diff --git a/haxe_libraries/kiss-tools.hxml b/haxe_libraries/kiss-tools.hxml index d386b20..8470653 100644 --- a/haxe_libraries/kiss-tools.hxml +++ b/haxe_libraries/kiss-tools.hxml @@ -1,4 +1,4 @@ -# @install: lix --silent download "gh://github.com/kiss-lang/kiss-tools#397959357bb64108cae259b18b361a236b35a530" into kiss-tools/0.0.0/github/397959357bb64108cae259b18b361a236b35a530 +# @install: lix --silent download "gh://github.com/kiss-lang/kiss-tools#89e75b75f36eeb7785006b8eb6988255a52f0f12" into kiss-tools/0.0.0/github/89e75b75f36eeb7785006b8eb6988255a52f0f12 -lib kiss --cp ${HAXE_LIBCACHE}/kiss-tools/0.0.0/github/397959357bb64108cae259b18b361a236b35a530/src/ +-cp ${HAXE_LIBCACHE}/kiss-tools/0.0.0/github/89e75b75f36eeb7785006b8eb6988255a52f0f12/src/ -D kiss-tools=0.0.0 \ No newline at end of file diff --git a/haxe_libraries/kiss.hxml b/haxe_libraries/kiss.hxml index 9090b41..d17095c 100644 --- a/haxe_libraries/kiss.hxml +++ b/haxe_libraries/kiss.hxml @@ -1,12 +1,12 @@ -# @install: lix --silent download "gh://github.com/kiss-lang/kiss#e3f1997409ed0e9f6109f3075eaa50e36ab9e5b1" into kiss/0.0.1/github/e3f1997409ed0e9f6109f3075eaa50e36ab9e5b1 -# @run: haxelib run-dir kiss "${HAXE_LIBCACHE}/kiss/0.0.1/github/e3f1997409ed0e9f6109f3075eaa50e36ab9e5b1" +# @install: lix --silent download "gh://github.com/kiss-lang/kiss#57403abc93b22f45e155b313b0e16b5ad1432864" into kiss/0.0.1/github/57403abc93b22f45e155b313b0e16b5ad1432864 +# @run: haxelib run-dir kiss "${HAXE_LIBCACHE}/kiss/0.0.1/github/57403abc93b22f45e155b313b0e16b5ad1432864" -lib haxe-strings -lib hscript -lib tink_json -lib tink_macro -lib tink_syntaxhub -lib uuid --cp ${HAXE_LIBCACHE}/kiss/0.0.1/github/e3f1997409ed0e9f6109f3075eaa50e36ab9e5b1/src +-cp ${HAXE_LIBCACHE}/kiss/0.0.1/github/57403abc93b22f45e155b313b0e16b5ad1432864/src -D kiss=0.0.1 -w -WUnusedPattern --macro kiss.KissFrontend.use() \ No newline at end of file diff --git a/src/hollywoo/Movie.kiss b/src/hollywoo/Movie.kiss index 375f948..e2dd900 100644 --- a/src/hollywoo/Movie.kiss +++ b/src/hollywoo/Movie.kiss @@ -1045,11 +1045,13 @@ (b.callSymbol "b.symbol" [(b.str "cc")])) ((= "skipping" (symbolNameValue arg true true)) (b.callSymbol "b.symbol" [(b.str "skipping")])) - (true (b.callSymbol "try" [ - (b.callSymbol "read" [(b.symbol "nextLineStream")]) - // optional arguments may not be present: - (b.callSymbol "catch" [(b.list [(b.symbol "e")]) (b.callSymbol "b.symbol" [(b.str "null")])]) - ])))))] + (true + (b.callSymbol "readOr" + [ + (b.symbol "nextLineStream") + // optional arguments may not be present: + (b.callSymbol "b.symbol" [(b.str "null")]) + ])))))] methodCall)) (#unless subclass @:keep (method ,nameAndType ,argList ,@body)) }))