Skip to content

Commit

Permalink
repair multiline symbol lookup
Browse files Browse the repository at this point in the history
  • Loading branch information
@ironsheep
ironsheep committed Nov 22, 2023
1 parent 0c8771f commit bd9cb75
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 39 deletions.
2 changes: 1 addition & 1 deletion spin2/TEST_LANG_SERVER/spin2/221206-fixes.spin2
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
' Run with DEBUG enabled to view

_clkfreq = 300_000_000 ' <--- FIXME:l not colored correctly (TOP defaults to CON (but syntax, how???)
_clkfreq = 300_000_000

sprites = 128

Expand Down
1 change: 1 addition & 0 deletions spin2/TEST_LANG_SERVER/spin2/231118-fixes.spin2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ PRI DeleteChainFromID(ID, EndID, Mode, KeepFirstIDValid) | Block, Header
Header.[19..8] <> EndID, ... 'mode 1: delete to ThisID = EndID
ID <> EndID) 'mode 2: delete to NextID = EndID

while lookupz(Mode: Header.[0], Header.[19..8] <> EndID, ID <> EndID) 'mode 2: delete to NextID = EndID

PRI CancelBlock(Block)

Expand Down
35 changes: 16 additions & 19 deletions spin2/server/src/parser/spin.common.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

import { Position } from "vscode-languageserver-types";
import { Context } from "../context";
import { isBuffer } from "util";

export enum eDebugDisplayType {
Unknown = 0,
Expand Down Expand Up @@ -100,7 +99,7 @@ export class ContinuedLines {
this.haveAllLines = true;
this._finishLine();
}
this._logMessage(` --- ContLn: addLine() line=[${nextLine}], lineIdx=(${lineIdx}), nbrLines=(${this.rawLines.length}), haveAllLines=(${this.haveAllLines})`);
//this._logMessage(` --- ContLn: addLine() line=[${nextLine}], lineIdx=(${lineIdx}), nbrLines=(${this.rawLines.length}), haveAllLines=(${this.haveAllLines})`);
} else {
this._logMessage(` --- ContLn: ERROR addLine() line=[${nextLine}], lineIdx=(${lineIdx}) - attempt add after last line arrived!`);
}
Expand Down Expand Up @@ -205,41 +204,39 @@ export class ContinuedLines {
let rawIdx: number = 0;
let remainingOffset: number = offset;
// subtract earlier line lengths from remainder to locate line our symbol is on
//this._logMessage(
// ` --- ContLn: ENTRY locateSymbol([${symbolName}], srtOfs=(${offset})) - rawLines=(${this.rawLines.length}), Ln#${this.lineStartIdx + 1}-${this.lineStartIdx + this.rawLines.length}`
//);
this._logMessage(
` --- ContLn: ENTRY locateSymbol([${symbolName}], srtOfs=(${offset})) - rawLines=(${this.rawLines.length}), Ln#${this.lineStartIdx + 1}-${this.lineStartIdx + this.rawLines.length}`
);
for (let index = 0; index < this.rawLines.length; index++) {
const rawPossContLine: string = this.rawLines[index];
const isLineContinued: boolean = rawPossContLine.endsWith("...");
const currLineLength: number = isLineContinued ? this._lengthWithoutContinuation(rawPossContLine) + 1 : rawPossContLine.trim().length;
const foundLineWhiteSpaceLength = this._skipWhite(rawPossContLine, 0);
// if the first line, don't take out the leading whitespace
const accumLength = index == 0 ? foundLineWhiteSpaceLength + currLineLength : currLineLength;
//this._logMessage(
// ` --- ContLn: ls() - CHECKING rawIdx=(${rawIdx}), remainingOffset=(${remainingOffset}), currLineLength=(${currLineLength}), isLineContinued=(${isLineContinued}) continuedLine=[${rawPossContLine}](${rawPossContLine.length})`
//);
const trimmedLineContentOnly: string = isLineContinued ? rawPossContLine.slice(0, -3).trimEnd() : rawPossContLine.trimEnd();
const remainingString: string = index == 0 ? trimmedLineContentOnly.substring(remainingOffset) : trimmedLineContentOnly.trimStart().substring(remainingOffset);
/*
this._logMessage(` --- ContLn: ls() - CHECKING rawIdx=(${rawIdx}), remainingOffset=(${remainingOffset}), currLineLength=(${currLineLength}), isLineContinued=(${isLineContinued})`);
this._logMessage(` --- ContLn: ls() - CHECKING continuedLine=[${rawPossContLine}](${rawPossContLine.length})`);
this._logMessage(` --- ContLn: ls() - CHECKING remainingString=[${remainingString}](${remainingString.length})`);
//*/
// if our offset is not in this line -or- the remainder of this line is not long enough to contain our symbol
if (remainingOffset > accumLength) {
if (remainingOffset >= accumLength) {
// not in this line... go to next...
rawIdx++;
remainingOffset -= accumLength;
//this._logMessage(
// ` --- ContLn: ls() - NOT-LINE rawIdx=(${rawIdx}), remainingOffset=(${remainingOffset}), currLineLength=(${currLineLength}), isLineContinued=(${isLineContinued})`
//);
} else if (rawPossContLine.indexOf(symbolName, remainingOffset) == -1) {
} else if (remainingString.length < symbolName.length || remainingString.indexOf(symbolName) == -1) {
// if not found in remainder of line... go to next
rawIdx++;
remainingOffset = 0;
} else if (currLineLength - remainingOffset < symbolName.length) {
// symbol can't fit in this line? go to next
// FIXME: TODO: is this needed?? / VALID??
rawIdx++;
remainingOffset = 0;
//this._logMessage(` --- ContLn: ls() - NOT-FIT rawIdx=(${rawIdx}), remainingOffset=(${remainingOffset}), currLineLength=(${currLineLength}), isLineContinued=(${isLineContinued})`);
} else {
// must be in this line!
this._logMessage(
` --- ContLn: locateSymbol() - THIS-LINE rawIdx=(${rawIdx}), remainingOffset=(${remainingOffset}), currLineLength=(${currLineLength}), isLineContinued=(${isLineContinued})`
` --- ContLn: locateSymbol() - THIS-LINE rawIdx=(${rawIdx}), remainingOffset=(${remainingOffset}), currLineLength=(${currLineLength}), isLineContinued=(${isLineContinued})`
);
break; // symbol is in this line
}
Expand All @@ -257,9 +254,9 @@ export class ContinuedLines {
desiredLocation = Position.create(lineIdx, symbolOffset);
//this._logMessage(` --- ContLn: locateSymbol() -> Posn=[line=(${lineIdx}), char=(${symbolOffset})]`);
if (symbolOffset != -1) {
this._logMessage(` --- ContLn: Found IN Ln#${lineIdx + 1} [${this.rawLines[rawIdx]}](${this.rawLines[rawIdx].length})`);
this._logMessage(` --- ContLn: Found [${symbolName}] IN Ln#${lineIdx + 1} [${this.rawLines[rawIdx]}](${this.rawLines[rawIdx].length})`);
} else {
this._logMessage(` --- NOT found! ?? [${symbolName}] NOT in line=[${this.rawLines[rawIdx]}] ??`);
this._logMessage(` --- ERROR NOT found! ?? [${symbolName}] NOT in line=[${this.rawLines[rawIdx]}] ??`);
}
}
return desiredLocation;
Expand Down
29 changes: 10 additions & 19 deletions spin2/server/src/parser/spin2.documentSemanticParser.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3836,10 +3836,10 @@ export class Spin2DocumentSemanticParser {
if (variableNamePart.endsWith(".")) {
variableNamePart = variableNamePart.substr(0, variableNamePart.length - 1);
}
//const nameOffset = line.indexOf(variableNamePart, currSingleLineOffset);
symbolPosition = multiLineSet.locateSymbol(variableNamePart, currSingleLineOffset);
let nameOffset = multiLineSet.offsetIntoLineForPosition(symbolPosition);
if (variableNamePart.charAt(0).match(/[a-zA-Z_]/)) {
//const nameOffset = line.indexOf(variableNamePart, currSingleLineOffset);
symbolPosition = multiLineSet.locateSymbol(variableNamePart, currSingleLineOffset);
let nameOffset = multiLineSet.offsetIntoLineForPosition(symbolPosition);
if (this._isPossibleObjectReference(variableNamePart)) {
// go register object reference!
const bHaveObjReference = this._reportObjectReference(variableNamePart, symbolPosition.line, symbolPosition.character, multiLineSet.lineAt(symbolPosition.line), tokenSet);
Expand Down Expand Up @@ -4144,6 +4144,7 @@ export class Spin2DocumentSemanticParser {
this._logSPIN(` -- assignmentStringOffset=[${assignmentStringOffset}], bIsDebugLine=(${bIsDebugLine})`);
let offsetInNonStringRHS = 0;
let currNameLength: number = 0;
this._logSPIN(` -- SPIN Multi loop start currSingleLineOffset=(${currSingleLineOffset})`);
for (let index = 0; index < possNames.length; index++) {
let possibleName = possNames[index];
// special code to handle case of var.[bitfield] leaving name a 'var.'
Expand Down Expand Up @@ -4176,27 +4177,17 @@ export class Spin2DocumentSemanticParser {
if (!bHaveObjReference) {
const searchString: string = possibleNameSet.length == 1 ? possibleNameSet[0] : possibleNameSet[0] + "." + possibleNameSet[1];
//nameOffset = nonStringAssignmentRHSStr.indexOf(searchString, offsetInNonStringRHS) + assignmentStringOffset; // so we don't match in in strings...
symbolPosition = multiLineSet.locateSymbol(searchString, currSingleLineOffset);
nameOffset = multiLineSet.offsetIntoLineForPosition(symbolPosition);
this._logSPIN(` -- SPIN RHS nonStringAssignmentRHSStr=[${nonStringAssignmentRHSStr}]`);
this._logSPIN(` -- SPIN RHS searchString=[${searchString}]`);
this._logSPIN(` -- SPIN RHS nameOffset=(${nameOffset}), offsetInNonStringRHS=(${offsetInNonStringRHS}), currSingleLineOffset=(${currSingleLineOffset})`);
let referenceDetails: RememberedToken | undefined = undefined;
if (this.semanticFindings.isLocalToken(namePart)) {
referenceDetails = this.semanticFindings.getLocalTokenForLine(namePart, symbolPosition.line + 1);
if (referenceDetails) {
this._logSPIN(` -- FOUND Local name=[${namePart}], referenceDetails=(${referenceDetails})`);
} else {
this._logSPIN(` -- EXISTS Local name=[${namePart}], BUT referenceDetails=(${referenceDetails})`);
}
this._logSPIN(` -- FOUND Local name=[${namePart}], referenceDetails=(${referenceDetails})`);
}
if (!referenceDetails && this.semanticFindings.isGlobalToken(namePart)) {
referenceDetails = this.semanticFindings.getGlobalToken(namePart);
if (referenceDetails) {
this._logSPIN(` -- FOUND Global name=[${namePart}], referenceDetails=(${referenceDetails})`);
} else {
this._logSPIN(` -- EXISTS Global name=[${namePart}], BUT referenceDetails=(${referenceDetails})`);
}
this._logSPIN(` -- FOUND Global name=[${namePart}], referenceDetails=(${referenceDetails})`);
if (referenceDetails != undefined && referenceDetails?.type == "method") {
const methodCallNoSpace = `${namePart}(`;
const methodCallSpace = `${namePart} (`;
Expand Down Expand Up @@ -4357,8 +4348,8 @@ export class Spin2DocumentSemanticParser {
});
}
offsetInNonStringRHS += currNameLength + 1;
currSingleLineOffset += currNameLength + 1;
//this._logSPIN(` -- SPIN ADVANCE by name part len - offsetInNonStringRHS: (${priorInNonStringRHS}) -> (${offsetInNonStringRHS}), currentOffset: (${priorOffset}) -> (${currentOffset})`);
currSingleLineOffset = nameOffset > 0 ? nameOffset + currNameLength : currSingleLineOffset + currNameLength;
this._logSPIN(` -- SPIN Multi loop currSingleLineOffset=(${currSingleLineOffset}) <-- nameOffset=(${nameOffset}), currNameLength=(${currNameLength})`);
}
}
return tokenSet;
Expand Down Expand Up @@ -4721,11 +4712,11 @@ export class Spin2DocumentSemanticParser {
let nameOffset: number = 0;
currNameLength = possibleName.length;
if (possibleName.charAt(0).match(/[a-zA-Z_]/)) {
this._logSPIN(" -- possibleName=[" + possibleName + "]");
this._logSPIN(` -- possibleName=[${possibleName}]`);
// does name contain a namespace reference?
if (possibleName.includes(".")) {
possibleNameSet = possibleName.split(".");
this._logSPIN(" -- possibleNameSet=[" + possibleNameSet + "]");
this._logSPIN(` -- possibleNameSet=[${possibleNameSet}]`);
}
const namePart = possibleNameSet[0];
currNameLength = namePart.length;
Expand Down

0 comments on commit bd9cb75

Please sign in to comment.