Fix getCommandIndex and getCommandCount for when run is finished

Zomis · Dec 10, 2016 · 354ed37 · 354ed37
1 parent 0e802be
commit 354ed37
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/groovy/net/zomis/brainf/model/BrainfuckCode.groovy b/src/main/groovy/net/zomis/brainf/model/BrainfuckCode.groovy
@@ -108,9 +108,9 @@ class BrainfuckCode {
         // source.getCommand(commandIndex)
     }
 
-    @Deprecated
     int getCommandCount() {
-        source.capacity()
+        def lastToken = rootTree.tokens.last();
+        return lastToken.info.position + lastToken.info.length
     }
 
     @Deprecated
@@ -119,6 +119,10 @@ class BrainfuckCode {
     }
 
     public int getCommandIndex() {
+        if (enteredTrees.isEmpty()) {
+            // No more commands to run so we are finished
+            return commandCount;
+        }
         Syntax syntax = getCurrentSyntax();
         Token token = syntax.tokens.get(positionInSyntax);
         return token.info.position;

diff --git a/src/test/groovy/net/zomis/brainf/BrainTest.groovy b/src/test/groovy/net/zomis/brainf/BrainTest.groovy
@@ -303,8 +303,11 @@ $ bf '+' * 3
 
     @Test
     public void simpleCommands() {
-        useCode("+>++>+++<")
+        String code = "+>++>+++<";
+        useCode(code)
+        assert brain.code.commandIndex == 0
         brain.run(new UntilEndStrategy());
+        assert brain.code.commandCount == code.length()
         assert brain.code.commandCount == brain.code.commandIndex
         assert 1 == brain.memory.memoryIndex
         assert 2 == brain.memory.value