completed chapter 2

unison/lexer.u

@@ -26,27 +26,27 @@ Lexer.lexer str =
     loop tup =
         (str, tokens) = tup 
         match str with 
-        "" -> tokens
-        lex -> processText str tokens |> loop
+            "" -> tokens
+            lex -> processText str tokens |> loop
     loop (str, [])
 
 Lexer.processText : Text -> [Token] -> (Text, [Token])
 Lexer.processText str tokens = 
     (ch, txt) = Text.uncons str |> Optional.getOrElse (?\NUL, "")
-    match ch with
-        x
-            | isWhitespace x -> (txt, tokens)
-            | x == ?= -> identEquals txt tokens
-            | x == ?! -> identNotEqual txt tokens
-            | isLetter(x) -> 
-                (var, rem) = identChar txt
-                val = fromCharList([ch]) ++ var
-                (rem, tokens :+ keyWords(val) )
-            | isDigit(x) -> 
-                (var, rem) = identNum txt
-                num = fromCharList([ch]) ++ var
-                (rem, tokens :+ Int num)
-        _ ->(txt, tokens :+ nextToken(ch))
+    match ch with 
+    _
+        | isWhitespace ch -> (txt, tokens)
+        | ch == ?= -> identEquals txt tokens
+        | ch == ?! -> identNotEqual txt tokens
+        | isLetter(ch) -> 
+            (var, rem) = identChar txt
+            val = fromCharList([ch]) ++ var
+            (rem, tokens :+ keyWords(val) )
+        | isDigit(ch) -> 
+            (var, rem) = identNum txt
+            num = fromCharList([ch]) ++ var
+            (rem, tokens :+ Int num)
+        | otherwise ->(txt, tokens :+ nextToken(ch))
 
 Lexer.identEquals : Text -> [Token] -> (Text, [Token])
 Lexer.identEquals str tokens =
@@ -79,3 +79,9 @@ Lexer.identNum str =
 Lexer.isLetter : Char -> Boolean
 Lexer.isLetter ch =
     ((?a <= ch) && (ch <= ?z)) || ((?A <= ch) && (ch <= ?Z)) || (ch == ?_)
+
+Test.testFile : '{IO, Exception} [Token]
+Test.testFile = do
+    path = FilePath "test.txt"
+    tokens = lexer << getText <| open path Read
+    tokens :+ Eof

unison/main.u

@@ -1,4 +1,4 @@
-
+---
 Test.test : '{IO, Exception} Boolean
 Test.test = do
     result = lexer """let five = 5;
@@ -45,8 +45,3 @@ Test.test = do
     result === expect
 
 
-Test.testFile : '{IO, Exception} [Token]
-Test.testFile = do
-    path = FilePath "test.txt"
-    tokens = lexer << getText <| open path Read
-    tokens :+ Eof

unison/parTest.txt

@@ -1 +1,3 @@
-foobar;
+a + add(b * c) + d;
+add(a, b, 1, 2 * 3, 4 + 5, add(6, 7 * 8));
+add(a + b + c * d / f + g);