Changeset 7901

Timestamp:

11/07/05 20:38:21 (3 years ago)

Author:

iblech

Message:

* t/builtins/numify.t: Added Larry's testcase posted to p6c (link to

nntp.perl.org included in the test).

* t/var/caller.t: "my $a is env" is spelled "env $a" now, according to latest S02 (r6537).
* Pugs.Parser: "+" is a valid twigil now.
* Pugs.AST.Scope, Pugs.Lexer: Added SEnv.

Files:

• src/Pugs/AST/Scope.hs (modified) (1 diff)
• src/Pugs/Lexer.hs (modified) (1 diff)
• src/Pugs/Parser.hs (modified) (1 diff)
• t/builtins/numify.t (modified) (2 diffs)
• t/var/caller.t (modified) (7 diffs)

src/Pugs/AST/Scope.hs

@@ -9 +9 @@
            | SLet    -- ^ Hypotheticalised (reverted upon failure)
            | STemp   -- ^ Temporary (reverted at scope exit)
+           | SEnv    -- ^ Environment (declared with @env@)
            | SMy     -- ^ Lexical
            | SOur    -- ^ Package

src/Pugs/Lexer.hs

@@ -275 +275 @@
     readScope "let"     = SLet
     readScope "temp"    = STemp
+    readScope "env"     = SEnv
     readScope _         = SGlobal
 

src/Pugs/Parser.hs

@@ -1977 +1977 @@
 
 ruleTwigil :: RuleParser String
-ruleTwigil = option "" . choice . map string $ words " ^ * ? . : "
+ruleTwigil = option "" . choice . map string $ words " ^ * ? . : + "
 
 ruleMatchPos :: RuleParser String

t/builtins/numify.t

@@ -4 +4 @@
 use Test;
 
-plan 37;
+plan 40;
 
 is(int('-1.999'), -1, "int('-1.999') is -1");
@@ -11 +11 @@
 is(int('0o678'), 0o67, "int('0o678') is 0o67");
 is(int('3e4d5'), 3e4, "int('3e4d5') is 3e4");
+
+# Per Larry: http://www.nntp.perl.org/group/perl.perl6.compiler/1134
+is(+'0012', 12, "+'0012' is 12");
+is(+'0000',  0, "+'0000' is  0");
+is(+'000a',  0, "+'000a' is  0 (illegal number)");
 
 is(+'1.9e3', 1900, "+'1.9e3' is 1900");

t/var/caller.t

@@ -4 +4 @@
 use Test;
 
-plan 8;
+plan 17;
 
 {
-  my $a is env = 9;
+  env $a = 9;
   my $sub = sub { $CALLER::a };
 
@@ -17 +17 @@
 
 {
-  my $a is env = 9;
+  env $a = 9;
   my $sub2 = sub { $CALLER::a };
   my $sub1 = sub {
-    my $a is env = 10;
+    env $a = 10;
     $sub2();
   };
 
   {
-    my $a = 11;
+    env $a = 11;
     is $sub1(), 10, '$CALLER:: with nested subs works';
-  }
-}
-
-{
-  my $a is env = 9;
-  my $sub2 = sub { $CALLER::a };
-  my $sub1 = sub ($a is env) {
-    $sub2();
-  };
-
-  {
-    my $a = 11;
-    is $sub1(15), 15, '$CALLER:: works when accessing subparams, too';
   }
 }
@@ -46 +33 @@
   my $get_caller = sub { return sub { $CALLER::CALLER::a } };
   my $sub1 = sub {
-    my $a is env = 3;
+    env $a = 3;
     $get_caller();
   };
   my $sub2 = sub {
-    my $a is env = 5;
+    env $a = 5;
     $get_caller();
   };
@@ -65 +52 @@
 # L<S02/"Names" /The CALLER package refers to the lexical scope/>
 {
-  # $_ is always implicitly declared "is env".
+  # $_ is always implicitly declared "env".
   my sub foo () { $CALLER::_ }
   my sub bar () {
@@ -73 +60 @@
 
   $_ = 23;
-  is bar(), 42, '$_ is implicitly declared "is env" (1)';
+  is bar(), 42, '$_ is implicitly declared "env" (1)';
 }
 
 {
-  # $_ is always implicitly declared "is env".
+  # $_ is always implicitly declared "env".
   # (And, BTW, $_ is lexical.)
   my sub foo () { $_ = 17; $CALLER::_ }
@@ -86 +73 @@
 
   $_ = 23;
-  is bar(), 42, '$_ is implicitly declared "is env" (2)';
+  is bar(), 42, '$_ is implicitly declared "env" (2)';
 }
 
 {
   # ...but other vars are not
-  my sub foo { my $abc = 17; $CALLER::_ }
+  my sub foo { my $abc = 17; $CALLER::abc }
   my sub bar {
     my $abc = 42;
@@ -99 +86 @@
   my $abs = 23;
   dies_ok { bar() },
-    'vars not declared "is env" are not accessible via $CALLER::_';
+    'vars not declared "env" are not accessible via $CALLER::';
+}
+
+# Vars declared with env() default to being rw in the creating scope and
+# readonly when accessed with $CALLER::.
+{
+  env $foo = 42;
+  $foo++;
+  is $foo, 43, "env() vars are rw in the creating scope (1)";
+}
+
+{
+  env $foo = 42;
+  { $foo++ }
+  is $foo, 43, "env() vars are rw in the creating scope (2)";
+}
+
+{
+  my sub modify { $CALLER::foo++ }
+  env $foo = 42;
+  dies_ok { modify() }, 'env() vars are ro when accessed with $CALLER::';
+}
+
+{
+  my sub modify { $CALLER::_++ }
+  $_ = 42;
+  lives_ok { modify() }, '$_ is implicitly rw (1)';
+  is $_, 43,             '$_ is implicitly rw (2)';
+}
+
+{
+  my sub modify { $CALLER::foo++ }
+  env $foo is rw = 42;
+  lives_ok { modify() },
+      'env() vars declared "is rw" are rw when accessed with $CALLER:: (1)';
+  is $foo, 43,
+      'env() vars declared "is rw" are rw when accessed with $CALLER:: (2)';
+}
+
+=begin underspecced
+
+# Is $+foo really short for $CALLER::foo? S02 doesn't make this 100% clear.
+
+{
+  my sub get_foo { try { $+foo } }
+  env $foo = 42;
+
+  is get_foo(), 42, '$+ is short for $CALLER::';
+}
+
+=end underspecced
+
+=cut
+
+# Rebinding caller's variables -- legal?
+{
+  my $other_var = 23;
+  my sub rebind_foo { $CALLER::foo := $other_var }
+  env $foo = 42;
+
+  lives_ok { rebind_foo() }, 'rebinding $CALLER:: variables works (1)';
+  is $foo, 23,               'rebinding $CALLER:: variables works (2)';
+  $other_var++;
+  is $foo, 24,               'rebinding $CALLER:: variables works (3)';
 }