Merge pull request #92 from SSlinky/dev

Better expression evaluation with AST walking and TS implemented versions of operators.

Author: SSlinky

.vscode/launch.json

@@ -10,11 +10,7 @@
 			"args": [
 				"--extensionDevelopmentPath=${workspaceRoot}",
 				"${workspaceFolder}/sample/project"
-			],
-			"preLaunchTask": {
-				"type": "npm",
-				"script": "build"
-			}
+			]
 		},
 		{
 			"type": "node",

package-lock.json

@@ -6,7 +6,7 @@
 	"icon": "images/vba-lsp-icon.png",
 	"author": "SSlinky",
 	"license": "MIT",
-	"version": "1.7.2",
+	"version": "1.7.3",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/SSlinky/VBA-LanguageServer"

package.json

@@ -60,7 +60,8 @@ orderOfOps2: MOD;
 orderOfOps3: PLUS | SUBT;
 orderOfOps4: AMP;
 orderOfOps5: LIKE | (LT | GT)?  (LT | GT | EQ) | EQ;
-orderOfOps6: AND | OR | XOR | EQV | IMP;
+orderOfOps6: anyWord;
+// orderOfOps6: AND | OR | XOR | EQV | IMP;
 
 
 directiveExpression
@@ -153,7 +154,6 @@ reservedWord
     | PLUS
     | SUBT
     | THEN
-    | compilerConstant
     ;
 
 unreservedWord
@@ -166,6 +166,7 @@ unreservedWord
 	| NOTHING
 	| NULL_
 	| TRUE
+    | compilerConstant
     ;
 
 anyWord: ( unreservedWord | reservedWord)+;

server/src/antlr/vbapre.g4

@@ -96,6 +96,14 @@ export class AmbiguousNameDiagnostic extends BaseDiagnostic {
 	}
 }
 
+// test
+export class CannotEvaluateExpressionDiagnostic extends BaseDiagnostic {
+	severity = DiagnosticSeverity.Error;
+	constructor(range: Range, message: string) {
+		super(range);
+		this.message = `Cannot evaluate expression: '${message}'.`;
+	}
+}
 
 // test
 export class ShadowDeclarationDiagnostic extends BaseDiagnostic {

server/src/capabilities/diagnostics.ts

@@ -17,9 +17,9 @@ CompilerConditionalStatementContext.prototype.vbaExpression = function (): strin
     return (this.compilerIfStatement() ?? this.compilerElseIfStatement())!
         .booleanExpression()
         .getText()
-        .toLowerCase();
+        .toUpperCase();
 };
 
 DirectiveExpressionContext.prototype.vbaExpression = function (): string {
-    return this.getText().toLowerCase();
+    return this.getText().toUpperCase();
 };

server/src/extensions/antlrVbaPreParserExtensions.ts

@@ -6,6 +6,7 @@ declare global {
 		stripQuotes(): string;
 		toFilePath(): string;
 		toFileUri(): string;
+		ciEquals(s: string): boolean;
 	}
 }
 
@@ -25,3 +26,9 @@ String.prototype.toFileUri = function (): string {
 		? pathToFileURL(this.toString()).href
 		: this.toString();
 };
+
+String.prototype.ciEquals = function (s: string): boolean {
+	return this.localeCompare(s, undefined, {
+		sensitivity: 'accent'
+	}) === 0;
+};