bare-script 3.5.3 → 3.5.5

package/lib/parser.js

@@ -459,7 +459,7 @@ const rScriptFunctionArgSplit = /\s*,\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>.+))?)${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}`);

package/lib/value.js

@@ -488,14 +488,51 @@ const rNumber = /^\s*[-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?\s*$/;
  * @ignore
  */
 export function valueParseInteger(text, radix = 10) {
-    if (!rInteger.test(text)) {
+    if (valueType(radix) !== 'number' || Math.floor(radix) !== radix || radix < 2 || radix > 36 ||
+        !valueParseIntegerRegexMap[String(radix)].test(text)) {
         return null;
     }
     return Number.parseInt(text, radix);
 }
 
 
-const rInteger = /^\s*[-+]?\d+\s*$/;
+const valueParseIntegerRegexMap = {
+    '2': /^\s*[-+]?[0-1]+\s*$/,
+    '3': /^\s*[-+]?[0-2]+\s*$/,
+    '4': /^\s*[-+]?[0-3]+\s*$/,
+    '5': /^\s*[-+]?[0-4]+\s*$/,
+    '6': /^\s*[-+]?[0-5]+\s*$/,
+    '7': /^\s*[-+]?[0-6]+\s*$/,
+    '8': /^\s*[-+]?[0-7]+\s*$/,
+    '9': /^\s*[-+]?[0-8]+\s*$/,
+    '10': /^\s*[-+]?[0-9]+\s*$/,
+    '11': /^\s*[-+]?[0-9Aa]+\s*$/,
+    '12': /^\s*[-+]?[0-9A-Ba-b]+\s*$/,
+    '13': /^\s*[-+]?[0-9A-Ca-c]+\s*$/,
+    '14': /^\s*[-+]?[0-9A-Da-d]+\s*$/,
+    '15': /^\s*[-+]?[0-9A-Ea-e]+\s*$/,
+    '16': /^\s*[-+]?[0-9A-Fa-f]+\s*$/,
+    '17': /^\s*[-+]?[0-9A-Ga-g]+\s*$/,
+    '18': /^\s*[-+]?[0-9A-Ha-h]+\s*$/,
+    '19': /^\s*[-+]?[0-9A-Ia-i]+\s*$/,
+    '20': /^\s*[-+]?[0-9A-Ja-j]+\s*$/,
+    '21': /^\s*[-+]?[0-9A-Ka-k]+\s*$/,
+    '22': /^\s*[-+]?[0-9A-La-l]+\s*$/,
+    '23': /^\s*[-+]?[0-9A-Ma-m]+\s*$/,
+    '24': /^\s*[-+]?[0-9A-Na-n]+\s*$/,
+    '25': /^\s*[-+]?[0-9A-Oa-o]+\s*$/,
+    '26': /^\s*[-+]?[0-9A-Pa-p]+\s*$/,
+    '27': /^\s*[-+]?[0-9A-Qa-q]+\s*$/,
+    '28': /^\s*[-+]?[0-9A-Ra-r]+\s*$/,
+    '29': /^\s*[-+]?[0-9A-Sa-s]+\s*$/,
+    '30': /^\s*[-+]?[0-9A-Ta-t]+\s*$/,
+    '31': /^\s*[-+]?[0-9A-Ua-u]+\s*$/,
+    '32': /^\s*[-+]?[0-9A-Va-v]+\s*$/,
+    '33': /^\s*[-+]?[0-9A-Wa-w]+\s*$/,
+    '34': /^\s*[-+]?[0-9A-Xa-x]+\s*$/,
+    '35': /^\s*[-+]?[0-9A-Ya-y]+\s*$/,
+    '36': /^\s*[-+]?[0-9A-Za-z]+\s*$/
+};
 
 
 //

package/package.json

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