Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update property declaration syntax for Haxe 4 compatibility #114

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update property declaration syntax for Haxe 4 compatibility #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cx-src/nape/callbacks/CbType.cx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ $(import);
$doc($$*$$desc)
!! * In a Listener (Assuming you do not 'remove' this type from the object)
!! */
#if nape_swc @:isVar #end public static var ANY_`T(get_ANY_`T, never):CbType;
#if nape_swc @:isVar #end public static var ANY_`T(get, never):CbType;
force_inline static function get_ANY_`T():CbType {
return PR(CbType).ANY_`T;
}
Expand Down
2 changes: 1 addition & 1 deletion cx-src/zpp_nape/util/Flags.cx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ $(mixin global Flags(F,defs)
FlagsInit(N,F,I)
tostring(N)

#if nape_swc @:isVar #end public static var N(get_`N,never):F;
#if nape_swc @:isVar #end public static var N(get,never):F;
force_inline static function get_`N() {
if(PR(Flags).F`_`N==null) {
PR(Flags).internal = true;
Expand Down
4 changes: 2 additions & 2 deletions cx-src/zpp_nape/util/Names.cx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ $(mixin global newTArray(T) {
});

$(mixin global property(name,Type,getter,setter)
#if nape_swc @:isVar #end public var $name(get_`name,set_`name):Type;
#if nape_swc @:isVar #end public var $name(get,set):Type;
force_inline function get_`name():Type getter
force_inline function set_`name(name:Type):Type {
setter
Expand All @@ -98,6 +98,6 @@ $(mixin global property(name,Type,getter,setter)
);

$(mixin global property(name,Type,getter)
#if nape_swc @:isVar #end public var $name(get_`name,never):Type;
#if nape_swc @:isVar #end public var $name(get,never):Type;
force_inline function get_`name():Type getter
);
2 changes: 1 addition & 1 deletion cx-src/zpp_nape/util/WrapLists.cx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ $(mixin global WrapListNew(T,ListT,IteT, defs, noFinal)
!!/**
!! * Length of list.
!! */
#if nape_swc @:isVar #end public var length(get_length,never):Int;
#if nape_swc @:isVar #end public var length(get,never):Int;
//this must truly be inlined for nape_swc.
#if use_inline
force_inline function get_length() {
Expand Down