Simpler tokenizer

1 files changed, 3 insertions, 3 deletions

diff --git a/parser.fun b/parser.fun
index b571a40..15134a8 100644
--- a/parser.fun
+++ b/parser.fun
@@ -92,7 +92,7 @@ functor Parser(P: PPC): PARSER = struct
   datatype expr =
     Enum |
     Eid of int |
-    Estrlit of string |
+    Estrlit of int |
     EmemberByV of int * exprAug |
     EmemberByP of int * exprAug |
     EfuncCall of exprAug * exprAug list |
@@ -254,7 +254,7 @@ functor Parser(P: PPC): PARSER = struct
       case e of
         Eid id => Printf out P.?id P %
       | Enum => Printf out `"num" P %
-      | Estrlit s => Printf out `"\"" `s `"\"" P %
+      | Estrlit s => Printf out P.?s P %
       | EmemberByV pair => member pair "."
       | EmemberByP pair => member pair "->"
       | EfuncCall (func, args) => (
@@ -399,7 +399,7 @@ functor Parser(P: PPC): PARSER = struct
   in
     case tk of
       Tk (T.Id id) => wrap $ Eid id
-    | Tk (T.StringConst s) => wrap $ Estrlit s
+    | Tk (T.Strlit id) => wrap $ Estrlit id
     | Tk (T.CharConst _) => raise Unimplemented
     | Tk (T.Num _) => wrap Enum
     | TkParens list =>