[rakudo]:

* Rework handling of named unaries a bit. git-svn-id: http://svn.perl.org/parrot/trunk/languages/perl6@28162 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
rakudo · Jun 7, 2008 · 0404104 · 0404104
1 parent b8c09a8
commit 0404104
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/src/builtins/misc.pir b/src/builtins/misc.pir
@@ -12,12 +12,6 @@ src/builtins/misc.pir - miscellaneous builtins that need reclassification
     .return($P0)
 .end
 
-.sub 'WHAT'
-    .param pmc x
-    .return x.'WHAT'()
-.end
-
-
 # Local Variables:
 #   mode: pir
 #   fill-column: 100

diff --git a/src/builtins/named-unary.pir b/src/builtins/named-unary.pir
@@ -12,6 +12,26 @@ src/builtins/named-unary.pir - Perl6 named unary builtins
 
 .namespace []
 
+=item HOW($x)
+
+=item WHAT($x)
+
+Return the metaclass or protoobject for C<$x>.
+
+=cut
+
+.sub 'HOW'
+    .param pmc x
+    .return x.'HOW'()
+.end
+
+
+.sub 'WHAT'
+    .param pmc x
+    .return x.'WHAT'()
+.end
+
+
 =item defined($x)
 
 Returns a true value if $x is defined, and a false value otherwise.

diff --git a/src/builtins/op.pir b/src/builtins/op.pir
@@ -323,13 +323,13 @@ src/builtins/op.pir - Perl6 builtin operators
 .end
 
 
-.sub 'prefix:true' :multi(_)
+.sub 'true' :multi(_)
     .param pmc a
     .return 'prefix:?'(a)
 .end
 
 
-.sub 'prefix:not' :multi(_)
+.sub 'not' :multi(_)
     .param pmc a
     .return 'prefix:!'(a)
 .end

diff --git a/src/parser/actions.pm b/src/parser/actions.pm
@@ -1916,12 +1916,11 @@ method EXPR($/, $key) {
     }
     else {
         my $past := PAST::Op.new(
+            :node($/),
             :name($<type>),
-            :pasttype($<top><pasttype>),
-            :pirop($<top><pirop>),
-            :lvalue($<top><lvalue>),
-            :node($/)
+            :opattr($<top>)
         );
+        if $<top><subname> { $past.name(~$<top><subname>); }
         for @($/) {
             unless +$_.from() == +$_.to() { $past.push( $($_) ) };
         }

diff --git a/src/parser/grammar-oper.pg b/src/parser/grammar-oper.pg
@@ -69,10 +69,12 @@ proto infix:<^> is equiv(infix:<|>)
 
 ## named unary
 proto prefix:<rand> is precedence('o=') { ... }
-proto prefix:<sleep> is equiv(prefix:<rand>) { ... }
+proto prefix:<HOW> is equiv(prefix:<rand>) is subname('HOW') { ... }
+proto prefix:<WHAT> is equiv(prefix:<rand>) is subname('WHAT') { ... }
 proto prefix:<abs> is equiv(prefix:<rand>)
     is pirop('n_abs')
     { ... }
+proto prefix:<sleep> is equiv(prefix:<rand>) { ... }
 
 ## nonchaining
 proto infix:<..> is precedence('n=') { ... }
@@ -164,8 +166,8 @@ proto infix:<^=> is equiv(infix:<:=>) { ... }
 proto infix:«=>» is equiv(infix:<:=>) { ... }
 
 ## loose unary
-proto prefix:<true> is precedence('h=') { ... }
-proto prefix:<not> is equiv(prefix:<true>) { ... }
+proto prefix:<true> is precedence('h=') is subname('true') { ... }
+proto prefix:<not> is equiv(prefix:<true>) is subname('not') { ... }
 
 ## comma
 proto infix:<,> is precedence('g=')