Changeset 22179

Timestamp:

09/07/08 14:05:38 (3 months ago)

Author:

pmurias

Message:

[pugs-m0ld] basic functions calls with only positionals and integer literals

Files:

• src/Pugs/CodeGen/M0ld.hs (modified) (4 diffs)

src/Pugs/CodeGen/M0ld.hs

@@ -13 +13 @@
     return $ "$id"++(show id)
 void = "$void"
+placeholder other r = return $ "my "++ r ++ " = " ++ (show other) ++ "; #placeholder\n"
 
 class EmitM0ld a where
@@ -32 +33 @@
     emit statement r = case statement of 
         PPos {pNode=stmt}  -> emit stmt r
-        PNoop              -> return "; #noop\n"
+        PNoop              -> return "#noop\n"
         PStmt {pExpr=expr} -> emit expr r
 
@@ -45 +46 @@
                 ++ void ++ " = $interpreter.\"return\"(" ++ ret ++ ");\n"
                 ++ "});\n")
+        PLit {pLit=lit} -> emit lit r
+        other -> placeholder other r
+
+instance EmitM0ld PIL_Literal where
+    emit PVal {pVal=val} r = emit val r
+
+instance EmitM0ld Val where
+    emit (VInt int) r = return $ "my " ++ r ++ " = " ++ (show int) ++ ";\n"
+    emit other r = placeholder other r
 
 instance EmitM0ld PIL_LValue where
@@ -51 +61 @@
             fun_r <- uniqueId
             fun_code <- emit fun fun_r
-            return (fun_code ++ "my " ++ r ++ " = " ++ fun_r ++ ".\"postcircumfix:( )\"(" ++ (show args) ++ ");\n")
-        PApp {pFun=fun,pArgs=args,pInv=Just inv} -> do
-            inv <- emit inv r
-            fun <- emit fun r
-            return (inv ++ ".(" ++ fun ++ ")(" ++ (show args) ++ ")")
+            args <- mapM (\arg -> do
+                id <- uniqueId
+                code <- emit arg id
+                return (code,id)) args
+            return (fun_code ++ (concat $ fmap fst args) ++ "my " ++ r ++ " = " ++ fun_r ++ ".\"postcircumfix:( )\"(" ++ (concat $ fmap snd args) ++ ");\n")
         PVar {pVarName=name} -> do
             return $ "my " ++ r ++ " = $scope.\"postcircumfix:{ }\"(\"" ++ name ++ "\");\n"
-        other -> return $ show other 
+        other -> return $ (show other) ++ ";\n"
 
 genM0ld :: FilePath -> Eval Val
 genM0ld filepath = do
     penv <- compile () :: Eval PIL_Environment
-    return $ VStr $ (evalState (emit penv void) 0) ++ "\n"
+    return $ VStr $ (evalState (emit penv void) 0)