Allow defining multi-subs with inlining annotations

The inline primitive form will be used for calls to the base function. If it is augmented, multi-dispatch will be used.
sorear · Jan 1, 2012 · b5d9d05 · b5d9d05
1 parent 6406010
commit b5d9d05
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/CodeGen.cs b/lib/CodeGen.cs
@@ -3846,7 +3846,7 @@ object Call(object[] args) {
                     r = new object[] { "simple",null,null,null, lsimp.flags, Handle.Wrap(lsimp.type) };
                 var ldisp  = li as LIDispatch;
                 if (ldisp != null)
-                    r = new object[] { "dispatch",null,null,null };
+                    r = new object[] { "dispatch",null,null,null, Handle.Wrap(csr) };
                 var llab   = li as LILabel;
                 if (llab != null)
                     r = new object[] { "label",null,null,null };

diff --git a/src/NieczaPassSimplifier.pm6 b/src/NieczaPassSimplifier.pm6
@@ -135,7 +135,11 @@ sub run_optree($body, $op, $nv) {
     return $op unless $inv.^isa(::Op::Lexical);
     my $invname = $inv.name;
     my @inv_lex = $body.lookup_lex($invname);
-    return $op unless @inv_lex && @inv_lex[0] eq 'sub';
+    return $op unless @inv_lex;
+    @inv_lex = $body.lookup_lex($invname ~ ':(!proto)')
+        if @inv_lex[0] eq 'dispatch' &&
+            @inv_lex[4].has_lexical($invname ~ ':(!proto)');
+    return $op unless @inv_lex[0] eq 'sub';
 
     if @inv_lex[4].get_extend('builtin') -> $B {
         return $op unless defined my $args = no_named_params($op);