improved error handling for ';'

Author: ppaska

index.html

@@ -29,16 +29,19 @@
   <div class="container">
     <h4>JSPython development console</h4>
     <div id="editor">
+      errorFunc(1)
+      errorFunc(3)
+      errorFunc(6)
+      errorFunc(7)
+      """
+      l = null
+      r = {price: 5}
 
-    try:
-      raise Error('sdsdss')
-      print("Hello")
-    except:
-      print("Something went wrong")
-    finally:
-      print("Something went wrong")
-    else:
-      print("Nothing went wrong")      
+      if l?.price != null and r?.price != null:
+      return 100
+
+      return 1
+      """
 
     </div>
     <!--
@@ -109,6 +112,15 @@ <h4>JSPython development console</h4>
         const scope = {
           Math,
           dateTime: () => new Date(),
+          errorFunc: p => {
+
+            if (p === 6) {
+              throw new Error(`Don't like '6'`);
+            }
+
+            console.log('allGood');
+          },
+
           sqrPromise: (fn) => new Promise((s, f) => setTimeout(() => s(fn * fn), 5)),
           print: (...args) => { console.log(...args); return args.length > 0 ? args[0] : null; },
           x: 10,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jspython-interpreter",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "JSPython is a javascript implementation of Python language that runs within web browser or NodeJS environment",
   "keywords": [
     "python",

src/evaluator/evaluator.ts

@@ -247,7 +247,11 @@ export class Evaluator {
 
             const value = blockContext.blockScope.get((node as GetSingleVarNode).name);
             if (value === undefined) {
-                throw new Error(`Variable ${name} is not defined.`);
+                if (name.charAt(name.length - 1) === ';') {
+                    throw new Error(`Unexpected ';' in the end.`);
+                } else {
+                    throw new Error(`Variable '${name}' is not defined.`);
+                }
             }
             return value;
         }

src/evaluator/evaluatorAsync.ts

@@ -252,8 +252,13 @@ export class EvaluatorAsync {
         if (node.type === "getSingleVar") {
             const name = (node as GetSingleVarNode).name;
             const value = blockContext.blockScope.get(name);
+
             if (value === undefined) {
-                throw new Error(`Variable ${name} is not defined.`);
+                if (name.charAt(name.length - 1) === ';') {
+                    throw new Error(`Unexpected ';' in the end.`);
+                } else {
+                    throw new Error(`Variable '${name}' is not defined.`);
+                }
             }
             return value;
         }

src/initialScope.ts

@@ -2,7 +2,7 @@ import { parseDatetimeOrNull } from "./common/utils";
 
 export const INITIAL_SCOPE = {
     jsPython(): string {
-        return [`JSPython v2.0.9`, "(c) 2020 FalconSoft Ltd. All rights reserved."].join('\n')
+        return [`JSPython v2.0.10`, "(c) 2021 FalconSoft Ltd. All rights reserved."].join('\n')
     },
     dateTime: (str: number | string | any = null) => (str && str.length)
         ? parseDatetimeOrNull(str) || new Date() : new Date(),

src/interpreter.ts

@@ -53,7 +53,7 @@ export class Interpreter {
         } as BlockContext;
 
         blockContext.blockScope.set('printExecutionContext', () => console.log(blockContext.blockScope));
-        blockContext.blockScope.set('getExecutionContext', () => blockContext.blockScope);
+        blockContext.blockScope.set('getExecutionContext', () => blockContext.blockScope.clone());
 
         const result = new Evaluator().evalBlock(ast, blockContext);
         if (!entryFunctionName || !entryFunctionName.length) {
@@ -76,7 +76,7 @@ export class Interpreter {
             blockScope: new Scope(scope)
         } as BlockContext;
         blockContext.blockScope.set('printExecutionContext', () => console.log(blockContext.blockScope));
-        blockContext.blockScope.set('getExecutionContext', () => blockContext.blockScope);
+        blockContext.blockScope.set('getExecutionContext', () => blockContext.blockScope.clone());
 
 
         const result = await evaluator.evalBlockAsync(ast, blockContext);

src/parser/parser.ts

@@ -415,6 +415,10 @@ export class Parser {
             throw new Error(`Tokens length can't empty.`)
         }
 
+        if (getTokenValue(tokens[tokens.length-1]) === ';') {
+            throw new Error(`Unexpected symbol ';' in the end`)
+        }
+
         this._currentToken = tokens[0];
 
         // const or variable
@@ -574,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])}'.`);
     }
 }