bare-script 3.5.2 → 3.5.4

package/lib/parser.js

@@ -450,27 +450,30 @@ const rScriptLineSplit = /\r?\n/;
 const rScriptContinuation = /\\\s*$/;
 const rScriptComment = /^\s*(?:#.*)?$/;
 const rScriptAssignment = /^\s*(?<name>[A-Za-z_]\w*)\s*=\s*(?<expr>.+)$/;
+const rPartComment = '\\s*(#.*)?$';
 const rScriptFunctionBegin = new RegExp(
     '^(?<async>\\s*async)?\\s*function\\s+(?<name>[A-Za-z_]\\w*)\\s*\\(' +
-        '\\s*(?<args>[A-Za-z_]\\w*(?:\\s*,\\s*[A-Za-z_]\\w*)*)?(?<lastArgArray>\\s*\\.\\.\\.)?\\s*\\)\\s*:\\s*$'
+        `\\s*(?<args>[A-Za-z_]\\w*(?:\\s*,\\s*[A-Za-z_]\\w*)*)?(?<lastArgArray>\\s*\\.\\.\\.)?\\s*\\)\\s*:${rPartComment}`
 );
 const rScriptFunctionArgSplit = /\s*,\s*/;
-const rScriptFunctionEnd = /^\s*endfunction\s*$/;
-const rScriptLabel = /^\s*(?<name>[A-Za-z_]\w*)\s*:\s*$/;
-const rScriptJump = /^(?<jump>\s*(?:jump|jumpif\s*\((?<expr>.+)\)))\s+(?<name>[A-Za-z_]\w*)\s*$/;
-const rScriptReturn = /^(?<return>\s*return(?:\s+(?<expr>.+))?)\s*$/;
-const rScriptInclude = /^\s*include\s+(?<delim>')(?<url>(?:\\'|[^'])*)'\s*$/;
-const rScriptIncludeSystem = /^\s*include\s+(?<delim><)(?<url>[^>]*)>\s*$/;
-const rScriptIfBegin = /^\s*if\s+(?<expr>.+)\s*:\s*$/;
-const rScriptIfElseIf = /^\s*elif\s+(?<expr>.+)\s*:\s*$/;
-const rScriptIfElse = /^\s*else\s*:\s*$/;
-const rScriptIfEnd = /^\s*endif\s*$/;
-const rScriptForBegin = /^\s*for\s+(?<value>[A-Za-z_]\w*)(?:\s*,\s*(?<index>[A-Za-z_]\w*))?\s+in\s+(?<values>.+)\s*:\s*$/;
-const rScriptForEnd = /^\s*endfor\s*$/;
-const rScriptWhileBegin = /^\s*while\s+(?<expr>.+)\s*:\s*$/;
-const rScriptWhileEnd = /^\s*endwhile\s*$/;
-const rScriptBreak = /^\s*break\s*$/;
-const rScriptContinue = /^\s*continue\s*$/;
+const rScriptFunctionEnd = new RegExp(`^\\s*endfunction${rPartComment}`);
+const rScriptLabel = new RegExp(`^\\s*(?<name>[A-Za-z_]\\w*)\\s*:${rPartComment}`);
+const rScriptJump = new RegExp(`^(?<jump>\\s*(?:jump|jumpif\\s*\\((?<expr>.+)\\)))\\s+(?<name>[A-Za-z_]\\w*)${rPartComment}`);
+const rScriptReturn = new RegExp(`^(?<return>\\s*return(?:\\s+(?<expr>[^#\\s].*))?)${rPartComment}`);
+const rScriptInclude = new RegExp(`^\\s*include\\s+(?<delim>')(?<url>(?:\\'|[^'])*)'${rPartComment}`);
+const rScriptIncludeSystem = new RegExp(`^\\s*include\\s+(?<delim><)(?<url>[^>]*)>${rPartComment}`);
+const rScriptIfBegin = new RegExp(`^\\s*if\\s+(?<expr>.+)\\s*:${rPartComment}`);
+const rScriptIfElseIf = new RegExp(`^\\s*elif\\s+(?<expr>.+)\\s*:${rPartComment}`);
+const rScriptIfElse = new RegExp(`^\\s*else\\s*:${rPartComment}`);
+const rScriptIfEnd = new RegExp(`^\\s*endif${rPartComment}`);
+const rScriptForBegin = new RegExp(
+    `^\\s*for\\s+(?<value>[A-Za-z_]\\w*)(?:\\s*,\\s*(?<index>[A-Za-z_]\\w*))?\\s+in\\s+(?<values>.+)\\s*:${rPartComment}`
+);
+const rScriptForEnd = new RegExp(`^\\s*endfor${rPartComment}`);
+const rScriptWhileBegin = new RegExp(`^\\s*while\\s+(?<expr>.+)\\s*:${rPartComment}`);
+const rScriptWhileEnd = new RegExp(`^\\s*endwhile${rPartComment}`);
+const rScriptBreak = new RegExp(`^\\s*break${rPartComment}`);
+const rScriptContinue = new RegExp(`^\\s*continue${rPartComment}`);
 
 
 /**
@@ -509,6 +512,11 @@ function parseBinaryExpression(exprText, binLeftExpr = null) {
     // Match a binary operator - if not found, return the left expression
     const matchBinaryOp = binText.match(rExprBinaryOp);
     if (matchBinaryOp === null) {
+        // End-of-line comment?
+        if (binText.match(rExprComment)) {
+            binText = '';
+        }
+
         return [leftExpr, binText];
     }
     const [, binOp] = matchBinaryOp;
@@ -671,6 +679,7 @@ function parseUnaryExpression(exprText) {
 
 
 // BareScript expression regex
+const rExprComment = /^\s*#.*$/;
 const rExprBinaryOp = /^\s*(\*\*|\*|\/|%|\+|-|<<|>>|<=|<|>=|>|==|!=|&&|\|\||&|\^|\|)/;
 const rExprUnaryOp = /^\s*(!|-|~)/;
 const rExprFunctionOpen = /^\s*([A-Za-z_]\w+)\s*\(/;

package/package.json

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