Changeset 10715

Timestamp:

06/16/06 10:26:34 (2 years ago)

Author:

audreyt

Message:

* $?SUBNAME is no more (not since tokyo hackathon); use

&?ROUTINE.name instead. Also &?SUB is now &?ROUTINE
since it works in methods too.

Files:

• src/Pugs/Monads.hs (modified) (2 diffs)
• src/Pugs/Parser.hs (modified) (1 diff)
• t/magicals/subname.t (modified) (1 diff)
• t/subroutines/pointy.t (modified) (1 diff)

src/Pugs/Monads.hs

@@ -272 +272 @@
             subRec <- sequence
                 [ genSym "&?ROUTINE" (codeRef (orig sub))
-                , genSym "$?SUBNAME" (scalarRef $ VStr $ subName sub)]
             -- retRec    <- genSubs env "&return" retSub
             callerRec <- genSubs env "&?CALLER_CONTINUATION" (ccSub cc)
@@ -280 +279 @@
                 , envOuter   = maybe Nothing envOuter (subEnv sub)
                 , envImplicit= envImplicit e `Map.union` Map.fromList
-                    [ ("&?ROUTINE", ()), ("$?SUBNAME", ()), ("&?CALLER_CONTINUATION", ()) ]
+                    [ ("&?ROUTINE", ()), ("&?CALLER_CONTINUATION", ()) ]
                 }
     ccSub :: (Val -> Eval Val) -> Env -> VCode

src/Pugs/Parser.hs

@@ -632 +632 @@
     optional (string "v" <|> string "Perl-")
     version <- many1 (choice [ digit, char '.' ])
-    optional ruleAuthorPart
+    optional $ do
+        variant <- ruleAuthorPart
+        {-
+        when (map toLower variant /= "pugs") $ do
+            pos <- getPosition
+            error $ "Perl implementation " ++ tail variant ++ " required--this is only Pugs v" ++ versnum ++ ", stopped at " ++ (show pos)
+        -}
     return version
 

t/magicals/subname.t

@@ -7 +7 @@
 
 
-# L<S06/"The &?SUB routine" /contains the name of the current subroutine/>
-# L<S02/"Names" /Which sub name am I in/>
-sub foo { return $?SUBNAME } 
-is(foo(), '&main::foo', 'got the right subname');
+# L<S06/"The &?ROUTINE object" /current routine name/>
+# L<S02/"Names" /Which routine am I in/>
+sub foo { return &?ROUTINE.name }
+is(foo(), '&main::foo', 'got the right routine name');
 
-my $bar = sub { return $?SUBNAME };
-is($bar(), '<anon>', 'got the right subname (anon-block)');
+my $bar = sub { return &?ROUTINE.name };
+is($bar(), '<anon>', 'got the right routine name (anon-block)');
 
-my $baz = try { $?SUBNAME };
-ok(not(defined $baz), '$?SUBNAME not defined outside of a sub');
+my $baz = try { &?ROUTINE.name };
+ok(not(defined $baz), '&?ROUTINE.name not defined outside of a routine');

t/subroutines/pointy.t

@@ -65 +65 @@
 sub outer {  
     my $s = -> { 
-        is($?SUBNAME, '&main::outer', 'pointy still sees outer\'s $?SUBNAME'); 
+        is(&?ROUTINE.name, '&main::outer', 'pointy still sees outer\'s &?ROUTINE'); 
 
         $str ~= 'inner';