fixed error handling and try/except and dateTime

ppaska · ppaska · commit 387ca07915c5 · 2021-01-27T02:49:17.000Z
diff --git a/index.html b/index.html
@@ -29,6 +29,7 @@
   <div class="container">
     <h4>JSPython development console</h4>
     <div id="editor">
+    async def f1():
       errorFunc(1)
       errorFunc(3)
       errorFunc(6)
@@ -42,6 +43,7 @@ <h4>JSPython development console</h4>
 
       return 1
       """
+    f1()
 
     </div>
     <!--
@@ -111,7 +113,6 @@ <h4>JSPython development console</h4>
       try {
         const scope = {
           Math,
-          dateTime: () => new Date(),
           errorFunc: p => {
 
             if (p === 6) {
@@ -144,7 +145,7 @@ <h4>JSPython development console</h4>
         const data = typeof result === 'object' ? JSON.stringify(result, null, '\t') : String(result);
         resultEditor.getSession().setValue(data)
       } catch (err) {
-        console.error(err);
+        console.log('error', err);
         resultEditor.getSession().setValue(String(err.message))
       }
     }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jspython-interpreter",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "JSPython is a javascript implementation of Python language that runs within web browser or NodeJS environment",
   "keywords": [
     "python",
diff --git a/src/evaluator/evaluator.ts b/src/evaluator/evaluator.ts
@@ -80,46 +80,42 @@ export class Evaluator {
         return this.evalBlock(ast, blockContext);
     }
 
-    private invokeFunction(func: (...args: unknown[]) => unknown, fps: unknown[], 
-            loc: { moduleName: string, line: number, column: number }): unknown {
-        try {
-            if (fps.length === 0) { return func(); }
-            if (fps.length === 1) { return func(fps[0]); }
-            if (fps.length === 2) { return func(fps[0], fps[1]); }
-            if (fps.length === 3) { return func(fps[0], fps[1], fps[2]); }
-            if (fps.length === 4) {
-                return func(fps[0], fps[1], fps[2], fps[3]);
-            }
-            if (fps.length === 5) {
-                return func(fps[0], fps[1], fps[2], fps[3], fps[4]);
-            }
+    private invokeFunction(func: (...args: unknown[]) => unknown, fps: unknown[],
+        loc: { moduleName: string, line: number, column: number }): unknown {
+
+        if (fps.length === 0) { return func(); }
+        if (fps.length === 1) { return func(fps[0]); }
+        if (fps.length === 2) { return func(fps[0], fps[1]); }
+        if (fps.length === 3) { return func(fps[0], fps[1], fps[2]); }
+        if (fps.length === 4) {
+            return func(fps[0], fps[1], fps[2], fps[3]);
+        }
+        if (fps.length === 5) {
+            return func(fps[0], fps[1], fps[2], fps[3], fps[4]);
+        }
 
-            if (fps.length === 6) {
-                return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5]);
-            }
+        if (fps.length === 6) {
+            return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5]);
+        }
 
-            if (fps.length === 7) {
-                return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6]);
-            }
+        if (fps.length === 7) {
+            return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6]);
+        }
 
-            if (fps.length === 8) {
-                return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7]);
-            }
+        if (fps.length === 8) {
+            return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7]);
+        }
 
-            if (fps.length === 9) {
-                return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8]);
-            }
+        if (fps.length === 9) {
+            return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8]);
+        }
 
-            if (fps.length === 10) {
-                return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9]);
-            }
+        if (fps.length === 10) {
+            return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9]);
+        }
 
-            if (fps.length > 10) {
-                throw Error('Function has too many parameters. Current limitation is 10');
-            }
-        } catch (err) {
-            var jspyError = new JspyError(loc?.moduleName || 'js-func-error.jspy', loc?.line || 0, loc?.column || 0, 'FuncCall', err.message || err);
-            throw jspyError;
+        if (fps.length > 10) {
+            throw Error('Function has too many parameters. Current limitation is 10');
         }
 
     }
@@ -161,23 +157,18 @@ export class Evaluator {
                 }
             }
             catch (err) {
-                if (err instanceof JspyEvalError) {
-                    // evaluation error should not be handled
-                    throw err;
-                } else {
-                    const name = (err instanceof JspyError) ? (err as JspyError).name : typeof (err);
-                    const message = (err instanceof JspyError) ? (err as JspyError).message : err ?? err.message;
-                    const moduleName = (err instanceof JspyError) ? (err as JspyError).module : 0;
-                    const line = (err instanceof JspyError) ? (err as JspyError).line : 0;
-                    const column = (err instanceof JspyError) ? (err as JspyError).column : 0;
-
-                    const firstExept = tryNode.exepts[0];
-                    const catchBody = firstExept.body;
-                    const ctx = blockContext;// cloneContext(blockContext);
-                    ctx.blockScope.set(firstExept.error?.alias || "error", { name, message, line, column, moduleName })
-                    this.evalBlock({ name: blockContext.moduleName, type: 'trycatch', body: catchBody } as AstBlock, ctx);
-                    ctx.blockScope.set(firstExept.error?.alias || "error", null)
-                }
+                const name = (err instanceof JspyError) ? (err as JspyError).name : typeof (err);
+                const message = (err instanceof JspyError) ? (err as JspyError).message : err?.message ?? String(err);
+                const moduleName = (err instanceof JspyError) ? (err as JspyError).module : 0;
+                const line = (err instanceof JspyError) ? (err as JspyError).line : 0;
+                const column = (err instanceof JspyError) ? (err as JspyError).column : 0;
+
+                const firstExept = tryNode.exepts[0];
+                const catchBody = firstExept.body;
+                const ctx = blockContext;// cloneContext(blockContext);
+                ctx.blockScope.set(firstExept.error?.alias || "error", { name, message, line, column, moduleName })
+                this.evalBlock({ name: blockContext.moduleName, type: 'trycatch', body: catchBody } as AstBlock, ctx);
+                ctx.blockScope.set(firstExept.error?.alias || "error", null)
             }
             finally {
                 if (tryNode.finallyBody?.length || 0 > 0) {
diff --git a/src/evaluator/evaluatorAsync.ts b/src/evaluator/evaluatorAsync.ts
@@ -88,42 +88,38 @@ export class EvaluatorAsync {
         return await this.evalBlockAsync(ast, blockContext);
     }
 
-    private async invokeFunctionAsync(func: (...args: unknown[]) => unknown, fps: unknown[], 
-            loc?: { moduleName: string, line: number, column: number }): Promise<unknown> {
-        try {
-            if (fps.length === 0) { return await func(); }
-            if (fps.length === 1) { return await func(fps[0]); }
-            if (fps.length === 2) { return await func(fps[0], fps[1]); }
-            if (fps.length === 3) { return await func(fps[0], fps[1], fps[2]); }
-            if (fps.length === 4) {
-                return await func(fps[0], fps[1], fps[2], fps[3]);
-            }
-            if (fps.length === 5) {
-                return await func(fps[0], fps[1], fps[2], fps[3], fps[4]);
-            }
+    private async invokeFunctionAsync(func: (...args: unknown[]) => unknown, fps: unknown[],
+        loc?: { moduleName: string, line: number, column: number }): Promise<unknown> {
+
+        if (fps.length === 0) { return await func(); }
+        if (fps.length === 1) { return await func(fps[0]); }
+        if (fps.length === 2) { return await func(fps[0], fps[1]); }
+        if (fps.length === 3) { return await func(fps[0], fps[1], fps[2]); }
+        if (fps.length === 4) {
+            return await func(fps[0], fps[1], fps[2], fps[3]);
+        }
+        if (fps.length === 5) {
+            return await func(fps[0], fps[1], fps[2], fps[3], fps[4]);
+        }
 
-            if (fps.length === 6) {
-                return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5]);
-            }
+        if (fps.length === 6) {
+            return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5]);
+        }
 
-            if (fps.length === 7) {
-                return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6]);
-            }
+        if (fps.length === 7) {
+            return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6]);
+        }
 
-            if (fps.length === 8) {
-                return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7]);
-            }
+        if (fps.length === 8) {
+            return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7]);
+        }
 
-            if (fps.length === 9) {
-                return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8]);
-            }
+        if (fps.length === 9) {
+            return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8]);
+        }
 
-            if (fps.length === 10) {
-                return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9]);
-            }
-        } catch (err) {
-            var jspyError = new JspyError(loc?.moduleName || 'js-func-error.jspy', loc?.line || 0, loc?.column || 0, 'FuncCall', err.message || err);
-            throw jspyError;
+        if (fps.length === 10) {
+            return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9]);
         }
 
         if (fps.length > 10) {
@@ -168,23 +164,19 @@ export class EvaluatorAsync {
                 }
             }
             catch (err) {
-                if (err instanceof JspyEvalError) {
-                    // evaluation error should not be handled
-                    throw err;
-                } else {
-                    const name = (err instanceof JspyError) ? (err as JspyError).name : typeof (err);
-                    const message = (err instanceof JspyError) ? (err as JspyError).message : err ?? err.message;
-                    const moduleName = (err instanceof JspyError) ? (err as JspyError).module : 0;
-                    const line = (err instanceof JspyError) ? (err as JspyError).line : 0;
-                    const column = (err instanceof JspyError) ? (err as JspyError).column : 0;
-
-                    const firstExept = tryNode.exepts[0];
-                    const catchBody = firstExept.body;
-                    const ctx = blockContext;// cloneContext(blockContext);
-                    ctx.blockScope.set(firstExept.error?.alias || "error", { name, message, line, column, moduleName })
-                    await this.evalBlockAsync({ name: blockContext.moduleName, type: 'trycatch', body: catchBody } as AstBlock, ctx);
-                    ctx.blockScope.set(firstExept.error?.alias || "error", null);
-                }
+                // catches here all exceptions. Including JSPY Eval errors
+                const name = (err instanceof JspyError) ? (err as JspyError).name : typeof (err);
+                const message = (err instanceof JspyError) ? (err as JspyError).message : err?.message ?? String(err);
+                const moduleName = (err instanceof JspyError) ? (err as JspyError).module : 0;
+                const line = (err instanceof JspyError) ? (err as JspyError).line : 0;
+                const column = (err instanceof JspyError) ? (err as JspyError).column : 0;
+
+                const firstExept = tryNode.exepts[0];
+                const catchBody = firstExept.body;
+                const ctx = blockContext;
+                ctx.blockScope.set(firstExept.error?.alias || "error", { name, message, line, column, moduleName })
+                await this.evalBlockAsync({ name: blockContext.moduleName, type: 'trycatch', body: catchBody } as AstBlock, ctx);
+                ctx.blockScope.set(firstExept.error?.alias || "error", null);
             }
             finally {
                 if (tryNode.finallyBody?.length || 0 > 0) {
diff --git a/src/initialScope.ts b/src/initialScope.ts
@@ -2,10 +2,9 @@ import { parseDatetimeOrNull } from "./common/utils";
 
 export const INITIAL_SCOPE = {
     jsPython(): string {
-        return [`JSPython v2.0.10`, "(c) 2021 FalconSoft Ltd. All rights reserved."].join('\n')
+        return [`JSPython v2.0.11`, "(c) 2021 FalconSoft Ltd. All rights reserved."].join('\n')
     },
-    dateTime: (str: number | string | any = null) => (str && str.length)
-        ? parseDatetimeOrNull(str) || new Date() : new Date(),
+    dateTime: (str: number | string | any = null) => parseDatetimeOrNull(str) || new Date(),
     range: range,
     print: (...args: any[]) => { console.log(...args); return args.length > 0 ? args[0] : null; },
     isNull: (v: any, defValue: any = null): boolean | any => defValue === null ? v === null : v || defValue,
diff --git a/src/parser/parser.ts b/src/parser/parser.ts
@@ -415,7 +415,7 @@ export class Parser {
             throw new Error(`Tokens length can't empty.`)
         }
 
-        if (getTokenValue(tokens[tokens.length-1]) === ';') {
+        if (getTokenValue(tokens[tokens.length - 1]) === ';') {
             throw new Error(`Unexpected symbol ';' in the end`)
         }
 
@@ -578,7 +578,7 @@ export class Parser {
             const paramsNodes = this.createExpressionNode(paramsTokensSlice);
             return new BracketObjectAccessNode(name, paramsNodes, false, getTokenLoc(tokens[0]));
         }
-        
+
         throw Error(`Undefined node '${getTokenValue(tokens[0])}'.`);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jspython-interpreter",`
`3`		`- "version": "2.0.10",`
	`3`	`+ "version": "2.0.11",`
`4`	`4`	`"description": "JSPython is a javascript implementation of Python language that runs within web browser or NodeJS environment",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"python",`
Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ export class Parser {`
`415`	`415`	throw new Error(`Tokens length can't empty.`)
`416`	`416`	`}`
`417`	`417`
`418`		`- if (getTokenValue(tokens[tokens.length-1]) === ';') {`
	`418`	`+ if (getTokenValue(tokens[tokens.length - 1]) === ';') {`
`419`	`419`	throw new Error(`Unexpected symbol ';' in the end`)
`420`	`420`	`}`
`421`	`421`
`@@ -578,7 +578,7 @@ export class Parser {`
`578`	`578`	`const paramsNodes = this.createExpressionNode(paramsTokensSlice);`
`579`	`579`	`return new BracketObjectAccessNode(name, paramsNodes, false, getTokenLoc(tokens[0]));`
`580`	`580`	`}`
`581`		`-`
	`581`	`+`
`582`	`582`	throw Error(`Undefined node '${getTokenValue(tokens[0])}'.`);
`583`	`583`	`}`
`584`	`584`	`}`