kiss-lang/kiss
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

AsyncEmbeddedScript2 support continuation after errors

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-08-10 11:38:47 -05:00
parent faeeae1a68
commit f2cff4803e
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/kiss/AsyncEmbeddedScript2.hx
View File

@@ -251,7 +251,7 @@ class AsyncEmbeddedScript2 {
} }
#end #end
instructions[instructionPointer](this, skipping, continuation); instructions[instructionPointer](this, skipping, continuation);
}); }, continuation);
if (tryCallNextWithTailRecursion) { if (tryCallNextWithTailRecursion) {
nextCalledWithTailRecursion = true; nextCalledWithTailRecursion = true;
@@ -300,7 +300,7 @@ class AsyncEmbeddedScript2 {
public var printCurrentInstruction = true; public var printCurrentInstruction = true;
public function runWithErrorChecking(process:Void->Void) { public function runWithErrorChecking(process:Void->Void, ?cc:Continuation2) {
try { try {
process(); process();
} catch (e:haxe.Exception) { } catch (e:haxe.Exception) {
@@ -309,12 +309,22 @@ class AsyncEmbeddedScript2 {
Prelude.print("ERROR MESSAGE:"); Prelude.print("ERROR MESSAGE:");
Prelude.printStr(e.message); Prelude.printStr(e.message);
if (onError != null) { if (onError != null) {
onError(e); onError(e, () -> {
#if (sys || hxnodejs)
Sys.exit(1);
#end
throw e;
}, if (cc != null) {
cc;
} else {
()->{trace("no-op cc");};
});
} else {
#if (sys || hxnodejs)
Sys.exit(1);
#end
throw e;
} }
#if (sys || hxnodejs)
Sys.exit(1);
#end
throw e;
} }
} }
@@ -359,7 +369,8 @@ class AsyncEmbeddedScript2 {
} }
} }
public var onError:Any->Void; // function onError(error:Any, quit:Continuation2, continue:Continuation2) {}
public var onError:(Any,Continuation2,Continuation2)->Void;
#if macro #if macro
public static function build(dslHaxelib:String, dslFile:String, scriptFile:String):Array<Field> { public static function build(dslHaxelib:String, dslFile:String, scriptFile:String):Array<Field> {
@@ -420,14 +431,17 @@ class AsyncEmbeddedScript2 {
}; };
// Or if you're subclassing this before implementing your script, add this macro to the subclass dsl: // Or if you're subclassing this before implementing your script, add this macro to the subclass dsl:
// (defMacro makeCC [&body b] // (defMacro makeCC [errorCC &body b]
// `->:Void [] (runWithErrorChecking ->:Void {,@b})) // `->:Void [] (runWithErrorChecking ->:Void {,@b} errorCC))
k.macros["makeCC"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> { k.macros["makeCC"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
var b = wholeExp.expBuilder(); var b = wholeExp.expBuilder();
wholeExp.checkNumArgs(2, null, "(makeCC <errorCC> <body...>)");
var errorCC = args.shift();
b.callSymbol("lambda", [b.list([]), b.callSymbol("lambda", [b.list([]),
b.callSymbol("runWithErrorChecking", [ b.callSymbol("runWithErrorChecking", [
b.callSymbol("lambda", [b.list([])].concat(args)) b.callSymbol("lambda", [b.list([])].concat(args)),
errorCC
])]); ])]);
}; };