From 1da5a277188a954d881316cb605962ee66053285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Thu, 17 Mar 2022 22:14:18 +0100
Subject: Normalize errors.

---
 module/hnh/util.scm       | 26 ++++++++++++++------------
 module/hnh/util/graph.scm |  9 +++++----
 2 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'module/hnh')

diff --git a/module/hnh/util.scm b/module/hnh/util.scm
index 1b5ceeab..e766cd0a 100644
--- a/module/hnh/util.scm
+++ b/module/hnh/util.scm
@@ -247,18 +247,20 @@
 ;; and the other items in some order.
 ;; Ord b => (list a) [, (b, b -> bool), (a -> b)] -> a, (list a)
 (define*-public (find-extreme items optional: (< <) (access identity))
-  (if (null? items)
-      (error "Can't find extreme in an empty list")
-      (fold-values
-       (lambda (c min other)
-         (if (< (access c) (access min))
-             ;; Current stream head is smaller that previous min
-             (values c (cons min other))
-             ;; Previous min is still smallest
-             (values min (cons c other))))
-       (cdr items)
-       ;; seeds:
-       (car items) '())))
+  (when (null? items)
+    (scm-error 'wrong-type-arg "find-extreme"
+               "Can't find extreme in an empty list"
+               #f #f))
+  (fold-values
+   (lambda (c min other)
+     (if (< (access c) (access min))
+         ;; Current stream head is smaller that previous min
+         (values c (cons min other))
+         ;; Previous min is still smallest
+         (values min (cons c other))))
+   (cdr items)
+   ;; seeds:
+   (car items) '()))
 
 (define*-public (find-min list optional: (access identity))
   (find-extreme list < access))
diff --git a/module/hnh/util/graph.scm b/module/hnh/util/graph.scm
index 912f9612..03c2ae3c 100644
--- a/module/hnh/util/graph.scm
+++ b/module/hnh/util/graph.scm
@@ -73,8 +73,9 @@
 (define-public (find-and-remove-node-without-dependencies graph)
   (let ((node (find-node-without-dependencies graph)))
     (unless node
-      (throw 'graph-error 'find-and-remove-node-without-dependencies
-             "No node without dependencies in graph" '() graph))
+      (scm-error 'graph-error "find-and-remove-node-without-dependencies"
+                 "No node without dependencies in graph"
+                 #f (list graph)))
     (values node (remove-node graph node))))
 
 ;; Assumes that the edges of the graph are dependencies.
@@ -89,5 +90,5 @@
             '()
             (let* ((node graph* (find-and-remove-node-without-dependencies graph)))
               (cons node (loop graph*))))))
-    (lambda (err caller fmt args graph . data)
-      graph)))
+    (lambda (err caller fmt args data)
+      (car graph))))
-- 
cgit v1.2.3