diff --git a/.haxerc b/.haxerc index 8b6b442..2d17345 100644 --- a/.haxerc +++ b/.haxerc @@ -1,4 +1,4 @@ { - "version": "4.0.5", + "version": "4.2.1", "resolveLibs": "scoped" } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 32f5ce9..485cfc8 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,6 +1,19 @@ { - "version": "0.1.0", + "version": "2.0.0", "command": "haxelib", "args": ["run", "travix", "node"], - "problemMatcher": "$haxe" + "problemMatcher": "$haxe", + "tasks": [ + { + "label": "haxelib", + "command": "haxelib", + "args": [ + "run", + "travix", + "node" + ], + "problemMatcher": "$haxe", + "group": "build" + } + ] } diff --git a/haxe_libraries/tink_chunk.hxml b/haxe_libraries/tink_chunk.hxml new file mode 100644 index 0000000..d36d132 --- /dev/null +++ b/haxe_libraries/tink_chunk.hxml @@ -0,0 +1,3 @@ +# @install: lix --silent download "gh://github.com/haxetink/tink_chunk#f095072a029f1f50ce5f2cc0a690c3e834298d96" into tink_chunk/0.3.1/github/f095072a029f1f50ce5f2cc0a690c3e834298d96 +-cp ${HAXE_LIBCACHE}/tink_chunk/0.3.1/github/f095072a029f1f50ce5f2cc0a690c3e834298d96/src +-D tink_chunk=0.3.1 \ No newline at end of file diff --git a/haxe_libraries/tink_cli.hxml b/haxe_libraries/tink_cli.hxml index 2b332dd..5f04018 100644 --- a/haxe_libraries/tink_cli.hxml +++ b/haxe_libraries/tink_cli.hxml @@ -1,8 +1,8 @@ --D tink_cli=0.3.1 -# @install: lix --silent download "haxelib:/tink_cli#0.3.1" into tink_cli/0.3.1/haxelib +# @install: lix --silent download "gh://github.com/haxetink/tink_cli#1278ad2a34fd5e2403e414aefe09bb938d0c8825" into tink_cli/0.5.1/github/1278ad2a34fd5e2403e414aefe09bb938d0c8825 -lib tink_io --lib tink_stringly -lib tink_macro --cp ${HAXE_LIBCACHE}/tink_cli/0.3.1/haxelib/src +-lib tink_stringly +-cp ${HAXE_LIBCACHE}/tink_cli/0.5.1/github/1278ad2a34fd5e2403e414aefe09bb938d0c8825/src +-D tink_cli=0.5.1 # Make sure docs are generated -D use-rtti-doc \ No newline at end of file diff --git a/haxe_libraries/tink_core.hxml b/haxe_libraries/tink_core.hxml index 4f2a5fc..98d5369 100644 --- a/haxe_libraries/tink_core.hxml +++ b/haxe_libraries/tink_core.hxml @@ -1,3 +1,3 @@ --D tink_core=1.24.0 -# @install: lix --silent download "haxelib:/tink_core#1.24.0" into tink_core/1.24.0/haxelib --cp ${HAXE_LIBCACHE}/tink_core/1.24.0/haxelib/src +# @install: lix --silent download "gh://github.com/haxetink/tink_core#abee932c4e724517090238b6527eac28874c0354" into tink_core/1.27.1/github/abee932c4e724517090238b6527eac28874c0354 +-cp ${HAXE_LIBCACHE}/tink_core/1.27.1/github/abee932c4e724517090238b6527eac28874c0354/src +-D tink_core=1.27.1 \ No newline at end of file diff --git a/haxe_libraries/tink_io.hxml b/haxe_libraries/tink_io.hxml index 0e96a41..e245c19 100644 --- a/haxe_libraries/tink_io.hxml +++ b/haxe_libraries/tink_io.hxml @@ -1,5 +1,5 @@ --D tink_io=0.5.0 -# @install: lix --silent download "haxelib:/tink_io#0.5.0" into tink_io/0.5.0/haxelib +# @install: lix --silent download "gh://github.com/haxetink/tink_io#e4a92421865adfd7037474937cffacaa1abd4338" into tink_io/0.8.0/github/e4a92421865adfd7037474937cffacaa1abd4338 +-lib tink_chunk -lib tink_streams --lib tink_core --cp ${HAXE_LIBCACHE}/tink_io/0.5.0/haxelib/src +-cp ${HAXE_LIBCACHE}/tink_io/0.8.0/github/e4a92421865adfd7037474937cffacaa1abd4338/src +-D tink_io=0.8.0 \ No newline at end of file diff --git a/haxe_libraries/tink_streams.hxml b/haxe_libraries/tink_streams.hxml index 93af2d1..c766a65 100644 --- a/haxe_libraries/tink_streams.hxml +++ b/haxe_libraries/tink_streams.hxml @@ -1,4 +1,6 @@ --D tink_streams=0.2.1 -# @install: lix --silent download "haxelib:/tink_streams#0.2.1" into tink_streams/0.2.1/haxelib +# @install: lix --silent download "gh://github.com/haxetink/tink_streams#aa006c354e742164c4f7bc8ec4532bc9154fb0d0" into tink_streams/0.3.3/github/aa006c354e742164c4f7bc8ec4532bc9154fb0d0 -lib tink_core --cp ${HAXE_LIBCACHE}/tink_streams/0.2.1/haxelib/src +-cp ${HAXE_LIBCACHE}/tink_streams/0.3.3/github/aa006c354e742164c4f7bc8ec4532bc9154fb0d0/src +-D tink_streams=0.3.3 +# temp for development, delete this file when pure branch merged +-D pure \ No newline at end of file diff --git a/haxe_libraries/travix.hxml b/haxe_libraries/travix.hxml index 527629d..b09e4f4 100644 --- a/haxe_libraries/travix.hxml +++ b/haxe_libraries/travix.hxml @@ -1,6 +1,7 @@ --D travix=0.12.2 -# @install: lix --silent download "gh://github.com/back2dos/travix#7da3bf96717b52bf3c7e5d2273bf927a8cd7aeb5" into travix/0.12.2/github/7da3bf96717b52bf3c7e5d2273bf927a8cd7aeb5 -# @post-install: cd ${HAXE_LIBCACHE}/travix/0.12.2/github/7da3bf96717b52bf3c7e5d2273bf927a8cd7aeb5 && haxe -cp src --run travix.PostDownload -# @run: haxelib run-dir travix ${HAXE_LIBCACHE}/travix/0.12.2/github/7da3bf96717b52bf3c7e5d2273bf927a8cd7aeb5 +# @install: lix --silent download "gh://github.com/back2dos/travix#354c2b2a82cc3b03e2f87cc1b6f0ddc0a6a5c133" into travix/0.15.0/github/354c2b2a82cc3b03e2f87cc1b6f0ddc0a6a5c133 +# @post-install: cd ${HAXE_LIBCACHE}/travix/0.15.0/github/354c2b2a82cc3b03e2f87cc1b6f0ddc0a6a5c133 && haxe -cp src --run travix.PostDownload +# @run: haxelib run-dir travix ${HAXE_LIBCACHE}/travix/0.15.0/github/354c2b2a82cc3b03e2f87cc1b6f0ddc0a6a5c133 -lib tink_cli --cp ${HAXE_LIBCACHE}/travix/0.12.2/github/7da3bf96717b52bf3c7e5d2273bf927a8cd7aeb5/src +-cp ${HAXE_LIBCACHE}/travix/0.15.0/github/354c2b2a82cc3b03e2f87cc1b6f0ddc0a6a5c133/src +-D travix=0.15.0 +--macro travix.Macro.setup() \ No newline at end of file diff --git a/src/tink/macro/Types.hx b/src/tink/macro/Types.hx index ac88ade..709daee 100644 --- a/src/tink/macro/Types.hx +++ b/src/tink/macro/Types.hx @@ -44,7 +44,7 @@ class Types { case AccNormal: 'default'; case AccInline: if (read) 'default' else 'never'; case AccNo: 'null'; - case AccNever | AccCtor: 'never'; + case AccNever #if haxe4 | AccCtor #end: 'never'; case AccCall: if (read) 'get' else 'set'; default: throw 'not implemented';