java-slang frontend integration

src/commons/utils/JavaHelper.ts

@@ -18,7 +18,7 @@
   isUsingCse: boolean,
   options?: { uploadIsActive?: boolean; uploads?: UploadResult }
 ) {
-  let compiled = {};
+  let compiled: {[key: string]: string} = {};
 
   const stderr = (type: 'TypeCheck' | 'Compile' | 'Runtime', msg: string) => {
     context.errors.push({
@@ -110,10 +110,13 @@
     }
 
     try {
-      const classFile = compileFromSource(javaCode);
-      compiled = {
-        'Main.class': Buffer.from(new BinaryWriter().generateBinary(classFile)).toString('base64')
-      };
+      const binaryWriter = new BinaryWriter();
+      const classes = compileFromSource(javaCode);
+      console.debug(classes)
+      classes.forEach(c => {
+        compiled[c.className + '.class']
+          = Buffer.from(binaryWriter.generateBinary(c.classFile)).toString('base64');
+      });
     } catch (e) {
       stderr('Compile', e);
       return Promise.resolve({ status: 'error' });

src/features/cseMachine/java/components/Control.tsx

@@ -128,6 +128,10 @@
         return `res ${resInstr.name}`;
       case ECE.InstrType.DEREF:
         return 'deref';
+      case ECE.InstrType.BRANCH:
+        return `branch`;
+      case ECE.InstrType.SWITCH:
+        return `switch`;
       default:
         return 'INSTRUCTION';
     }
@@ -188,6 +192,11 @@
         return `Resolve field ${resInstr.name} of most recently pushed value from stash`;
       case ECE.InstrType.DEREF:
         return 'Dereference most recently pushed value from stash';
+      case ECE.InstrType.BRANCH:
+        return 'Evaluate condition and push either consequent or alternative to stash';
+      case ECE.InstrType.SWITCH:
+        const switchInstr = controlItem as ECE.SwitchInstr;
+        return `Switch on ${astToString(switchInstr.expr)} and push result of case to stash`;
       default:
         return 'INSTRUCTION';
     }