bare-script 3.7.1 → 3.7.3

package/lib/include/unittest.bare

@@ -15,8 +15,8 @@ include <diff.bare>
 
 
 # Test statistics
-unittestTests = objectNew()
-unittestWarnings = arrayNew()
+unittestTests = {}
+unittestWarnings = []
 
 
 # $function: unittestRunTest
@@ -60,7 +60,7 @@ function unittestRunTestHelper(testName):
     endif
 
     # Add the unit test result array
-    testFailures = arrayNew()
+    testFailures = []
     objectSet(unittestTests, testName, testFailures)
     systemGlobalSet('unittestTestName', testName)
 
@@ -81,7 +81,7 @@ function unittestEqual(actual, expected, description):
 
     # Add the test failure error lines
     testFailures = objectGet(unittestTests, unittestTestName)
-    errorLines = arrayNew( \
+    errorLines = [ \
         'Equal:', \
         '', \
         '```', \
@@ -91,9 +91,9 @@ function unittestEqual(actual, expected, description):
         '```', \
         jsonStringify(expected), \
         '```' \
-    )
+    ]
     if description:
-        arrayPush(testFailures, arrayExtend(arrayNew(markdownEscape(description), ''), errorLines))
+        arrayPush(testFailures, arrayExtend([markdownEscape(description), ''], errorLines))
     else:
         arrayPush(testFailures, errorLines)
     endif
@@ -115,8 +115,8 @@ function unittestDeepEqual(actual, expected, description):
     endif
 
     # Compute the difference lines
-    errorLines = arrayNew()
-    diffErrorLines = arrayNew()
+    errorLines = []
+    diffErrorLines = []
     for diff in diffLines(actualJSON, expectedJSON):
         diffType = objectGet(diff, 'type')
         if diffType == 'Remove':
@@ -130,15 +130,15 @@ function unittestDeepEqual(actual, expected, description):
         else:
             # diffType == 'Identical'
             if diffErrorLines:
-                arrayExtend(errorLines, arrayNew('Deep-equal:', '', '```'))
+                arrayExtend(errorLines, ['Deep-equal:', '', '```'])
                 arrayExtend(errorLines, diffErrorLines)
                 arrayPush(errorLines, '```')
-                diffErrorLines = arrayNew()
+                diffErrorLines = []
             endif
         endif
     endfor
     if diffErrorLines:
-        arrayExtend(errorLines, arrayNew('Deep-equal:', '', '```'))
+        arrayExtend(errorLines, ['Deep-equal:', '', '```'])
         arrayExtend(errorLines, diffErrorLines)
         arrayPush(errorLines, '```')
     endif
@@ -146,7 +146,7 @@ function unittestDeepEqual(actual, expected, description):
     # Add the test failure error lines
     testFailures = objectGet(unittestTests, unittestTestName)
     if description:
-        arrayPush(testFailures, arrayExtend(arrayNew(markdownEscape(description), ''), errorLines))
+        arrayPush(testFailures, arrayExtend([markdownEscape(description), ''], errorLines))
     else:
         arrayPush(testFailures, errorLines)
     endif
@@ -210,7 +210,7 @@ function unittestReport(options):
         if testNameArg:
             markdownPrint('', argsLink(unittestReportArguments, 'All tests', null, true))
         else:
-            markdownPrint('', argsLink(unittestReportArguments, if(hideTests, 'Show', 'Hide') + ' tests', objectNew('hideTests', !hideTests)))
+            markdownPrint('', argsLink(unittestReportArguments, if(hideTests, 'Show', 'Hide') + ' tests', {'hideTests': !hideTests}))
         endif
     endif
 
@@ -227,15 +227,15 @@ function unittestReport(options):
     if testFailCount:
         markdownPrint('', '## Failing Tests')
         if hideTests && !isReport && !testNameArg:
-            markdownPrint('', argsLink(unittestReportArguments, 'Show', objectNew('hideTests', false)))
+            markdownPrint('', argsLink(unittestReportArguments, 'Show', {'hideTests': false}))
         endif
         if !hideTests || testNameArg:
             for testName in testNames:
                 testFailures = objectGet(unittestTests, testName)
                 if arrayLength(testFailures):
                     failureLink = if(isReport, testName, \
-                        argsLink(unittestReportArguments, testName, objectNew('test', testName), false, '_top'))
-                    failureLines = arrayNew('', failureLink + ' - FAIL')
+                        argsLink(unittestReportArguments, testName, {'test': testName}, false, '_top'))
+                    failureLines = ['', failureLink + ' - FAIL']
                     for errorLines in testFailures:
                         for errorLine, ixErrorLine in errorLines:
                             if ixErrorLine == 0:
@@ -256,14 +256,14 @@ function unittestReport(options):
     if testPassCount:
         markdownPrint('', '## Passing Tests')
         if hideTests && !isReport && !testNameArg:
-            markdownPrint('', argsLink(unittestReportArguments, 'Show', objectNew('hideTests', false)))
+            markdownPrint('', argsLink(unittestReportArguments, 'Show', {'hideTests': false}))
         endif
         if !hideTests || testNameArg:
             for testName in testNames:
                 testFailures = objectGet(unittestTests, testName)
                 if !arrayLength(testFailures):
                     testLink = if(isReport, testName, \
-                        argsLink(unittestReportArguments, testName, objectNew('test', testName), false, '_top'))
+                        argsLink(unittestReportArguments, testName, {'test': testName}, false, '_top'))
                     markdownPrint('', testLink + ' - OK')
                 endif
             endfor
@@ -294,18 +294,18 @@ function unittestReport(options):
             for row in coverageData:
                 scriptName = objectGet(row, 'Script')
                 if !isReport && !stringStartsWith(scriptName, '**'):
-                    objectSet(row, 'Script', argsLink(unittestReportArguments, scriptName, objectNew("script", scriptName), false, "_top"))
+                    objectSet(row, 'Script', argsLink(unittestReportArguments, scriptName, {"script": scriptName}, false, "_top"))
                 endif
                 objectSet(row, 'Coverage', numberToFixed(objectGet(row, 'Coverage'), 1) + '%')
             endfor
-            markdownPrint('', dataTableMarkdown(coverageData, objectNew( \
-                'fields', arrayNew('Script', 'Statements', 'Missing', 'Coverage'), \
-                'formats', objectNew( \
-                    'Statements', objectNew('align', 'right'), \
-                    'Missing', objectNew('align', 'right'), \
-                    'Coverage', objectNew('align', 'right') \
-                ) \
-            )))
+            markdownPrint('', dataTableMarkdown(coverageData, { \
+                'fields': ['Script', 'Statements', 'Missing', 'Coverage'], \
+                'formats': { \
+                    'Statements': {'align': 'right'}, \
+                    'Missing': {'align': 'right'}, \
+                    'Coverage': {'align': 'right'} \
+                } \
+            }))
         else:
             markdownPrint('', '*No data.*')
         endif
@@ -317,12 +317,12 @@ endfunction
 
 
 # unittestReport application arguments
-unittestReportArguments = argsValidate(arrayNew( \
-    objectNew('name', 'test', 'global', 'vUnittestTest'), \
-    objectNew('name', 'script', 'global', 'vUnittestScript'), \
-    objectNew('name', 'hideTests', 'global', 'vUnittestHideTests', 'type', 'bool', 'default', false), \
-    objectNew('name', 'report', 'global', 'vUnittestReport', 'type', 'bool', 'default', false) \
-))
+unittestReportArguments = argsValidate([ \
+    {'name': 'test', 'global': 'vUnittestTest'}, \
+    {'name': 'script', 'global': 'vUnittestScript'}, \
+    {'name': 'hideTests', 'global': 'vUnittestHideTests', 'type': 'bool', 'default': false}, \
+    {'name': 'report', 'global': 'vUnittestReport', 'type': 'bool', 'default': false} \
+])
 
 
 # Render the script coverage details page
@@ -331,7 +331,7 @@ function unittestReportScript(scriptName):
     title = scriptName + ' Coverage'
     documentSetTitle(title)
     markdownPrint( \
-        argsLink(unittestReportArguments, 'Back', objectNew('script', null), false, '_top'), \
+        argsLink(unittestReportArguments, 'Back', {'script': null}, false, '_top'), \
         '', \
         '# ' + markdownEscape(title) \
     )
@@ -349,7 +349,7 @@ function unittestReportScript(scriptName):
     scriptLines = objectGet(script, 'scriptLines')
 
     # Mark the statements covered or not-covered
-    lineColors = objectNew()
+    lineColors = {}
     statements = unittestScriptStatements(script)
     for statement in statements:
         statementKey = arrayGet(objectKeys(statement), 0)
@@ -369,9 +369,9 @@ function unittestReportScript(scriptName):
     endfor
 
     # Generate the code coverage details
-    codeLineElements = arrayNew()
-    codeElements = objectNew('html', 'pre', 'elem', codeLineElements)
-    currentLines = arrayNew()
+    codeLineElements = []
+    codeElements = {'html': 'pre', 'elem': codeLineElements}
+    currentLines = []
     currentColor = null
     for line, ixLine in scriptLines:
         # Accumulate lines of the same color
@@ -383,7 +383,7 @@ function unittestReportScript(scriptName):
 
         # Render the current lines
         unittestReportScriptLines(codeLineElements, currentLines, currentColor)
-        currentLines = arrayNew(line)
+        currentLines = [line]
         currentColor = lineColor
     endfor
     unittestReportScriptLines(codeLineElements, currentLines, currentColor, true)
@@ -395,13 +395,13 @@ function unittestReportScriptLines(codeLineElements, lines, color, noNewline):
     if lines:
         linesStr = arrayJoin(lines, stringFromCharCode(10)) + if(noNewline, '', stringFromCharCode(10))
         if !color:
-            arrayPush(codeLineElements, objectNew('text', linesStr))
+            arrayPush(codeLineElements, {'text': linesStr})
         else:
-            arrayPush(codeLineElements, objectNew( \
-                'html', 'span', \
-                'attr', objectNew('style', 'display: block; background-color: ' + color), \
-                'elem', objectNew('text', linesStr) \
-            ))
+            arrayPush(codeLineElements, { \
+                'html': 'span', \
+                'attr': {'style': 'display: block; background-color: ' + color}, \
+                'elem': {'text': linesStr} \
+            })
         endif
     endif
 endfunction
@@ -409,14 +409,14 @@ endfunction
 
 # Get the coverage data table - columns are "Script", "Statement", "Covered", and "Percent"
 function unittestCoverageData(coverageExclude):
-    data = arrayNew()
+    data = []
 
     # Get the global coverage object
     coverage = coverageGlobalGet()
     if coverage:
         # Get the script names with coverage data
         scripts = objectGet(coverage, 'scripts')
-        scriptNames = if(scripts, arraySort(objectKeys(scripts)), arrayNew())
+        scriptNames = if(scripts, arraySort(objectKeys(scripts)), [])
 
         # Compute script statement coverage
         totalStatements = 0
@@ -458,25 +458,25 @@ function unittestCoverageData(coverageExclude):
 
             # Add the script coverage data row
             coveragePercent = if(statementCount, 100 * (statementCount - missingCount) / statementCount, 100)
-            arrayPush(data, objectNew( \
-                'Script', scriptName, \
-                'Statements', statementCount, \
-                'Missing', missingCount, \
-                'Coverage',  coveragePercent, \
-                'CoverageStr', numberToFixed(coveragePercent, 1) + '%'  \
-            ))
+            arrayPush(data, { \
+                'Script': scriptName, \
+                'Statements': statementCount, \
+                'Missing': missingCount, \
+                'Coverage':  coveragePercent, \
+                'CoverageStr': numberToFixed(coveragePercent, 1) + '%'  \
+            })
         endfor
 
         # Add the coverage totals data row
         if scriptNames:
             coveragePercent = if(totalStatements, 100 * (totalStatements - totalMissing) / totalStatements, 100)
-            arrayPush(data, objectNew( \
-                'Script', '**Total**', \
-                'Statements', totalStatements, \
-                'Missing', totalMissing, \
-                'Coverage', coveragePercent, \
-                'CoverageStr', numberToFixed(coveragePercent, 1) + '%'  \
-            ))
+            arrayPush(data, { \
+                'Script': '**Total**', \
+                'Statements': totalStatements, \
+                'Missing': totalMissing, \
+                'Coverage': coveragePercent, \
+                'CoverageStr': numberToFixed(coveragePercent, 1) + '%'  \
+            })
         endif
     endif
 
@@ -486,7 +486,7 @@ endfunction
 
 # Get a script's array of statements
 function unittestScriptStatements(script):
-    statements = arrayNew()
+    statements = []
 
     # Add the top-level script statements
     for statement in objectGet(script, 'statements'):

package/lib/include/unittestMock.bare

@@ -18,16 +18,16 @@ unittestMockWindowWidth = 1024
 
 
 # The mocked MarkdownUp state
-unittestMockCalls = arrayNew()
-unittestMockFunctions = objectNew()
-unittestMockStateDefault = objectNew( \
-    'drawingFontSizePx', unittestMockDefaultFontSizePx, \
-    'drawingHeight', 480, \
-    'drawingWidth', 640, \
-    'localStorage', objectNew(), \
-    'sessionStorage', objectNew(), \
-    'windowClipboard', '' \
-)
+unittestMockCalls = []
+unittestMockFunctions = {}
+unittestMockStateDefault = { \
+    'drawingFontSizePx': unittestMockDefaultFontSizePx, \
+    'drawingHeight': 480, \
+    'drawingWidth': 640, \
+    'localStorage': {}, \
+    'sessionStorage': {}, \
+    'windowClipboard': '' \
+}
 unittestMockState = objectCopy(unittestMockStateDefault)
 
 
@@ -145,7 +145,7 @@ endfunction
 
 function unittestMockGeneric(funcName, args...):
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew(funcName, args))
+    arrayPush(unittestMockCalls, [funcName, args])
 endfunction
 
 
@@ -161,8 +161,8 @@ function unittestMockEnd():
 
     # Reset the mock state
     mockCalls = unittestMockCalls
-    systemGlobalSet('unittestMockCalls', arrayNew())
-    systemGlobalSet('unittestMockFunctions', objectNew())
+    systemGlobalSet('unittestMockCalls', [])
+    systemGlobalSet('unittestMockFunctions', {})
     systemGlobalSet('unittestMockState', objectCopy(unittestMockStateDefault))
 
     return mockCalls
@@ -183,7 +183,7 @@ function unittestMock_documentInputValue(data, args...):
     id = arrayGet(args, 0)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('documentInputValue', args))
+    arrayPush(unittestMockCalls, ['documentInputValue', args])
 
     # Return the mocked documentInputValue response
     return if(data != null, objectGet(data, id))
@@ -210,7 +210,7 @@ function unittestMock_drawNew(args...):
     height = arrayGet(args, 1)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('drawNew', args))
+    arrayPush(unittestMockCalls, ['drawNew', args])
 
     # Update the mock state
     objectSet(unittestMockState, 'drawingWidth', width)
@@ -230,7 +230,7 @@ function unittestMock_drawTextStyle(args...):
     fontSizePx = arrayGet(args, 0)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('drawTextStyle', args))
+    arrayPush(unittestMockCalls, ['drawTextStyle', args])
 
     # Update the mock state
     objectSet(unittestMockState, 'drawingFontSizePx', if(fontSizePx != null, fontSizePx, unittestMockDefaultFontSizePx))
@@ -254,10 +254,10 @@ endfunction
 
 function unittestMock_localStorageClear(args...):
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('localStorageClear', args))
+    arrayPush(unittestMockCalls, ['localStorageClear', args])
 
     # Update the mock state
-    objectSet(unittestMockState, 'localStorage', objectNew())
+    objectSet(unittestMockState, 'localStorage', {})
 endfunction
 
 
@@ -270,7 +270,7 @@ function unittestMock_localStorageRemove(args...):
     key = arrayGet(args, 0)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('localStorageRemove', args))
+    arrayPush(unittestMockCalls, ['localStorageRemove', args])
 
     # Update the mock state
     objectDelete(objectGet(unittestMockState, 'localStorage'), key)
@@ -282,7 +282,7 @@ function unittestMock_localStorageSet(args...):
     value = arrayGet(args, 1)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('localStorageSet', args))
+    arrayPush(unittestMockCalls, ['localStorageSet', args])
 
     # Update the mock state
     objectSet(objectGet(unittestMockState, 'localStorage'), key, value)
@@ -317,7 +317,7 @@ unittestMock_markdownHeaderId_dash = regexNew('[^a-z0-9]+')
 
 function unittestMock_markdownParse(data, args...):
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('markdownParse', args))
+    arrayPush(unittestMockCalls, ['markdownParse', args])
 
     # Return the mocked markdownParse response
     return if(data != null, arrayShift(data))
@@ -326,7 +326,7 @@ endfunction
 
 function unittestMock_markdownTitle(data, args...):
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('markdownTitle', args))
+    arrayPush(unittestMockCalls, ['markdownTitle', args])
 
     # Return the mocked markdownTitle response
     return if(data != null, arrayShift(data))
@@ -344,11 +344,11 @@ function unittestMock_schemaElements(types, typeName):
     if userTypeKey == 'struct' && objectGet(objectGet(userType, 'struct'), 'union'):
         userTypeKey = 'union'
     endif
-    return arrayNew( \
-        arrayNew( \
-            objectNew('html', 'h1', 'elem', objectNew('text', userTypeKey + ' ' + typeName)) \
-        ) \
-    )
+    return [ \
+        [ \
+            {'html': 'h1', 'elem': {'text': userTypeKey + ' ' + typeName}} \
+        ] \
+    ]
 endfunction
 
 
@@ -359,10 +359,10 @@ endfunction
 
 function unittestMock_sessionStorageClear(args...):
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('sessionStorageClear', args))
+    arrayPush(unittestMockCalls, ['sessionStorageClear', args])
 
     # Update the mock state
-    objectSet(unittestMockState, 'sessionStorage', objectNew())
+    objectSet(unittestMockState, 'sessionStorage', {})
 endfunction
 
 
@@ -375,7 +375,7 @@ function unittestMock_sessionStorageRemove(args...):
     key = arrayGet(args, 0)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('sessionStorageRemove', args))
+    arrayPush(unittestMockCalls, ['sessionStorageRemove', args])
 
     # Update the mock state
     objectDelete(objectGet(unittestMockState, 'sessionStorage'), key)
@@ -387,7 +387,7 @@ function unittestMock_sessionStorageSet(args...):
     value = arrayGet(args, 1)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('sessionStorageSet', args))
+    arrayPush(unittestMockCalls, ['sessionStorageSet', args])
 
     # Update the mock state
     objectSet(objectGet(unittestMockState, 'sessionStorage'), key, value)
@@ -403,12 +403,12 @@ function unittestMock_systemFetch(data, args...):
     url = arrayGet(args, 0)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('systemFetch', args))
+    arrayPush(unittestMockCalls, ['systemFetch', args])
 
     # Array of URLs?
     urlType = systemType(url)
     if urlType == 'array':
-        result = arrayNew()
+        result = []
         for urlItem in url:
             urlActual = if(systemType(urlItem) == 'object', objectGet(urlItem, 'url'), urlItem)
             arrayPush(result, if(data != null, objectGet(data, urlActual)))
@@ -446,7 +446,7 @@ function unittestMock_windowClipboardWrite(args...):
     text = arrayGet(args, 0)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('windowClipboardWrite', args))
+    arrayPush(unittestMockCalls, ['windowClipboardWrite', args])
 
     # Update the mock state
     objectSet(unittestMockState, 'windowClipboard', text)

package/lib/model.js

@@ -324,21 +324,20 @@ export function validateExpression(expr) {
  */
 export function lintScript(script) {
     const warnings = [];
+    const {statements} = script;
 
     // Empty script?
-    if (script.statements.length === 0) {
-        warnings.push('Empty script');
+    if (statements.length === 0) {
+        lintScriptWarning(warnings, script, null, 'Empty script');
     }
 
     // Variable used before assignment?
     const varAssigns = {};
     const varUses = {};
-    getVariableAssignmentsAndUses(script.statements, varAssigns, varUses);
+    getVariableAssignmentsAndUses(statements, varAssigns, varUses);
     for (const varName of Object.keys(varAssigns)) {
         if (varName in varUses && varUses[varName] <= varAssigns[varName]) {
-            warnings.push(
-                `Global variable "${varName}" used (index ${varUses[varName]}) before assignment (index ${varAssigns[varName]})`
-            );
+            lintScriptWarning(warnings, script, statements[varUses[varName]], `Global variable "${varName}" used before assignment`);
         }
     }
 
@@ -346,14 +345,14 @@ export function lintScript(script) {
     const functionsDefined = {};
     const labelsDefined = {};
     const labelsUsed = {};
-    for (const [ixStatement, statement] of script.statements.entries()) {
+    for (const [ixStatement, statement] of statements.entries()) {
         const [statementKey] = Object.keys(statement);
 
         // Function definition checks
         if (statementKey === 'function') {
             // Function redefinition?
             if (statement.function.name in functionsDefined) {
-                warnings.push(`Redefinition of function "${statement.function.name}" (index ${ixStatement})`);
+                lintScriptWarning(warnings, script, statement, `Redefinition of function "${statement.function.name}"`);
             } else {
                 functionsDefined[statement.function.name] = ixStatement;
             }
@@ -369,9 +368,9 @@ export function lintScript(script) {
                     continue;
                 }
                 if (varName in fnVarUses && fnVarUses[varName] <= fnVarAssigns[varName]) {
-                    warnings.push(
-                        `Variable "${varName}" of function "${statement.function.name}" used (index ${fnVarUses[varName]}) ` +
-                            `before assignment (index ${fnVarAssigns[varName]})`
+                    lintScriptWarning(
+                        warnings, script, statement,
+                        `Variable "${varName}" of function "${statement.function.name}" used before assignment`
                     );
                 }
             }
@@ -379,8 +378,9 @@ export function lintScript(script) {
             // Unused variables?
             for (const varName of Object.keys(fnVarAssigns)) {
                 if (!(varName in fnVarUses)) {
-                    warnings.push(
-                        `Unused variable "${varName}" defined in function "${statement.function.name}" (index ${fnVarAssigns[varName]})`
+                    lintScriptWarning(
+                        warnings, script, statement,
+                        `Unused variable "${varName}" defined in function "${statement.function.name}"`
                     );
                 }
             }
@@ -391,13 +391,17 @@ export function lintScript(script) {
                 for (const arg of args) {
                     // Duplicate argument?
                     if (argsDefined.has(arg)) {
-                        warnings.push(`Duplicate argument "${arg}" of function "${statement.function.name}" (index ${ixStatement})`);
+                        lintScriptWarning(
+                            warnings, script, statement, `Duplicate argument "${arg}" of function "${statement.function.name}"`
+                        );
                     } else {
                         argsDefined.add(arg);
 
                         // Unused argument?
                         if (!(arg in fnVarUses)) {
-                            warnings.push(`Unused argument "${arg}" of function "${statement.function.name}" (index ${ixStatement})`);
+                            lintScriptWarning(
+                                warnings, script, statement, `Unused argument "${arg}" of function "${statement.function.name}"`
+                            );
                         }
                     }
                 }
@@ -413,7 +417,7 @@ export function lintScript(script) {
                 if (fnStatementKey === 'expr') {
                     // Pointless function expression statement?
                     if (!('name' in fnStatement.expr) && isPointlessExpression(fnStatement.expr.expr)) {
-                        warnings.push(`Pointless statement in function "${statement.function.name}" (index ${ixFnStatement})`);
+                        lintScriptWarning(warnings, script, statement, `Pointless statement in function "${statement.function.name}"`);
                     }
 
                 // Function label statement checks
@@ -421,8 +425,9 @@ export function lintScript(script) {
                     // Label redefinition?
                     const fnStatementLabel = fnStatement.label.name;
                     if (fnStatementLabel in fnLabelsDefined) {
-                        warnings.push(
-                            `Redefinition of label "${fnStatementLabel}" in function "${statement.function.name}" (index ${ixFnStatement})`
+                        lintScriptWarning(
+                            warnings, script, statement,
+                            `Redefinition of label "${fnStatementLabel}" in function "${statement.function.name}"`
                         );
                     } else {
                         fnLabelsDefined[fnStatementLabel] = ixFnStatement;
@@ -439,14 +444,14 @@ export function lintScript(script) {
             // Unused function labels?
             for (const label of Object.keys(fnLabelsDefined)) {
                 if (!(label in fnLabelsUsed)) {
-                    warnings.push(`Unused label "${label}" in function "${statement.function.name}" (index ${fnLabelsDefined[label]})`);
+                    lintScriptWarning(warnings, script, statement, `Unused label "${label}" in function "${statement.function.name}"`);
                 }
             }
 
             // Unknown function labels?
             for (const label of Object.keys(fnLabelsUsed)) {
                 if (!(label in fnLabelsDefined)) {
-                    warnings.push(`Unknown label "${label}" in function "${statement.function.name}" (index ${fnLabelsUsed[label]})`);
+                    lintScriptWarning(warnings, script, statement, `Unknown label "${label}" in function "${statement.function.name}"`);
                 }
             }
 
@@ -454,7 +459,7 @@ export function lintScript(script) {
         } else if (statementKey === 'expr') {
             // Pointless global expression statement?
             if (!('name' in statement.expr) && isPointlessExpression(statement.expr.expr)) {
-                warnings.push(`Pointless global statement (index ${ixStatement})`);
+                lintScriptWarning(warnings, script, statement, 'Pointless global statement');
             }
 
         // Global label statement checks
@@ -462,7 +467,7 @@ export function lintScript(script) {
             // Label redefinition?
             const statementLabel = statement.label.name;
             if (statementLabel in labelsDefined) {
-                warnings.push(`Redefinition of global label "${statementLabel}" (index ${ixStatement})`);
+                lintScriptWarning(warnings, script, statement, `Redefinition of global label "${statementLabel}"`);
             } else {
                 labelsDefined[statementLabel] = ixStatement;
             }
@@ -478,14 +483,14 @@ export function lintScript(script) {
     // Unused global labels?
     for (const label of Object.keys(labelsDefined)) {
         if (!(label in labelsUsed)) {
-            warnings.push(`Unused global label "${label}" (index ${labelsDefined[label]})`);
+            lintScriptWarning(warnings, script, statements[labelsDefined[label]], `Unused global label "${label}"`);
         }
     }
 
     // Unknown global labels?
     for (const label of Object.keys(labelsUsed)) {
         if (!(label in labelsDefined)) {
-            warnings.push(`Unknown global label "${label}" (index ${labelsUsed[label]})`);
+            lintScriptWarning(warnings, script, statements[labelsUsed[label]], `Unknown global label "${label}"`);
         }
     }
 
@@ -493,6 +498,21 @@ export function lintScript(script) {
 }
 
 
+// Helper to format static analysis warnings
+function lintScriptWarning(warnings, script, statement, message) {
+    let warning;
+    if (script && statement) {
+        const [statementKey] = Object.keys(statement);
+        const scriptName = script.scriptName ?? '';
+        const lineno = statement[statementKey].lineNumber ?? '';
+        warning = (scriptName || lineno) ? `${scriptName}:${lineno}: ${message}` : message;
+    } else {
+        warning = message;
+    }
+    warnings.push(warning);
+}
+
+
 // Helper function to determine if an expression statement's expression is pointless
 function isPointlessExpression(expr) {
     const [exprKey] = Object.keys(expr);