Now with tests

Author: TPolzer

.travis.yml

@@ -16,4 +16,4 @@ before_install:
   - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90
   - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 90
 script:
-  - bazel build checktestdata
+  - bazel test test

BUILD

@@ -92,3 +92,14 @@ cc_library(
     srcs = [],
     hdrs = ["command.h"],
 )
+
+sh_test(
+    name = "test",
+    srcs = ["test.sh"],
+    data = [
+        ":checktestdata",
+    ] + glob([
+        "tests/testprog*",
+        "tests/testdata*",
+    ]),
+)

checktestdata.cc

@@ -139,13 +139,13 @@ class Reader : public Command {
         read_ = &Reader::readFloat;
         break;
       case checktestdataParser::STRING:
+        string_ = std::move(*value);
+        read_ = &Reader::readString;
         break;
-      case checktestdataParser::REGEX: {
-        const auto& str = std::get<Value::string>(value->eval().value_);
-        regex_.emplace(str);
+      case checktestdataParser::REGEX:
+        string_ = std::move(*value);
         read_ = &Reader::readRegex;
         break;
-      }
       default:
         throw std::logic_error("unimplemented read statement " +
                                std::to_string(ctx->type->getType()));
@@ -158,8 +158,26 @@ class Reader : public Command {
   }
 
  private:
+  Expression string_;
+  const void* last_string_value_ = nullptr;
   std::optional<RE2> regex_;
+
+  void readString(std::string_view& in) {
+    const auto& s = std::get<Value::string>(string_.eval().value_);
+    if (in.substr(0, s.size()) == s) {
+      in.remove_prefix(s.size());
+    }
+    if (variable_) {
+      variable_->assign(Value{s});
+    }
+  }
+
   void readRegex(std::string_view& in) {
+    const auto& s = std::get<Value::string>(string_.eval().value_);
+    if (&s != last_string_value_) {
+      last_string_value_ = &s;
+      regex_.emplace(s);
+    }
     const char* before = in.data();
     if (!RE2::Consume(&in, *regex_)) {
       throw InputMismatch{absl::StrCat("did not match regex ",
@@ -210,10 +228,12 @@ class Reader : public Command {
     if (peek(in) == '-') get(in);
     bool fail = true;
     int decimals = 0;
+    int digits = 0;
     bool scientific = false;
     while (peek(in) >= '0' && peek(in) <= '9') {
       fail = false;
       get(in);
+      ++digits;
     }
     if (!fail && peek(in) == '.') {
       get(in);
@@ -232,11 +252,17 @@ class Reader : public Command {
         get(in);
       }
     }
-    if ((mindecimals_ &&
-         std::get<int64_t>(mindecimals_->eval().value_) > decimals) ||
-        (maxdecimals_ &&
-         std::get<int64_t>(maxdecimals_->eval().value_) < decimals)) {
-      throw std::logic_error{"wrong number of decimal places in input"};
+    if (mindecimals_) {
+      int64_t mindecimals = mindecimals_->eval().toInt<uint32_t>();
+      int64_t maxdecimals = maxdecimals_->eval().toInt<uint32_t>();
+      if (scientific && (digits != 1 || before[0] == '0')) {
+        throw std::logic_error{
+            "In the FLOATP case a floating point number in scientific notation "
+            "must have exactly one nonzero digit before the decimal point."};
+      }
+      if (mindecimals > decimals || maxdecimals < decimals) {
+        throw std::logic_error{"wrong number of decimal places in input"};
+      }
     }
     if (scientific_ && *scientific_ != scientific) {
       throw std::logic_error{"wrong float format"};
@@ -538,11 +564,13 @@ int main(int argc, char** argv) {
   checktestdataLexer lexer(&input);
   CommonTokenStream tokens(&lexer);
   checktestdataParser parser(&tokens);
-  if (parser.getNumberOfSyntaxErrors()) {
-    throw std::runtime_error{"failed to compile ctd"};
-  }
   tree::ParseTree* tree = parser.main();
-  // std::cout << tree->toStringTree(&parser) << std::endl;
+  if (!lexer.hitEOF || parser.getNumberOfSyntaxErrors()) {
+    throw std::runtime_error{absl::StrCat("failed to compile ctd ",
+                                          lexer.hitEOF, " ",
+                                          parser.getNumberOfSyntaxErrors())};
+  }
+  // std::cerr << tree->toStringTree(&parser) << std::endl;
   std::vector<std::thread> threads;
   for (int i = 2; i == 2 || i < argc; ++i) {
     threads.emplace_back([tree, i, argc, argv]() {

checktestdata.g4

@@ -11,7 +11,9 @@ fragment ESCAPED_CHAR :
 	| '\\r' 
 	| '\\b'
 	| '\\\n'
-	| '\\' [0-7][0-7][0-7];
+	| '\\' [0-7][0-7][0-7]
+	| '\\' [0-7][0-7]
+	| '\\' [0-7];
 
 main : command* EOF;
 command :

expression.cc

@@ -38,11 +38,13 @@ Value parseString(const std::string& literal) {
       i += 1;
       char c2 = literal[i];
       if (c2 >= '0' && c2 <= '9') {
-        i++;
-        char c3 = literal[i];
-        i++;
-        char c4 = literal[i];
-        result += static_cast<char>(c4 + 8 * (c3 + 8 * c2));
+        for (; i < (int)literal.size() - 1 && literal[i] >= '0' &&
+               literal[i] <= '9';
+             ++i) {
+          c2 *= 8;
+          c2 += literal[i];
+        }
+        result += c2;
       } else {
         switch (c2) {
           case '\\':

test.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+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/')".*)
+  do
+    echo checktestdata $prog $data
+    ./checktestdata $prog $data
+    retval=$?
+    if [[ ($prog == *.err*) || ($data == *.err*) ]]
+    then
+      retval=$[! $retval]
+    fi
+    if [ "$retval" -ne 0 ]
+    then
+      exit 1
+    fi
+  done
+done
+exit $retval

tests/testdata23.in

@@ -1,2 +1,2 @@
-bar.*
+(?s)bar.*
 barblaboo.*#!?$$^[a-z]