diff --git a/src/bindx/macro/BindMacros.hx b/src/bindx/macro/BindMacros.hx index d0fbd80..c5cbe9a 100644 --- a/src/bindx/macro/BindMacros.hx +++ b/src/bindx/macro/BindMacros.hx @@ -9,7 +9,6 @@ import haxe.macro.Context; using haxe.macro.Tools; using bindx.macro.MacroUtils; -using Lambda; @:access(bindx.macro.BindableMacros) class BindMacros { diff --git a/src/bindx/macro/BindSignalProvider.hx b/src/bindx/macro/BindSignalProvider.hx index 7f65e2e..8a68d61 100644 --- a/src/bindx/macro/BindSignalProvider.hx +++ b/src/bindx/macro/BindSignalProvider.hx @@ -8,7 +8,6 @@ import bindx.BindSignal; using bindx.macro.MacroUtils; using haxe.macro.Tools; -using Lambda; class BindSignalProvider implements IBindingSignalProvider { diff --git a/src/bindx/macro/BindableMacros.hx b/src/bindx/macro/BindableMacros.hx index 58cf0e7..9efea18 100644 --- a/src/bindx/macro/BindableMacros.hx +++ b/src/bindx/macro/BindableMacros.hx @@ -191,15 +191,15 @@ class BindableMacros { static inline function injectBindableMeta(fields:Array, meta:MetadataEntry):Void { for (f in fields) { - if (f.hasBindableMeta()) continue; - if (f.access.exists(function (it) return it.equals(APrivate))) continue; + if (f.access.indexOf(APrivate) > -1 || f.hasBindableMeta()) continue; var forceParam = meta.findParam(FORCE); - if (isFieldBindable(f, fields, forceParam.isNotNullAndTrue())) + if (isFieldBindable(f, fields, forceParam.isNotNullAndTrue())) { switch (f.kind) { case FFun(_): case _: f.meta.push({name:MetaUtils.BINDABLE_META, pos:f.pos, params:meta.params}); } + } } } diff --git a/src/bindx/macro/MacroUtils.hx b/src/bindx/macro/MacroUtils.hx index 8db39ed..f650e30 100644 --- a/src/bindx/macro/MacroUtils.hx +++ b/src/bindx/macro/MacroUtils.hx @@ -6,7 +6,6 @@ import haxe.macro.Expr; import haxe.macro.Context; using haxe.macro.Tools; -using Lambda; class MetaUtils {