Rearrange binding process to bind signatures after lexpad setup; (fixes

#19)
sorear · Jan 1, 2012 · 2580531 · 2580531
1 parent 5dd6ed3
commit 2580531
Show file tree

Hide file tree

Showing 9 changed files with 288 additions and 253 deletions.
diff --git a/lib/Builtins.cs b/lib/Builtins.cs
@@ -2221,7 +2221,7 @@ class CrossSource: ItemSource {
             n = o.slots[1] as VarHash;
         }
 
-        return de.info.Binder(th, de.outer, de.ip6, p, n, false, de);
+        return de.info.SetupCall(th, de.outer, de.ip6, p, n, false, de);
     }
 
     public static bool obj_can(P6any obj, string mname) {

diff --git a/lib/CORE.setting b/lib/CORE.setting
@@ -494,12 +494,10 @@ my class Cool {
         Num; # XXX StrPos
     }
 
-    my $_char = /./;
-    method comb($matcher?, $limit?, :$match) {
+    method comb($matcher = /./, $limit?, :$match) {
         my $str = ~self;
         my $C = Cursor.cursor_start($str);
         my $i = 0;
-        $matcher := $matcher // $_char;
         my $limctr = $limit // Inf;
         my @out;
         while ($i < chars $str) && $limctr > 0 {

diff --git a/lib/CodeGen.cs b/lib/CodeGen.cs
@@ -469,6 +469,8 @@ sealed class Tokens {
             RuntimeUnit.GetMethod("LoadLADArr");
         public static readonly MethodInfo Frame_Return =
             Frame.GetMethod("Return");
+        public static readonly MethodInfo Frame_Binder =
+            Frame.GetMethod("Binder");
 
         public static readonly FieldInfo P6any_mo =
             P6any.GetField("mo");
@@ -2671,6 +2673,7 @@ class NamProcessor {
                 return z[1] as CpsOp; };
             handlers["_newdispatch"] = delegate(NamProcessor th, object[] z) {
                 return th.MakeDispatch(JScalar.S(z[1])); };
+            thandlers["_binder"] = Methody(Tokens.Void, Tokens.Frame_Binder);
             handlers["class_ref"] = delegate(NamProcessor th, object[] z) {
                 string kind = FixStr(z[1]);
                 STable m;
@@ -3313,6 +3316,8 @@ class NamProcessor {
             }
             foreach (object lf in latefrags) frags.Add(lf);
 
+            if (sub.sig != null) frags.Add(a(j("_binder")));
+
             // PRE
             foreach (SubInfo z in sub.GetPhasers(Kernel.PHASER_PRE)) {
                 frags.Add(a(j("ternary"),

diff --git a/lib/Cursor.cs b/lib/Cursor.cs
@@ -31,7 +31,7 @@ public sealed class GState {
             return th;
         }
 
-        return m.info.Binder(th, m.outer, m.ip6, pos, null, false, m);
+        return m.info.SetupCall(th, m.outer, m.ip6, pos, null, false, m);
     }
 
     public GState(string orig, P6any actions) {