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

bind.chain refacttoring/optimizations

Browse Source
This commit is contained in:
Dima Granetchi
2014-11-20 00:04:13 +02:00
parent 82936c8dba
commit 28d3a5850a
2 changed files with 88 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindx/BindxExt.hx
+72 -65
View File
@@ -1,5 +1,6 @@
package bindx; package bindx;
import haxe.macro.Context; import haxe.macro.Context;
import haxe.macro.Printer;
#if macro #if macro
@@ -27,97 +28,114 @@ class BindExt {
} }
#if macro #if macro
static function internalBindChain(expr:Expr, listener:Expr):Expr { static function checkFields(expr:Expr):Array<FieldExpr> {
var printer = new haxe.macro.Printer();
var first = Bind.checkField(expr); var first = Bind.checkField(expr);
var prevField = {e:first.e, field:first.field, error:null}; var prevField = {e:first.e, field:first.field, error:null};
var fields:Array<FieldExpr> = [{field:first.field, bindable:true, e:first.e}]; var fields:Array<FieldExpr> = [ { field:first.field, bindable:true, e:first.e } ];
while (true) {
inline function tryCheck(e:Expr) {
var field = null; var field = null;
try { try {
field = Bind.tryCheckField(prevField.e); field = Bind.tryCheckField(e);
if (field.field != null) } catch (e:FatalError) e.contextFatal();
fields.push({field:field.field, bindable:field.error == null, e:field.e}); return field;
else if (field.error != null) { }
var end = true;
switch (prevField.e.expr) { while (true) {
case ECall(e, params): var field = tryCheck(prevField.e);
field = Bind.tryCheckField(e); if (field.field != null) {
fields.push({e:field.e, field:field.field, params:params, bindable:field.error == null}); fields.push( { field:field.field, bindable:field.error == null, e:field.e } );
end = false; } else if (field.error != null) {
case _: var end = true;
} switch (prevField.e.expr) {
if (end) break; case ECall(e, params):
field = tryCheck(e);
// TODO: test
if (field.error != null) field.error.contextError();
if (field.field == null)
Context.fatalError('error parse fields ${e.toString()}', e.pos);
fields.push( { e:field.e, field:field.field, params:params, bindable:field.error == null } );
end = false;
case _:
} }
} if (end) break;
catch (e:FatalError) {
e.contextFatal();
} }
prevField = field; prevField = field;
} }
for (it in fields) //for (it in fields) trace(printer.printExpr(it.e) + " -> " + it.field.name + (it.params != null ? '(${printer.printExprs(it.params, ",")})' : "") + " bind:" + it.bindable);
trace(printer.printExpr(it.e) + " -> " + it.field.name + (it.params != null ? '(${printer.printExprs(it.params, ",")})' : "") + " bind:" + it.bindable); return fields;
}
public static function internalBindChain(expr:Expr, listener:Expr):Expr {
var fields = checkFields(expr);
var chain = prepareBindChain(fields, listener, expr.pos);
var res = macro
$b { chain.bind.concat(chain.init).concat([macro function __unbind__():Void { $b { chain.unbind } }]) };
//trace(new Printer().printExpr(res));
return res;
}
static var ZERO_LISTENER = "listener0";
public static function prepareBindChain(fields:Array<FieldExpr>, listener:Expr, pos:Position):{init:Array<Expr>, bind:Array<Expr>, unbind:Array<Expr>} {
var res = { init:[], bind:[], unbind:[] };
res.bind.push(macro var $ZERO_LISTENER = $ { listener } );
var prevListenerName = ZERO_LISTENER;
var prevListenerNameExpr = macro $i { prevListenerName };
var zeroListener = { f:fields[0], l:prevListenerNameExpr };
var i = -1; var i = -1;
var res = [];
var unbindRes = [];
res.push(macro var listener0 = $ { listener } );
var zeroListener = null;
while (++i < fields.length - 1) { while (++i < fields.length - 1) {
var field = fields[i + 1]; var field = fields[i + 1];
var next = fields[i]; var prev = fields[i];
var listenerName = 'listener${i+1}'; var listenerName = 'listener${i+1}';
var listenerNameExpr = macro $i { listenerName }; var listenerNameExpr = macro $i { listenerName };
var nextListenerName = i == 0 ? 'listener0' : 'listener${i}';
var nextListenerNameExpr = macro $i { nextListenerName };
var value = 'value${i+1}'; var value = 'value${i+1}';
var valueExpr = macro $i { value }; var valueExpr = macro $i { value };
var fieldName = next.field.name; var fieldName = prev.field.name;
var e = next.e; var e = prev.e;
var fieldListenerBody = []; var fieldListenerBody = [];
var fieldListener:Expr; var fieldListener:Expr;
if (next.bindable) zeroListener = { f:next, l:nextListenerNameExpr };
if (field.bindable) zeroListener = { f:field, l:listenerNameExpr }; if (field.bindable) zeroListener = { f:field, l:listenerNameExpr };
if (field.bindable) { if (field.bindable) {
var type = Context.typeof(field.e).toComplexType(); var type = Context.typeof(field.e).toComplexType();
res.push(macro var $value:Null<$type> = null ); res.bind.push(macro var $value:Null<$type> = null );
var bind = BindMacros.bindingSignalProvider.getClassFieldBindExpr(macro n, next.field, nextListenerNameExpr ); var unbind = BindMacros.bindingSignalProvider.getClassFieldUnbindExpr(valueExpr, prev.field, prevListenerNameExpr );
var unbind = BindMacros.bindingSignalProvider.getClassFieldUnbindExpr(valueExpr, next.field, nextListenerNameExpr );
fieldListenerBody.push(macro fieldListenerBody.push(macro
if (n != null) { if (n != null) {
$ { bind } $ { BindMacros.bindingSignalProvider.getClassFieldBindExpr(macro n, prev.field, prevListenerNameExpr ) }
$nextListenerNameExpr($a { next.params != null ? [] : [macro n.$fieldName, macro n.$fieldName] } ); $prevListenerNameExpr($a { prev.params != null ? [] : [macro n.$fieldName, macro n.$fieldName] } );
} }
); );
if (field.params != null) { if (field.params != null) {
fieldListenerBody.unshift(macro $valueExpr = n ); fieldListenerBody.unshift(macro var n:Null<$type> = $valueExpr = $e );
fieldListenerBody.unshift(macro var n = $e );
fieldListenerBody.unshift(macro if ($valueExpr != null) $unbind ); fieldListenerBody.unshift(macro if ($valueExpr != null) $unbind );
fieldListener = macro function $listenerName () { fieldListener = macro function $listenerName ():Void {
$b { fieldListenerBody }; $b { fieldListenerBody };
}; };
} }
else { else {
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 )} );
fieldListener = macro function $listenerName (o:Null<$type>, n:Null<$type>) { fieldListener = macro function $listenerName (o:Null<$type>, n:Null<$type>):Void {
$b { fieldListenerBody }; $b { fieldListenerBody };
}; };
} }
res.bind.push(fieldListener);
unbindRes.push(macro if ($valueExpr != null) $unbind); res.unbind.push(macro if ($valueExpr != null) { $unbind; $valueExpr = null; } );
unbindRes.push(macro $valueExpr = null );
//trace(printer.printExpr(unbind));
} }
else { else {
trace(printer.printExpr(field.e) + " . " + field.field.name); //trace(printer.printExpr(field.e) + " . " + field.field.name);
/*if (field.params != null) { /*if (field.params != null) {
fieldListenerBody.unshift(macro var n = $e ); fieldListenerBody.unshift(macro var n = $e );
@@ -131,36 +149,25 @@ class BindExt {
}; };
}*/ }*/
} }
if (fieldListener != null) { prevListenerName = listenerName;
res.push(fieldListener); prevListenerNameExpr = listenerNameExpr;
}
} }
if (zeroListener == null) { if (zeroListener == null) {
Context.error("Chain is not bindable ", expr.pos); Context.error("Chain is not bindable", pos);
} }
var bind = BindMacros.bindingSignalProvider.getClassFieldBindExpr(zeroListener.f.e, zeroListener.f.field, zeroListener.l ); var bind = BindMacros.bindingSignalProvider.getClassFieldBindExpr(zeroListener.f.e, zeroListener.f.field, zeroListener.l );
var unbind = BindMacros.bindingSignalProvider.getClassFieldUnbindExpr(zeroListener.f.e, zeroListener.f.field, zeroListener.l ); var unbind = BindMacros.bindingSignalProvider.getClassFieldUnbindExpr(zeroListener.f.e, zeroListener.f.field, zeroListener.l );
res.push(macro try { $bind; } catch (e:Dynamic) { res.init.push(bind);
trace("Warning: Can't initialize chain binding " + Std.string(e)); res.unbind.push(unbind);
});
unbindRes.push(macro try { $unbind; } catch (e:Dynamic) {
trace("Warning: Unbind chain problem " + Std.string(e));
});
if (zeroListener.f.params != null) { if (zeroListener.f.params != null) {
res.push(macro ${zeroListener.l}()); res.init.push(macro ${zeroListener.l}());
} }
else { else {
var fieldName = zeroListener.f.field.name; var fieldName = zeroListener.f.field.name;
res.push(macro try { $ { zeroListener.l } (null, $ { zeroListener.f.e } .$fieldName ); } catch (e:Dynamic) { res.init.push(macro $ { zeroListener.l } (null, $ { zeroListener.f.e } .$fieldName ));
trace("Warning: Can't initialize chain binding " + Std.string(e));
});
} }
res.push(macro function unbind() { $b { unbindRes } } );
var res = macro $b { res };
trace(printer.printExpr(res));
return res; return res;
} }
#end #end
test/ChainBindTest.hx
+16
View File
@@ -57,6 +57,22 @@ class ChainBindTest extends BuddySuite {
callNum.should.be(2); callNum.should.be(2);
}); });
it("BindExt.chain should bind default fields", {
b.d = "a";
var unbind = BindExt.chain(b.d, function (f:String, t:String) {
callNum ++;
});
b.d = "b";
callNum.should.be(2);
unbind();
b.d = "c";
callNum.should.be(2);
});
}); });
} }
} }