Changeset 3465

Timestamp:

05/19/05 22:22:58 (4 years ago)

Author:

chromatic

svk:copy_cache_prev:

5016

Message:

First stab at making $?CLASS and $?PACKAGE work. It compiles anyway.

Files:

• src/Pugs/Eval.hs (modified) (1 diff)
• t/oo/magical_vars.t (modified) (4 diffs)

src/Pugs/Eval.hs

@@ -239 +239 @@
 getMagical "$?MODULE"   = constSym "main"
 getMagical "$?OS"       = constSym $ getConfig "osname"
+getMagical "$?CLASS"    = constSym =<< asks envPackage
+getMagical "$?PACKAGE"  = constSym =<< asks envPackage
 getMagical _            = return Nothing
 

t/oo/magical_vars.t

@@ -4 +4 @@
 use Test;
 
-plan 9;
+plan 11;
 
 class Foo {
   method get_self()  { $?SELF }
-  method get_class() { eval '$?CLASS' }
+  method get_class() { $?CLASS }
+  method get_package() { $?PACKAGE }
   method dummy()     { 42 }
 }
@@ -14 +15 @@
 role Bar {
   method get_self()  { $?SELF }
-  method get_class() { eval '$?CLASS' }
-  method get_role()  { eval '$?ROLE'  }
+  method get_class() { $?CLASS }
+  method get_role()  { $?ROLE }
+  method get_package() { $?PACKAGE }
   method dummy()     { 42 }
 }
@@ -24 +26 @@
   my $foo_obj = Foo.new;
   my $class   = $foo_obj.get_class;
+  my $package = $foo_obj.get_package;
+  is( $package, 'Foo', '$?PACKAGE should be the package name' );
 
-  is $class ~~ Foo, 'the thing returned by $?CLASS in our class smartmatches against our class';
+  ok( $class ~~ Foo, 'the thing returned by $?CLASS in our class smartmatches against our class' );
   my $fourty_two;
   lives_ok { $fourty_two = $class.new.dummy },
-    'the class returned by $?CLASS in our class way really our class (1)';
+    'the class returned by $?CLASS in our class was really our class (1)';
   is $fourty_two, 42, 'the class returned by $?CLASS in our class way really our class (2)';
 }
@@ -42 +46 @@
   my $bar   = SimpleClass.new;
   my $class = $bar.get_class;
+  my $package = $bar.get_package;
+
+  is( $package, 'SimpleClass', '$?PACKAGE should be the package name' );
 
   is $class ~~ SimpleClass, 'the thing returned by $?CLASS in our role smartmatches against our class';