More error checking

NexusTools · Dec 3, 2017 · 58e003c · 58e003c
1 parent 99ded28
commit 58e003c
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 22 deletions.
diff --git a/lib/Instructions/Bundle.js b/lib/Instructions/Bundle.js
diff --git a/lib/Instructions/Bundle.js.map b/lib/Instructions/Bundle.js.map
diff --git a/lib/Instructions/Bundle.ts b/lib/Instructions/Bundle.ts
@@ -10,7 +10,7 @@ export class Bundle implements Instruction {
     generateSource(): string {
         var source = "";
         this.bundle.forEach(function(instruction) {
-            source += instruction.generateSource(undefined);
+            source += instruction.generateSource(undefined, false);
         })
         return source;
     }

diff --git a/lib/Instructions/EndIf.js b/lib/Instructions/EndIf.js
diff --git a/lib/Instructions/EndIf.js.map b/lib/Instructions/EndIf.js.map
diff --git a/lib/Instructions/EndIf.ts b/lib/Instructions/EndIf.ts
@@ -8,8 +8,8 @@ export class EndIf implements Instruction {
 
     generateSource(stackControl: StackControl, asyncContext: boolean): string {
         if (stackControl.pop({omitcb:true})['else'] || !asyncContext)
-            return "}";
-        return "}else{__next()}"
+            return "}}catch(e){__out.write(__error(e))}";
+        return "}else{__next()}}catch(e){__out.write(__error(e));__next()}"
     }
 
 }
diff --git a/lib/Instructions/Exec.js b/lib/Instructions/Exec.js
diff --git a/lib/Instructions/Exec.js.map b/lib/Instructions/Exec.js.map
diff --git a/lib/Instructions/Exec.ts b/lib/Instructions/Exec.ts
@@ -16,7 +16,7 @@ export class Exec implements Instruction {
     }
 
     generateSource(): string {
-        return "try{" + this._source + ";}catch(e){__out.write(__error(e));};";
+        return "try{" + this._source + "}catch(e){__out.write(__error(e))}";
     }
 
 }
diff --git a/lib/Instructions/If.js b/lib/Instructions/If.js
diff --git a/lib/Instructions/If.js.map b/lib/Instructions/If.js.map
diff --git a/lib/Instructions/If.ts b/lib/Instructions/If.ts
@@ -19,7 +19,7 @@ export class If implements Instruction {
 
     generateSource(stackControl: {push: Function, pop: Function}): string {
         stackControl.push();
-        return "if (" + this._condition + ") {";
+        return "try{if(" + this._condition + "){";
     }
 
 }
diff --git a/lib/Template.js b/lib/Template.js