X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=gen.icl;h=59d04e477317a228882732a660f70c6ce223a9f5;hb=5133b2b81d244d3f05930481366082a00fc95c3b;hp=a00275d6b5d14047dc2e2d8f7173061d2d7b7562;hpb=8472f6d9507fd0116ac85d02e8ed5566ef8e7980;p=cc1516.git diff --git a/gen.icl b/gen.icl index a00275d..59d04e4 100644 --- a/gen.icl +++ b/gen.icl @@ -121,8 +121,9 @@ instance g Expr where Just (LAB t) = liftT (Left $ Error "PANIC: variable and function name clash") //load k >>= \instr-> tell [instr] //note: pure is pure for list, i.e. [] g (FunExpr _ k es fs) = - mapM g es + mapM_ g es >>| jump "bsr" k + >>| mapM_ (const $ tell [Instr "ajs" [Lit -1] ""]) es //clean up args >>| tell [Instr "ldr" [Raw "RR"] ""] jump :: String String -> Gen () @@ -156,7 +157,9 @@ instance g Stmt where Nothing = liftT (Left $ Error $ concat ["PANIC: ", k, " not found as var"]) Just (LAB t) = liftT (Left $ Error $ "PANIC: cannot assign to function") Just (ADDR t) = tell [Instr "stl" [Lit t] ""] - g (FunStmt k es) = mapM g es >>| jump "bsr" k + g (FunStmt k es) = mapM_ g es + >>| mapM_ (const $ tell [Instr "ajs" [Lit -1] ""]) es //clean up args + >>| jump "bsr" k g (ReturnStmt Nothing) = tell [Instr "unlink" [] ""] >>| tell [Instr "ret" [] ""] g (ReturnStmt (Just e)) = g e