3a_asm: using Expr in both stages

[calu.git] / 3a_asm / Expr_eval.hs

diff --git a/3a_asm/Expr_eval.hs b/3a_asm/Expr_eval.hs
index 1b12f4b7b3e1401287e286aa9d9f8ac4d18a7947..6074074900b58a791de45ac380607a878c9acb07 100644 (file)
--- a/3a_asm/Expr_eval.hs
+++ b/3a_asm/Expr_eval.hs
@@ -1,4 +1,4 @@
-module Expr_eval (expr) where
+module Expr_eval (expr, testExpr) where
 
 import DTFormat
 
@@ -53,11 +53,11 @@ factor d =
                -- define or label
                s <- foldl1 (<|>) (fmap (try . string . fst) d);
                return $ (get_elem s d)
-       } <|> do {
+       } <|> try (do {
                string "0";
                r <- hexadecimal;
                return $ fromInteger r
-       } <|> do {
+       } ) <|> do {
                r <- decimal;
                return $ fromInteger r
        } <?> "factor"