xmlui 0.8.6 → 0.9.1

package/dist/scripts/src/components-core/script-runner/process-statement-sync.js

@@ -2,15 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processStatementQueue = processStatementQueue;
 exports.processDeclarations = processDeclarations;
-const eval_tree_sync_1 = require("../script-runner/eval-tree-sync");
+const ScriptingSourceTreeExp_1 = require("../../abstractions/scripting/ScriptingSourceTreeExp");
 const reportEngineError_1 = require("../reportEngineError");
 const EngineError_1 = require("../EngineError");
 const process_statement_common_1 = require("./process-statement-common");
+const eval_tree_sync_1 = require("./eval-tree-sync");
 const statement_queue_1 = require("./statement-queue");
+const Parser_1 = require("../../parsers/scripting-exp/Parser");
 const SYNC_EVAL_TIMEOUT = 1000;
 // --- Helper function to process the entire queue synchronously
 function processStatementQueue(statements, evalContext, thread) {
-    var _a;
+    var _a, _b, _c;
     if (!thread) {
         // --- Create the main thread for the queue
         thread = (0, process_statement_common_1.ensureMainThread)(evalContext);
@@ -21,7 +23,7 @@ function processStatementQueue(statements, evalContext, thread) {
     evalContext.startTick = new Date().valueOf();
     // --- Fill the queue with items
     const queue = new statement_queue_1.StatementQueue();
-    queue.push((0, statement_queue_1.mapStatementsToQueueItems)(statements));
+    queue.push((0, statement_queue_1.mapStatementsToQueueItems)((0, process_statement_common_1.toStatementItems)(statements)));
     // --- Prepare queue diagnostics information
     const diagInfo = {
         processedStatements: 0,
@@ -43,7 +45,10 @@ function processStatementQueue(statements, evalContext, thread) {
         thread.breakLabelValue = queue.length > 0 ? queue.peek().label : -1;
         let outcome;
         try {
-            outcome = processStatement(queueItem.statement, evalContext, thread);
+            // --- Sign that the statement is about to start
+            (_a = evalContext === null || evalContext === void 0 ? void 0 : evalContext.onStatementStarted) === null || _a === void 0 ? void 0 : _a.call(evalContext, evalContext, queueItem.statement);
+            // --- Execute the statement
+            outcome = processStatement(queueItem.statement, (_b = queueItem.execInfo) !== null && _b !== void 0 ? _b : {}, evalContext, thread);
         }
         catch (err) {
             if (thread.tryBlocks && thread.tryBlocks.length > 0) {
@@ -63,7 +68,8 @@ function processStatementQueue(statements, evalContext, thread) {
                     (0, reportEngineError_1.reportEngineError)(err);
                 }
                 else {
-                    (0, reportEngineError_1.reportEngineError)(new EngineError_1.StatementExecutionError(err, (_a = queueItem.statement) === null || _a === void 0 ? void 0 : _a.source), err);
+                    // TODO: Provide source code information
+                    (0, reportEngineError_1.reportEngineError)(new EngineError_1.StatementExecutionError(err /* queueItem!.statement?.source */), err);
                 }
             }
         }
@@ -78,6 +84,8 @@ function processStatementQueue(statements, evalContext, thread) {
                 diagInfo.clearToLabels++;
             }
         }
+        // --- Sign that the statement has been completed
+        (_c = evalContext === null || evalContext === void 0 ? void 0 : evalContext.onStatementCompleted) === null || _c === void 0 ? void 0 : _c.call(evalContext, evalContext, queueItem.statement);
         // --- Provide diagnostics
         if (queue.length > diagInfo.maxQueueLength) {
             diagInfo.maxQueueLength = queue.length;
@@ -90,6 +98,7 @@ function processStatementQueue(statements, evalContext, thread) {
         }
         diagInfo.processedStatements++;
     }
+    // --- Done.
     return diagInfo;
 }
 /**
@@ -99,128 +108,94 @@ function processStatementQueue(statements, evalContext, thread) {
  * @param thread Logical thread to use for statement processing
  * @returns Items to put back into the queue of statements
  */
-function processStatement(statement, evalContext, thread) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+function processStatement(statement, execInfo, evalContext, thread) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     // --- These items should be put in the statement queue after return
     let toUnshift = [];
     let clearToLabel;
     // --- Process the statement according to its type
     switch (statement.type) {
-        case "ImportD":
-            // --- Get module information
-            const thisModule = statement.module;
-            if (!thisModule) {
-                throw new Error("Missing module");
-            }
-            const parentModule = (_a = statement.module) === null || _a === void 0 ? void 0 : _a.parent;
-            if (!parentModule) {
-                throw new Error("Missing parent module");
-            }
-            // --- At this point the imported module is set
-            // if (!statement.module!.executed) {
-            //   // --- Run the module, it has not been executed yet
-            //   const childEvalContext = createEvalContext({
-            //     cancellationToken: evalContext.cancellationToken,
-            //     timeout: evalContext.timeout ?? 1000
-            //   });
-            //   statement.module!.executed = true;
-            //   executeScriptModule(statement.module!, childEvalContext);
-            // }
-            // --- Import the module's exported variables into the parent module
-            const topVars = evalContext.mainThread.blocks[0].vars;
-            const topConst = evalContext.mainThread.blocks[0].constVars;
-            for (const modImports of Object.values(statement.imports)) {
-                for (const key of Object.keys(modImports)) {
-                    if (key in topVars) {
-                        throw new Error(`Import ${key} already exists`);
-                    }
-                    topVars[key] = statement.module.exports.get(modImports[key]);
-                    topConst.add(key);
-                }
-            }
-            break;
-        case "FuncD":
+        case ScriptingSourceTreeExp_1.T_FUNCTION_DECLARATION:
             // --- Function declarations are already hoisted, nothing to do
             break;
-        case "VarS":
+        case ScriptingSourceTreeExp_1.T_VAR_STATEMENT:
             if (thread !== evalContext.mainThread) {
                 throw new Error("'var' declarations are not allowed within functions");
             }
             break;
-        case "EmptyS":
+        case ScriptingSourceTreeExp_1.T_EMPTY_STATEMENT:
             // --- Nothing to do
             break;
-        case "BlockS":
+        case ScriptingSourceTreeExp_1.T_BLOCK_STATEMENT:
             // --- No statement, nothing to process
-            if (statement.statements.length === 0)
+            if (statement.stmts.length === 0)
                 break;
             // --- Create a new block scope
-            (_b = thread.blocks) !== null && _b !== void 0 ? _b : (thread.blocks = []);
+            (_a = thread.blocks) !== null && _a !== void 0 ? _a : (thread.blocks = []);
             thread.blocks.push({ vars: {} });
             // --- Hoist function declarations to the innermost block scope
-            (0, process_statement_common_1.hoistFunctionDeclarations)(thread, statement.statements);
-            // --- Prepare an empty statement that will only remove the block scope when the entire block is processed
-            const closing = {
-                type: "EmptyS",
-                removeBlockScope: true,
-            }; // --- We need the cast as we do not provide required props
-            // --- Queue the block scope's body
-            toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([...statement.statements, closing]);
+            (0, process_statement_common_1.hoistFunctionDeclarations)(thread, statement.stmts);
+            // --- Queue the block scope's body...
+            toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([
+                ...(0, process_statement_common_1.toStatementItems)(statement.stmts),
+                // --- ...and an empty statement to remove the block scope
+                (0, process_statement_common_1.closing)(),
+            ]);
             break;
-        case "ExprS":
+        case ScriptingSourceTreeExp_1.T_EXPRESSION_STATEMENT:
             // --- Just evaluate it
-            const statementValue = (0, eval_tree_sync_1.evalBinding)(statement.expression, evalContext, thread);
+            const statementValue = (0, eval_tree_sync_1.evalBinding)(statement.expr, evalContext, thread);
             if (thread.blocks && thread.blocks.length !== 0) {
                 thread.blocks[thread.blocks.length - 1].returnValue = statementValue;
             }
             break;
-        case "ArrowS":
+        case ScriptingSourceTreeExp_1.T_ARROW_EXPRESSION_STATEMENT:
             // --- Compile the arrow expression
-            const arrowFuncValue = (0, eval_tree_sync_1.executeArrowExpressionSync)(statement.expression, evalContext, thread, ...((_c = evalContext.eventArgs) !== null && _c !== void 0 ? _c : []));
+            const arrowFuncValue = (0, eval_tree_sync_1.executeArrowExpressionSync)(statement.expr, evalContext, thread, ...((_b = evalContext.eventArgs) !== null && _b !== void 0 ? _b : []));
             if (thread.blocks && thread.blocks.length !== 0) {
                 thread.blocks[thread.blocks.length - 1].returnValue = arrowFuncValue;
             }
             break;
-        case "LetS": {
+        case ScriptingSourceTreeExp_1.T_LET_STATEMENT: {
             // --- Create a new variable in the innermost scope
             const block = (0, process_statement_common_1.innermostBlockScope)(thread);
             if (!block) {
                 throw new Error("Missing block scope");
             }
-            processDeclarations(block, evalContext, thread, statement.declarations);
+            processDeclarations(block, evalContext, thread, statement.decls);
             break;
         }
-        case "ConstS": {
+        case ScriptingSourceTreeExp_1.T_CONST_STATEMENT: {
             // --- Create a new variable in the innermost scope
             const block = (0, process_statement_common_1.innermostBlockScope)(thread);
             if (!block) {
                 throw new Error("Missing block scope");
             }
-            processDeclarations(block, evalContext, thread, statement.declarations, true);
+            processDeclarations(block, evalContext, thread, statement.decls, true);
             break;
         }
-        case "IfS":
+        case ScriptingSourceTreeExp_1.T_IF_STATEMENT:
             // --- Evaluate the condition
-            const condition = !!(0, eval_tree_sync_1.evalBinding)(statement.condition, evalContext, thread);
+            const condition = !!(0, eval_tree_sync_1.evalBinding)(statement.cond, evalContext, thread);
             if (condition) {
-                toUnshift = (0, statement_queue_1.mapToItem)(statement.thenBranch);
+                toUnshift = (0, statement_queue_1.mapToItem)(statement.thenB);
             }
-            else if (statement.elseBranch) {
-                toUnshift = (0, statement_queue_1.mapToItem)(statement.elseBranch);
+            else if (statement.elseB) {
+                toUnshift = (0, statement_queue_1.mapToItem)(statement.elseB);
             }
             break;
-        case "RetS": {
+        case ScriptingSourceTreeExp_1.T_RETURN_STATEMENT: {
             // --- Check if return is valid here
             let blockScope = (0, process_statement_common_1.innermostBlockScope)(thread);
             if (blockScope === undefined) {
                 throw new Error("Return requires a block scope");
             }
             // --- Store the return value
-            thread.returnValue = statement.expression
-                ? (0, eval_tree_sync_1.evalBinding)(statement.expression, evalContext, thread)
+            thread.returnValue = statement.expr
+                ? (0, eval_tree_sync_1.evalBinding)(statement.expr, evalContext, thread)
                 : undefined;
             // --- Check for try blocks
-            if (((_d = thread.tryBlocks) !== null && _d !== void 0 ? _d : []).length > 0) {
+            if (((_c = thread.tryBlocks) !== null && _c !== void 0 ? _c : []).length > 0) {
                 // --- Mark the loop's try scope to exit with "return"
                 const returnTryScope = thread.tryBlocks[0];
                 returnTryScope.exitType = "return";
@@ -238,11 +213,11 @@ function processStatement(statement, evalContext, thread) {
             }
             break;
         }
-        case "WhileS": {
+        case ScriptingSourceTreeExp_1.T_WHILE_STATEMENT: {
             // --- Create or get the loop's scope (guard is falsy for the first execution)
-            let loopScope = statement.guard ? (0, process_statement_common_1.innermostLoopScope)(thread) : (0, process_statement_common_1.createLoopScope)(thread);
+            let loopScope = execInfo.guard ? (0, process_statement_common_1.innermostLoopScope)(thread) : (0, process_statement_common_1.createLoopScope)(thread);
             // --- Evaluate the loop condition
-            const condition = !!(0, eval_tree_sync_1.evalBinding)(statement.condition, evalContext, thread);
+            const condition = !!(0, eval_tree_sync_1.evalBinding)(statement.cond, evalContext, thread);
             if (condition) {
                 toUnshift = (0, process_statement_common_1.provideLoopBody)(loopScope, statement, thread.breakLabelValue);
             }
@@ -252,14 +227,14 @@ function processStatement(statement, evalContext, thread) {
             }
             break;
         }
-        case "DoWS": {
-            if (!statement.guard) {
+        case ScriptingSourceTreeExp_1.T_DO_WHILE_STATEMENT: {
+            if (!execInfo.guard) {
                 // --- First loop execution (do-while is a post-test loop)
                 toUnshift = (0, process_statement_common_1.provideLoopBody)((0, process_statement_common_1.createLoopScope)(thread), statement, thread.breakLabelValue);
                 break;
             }
             // --- Evaluate the loop condition
-            const condition = !!(0, eval_tree_sync_1.evalBinding)(statement.condition, evalContext, thread);
+            const condition = !!(0, eval_tree_sync_1.evalBinding)(statement.cond, evalContext, thread);
             if (condition) {
                 toUnshift = (0, process_statement_common_1.provideLoopBody)((0, process_statement_common_1.innermostLoopScope)(thread), statement, thread.breakLabelValue);
             }
@@ -269,7 +244,7 @@ function processStatement(statement, evalContext, thread) {
             }
             break;
         }
-        case "ContS": {
+        case ScriptingSourceTreeExp_1.T_CONTINUE_STATEMENT: {
             // --- Search for the innermost non-switch loop scope, release the switch scopes
             if (!thread.loops || thread.loops.length === 0) {
                 throw new Error("Missing loop scope");
@@ -286,7 +261,7 @@ function processStatement(statement, evalContext, thread) {
                 throw new Error("Missing loop scope");
             }
             if (loopScope.tryBlockDepth >= 0 &&
-                loopScope.tryBlockDepth < ((_e = thread.tryBlocks) !== null && _e !== void 0 ? _e : []).length) {
+                loopScope.tryBlockDepth < ((_d = thread.tryBlocks) !== null && _d !== void 0 ? _d : []).length) {
                 // --- Mark the loop's try scope to exit with "continue"
                 for (let i = loopScope.tryBlockDepth; i < thread.tryBlocks.length; i++) {
                     thread.tryBlocks[loopScope.tryBlockDepth].exitType = "continue";
@@ -301,7 +276,7 @@ function processStatement(statement, evalContext, thread) {
             }
             break;
         }
-        case "BrkS": {
+        case ScriptingSourceTreeExp_1.T_BREAK_STATEMENT: {
             const loopScope = (0, process_statement_common_1.innermostLoopScope)(thread);
             if (loopScope === undefined) {
                 throw new Error("Missing loop scope");
@@ -313,7 +288,7 @@ function processStatement(statement, evalContext, thread) {
             }
             // --- Break is in a loop construct
             if (loopScope.tryBlockDepth >= 0 &&
-                loopScope.tryBlockDepth < ((_f = thread.tryBlocks) !== null && _f !== void 0 ? _f : []).length) {
+                loopScope.tryBlockDepth < ((_e = thread.tryBlocks) !== null && _e !== void 0 ? _e : []).length) {
                 // --- Mark the loop's try scope to exit with "break"
                 for (let i = loopScope.tryBlockDepth; i < thread.tryBlocks.length; i++) {
                     thread.tryBlocks[loopScope.tryBlockDepth].exitType = "break";
@@ -328,17 +303,17 @@ function processStatement(statement, evalContext, thread) {
             }
             break;
         }
-        case "ForS":
-            if (!statement.guard) {
+        case ScriptingSourceTreeExp_1.T_FOR_STATEMENT:
+            if (!execInfo.guard) {
                 // --- Init the loop with a new scope
                 (0, process_statement_common_1.createLoopScope)(thread, 1);
                 // --- Create a new block for the loop variables
-                (_g = thread.blocks) !== null && _g !== void 0 ? _g : (thread.blocks = []);
+                (_f = thread.blocks) !== null && _f !== void 0 ? _f : (thread.blocks = []);
                 thread.blocks.push({ vars: {} });
-                const guardStatement = Object.assign(Object.assign({}, statement), { guard: true });
+                const guardStatement = (0, process_statement_common_1.guard)(statement);
                 if (statement.init) {
                     // --- Unshift the initialization part and the guarded for-loop
-                    toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([statement.init, guardStatement]);
+                    toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([{ statement: statement.init }, guardStatement]);
                 }
                 else {
                     // --- No init, unshift only the guard statement
@@ -347,21 +322,31 @@ function processStatement(statement, evalContext, thread) {
             }
             else {
                 // --- Initialization already done. Evaluate the condition
-                if (!statement.condition || (0, eval_tree_sync_1.evalBinding)(statement.condition, evalContext, thread)) {
+                if (!statement.cond || (0, eval_tree_sync_1.evalBinding)(statement.cond, evalContext, thread)) {
                     // --- Stay in the loop, inject the body, the update expression, and the loop guard
                     const loopScope = (0, process_statement_common_1.innermostLoopScope)(thread);
-                    if (statement.update) {
+                    if (statement.upd) {
                         const updateStmt = {
-                            type: "ExprS",
-                            expression: statement.update,
+                            statement: {
+                                type: ScriptingSourceTreeExp_1.T_EXPRESSION_STATEMENT,
+                                nodeId: (0, Parser_1.createXmlUiTreeNodeId)(),
+                                expr: statement.upd,
+                            },
                         };
-                        toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([statement.body, updateStmt, Object.assign({}, statement)]);
+                        toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([
+                            { statement: statement.body },
+                            updateStmt,
+                            { statement, execInfo },
+                        ]);
                     }
                     else {
-                        toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([statement.body, Object.assign({}, statement)]);
+                        toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([
+                            { statement: statement.body },
+                            { statement, execInfo },
+                        ]);
                     }
                     // --- The next queue label is for "break"
-                    loopScope.breakLabel = (_h = thread.breakLabelValue) !== null && _h !== void 0 ? _h : -1;
+                    loopScope.breakLabel = (_g = thread.breakLabelValue) !== null && _g !== void 0 ? _g : -1;
                     // --- The guard action's label is for "continue"
                     loopScope.continueLabel = toUnshift[1].label;
                 }
@@ -371,10 +356,10 @@ function processStatement(statement, evalContext, thread) {
                 }
             }
             break;
-        case "ForInS":
-            if (!statement.guard) {
+        case ScriptingSourceTreeExp_1.T_FOR_IN_STATEMENT:
+            if (!execInfo.guard) {
                 // --- Get the object keys
-                const keyedObject = (0, eval_tree_sync_1.evalBinding)(statement.expression, evalContext, thread);
+                const keyedObject = (0, eval_tree_sync_1.evalBinding)(statement.expr, evalContext, thread);
                 if (keyedObject == undefined) {
                     // --- Nothing to do, no object to traverse
                     break;
@@ -382,32 +367,32 @@ function processStatement(statement, evalContext, thread) {
                 // --- Init the loop with a new scope
                 (0, process_statement_common_1.createLoopScope)(thread, 1);
                 // --- Create a new block for the loop variables
-                (_j = thread.blocks) !== null && _j !== void 0 ? _j : (thread.blocks = []);
+                (_h = thread.blocks) !== null && _h !== void 0 ? _h : (thread.blocks = []);
                 thread.blocks.push({ vars: {} });
-                statement.keys = Object.keys(keyedObject);
-                statement.keyIndex = 0;
-                toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([Object.assign(Object.assign({}, statement), { guard: true })]);
+                toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([
+                    { statement, execInfo: { guard: true, keys: Object.keys(keyedObject), keyIndex: 0 } },
+                ]);
             }
             else {
                 // --- Just for the sake of extra safety
-                if (statement.keyIndex === undefined || statement.keys === undefined) {
+                if (execInfo.keyIndex === undefined || execInfo.keys === undefined) {
                     throw new Error("Keys information expected in for..in loop");
                 }
                 // --- Any key left?
-                if (statement.keyIndex < statement.keys.length) {
+                if (execInfo.keyIndex < execInfo.keys.length) {
                     // --- Set the binding variable to the next key
-                    const propValue = statement.keys[statement.keyIndex++];
-                    switch (statement.varBinding) {
+                    const propValue = execInfo.keys[execInfo.keyIndex++];
+                    switch (statement.varB) {
                         case "none": {
                             const assigmentExpr = {
-                                type: "AsgnE",
+                                type: ScriptingSourceTreeExp_1.T_ASSIGNMENT_EXPRESSION,
                                 leftValue: {
-                                    type: "IdE",
-                                    name: statement.id,
+                                    type: ScriptingSourceTreeExp_1.T_IDENTIFIER,
+                                    name: statement.id.name,
                                 },
-                                operator: "=",
-                                operand: {
-                                    type: "LitE",
+                                op: "=",
+                                expr: {
+                                    type: ScriptingSourceTreeExp_1.T_LITERAL,
                                     value: propValue,
                                 },
                             };
@@ -422,19 +407,22 @@ function processStatement(statement, evalContext, thread) {
                                 if (!block) {
                                     throw new Error("Missing block scope");
                                 }
-                                block.vars[statement.id] = propValue;
-                                if (statement.varBinding === "const") {
-                                    (_k = block.constVars) !== null && _k !== void 0 ? _k : (block.constVars = new Set());
-                                    block.constVars.add(statement.id);
+                                block.vars[statement.id.name] = propValue;
+                                if (statement.varB === "const") {
+                                    (_j = block.constVars) !== null && _j !== void 0 ? _j : (block.constVars = new Set());
+                                    block.constVars.add(statement.id.name);
                                 }
                             }
                             break;
                     }
                     // --- Inject the loop body
                     const loopScope = (0, process_statement_common_1.innermostLoopScope)(thread);
-                    toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([statement.body, Object.assign({}, statement)]);
+                    toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([
+                        { statement: statement.body },
+                        { statement, execInfo },
+                    ]);
                     // --- The next queue label is for "break"
-                    loopScope.breakLabel = (_l = thread.breakLabelValue) !== null && _l !== void 0 ? _l : -1;
+                    loopScope.breakLabel = (_k = thread.breakLabelValue) !== null && _k !== void 0 ? _k : -1;
                     // --- The guard action's label is for "continue"
                     loopScope.continueLabel = toUnshift[1].label;
                 }
@@ -444,10 +432,10 @@ function processStatement(statement, evalContext, thread) {
                 }
             }
             break;
-        case "ForOfS":
-            if (!statement.guard) {
+        case ScriptingSourceTreeExp_1.T_FOR_OF_STATEMENT:
+            if (!execInfo.guard) {
                 // --- Get the object keys
-                const iteratorObject = (0, eval_tree_sync_1.evalBinding)(statement.expression, evalContext, thread);
+                const iteratorObject = (0, eval_tree_sync_1.evalBinding)(statement.expr, evalContext, thread);
                 if (iteratorObject == null || typeof iteratorObject[Symbol.iterator] !== "function") {
                     // --- The object is not an iterator
                     throw new Error("Object in for..of is not iterable");
@@ -455,18 +443,19 @@ function processStatement(statement, evalContext, thread) {
                 // --- Init the loop with a new scope
                 (0, process_statement_common_1.createLoopScope)(thread, 1);
                 // --- Create a new block for the loop variables
-                (_m = thread.blocks) !== null && _m !== void 0 ? _m : (thread.blocks = []);
+                (_l = thread.blocks) !== null && _l !== void 0 ? _l : (thread.blocks = []);
                 thread.blocks.push({ vars: {} });
-                statement.iterator = iteratorObject[Symbol.iterator]();
-                toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([Object.assign(Object.assign({}, statement), { guard: true })]);
+                toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([
+                    { statement, execInfo: { guard: true, iterator: iteratorObject[Symbol.iterator]() } },
+                ]);
             }
             else {
                 // --- Just for the sake of extra safety
-                if (statement.iterator === undefined) {
+                if (execInfo.iterator === undefined) {
                     throw new Error("Iterator expected in for..of loop");
                 }
                 // --- Any iteration left?
-                const nextIteration = statement.iterator.next();
+                const nextIteration = execInfo.iterator.next();
                 if (nextIteration.done) {
                     // --- The for..of loop is complete. Remove the loop's scope from the evaluation context
                     (0, process_statement_common_1.releaseLoopScope)(thread);
@@ -474,17 +463,17 @@ function processStatement(statement, evalContext, thread) {
                 }
                 // --- Set the binding variable to the next key
                 const propValue = nextIteration.value;
-                switch (statement.varBinding) {
+                switch (statement.varB) {
                     case "none": {
                         const assigmentExpr = {
-                            type: "AsgnE",
+                            type: ScriptingSourceTreeExp_1.T_ASSIGNMENT_EXPRESSION,
                             leftValue: {
-                                type: "IdE",
-                                name: statement.id,
+                                type: ScriptingSourceTreeExp_1.T_IDENTIFIER,
+                                name: statement.id.name,
                             },
-                            operator: "=",
-                            operand: {
-                                type: "LitE",
+                            op: "=",
+                            expr: {
+                                type: ScriptingSourceTreeExp_1.T_LITERAL,
                                 value: propValue,
                             },
                         };
@@ -499,28 +488,31 @@ function processStatement(statement, evalContext, thread) {
                             if (!block) {
                                 throw new Error("Missing block scope");
                             }
-                            block.vars[statement.id] = propValue;
-                            if (statement.varBinding === "const") {
-                                (_o = block.constVars) !== null && _o !== void 0 ? _o : (block.constVars = new Set());
-                                block.constVars.add(statement.id);
+                            block.vars[statement.id.name] = propValue;
+                            if (statement.varB === "const") {
+                                (_m = block.constVars) !== null && _m !== void 0 ? _m : (block.constVars = new Set());
+                                block.constVars.add(statement.id.name);
                             }
                         }
                         break;
                 }
                 // --- Inject the loop body
                 const loopScope = (0, process_statement_common_1.innermostLoopScope)(thread);
-                toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([statement.body, Object.assign({}, statement)]);
+                toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([
+                    { statement: statement.body },
+                    { statement, execInfo },
+                ]);
                 // --- The next queue label is for "break"
-                loopScope.breakLabel = (_p = thread.breakLabelValue) !== null && _p !== void 0 ? _p : -1;
+                loopScope.breakLabel = (_o = thread.breakLabelValue) !== null && _o !== void 0 ? _o : -1;
                 // --- The guard action's label is for "continue"
                 loopScope.continueLabel = toUnshift[1].label;
             }
             break;
-        case "ThrowS": {
-            throw new EngineError_1.ThrowStatementError((0, eval_tree_sync_1.evalBinding)(statement.expression, evalContext, thread));
+        case ScriptingSourceTreeExp_1.T_THROW_STATEMENT: {
+            throw new EngineError_1.ThrowStatementError((0, eval_tree_sync_1.evalBinding)(statement.expr, evalContext, thread));
         }
-        case "TryS": {
-            if (!statement.guard) {
+        case ScriptingSourceTreeExp_1.T_TRY_STATEMENT: {
+            if (!execInfo.guard) {
                 // --- Execute the try block
                 toUnshift = (0, process_statement_common_1.provideTryBody)(thread, (0, process_statement_common_1.createTryScope)(thread, statement));
                 break;
@@ -535,10 +527,10 @@ function processStatement(statement, evalContext, thread) {
                             // --- Remove the "try" block's scope
                             thread.blocks.pop();
                             // --- Go on with catch or finally
-                            if (statement.catchBlock) {
-                                if (tryScope.statement.catchVariable) {
+                            if (statement.catchB) {
+                                if (tryScope.statement.catchV) {
                                     const block = (0, process_statement_common_1.innermostBlockScope)(thread);
-                                    block.vars[tryScope.statement.catchVariable] =
+                                    block.vars[tryScope.statement.catchV.name] =
                                         tryScope.errorToThrow instanceof EngineError_1.ThrowStatementError
                                             ? tryScope.errorToThrow.errorObject
                                             : tryScope.errorToThrow;
@@ -547,7 +539,7 @@ function processStatement(statement, evalContext, thread) {
                                 tryScope.processingPhase = "catch";
                                 toUnshift = (0, process_statement_common_1.provideCatchBody)(thread, tryScope);
                             }
-                            else if (tryScope.statement.finallyBlock) {
+                            else if (tryScope.statement.finallyB) {
                                 // --- No catch, move on finally
                                 tryScope.processingPhase = "finally";
                                 toUnshift = (0, process_statement_common_1.provideFinallyBody)(thread, tryScope);
@@ -572,14 +564,14 @@ function processStatement(statement, evalContext, thread) {
                 case "try":
                     // --- We completed the try block successfully
                     tryScope.processingPhase = "finally";
-                    if (statement.finallyBlock) {
+                    if (statement.finallyB) {
                         toUnshift = (0, process_statement_common_1.provideFinallyBody)(thread, tryScope);
                     }
                     break;
                 case "catch":
                     // --- We completed the catch block successfully, remove the handled error
                     tryScope.processingPhase = "finally";
-                    if (statement.finallyBlock) {
+                    if (statement.finallyB) {
                         toUnshift = (0, process_statement_common_1.provideFinallyBody)(thread, tryScope);
                     }
                     break;
@@ -622,9 +614,9 @@ function processStatement(statement, evalContext, thread) {
             }
             break;
         }
-        case "SwitchS": {
+        case ScriptingSourceTreeExp_1.T_SWITCH_STATEMENT: {
             // --- Create or get the loop's scope (guard is falsy for the first execution)
-            if (statement.guard) {
+            if (execInfo.guard) {
                 // --- Complete the switch
                 (0, process_statement_common_1.releaseLoopScope)(thread);
             }
@@ -633,18 +625,18 @@ function processStatement(statement, evalContext, thread) {
                 loopScope.isSwitch = true;
                 thread.blocks.push({ vars: {} });
                 // --- Evaluate the switch value
-                const switchValue = (0, eval_tree_sync_1.evalBinding)(statement.expression, evalContext, thread);
+                const switchValue = (0, eval_tree_sync_1.evalBinding)(statement.expr, evalContext, thread);
                 // --- Find the matching label
                 let matchingIndex = -1;
                 for (let i = 0; i < statement.cases.length; i++) {
                     const currentCase = statement.cases[i];
                     // --- Check for default case
-                    if (currentCase.caseExpression === undefined) {
+                    if (currentCase.caseE === undefined) {
                         matchingIndex = i;
                         break;
                     }
                     // --- Check for matching case
-                    const caseValue = (0, eval_tree_sync_1.evalBinding)(currentCase.caseExpression, evalContext, thread);
+                    const caseValue = (0, eval_tree_sync_1.evalBinding)(currentCase.caseE, evalContext, thread);
                     if (caseValue === switchValue) {
                         matchingIndex = i;
                         break;
@@ -654,19 +646,21 @@ function processStatement(statement, evalContext, thread) {
                 const statementFlow = [];
                 if (matchingIndex >= 0) {
                     for (let i = matchingIndex; i < statement.cases.length; i++) {
-                        statementFlow.push(...statement.cases[i].statements);
+                        statementFlow.push(...statement.cases[i].stmts);
                     }
                 }
                 // --- Queue the statement flow and the guard
-                const guardStatement = Object.assign(Object.assign({}, statement), { guard: true });
-                toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([...statementFlow, guardStatement]);
+                toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([
+                    ...(0, process_statement_common_1.toStatementItems)(statementFlow),
+                    (0, process_statement_common_1.guard)(statement),
+                ]);
                 loopScope.breakLabel = toUnshift[toUnshift.length - 1].label;
             }
             break;
         }
     }
     // --- The statement may remove the innermost scope
-    if (statement.removeBlockScope) {
+    if (execInfo.removeBlockScope) {
         if (thread.blocks && thread.blocks.length > 0) {
             thread.blocks.pop();
         }
@@ -682,9 +676,9 @@ function processDeclarations(block, evalContext, thread, declarations, addConst
         if (useValue) {
             value = baseValue;
         }
-        else if (decl.expression) {
+        else if (decl.expr) {
             //TODO illesg here, functionInvocation for global function (e.g. window.confirm... )
-            value = (0, eval_tree_sync_1.evalBinding)(decl.expression, evalContext, thread);
+            value = (0, eval_tree_sync_1.evalBinding)(decl.expr, evalContext, thread);
         }
         visitDeclaration(block, decl, value, addConst);
     }
@@ -694,11 +688,11 @@ function processDeclarations(block, evalContext, thread, declarations, addConst
         if (decl.id) {
             visitIdDeclaration(block, decl.id, baseValue, addConst);
         }
-        else if (decl.arrayDestruct) {
-            visitArrayDestruct(block, decl.arrayDestruct, baseValue, addConst);
+        else if (decl.aDestr) {
+            visitArrayDestruct(block, decl.aDestr, baseValue, addConst);
         }
-        else if (decl.objectDestruct) {
-            visitObjectDestruct(block, decl.objectDestruct, baseValue, addConst);
+        else if (decl.oDestr) {
+            visitObjectDestruct(block, decl.oDestr, baseValue, addConst);
         }
         else {
             throw new Error("Unknown declaration specifier");
@@ -724,11 +718,11 @@ function processDeclarations(block, evalContext, thread, declarations, addConst
             if (arrDecl.id) {
                 visitIdDeclaration(block, arrDecl.id, value, addConst);
             }
-            else if (arrDecl.arrayDestruct) {
-                visitArrayDestruct(block, arrDecl.arrayDestruct, value, addConst);
+            else if (arrDecl.aDestr) {
+                visitArrayDestruct(block, arrDecl.aDestr, value, addConst);
             }
-            else if (arrDecl.objectDestruct) {
-                visitObjectDestruct(block, arrDecl.objectDestruct, value, addConst);
+            else if (arrDecl.oDestr) {
+                visitObjectDestruct(block, arrDecl.oDestr, value, addConst);
             }
         }
     }
@@ -738,11 +732,11 @@ function processDeclarations(block, evalContext, thread, declarations, addConst
         for (let i = 0; i < objectD.length; i++) {
             const objDecl = objectD[i];
             const value = baseValue === null || baseValue === void 0 ? void 0 : baseValue[objDecl.id];
-            if (objDecl.arrayDestruct) {
-                visitArrayDestruct(block, objDecl.arrayDestruct, value, addConst);
+            if (objDecl.aDestr) {
+                visitArrayDestruct(block, objDecl.aDestr, value, addConst);
             }
-            else if (objDecl.objectDestruct) {
-                visitObjectDestruct(block, objDecl.objectDestruct, value, addConst);
+            else if (objDecl.oDestr) {
+                visitObjectDestruct(block, objDecl.oDestr, value, addConst);
             }
             else {
                 visitIdDeclaration(block, (_a = objDecl.alias) !== null && _a !== void 0 ? _a : objDecl.id, value, addConst);