Add BrainfuckAnalyzers for a list of all analyzers. Cleanup Brainalyze

Author: Zomis

src/main/groovy/net/zomis/brainf/analyze/Brainalyze.groovy

@@ -11,7 +11,7 @@ import net.zomis.brainf.model.groovy.GroovyBFContext
 import java.util.function.ToIntFunction
 import java.util.function.ToLongFunction
 
-class Brainalyze implements BrainfuckListener {
+class Brainalyze {
 
     private final MemoryCell[] cells
     private final GroovyBFContext groovy
@@ -35,21 +35,6 @@ class Brainalyze implements BrainfuckListener {
         cells[index]
     }
 
-    @Deprecated
-    static Brainalyze analyze(BrainfuckRunner brain, GroovyBFContext groovyContext) {
-        Brainalyze analyze = new Brainalyze(brain, groovyContext)
-        brain.setListener(analyze)
-        brain.run()
-
-        for (int i = analyze.cells.length - 1; i >= 0; i--) {
-            if (analyze.cells[i].used) {
-                analyze.maxMemory = i
-                break
-            }
-        }
-        analyze
-    }
-
     void print() {
         if (get(ReadWriteAnalysis)) {
             maxMemory = get(ReadWriteAnalysis).maxMemory
@@ -67,49 +52,6 @@ class Brainalyze implements BrainfuckListener {
         println()
     }
 
-    @Override
-    void beforePerform(BrainfuckRunner runner, BrainfuckCommand cmd) {
-        if (!(cmd instanceof BrainFCommand)) {
-            return
-        }
-        BrainFCommand command = (BrainFCommand) cmd
-        MemoryCell cell = cells[runner.memory.memoryIndex]
-
-        switch (command) {
-            case BrainFCommand.ADD:
-            case BrainFCommand.SUBTRACT:
-            case BrainFCommand.READ:
-            case BrainFCommand.WHILE:
-            case BrainFCommand.END_WHILE:
-            case BrainFCommand.WRITE:
-                cell.used = true
-                break
-        }
-
-    }
-
-    @Override
-    void afterPerform(BrainfuckRunner runner, BrainfuckCommand command) {
-    }
-
-    int[] array(ToIntFunction<MemoryCell> function, int fromIndex, int toIndex) {
-        int[] result = new int[toIndex - fromIndex]
-        for (int i = 0; i < result.length; i++) {
-            MemoryCell cell = cells[fromIndex + i]
-            result[i] = function.applyAsInt(cell)
-        }
-        result
-    }
-
-    long[] arrayLong(ToLongFunction<MemoryCell> function, int fromIndex, int toIndex) {
-        long[] result = new long[toIndex - fromIndex]
-        for (int i = 0; i < result.length; i++) {
-            MemoryCell cell = cells[fromIndex + i]
-            result[i] = function.applyAsLong(cell)
-        }
-        result
-    }
-
     public <T> long[] arrayLong(Class<T> clazz, ToLongFunction<T> function, int fromIndex, int toIndex) {
         long[] result = new long[toIndex - fromIndex]
         for (int i = 0; i < result.length; i++) {

src/main/groovy/net/zomis/brainf/analyze/MemoryCell.groovy

@@ -14,7 +14,6 @@ import java.util.stream.Stream
 class MemoryCell {
 
     final int index
-    boolean used
 
     private final Map<Class<?>, Object> analysis = [:]
 

src/main/groovy/net/zomis/brainf/analyze/analyzers/BrainfuckAnalyzers.groovy

@@ -0,0 +1,20 @@
+package net.zomis.brainf.analyze.analyzers
+
+import net.zomis.brainf.analyze.BrainfuckAnalyzer
+
+class BrainfuckAnalyzers {
+
+    public static BrainfuckAnalyzer[] getAvailableAnalyzers() {
+        BrainfuckAnalyzer[] analyzers = [
+                new GroovyCommandAnalysis(),
+                new IOAnalysis(),
+                new MemoryValues(),
+                new ReadWriteAnalysis(),
+                new WhileLoopAnalysis(),
+                new CommandCountAnalysis(),
+                new MemoryIndexAnalysis(),
+        ]
+        analyzers
+    }
+
+}

src/main/groovy/net/zomis/brainf/model/groovy/SpecialDelegate.groovy

@@ -1,6 +1,8 @@
 package net.zomis.brainf.model.groovy
 
+import net.zomis.brainf.analyze.AnalyzeFactory
 import net.zomis.brainf.analyze.Brainalyze
+import net.zomis.brainf.analyze.analyzers.BrainfuckAnalyzers
 import net.zomis.brainf.model.BrainfuckCode
 import net.zomis.brainf.model.BrainfuckCommand
 import net.zomis.brainf.model.BrainfuckMemory
@@ -113,7 +115,9 @@ class SpecialDelegate {
             GroovyBFContext otherContext = new GroovyBFContext()
             other.code.source = ListCode.create(new GroovySupportConverter(otherContext,
                     new BrainfuckConverter()), url.text)
-            Brainalyze analyze = Brainalyze.analyze(other, otherContext)
+            Brainalyze analyze = new AnalyzeFactory()
+                .addAnalyzers(BrainfuckAnalyzers.availableAnalyzers)
+                .analyze(other, otherContext)
             println "Analyze for $file"
             analyze.print()
             println()

src/main/groovy/net/zomis/brainf/ui/MainController.java

@@ -20,7 +20,9 @@
 import javafx.scene.control.TabPane;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
+import net.zomis.brainf.analyze.AnalyzeFactory;
 import net.zomis.brainf.analyze.Brainalyze;
+import net.zomis.brainf.analyze.analyzers.BrainfuckAnalyzers;
 import net.zomis.brainf.model.BrainfuckRunner;
 import net.zomis.brainf.model.ListCode;
 import net.zomis.brainf.model.groovy.GroovyBFContext;
@@ -128,7 +130,9 @@ private void stopCode() {
     }
 
     @FXML private void analyze(ActionEvent event) {
-        Brainalyze analyze = Brainalyze.analyze(brain(), new GroovyBFContext());
+        Brainalyze analyze = new AnalyzeFactory()
+            .addAnalyzers(BrainfuckAnalyzers.getAvailableAnalyzers())
+            .analyze(brain(), new GroovyBFContext());
         analyze.print();
     }
 

src/test/groovy/net/zomis/brainf/BrainfuckTest.groovy

@@ -3,6 +3,7 @@ package net.zomis.brainf
 import net.zomis.brainf.analyze.AnalyzeFactory
 import net.zomis.brainf.analyze.Brainalyze
 import net.zomis.brainf.analyze.BrainfuckAnalyzer
+import net.zomis.brainf.analyze.analyzers.BrainfuckAnalyzers
 import net.zomis.brainf.analyze.analyzers.CommandCountAnalysis
 import net.zomis.brainf.analyze.analyzers.GroovyCommandAnalysis
 import net.zomis.brainf.analyze.analyzers.IOAnalysis
@@ -25,10 +26,6 @@ class BrainfuckTest {
     Brainalyze analyze
     GroovyBFContext context
 
-    void analyze() {
-        analyze = Brainalyze.analyze(brain, context)
-    }
-
     void analyze(BrainfuckAnalyzer... analyzers) {
         analyze = new AnalyzeFactory().addAnalyzers(analyzers).analyze(brain, context)
     }
@@ -44,15 +41,6 @@ class BrainfuckTest {
     }
 
     void analyzeAll() {
-        BrainfuckAnalyzer[] analyzers = [
-              new GroovyCommandAnalysis(),
-              new IOAnalysis(),
-              new MemoryValues(),
-              new ReadWriteAnalysis(),
-              new WhileLoopAnalysis(),
-              new CommandCountAnalysis(),
-              new MemoryIndexAnalysis(),
-        ]
-        analyze(analyzers)
+        analyze(BrainfuckAnalyzers.availableAnalyzers)
     }
 }