3a_asm: 'nicer' fix for ldil vs. ldilt fail

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

diff --git a/3a_asm/Main.hs b/3a_asm/Main.hs
index d62fe17360220692b8defa51d7e7495b49dd2a71..8160012fd09585ae1191b745804bcb996c57e596 100644 (file)
--- a/3a_asm/Main.hs
+++ b/3a_asm/Main.hs
@@ -173,9 +173,12 @@ lf_data d = do
        repeat <- try (do {size <- many1 $ noneOf "\n;,"; char ','; return $ size}) <|> return "1"
        -- TODO: atm 32bit imm only
        code <- many1 $ noneOf "\n;"
-       -- TODO: this is quite ugly here :/
-       let (Right val) = parse (parseConst d) "" code
-       let (Right r) = parse (parseConst d) "" repeat
+       let val = case parse (parseConst d) "" code of
+               Right v -> v
+               Left err -> error $ show err
+       let r = case parse (parseConst d) "" repeat of
+               Right v -> v
+               Left err -> error $ show err
        comment <- try(parseComment) <|> parseMySpaces
        return $ DTF_Fill r val (fill ++ (if repeat == "1" then "" else repeat) ++ code) l comment