Condense epilogue, VCall, MemWrite

1 files changed, 1 insertions, 20 deletions

diff --git a/V2VM.java b/V2VM.java
index 7e2f07e..cbe11eb 100644
--- a/V2VM.java
+++ b/V2VM.java
@@ -8,12 +8,6 @@ import cs132.vapor.ast.VDataSegment;
 import cs132.vapor.ast.VFunction;
 import cs132.vapor.ast.VInstr;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
 import java.util.Arrays;
 
 import cfg.*;
@@ -31,7 +25,7 @@ public class V2VM {
             InputStream is2 = new ByteArrayInputStream(bytes);
 
             InputStream systemInCopy = createCopyOfSystemIn();
-            ArrayList<String> strProg = inputStreamToArrayList(is1);
+            ArrayList<String> strProg = SplitProgramInputStream.split(is1);
 
             VaporProgram prog = parseVapor(is2, System.out);
 
@@ -90,19 +84,6 @@ public class V2VM {
         return program;
     }
 
-    public static ArrayList<String> inputStreamToArrayList(InputStream inputStream) {
-        ArrayList<String> lines = new ArrayList<>();
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                lines.add(line);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return lines;
-    }
-
     public static byte[] readAllBytes(InputStream inputStream) throws IOException {
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         int nRead;