Changeset 3443 for src/Pugs/Parser.hs

Timestamp:

05/19/05 17:57:17 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5016

Message:

* We have OUTER:: scope now.
* Closure (VCode) now captures over the entire Env, instead

of just the envLexical slot. This is currently only used to

restore the original OUTER

scope when calling a subroutine, but once we switch to oleg's CC_2CPST for Eval monad, this will get us rubyish coroutines (and serialised subcontinuations) for free.

Files:

• src/Pugs/Parser.hs (modified) (3 diffs)

src/Pugs/Parser.hs

@@ -331 +331 @@
             { isMulti       = isMulti
             , subName       = name'
-            , subPad        = envLexical env
+            , subEnv        = Just env
             , subType       = if isMethod then SubMethod else SubRoutine
             , subAssoc      = "pre"
@@ -439 +439 @@
                     { isMulti       = False
                     , subName       = name
-                    , subPad        = mkPad [] -- XXX really?
+                    , subEnv        = Nothing
                     , subReturns    = if null typ then typeOfSigil sigil else mkType typ
                     , subBody       = fun
@@ -761 +761 @@
     unless (isNothing formal || null names) $ 
         fail "Cannot mix placeholder variables with formal parameters"
+    env <- getState
     let sub = MkCode
             { isMulti       = False
             , subName       = "<anon>"
-            , subPad        = mkPad []
+            , subEnv        = Just env
             , subType       = typ
             , subAssoc      = "pre"