Add MemoryValues analysis, addressing #22

Author: Zomis

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

@@ -22,8 +22,6 @@ class Brainalyze implements BrainfuckListener {
     private final GroovyBFContext groovy
     @PackageScope final Map<Class<?>, Object> analysis = [:]
     private boolean memoryIndexBelowZero
-    private int minValue
-    private int maxValue
     private int maxMemory
 
     public <T extends BrainfuckAnalyzer> T get(Class<T> clazz) {
@@ -60,10 +58,6 @@ class Brainalyze implements BrainfuckListener {
         brain.setListener(analyze)
         brain.run()
 
-        for (int i = 0; i < brain.memory.memorySize; i++) {
-            analyze.cells[i].value = brain.memory.getMemory(i)
-        }
-
         int commandCount = brain.code.commandCount
         for (int i = 0; i < commandCount; i++) {
             BrainfuckCommand command = brain.code.getCommandAt(i)
@@ -203,12 +197,6 @@ class Brainalyze implements BrainfuckListener {
 
     @Override
     void afterPerform(BrainfuckRunner runner, BrainfuckCommand command) {
-        if (runner.memory.value > this.maxValue) {
-            this.maxValue = runner.memory.value
-        }
-        if (runner.memory.value < this.minValue) {
-            this.minValue = runner.memory.value
-        }
     }
 
     IndexCounters getWhileLoopCounts() {
@@ -251,12 +239,4 @@ class Brainalyze implements BrainfuckListener {
         this.memoryIndexBelowZero
     }
 
-    int getMinValue() {
-        this.minValue
-    }
-
-    int getMaxValue() {
-        this.maxValue
-    }
-
 }

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

@@ -15,7 +15,6 @@ class MemoryCell {
 
     final int index
     boolean used
-    int value
     IndexCounter prints = new IndexCounter()
     IndexCounter userInputs = new IndexCounter()
 
@@ -44,18 +43,13 @@ class MemoryCell {
     }
 
     String toString(GroovyBFContext groovy) {
-        int value = this.value
         String hexAddress = String.format("%04X", index)
         String decAddress = String.format("%06d", index)
 
-        boolean specialChar = value >= 0 && value <= 13
-        char chrValue = specialChar ? 32 : value;
-        String decValue = String.format("%6d", value);
-
         String analysis = analysis.values().stream().map({obj -> String.valueOf(obj)}).collect(Collectors.joining('\t'))
         Map<String, Integer> tagsCount = resolveTags(groovy)
         String tags = tagsCount.isEmpty() ? '' : tagsCount.toString()
-        "Hex $hexAddress\tDec $decAddress\tValue $decValue '$chrValue' \t" +
+        "Hex $hexAddress\tDec $decAddress\t" +
             analysis +
             "$tags".toString()
     }

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

@@ -0,0 +1,49 @@
+package net.zomis.brainf.analyze.analyzers
+
+import net.zomis.brainf.analyze.Brainalyze
+import net.zomis.brainf.analyze.BrainfuckAnalyzer
+import net.zomis.brainf.analyze.MemoryCell
+import net.zomis.brainf.model.BrainfuckCommand
+import net.zomis.brainf.model.BrainfuckRunner
+
+class MemoryValues implements BrainfuckAnalyzer {
+
+    public static class MemoryCellValue {
+        int value
+
+        String toString() {
+            int value = this.value
+            boolean specialChar = value >= 0 && value <= 13
+            char chrValue = specialChar ? 32 : value;
+            String decValue = String.format("%6d", value);
+            "Value $decValue '$chrValue'"
+        }
+
+    }
+
+    private int minValue
+    private int maxValue
+
+    @Override
+    void afterPerform(MemoryCell cell, BrainfuckRunner runner, BrainfuckCommand command) {
+        if (runner.memory.value > this.maxValue) {
+            this.maxValue = runner.memory.value
+        }
+        if (runner.memory.value < this.minValue) {
+            this.minValue = runner.memory.value
+        }
+    }
+
+    @Override
+    Object createMemoryData() {
+        return new MemoryCellValue()
+    }
+
+    @Override
+    void after(Brainalyze analyze, BrainfuckRunner runner) {
+        for (int i = 0; i < runner.memory.memorySize; i++) {
+            analyze.cell(i).data(this, MemoryCellValue).value = runner.memory.getMemory(i)
+        }
+    }
+
+}

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

@@ -2,6 +2,7 @@ package net.zomis.brainf
 
 import net.zomis.brainf.analyze.IndexCounters
 import net.zomis.brainf.analyze.MemoryCell
+import net.zomis.brainf.analyze.analyzers.MemoryValues
 import net.zomis.brainf.analyze.analyzers.ReadWriteAnalysis
 import net.zomis.brainf.model.BrainF
 import net.zomis.brainf.model.classic.BrainFCommand
@@ -211,7 +212,7 @@ public class BrainTest extends BrainfuckTest {
     public void readsAndWrites() {
         source.addCommands(">> +++++ [->[+>>]+[<<]>]")
         // distribute values from 5 downto 1 across the tape
-        analyze(new ReadWriteAnalysis())
+        analyze(new MemoryValues(), new ReadWriteAnalysis())
         analyze.print()
         ReadWriteAnalysis readWrite = analyze.get(ReadWriteAnalysis)
         assert readWrite.maxMemory == 0x0B