X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=3a_asm%2FExpr_eval.hs;fp=3a_asm%2FExpr_eval.hs;h=6074074900b58a791de45ac380607a878c9acb07;hb=0df70b557af4fd0550f0db2aa56fa3d89828d0a2;hp=1b12f4b7b3e1401287e286aa9d9f8ac4d18a7947;hpb=9dd69a23aa1aceb8afc59218daa197fcba49f4b7;p=calu.git

diff --git a/3a_asm/Expr_eval.hs b/3a_asm/Expr_eval.hs
index 1b12f4b..6074074 100644
--- 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"