From b1bcd3b03436f00b0ae59db7823a06532fd9503c Mon Sep 17 00:00:00 2001 From: Dima Granetchi Date: Fri, 28 Nov 2014 18:37:36 +0200 Subject: [PATCH] minor updates --- src/bindx/BindSignal.hx | 9 ++++----- src/bindx/BindxExt.hx | 4 ++-- src/bindx/Error.hx | 5 ++++- src/bindx/IBindingSignalProvider.hx | 2 -- src/bindx/MetaUtils.hx | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/bindx/BindSignal.hx b/src/bindx/BindSignal.hx index d29bca7..ea78397 100644 --- a/src/bindx/BindSignal.hx +++ b/src/bindx/BindSignal.hx @@ -85,9 +85,9 @@ class BindSignalProvider implements IBindingSignalProvider { var args = switch (field.kind) { case FMethod(_): if (!isNull(oldValue)) - Context.error("method notify don't require oldValue", oldValue.pos); + Context.error("method notify doesn't require oldValue", oldValue.pos); if (!isNull(newValue)) - Context.error("method notify don't require newValue", newValue.pos); + Context.error("method notify doesn't require newValue", newValue.pos); []; case FVar(_, _): [oldValue, newValue]; @@ -132,9 +132,8 @@ class BindSignalProvider implements IBindingSignalProvider { }); var getter = macro function foo() { - if (this.$signalPrivateName == null) { - this.$signalPrivateName = ${builder} - } + if (this.$signalPrivateName == null) + this.$signalPrivateName = ${builder}; return $i{signalPrivateName}; }; var getterAccess = [APrivate]; diff --git a/src/bindx/BindxExt.hx b/src/bindx/BindxExt.hx index 5ec7823..55c2f78 100644 --- a/src/bindx/BindxExt.hx +++ b/src/bindx/BindxExt.hx @@ -26,8 +26,8 @@ typedef Chain = { var expr:Expr; var zeroName:String; } - #end + @:access(bindx.BindMacros) class BindExt { @@ -307,7 +307,7 @@ class BindExt { } if (zeroListener == null || zeroListener.f.bindable == false) - throw new bindx.Error("Chain is not bindable.", expr.pos); + throw new bindx.Error('${expr.toString()} is not bindable.', expr.pos); var zeroName = res.zeroName = zeroListener.f.e.toString(); if (zeroName != "this") diff --git a/src/bindx/Error.hx b/src/bindx/Error.hx index 71b2406..1137b66 100644 --- a/src/bindx/Error.hx +++ b/src/bindx/Error.hx @@ -1,5 +1,7 @@ package bindx; +#if macro + import haxe.macro.Context; import haxe.macro.Expr.Position; @@ -44,4 +46,5 @@ class Error { public function contextFatal():Void { Context.fatalError(message, pos); } -} \ No newline at end of file +} +#end \ No newline at end of file diff --git a/src/bindx/IBindingSignalProvider.hx b/src/bindx/IBindingSignalProvider.hx index ccc5f62..c2c7d6b 100644 --- a/src/bindx/IBindingSignalProvider.hx +++ b/src/bindx/IBindingSignalProvider.hx @@ -15,7 +15,5 @@ interface IBindingSignalProvider { function getClassFieldUnbindExpr(expr:Expr, field:ClassField, listener:Expr):Expr; function getClassFieldChangedExpr(expr:Expr, field:ClassField, oldValue:Expr, newValue:Expr):Expr; function getUnbindAllExpr(expr:ExprOf, type:Type):Expr; - } - #end \ No newline at end of file diff --git a/src/bindx/MetaUtils.hx b/src/bindx/MetaUtils.hx index ecd6395..1d8bf8f 100644 --- a/src/bindx/MetaUtils.hx +++ b/src/bindx/MetaUtils.hx @@ -13,9 +13,9 @@ class MetaUtils { static public inline var BINDABLE_META = ":bindable"; static public function findParam(meta:MetadataEntry, name:String):Expr { - if (meta.params == null) { + if (meta.params == null) return null; - } + for (p in meta.params) { switch (p.expr) { case EBinop(OpAssign, e1, e2):