refactor exceptions to be less verbose

1 files changed, 8 insertions, 37 deletions

diff --git a/mcgoron.iterator.exceptions.sld b/mcgoron.iterator.exceptions.sld
index 0140f4c..e2f47db 100644
--- a/mcgoron.iterator.exceptions.sld
+++ b/mcgoron.iterator.exceptions.sld
@@ -15,42 +15,13 @@
 
 (define-library (mcgoron iterator exceptions)
   (import (scheme base))
-  (export field-not-found-exception field-not-found-exception?
-          field-not-found-exception:field
-          field-not-found-exception:iterator
-          non-integer-movement-exception non-integer-movement-exception?
-          non-integer-movement-exception:spaces
-          negative-movement-exception negative-movement-exception?
-          negative-movement-exception:spaces
-          improper-list-exception improper-list-exception?
-          improper-list-exception:idx
-          improper-list-exception:cdr
+  (export make-iterator-exception iterator-exception?
+          iterator-exception-iterator
+          iterator-exception-type
+          iterator-exception-fields
           not-implemented-exception
-          not-implemented-exception?
-          not-implemented-exception:type
-          not-implemented-exception:args)
-  (begin
-    (define-record-type <field-not-found-exception>
-      (field-not-found-exception field iterator)
-      field-not-found-exception?
-      (field field-not-found-exception:field)
-      (iterator field-not-found-exception:iterator))
-    (define-record-type <non-integer-movement-exception>
-      (non-integer-movement-exception spaces)
-      non-integer-movement-exception?
-      (spaces non-integer-movement-exception:spaces))
-    (define-record-type <negative-movement-exception>
-      (negative-movement-exception spaces)
-      negative-movement-exception?
-      (spaces negative-movement-exception:spaces))
-    (define-record-type <improper-list-exception>
-      (improper-list-exception idx cdr)
-      improper-list-exception?
-      (idx improper-list-exception:idx)
-      (cdr improper-list-exception:cdr))
-    (define-record-type <not-implemented-exception>
-      (not-implemented-exception type args)
-      not-implemented-exception?
-      (type not-implemented-exception:type)
-      (args not-implemented-exception:args))))
+          non-integer-movement-exception
+          negative-movement-exception
+          ref-at-end-exception)
+  (include "mcgoron.iterator.exceptions.scm"))