nekotoro/bindx2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chain binding with gaps

Browse Source
This commit is contained in:
Dima Granetchi
2014-11-20 18:05:03 +02:00
parent 28d3a5850a
commit da54ed7921
2 changed files with 84 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindx/BindxExt.hx
+38 -35
View File
@@ -72,7 +72,7 @@ class BindExt {
var res = macro var res = macro
$b { chain.bind.concat(chain.init).concat([macro function __unbind__():Void { $b { chain.unbind } }]) }; $b { chain.bind.concat(chain.init).concat([macro function __unbind__():Void { $b { chain.unbind } }]) };
//trace(new Printer().printExpr(res)); trace(new Printer().printExpr(res));
return res; return res;
} }
@@ -93,7 +93,7 @@ class BindExt {
var listenerName = 'listener${i+1}'; var listenerName = 'listener${i+1}';
var listenerNameExpr = macro $i { listenerName }; var listenerNameExpr = macro $i { listenerName };
var value = 'value${i+1}'; var value = 'value${i}';
var valueExpr = macro $i { value }; var valueExpr = macro $i { value };
var fieldName = prev.field.name; var fieldName = prev.field.name;
@@ -103,52 +103,57 @@ class BindExt {
var fieldListener:Expr; var fieldListener:Expr;
if (field.bindable) zeroListener = { f:field, l:listenerNameExpr }; if (field.bindable) zeroListener = { f:field, l:listenerNameExpr };
if (field.bindable) {
var type = Context.typeof(field.e).toComplexType(); var type = Context.typeof(field.e).toComplexType();
var unbind:Expr;
if (prev.bindable) {
unbind = BindMacros.bindingSignalProvider.getClassFieldUnbindExpr(valueExpr, prev.field, prevListenerNameExpr );
res.bind.push(macro var $value:Null<$type> = null ); res.bind.push(macro var $value:Null<$type> = null );
var unbind = BindMacros.bindingSignalProvider.getClassFieldUnbindExpr(valueExpr, prev.field, prevListenerNameExpr ); res.unbind.push(macro if ($valueExpr != null) { $unbind; $valueExpr = null; } );
fieldListenerBody.push(macro fieldListenerBody.push(macro
if (n != null) { if (n != null) {
$ { BindMacros.bindingSignalProvider.getClassFieldBindExpr(macro n, prev.field, prevListenerNameExpr ) } $ { BindMacros.bindingSignalProvider.getClassFieldBindExpr(macro n, prev.field, prevListenerNameExpr ) }
$prevListenerNameExpr($a { prev.params != null ? [] : [macro n.$fieldName, macro n.$fieldName] } ); $prevListenerNameExpr($a { prev.params != null ? [] : [macro n.$fieldName, macro n.$fieldName] } );
} }
); );
if (field.params != null) { } else {
fieldListenerBody.unshift(macro var n:Null<$type> = $valueExpr = $e ); fieldListenerBody.push(macro
fieldListenerBody.unshift(macro if ($valueExpr != null) $unbind ); if (n != null) {
$prevListenerNameExpr($a { prev.params != null ? [] : [macro n.$fieldName, macro n.$fieldName] } );
}
);
}
fieldListener = macro function $listenerName ():Void { if (field.params != null) {
$b { fieldListenerBody }; if (prev.bindable) {
}; if (field.bindable) {
fieldListenerBody.unshift(macro $valueExpr = n );
fieldListenerBody.unshift(macro if ($valueExpr != null) $unbind );
} else {
fieldListenerBody.unshift(macro if (n != null) ${BindMacros.bindingSignalProvider.getClassFieldUnbindExpr(macro n, prev.field, prevListenerNameExpr )} );
}
}
fieldListenerBody.unshift(macro var n:Null<$type> = $e );
fieldListener = macro function $listenerName ():Void $b { fieldListenerBody };
} }
else { else {
if (prev.bindable) {
fieldListenerBody.unshift(macro $valueExpr = n ); fieldListenerBody.unshift(macro $valueExpr = n );
fieldListenerBody.unshift(macro if ($valueExpr != null) $unbind ); fieldListenerBody.unshift(macro if ($valueExpr != null) $unbind );
fieldListenerBody.unshift(macro if (o != null) ${BindMacros.bindingSignalProvider.getClassFieldUnbindExpr(macro o, prev.field, prevListenerNameExpr )} ); fieldListenerBody.unshift(macro if (o != null) ${BindMacros.bindingSignalProvider.getClassFieldUnbindExpr(macro o, prev.field, prevListenerNameExpr )} );
fieldListener = macro function $listenerName (o:Null<$type>, n:Null<$type>):Void {
$b { fieldListenerBody };
};
} }
fieldListener = macro function $listenerName (o:Null<$type>, n:Null<$type>):Void
$b { fieldListenerBody };
}
res.bind.push(fieldListener); res.bind.push(fieldListener);
res.unbind.push(macro if ($valueExpr != null) { $unbind; $valueExpr = null; } );
}
else {
//trace(printer.printExpr(field.e) + " . " + field.field.name);
/*if (field.params != null) {
fieldListenerBody.unshift(macro var n = $e );
fieldListener = macro function $listenerName () {
$b { fieldListenerBody };
};
}
else {
fieldListener = macro function $listenerName (o, n) {
$b { fieldListenerBody };
};
}*/
}
prevListenerName = listenerName; prevListenerName = listenerName;
prevListenerNameExpr = listenerNameExpr; prevListenerNameExpr = listenerNameExpr;
} }
@@ -157,10 +162,8 @@ class BindExt {
Context.error("Chain is not bindable", pos); Context.error("Chain is not bindable", pos);
} }
var bind = BindMacros.bindingSignalProvider.getClassFieldBindExpr(zeroListener.f.e, zeroListener.f.field, zeroListener.l ); res.init.push(BindMacros.bindingSignalProvider.getClassFieldBindExpr(zeroListener.f.e, zeroListener.f.field, zeroListener.l ));
var unbind = BindMacros.bindingSignalProvider.getClassFieldUnbindExpr(zeroListener.f.e, zeroListener.f.field, zeroListener.l ); res.unbind.push(BindMacros.bindingSignalProvider.getClassFieldUnbindExpr(zeroListener.f.e, zeroListener.f.field, zeroListener.l ));
res.init.push(bind);
res.unbind.push(unbind);
if (zeroListener.f.params != null) { if (zeroListener.f.params != null) {
res.init.push(macro ${zeroListener.l}()); res.init.push(macro ${zeroListener.l}());
} }
test/ChainBindTest.hx
+42 -12
View File
@@ -14,33 +14,57 @@ class ChainBindTest extends BuddySuite {
describe("Using BindExt.chain", { describe("Using BindExt.chain", {
var val:String;
var b:BindableChain; var b:BindableChain;
var b2:BindableChain; var b2:BindableChain;
var callNum:Int; var callNum:Int;
before({ before({
b = new BindableChain(); val = "a";
b.c = new BindableChain(); b = new BindableChain(4);
b.c.c = new BindableChain(); b2 = new BindableChain(4);
b2 = new BindableChain();
b2.c = new BindableChain();
callNum = 0; callNum = 0;
}); });
it("BindExt.chain should bind chain changes (1 gap)", { it("BindExt.chain should bind chain changes (0 gap)", {
b.c.f("tada").d = "a"; b.c.c.f("tada").d = val;
var unbind = BindExt.chain(b.c.f("tada").d, function (_, t:String) { b2.c.c.f("tada").d = val;
var unbind = BindExt.chain(b.c.c.f("tada").d, function (_, t:String) {
callNum++; callNum++;
t.should.be(b.c.f("tada").d); t.should.be(val);
});
callNum.should.be(1); // first auto call
b.c.c.f("tada").d = val = "b";
callNum.should.be(2); // bind
val = b2.c.c.f("tada").d;
b.c = b2.c;
callNum.should.be(3);
b.c.c = b2.c.c;
callNum.should.be(3);
unbind();
b.c.c.f("tada").d = "c";
callNum.should.be(3);
});
it("BindExt.chain should bind chain changes (1 gap)", {
b.c.nc.c.f("tada").d = "a";
var unbind = BindExt.chain(b.c.nc.c.f("tada").d, function (_, t:String) {
callNum++;
t.should.be(val);
}); });
callNum.should.be(1); callNum.should.be(1);
b.c.f("tada").d = "b"; b.c.nc.c.f("tada").d = val = "b";
callNum.should.be(2); callNum.should.be(2);
unbind(); unbind();
b.c.f("tada").d = "c"; b.c.nc.c.f("tada").d = "c";
callNum.should.be(2); callNum.should.be(2);
}); });
@@ -88,11 +112,17 @@ class BindableChain implements bindx.IBindable {
@:bindable @:bindable
public var c:BindableChain; public var c:BindableChain;
public var nc:BindableChain;
@:bindable @:bindable
public function f(s:String):BindableChain { public function f(s:String):BindableChain {
return c; return c;
} }
public function new() { public function new(depth:Int) {
if (depth > 0) {
c = new BindableChain(depth - 1);
nc = new BindableChain(depth - 1);
}
} }
} }