Merge pull request #36 from source-academy/compiler

Change representation of class file to match JVM

Author: Chang-CH

src/compiler/__tests__/test-utils.ts …mpiler/__tests__/__utils__/test-utils.tssrc/compiler/__tests__/test-utils.ts renamed to src/compiler/__tests__/__utils__/test-utils.ts src/compiler/__tests__/test-utils.ts renamed to src/compiler/__tests__/__utils__/test-utils.ts

@@ -1,7 +1,8 @@
 import { inspect } from "util";
-import { Compiler } from "../compiler";
-import { BinaryWriter } from "../binary-writer";
-import { AST } from "../../ast/types/packages-and-modules";
+import { Compiler } from "../../compiler";
+import { BinaryWriter } from "../../binary-writer";
+import { AST } from "../../../ast/types/packages-and-modules";
+import { javaPegGrammar } from "../../grammar"
 import { execSync } from "child_process";
 
 import * as peggy from "peggy";
@@ -15,7 +16,6 @@ export type testCase = {
 
 const debug = false;
 const pathToTestDir = "./src/compiler/__tests__/";
-const javaPegGrammar = fs.readFileSync('./src/compiler/main.pegjs', 'utf-8');
 const parser = peggy.generate(javaPegGrammar, {
   allowedStartRules: ["CompilationUnit"],
 });
@@ -43,7 +43,3 @@ export function runTest(program: string, expectedLines: string[]) {
 
   expect(actualLines).toStrictEqual(expectedLines);
 }
-
-describe("compiler's test utils", () => {
-  it("Prevent jest from complaining", () => { });
-});

src/compiler/__tests__/tests/arithmeticExpression.test.ts

@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -85,4 +85,4 @@ export const arithmeticExpressionTest = () => describe("arithmetic expression",
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});

src/compiler/__tests__/tests/array.test.ts

@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -207,4 +207,4 @@ export const arrayTest = () => describe("arrays", () => {
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});

src/compiler/__tests__/tests/class.test.ts

@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -151,4 +151,4 @@ export const classTest = () => describe("fields and methods of class", () => {
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});

src/compiler/__tests__/tests/for.test.ts

@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -165,4 +165,4 @@ export const forTest = () => describe("for statements", () => {
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});

src/compiler/__tests__/tests/ifElse.test.ts

@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -321,4 +321,4 @@ export const ifElseTest = () => describe("if else statements", () => {
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});

src/compiler/__tests__/tests/import.test.ts

@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -50,4 +50,4 @@ export const importTest = () => describe("imports", () => {
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});

src/compiler/__tests__/tests/methodInvocation.test.ts

@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -159,4 +159,4 @@ export const methodInvocationTest = () => describe("method invocations", () => {
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});

src/compiler/__tests__/tests/println.test.ts

@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {
@@ -119,4 +119,4 @@ export const printlnTest = () => describe("println", () => {
     const { comment: comment, program: program, expectedLines: expectedLines } = testCase;
     it(comment, () => runTest(program, expectedLines));
   }
-});
+});

src/compiler/__tests__/tests/unaryExpression.test.ts

@@ -1,7 +1,7 @@
 import {
   runTest,
   testCase,
-} from "../test-utils";
+} from "../__utils__/test-utils";
 
 const testCases: testCase[] = [
   {