Fix does at the point of declaration. (We're kinda cheating because w…

…e should really do it at compile time. This may result in shoes loudly being banged on tables.)
rakudo · Apr 20, 2009 · 5919b0c · 5919b0c
1 parent 480902e
commit 5919b0c
Showing 1 changed file with 21 additions and 4 deletions.
diff --git a/src/builtins/guts.pir b/src/builtins/guts.pir
@@ -831,24 +831,41 @@ and C<type>.
 
 .sub '!var_trait'
     .param pmc var
-    .param string type
     .param string trait
+    .param string name
     .param pmc arg             :optional
     .param int has_arg         :opt_flag
 
     if has_arg goto have_arg
     null arg
   have_arg:
-
-    $S0 = concat '!var_trait_', trait
+
+    $S0 = substr trait, 16
+    $S0 = concat '!var_trait_', $S0
     $P0 = find_name $S0
     if null $P0 goto done
-    .tailcall $P0(trait, var, arg)
+    if has_arg goto with_arg
+    .tailcall $P0(var, name)
+  with_arg:
+    .tailcall $P0(var, name, arg)
   done:
     .return (var)
 .end
 
 
+.sub '!var_trait_does'
+    .param pmc var
+    .param string name
+    .param pmc arg :slurpy
+    $P0 = compreg 'Perl6'
+    $P0 = $P0.'parse_name'(name)
+    $S0 = pop $P0
+    $P0 = get_hll_global $P0, $S0
+    $P0 = $P0.'!select'(arg :flat)
+    .tailcall 'infix:does'(var, $P0)
+.end
+
+
 =item !var_trait_verb(var, trait, arg?)
 
 =cut