Fix multimethods and implement lexical proto shadowing

sorear · May 12, 2011 · 2703ab0 · 2703ab0
1 parent 7c63a3c
commit 2703ab0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/lib/CLRBackend.cs b/lib/CLRBackend.cs
@@ -2599,6 +2599,8 @@ class NamProcessor {
                     }
                 }
                 if (csr.outer == null) break;
+                // don't go above nearest proto
+                if (csr.l_lexicals.ContainsKey(pn)) break;
                 if (brk) cands.Add(CpsOp.Null(Tokens.P6any));
             }
 

diff --git a/lib/Kernel.cs b/lib/Kernel.cs
@@ -1414,6 +1414,7 @@ public class MMDCandidateLongname {
             int[] links = new int[raw.Length * raw.Length * 2];
             int ap = 0;
             int[] heads = new int[raw.Length * 2];
+            int[] orig = new int[raw.Length];
             MMDCandidateLongname[] lns = new MMDCandidateLongname[raw.Length];
             int nlns = 0;
             int tien = 0;
@@ -1423,6 +1424,7 @@ public class MMDCandidateLongname {
                     tien++;
                 } else {
                     lns[nlns] = new MMDCandidateLongname(raw[i], tien);
+                    orig[nlns] = i;
                     heads[2*nlns] = -1;
                     nlns++;
                 }
@@ -1460,7 +1462,7 @@ public class MMDCandidateLongname {
                     }
                     // prevent constrained candidates from being part of a tie
                     if (lns[i].extra_constraints) outp.Add(null);
-                    outp.Add(raw[i]);
+                    outp.Add(raw[orig[i]]);
                     if (lns[i].extra_constraints) outp.Add(null);
                     k--;
                 }
@@ -1495,7 +1497,7 @@ public class MMDCandidateLongname {
                     //Console.WriteLine(".");
                     continue;
                 }
-                //Console.WriteLine((new MMDCandidateLongname(p)).LongName());
+                //Console.WriteLine((new MMDCandidateLongname(p,0)).LongName());
                 SubInfo si = (SubInfo)p.GetSlot("info");
                 Frame   o  = (Frame)p.GetSlot("outer");
                 Frame nth = th.MakeChild(o, si);

diff --git a/test.pl b/test.pl
@@ -2,7 +2,7 @@
 
 use Test;
 
-plan 827;
+plan 828;
 
 ok 1, "one is true";
 ok 2, "two is also true";
@@ -1913,11 +1913,11 @@
         is foo(True), "bool", "augmenting multisubs works (1)";
         is foo(5), "any", "augmenting multisubs works (2)";
 
-        # {
-        #     proto foo($) {*}
-        #     multi foo(Any $) { "any2" }
-        #     is foo(True), "any2", "proto-shadowing works";
-        # }
+        {
+            proto foo($) {*}
+            multi foo(Any $) { "any2" }
+            is foo(True), "any2", "proto-shadowing works";
+        }
 
         {
             sub foo(Any $) { "any3" }