add function dictionary 1func

[cc1516.git] / gen.icl

diff --git a/gen.icl b/gen.icl
index acfdd61..ae1c829 100644 (file)
--- a/gen.icl
+++ b/gen.icl
@@ -33,31 +33,55 @@ FALSE :== 0
 :: SSMProgram :== [Instr]
 :: GenError = Error String
 :: Addressbook :== 'Map'.Map String Address
-:: Address = LAB String | ADDR Int
+:: Address = LAB String Int Int | ADDR Int
 :: Gen a :== RWST () SSMProgram (Addressbook, [Label]) (Either GenError) a
 
 labelStream :: [Label]
 labelStream = ["lbl_" +++ toString i\\i<-[1..]]
 
-defaultAddressBook :: Addressbook 
-defaultAddressBook = extend "print" (LAB "print")
-                        $ extend "read" (LAB "read")
-                        $ extend "isEmpty" (LAB "isEmpty")
-                        'Map'.newMap
+defaultAddressBook :: [FunDecl] -> Addressbook 
+defaultAddressBook fd = extend "1printint" (LAB "1printint" 1 0)
+       $ extend "1printchar" (LAB "1printchar" 1 1)
+       $ extend "read" (LAB "read" 0 2)
+       $ extend "1readint" (LAB "1readint" 0 3)
+       $ extend "isEmpty" (LAB "isempty" 1 4)
+       $ addFuncs fd 5
+       where
+               addFuncs [] _ = 'Map'.newMap
+               addFuncs [(FunDecl _ k args _ _ _):xs] n =
+                       extend k (LAB k (length args) n) $ addFuncs xs (n+1)
 
 gen :: AST -> Either String String
-gen (AST fds) = case evalRWST prog () (defaultAddressBook, labelStream) of
+gen (AST fds) = case evalRWST prog () (defaultAddressBook fds, labelStream) of
             Left (Error e) = Left e
             Right (_, p) = Right $ toString p
     where
         prog = tell [
                        Instr "bsr" [L "main"] "",
                        Instr "halt" [] ""
-                       ] >>| tell programContext
+                       ] >>| tell (programContext fds)
             >>| mapM_ g fds
 
-programContext :: SSMProgram
-programContext =    [Lab "1printint"
+programContext :: [FunDecl] -> SSMProgram
+programContext x = [Lab "1func"
+                               ,Instr "link" [Lit 0] ""
+                               :fS ["1printint" ,"1printchar"
+                                       ,"read" ,"1readint"
+                                       ,"isEmpty":map (\(FunDecl _ k _ _ _ _)->k) x] 0] ++ 
+                               [Instr "unlink" [] ""
+                               ,Instr "ret" [] "":context]
+       where
+
+               fS :: [String] Int -> SSMProgram
+               fS [] _ = []
+               fS [k:xs] n = [
+                        Instr "ldl" [Lit -2] ""
+                       ,Instr "ldc" [Lit n] $ "branch to: " +++ k
+                       ,Instr "eq" [] ""
+                       ,Instr "brt" [L k] ""
+                       :fS xs $ n+1]
+               context :: SSMProgram
+               context =   [Lab "1printint"
                     ,Instr "link" [Lit 0] ""
                     ,Instr "ldl" [Lit -2] "load first argument"
                                        ,Instr "trap" [Lit 0] "print int"
@@ -69,19 +93,13 @@ programContext =    [Lab "1printint"
                                        ,Instr "trap" [Lit 1] "print char"
                     ,Instr "unlink" [] ""
                     ,Instr "ret" [] ""
-                    ,Lab "1readint"
-                    ,Instr "link" [Lit 0] ""
-                                       ,Instr "trap" [Lit 10] "read int"
-                    ,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"
@@ -90,6 +108,7 @@ programContext =    [Lab "1printint"
                     ,Instr "str" [Raw "RR"] ""
                     ,Instr "unlink" [] ""
                     ,Instr "ret" [] ""
+                    ,Lab "read"
                     ]
 
 //helper functions for the gen monad
@@ -157,17 +176,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
@@ -193,7 +215,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
@@ -218,7 +240,6 @@ 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)) >>|
         getAdressbook >>= \oldMap ->
                updateAdressbook (addVars args) >>|
         tell [Lab k] >>|
@@ -227,6 +248,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 ()