X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=gen.icl;h=c8b45d3ab0415ef5863e683e040ec14d25ae4c37;hb=bc78930bacf1a3b835acf68889f178600af0e5d4;hp=71fe1039bccba39fc47e70e0212c14d89d8ad802;hpb=d77201023099377ed4d4559c26d2e02f4f61c114;p=cc1516.git

diff --git a/gen.icl b/gen.icl
index 71fe103..c8b45d3 100644
--- a/gen.icl
+++ b/gen.icl
@@ -5,23 +5,34 @@ import StdMisc
 import StdList
 import StdOverloaded
 import StdString
-
-from Data.Func import $
-from Text import class Text(join), instance Text String
-from Data.List import intersperse
+from StdFunc import id
+import StdTuple
+
+import Data.Func
+import qualified Data.Map as Map
+import Data.List
+import Data.Either
+import Data.Tuple
+import Data.Functor
+import Control.Applicative
+import Control.Monad
+import Control.Monad.State
+import Control.Monad.Trans
+from Text import class Text(concat), instance Text String
 
 import AST
 
 //Instruction is an instruction, with possible arguments and a possible comment
 //Or is a label
 :: Instr    = Instr String [Arg] String
-            | Label String
-:: Arg = L String | Lit Int
+            | Lab String
+:: Label :== String
+:: Arg = L Label | Lit Int
 :: SSMProgram :== [Instr]
 
 
 gen :: AST -> String
-gen _ = toString    [Label "Test"
+gen _ = toString    [Lab "Test"
                     ,Instr "ldc" [Lit 1] "Eerste instructie"
                     ,Instr "ldc" [Lit 2] "Tweede instructie"]
 
@@ -30,17 +41,42 @@ gen _ = toString    [Label "Test"
 //i.e. to figure out the positions of vars relative to the 
 //SP/MP/whatever or in which register they are 
 //and to supply with fresh labels 
-class g a :: a -> SSMProgram
 
-instance g Expr where
-    g _ = undef
+//The generation monad
+:: GenError = Error String
+:: GenMap :== 'Map'.Map String LoadPlace
+:: LoadPlace    = LDA Int | LDC Int | LDH Int | LDL Int 
+                | LDR Int | LDS Int
+:: Gen a :== StateT (GenMap, [Label]) (Either GenError) a
 
+genMap :: Gen GenMap
+genMap = gets fst
 
+class g a :: a -> Gen SSMProgram
+
+instance g Expr where
+    g (VarExpr _ (VarDef k fs)) = pure <$> load k //note: pure is pure for list, i.e. []
+
+load :: String -> Gen Instr
+load k = genMap >>= \g-> case 'Map'.member k g of
+    False = liftT (Left $ Error $ concat ["PANIC: ", k, " not found in variable mapping"])
+    True = loadP $ 'Map'.find k g
+
+loadP :: LoadPlace -> Gen Instr
+loadP pl = dec pl >>= \(instr, arg)-> pure $ Instr instr [arg] ""
+where
+    dec (LDA i) = pure ("lda", Lit i)
+    dec (LDC i) = pure ("ldc", Lit i)
+    dec (LDH i) = pure ("ldh", Lit i)
+    dec (LDL i) = pure ("ldl", Lit i)
+    dec (LDR i) = pure ("ldr", Lit i)
+    dec (LDS i) = pure ("lds", Lit i)
+    dec _       = liftT (Left $ Error "PANIC: trying to load non adres")
 
 class print a :: a -> [String]
 
 instance print Instr where
-    print (Label l) = [l, ":", "\n"]
+    print (Lab l) = [l, ":", "\n"]
     print (Instr i args com) = ["\t", i] ++ print args ++ [" ;", com, "\n"]
 
 instance print [Arg] where
@@ -51,4 +87,7 @@ instance toString Arg where
     toString (Lit int) = toString int
 
 instance toString SSMProgram where
-    toString p = join " " $ map (\i-> join " " $ print i) p
\ No newline at end of file
+    toString p = concat $ intersperse " " $ map (\i-> concat $ intersperse " " $ print i) p
+
+instance MonadTrans (StateT (GenMap,[Label])) where
+    liftT m = StateT \s-> m >>= \a-> return (a, s)
\ No newline at end of file