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

minor

Browse Source
This commit is contained in:
Dima Granetchi
2014-11-21 15:11:38 +02:00
parent 1bcfbf91e5
commit a4b681d009
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindx/BindxExt.hx
+8 -11
View File
@@ -34,9 +34,7 @@ class BindExt {
inline function tryCheck(e:Expr) { inline function tryCheck(e:Expr) {
var field = null; var field = null;
try { try { field = Bind.tryCheckField(e); } catch (e:FatalError) e.contextFatal();
field = Bind.tryCheckField(e);
} catch (e:FatalError) e.contextFatal();
return field; return field;
} }
@@ -49,10 +47,8 @@ class BindExt {
switch (prevField.e.expr) { switch (prevField.e.expr) {
case ECall(e, params): case ECall(e, params):
field = tryCheck(e); field = tryCheck(e);
// TODO: test
if (field.error != null) field.error.contextError(); if (field.error != null) field.error.contextError();
if (field.field == null) if (field.field == null) Context.fatalError('error parse fields ${e.toString()}', e.pos);
Context.fatalError('error parse fields ${e.toString()}', e.pos);
fields.push( { e:field.e, field:field.field, params:params, bindable:field.error == null } ); fields.push( { e:field.e, field:field.field, params:params, bindable:field.error == null } );
end = false; end = false;
case _: case _:
@@ -67,8 +63,10 @@ class BindExt {
public static function internalBindChain(expr:Expr, listener:Expr):Expr { public static function internalBindChain(expr:Expr, listener:Expr):Expr {
var fields = checkFields(expr); var fields = checkFields(expr);
if (fields.length == 0) if (fields.length == 0)
Context.fatalError("can't bind empty expression", expr.pos); Context.fatalError("can't bind empty expression", expr.pos);
var i = fields.length; var i = fields.length;
var first = null; var first = null;
while (i-- > 0) { while (i-- > 0) {
@@ -79,8 +77,7 @@ class BindExt {
if (first != null) if (first != null)
Context.warning('expr in not full bindable. Can bind only "${first.e.toString()}"', expr.pos); Context.warning('expr in not full bindable. Can bind only "${first.e.toString()}"', expr.pos);
var listenerExpr = macro listener; var chain = prepareBindChain(fields, macro listener, expr.pos);
var chain = prepareBindChain(fields, listenerExpr, expr.pos);
var res = macro (function (listener):Void->Void var res = macro (function (listener):Void->Void
$b { chain.bind.concat(chain.init).concat([macro return function ():Void $b { chain.unbind }]) } $b { chain.bind.concat(chain.init).concat([macro return function ():Void $b { chain.unbind }]) }
@@ -98,7 +95,7 @@ class BindExt {
var prevListenerName = ZERO_LISTENER; var prevListenerName = ZERO_LISTENER;
var prevListenerNameExpr = macro $i { prevListenerName }; var prevListenerNameExpr = macro $i { prevListenerName };
var zeroListener = { f:fields[0], l:prevListenerNameExpr }; var zeroListener = fields[0].bindable ? { f:fields[0], l:prevListenerNameExpr } : null;
var i = -1; var i = -1;
while (++i < fields.length - 1) { while (++i < fields.length - 1) {
var field = fields[i + 1]; var field = fields[i + 1];
@@ -153,12 +150,12 @@ class BindExt {
prevListenerNameExpr = listenerNameExpr; prevListenerNameExpr = listenerNameExpr;
} }
if (zeroListener == null || zeroListener.f.bindable == false) { if (zeroListener == null || zeroListener.f.bindable == false)
Context.error("Chain is not bindable", pos); Context.error("Chain is not bindable", pos);
}
res.init.push(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 ));
res.unbind.push(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 ));
if (zeroListener.f.params != null) { if (zeroListener.f.params != null) {
res.init.push(macro ${zeroListener.l}()); res.init.push(macro ${zeroListener.l}());
} }