Add IOAnalysis, addressing #22

Author: Zomis

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

@@ -17,7 +17,6 @@ class Brainalyze implements BrainfuckListener {
     private final int[] actionsPerCommand
     private final int[] codeCommands
     private final MemoryCell[] cells
-    private final IndexCounters whileLoopCounts = new IndexCounters()
     private final List<Map> problematicCommands = []
     private final GroovyBFContext groovy
     @PackageScope final Map<Class<?>, Object> analysis = [:]
@@ -147,10 +146,6 @@ class Brainalyze implements BrainfuckListener {
             this.memoryIndexBelowZero = true
         }
 
-        if (command == BrainFCommand.READ) {
-            cell.userInputs.add(codeIndex)
-        }
-
         switch (command) {
             case BrainFCommand.ADD:
             case BrainFCommand.SUBTRACT:
@@ -162,9 +157,6 @@ class Brainalyze implements BrainfuckListener {
                 break
         }
 
-        if (command == BrainFCommand.WRITE) {
-            cell.prints.add(codeIndex)
-        }
     }
 
     @Override

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

@@ -15,8 +15,6 @@ class MemoryCell {
 
     final int index
     boolean used
-    IndexCounter prints = new IndexCounter('print')
-    IndexCounter userInputs = new IndexCounter('userInput')
 
     private final Map<Class<?>, Object> analysis = [:]
 
@@ -60,8 +58,7 @@ class MemoryCell {
         Stream<CellTagger> taggers = this.analysis.values().stream()
             .filter({it instanceof CellTagger})
             .map({it as CellTagger})
-        Stream<CellTagger> oldTaggers = Stream.of(prints, userInputs)
-        Stream.concat(taggers, oldTaggers)
+        taggers
             .flatMap({it.tags(loopNames)})
             .sorted()
             .collect(countingCollector())

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

@@ -0,0 +1,46 @@
+package net.zomis.brainf.analyze.analyzers
+
+import net.zomis.brainf.analyze.BrainfuckAnalyzer
+import net.zomis.brainf.analyze.CellTagger
+import net.zomis.brainf.analyze.IndexCounter
+import net.zomis.brainf.analyze.MemoryCell
+import net.zomis.brainf.model.BrainfuckCommand
+import net.zomis.brainf.model.BrainfuckRunner
+import net.zomis.brainf.model.classic.BrainFCommand
+
+import java.util.function.Function
+import java.util.stream.Stream
+
+class IOAnalysis implements BrainfuckAnalyzer {
+
+    public static class CellIO implements CellTagger {
+        IndexCounter prints = new IndexCounter('print')
+        IndexCounter userInputs = new IndexCounter('userInput')
+
+        @Override
+        Stream<String> tags(Function<Integer, String> indexToStringFunction) {
+            return Stream.concat(prints.tags(indexToStringFunction), userInputs.tags(indexToStringFunction))
+        }
+
+        @Override
+        String toString() { 'CellIO ' }
+    }
+
+    @Override
+    Object createMemoryData() {
+        return new CellIO()
+    }
+
+    @Override
+    void beforePerform(MemoryCell cell, BrainfuckRunner runner, BrainfuckCommand command) {
+        int codeIndex = runner.code.commandIndex
+        if (command == BrainFCommand.READ) {
+            cell.data(this, CellIO).userInputs.add(codeIndex)
+        }
+
+        if (command == BrainFCommand.WRITE) {
+            cell.data(this, CellIO).prints.add(codeIndex)
+        }
+
+    }
+}

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.IOAnalysis
 import net.zomis.brainf.analyze.analyzers.MemoryValues
 import net.zomis.brainf.analyze.analyzers.ReadWriteAnalysis
 import net.zomis.brainf.analyze.analyzers.WhileLoopAnalysis
@@ -70,7 +71,7 @@ public class BrainTest extends BrainfuckTest {
     public void userInputTag() {
         String commands = '++++[->,<]'
         brain = BrainF.createFromCodeAndInput(30, commands, 'INPUT')
-        analyze()
+        analyze(new IOAnalysis())
         cellTagsContains(analyze.cell(1), 'userInput')
     }
 
@@ -138,9 +139,9 @@ public class BrainTest extends BrainfuckTest {
     @Test
     public void printedMemory() {
         source.addCommands('>.<+++.[-.]')
-        analyze()
-        assert analyze.cell(0).prints.toString() == '[6, 9 * 3]' // printed by code index 6 once, code index 9 thrice
-        assert analyze.cell(1).prints.toString() == '[1]'
+        analyze(new IOAnalysis())
+        assert analyze.cell(0).data(IOAnalysis.CellIO).prints.toString() == '[6, 9 * 3]' // printed by code index 6 once, code index 9 thrice
+        assert analyze.cell(1).data(IOAnalysis.CellIO).prints.toString() == '[1]'
     }
 
     @Test