fixed printing:)

[cc1516.git] / gen.icl

diff --git a/gen.icl b/gen.icl
index efa8fa3..6020d03 100644 (file)
--- a/gen.icl
+++ b/gen.icl
@@ -33,17 +33,18 @@ FALSE :== 0
 :: SSMProgram :== [Instr]
 :: GenError = Error String
 :: Addressbook :== 'Map'.Map String Address
-:: Address = LAB String | ADDR Int
+:: Address = LAB String Int | ADDR Int
 :: Gen a :== RWST () SSMProgram (Addressbook, [Label]) (Either GenError) a
 
 labelStream :: [Label]
 labelStream = ["lbl_" +++ toString i\\i<-[1..]]
 
 defaultAddressBook :: Addressbook 
-defaultAddressBook = extend "1printint" (LAB "1printint")
-       $ extend "1printchar" (LAB "1printchar")
-       $ extend "1readchar" (LAB "1readchar")
-       $ extend "1readint" (LAB "1readint")
+defaultAddressBook = extend "1printint" (LAB "1printint" 1)
+       $ extend "1printchar" (LAB "1printchar" 1)
+       $ extend "read" (LAB "read" 0)
+       $ extend "1readint" (LAB "1readint" 0)
+       $ extend "isEmpty" (LAB "isempty" 1)
        'Map'.newMap
 
 gen :: AST -> Either String String
@@ -76,13 +77,13 @@ programContext =    [Lab "1printint"
                     ,Instr "str" [Raw "RR"] ""
                     ,Instr "unlink" [] ""
                     ,Instr "ret" [] ""
-                    ,Lab "1readchar"
+                    ,Lab "read"
                     ,Instr "link" [Lit 0] ""
                                        ,Instr "trap" [Lit 11] "read char"
                     ,Instr "str" [Raw "RR"] ""
                     ,Instr "unlink" [] ""
                     ,Instr "ret" [] ""
-                    ,Lab "isEmpty"
+                    ,Lab "isempty"
                     ,Instr "link" [Lit 0] ""
                     ,Instr "ldl" [Lit -2] "load prt to list"
                     ,Instr "lda" [Lit 0] "derefrence ptr"
@@ -91,6 +92,7 @@ programContext =    [Lab "1printint"
                     ,Instr "str" [Raw "RR"] ""
                     ,Instr "unlink" [] ""
                     ,Instr "ret" [] ""
+                    ,Lab "read"
                     ]
 
 //helper functions for the gen monad
@@ -158,17 +160,20 @@ instance g Expr where
                >>| tell [Instr "ajs" [Lit -1] ""]
     g (VarExpr _ (VarDef k fs)) = getAdressbook >>= \ab->case 'Map'.get k ab of
                Just (ADDR t) = tell [Instr "ldl" [Lit t] ""] >>| mapM_ g fs >>| pure ()
-               _ = liftT (Left $ Error "PANIC: variable and function name clash")
-    g (FunExpr _ k es fs) = 
-               mapM_ g es
-               >>| jump "bsr" k
-        >>| mapM_ (const $ tell [Instr "ajs" [Lit -1] ""]) es //clean up args
-               >>| tell [Instr "ldr" [Raw "RR"] ""]
+               _ = liftT (Left $ Error "Higher order functions not implemented")
+    g (FunExpr _ k es fs) = getAdressbook >>= \ab->case 'Map'.get k ab of
+               Just (LAB l arity) = if (arity <> (length es))
+                       (liftT $ Left $ Error "Higher order functions not implemented")
+                       (       mapM_ g es
+                               >>| jump "bsr" k
+                       >>| mapM_ (const $ tell [Instr "ajs" [Lit -1] ""]) es //clean up args
+                               >>| tell [Instr "ldr" [Raw "RR"] ""])
+               _ = liftT (Left $ Error "Funcall to variable?")
 
 jump :: String String -> Gen ()
 jump instr k = getAdressbook >>= \ab->case 'Map'.get k ab of
        Nothing = liftT (Left $ Error $ concat ["PANIC: ", k, " not found as function"])
-       Just (LAB t) = tell [Instr instr [L t] (k +++"()")]
+       Just (LAB t _) = tell [Instr instr [L t] (k +++"()")]
        Just (ADDR t) = liftT (Left $ Error $ "PANIC: jump should go to label")
 
 instance g Stmt where
@@ -194,7 +199,7 @@ instance g Stmt where
     g (AssStmt (VarDef k fs) e) = 
         g e >>| getAdressbook >>= \ab->case 'Map'.get k ab of
             Nothing = liftT (Left $ Error $ concat ["PANIC: ", k, " not found as var"])
-            Just (LAB t) = liftT (Left $ Error $ "PANIC: cannot assign to function")
+            Just (LAB t _) = liftT (Left $ Error $ "PANIC: cannot assign to function")
             Just (ADDR t) = tell [Instr "stl" [Lit t] ""]
     g (FunStmt k es fs) = mapM_ g es 
         >>| jump "bsr" k
@@ -219,7 +224,7 @@ addVars [x:xs] = \ab->extend x (ADDR (-2 - (length xs))) (addVars xs ab)
 instance g FunDecl where
     g (FunDecl _ k args _ vds stms) = 
         //varDecls can call the enclosing function, so first reserve a label for it 
-        updateAdressbook (extend k (LAB k)) >>|
+        updateAdressbook (extend k (LAB k (length args))) >>|
         getAdressbook >>= \oldMap ->
                updateAdressbook (addVars args) >>|
         tell [Lab k] >>|
@@ -228,6 +233,8 @@ instance g FunDecl where
         foldM foldVarDecl 1 vds  >>|
         //and the statements
         mapM_ g stms >>|
+               //Ugly hack to always return
+               g (ReturnStmt Nothing) >>|
         updateAdressbook (const oldMap) >>| pure ()
 
 annote :: Int String -> Gen ()