warning text fix

This commit is contained in:
Dima Granetchi
2014-11-22 23:42:21 +02:00
parent 58e2031a42
commit f98de63287
2 changed files with 13 additions and 7 deletions
+1 -1
View File
@@ -114,7 +114,7 @@ class Bind {
case _: case _:
} }
return {e:f, field:null, error:new bindx.Error('Can\'t bind \'${f.toString()}\'', f.pos)}; return {e:f, field:null, error:new bindx.Error('\'${f.toString()}\' is not bindable', f.pos)};
} }
public static function isBindable(classType:ClassType):Bool { public static function isBindable(classType:ClassType):Bool {
+10 -4
View File
@@ -60,7 +60,7 @@ class BindExt {
var methodListenerName = "methodListener"; var methodListenerName = "methodListener";
var methodListenerNameExpr = macro $i{methodListenerName}; var methodListenerNameExpr = macro $i{methodListenerName};
var chain:Chain = { init:[], bind:[], unbind:[], expr:expr }; var chain:Chain = { init:[], bind:[], unbind:[], expr:expr };
var binded:Map<String, {prebind:Expr, c:Chain, e:Expr}> = new Map(); var binded:Map<String, {prebind:Expr, c:Chain}> = new Map();
var prefix = 0; var prefix = 0;
function findChain(expr:Expr) { function findChain(expr:Expr) {
@@ -89,12 +89,18 @@ class BindExt {
var pre = '_${prefix++}'; var pre = '_${prefix++}';
var zeroListener = listenerName(0, pre); var zeroListener = listenerName(0, pre);
var c = null; var c = null;
try { c = warnPrepareChain(start, macro $i{zeroListener}, pre, true); } catch (e:bindx.Error) { e.contextWarning(); } try {
c = warnPrepareChain(start, macro $i { zeroListener }, pre, true);
}
catch (e:bindx.Error) {
Context.warning('${start.toString()} is not bindable.', e.pos);
//e.contextWarning();
}
if (c != null) { if (c != null) {
var key = c.expr.toString(); var key = c.expr.toString();
if (!binded.exists(key)) { if (!binded.exists(key)) {
var prebind = macro var $zeroListener = ${ecall ? methodListenerNameExpr : fieldListenerNameExpr}; var prebind = macro var $zeroListener = ${ecall ? methodListenerNameExpr : fieldListenerNameExpr};
binded.set(key, {prebind:prebind, c:c, e:start}); binded.set(key, {prebind:prebind, c:c});
} }
else { else {
//trace("skip second bind " + key); //trace("skip second bind " + key);
@@ -127,7 +133,7 @@ class BindExt {
for (k in keys) { for (k in keys) {
var data = binded.get(k); var data = binded.get(k);
Context.warning('Bind ${data.e.toString()}', data.e.pos); Context.warning('Bind ${data.c.expr.toString()}', data.c.expr.pos);
chain.bind.unshift(data.prebind); chain.bind.unshift(data.prebind);
var c = data.c; var c = data.c;
chain.init = chain.init.concat(c.init); chain.init = chain.init.concat(c.init);