bare-script 3.7.5 → 3.7.6

package/lib/include/diff.bare

@@ -152,4 +152,4 @@ endfunction
 
 
 # Regex for splitting lines
-diffRegexLineSplit = regexNew(stringFromCharCode(13) + '?' + stringFromCharCode(10))
+diffRegexLineSplit = regexNew('\r?\n')

package/lib/include/unittest.bare

@@ -393,7 +393,7 @@ endfunction
 
 function unittestReportScriptLines(codeLineElements, lines, color, noNewline):
     if lines:
-        linesStr = arrayJoin(lines, stringFromCharCode(10)) + if(noNewline, '', stringFromCharCode(10))
+        linesStr = arrayJoin(lines, '\n') + if(noNewline, '', '\n')
         if !color:
             arrayPush(codeLineElements, {'text': linesStr})
         else:

package/lib/model.js

@@ -361,7 +361,8 @@ export function lintScript(script) {
             const fnVarAssigns = {};
             const fnVarUses = {};
             const args = (statement.function.args ?? null);
-            getVariableAssignmentsAndUses(statement.function.statements, fnVarAssigns, fnVarUses);
+            const fnStatements = statement.function.statements;
+            getVariableAssignmentsAndUses(fnStatements, fnVarAssigns, fnVarUses);
             for (const varName of Object.keys(fnVarAssigns)) {
                 // Ignore re-assigned function arguments
                 if (args !== null && args.indexOf(varName) !== -1) {
@@ -369,7 +370,7 @@ export function lintScript(script) {
                 }
                 if (varName in fnVarUses && fnVarUses[varName] <= fnVarAssigns[varName]) {
                     lintScriptWarning(
-                        warnings, script, statement,
+                        warnings, script, fnStatements[fnVarUses[varName]],
                         `Variable "${varName}" of function "${statement.function.name}" used before assignment`
                     );
                 }
@@ -379,7 +380,7 @@ export function lintScript(script) {
             for (const varName of Object.keys(fnVarAssigns)) {
                 if (!(varName in fnVarUses)) {
                     lintScriptWarning(
-                        warnings, script, statement,
+                        warnings, script, fnStatements[fnVarAssigns[varName]],
                         `Unused variable "${varName}" defined in function "${statement.function.name}"`
                     );
                 }
@@ -410,7 +411,7 @@ export function lintScript(script) {
             // Iterate function statements
             const fnLabelsDefined = {};
             const fnLabelsUsed = {};
-            for (const [ixFnStatement, fnStatement] of statement.function.statements.entries()) {
+            for (const [ixFnStatement, fnStatement] of fnStatements.entries()) {
                 const [fnStatementKey] = Object.keys(fnStatement);
 
                 // Function expression statement checks

package/package.json

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