3a_asm: FIX: parser fail bei labels aufloesen

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

diff --git a/3a_asm/Expr_eval.hs b/3a_asm/Expr_eval.hs
index 6074074900b58a791de45ac380607a878c9acb07..71e0f4de63ae06f083fde358ea8a9bb3a64c758f 100644 (file)
--- a/3a_asm/Expr_eval.hs
+++ b/3a_asm/Expr_eval.hs
@@ -10,6 +10,7 @@ import qualified Text.ParserCombinators.Parsec.Token as P
 import Text.ParserCombinators.Parsec.Language
 import System.IO
 import Data.Word
+import Data.List
 import Data.Bits
 
 lexer :: P.TokenParser ()
@@ -17,7 +18,6 @@ lexer = P.makeTokenParser (haskellDef { reservedOpNames = ["*","/","+","-","<<",
 
 decimal = P.decimal lexer
 hexadecimal = P.hexadecimal lexer
-parens = P.parens lexer
 reservedOp = P.reservedOp lexer
 
 expr :: [DictElem] -> Parser Word32
@@ -48,7 +48,8 @@ factor_spaces d = do
 factor :: [DictElem] -> Parser Word32
 factor d =
        do {
-               parens (expr d);
+               char '('; r <- expr d; char ')';
+               return r
        } <|> do {
                -- define or label
                s <- foldl1 (<|>) (fmap (try . string . fst) d);