curry gotcha

[cc1516.git] / gen.icl

diff --git a/gen.icl b/gen.icl
index 3dd4399..87e4f8e 100644 (file)
--- a/gen.icl
+++ b/gen.icl
@@ -337,7 +337,7 @@ instance g Stmt where
             Just (ADDR t ar) = case fs of 
                 []  = tell [Instr "stl" [Lit t] ""]
                 _   = tell [Instr "ldl" [Lit t] ""]
-                        >>| mapM_ followFs fs
+                        >>| followFs fs
                         >>| tell [Instr "sta" [Lit 0] ""]
     g (FunStmt k es fs) = funnyStuff k es fs
     g (ReturnStmt Nothing) = tell [Instr "unlink" [] ""]
@@ -348,13 +348,20 @@ instance g Stmt where
 
 //expects the heap address to the var to slect on to be on the stack
 //and leaves the heap adress to write to on the stack
-followFs :: FieldSelector -> Gen()
-followFs FieldHd = tell [Instr "ldc" [Lit 1] "select hd"
-                        ,Instr "sub" [] "select hd"]
-followFs FieldTl = tell []
-followFs FieldFst = tell [Instr "ldc" [Lit 1] "select fst"
-                         ,Instr "sub" [] "select fst"]
-followFs FieldSnd = tell []
+followFs :: [FieldSelector] -> Gen()
+followFs [] = tell []
+followFs [FieldHd:fs]   = tell [Instr "ldc" [Lit 1] "select hd"
+                             ,Instr "sub" [] "select hd"]
+                            >>| followFs fs
+followFs [FieldTl]      = tell []
+followFs [FieldTl:fs]   = tell [Instr "lda" [Lit 0] ""]
+                            >>| followFs fs
+followFs [FieldFst:fs]  = tell [Instr "ldc" [Lit 1] "select fst"
+                                ,Instr "sub" [] "select fst"]
+                            >>| followFs fs
+followFs [FieldSnd]     = tell []
+followFs [FieldSnd:fs]  = tell [Instr "lda" [Lit 0] ""]
+                            >>| followFs fs
 
 foldVarDecl :: Int VarDecl -> Gen Int
 foldVarDecl x (VarDecl _ mt k e) = g e