Fix Wall

ia-toki · Oct 29, 2024 · dfddcdf · dfddcdf
1 parent 8d0f16b
commit dfddcdf
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/include/tcframe/driver/TestCaseDriver.hpp b/include/tcframe/driver/TestCaseDriver.hpp
@@ -38,8 +38,8 @@ class TestCaseDriver {
             IOManipulator* ioManipulator,
             Verifier* verifier,
             MultipleTestCasesConfig multipleTestCasesConfig)
-            : ioManipulator_(ioManipulator)
-            , rawIOManipulator_(rawIOManipulator)
+            : rawIOManipulator_(rawIOManipulator)
+            , ioManipulator_(ioManipulator)
             , verifier_(verifier)
             , multipleTestCasesConfig_(move(multipleTestCasesConfig)) {}
 

diff --git a/include/tcframe/runner/grader/Grader.hpp b/include/tcframe/runner/grader/Grader.hpp
@@ -77,7 +77,7 @@ class Grader {
 private:
     map<int, double> getSubtaskPoints(const GradingOptions& options) {
         map<int, double> subtaskPointsByIds;
-        for (int id = 1; id <= options.subtaskPoints().size(); id++) {
+        for (unsigned id = 1; id <= options.subtaskPoints().size(); id++) {
             subtaskPointsByIds[id] = options.subtaskPoints()[id - 1];
         }
         if (subtaskPointsByIds.empty()) {

diff --git a/include/tcframe/runner/os/OperatingSystem.hpp b/include/tcframe/runner/os/OperatingSystem.hpp
@@ -100,7 +100,8 @@ class OperatingSystem {
 
 private:
     static void runCommand(const string& command) {
-        system(command.c_str());
+        int val = system(command.c_str());
+        std::cerr << "[tcframe] exit code: " << val << "\n";
     }
 };
 

diff --git a/include/tcframe/spec/constraint/Subtask.hpp b/include/tcframe/spec/constraint/Subtask.hpp
@@ -34,8 +34,8 @@ struct Subtask {
 
     Subtask(int id, double points, vector<Constraint> constraints)
             : id_(id)
-            , points_(points)
-            , constraints_(move(constraints)) {}
+	    , constraints_(move(constraints))
+            , points_(points) {}
 
     int id() const {
         return id_;

diff --git a/include/tcframe/spec/core/Magic.hpp b/include/tcframe/spec/core/Magic.hpp
@@ -36,8 +36,8 @@ namespace tcframe {
 struct VectorSize {
     function<int()> size;
 
-    explicit VectorSize(function<int()> size)
-            : size(move(size)) {}
+    explicit VectorSize(function<int()> _size)
+            : size(move(_size)) {}
 };
 
 template<typename T>
@@ -55,9 +55,9 @@ struct MatrixSize {
     function<int()> rows;
     function<int()> columns;
 
-    MatrixSize(function<int()> rows, function<int()> columns)
-            : rows(move(rows))
-            , columns(move(columns)) {}
+    MatrixSize(function<int()> _rows, function<int()> _columns)
+            : rows(move(_rows))
+            , columns(move(_columns)) {}
 };
 
 class VariableNamesExtractor {

diff --git a/include/tcframe/spec/io/IOFormat.hpp b/include/tcframe/spec/io/IOFormat.hpp
@@ -49,7 +49,7 @@ struct IOFormat {
         if (a.size() != b.size()) {
             return false;
         }
-        for (int i = 0; i < a.size(); i++) {
+        for (unsigned i = 0; i < a.size(); i++) {
             if (!a[i]->equals(b[i])) {
                 return false;
             }
@@ -61,7 +61,7 @@ struct IOFormat {
         if (a.size() != b.size()) {
             return false;
         }
-        for (int i = 0; i < a.size(); i++) {
+        for (unsigned i = 0; i < a.size(); i++) {
             if (!equals(a[i], b[i])) {
                 return false;
             }

diff --git a/include/tcframe/spec/io/LinesIOSegment.hpp b/include/tcframe/spec/io/LinesIOSegment.hpp
@@ -46,7 +46,7 @@ struct LinesIOSegment : public IOSegment {
         if (variables_.size() != o.variables_.size()) {
             return false;
         }
-        for (int i = 0; i < variables_.size(); i++) {
+        for (unsigned i = 0; i < variables_.size(); i++) {
             if (!variables_[i]->equals(o.variables_[i])) {
                 return false;
             }

diff --git a/include/tcframe/spec/io/LinesIOSegmentManipulator.hpp b/include/tcframe/spec/io/LinesIOSegmentManipulator.hpp
@@ -65,7 +65,7 @@ class LinesIOSegmentManipulator {
 
         int size = getSize(segment);
         for (int j = 0; j < size; j++) {
-            for (int i = 0; i < segment->variables().size(); i++) {
+            for (unsigned i = 0; i < segment->variables().size(); i++) {
                 Variable *variable = segment->variables()[i];
                 if (variable->type() == VariableType::VECTOR) {
                     if (i > 0) {

diff --git a/include/tcframe/spec/variable/Vector.hpp b/include/tcframe/spec/variable/Vector.hpp
@@ -111,7 +111,6 @@ class RawVectorImpl : public VectorImpl<string> {
             , var_(&var) {}
 
     void parseAndAddElementFrom(istream* in) {
-        int index = size();
         string element;
         Variable::parseRawLine(in, element);
         var_->push_back(element);

diff --git a/scripts/tcframe b/scripts/tcframe
@@ -54,7 +54,7 @@ build() {
         exit 1
     fi
 
-    g++ -std=c++17 -Wunused -Wall -Wshadow -Wunused-type -O3 -D__TCFRAME_SPEC_FILE__="\"$SPEC_FILE\"" -I "$TCFRAME_HOME/include" $TCFRAME_CXX_FLAGS -o "$RUNNER_EXEC" "$TCFRAME_HOME/src/tcframe/runner.cpp"
+    g++ -std=c++17 -Wunused -Wall -Wshadow -Wreturn-type -O3 -D__TCFRAME_SPEC_FILE__="\"$SPEC_FILE\"" -I "$TCFRAME_HOME/include" $TCFRAME_CXX_FLAGS -o "$RUNNER_EXEC" "$TCFRAME_HOME/src/tcframe/runner.cpp"
     echo_colored "Build OK" 32
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ build() { @@
             exit 1
         fi
-        g++ -std=c++17 -Wunused -Wall -Wshadow -Wunused-type -O3 -D__TCFRAME_SPEC_FILE__="\"$SPEC_FILE\"" -I "$TCFRAME_HOME/include" $TCFRAME_CXX_FLAGS -o "$RUNNER_EXEC" "$TCFRAME_HOME/src/tcframe/runner.cpp"
+        g++ -std=c++17 -Wunused -Wall -Wshadow -Wreturn-type -O3 -D__TCFRAME_SPEC_FILE__="\"$SPEC_FILE\"" -I "$TCFRAME_HOME/include" $TCFRAME_CXX_FLAGS -o "$RUNNER_EXEC" "$TCFRAME_HOME/src/tcframe/runner.cpp"
         echo_colored "Build OK" 32
     }
@@ Expand Down @@