Merge pull request #49 from jyoo980/fix-dirdecl

Fix Tests
jyoo980 · Oct 13, 2019 · 4f2a9d5 · 4f2a9d5
2 parents 09f0da0 + 1468ca2
commit 4f2a9d5
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 56 deletions.
diff --git a/src/ast/DirDecl.ts b/src/ast/DirDecl.ts
@@ -18,7 +18,7 @@ export class DirDecl extends Content {
     tabLevel: number;
 
     public parse(context: Tokenizer): any {
-        this.tabLevel = context.getCurrentLineTabLevel() === 0 ? -1 : context.getCurrentLineTabLevel();
+        this.tabLevel = context.getCurrentLineTabLevel();
 
         context.getAndCheckNext("dir");
         this.directoryName = context.getNext();
@@ -29,7 +29,7 @@ export class DirDecl extends Content {
     protected parseContents(context: Tokenizer): any {
         this.contents = [];
 
-        do {
+        while (context.getCurrentLineTabLevel() > this.tabLevel && !context.checkToken("NO_MORE_TOKENS")) {
             let contentDecl: Content;
 
             if (context.checkToken("dir")) {
@@ -44,7 +44,7 @@ export class DirDecl extends Content {
 
             contentDecl.parse(context);
             this.contents.push(contentDecl);
-        } while (context.getCurrentLineTabLevel() > this.tabLevel && !context.checkToken("NO_MORE_TOKENS"))
+        }
     }
 
     public evaluate(): any {

diff --git a/src/ast/errors/ASTErrors.ts b/src/ast/errors/ASTErrors.ts
@@ -1,6 +1,6 @@
 export class ValidationError extends Error {
     constructor(...args: any[]) {
         super(...args);
-        Error.captureStackTrace(this, ValidationError);
+        Object.setPrototypeOf(this, new.target.prototype);
     }
-}
+}
diff --git a/src/ast/symbols/TypeTable.ts b/src/ast/symbols/TypeTable.ts
@@ -4,7 +4,7 @@ import { TypeNode, SyntaxKind } from "typescript";
 export class TypeCheckError extends Error {
     constructor(...args: any[]) {
         super(...args);
-        Error.captureStackTrace(this, TypeCheckError);
+        Object.setPrototypeOf(this, new.target.prototype);
     }
 }
 
@@ -87,4 +87,14 @@ export class TypeTable {
     public areValidTypes(candidates: string[]): boolean {
         return candidates.every((candidate) => this.isValidType(candidate));
     }
+
+    // NOTE: Should be used for testing only
+    public resetTypeTable() {
+        this.table = new Map([
+            ["number", new TypeNodePair("number")],
+            ["boolean", new TypeNodePair("boolean")],
+            ["string", new TypeNodePair("string")],
+            ["void", new TypeNodePair("void")]
+        ]);
+    }
 }
diff --git a/src/util/FileSystem.ts b/src/util/FileSystem.ts
@@ -3,35 +3,35 @@ import * as fs from "fs-extra";
 export class FileReadError extends Error {
     constructor(...args: any[]) {
         super(...args);
-        Error.captureStackTrace(this, FileReadError);
+        Object.setPrototypeOf(this, new.target.prototype);
     }
 }
 
 export class FileWriteError extends Error {
     constructor(...args: any[]) {
         super(...args);
-        Error.captureStackTrace(this, FileWriteError);
+        Object.setPrototypeOf(this, new.target.prototype);
     }
 }
 
 export class FileDeleteError extends Error {
     constructor(...args: any[]) {
         super(...args);
-        Error.captureStackTrace(this, FileDeleteError);
+        Object.setPrototypeOf(this, new.target.prototype);
     }
 }
 
 export class DirectoryWriteError extends Error {
     constructor(...args: any[]) {
         super(...args);
-        Error.captureStackTrace(this, DirectoryWriteError);
+        Object.setPrototypeOf(this, new.target.prototype);
     }
 }
 
 export class PathExistsError extends Error {
     constructor(...args: any[]) {
         super(...args);
-        Error.captureStackTrace(this, PathExistsError);
+        Object.setPrototypeOf(this, new.target.prototype);
     }
 }
 

diff --git a/src/util/Tokenizer.ts b/src/util/Tokenizer.ts
@@ -3,14 +3,14 @@ import FileSystem from "./FileSystem";
 export class TokenizerError extends Error {
     constructor(...args: any[]) {
         super(...args);
-        Error.captureStackTrace(this, TokenizerError);
+        Object.setPrototypeOf(this, new.target.prototype);
     }
 }
 
 export class ParseError extends Error {
     constructor(...args: any[]) {
         super(...args);
-        Error.captureStackTrace(this, ParseError);
+        Object.setPrototypeOf(this, new.target.prototype);
     }
 }
 
@@ -122,7 +122,6 @@ export class Tokenizer {
             // 5. split on reservedword
             this.tokens.push(line.split(Tokenizer.reservedTokenWord).filter((str) => str !==''));
         });
-        console.log(this.tokens);
     }
 
     /**

diff --git a/test/ast/ClassDecl.spec.ts b/test/ast/ClassDecl.spec.ts
@@ -8,23 +8,6 @@ describe("ClassDecl parse test", () => {
 
     const DUMMY_ROOT_DIR: string = ".";
 
-
-    it("parses single-line, simple class definition", () => {
-        let tokenizer : Tokenizer = new Tokenizer("classDeclSimple.txt", "./test/testFiles");
-        let classDec : ClassDecl = new ClassDecl(DUMMY_ROOT_DIR);
-        classDec = classDec.parse(tokenizer);
-        expect(classDec.isAbstract).to.be.true;
-        expect(classDec.className).to.equal("Time");
-        expect(classDec.implementsNodes).to.be.undefined;
-        expect(classDec.extendsNodes.parentName).to.equal("TimeClass");
-        expect(classDec.comments).to.be.undefined;
-        expect(classDec.fields.length).to.equal(0);
-        expect(classDec.functions.length).to.equal(0);
-        let typeTable : TypeTable = TypeTable.getInstance();
-        expect(typeTable.table.size).to.equal(5);
-        expect(typeTable.getTypeNode(classDec.className)).to.not.be.undefined;
-    });
-
     it("parses complex class definition", () => {
         let tokenizer : Tokenizer = new Tokenizer("classDeclComplex.txt", "./test/testFiles");
         let classDec : ClassDecl = new ClassDecl(DUMMY_ROOT_DIR);

diff --git a/test/ast/FieldDecl.spec.ts b/test/ast/FieldDecl.spec.ts
@@ -1,7 +1,7 @@
 import {ParseError, Tokenizer} from "../../src/util/Tokenizer";
 import {FieldDecl} from "../../src/ast/FieldDecl";
 import {expect} from "chai";
-import {TypeCheckError} from "../../src/ast/symbols/TypeTable";
+import {TypeCheckError, TypeTable} from "../../src/ast/symbols/TypeTable";
 
 describe("FieldDecl tokenizer test", () => {
 
@@ -47,6 +47,7 @@ describe("FieldDecl tokenizer test", () => {
 
     it("should throw a TypeCheckError when it contains types which are undeclared", () => {
         const tokenizer: Tokenizer = new Tokenizer("fieldDeclExample.txt", "./test/testFiles");
+        TypeTable.getInstance().resetTypeTable();
         fieldDecl.parse(tokenizer);
         expect(() => {
             return fieldDecl.typeCheck();

diff --git a/test/testFiles/classDeclSimple.txt b/test/testFiles/classDeclSimple.txt
@@ -1 +1 @@
-abstract class Time extends TimeClass
+abstract class Time extends TimeClass
diff --git a/test/testFiles/simpleProgram.txt b/test/testFiles/simpleProgram.txt
@@ -1,7 +1,7 @@
 project ZooProject
-modules [ ]
-dir src/AnimalModels
-	interface Animal
-		fields public [ string name, number age ]
-			generate getters
-			generate setters
+	modules [ ]
+	dir src/AnimalModels
+		interface Animal
+			fields public [ string name, number age ]
+				generate getters
+				generate setters
diff --git a/test/testFiles/simpleProgramClass.txt b/test/testFiles/simpleProgramClass.txt
@@ -1,14 +1,14 @@
 project TestProject
-modules [ ]
-dir src/model
-    class Time
-        fields private [ number dayOfWeek, number hour, number minute ]
-            generate getters
-            generate setters
-        fields public [ number date ]
-            generate getters
-        function private getDate
-            params [ string id, string content, string kind ]
-            returns string
+    modules [ ]
+    dir src/model
+        class Time
+            fields private [ number dayOfWeek, number hour, number minute ]
+                generate getters
+                generate setters
+            fields public [ number date ]
+                generate getters
+            function private getDate
+                params [ string id, string content, string kind ]
+                returns string
 
 
diff --git a/test/util/FileSystem.spec.ts b/test/util/FileSystem.spec.ts
@@ -79,11 +79,17 @@ describe("FileSystem read tests", () => {
 
     it("should successfully read contents of a file", () => {
         fs = new FileSystem();
-        let contents = fs.readFileSync("projectstructureex.txt", testDir).toString();
-        expect(contents).to.equal("dir src\n" +
-            "\tclass Time\n" +
-            "\tdir TransitModels\n" +
-            "dir tests\n");
+        let contents = fs.readFileSync("programExample.txt", testDir).toString();
+        expect(contents).to.equal(
+            "project ts-dsl\n" +
+            "    dir src\n" +
+            "        dir ast\n" +
+            "        dir codegen\n" +
+            "        dir util\n" +
+            "    dir test\n" +
+            "        dir ast\n" +
+            "        dir testFiles\n" +
+            "        dir util\n");
     });
 
     it("should throw a FileReadError when reading contents of a file that does not exist", () => {

diff --git a/test/util/PackageJson.spec.ts b/test/util/PackageJson.spec.ts
@@ -54,7 +54,7 @@ describe('PackageJson generation and add modules test', function() {
         } catch (err) {
             result = err;
         } finally {
-            expect(result).to.equal('npm failed when installing abcabcabcabc with: 404 Not Found - GET https://registry.yarnpkg.com/abcabcabcabc - Not found');
+            expect(result).to.equal('npm failed when installing abcabcabcabc with: 404 Not Found: abcabcabcabc@latest');
             expect(verifiyDependency(module)).to.equal(null);
         }
     });