Merge loopvar test from #7 and fix it.

Loop counter should be incremented after the last iteration.

Author: TPolzer

BUILD

@@ -37,6 +37,7 @@ cc_binary(
     deps = [
         ":command",
         ":expression",
+        ":loop",
         ":parser",
         ":stream",
         ":value",
@@ -93,6 +94,16 @@ cc_library(
     hdrs = ["command.h"],
 )
 
+cc_library(
+    name = "loop",
+    srcs = ["loop.cc"],
+    hdrs = ["loop.h"],
+    deps = [
+        ":command",
+        ":expression",
+    ],
+)
+
 sh_test(
     name = "test",
     srcs = ["test.sh"],

checktestdata.cc

@@ -12,6 +12,7 @@
 
 #include "command.h"
 #include "expression.h"
+#include "loop.h"
 #include "stream.h"
 #include "variable.h"
 
@@ -65,56 +66,6 @@ class SuccessCommand : public Command {
   void run(std::string_view&) {}
 };
 
-class Loop : public Command {
- public:
-  Command* after_ = nullptr;
-  Command* separator_ = nullptr;
-  std::optional<Expression> i_;
-
- protected:
-  void set_i(int64_t i) {
-    if (i_) i_->assign(Value{i});
-  }
-};
-
-class WhileLoop : public Loop {
-  virtual void run(std::string_view& in) override {
-    if (next_) {
-      for (int64_t i = 0; std::get<bool>(condition_.eval().value_); ++i) {
-        set_i(i);
-        if (i)
-          separator_->run(in);
-        else
-          next_->run(in);
-      }
-    }
-    after_->run(in);
-  }
-
- public:
-  Expression condition_;
-};
-
-class ForLoop : public Loop {
-  virtual void run(std::string_view& in) override {
-    if (next_) {
-      Value v = count_.eval();
-      int64_t count = v.toInt<uint32_t>();
-      for (int64_t i = 0; i < count; ++i) {
-        set_i(i);
-        if (i)
-          separator_->run(in);
-        else
-          next_->run(in);
-      }
-    }
-    after_->run(in);
-  }
-
- public:
-  Expression count_;
-};
-
 class Reader : public Command {
  public:
   Reader(checktestdataParser::ReadContext* ctx, std::optional<Expression> min,

loop.cc

@@ -0,0 +1,33 @@
+#include "loop.h"
+
+void WhileLoop::run(std::string_view& in) {
+  if (next_) {
+    int64_t i;
+    for (i = 0; std::get<bool>(condition_.eval().value_); ++i) {
+      set_i(i);
+      if (i)
+        separator_->run(in);
+      else
+        next_->run(in);
+    }
+    set_i(i);
+  }
+  after_->run(in);
+}
+
+void ForLoop::run(std::string_view& in) {
+  if (next_) {
+    Value v = count_.eval();
+    int64_t count = v.toInt<uint32_t>();
+    int64_t i;
+    for (i = 0; i < count; ++i) {
+      set_i(i);
+      if (i)
+        separator_->run(in);
+      else
+        next_->run(in);
+    }
+    set_i(i);
+  }
+  after_->run(in);
+}

loop.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <string_view>
+
+#include "command.h"
+#include "expression.h"
+
+class Loop : public Command {
+ public:
+  Command* after_ = nullptr;
+  Command* separator_ = nullptr;
+  std::optional<Expression> i_;
+
+ protected:
+  void set_i(int64_t i) {
+    if (i_) i_->assign(Value{i});
+  }
+};
+
+class WhileLoop : public Loop {
+  void run(std::string_view& in) override;
+
+ public:
+  Expression condition_;
+};
+
+class ForLoop : public Loop {
+  void run(std::string_view& in) override;
+
+ public:
+  Expression count_;
+};

test.sh

@@ -3,7 +3,7 @@ IFS=$'\n'
 progs=$(find tests/ | grep testprog | sort -V)
 for prog in $progs
 do
-  for data in $(ls "$(echo $prog | sed -e 's/testprog\([0-9]*\)\..*/testdata\1/')".*)
+  for data in $(ls "$(echo $prog | sed -e 's/testprog\([^.]*\)\..*/testdata\1/')".*)
   do
     echo checktestdata $prog $data
     ./checktestdata $prog $data

tests/testdataloopvar.in

@@ -0,0 +1 @@
+0 1

tests/testprogloopvar.in

@@ -0,0 +1,6 @@
+# Read at least 2 bits (space-separated)
+WHILEI(i,!MATCH("\n"), SPACE)
+  INT(0,1)
+END
+ASSERT(i>=2)
+NEWLINE