Changeset 5266

Timestamp:

07/07/05 07:44:01 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

7266

Message:

* Finish the transition from @?CHECK and @?INIT to

@*CHECK and @*INIT.

Location:

src

Files:

• Main.hs (modified) (1 diff)
• Pugs/Compile/Pugs.hs (modified) (1 diff)
• Pugs/Parser.hs (modified) (4 diffs)

src/Main.hs

@@ -89 +89 @@
 --   "-e foo bar.p6" executes "foo" with @*ARGS[0] eq "bar.p6",
 --   "-E foo bar.p6" executes "foo" and then bar.p6.
+-- XXX - Wrong -- Need to preserve environment across -E runs
 run (("-E"):prog:rest)          = run ("-e":prog:[]) >> run rest
 run ("-":args)                  = do doRun "-" args =<< readStdin

src/Pugs/Compile/Pugs.hs

@@ -75 +75 @@
 
 instance Compile (String, [(TVar Bool, TVar VRef)]) where
-    compile ((_:'?':_), _) = return empty -- XXX - @?INIT etc; punt for now
+    compile ((_:'?':_), _) = return empty -- XXX - @?S etc; punt for now
+    compile ((_:'*':_), _) = return empty -- XXX - @*INIT etc; punt for now
     compile ((_:'=':_), _) = return empty -- XXX - @=POS etc; punt for now
     compile (n, tvars) = do

src/Pugs/Parser.hs

@@ -680 +680 @@
 
 vcode2initBlock :: Val -> RuleParser Exp
-vcode2initBlock code = vcode2initOrCheckBlock "@?INIT" True code
+vcode2initBlock code = vcode2initOrCheckBlock "@*INIT" True code
 
 vcode2checkBlock :: Val -> RuleParser Exp
-vcode2checkBlock code = vcode2initOrCheckBlock "@?CHECK" False code
+vcode2checkBlock code = vcode2initOrCheckBlock "@*CHECK" False code
 
 vcode2initOrCheckBlock :: String -> Bool -> Val -> RuleParser Exp
@@ -689 +689 @@
     -- Similar as with FIRST {...}, we transform our input:
     -- my $x = INIT { 42 }   is transformed into
-    -- BEGIN { push @?INIT, { FIRST { 42 } } }; my $x = @?INIT[(index)]();
+    -- BEGIN { push @*INIT, { FIRST { 42 } } }; my $x = @*INIT[(index)]();
     -- Or, with CHECK:
     -- my $x = CHECK { 42 }  is transformed into
-    -- BEGIN { push @?CHECK, { FIRST { 42 } } }; my $x = @?CHECK[(index)]();
+    -- BEGIN { push @*CHECK, { FIRST { 42 } } }; my $x = @*CHECK[(index)]();
     -- This is the inner FIRST {...} block we generate.
     body <- vcode2firstBlock code
@@ -698 +698 @@
                       | otherwise   = checkForIOLeak
     rv <- unsafeEvalExp $
-        -- BEGIN { push @?INIT, { FIRST {...} } }
+        -- BEGIN { push @*INIT, { FIRST {...} } }
         App (Var "&push") (Just $ Var magicalVar)
             [ Syn "sub" [ Val $ VCode mkSub { subBody = possiblyCheck body }]]
@@ -704 +704 @@
     let (Val (VInt elems)) = rv
     -- Finally, we can return the transformed expression.
-    -- elems is the new number of elems in @?INIT (as push returns the new
+    -- elems is the new number of elems in @*INIT (as push returns the new
     -- number of elems), but we're interested in the index, so we -1 it.
     return $ App (Syn "[]" [Var magicalVar, Val . VInt $ elems - 1]) Nothing []