Modify the compiler to return multiple class files with their file names.

Author: AprupKale

package.json

@@ -3,7 +3,9 @@
   "version": "1.0.13",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "files": ["dist"],
+  "files": [
+    "dist"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/source-academy/java-slang.git"
@@ -40,5 +42,6 @@
     "java-parser": "^2.0.5",
     "lodash": "^4.17.21",
     "peggy": "^4.0.2"
-  }
+  },
+  "packageManager": "[email protected]+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }

src/ClassFile/types/index.ts

@@ -3,6 +3,11 @@ import { ConstantInfo } from './constants'
 import { FieldInfo } from './fields'
 import { MethodInfo } from './methods'
 
+export interface Class {
+  classFile: ClassFile
+  className: string
+}
+
 export interface ClassFile {
   magic: number
   minorVersion: number

src/compiler/compiler.ts

@@ -1,4 +1,4 @@
-import { ClassFile } from '../ClassFile/types'
+import { Class, ClassFile } from '../ClassFile/types'
 import { AST } from '../ast/types/packages-and-modules'
 import {
   ClassBodyDeclaration,
@@ -52,7 +52,7 @@ export class Compiler {
   compile(ast: AST) {
     this.setup()
     this.symbolTable.handleImports(ast.importDeclarations)
-    const classFiles: Array<ClassFile> = []
+    const classFiles: Array<Class> = []
 
     ast.topLevelClassOrInterfaceDeclarations.forEach(decl => {
       const className = decl.typeIdentifier
@@ -66,7 +66,7 @@ export class Compiler {
     ast.topLevelClassOrInterfaceDeclarations.forEach(decl => {
       this.resetClassFileState()
       const classFile = this.compileClass(decl)
-      classFiles.push(classFile)
+      classFiles.push({classFile: classFile, className: this.className})
     })
 
     return classFiles

src/compiler/index.ts

@@ -1,16 +1,16 @@
 import * as peggy from 'peggy'
 import { AST } from '../ast/types/packages-and-modules'
-import { ClassFile } from '../ClassFile/types'
+import { Class } from '../ClassFile/types'
 import { Compiler } from './compiler'
 import { javaPegGrammar } from './grammar'
 import { peggyFunctions } from './peggy-functions'
 
-export const compile = (ast: AST): Array<ClassFile> => {
+export const compile = (ast: AST): Array<Class> => {
   const compiler = new Compiler()
   return compiler.compile(ast)
 }
 
-export const compileFromSource = (javaProgram: string): Array<ClassFile> => {
+export const compileFromSource = (javaProgram: string): Array<Class> => {
   const parser = peggy.generate(peggyFunctions + javaPegGrammar, {
     allowedStartRules: ['CompilationUnit'],
     cache: true