Fix regression when string cannot be used as variable type (#94)

docs/release-notes/1_0_1.rst

@@ -9,3 +9,4 @@ Bugfixes
 --------
 
 - Fixed a regression when I/O format segments do not pick up correct sizes taken from I/O variables.
+- Fixed a regression when ``std::string`` cannot be used as variable type.

ete-test/resources/normal-complex-formats/solution.cpp

@@ -3,5 +3,5 @@
 int A, B;
 
 int main() {
-    printf("1\n");
+    printf("yes\n");
 }

ete-test/resources/normal-complex-formats/spec.cpp

@@ -11,7 +11,7 @@ class ProblemSpec : public BaseProblemSpec {
     vector<int> X, Y;
     vector<vector<int>> M;
 
-    int res;
+    string res;
 
     void InputFormat() {
         LINE(N);
@@ -46,7 +46,7 @@ class TestSpec : public BaseTestSpec<ProblemSpec> {
             "8 8 8"
         });
         Output({
-            "1"
+            "yes"
         });
     }
 

include/tcframe/spec/variable/Matrix.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <exception>
-#include <functional>
 #include <iostream>
 #include <type_traits>
 #include <vector>
@@ -14,7 +13,6 @@ using std::endl;
 using std::iostream;
 using std::is_same;
 using std::ostream;
-using std::reference_wrapper;
 using std::ref;
 using std::vector;
 
@@ -42,40 +40,40 @@ class Matrix : public Variable {
 template<typename T, typename = ScalarCompatible<T>>
 class MatrixImpl : public Matrix {
 private:
-    reference_wrapper<vector<vector<T>>> var_;
+    vector<vector<T>>* var_;
     bool hasSpaces_;
 
 public:
     MatrixImpl(vector<vector<T>>& var, const string& name)
             : Matrix(name)
-            , var_(var)
+            , var_(&var)
             , hasSpaces_(!is_same<T, char>::value) {}
 
     int rows() const {
-        return (int) var_.get().size();
+        return (int) var_->size();
     }
 
     int columns(int rowIndex) const {
-        return (int) var_.get()[rowIndex].size();
+        return (int) (*var_)[rowIndex].size();
     }
 
     void clear() {
-        var_.get().clear();
+        var_->clear();
     }
 
     void printTo(ostream* out) {
-        for (int row = 0; row < var_.get().size(); row++) {
+        for (int row = 0; row < var_->size(); row++) {
             printRowTo(row, out);
             *out << endl;
         }
     }
 
     void printRowTo(int rowIndex, ostream* out) {
-        for (int c = 0; c < var_.get()[rowIndex].size(); c++) {
+        for (int c = 0; c < (*var_)[rowIndex].size(); c++) {
             if (c > 0 && hasSpaces_) {
                 *out << ' ';
             }
-            *out << var_.get()[rowIndex][c];
+            *out << (*var_)[rowIndex][c];
         }
     }
 
@@ -90,7 +88,7 @@ class MatrixImpl : public Matrix {
                 Variable::parseValue(in, element, TokenFormatter::formatMatrixElement(name(), r, c));
                 row.push_back(element);
             }
-            var_.get().push_back(row);
+            var_->push_back(row);
             WhitespaceManipulator::parseNewline(in, TokenFormatter::formatMatrixElement(name(), r, columns - 1));
         }
     }
@@ -111,7 +109,7 @@ class MatrixImpl : public Matrix {
             Variable::parseValue(in, element, TokenFormatter::formatMatrixElement(name(), rowIndex, c));
             row.push_back(element);
         }
-        var_.get().push_back(row);
+        var_->push_back(row);
     }
 };
 

include/tcframe/spec/variable/Scalar.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <exception>
-#include <functional>
 #include <iostream>
 #include <string>
 
@@ -12,7 +11,6 @@
 using std::istream;
 using std::ostream;
 using std::ref;
-using std::reference_wrapper;
 using std::string;
 
 namespace tcframe {
@@ -34,19 +32,19 @@ class Scalar : public Variable {
 template<typename T, typename = ScalarCompatible<T>>
 class ScalarImpl : public Scalar {
 private:
-    reference_wrapper<T> var_;
+    T* var_;
 
 public:
     ScalarImpl(T& var, const string& name)
             : Scalar(name)
-            , var_(ref(var)) {}
+            , var_(&var) {}
 
     void printTo(ostream* out) {
-        *out << var_;
+        *out << *var_;
     }
 
     void parseFrom(istream* in) {
-        Variable::parseValue(in, var_, TokenFormatter::formatVariable(name()));
+        Variable::parseValue(in, *var_, TokenFormatter::formatVariable(name()));
     }
 };
 

include/tcframe/spec/variable/Vector.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <exception>
-#include <functional>
 #include <iostream>
 #include <vector>
 
@@ -11,7 +10,6 @@
 
 using std::iostream;
 using std::ostream;
-using std::reference_wrapper;
 using std::ref;
 using std::vector;
 
@@ -39,24 +37,24 @@ class Vector : public Variable {
 template<typename T, typename = ScalarCompatible<T>>
 class VectorImpl : public Vector {
 private:
-    reference_wrapper<vector<T>> var_;
+    vector<T>* var_;
 
 public:
     VectorImpl(vector<T>& var, const string& name)
             : Vector(name)
-            , var_(ref(var)) {}
+            , var_(&var) {}
 
     int size() const {
-        return (int) var_.get().size();
+        return (int) var_->size();
     }
 
     void clear() {
-        var_.get().clear();
+        var_->clear();
     }
 
     void printTo(ostream* out) {
         bool first = true;
-        for (T& element : var_.get()) {
+        for (T& element : *var_) {
             if (!first) {
                 *out << ' ';
             }
@@ -66,7 +64,7 @@ class VectorImpl : public Vector {
     }
 
     void printElementTo(int index, ostream* out) {
-        *out << var_.get()[index];
+        *out << (*var_)[index];
     }
 
     void parseFrom(istream* in) {
@@ -96,7 +94,7 @@ class VectorImpl : public Vector {
         int index = size();
         T element;
         Variable::parseValue(in, element, TokenFormatter::formatVectorElement(name(), index));
-        var_.get().push_back(element);
+        var_->push_back(element);
     }
 };