Changeset 6801 for src/Pugs/CodeGen/PIR.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/CodeGen/PIR.hs (modified) (4 diffs)

src/Pugs/CodeGen/PIR.hs

@@ -106 +106 @@
         tellLabel endL
         return (ExpLV this)
-    trans (PCode styp params _ body) = do
+    trans (PCode styp params _ _ body) = do
         [begL, endL] <- genLabel ["blockBegin", "blockEnd"]
         this    <- genPMC "block"
@@ -126 +126 @@
 
 instance Translate PIL_Decl Decl where
-    trans (PSub name styp params lvalue body) | Just (pkg, name') <- isQualified name = do
-        declC <- trans $ PSub name' styp params lvalue body
+    trans (PSub name styp params lvalue ismulti body) | Just (pkg, name') <- isQualified name = do
+        declC <- trans $ PSub name' styp params lvalue ismulti body
         return $ DeclNS pkg [declC]
-    trans (PSub name styp params _ body) = do
+    trans (PSub name styp params _ _ body) = do
         (_, stmts)  <- listen $ do
             let prms = map tpParam params
@@ -186 +186 @@
         tellIns $ lhsC <:= rhsC
         return lhsC
-    trans (PApp _ exp@(PCode _ _ _ _) Nothing []) = do
+    trans (PApp _ exp@(PCode _ _ _ _ _) Nothing []) = do
         blockC  <- trans exp
         tellIns $ [reg tempPMC] <-& blockC $ []
@@ -383 +383 @@
             , InsNew tempPMC PerlScalar
             , "store_global"    .- [lit "$_", tempPMC]
-            ]) ++ [ StmtRaw (text (name ++ "()")) | PSub name@('_':'_':_) _ _ _ _ <- pilGlob penv ] ++
+            ]) ++ [ StmtRaw (text (name ++ "()")) | PSub name@('_':'_':_) _ _ _ _ _ <- pilGlob penv ] ++
             [ StmtRaw (text "main()")
             , StmtIns $ tempPMC  <-- "find_global" $ [lit "Perl6::Internals", lit "&exit"]