Немного рефакторинга и исправлений

Author: aNNiMON

src/main/java/com/annimon/ownlang/Console.java

@@ -8,6 +8,8 @@
 
 public class Console {
 
+    private Console() { }
+
     private static final String FILE_PREFIX = "tmp/";
     private static boolean filePrefixEnabled;
 

src/main/java/com/annimon/ownlang/Main.java

@@ -40,8 +40,7 @@ public static void main(String[] args) throws IOException {
             return;
         }
 
-        final Options options = new Options();
-        boolean beautifyMode = false;
+        final RunOptions options = new RunOptions();
         String input = null;
         for (int i = 0; i < args.length; i++) {
             switch (args[i]) {
@@ -52,19 +51,19 @@ public static void main(String[] args) throws IOException {
 
                 case "-b":
                 case "--beautify":
-                    beautifyMode = true;
+                    options.beautifyMode = true;
                     break;
-                    
+
                 case "-t":
                 case "--showtokens":
                     options.showTokens = true;
                     break;
-                    
+
                 case "-m":
                 case "--showtime":
                     options.showMeasurements = true;
                     break;
-                    
+
                 case "-o":
                 case "--optimize":
                     if (i + 1 < args.length) {
@@ -88,7 +87,7 @@ public static void main(String[] args) throws IOException {
                 case "--lint":
                     options.lintMode = true;
                     return;
-                    
+
                 case "-f":
                 case "--file":
                     if (i + 1 < args.length)  {
@@ -104,7 +103,7 @@ public static void main(String[] args) throws IOException {
                     System.arraycopy(ownlangArgs, 0, newArgs, 0, ownlangArgs.length);
                     Sandbox.main(newArgs);
                     return;
-                
+
                 default:
                     if (input == null) {
                         input = args[i];
@@ -116,20 +115,15 @@ public static void main(String[] args) throws IOException {
         if (input == null) {
             throw new IllegalArgumentException("Empty input");
         }
-        if (beautifyMode) {
+        if (options.beautifyMode) {
             System.out.println(Beautifier.beautify(input));
             return;
         }
         run(input, options);
     }
 
     private static void runDefault() throws IOException {
-        final Options options = new Options();
-        options.showAst = false;
-        options.showTokens = false;
-        options.showMeasurements = false;
-        options.lintMode = false;
-        options.optimizationLevel = 0;
+        final RunOptions options = new RunOptions();
         run(SourceLoader.readSource("program.own"), options);
     }
 
@@ -153,7 +147,7 @@ private static void createOwnLangArgs(String[] javaArgs, int index) {
         System.arraycopy(javaArgs, index, ownlangArgs, 0, ownlangArgs.length);
     }
 
-    private static void run(String input, Options options) {
+    private static void run(String input, RunOptions options) {
         options.validate();
         final TimeMeasurement measurement = new TimeMeasurement();
         measurement.start("Tokenize time");
@@ -209,16 +203,18 @@ private static void run(String input, Options options) {
         }
     }
 
-    private static class Options {
+    private static class RunOptions {
         boolean showTokens, showAst, showMeasurements;
         boolean lintMode;
+        boolean beautifyMode;
         int optimizationLevel;
 
-        Options() {
+        RunOptions() {
             showTokens = false;
             showAst = false;
             showMeasurements = false;
             lintMode = false;
+            beautifyMode = false;
             optimizationLevel = 0;
         }
 

src/test/java/com/annimon/ownlang/parser/ParserTest.java

@@ -50,7 +50,8 @@ private static BlockStatement assertProgram(String input, BlockStatement actual)
     }
 
     private static void assertStatements(BlockStatement expected, BlockStatement actual) {
-        for (int i = 0; i < expected.statements.size(); i++) {
+        final int size = expected.statements.size();
+        for (int i = 0; i < size; i++) {
             assertEquals(expected.statements.get(i).getClass(), actual.statements.get(i).getClass());
         }
     }

src/test/java/com/annimon/ownlang/parser/ProgramsTest.java

@@ -36,12 +36,16 @@ public ProgramsTest(String programPath) {
     public static Collection<String> data() {
         final File resDir = new File(RES_DIR);
         return scanDirectory(resDir)
-                .map(f -> f.getPath())
+                .map(File::getPath)
                 .collect(Collectors.toList());
     }
 
     private static Stream<File> scanDirectory(File dir) {
-        return Arrays.stream(dir.listFiles())
+        final File[] files = dir.listFiles();
+        if (files == null || files.length == 0) {
+            return Stream.empty();
+        }
+        return Arrays.stream(files)
                 .flatMap(file -> {
                     if (file.isDirectory()) {
                         return scanDirectory(file);