Separate LexerRunner method

Author: MightyHelper

.idea/workspace.xml

@@ -13,16 +13,17 @@
 import java.util.*;
 
 public class LexerRunner {
-	static OutputStream os;
+	static OutputStream outputStream;
 
 	private LexerRunner() {
 	}
 
 	public static void main(String[] args) {
 		Config.get().parseArguments(args);
+		String inputFileName = Config.get().getParam(Config.INPUT_FILE);
 		String outputFileName = Config.get().getParam(Config.OUTPUT_FILE);
-		os = outputFileName.isBlank() ? System.out : getOutputStream(outputFileName);
-		Lexer lexer = new Lexer(new SourceFileReader(Config.get().getParam(Config.INPUT_FILE)));
+		Lexer lexer = new Lexer(new SourceFileReader(inputFileName));
+		outputStream = outputFileName.isBlank() ? System.out : getOutputStream(outputFileName);
 		processTokens(lexer);
 	}
 
@@ -31,46 +32,53 @@ public static void main(String[] args) {
 	 * @param lexer The lexer to use
 	 */
 	private static void processTokens(Lexer lexer) {
-		List<String> header = new ArrayList<>();
-		List<List<String>> table = new ArrayList<>();
-		String headerMessage;
+		List<String> header = new ArrayList<>(); // Table header
+		List<List<String>> table = new ArrayList<>(); // Table rows
 		Language lang = Config.get().getActiveLang();
 		try {
-			while (lexer.isNotEOF(lexer.peek())) {
-				Token token = lexer.get();
-				table.add(List.of(
-					String.valueOf(token.type()),
-					String.valueOf(token.lexeme()),
-					token.location().row() + " (" + token.location().column() + ")"
-				));
-			}
-			// If no errors occurred, we can add the headers with the localized titles
-			headerMessage = lang.lexerOK();
-			header.add(lang.token());
-			header.add(lang.lexeme());
-			header.add(lang.lineCol());
-			Utils.outputTable(headerMessage, header, table, LexerRunner::output);
+			handleLexicalOK(lexer, header, table, lang);
 		} catch (CompilerError e) {
-			// If an error occurred, we can add the error headers with the localized titles
-			headerMessage = lang.lexError();
-			header.add(lang.line());
-			header.add(lang.column());
-			header.add(lang.description());
-			table.clear(); // Drop lexemes
-			table.add(List.of( // Insert Error
-				String.valueOf(e.getStart().row()),
-				String.valueOf(e.getStart().column()),
-				e.getClass().getSimpleName()
+			handleLexicalError(header, table, lang, e);
+		}
+	}
+
+	private static void handleLexicalOK(Lexer lexer, List<String> header, List<List<String>> table, Language lang) {
+		while (lexer.isNotEOF(lexer.peek())) {
+			Token token = lexer.get();
+			table.add(List.of(
+				String.valueOf(token.type()),
+				String.valueOf(token.lexeme()),
+				token.location().row() + " (" + token.location().column() + ")"
 			));
-			Utils.outputTable(headerMessage, header, table, LexerRunner::output);
-			output("\n");
-			output(e.getMessage());
 		}
+		// If no errors occurred, we can add the headers with the localized titles
+		String title = lang.lexerOK();
+		header.add(lang.token());
+		header.add(lang.lexeme());
+		header.add(lang.lineCol());
+		Utils.outputTable(title, header, table, LexerRunner::output);
+	}
+
+	private static void handleLexicalError(List<String> header, List<List<String>> table, Language lang, CompilerError e) {
+		// If an error occurred, we can add the error headers with the localized titles
+		String title = lang.lexError();
+		header.add(lang.line());
+		header.add(lang.column());
+		header.add(lang.description());
+		table.clear(); // Drop lexemes
+		table.add(List.of( // Insert Error
+			String.valueOf(e.getStart().row()),
+			String.valueOf(e.getStart().column()),
+			e.getClass().getSimpleName()
+		));
+		Utils.outputTable(title, header, table, LexerRunner::output);
+		output("\n");
+		output(e.getMessage());
 	}
 
 	private static void output(String s) {
 		try {
-			os.write(s.getBytes(StandardCharsets.UTF_8));
+			outputStream.write(s.getBytes(StandardCharsets.UTF_8));
 		} catch (IOException e) {
 			System.err.println("Unexpected error during output :c");
 			e.printStackTrace();