Changeset 6801 for src/Pugs/Compile.hs

Timestamp:

09/06/05 17:00:17 (3 years ago)

Author:

iblech

Message:

* Usual svn props.
* t/var/constant.t: Minor fixes.
* Pugs.PIL1, Pugs.Compile: PSub and PCode contain a p[Sub]?IsMulti? field now,

so PIL2JS and PIL-Run can know which subs are multis and which subs are not.

* Pugs.CodeGen?.PIR: Accomodate for the above change.
* PIL2JS: (Simple) multi subs!

• PIL2JS.js: If necessary, try to call all .variants of a multi to find out whether the parameters match the sub signature. (Hack)
• PIL::Subs: Emit appropriate code for multis --

multi foo {...} # is compiled as
our &foo ::= PIL2JS.new_multi(); &foo.add_variant({...});

* Test.pm: Removed the skip_rest_anti_multi-hack which was previously needed

for PIL2JS. :)

Files:

• src/Pugs/Compile.hs (modified) (6 diffs)

src/Pugs/Compile.hs

@@ -105 +105 @@
                 name' | ':' `elem` name = name
                       | otherwise = "main::" ++ name -- XXX wrong
-            return [PSub initL SubPrim [] False bodyC]
+            return [PSub initL SubPrim [] False False bodyC]
         canCompile _ = return []
         doCode name vsub = case subBody vsub of
@@ -117 +117 @@
     compile (name, decls) = do
         let bodyC = [ PStmts . PStmt . PExp $ PApp tcVoid (PExp (PVar sub)) Nothing []
-                    | PSub sub _ _ _ _ <- decls
+                    | PSub sub _ _ _ _ _ <- decls
                     ]
-        return (PSub name SubPrim [] False (combine bodyC PNil):decls)
+        return (PSub name SubPrim [] False False (combine bodyC PNil):decls)
 
 instance Compile (SubName, VCode) [PIL_Decl] where
@@ -126 +126 @@
             bodyC   = PStmts (PStmt . PExp $ storeC) PNil
             exportL = "__export_" ++ (render $ varText name)
-        return [PSub exportL SubPrim [] False bodyC]
+        return [PSub exportL SubPrim [] False False bodyC]
     compile (name, vsub) = do
         bodyC   <- enter cxtItemAny . compile $ case subBody vsub of
@@ -132 +132 @@
             body                -> body
         paramsC <- compile $ subParams vsub
-        return [PSub name (subType vsub) paramsC (subLValue vsub) bodyC]
+        return [PSub name (subType vsub) paramsC (subLValue vsub) (isMulti vsub) bodyC]
 
 instance Compile (String, [(TVar Bool, TVar VRef)]) PIL_Expr where
@@ -236 +236 @@
 
 pBlock :: PIL_Stmts -> PIL_Expr
-pBlock = PCode SubBlock [] False
+pBlock = PCode SubBlock [] False False
 
 {-
@@ -372 +372 @@
             exp                 -> exp
         paramsC <- compile $ subParams sub
-        return $ PCode (subType sub) paramsC (subLValue sub) bodyC
+        return $ PCode (subType sub) paramsC (subLValue sub) (isMulti sub) bodyC
     compile (Syn "module" _) = compile Noop
     compile (Syn "match" exp) = compile $ Syn "rx" exp -- wrong