From 6642aa86f596ce9ad2ed0adee477e26af5195e6a Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Wed, 15 Nov 2023 15:34:16 -0500 Subject: [PATCH] Change where reads file --- src/edu/jt_kb/cs4308/compiler/Driver.java | 28 ++++++------------- .../compiler/FileManagement/FileReader.java | 17 +++++++++++ 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/edu/jt_kb/cs4308/compiler/Driver.java b/src/edu/jt_kb/cs4308/compiler/Driver.java index a289c3d..9765f61 100644 --- a/src/edu/jt_kb/cs4308/compiler/Driver.java +++ b/src/edu/jt_kb/cs4308/compiler/Driver.java @@ -1,6 +1,10 @@ package edu.jt_kb.cs4308.compiler; +import edu.jt_kb.cs4308.compiler.FileManagement.FileReader; + import java.io.File; +import java.util.ArrayList; +import java.util.List; import java.util.Scanner; public class Driver { @@ -13,26 +17,12 @@ public class Driver { public void start() { File java = new File("src/edu/jt_kb/cs4308/compiler/resources/Java.txt"); File python = new File("src/edu/jt_kb/cs4308/compiler/resources/Python.txt"); - readFile(java); - System.out.println(); - readFile(python); + List code = new ArrayList<>(); + code = FileReader.readFile(java); + System.out.println(code); + code = FileReader.readFile(python); + System.out.println(code); } - private static void readFile(File file) { - try (Scanner input = new Scanner(file)) { - while (input.hasNextLine()) { - String line = input.nextLine(); - char[] chars = line.toCharArray(); - String result = "["; - for (char curr : chars) { - result += curr; - } - result += "]"; - System.out.println(result); - } - } catch (Exception e) { - e.printStackTrace(); - } - } } \ No newline at end of file diff --git a/src/edu/jt_kb/cs4308/compiler/FileManagement/FileReader.java b/src/edu/jt_kb/cs4308/compiler/FileManagement/FileReader.java index 80d9932..a9c16a1 100644 --- a/src/edu/jt_kb/cs4308/compiler/FileManagement/FileReader.java +++ b/src/edu/jt_kb/cs4308/compiler/FileManagement/FileReader.java @@ -1,4 +1,21 @@ package edu.jt_kb.cs4308.compiler.FileManagement; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Scanner; + public class FileReader { + public static List readFile(File file) { + List codeLines = new ArrayList<>(); + try (Scanner input = new Scanner(file)) { + while (input.hasNextLine()) { + String line = input.nextLine(); + codeLines.add(line + " $"); + } + } catch (Exception e) { + e.printStackTrace(); + } + return codeLines; + } }