Ability to have fixed-format procedure names spread over multiple lines

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

language/models/fixed.js

@@ -131,7 +131,11 @@ export function parseDLine(lineNumber, lineIndex, content) {
  */
 export function parsePLine(content, lineNumber, lineIndex) {
   content = content.padEnd(80);
-  const name = content.substr(6, 16)
+  let name = content.substr(6, 16).trimEnd();
+  if (name.endsWith(`...`)) {
+    name = name.substring(0, name.length - 3);
+  }
+  
   const longForm = content.substring(6).trimEnd();
   const potentialName = longForm.endsWith(`...`) ? calculateToken(lineNumber, lineIndex+6, longForm.substring(0, longForm.length - 3)) : undefined;
   const start = content[23].toUpperCase() === `B`;

language/parser.ts

@@ -203,8 +203,29 @@ export default class Parser {
       return objectName;
     };
 
-    let potentialName: Token|undefined;
-    let potentialNameUsed = false;
+    let potentialName: Token[]|undefined;
+    const getPotentialName = () => {
+      if (potentialName && potentialName.length > 0) {
+        return potentialName.map(p => p.value).join(``);
+      } else {
+        return undefined;
+      }
+    }
+    const pushPotentialNameToken = (token?: Token) => {
+      if (!potentialName) {
+        potentialName = [];
+      }
+      if (token) {
+        potentialName.push(token);
+      }
+    }
+    const getPotentialNameToken = (): Token|undefined => {
+      if (potentialName && potentialName.length > 0) {
+        return potentialName[potentialName.length - 1];
+      } else {
+        return undefined;
+      }
+    }
 
     let currentGroup: "structs"|"procedures"|"constants";
 
@@ -1445,8 +1466,6 @@ export default class Parser {
               }
             }
 
-            potentialName = cSpec.factor1;
-
             switch (cSpec.opcode && cSpec.opcode.value) {
             case `BEGSR`:
 
@@ -1523,29 +1542,34 @@ export default class Parser {
             const pSpec = parsePLine(line, lineNumber, lineIndex);
 
             if (pSpec.potentialName) {
-              potentialName = pSpec.potentialName;
-              potentialNameUsed = true;
+              pushPotentialNameToken(pSpec.potentialName);
+              
               tokens = [pSpec.potentialName];
             } else {
               if (pSpec.start) {
-                tokens = [...pSpec.keywordsRaw, pSpec.name]
-                potentialName = pSpec.name && pSpec.name.value.length > 0 ? pSpec.name : potentialName;
+                tokens = [...pSpec.keywordsRaw, pSpec.name];
+
+                if (pSpec.name && pSpec.name.value.length > 0) {
+                  pushPotentialNameToken(pSpec.name);
+                }
 
-                if (potentialName) {
+                const currentNameToken = getPotentialNameToken();
+
+                if (currentNameToken) {
                   currentItem = new Declaration(`procedure`);
 
-                  currentProcName = potentialName.value;
+                  currentProcName = getPotentialName();
                   currentItem.name = currentProcName;
                   currentItem.keyword = pSpec.keywords;
 
                   currentItem.position = {
                     path: fileUri,
-                    range: potentialName.range
+                    range: currentNameToken.range
                   };
 
                   currentItem.range = {
-                    start: potentialName.range.line,
-                    end: potentialName.range.line
+                    start: currentNameToken.range.line,
+                    end: currentNameToken.range.line
                   };
 
                   currentItem.scope = new Cache(undefined, true);
@@ -1573,35 +1597,36 @@ export default class Parser {
           case `D`:
             const dSpec = parseDLine(lineNumber, lineIndex, line);
 
-            if (dSpec.potentialName && dSpec.potentialName) {
-              potentialName = dSpec.potentialName;
-              potentialNameUsed = true;
+            if (dSpec.potentialName) {
+              pushPotentialNameToken(dSpec.potentialName);
               tokens = [dSpec.potentialName];
               continue;
             } else {
-              potentialName = dSpec.name && dSpec.name.value.length > 0 ? dSpec.name : potentialName;
-              tokens = [dSpec.field, ...dSpec.keywordsRaw, dSpec.name];
 
-              const useNameToken = potentialName ? potentialName : dSpec.field;
+              if (dSpec.name && dSpec.name.value.length > 0) {
+                pushPotentialNameToken(dSpec.name);
+              }
+
+              tokens = [dSpec.field, ...dSpec.keywordsRaw, dSpec.name];
 
               switch (dSpec.field && dSpec.field.value) {
               case `C`:
                 currentItem = new Declaration(`constant`);
-                currentItem.name = potentialName ? potentialName.value : NO_NAME;
+                currentItem.name = getPotentialName() || NO_NAME;
                 currentItem.keyword = dSpec.keywords || {};
 
                 // TODO: line number might be different with ...?
                 currentItem.position = {
                   path: fileUri,
-                  range: useNameToken.range
+                  range: dSpec.field.range
                 };
 
                 scope.addSymbol(currentItem);
                 resetDefinition = true;
                 break;
               case `S`:
                 currentItem = new Declaration(`variable`);
-                currentItem.name = potentialName ? potentialName.value : NO_NAME;
+                currentItem.name = getPotentialName() || NO_NAME;
                 currentItem.keyword = {
                   ...dSpec.keywords,
                   ...prettyTypeFromToken(dSpec),
@@ -1610,7 +1635,7 @@ export default class Parser {
                 // TODO: line number might be different with ...?
                 currentItem.position = {
                   path: fileUri,
-                  range: useNameToken.range
+                  range: getPotentialNameToken().range
                 };
 
                 scope.addSymbol(currentItem);
@@ -1619,20 +1644,20 @@ export default class Parser {
 
               case `DS`:
                 currentItem = new Declaration(`struct`);
-                currentItem.name = potentialName ? potentialName.value : NO_NAME;
+                currentItem.name = getPotentialName() || NO_NAME;
                 currentItem.keyword = dSpec.keywords;
 
                 currentItem.position = {
                   path: fileUri,
-                  range: useNameToken.range
+                  range: getPotentialNameToken()?.range || dSpec.field.range
                 };
 
                 currentItem.range = {
                   start: currentItem.position.range.line,
                   end: currentItem.position.range.line
                 };
 
-                expandDs(fileUri, useNameToken, currentItem);
+                expandDs(fileUri, getPotentialNameToken(), currentItem);
 
                 currentGroup = `structs`;
                 scope.addSymbol(currentItem);
@@ -1641,15 +1666,15 @@ export default class Parser {
 
               case `PR`:
                 currentItem = new Declaration(`procedure`);
-                currentItem.name = potentialName ? potentialName.value : NO_NAME;
+                currentItem.name = getPotentialName() || NO_NAME;
                 currentItem.keyword = {
                   ...prettyTypeFromToken(dSpec),
                   ...dSpec.keywords
                 }
 
                 currentItem.position = {
                   path: fileUri,
-                  range: useNameToken.range
+                  range: getPotentialNameToken().range
                 };
 
                 currentItem.range = {
@@ -1704,27 +1729,27 @@ export default class Parser {
                   // This happens when it's a blank parm.
                     const baseToken = dSpec.type || dSpec.len;
                   if (!potentialName && baseToken) {
-                    potentialName = {
+                    pushPotentialNameToken({
                       ...baseToken,
                       value: NO_NAME
-                    }
+                    });
                   }
 
                   if (potentialName) {
                     currentSub = new Declaration(`subitem`);
-                    currentSub.name = potentialName.value;
+                    currentSub.name = getPotentialName();
                     currentSub.keyword = {
                       ...prettyTypeFromToken(dSpec),
                       ...dSpec.keywords
                     }
 
                     currentSub.position = {
                       path: fileUri,
-                      range: potentialName.range
+                      range: getPotentialNameToken().range
                     };
 
                     // If the parameter has likeds, add the subitems to make it a struct.
-                    await expandDs(fileUri, potentialName, currentSub);
+                    await expandDs(fileUri, getPotentialNameToken(), currentSub);
 
                     currentItem.subItems.push(currentSub);
                     currentSub = undefined;
@@ -1766,7 +1791,6 @@ export default class Parser {
 
         if (resetDefinition) {
           potentialName = undefined;
-          potentialNameUsed = false;
 
           currentItem = undefined;
           currentTitle = undefined;