Add Beautifier as a stage

Author: aNNiMON

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

@@ -2,7 +2,7 @@
 
 import com.annimon.ownlang.exceptions.OwnLangParserException;
 import com.annimon.ownlang.exceptions.StoppedException;
-import com.annimon.ownlang.parser.Beautifier;
+import com.annimon.ownlang.parser.BeautifierStage;
 import com.annimon.ownlang.parser.Token;
 import com.annimon.ownlang.parser.ast.Statement;
 import com.annimon.ownlang.parser.error.ParseErrorsFormatterStage;
@@ -97,9 +97,10 @@ public static void main(String[] args) throws IOException {
             }
         }
         if (options.beautifyMode) {
-            String input = new SourceLoaderStage()
+            String result = new SourceLoaderStage()
+                    .then(new BeautifierStage())
                     .perform(new StagesDataMap(), options.toInputSource());
-            System.out.println(Beautifier.beautify(input));
+            System.out.println(result);
             return;
         }
         run(options);

ownlang-parser/src/main/java/com/annimon/ownlang/parser/Beautifier.java renamed to ownlang-parser/src/main/java/com/annimon/ownlang/parser/BeautifierStage.java

@@ -1,18 +1,16 @@
 package com.annimon.ownlang.parser;
 
 import com.annimon.ownlang.Console;
+import com.annimon.ownlang.stages.Stage;
+import com.annimon.ownlang.stages.StagesData;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  *
  * @author aNNiMON
  */
-public final class Beautifier {
-    
-    public static String beautify(String input) {
-        return new Beautifier(input).beautify();
-    }
+public final class BeautifierStage implements Stage<String, String> {
 
     private enum OperatorMode {
         SPACES, RSPACES, TRIM, RTRIM, AS_SOURCE,
@@ -77,21 +75,20 @@ private enum OperatorMode {
         OPERATORS.put(">>>", OperatorMode.SPACES);
     }
 
-    private final String input;
-    private final int length;
-    
-    private final StringBuilder beautifiedCode, buffer;
-    
+    private String input;
+    private int length;
+    private StringBuilder beautifiedCode, buffer;
     private int pos;
     private int indentLevel;
 
-    public Beautifier(String input) {
+    @Override
+    public String perform(StagesData stagesData, String input) {
         this.input = input;
         length = input.length();
         beautifiedCode = new StringBuilder();
         buffer = new StringBuilder();
-
         indentLevel = 0;
+        return beautify();
     }
 
     public String beautify() {