bare-script 2.2.8 → 2.2.10

package/lib/parser.js

@@ -56,6 +56,7 @@ export function parseScript(scriptText, startLineNumber = 1) {
     // Process each line
     const lineContinuation = [];
     let functionDef = null;
+    let functionLabelDefDepth = null;
     const labelDefs = [];
     let labelIndex = 0;
     let ixLine;
@@ -118,6 +119,7 @@ export function parseScript(scriptText, startLineNumber = 1) {
             }
 
             // Add the function definition statement
+            functionLabelDefDepth = labelDefs.length;
             functionDef = {
                 'function': {
                     'name': matchFunctionBegin.groups.name,
@@ -143,7 +145,17 @@ export function parseScript(scriptText, startLineNumber = 1) {
             if (functionDef === null) {
                 throw new BareScriptParserError('No matching function definition', line, 1, startLineNumber + ixLine);
             }
+
+            // Check for un-matched label definitions
+            if (labelDefs.length > functionLabelDefDepth) {
+                const labelDef = labelDefs.pop();
+                const [defKey] = Object.keys(labelDef);
+                const def = labelDef[defKey];
+                throw new BareScriptParserError(`Missing end${defKey} statement`, def.line, 1, def.lineNumber);
+            }
+
             functionDef = null;
+            functionLabelDefDepth = null;
             continue;
         }
 
@@ -173,7 +185,8 @@ export function parseScript(scriptText, startLineNumber = 1) {
         const matchIfElseIf = line.match(rScriptIfElseIf);
         if (matchIfElseIf !== null) {
             // Get the if-then definition
-            const ifthen = (labelDefs.length > 0 ? (labelDefs[labelDefs.length - 1].if ?? null) : null);
+            const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
+            const ifthen = (labelDefs.length > labelDefDepth ? (labelDefs[labelDefs.length - 1].if ?? null) : null);
             if (ifthen === null) {
                 throw new BareScriptParserError('No matching if statement', line, 1, startLineNumber + ixLine);
             }
@@ -204,7 +217,8 @@ export function parseScript(scriptText, startLineNumber = 1) {
         const matchIfElse = line.match(rScriptIfElse);
         if (matchIfElse !== null) {
             // Get the if-then definition
-            const ifthen = (labelDefs.length > 0 ? (labelDefs[labelDefs.length - 1].if ?? null) : null);
+            const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
+            const ifthen = (labelDefs.length > labelDefDepth ? (labelDefs[labelDefs.length - 1].if ?? null) : null);
             if (ifthen === null) {
                 throw new BareScriptParserError('No matching if statement', line, 1, startLineNumber + ixLine);
             }
@@ -227,7 +241,8 @@ export function parseScript(scriptText, startLineNumber = 1) {
         const matchIfEnd = line.match(rScriptIfEnd);
         if (matchIfEnd !== null) {
             // Pop the if-then definition
-            const ifthen = (labelDefs.length > 0 ? (labelDefs.pop().if ?? null) : null);
+            const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
+            const ifthen = (labelDefs.length > labelDefDepth ? (labelDefs.pop().if ?? null) : null);
             if (ifthen === null) {
                 throw new BareScriptParserError('No matching if statement', line, 1, startLineNumber + ixLine);
             }
@@ -269,7 +284,8 @@ export function parseScript(scriptText, startLineNumber = 1) {
         const matchWhileEnd = line.match(rScriptWhileEnd);
         if (matchWhileEnd !== null) {
             // Pop the while-do definition
-            const whiledo = (labelDefs.length > 0 ? (labelDefs.pop().while ?? null) : null);
+            const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
+            const whiledo = (labelDefs.length > labelDefDepth ? (labelDefs.pop().while ?? null) : null);
             if (whiledo === null) {
                 throw new BareScriptParserError('No matching while statement', line, 1, startLineNumber + ixLine);
             }
@@ -319,7 +335,8 @@ export function parseScript(scriptText, startLineNumber = 1) {
         const matchForEnd = line.match(rScriptForEnd);
         if (matchForEnd !== null) {
             // Pop the foreach definition
-            const foreach = (labelDefs.length > 0 ? (labelDefs.pop().for ?? null) : null);
+            const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
+            const foreach = (labelDefs.length > labelDefDepth ? (labelDefs.pop().for ?? null) : null);
             if (foreach === null) {
                 throw new BareScriptParserError('No matching for statement', line, 1, startLineNumber + ixLine);
             }
@@ -346,7 +363,9 @@ export function parseScript(scriptText, startLineNumber = 1) {
         const matchBreak = line.match(rScriptBreak);
         if (matchBreak !== null) {
             // Get the loop definition
-            const labelDef = (labelDefs.length > 0 ? arrayFindLast(labelDefs, (def) => !('if' in def)) : null);
+            const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
+            const ixLabelDef = labelDefs.findLastIndex((def) => !('if' in def));
+            const labelDef = (ixLabelDef >= labelDefDepth ? labelDefs[ixLabelDef] : null);
             if (labelDef === null) {
                 throw new BareScriptParserError('Break statement outside of loop', line, 1, startLineNumber + ixLine);
             }
@@ -362,7 +381,9 @@ export function parseScript(scriptText, startLineNumber = 1) {
         const matchContinue = line.match(rScriptContinue);
         if (matchContinue !== null) {
             // Get the loop definition
-            const labelDef = (labelDefs.length > 0 ? arrayFindLast(labelDefs, (def) => !('if' in def)) : null);
+            const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
+            const ixLabelDef = labelDefs.findLastIndex((def) => !('if' in def));
+            const labelDef = (ixLabelDef >= labelDefDepth ? labelDefs[ixLabelDef] : null);
             if (labelDef === null) {
                 throw new BareScriptParserError('Continue statement outside of loop', line, 1, startLineNumber + ixLine);
             }
@@ -449,20 +470,6 @@ export function parseScript(scriptText, startLineNumber = 1) {
 }
 
 
-// Firefox versions prior to 103 are missing Array.findLast - Debian Bookworm has Firefox 102
-function arrayFindLast(array, findFn) {
-    let ixValue = array.length - 1;
-    while (ixValue >= 0) {
-        const value = array[ixValue];
-        if (findFn(value)) {
-            return value;
-        }
-        ixValue -= 1;
-    }
-    return null;
-}
-
-
 // BareScript expression regex
 const rExprBinaryOp = /^\s*(\*\*|\*|\/|%|\+|-|<=|<|>=|>|==|!=|&&|\|\|)/;
 const rExprUnaryOp = /^\s*(!|-)/;

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "bare-script",
-    "version": "2.2.8",
+    "version": "2.2.10",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",