tiny updates

- handle abort trap \method() in debug() statements - handle obj[1].method() - numeric indexing - skip non-symbol names when processing RHS in spin
ironsheep · Nov 24, 2023 · d9a457a · d9a457a
1 parent 9e8795e
commit d9a457a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/spin2/CHANGELOG.md b/spin2/CHANGELOG.md
@@ -24,6 +24,7 @@ Possible next additions:
 Update P2 Only
 
 - Fixes to SPIN2 symbol.storageType and object[index].method() parsing
+- Handle \methodName() in debug() statements
 
 ## [2.2.6] 2023-11-21
 

diff --git a/spin2/server/src/parser/spin2.documentSemanticParser.ts b/spin2/server/src/parser/spin2.documentSemanticParser.ts
@@ -42,7 +42,7 @@ export class Spin2DocumentSemanticParser {
 
   private bLogStarted: boolean = false;
   // adjust following true/false to show specific parsing debug
-  private spin2DebugLogEnabled: boolean = true; // WARNING (REMOVE BEFORE FLIGHT)- change to 'false' - disable before commit
+  private spin2DebugLogEnabled: boolean = false; // WARNING (REMOVE BEFORE FLIGHT)- change to 'false' - disable before commit
   private showSpinCode: boolean = true;
   private showPreProc: boolean = true;
   private showCON: boolean = true;
@@ -4667,6 +4667,10 @@ export class Spin2DocumentSemanticParser {
             this._logSPIN(`  --  SPIN RHS    nameOffset=(${nameOffset}), offsetInNonStringRHS=(${offsetInNonStringRHS}), currentOffset=(${currentOffset})`);
             for (let index = 0; index < possibleNameSet.length; index++) {
               const namePart = possibleNameSet[index];
+              if (!namePart.charAt(0).match(/[a-zA-Z_]/)) {
+                nameOffset += namePart.length;
+                continue;
+              }
               currNameLength = namePart.length;
               nameOffset = line.indexOf(namePart, nameOffset);
               this._logSPIN(`  --  processing name(s) namePart=[${namePart}](${namePart.length})`);
@@ -6340,6 +6344,9 @@ export class Spin2DocumentSemanticParser {
           if (nameParts.length > 1) {
             indexNames = nameParts[1];
           }
+          if (indexNames && !indexNames.charAt(0).match(/[a-zA-Z_]/)) {
+            indexNames = undefined;
+          }
         }
         if (indexNames) {
           // handle case: instance[index].reference[()]  - "index" value

diff --git a/spin2/server/src/parser/spin2.utils.ts b/spin2/server/src/parser/spin2.utils.ts
@@ -90,7 +90,7 @@ export class Spin2ParseUtils {
     //this._logMessage("  -- gdnwlp nonDblStringLine=[" + nonDblStringLine + "]");
     const nonSglStringLine: string = this.removeDebugSingleQuotedStrings(nonDblStringLine, true);
     //this._logMessage("  -- gdnwlp nonSglStringLine=[" + nonSglStringLine + "]");
-    let lineParts: string[] | null = nonSglStringLine.match(/[^ ,@\[\]\=\+\-\*\/\:\#\<\>\|\^\&\t\(\)\!\?\~]+/g);
+    let lineParts: string[] | null = nonSglStringLine.match(/[^ ,@\[\]\=\+\-\*\/\:\#\<\>\|\^\&\t\(\)\!\?\~\\]+/g);
     //let lineParts: string[] | null = line.match(/[^ ,@\[\]\+\-\*\/\<\>\t\(\)]+/g);
     return lineParts == null ? [] : lineParts;
   }