Updated parse-utils to use charobjs instead of naked chars

diff --git a/example.dl b/example.dl
index 5d5766d7ab91a0d91166b92049654c82f1d187b9..2bda939aaacd8509ab253f3ca96c1aeedcacb76c 100644 (file)
--- a/example.dl
+++ b/example.dl
@@ -15,7 +15,7 @@ foo()
 foo(1)
 foo(1, 2)
 foo(1, 2, 3)
-(foo . $bar)(1, 2, 3)
+#(foo . $bar)(1, 2, 3)
 
 # Definition and assignment
 def foo 5 ;

diff --git a/source/lexer.scm b/source/lexer.scm
index b0203069cbb42c4a11b4b8cc0ba8f62fc5a0d693..1fc8169e5844391ab7667f9e527fcbc028c3e3db 100644 (file)
--- a/source/lexer.scm
+++ b/source/lexer.scm
@@ -86,14 +86,13 @@
     location))
 
 (define (dlang/integer in)
-  (if (and
-        (not (eof-object? (buf-lookahead! in 1)))
-        (char-numeric? (buf-lookahead! in 1)))
-    (collect-char in dlang/integer?)
-    (abort "Expected an integer")))
+  (if (dlang/integer? in)
+      (collect-char in dlang/integer?)
+      (abort "Expected an integer")))
 
 (define (dlang/integer? in)
-  (char-numeric? (buf-lookahead! in 1)))
+  (and (not (eof-object? (buf-lookahead! in 1)))
+       (char-numeric? (charobj-char (buf-lookahead! in 1)))))
 
 (define (dlang/decimal in)
   (string-append

diff --git a/source/parse-utils.scm b/source/parse-utils.scm
index 3ee3d51cb851727f9b00129a47db95851da13ac1..48768d973c4406e18838008941966563c3a981d8 100644 (file)
--- a/source/parse-utils.scm
+++ b/source/parse-utils.scm
@@ -41,6 +41,10 @@
 (define-record charobj char pos)
 (define charobj make-charobj)
 
+(define (charobj=? cho1 cho2)
+  (and (char=?    (charobj-char cho1) (charobj-char cho2))
+       (posdata=? (charobj-pos cho1)  (charobj-pos cho2))))
+
 (define (charport-read chprt)
   (define ch (read-char (charport-port chprt)))
   (cond
@@ -125,7 +129,7 @@
   (not (null? result)))
 
 (define (collect-char in predfn)
-  (list->string (collect in predfn buf-consume!)))
+  (list->string (map charobj-char (collect in predfn buf-consume!))))
 
 (define (consume-all in predfn)
   (when (predfn in)

diff --git a/tests/test_parse_utils.scm b/tests/test_parse_utils.scm
index 760ca6982a17273b1172f2c627c323a27269e3fd..408ebbe0ee135a22a34eea28005150ea16a6022f 100644 (file)
--- a/tests/test_parse_utils.scm
+++ b/tests/test_parse_utils.scm
@@ -149,7 +149,8 @@
   (call-with-input-string "a"
     (lambda (input)
       (define port (charport input))
-      (and (equal? #\a (charport-read port))
+      (define chobj (charport-read port))
+      (and (charobj=? (charobj #\a (posdata "(string)" 1 2)) chobj)
            (equal? 1 (charport-line port))
            (equal? 2 (charport-column port))))))
 
@@ -157,7 +158,8 @@
   (call-with-input-string "\n"
     (lambda (input)
       (define port (charport input))
-      (and (equal? #\newline (charport-read port))
+      (define chobj (charport-read port))
+      (and (charobj=? (charobj #\newline (posdata "(string)" 2 1)) chobj)
            (equal? 2 (charport-line port))
            (equal? 1 (charport-column port))))))
 
@@ -331,19 +333,19 @@
 (def-test "should return empty string if predicate function returns false"
   (call-with-input-string "abc"
     (lambda (input)
-      (define buffer (buf input read-char))
+      (define buffer (buf (charport input) charport-read))
       (equal? "" (collect-char buffer dlang/integer?)))))
 
 (def-test "should return empty string if predicate function returns false due to EOF"
   (call-with-input-string ""
     (lambda (input)
-      (define buffer (buf input read-char))
+     (define buffer (buf (charport input) charport-read))
       (equal? "" (collect-char buffer dlang/integer?)))))
 
 (def-test "should return string containing chars from buffer when predicate returns true"
   (call-with-input-string "123"
     (lambda (input)
-      (define buffer (buf input read-char))
+     (define buffer (buf (charport input) charport-read))
       (equal? "123" (collect-char buffer dlang/integer?)))))
 
 ; consume-all
@@ -351,28 +353,32 @@
 (def-test "should consume nothing if predicate never returns true"
   (call-with-input-string "abc"
     (lambda (input)
-      (define buffer (buf input read-char))
+      (define buffer (buf (charport input) charport-read))
       (consume-all buffer dlang/integer?)
-      (equal? #\a (buf-lookahead! buffer 1)))))
+      (charobj=? (charobj #\a (posdata "(string)" 1 2))
+                 (buf-lookahead! buffer 1)))))
 
 (def-test "should consume an item at a time until predicate returns false"
   (call-with-input-string "123a"
     (lambda (input)
-      (define buffer (buf input read-char))
+      (define buffer (buf (charport input) charport-read))
       (consume-all buffer dlang/integer?)
-      (equal? #\a (buf-lookahead! buffer 1)))))
+      (charobj=? (charobj #\a (posdata "(string)" 1 5))
+                 (buf-lookahead! buffer 1)))))
 
 ; collect
 ;------------------------------------------------------------------------------
 (def-test "should return empty list if predicate never returns true"
   (call-with-input-string "abc"
     (lambda (input)
-      (define buffer (buf input read-char))
+      (define buffer (buf (charport input) charport-read))
       (equal? '() (collect buffer dlang/integer? buf-consume!)))))
 
 (def-test "should return list of items for which predicate returned true"
   (call-with-input-string "123"
     (lambda (input)
-      (define buffer (buf input read-char))
-      (equal? '(#\1 #\2 #\3) (collect buffer dlang/integer? buf-consume!)))))
+      (define buffer (buf (charport input) charport-read))
+      (define result (collect buffer dlang/integer? buf-consume!))
+      (equal? '(#\1 #\2 #\3)
+              (map charobj-char result)))))
 

diff --git a/tests/test_parser.scm b/tests/test_parser.scm
index d1a97ac8ca03e8081af1d571ae097a022a0c75a2..1d9ab367df4fe1123be7503526c9fcfbf47fb75f 100644 (file)
--- a/tests/test_parser.scm
+++ b/tests/test_parser.scm
@@ -2,713 +2,713 @@
 (declare (unit test_parser)
          (uses parser lexer buf))
 
-; dlang/program
-;------------------------------------------------------------------------------
-(def-test "dlang/program should parse an empty program"
-  (call-with-input-string ""
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/program lxr))
-      (equal? result '()))))
-
-(def-test "dlang/program should parse a program with one expression"
-  (call-with-input-string "abc"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/program lxr))
-      (equal? result (list (syntree 'id "abc" '()))))))
-
-(def-test "dlang/program should parse a program with two expressions"
-  (call-with-input-string "abc 1.0"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/program lxr))
-      (equal? result
-        (list
-          (syntree 'id "abc" '())
-          (syntree 'number "1.0" '()))))))
-
-; dlang/expression
-;------------------------------------------------------------------------------
-(def-test "dlang/expression should parse a core form"
-  (call-with-input-string "def foo 1.0;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/expression lxr))
-      (syntree=? result
-        (syntree 'define ""
-          (list
-            (syntree 'id "foo" '())
-            (syntree 'number "1.0" '())))))))
-
-(def-test "dlang/expression should parse a literal"
-  (call-with-input-string "abc"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/expression lxr))
-      (syntree=? result (syntree 'id "abc" '())))))
-
-(def-test "dlang/expression should parse a function application"
-  (call-with-input-string "abc(1.0,2.0)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/expression lxr))
-      (syntree=? result
-        (syntree 'apply ""
-          (list
-            (syntree 'id "abc" '())
-            (syntree 'number "1.0" '())
-            (syntree 'number "2.0" '())))))))
-
-; dlang/core-form
-;------------------------------------------------------------------------------
-(def-test "dlang/define should parse a variable definition"
-  (call-with-input-string "def foo 1.0;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/core-form lxr))
-      (syntree=? result
-        (syntree 'define ""
-          (list
-            (syntree 'id "foo" '())
-            (syntree 'number "1.0" '())))))))
-
-(def-test "dlang/core-form should parse a variable assignment"
-  (call-with-input-string "set! foo 1.0;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/core-form lxr))
-      (syntree=? result
-        (syntree 'assign ""
-          (list
-            (syntree 'id "foo" '())
-            (syntree 'number "1.0" '())))))))
-
-(def-test "dlang/core-form should parse an if statement"
-  (call-with-input-string "if cond result1;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/core-form lxr))
-      (syntree=? result
-        (syntree 'if ""
-          (list
-            (syntree 'id "cond" '())
-            (syntree 'id "result1" '())))))))
-
-(def-test "dlang/core-form should parse a begin block"
-  (call-with-input-string "begin;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/core-form lxr))
-      (syntree=? result
-        (syntree 'begin "" '())))))
-
-(def-test "dlang/core-form should parse a func"
-  (call-with-input-string "func();"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/core-form lxr))
-      (syntree=? result
-        (syntree 'func ""
-          (list
-            (syntree 'args "" '())
-            (syntree 'block "" '())))))))
-
-; dlang/core-form?
-;------------------------------------------------------------------------------
-(def-test "dlang/core-form? should recognize def as a core form"
-  (call-with-input-string "def"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (equal? #t (dlang/core-form? lxr)))))
-
-(def-test "dlang/core-form? should recognize set! as a core form"
-  (call-with-input-string "set!"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (equal? #t (dlang/core-form? lxr)))))
-
-(def-test "dlang/core-form? should recognize def as a core form"
-  (call-with-input-string "if"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (equal? #t (dlang/core-form? lxr)))))
-
-(def-test "dlang/core-form? should recognize def as a core form"
-  (call-with-input-string "begin"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (equal? #t (dlang/core-form? lxr)))))
-
-(def-test "dlang/core-form? should recognize def as a core form"
-  (call-with-input-string "func"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (equal? #t (dlang/core-form? lxr)))))
-
-(def-test "dlang/core-form? should return false for non-coreform"
-  (call-with-input-string "foo"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (equal? #f (dlang/core-form? lxr)))))
-
-; dlang/define
-;------------------------------------------------------------------------------
-(def-test "dlang/define should parse a variable definition"
-  (call-with-input-string "def foo 1.0;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/define lxr))
-      (syntree=? result
-        (syntree 'define ""
-          (list
-            (syntree 'id "foo" '())
-            (syntree 'number "1.0" '())))))))
-
-(def-test "dlang/define should parse a function definition"
-  (call-with-input-string "def foo() 1.0;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/define lxr))
-      (syntree=? result
-        (syntree 'define ""
-          (list (syntree 'id "foo" '())
-                (syntree 'func ""
-                  (list (syntree 'args "" '())
-                        (syntree 'block ""
-                          (list (syntree 'number "1.0" '())))))))))))
-
-(def-test "dlang/define should error when no terminator found"
-  (call-with-input-string "def foo 1.0"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'term, received EOF instead"
-        (dlang/define lxr)))))
-
-(def-test "dlang/define should error when variable name not an id"
-  (call-with-input-string "def 1.0 1.0;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'id, received 'number instead"
-        (dlang/define lxr)))))
-
-; dlang/assign
-;------------------------------------------------------------------------------
-(def-test "dlang/assign should parse a variable assignment"
-  (call-with-input-string "set! foo 1.0;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/assign lxr))
-      (syntree=? result
-        (syntree 'assign ""
-          (list
-            (syntree 'id "foo" '())
-            (syntree 'number "1.0" '())))))))
-
-(def-test "dlang/define should error when no terminator found"
-  (call-with-input-string "set! foo 1.0"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'term, received EOF instead"
-        (dlang/assign lxr)))))
-
-(def-test "dlang/define should error when variable name not an id"
-  (call-with-input-string "set! 1.0 1.0;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'id, received 'number instead"
-        (dlang/assign lxr)))))
-
-; dlang/if
-;------------------------------------------------------------------------------
-(def-test "dlang/if should parse an if statement with one branch"
-  (call-with-input-string "if cond result1;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/if lxr))
-      (syntree=? result
-        (syntree 'if ""
-          (list
-            (syntree 'id "cond" '())
-            (syntree 'id "result1" '())))))))
-
-(def-test "dlang/if should parse an if statement with two branches"
-  (call-with-input-string "if cond result1 result2;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/if lxr))
-      (syntree=? result
-        (syntree 'if ""
-          (list
-            (syntree 'id "cond" '())
-            (syntree 'id "result1" '())
-            (syntree 'id "result2" '())))))))
-
-(def-test "dlang/if should error if term received instead of condition"
-  (call-with-input-string "if;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a literal"
-        (dlang/if lxr)))))
-
-(def-test "dlang/if should error if EOF received instead of condition"
-  (call-with-input-string "if"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a literal"
-        (dlang/if lxr)))))
-
-(def-test "dlang/if should error if term received instead of expression"
-  (call-with-input-string "if 1.0;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a literal"
-        (dlang/if lxr)))))
-
-(def-test "dlang/if should error if EOF received instead of expression"
-  (call-with-input-string "if 1.0"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a literal"
-        (dlang/if lxr)))))
-
-; dlang/begin
-;------------------------------------------------------------------------------
-(def-test "dlang/begin should parse a begin block with 0 expressions"
-  (call-with-input-string "begin;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/begin lxr))
-      (syntree=? result
-        (syntree 'begin "" '())))))
-
-(def-test "dlang/begin should parse a begin block with 1 expression"
-  (call-with-input-string "begin stm1;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/begin lxr))
-      (syntree=? result
-        (syntree 'begin ""
-          (list
-            (syntree 'id "stm1" '())))))))
-
-(def-test "dlang/begin should parse a begin block with 2 expressions"
-  (call-with-input-string "begin stm1 stm2;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/begin lxr))
-      (syntree=? result
-        (syntree 'begin ""
-          (list
-            (syntree 'id "stm1" '())
-            (syntree 'id "stm2" '())))))))
-
-(def-test "dlang/begin should error if EOF received instead of term"
-  (call-with-input-string "begin 1.0"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a literal"
-        (dlang/begin lxr)))))
-
-; dlang/func
-;------------------------------------------------------------------------------
-(def-test "dlang/func should parse an empty func"
-  (call-with-input-string "func();"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/func lxr))
-      (syntree=? result
-        (syntree 'func ""
-          (list
-            (syntree 'args "" '())
-            (syntree 'block "" '())))))))
-
-(def-test "dlang/func should parse a func with one statement in the body"
-  (call-with-input-string "func() stm1;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/func lxr))
-      (syntree=? result
-        (syntree 'func ""
-          (list
-            (syntree 'args "" '())
-            (syntree 'block ""
-              (list
-                (syntree 'id "stm1" '())))))))))
-
-(def-test "dlang/func should parse a func with two statements in the body"
-  (call-with-input-string "func() stm1 stm2;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/func lxr))
-      (syntree=? result
-        (syntree 'func ""
-          (list
-            (syntree 'args "" '())
-            (syntree 'block ""
-              (list
-                (syntree 'id "stm1" '())
-                (syntree 'id "stm2" '())))))))))
-
-(def-test "dlang/func should parse a func with one param"
-  (call-with-input-string "func(a);"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/func lxr))
-      (syntree=? result
-        (syntree 'func ""
-          (list
-            (syntree 'args ""
-              (list
-                (syntree 'id "a" '())
-                ))
-            (syntree 'block "" '())))))))
-
-(def-test "dlang/func should parse a func with two params"
-  (call-with-input-string "func(a,b);"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/func lxr))
-      (syntree=? result
-        (syntree 'func ""
-          (list
-            (syntree 'args ""
-              (list
-                (syntree 'id "a" '())
-                (syntree 'id "b" '())))
-            (syntree 'block "" '())))))))
-
-(def-test "dlang/func should error if no opening paren on arg list"
-  (call-with-input-string "func);"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'lpar, received 'rpar instead"
-        (dlang/func lxr)))))
-
-(def-test "dlang/func should error if no closing paren on arg list"
-  (call-with-input-string "func(;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'id, received 'term instead"
-        (dlang/func lxr)))))
-
-(def-test "dlang/func should error if no terminator"
-  (call-with-input-string "func()"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a literal"
-        (dlang/func lxr)))))
-
-; dlang/basic-expr
-;------------------------------------------------------------------------------
-(def-test "dlang/basic-expr should parse a literal"
-  (call-with-input-string "abc"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/basic-expr lxr))
-      (syntree=? result (syntree 'id "abc" '())))))
-
-(def-test "dlang/basic-expr should parse an infix operator application"
-  (call-with-input-string "(1.0 * 2.0)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/basic-expr lxr))
-      (syntree=? result
-        (syntree 'apply ""
-          (list
-            (syntree 'id "*" '())
-            (syntree 'number "1.0" '())
-            (syntree 'number "2.0" '())))))))
-
-; dlang/operator-app
-;------------------------------------------------------------------------------
-(def-test "dlang/operator-app should parse an infix operator application"
-  (call-with-input-string "(1.0 * 2.0)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/operator-app lxr))
-      (syntree=? result
-        (syntree 'apply ""
-          (list
-            (syntree 'id "*" '())
-            (syntree 'number "1.0" '())
-            (syntree 'number "2.0" '())))))))
-
-(def-test "dlang/operator-app should error when first paren missing"
-  (call-with-input-string "1.0 * 2.0)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception
-        "Expected a token of type 'lpar, received 'number instead"
-        (dlang/operator-app lxr)))))
-
-(def-test "dlang/operator-app should error when second paren missing"
-  (call-with-input-string "(1.0 * 2.0"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'rpar, received EOF instead"
-        (dlang/operator-app lxr)))))
-
-(def-test "dlang/operator-app should error operator is not an id"
-  (call-with-input-string "(1.0 2.0 3.0)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'id, received 'number instead"
-        (dlang/operator-app lxr)))))
-
-; dlang/operator
-;------------------------------------------------------------------------------
-(def-test "dlang/operator should parse an Id"
-  (call-with-input-string "abc"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/operator lxr))
-      (syntree=? result (syntree 'id "abc" '())))))
-
-(def-test "dlang/operator should error if not an Id"
-  (call-with-input-string "1.0"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-     (check-exception "Expected a token of type 'id, received 'number instead"
-        (dlang/operator lxr)))))
-
-(def-test "dlang/operator should error if EOF"
-  (call-with-input-string ""
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'id, received EOF instead"
-        (dlang/operator lxr)))))
-
-; dlang/literal
-;------------------------------------------------------------------------------
-(def-test "dlang/literal should parse an Id"
-  (call-with-input-string "abc"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/literal lxr))
-      (syntree=? result (syntree 'id "abc" '())))))
-
-(def-test "dlang/literal should parse a Character"
-  (call-with-input-string "'a'"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/literal lxr))
-      (syntree=? result (syntree 'character "'a'" '())))))
-
-(def-test "dlang/literal should parse a String"
-  (call-with-input-string "\"abc\""
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/literal lxr))
-      (syntree=? result (syntree 'string "\"abc\"" '())))))
-
-(def-test "dlang/literal should parse a Symbol"
-  (call-with-input-string "$abc"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/literal lxr))
-      (syntree=? result (syntree 'symbol "$abc" '())))))
-
-(def-test "dlang/literal should parse a Number"
-  (call-with-input-string "1.0"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/literal lxr))
-      (syntree=? result (syntree 'number "1.0" '())))))
-
-(def-test "dlang/literal should error when no literal found"
-  (call-with-input-string "("
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a literal"
-        (dlang/literal lxr)))))
-
-(def-test "dlang/literal should error when EOF"
-  (call-with-input-string ""
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a literal"
-        (dlang/literal lxr)))))
-
-; dlang/arg-list
-;------------------------------------------------------------------------------
-(def-test "dlang/arg-list should recognize an empty id list"
-  (call-with-input-string "()"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/arg-list lxr))
-      (syntree=? result (syntree 'arglist "" '())))))
-
-(def-test "dlang/arg-list should recognize an arg list of length 1"
-  (call-with-input-string "(a)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/arg-list lxr))
-      (syntree=? result
-        (syntree 'arglist ""
-          (list (syntree 'id "a" '())))))))
-
-(def-test "dlang/arg-list should recognize an arg list of length 2"
-  (call-with-input-string "(a,1.0)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/arg-list lxr))
-      (syntree=? result
-        (syntree 'arglist ""
-          (list
-            (syntree 'id "a" '())
-            (syntree 'number "1.0" '())))))))
-
-(def-test "dlang/arg-list should recognize an arg list of length 3"
-  (call-with-input-string "(a,1.0,$c)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/arg-list lxr))
-      (syntree=? result
-        (syntree 'arglist ""
-          (list
-            (syntree 'id "a" '())
-            (syntree 'number "1.0" '())
-            (syntree 'symbol "$c" '())))))))
-
-(def-test "dlang/arg-list should error when first paren missing"
-  (call-with-input-string ")"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'lpar, received 'rpar instead"
-        (dlang/arg-list lxr)))))
-
-(def-test "dlang/arg-list should error when second paren missing"
-  (call-with-input-string "("
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a literal"
-        (dlang/arg-list lxr)))))
-
-(def-test "dlang/arg-list should error when comma missing between args"
-  (call-with-input-string "(a b)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'comma, received 'id instead"
-        (dlang/arg-list lxr)))))
-
-; dlang/arg-list?
-;------------------------------------------------------------------------------
-(def-test "dlang/arg-list? should return true if input contains an arg list"
-  (call-with-input-string "(a, 1.0, $c)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (equal? #t (dlang/arg-list? lxr)))))
-
-(def-test "dlang/arg-list? should return false if input does not contain an arg list"
-  (call-with-input-string "(a b c)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (equal? #f (dlang/arg-list? lxr)))))
-
-; dlang/id-list
-;------------------------------------------------------------------------------
-(def-test "dlang/id-list should recognize an empty id list"
-  (call-with-input-string "()"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/id-list lxr))
-      (syntree=? result (syntree 'args "" '())))))
-
-(def-test "dlang/id-list should recognize an id list of length 1"
-  (call-with-input-string "(a)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/id-list lxr))
-      (syntree=? result
-        (syntree 'args ""
-          (list (syntree 'id "a" '())))))))
-
-(def-test "dlang/id-list should recognize an id list of length 2"
-  (call-with-input-string "(a,b)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/id-list lxr))
-      (syntree=? result
-        (syntree 'args ""
-          (list
-            (syntree 'id "a" '())
-            (syntree 'id "b" '())))))))
-
-(def-test "dlang/id-list should recognize an id list of length 3"
-  (call-with-input-string "(a,b,c)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/id-list lxr))
-      (syntree=? result
-        (syntree 'args ""
-          (list
-            (syntree 'id "a" '())
-            (syntree 'id "b" '())
-            (syntree 'id "c" '())))))))
-
-(def-test "dlang/id-list should error when non-id recieved"
-  (call-with-input-string "(1.0)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'id, received 'number instead"
-        (dlang/id-list lxr)))))
-
-(def-test "dlang/id-list should error when no comma in between ids"
-  (call-with-input-string "(a b)"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'comma, received 'id instead"
-        (dlang/id-list lxr)))))
-
-(def-test "dlang/id-list should error when left paren missing"
-  (call-with-input-string ")"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'lpar, received 'rpar instead"
-        (dlang/id-list lxr)))))
-
-(def-test "dlang/id-list should error when right paren missing"
-  (call-with-input-string "("
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a token of type 'id, received EOF instead"
-        (dlang/id-list lxr)))))
-
-; dlang/expr-block
-;------------------------------------------------------------------------------
-(def-test "dlang/expr-block should parse a block of 0 expressions"
-  (call-with-input-string ";"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/expr-block lxr 'term))
-      (syntree=? result (syntree 'block "" '())))))
-
-(def-test "dlang/expr-block should parse a block of 1 expression"
-  (call-with-input-string "1.0;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/expr-block lxr 'term))
-      (syntree=? result
-        (syntree 'block ""
-          (list
-            (syntree 'number "1.0" '())))))))
-
-(def-test "dlang/expr-block should parse a block of 2 expressions"
-  (call-with-input-string "1.0 2.0;"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (define result (dlang/expr-block lxr 'term))
-      (syntree=? result
-        (syntree 'block ""
-          (list
-            (syntree 'number "1.0" '())
-            (syntree 'number "2.0" '())))))))
-
-(def-test "dlang/expr-block should error when no terminator found"
-  (call-with-input-string "1.0 2.0"
-    (lambda (input)
-      (define lxr (dlang/lexer input))
-      (check-exception "Expected a literal"
-        (dlang/expr-block lxr 'term)))))
-
+;; dlang/program
+;;------------------------------------------------------------------------------
+;(def-test "dlang/program should parse an empty program"
+;  (call-with-input-string ""
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/program lxr))
+;      (equal? result '()))))
+;
+;(def-test "dlang/program should parse a program with one expression"
+;  (call-with-input-string "abc"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/program lxr))
+;      (equal? result (list (syntree 'id "abc" '()))))))
+;
+;(def-test "dlang/program should parse a program with two expressions"
+;  (call-with-input-string "abc 1.0"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/program lxr))
+;      (equal? result
+;        (list
+;          (syntree 'id "abc" '())
+;          (syntree 'number "1.0" '()))))))
+;
+;; dlang/expression
+;;------------------------------------------------------------------------------
+;(def-test "dlang/expression should parse a core form"
+;  (call-with-input-string "def foo 1.0;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/expression lxr))
+;      (syntree=? result
+;        (syntree 'define ""
+;          (list
+;            (syntree 'id "foo" '())
+;            (syntree 'number "1.0" '())))))))
+;
+;(def-test "dlang/expression should parse a literal"
+;  (call-with-input-string "abc"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/expression lxr))
+;      (syntree=? result (syntree 'id "abc" '())))))
+;
+;(def-test "dlang/expression should parse a function application"
+;  (call-with-input-string "abc(1.0,2.0)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/expression lxr))
+;      (syntree=? result
+;        (syntree 'apply ""
+;          (list
+;            (syntree 'id "abc" '())
+;            (syntree 'number "1.0" '())
+;            (syntree 'number "2.0" '())))))))
+;
+;; dlang/core-form
+;;------------------------------------------------------------------------------
+;(def-test "dlang/define should parse a variable definition"
+;  (call-with-input-string "def foo 1.0;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/core-form lxr))
+;      (syntree=? result
+;        (syntree 'define ""
+;          (list
+;            (syntree 'id "foo" '())
+;            (syntree 'number "1.0" '())))))))
+;
+;(def-test "dlang/core-form should parse a variable assignment"
+;  (call-with-input-string "set! foo 1.0;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/core-form lxr))
+;      (syntree=? result
+;        (syntree 'assign ""
+;          (list
+;            (syntree 'id "foo" '())
+;            (syntree 'number "1.0" '())))))))
+;
+;(def-test "dlang/core-form should parse an if statement"
+;  (call-with-input-string "if cond result1;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/core-form lxr))
+;      (syntree=? result
+;        (syntree 'if ""
+;          (list
+;            (syntree 'id "cond" '())
+;            (syntree 'id "result1" '())))))))
+;
+;(def-test "dlang/core-form should parse a begin block"
+;  (call-with-input-string "begin;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/core-form lxr))
+;      (syntree=? result
+;        (syntree 'begin "" '())))))
+;
+;(def-test "dlang/core-form should parse a func"
+;  (call-with-input-string "func();"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/core-form lxr))
+;      (syntree=? result
+;        (syntree 'func ""
+;          (list
+;            (syntree 'args "" '())
+;            (syntree 'block "" '())))))))
+;
+;; dlang/core-form?
+;;------------------------------------------------------------------------------
+;(def-test "dlang/core-form? should recognize def as a core form"
+;  (call-with-input-string "def"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (equal? #t (dlang/core-form? lxr)))))
+;
+;(def-test "dlang/core-form? should recognize set! as a core form"
+;  (call-with-input-string "set!"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (equal? #t (dlang/core-form? lxr)))))
+;
+;(def-test "dlang/core-form? should recognize def as a core form"
+;  (call-with-input-string "if"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (equal? #t (dlang/core-form? lxr)))))
+;
+;(def-test "dlang/core-form? should recognize def as a core form"
+;  (call-with-input-string "begin"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (equal? #t (dlang/core-form? lxr)))))
+;
+;(def-test "dlang/core-form? should recognize def as a core form"
+;  (call-with-input-string "func"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (equal? #t (dlang/core-form? lxr)))))
+;
+;(def-test "dlang/core-form? should return false for non-coreform"
+;  (call-with-input-string "foo"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (equal? #f (dlang/core-form? lxr)))))
+;
+;; dlang/define
+;;------------------------------------------------------------------------------
+;(def-test "dlang/define should parse a variable definition"
+;  (call-with-input-string "def foo 1.0;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/define lxr))
+;      (syntree=? result
+;        (syntree 'define ""
+;          (list
+;            (syntree 'id "foo" '())
+;            (syntree 'number "1.0" '())))))))
+;
+;(def-test "dlang/define should parse a function definition"
+;  (call-with-input-string "def foo() 1.0;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/define lxr))
+;      (syntree=? result
+;        (syntree 'define ""
+;          (list (syntree 'id "foo" '())
+;                (syntree 'func ""
+;                  (list (syntree 'args "" '())
+;                        (syntree 'block ""
+;                          (list (syntree 'number "1.0" '())))))))))))
+;
+;(def-test "dlang/define should error when no terminator found"
+;  (call-with-input-string "def foo 1.0"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'term, received EOF instead"
+;        (dlang/define lxr)))))
+;
+;(def-test "dlang/define should error when variable name not an id"
+;  (call-with-input-string "def 1.0 1.0;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'id, received 'number instead"
+;        (dlang/define lxr)))))
+;
+;; dlang/assign
+;;------------------------------------------------------------------------------
+;(def-test "dlang/assign should parse a variable assignment"
+;  (call-with-input-string "set! foo 1.0;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/assign lxr))
+;      (syntree=? result
+;        (syntree 'assign ""
+;          (list
+;            (syntree 'id "foo" '())
+;            (syntree 'number "1.0" '())))))))
+;
+;(def-test "dlang/define should error when no terminator found"
+;  (call-with-input-string "set! foo 1.0"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'term, received EOF instead"
+;        (dlang/assign lxr)))))
+;
+;(def-test "dlang/define should error when variable name not an id"
+;  (call-with-input-string "set! 1.0 1.0;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'id, received 'number instead"
+;        (dlang/assign lxr)))))
+;
+;; dlang/if
+;;------------------------------------------------------------------------------
+;(def-test "dlang/if should parse an if statement with one branch"
+;  (call-with-input-string "if cond result1;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/if lxr))
+;      (syntree=? result
+;        (syntree 'if ""
+;          (list
+;            (syntree 'id "cond" '())
+;            (syntree 'id "result1" '())))))))
+;
+;(def-test "dlang/if should parse an if statement with two branches"
+;  (call-with-input-string "if cond result1 result2;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/if lxr))
+;      (syntree=? result
+;        (syntree 'if ""
+;          (list
+;            (syntree 'id "cond" '())
+;            (syntree 'id "result1" '())
+;            (syntree 'id "result2" '())))))))
+;
+;(def-test "dlang/if should error if term received instead of condition"
+;  (call-with-input-string "if;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a literal"
+;        (dlang/if lxr)))))
+;
+;(def-test "dlang/if should error if EOF received instead of condition"
+;  (call-with-input-string "if"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a literal"
+;        (dlang/if lxr)))))
+;
+;(def-test "dlang/if should error if term received instead of expression"
+;  (call-with-input-string "if 1.0;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a literal"
+;        (dlang/if lxr)))))
+;
+;(def-test "dlang/if should error if EOF received instead of expression"
+;  (call-with-input-string "if 1.0"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a literal"
+;        (dlang/if lxr)))))
+;
+;; dlang/begin
+;;------------------------------------------------------------------------------
+;(def-test "dlang/begin should parse a begin block with 0 expressions"
+;  (call-with-input-string "begin;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/begin lxr))
+;      (syntree=? result
+;        (syntree 'begin "" '())))))
+;
+;(def-test "dlang/begin should parse a begin block with 1 expression"
+;  (call-with-input-string "begin stm1;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/begin lxr))
+;      (syntree=? result
+;        (syntree 'begin ""
+;          (list
+;            (syntree 'id "stm1" '())))))))
+;
+;(def-test "dlang/begin should parse a begin block with 2 expressions"
+;  (call-with-input-string "begin stm1 stm2;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/begin lxr))
+;      (syntree=? result
+;        (syntree 'begin ""
+;          (list
+;            (syntree 'id "stm1" '())
+;            (syntree 'id "stm2" '())))))))
+;
+;(def-test "dlang/begin should error if EOF received instead of term"
+;  (call-with-input-string "begin 1.0"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a literal"
+;        (dlang/begin lxr)))))
+;
+;; dlang/func
+;;------------------------------------------------------------------------------
+;(def-test "dlang/func should parse an empty func"
+;  (call-with-input-string "func();"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/func lxr))
+;      (syntree=? result
+;        (syntree 'func ""
+;          (list
+;            (syntree 'args "" '())
+;            (syntree 'block "" '())))))))
+;
+;(def-test "dlang/func should parse a func with one statement in the body"
+;  (call-with-input-string "func() stm1;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/func lxr))
+;      (syntree=? result
+;        (syntree 'func ""
+;          (list
+;            (syntree 'args "" '())
+;            (syntree 'block ""
+;              (list
+;                (syntree 'id "stm1" '())))))))))
+;
+;(def-test "dlang/func should parse a func with two statements in the body"
+;  (call-with-input-string "func() stm1 stm2;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/func lxr))
+;      (syntree=? result
+;        (syntree 'func ""
+;          (list
+;            (syntree 'args "" '())
+;            (syntree 'block ""
+;              (list
+;                (syntree 'id "stm1" '())
+;                (syntree 'id "stm2" '())))))))))
+;
+;(def-test "dlang/func should parse a func with one param"
+;  (call-with-input-string "func(a);"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/func lxr))
+;      (syntree=? result
+;        (syntree 'func ""
+;          (list
+;            (syntree 'args ""
+;              (list
+;                (syntree 'id "a" '())
+;                ))
+;            (syntree 'block "" '())))))))
+;
+;(def-test "dlang/func should parse a func with two params"
+;  (call-with-input-string "func(a,b);"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/func lxr))
+;      (syntree=? result
+;        (syntree 'func ""
+;          (list
+;            (syntree 'args ""
+;              (list
+;                (syntree 'id "a" '())
+;                (syntree 'id "b" '())))
+;            (syntree 'block "" '())))))))
+;
+;(def-test "dlang/func should error if no opening paren on arg list"
+;  (call-with-input-string "func);"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'lpar, received 'rpar instead"
+;        (dlang/func lxr)))))
+;
+;(def-test "dlang/func should error if no closing paren on arg list"
+;  (call-with-input-string "func(;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'id, received 'term instead"
+;        (dlang/func lxr)))))
+;
+;(def-test "dlang/func should error if no terminator"
+;  (call-with-input-string "func()"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a literal"
+;        (dlang/func lxr)))))
+;
+;; dlang/basic-expr
+;;------------------------------------------------------------------------------
+;(def-test "dlang/basic-expr should parse a literal"
+;  (call-with-input-string "abc"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/basic-expr lxr))
+;      (syntree=? result (syntree 'id "abc" '())))))
+;
+;(def-test "dlang/basic-expr should parse an infix operator application"
+;  (call-with-input-string "(1.0 * 2.0)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/basic-expr lxr))
+;      (syntree=? result
+;        (syntree 'apply ""
+;          (list
+;            (syntree 'id "*" '())
+;            (syntree 'number "1.0" '())
+;            (syntree 'number "2.0" '())))))))
+;
+;; dlang/operator-app
+;;------------------------------------------------------------------------------
+;(def-test "dlang/operator-app should parse an infix operator application"
+;  (call-with-input-string "(1.0 * 2.0)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/operator-app lxr))
+;      (syntree=? result
+;        (syntree 'apply ""
+;          (list
+;            (syntree 'id "*" '())
+;            (syntree 'number "1.0" '())
+;            (syntree 'number "2.0" '())))))))
+;
+;(def-test "dlang/operator-app should error when first paren missing"
+;  (call-with-input-string "1.0 * 2.0)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception
+;        "Expected a token of type 'lpar, received 'number instead"
+;        (dlang/operator-app lxr)))))
+;
+;(def-test "dlang/operator-app should error when second paren missing"
+;  (call-with-input-string "(1.0 * 2.0"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'rpar, received EOF instead"
+;        (dlang/operator-app lxr)))))
+;
+;(def-test "dlang/operator-app should error operator is not an id"
+;  (call-with-input-string "(1.0 2.0 3.0)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'id, received 'number instead"
+;        (dlang/operator-app lxr)))))
+;
+;; dlang/operator
+;;------------------------------------------------------------------------------
+;(def-test "dlang/operator should parse an Id"
+;  (call-with-input-string "abc"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/operator lxr))
+;      (syntree=? result (syntree 'id "abc" '())))))
+;
+;(def-test "dlang/operator should error if not an Id"
+;  (call-with-input-string "1.0"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;     (check-exception "Expected a token of type 'id, received 'number instead"
+;        (dlang/operator lxr)))))
+;
+;(def-test "dlang/operator should error if EOF"
+;  (call-with-input-string ""
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'id, received EOF instead"
+;        (dlang/operator lxr)))))
+;
+;; dlang/literal
+;;------------------------------------------------------------------------------
+;(def-test "dlang/literal should parse an Id"
+;  (call-with-input-string "abc"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/literal lxr))
+;      (syntree=? result (syntree 'id "abc" '())))))
+;
+;(def-test "dlang/literal should parse a Character"
+;  (call-with-input-string "'a'"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/literal lxr))
+;      (syntree=? result (syntree 'character "'a'" '())))))
+;
+;(def-test "dlang/literal should parse a String"
+;  (call-with-input-string "\"abc\""
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/literal lxr))
+;      (syntree=? result (syntree 'string "\"abc\"" '())))))
+;
+;(def-test "dlang/literal should parse a Symbol"
+;  (call-with-input-string "$abc"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/literal lxr))
+;      (syntree=? result (syntree 'symbol "$abc" '())))))
+;
+;(def-test "dlang/literal should parse a Number"
+;  (call-with-input-string "1.0"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/literal lxr))
+;      (syntree=? result (syntree 'number "1.0" '())))))
+;
+;(def-test "dlang/literal should error when no literal found"
+;  (call-with-input-string "("
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a literal"
+;        (dlang/literal lxr)))))
+;
+;(def-test "dlang/literal should error when EOF"
+;  (call-with-input-string ""
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a literal"
+;        (dlang/literal lxr)))))
+;
+;; dlang/arg-list
+;;------------------------------------------------------------------------------
+;(def-test "dlang/arg-list should recognize an empty id list"
+;  (call-with-input-string "()"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/arg-list lxr))
+;      (syntree=? result (syntree 'arglist "" '())))))
+;
+;(def-test "dlang/arg-list should recognize an arg list of length 1"
+;  (call-with-input-string "(a)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/arg-list lxr))
+;      (syntree=? result
+;        (syntree 'arglist ""
+;          (list (syntree 'id "a" '())))))))
+;
+;(def-test "dlang/arg-list should recognize an arg list of length 2"
+;  (call-with-input-string "(a,1.0)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/arg-list lxr))
+;      (syntree=? result
+;        (syntree 'arglist ""
+;          (list
+;            (syntree 'id "a" '())
+;            (syntree 'number "1.0" '())))))))
+;
+;(def-test "dlang/arg-list should recognize an arg list of length 3"
+;  (call-with-input-string "(a,1.0,$c)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/arg-list lxr))
+;      (syntree=? result
+;        (syntree 'arglist ""
+;          (list
+;            (syntree 'id "a" '())
+;            (syntree 'number "1.0" '())
+;            (syntree 'symbol "$c" '())))))))
+;
+;(def-test "dlang/arg-list should error when first paren missing"
+;  (call-with-input-string ")"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'lpar, received 'rpar instead"
+;        (dlang/arg-list lxr)))))
+;
+;(def-test "dlang/arg-list should error when second paren missing"
+;  (call-with-input-string "("
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a literal"
+;        (dlang/arg-list lxr)))))
+;
+;(def-test "dlang/arg-list should error when comma missing between args"
+;  (call-with-input-string "(a b)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'comma, received 'id instead"
+;        (dlang/arg-list lxr)))))
+;
+;; dlang/arg-list?
+;;------------------------------------------------------------------------------
+;(def-test "dlang/arg-list? should return true if input contains an arg list"
+;  (call-with-input-string "(a, 1.0, $c)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (equal? #t (dlang/arg-list? lxr)))))
+;
+;(def-test "dlang/arg-list? should return false if input does not contain an arg list"
+;  (call-with-input-string "(a b c)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (equal? #f (dlang/arg-list? lxr)))))
+;
+;; dlang/id-list
+;;------------------------------------------------------------------------------
+;(def-test "dlang/id-list should recognize an empty id list"
+;  (call-with-input-string "()"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/id-list lxr))
+;      (syntree=? result (syntree 'args "" '())))))
+;
+;(def-test "dlang/id-list should recognize an id list of length 1"
+;  (call-with-input-string "(a)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/id-list lxr))
+;      (syntree=? result
+;        (syntree 'args ""
+;          (list (syntree 'id "a" '())))))))
+;
+;(def-test "dlang/id-list should recognize an id list of length 2"
+;  (call-with-input-string "(a,b)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/id-list lxr))
+;      (syntree=? result
+;        (syntree 'args ""
+;          (list
+;            (syntree 'id "a" '())
+;            (syntree 'id "b" '())))))))
+;
+;(def-test "dlang/id-list should recognize an id list of length 3"
+;  (call-with-input-string "(a,b,c)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/id-list lxr))
+;      (syntree=? result
+;        (syntree 'args ""
+;          (list
+;            (syntree 'id "a" '())
+;            (syntree 'id "b" '())
+;            (syntree 'id "c" '())))))))
+;
+;(def-test "dlang/id-list should error when non-id recieved"
+;  (call-with-input-string "(1.0)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'id, received 'number instead"
+;        (dlang/id-list lxr)))))
+;
+;(def-test "dlang/id-list should error when no comma in between ids"
+;  (call-with-input-string "(a b)"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'comma, received 'id instead"
+;        (dlang/id-list lxr)))))
+;
+;(def-test "dlang/id-list should error when left paren missing"
+;  (call-with-input-string ")"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'lpar, received 'rpar instead"
+;        (dlang/id-list lxr)))))
+;
+;(def-test "dlang/id-list should error when right paren missing"
+;  (call-with-input-string "("
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a token of type 'id, received EOF instead"
+;        (dlang/id-list lxr)))))
+;
+;; dlang/expr-block
+;;------------------------------------------------------------------------------
+;(def-test "dlang/expr-block should parse a block of 0 expressions"
+;  (call-with-input-string ";"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/expr-block lxr 'term))
+;      (syntree=? result (syntree 'block "" '())))))
+;
+;(def-test "dlang/expr-block should parse a block of 1 expression"
+;  (call-with-input-string "1.0;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/expr-block lxr 'term))
+;      (syntree=? result
+;        (syntree 'block ""
+;          (list
+;            (syntree 'number "1.0" '())))))))
+;
+;(def-test "dlang/expr-block should parse a block of 2 expressions"
+;  (call-with-input-string "1.0 2.0;"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (define result (dlang/expr-block lxr 'term))
+;      (syntree=? result
+;        (syntree 'block ""
+;          (list
+;            (syntree 'number "1.0" '())
+;            (syntree 'number "2.0" '())))))))
+;
+;(def-test "dlang/expr-block should error when no terminator found"
+;  (call-with-input-string "1.0 2.0"
+;    (lambda (input)
+;      (define lxr (dlang/lexer input))
+;      (check-exception "Expected a literal"
+;        (dlang/expr-block lxr 'term)))))
+;