fix: add support for paths in msgbox.obj (#276)

Add support for paths in msgbox.obj
equinor · Sep 1, 2023 · f15b4f1 · f15b4f1
1 parent 9edabb2
commit f15b4f1
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 2 deletions.
diff --git a/server/src/septic/septicParser.ts b/server/src/septic/septicParser.ts
@@ -42,6 +42,7 @@ let validAttributeTokens = [
     SepticTokenType.numeric,
     SepticTokenType.string,
     SepticTokenType.identifier,
+    SepticTokenType.path,
 ];
 
 export class SepticParser extends Parser<SepticTokenType, SepticCnfg> {
@@ -220,7 +221,7 @@ export class SepticScanner {
                 } else if (this.peek() === "*") {
                     this.blockComment();
                 } else {
-                    this.error(`Unexpected token: ${this.peek()}`);
+                    this.path();
                 }
                 break;
             case "-":
@@ -231,6 +232,9 @@ export class SepticScanner {
                     this.error(`Unexpected token: ${c}`);
                 }
                 break;
+            case "~":
+                this.path();
+                break;
             default:
                 if (this.isDigit(c)) {
                     this.numeric();
@@ -427,6 +431,20 @@ export class SepticScanner {
         }
     }
 
+    private path(): void {
+        while (
+            !this.isAtEnd() &&
+            !(
+                this.peek() === " " ||
+                this.peek() === "\n" ||
+                this.peek() === "\r"
+            )
+        ) {
+            this.advance();
+        }
+        this.addToken(SepticTokenType.path);
+    }
+
     private isDigit(char: string): boolean {
         return char >= "0" && char <= "9";
     }

diff --git a/server/src/septic/septicTokens.ts b/server/src/septic/septicTokens.ts
@@ -17,6 +17,7 @@ export enum SepticTokenType {
     skip,
     unknown,
     identifier,
+    path,
     eof = "eof",
 }
 

diff --git a/server/src/test/septicParser.test.ts b/server/src/test/septicParser.test.ts
@@ -403,6 +403,37 @@ describe("Test tokenization of comments", () => {
     });
 });
 
+describe("Test tokenization of paths", () => {
+    it("Expect correct tokenization of path", () => {
+        const input = "Obj= /test/path ";
+        const scanner = new SepticScanner(input);
+        let tokens = scanner.scanTokens();
+        expect(tokens.tokens.length).to.equal(3);
+        expect(tokens.tokens[0].type).to.equal(SepticTokenType.attribute);
+        expect(tokens.tokens[1].type).to.equal(SepticTokenType.path);
+        expect(tokens.tokens[1].content).to.equal("/test/path");
+    });
+
+    it("Expect correct tokenization of wildcard path", () => {
+        const input = "Obj= ~ ";
+        const scanner = new SepticScanner(input);
+        let tokens = scanner.scanTokens();
+        expect(tokens.tokens.length).to.equal(3);
+        expect(tokens.tokens[0].type).to.equal(SepticTokenType.attribute);
+        expect(tokens.tokens[1].type).to.equal(SepticTokenType.path);
+        expect(tokens.tokens[1].content).to.equal("~");
+    });
+
+    it("Expect no path tokens for invalid paths", () => {
+        const input = "Obj= \bspath ";
+        const scanner = new SepticScanner(input);
+        let tokens = scanner.scanTokens();
+        expect(tokens.tokens.length).to.equal(4);
+        expect(tokens.tokens[0].type).to.equal(SepticTokenType.attribute);
+        expect(tokens.tokens[1].type).to.not.equal(SepticTokenType.path);
+    });
+});
+
 describe("Test tokenization of blocks", () => {
     it("Expect correct tokenization of attribute with list of values", () => {
         const input = `Grps=  7
@@ -637,6 +668,12 @@ describe("Test basic functionality of parser", () => {
                 end: 63,
                 content: "OFF",
             },
+            {
+                type: SepticTokenType.path,
+                start: 65,
+                end: 70,
+                content: "/test/path",
+            },
             {
                 type: SepticTokenType.eof,
                 start: 100,
@@ -648,12 +685,13 @@ describe("Test basic functionality of parser", () => {
         parser.advance();
         let attr = parser.attribute();
         expect(attr.key).to.equal("Test");
-        expect(attr.values.length).to.equal(5);
+        expect(attr.values.length).to.equal(6);
         expect(attr.values[0].value).to.equal("Test");
         expect(attr.values[1].value).to.equal("77");
         expect(attr.values[2].value).to.equal("00000000000000000000001");
         expect(attr.values[3].value).to.equal("1000");
         expect(attr.values[4].value).to.equal("OFF");
+        expect(attr.values[5].value).to.equal("/test/path");
     });
 
     it("Test parsing of variables with one part", () => {