More work on bringing our traits support closer in line with S14 and …

…STD.pm. This kills trait_auxiliary in favor of trait_mod, adds parsing and an implementation of will (just delegates to is) and parsing of hides too (not yet implemnted), so now we should parse all the trait mods that STD does.

build/Makefile.in

@@ -127,6 +127,7 @@ SETTING = \
   src/setting/Range.pm \
   src/setting/Temporal.pm \
   src/setting/Whatever.pm \
+  src/setting/traits.pm \
 
 PMCS        = perl6str objectref perl6scalar mutablevar perl6multisub p6invocation p6opaque p6role
 

src/builtins/guts.pir

@@ -682,9 +682,9 @@ Add a trait with the given C<type> and C<name> to C<metaclass>.
     .param pmc pos_args   :slurpy
     .param pmc named_args :slurpy :named
 
-    if type == 'trait_auxiliary:is' goto is
-    if type == 'trait_auxiliary:does' goto does
-    'die'("Unknown trait auxiliary ", type)
+    if type == 'trait_mod:is' goto is
+    if type == 'trait_mod:does' goto does
+    'die'("Unknown trait_mod: ", type)
 
   is:
     ##  get the (parrot)class object associated with name
@@ -911,7 +911,7 @@ and C<type>.
     null arg
   have_arg:
 
-    $S0 = substr trait, 16
+    $S0 = substr trait, 10
     $S0 = concat '!var_trait_', $S0
     $P0 = find_name $S0
     if null $P0 goto done

src/parser/actions.pm

@@ -918,7 +918,7 @@ method trait_mod($/) {
     my $sym   := ~$<sym>;
     my $trait := PAST::Op.new( :name('infix:,'));
     if $sym eq 'is' {
-        $trait.push( 'trait_auxiliary:' ~ $sym );
+        $trait.push( 'trait_mod:' ~ $sym );
         $trait.push( ~$<name> );
         if $<postcircumfix> {
             my $arg := $<postcircumfix>[0].ast;
@@ -927,7 +927,7 @@ method trait_mod($/) {
         }
     }
     elsif $sym eq 'does' {
-        $trait.push( 'trait_auxiliary:' ~ $sym );
+        $trait.push( 'trait_mod:' ~ $sym );
         $trait.push( ~$<name> );
         if $<EXPR> {
             for @(build_call($<EXPR>[0].ast)) {
@@ -1460,7 +1460,7 @@ method package_declarator($/, $key) {
         $block[0].push(PAST::Op.new(
             :name('!meta_trait'),
             $?METACLASS,
-            'trait_auxiliary:does',
+            'trait_mod:does',
             $typename
         ));
         make PAST::Stmts.new()
@@ -1576,9 +1576,9 @@ method package_def($/, $key) {
             my $trait := $_.ast;
             if $trait[1] eq 'also' { $block<isalso> := 1; }
             elsif $trait[1] ne 'rw' && $trait[1] ne 'hidden' {
-                ##  If it is a trait_auxiliary:does or a trait_auxiliary:is we
+                ##  If it is a trait_mod:does or a trait_mod:is we
                 ##  should check the name is a type.
-                if $trait[0] eq 'trait_auxiliary:is' || $trait[0] eq 'trait_auxiliary:does' {
+                if $trait[0] eq 'trait_mod:is' || $trait[0] eq 'trait_mod:does' {
                     unless $/.is_type($trait[1]) {
                         $_.panic("The type " ~ $trait[1] ~ " does not exist.");
                     }
@@ -3173,7 +3173,7 @@ sub make_sigparam($var) {
 sub add_optoken($block, $match) {
     my $category := ~$match<category>;
     my $name := $category ~ ':' ~ ~$match[0];
-    if $category ne 'trait_auxiliary' {
+    if $category ne 'trait_mod' {
         my $equiv := 'infix:+';
         if $category eq 'prefix' { $equiv := 'prefix:+' }
         elsif $category eq 'postfix' { $equiv := 'postfix:++' }
@@ -3268,7 +3268,7 @@ sub package_has_trait($name) {
     my $block := $?BLOCK_OPEN || @?BLOCK[0];
     for $block<traits> {
         my $ast := $_.ast;
-        if +@($ast) >= 2 && $ast[0] eq 'trait_auxiliary:is' && $ast[1] eq $name {
+        if +@($ast) >= 2 && $ast[0] eq 'trait_mod:is' && $ast[1] eq $name {
             return 1;
         }
     }

src/parser/grammar.pg

@@ -446,6 +446,7 @@ rule trait {
 rule trait_mod {
     [
     | $<sym>=[is] <name><postcircumfix>?
+    | $<sym>=[hides] <module_name>
     | $<sym>=[does] <name>['['<EXPR>?']']?
     | $<sym>=[will] <identifier> <block>
     | $<sym>=[of|returns] <fulltypename>
@@ -873,7 +874,7 @@ token subshortname {
     <category> <colonpair>+
 }
 
-token category { 'infix' | 'prefix' | 'postfix' | 'circumfix' | 'postcircumfix' | 'trait_auxiliary' }
+token category { 'infix' | 'prefix' | 'postfix' | 'circumfix' | 'postcircumfix' | 'trait_mod' }
 
 ## used internally to convert p6 opnames to internal ones
 regex opname { 

src/setting/traits.pm

@@ -0,0 +1,3 @@
+multi sub trait_mod:<will>($declarand, $trait, &arg) {
+    &trait_mod:<is>($declarand, $trait, &arg);
+}