deep bind expr

src/bindx/BindxExt.hx

@@ -9,6 +9,7 @@ import haxe.macro.Context;
 import haxe.macro.Printer;
 
 using Lambda;
+using StringTools;
 using haxe.macro.Tools;
 
 typedef FieldExpr = {
@@ -59,7 +60,7 @@ class BindExt {
         var methodListenerName = "methodListener";
         var methodListenerNameExpr = macro $i{methodListenerName};
         var chain:Chain = { init:[], bind:[], unbind:[], expr:expr };
-        var binded:Map<String, Bool> = new Map();
+        var binded:Map<String, {prebind:Expr, c:Chain, e:Expr}> = new Map();
         
         var prefix = 0;
         function findChain(expr:Expr) {
@@ -92,21 +93,48 @@ class BindExt {
                 if (c != null) {
                     var key = c.expr.toString();
                     if (!binded.exists(key)) {
-                        binded.set(key, true);
+                        var prebind = macro var $zeroListener = ${ecall ? methodListenerNameExpr : fieldListenerNameExpr};
-                        Context.warning('Bind ${start.toString()}', start.pos);
+                        binded.set(key, {prebind:prebind, c:c, e:start});
-                        chain.bind.unshift(macro var $zeroListener = ${ecall ? methodListenerNameExpr : fieldListenerNameExpr});
+                    }
-                        chain.init = chain.init.concat(c.init);
+                    else {
-                        chain.bind = chain.bind.concat(c.bind);
+                        //trace("skip second bind " + key);
-                        chain.unbind = chain.unbind.concat(c.unbind);
+                        //Context.warning("skip second bind " + key, c.expr.pos);
-                    } else {
-                        Context.warning("skip second bind " + c.expr.toString(), start.pos);
                     }
                 }
             }
-            e.iter(findChain);
+            expr.iter(findChain);
         }
         findChain(expr);
         
+        var keys = [for (k in binded.keys()) k];
+        var i = 0;
+        while (i < keys.length) {
+            var k = keys[i];
+            var j = i;
+            var remove = false;
+            while (++j < keys.length) {
+                if (keys[j].startsWith(k)) {
+                    remove = true;
+                    break;
+                }
+            }
+            if (remove) {
+                keys = keys.splice(i, 1);
+                //Context.warning("skip second bind " + k, binded.get(k).e.pos);
+            }
+            else i++;
+        }
+        
+        for (k in keys) {
+            var data = binded.get(k);
+            Context.warning('Bind ${data.e.toString()}', data.e.pos);
+            chain.bind.unshift(data.prebind);
+            var c = data.c;
+            chain.init = chain.init.concat(c.init);
+            chain.bind = chain.bind.concat(c.bind);
+            chain.unbind = chain.unbind.concat(c.unbind);
+        }
+        
         var zeroListener = listenerName(0, "");
         
         var callListener = switch (type) {
@@ -206,7 +234,7 @@ class BindExt {
         var zeroListener = fields[0].bindable ? { f:fields[0], l:prevListenerNameExpr } : null;
         if (zeroListener != null) {
             var fn = zeroListener.f.field.name;
-            res.expr = macro ${zeroListener.f.e}.$fn;
+            res.expr = macro @:pos(zeroListener.f.e.pos) ${zeroListener.f.e}.$fn;
         }
         var i = -1;
         while (++i < fields.length - 1) {
@@ -229,7 +257,7 @@ class BindExt {
             }
             if (prev.bindable && res.expr == null) {
                     var fn = prev.field.name;
-                    res.expr = macro ${prev.e}.$fn;
+                    res.expr = macro @:pos(prev.e.pos) ${prev.e}.$fn;
             }
             
             var type = Context.typeof(field.e).toComplexType();

test/ExprBindTest.hx

@@ -49,9 +49,9 @@ class ExprBindTest extends BuddySuite {
                 a.str = "a1";
                 b.str = "";
                 c.str = "1";
-                inline function val() return if (a.str.charAt(b.str.length) == c.str) a.str else c.str;
+                inline function val() return if (a.str.charAt(b.str.length) == Std.string(c.str)) 1 else 0;
                 
-                BindExt.expr(if (a.str.charAt(b.str.length) == c.str) a.str else c.str, function (from, to:String) {
+                BindExt.expr(if (a.str.charAt(b.str.length) == Std.string(c.str)) 1 else 0, function (from, to:Int) {
                     to.should.be(val());
                     callNum ++;
                 });