Refactor: Move all config classes to spec/config/ package

ia-toki · Aug 3, 2017 · 86d96c6 · 86d96c6
1 parent c4c3368
commit 86d96c6
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -102,19 +102,20 @@ set(INCLUDE
         include/tcframe/runner/verdict/VerdictCreator.hpp
         include/tcframe/runner/verdict/VerdictStatus.hpp
         include/tcframe/spec.hpp
+        include/tcframe/spec/config.hpp
+        include/tcframe/spec/config/GradingConfig.hpp
+        include/tcframe/spec/config/MultipleTestCasesConfig.hpp
+        include/tcframe/spec/config/StyleConfig.hpp
         include/tcframe/spec/constraint.hpp
         include/tcframe/spec/constraint/Constraint.hpp
         include/tcframe/spec/constraint/ConstraintSuite.hpp
         include/tcframe/spec/constraint/Subtask.hpp
         include/tcframe/spec/core.hpp
         include/tcframe/spec/core/BaseTestSpec.hpp
         include/tcframe/spec/core/BaseProblemSpec.hpp
-        include/tcframe/spec/core/GradingConfig.hpp
         include/tcframe/spec/core/Magic.hpp
-        include/tcframe/spec/core/MultipleTestCasesConfig.hpp
         include/tcframe/spec/core/SeedSetter.hpp
         include/tcframe/spec/core/Spec.hpp
-        include/tcframe/spec/core/StyleConfig.hpp
         include/tcframe/spec/io.hpp
         include/tcframe/spec/io/GridIOSegment.hpp
         include/tcframe/spec/io/GridIOSegmentManipulator.hpp

diff --git a/include/tcframe/spec/config.hpp b/include/tcframe/spec/config.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "tcframe/spec/config/GradingConfig.hpp"
+#include "tcframe/spec/config/MultipleTestCasesConfig.hpp"
+#include "tcframe/spec/config/StyleConfig.hpp"
diff --git a/include/tcframe/spec/core/GradingConfig.hpp → ...ude/tcframe/spec/config/GradingConfig.hpp b/include/tcframe/spec/core/GradingConfig.hpp → ...ude/tcframe/spec/config/GradingConfig.hpp
diff --git a/...ame/spec/core/MultipleTestCasesConfig.hpp → ...e/spec/config/MultipleTestCasesConfig.hpp b/...ame/spec/core/MultipleTestCasesConfig.hpp → ...e/spec/config/MultipleTestCasesConfig.hpp
diff --git a/include/tcframe/spec/core/StyleConfig.hpp → include/tcframe/spec/config/StyleConfig.hpp b/include/tcframe/spec/core/StyleConfig.hpp → include/tcframe/spec/config/StyleConfig.hpp
diff --git a/include/tcframe/spec/core.hpp b/include/tcframe/spec/core.hpp
@@ -2,9 +2,6 @@
 
 #include "tcframe/spec/core/BaseProblemSpec.hpp"
 #include "tcframe/spec/core/BaseTestSpec.hpp"
-#include "tcframe/spec/core/GradingConfig.hpp"
 #include "tcframe/spec/core/Magic.hpp"
-#include "tcframe/spec/core/MultipleTestCasesConfig.hpp"
 #include "tcframe/spec/core/SeedSetter.hpp"
 #include "tcframe/spec/core/Spec.hpp"
-#include "tcframe/spec/core/StyleConfig.hpp"
diff --git a/include/tcframe/spec/core/BaseProblemSpec.hpp b/include/tcframe/spec/core/BaseProblemSpec.hpp
@@ -2,9 +2,7 @@
 
 #include <vector>
 
-#include "GradingConfig.hpp"
-#include "MultipleTestCasesConfig.hpp"
-#include "StyleConfig.hpp"
+#include "tcframe/spec/config.hpp"
 #include "tcframe/spec/constraint.hpp"
 #include "tcframe/spec/io.hpp"
 #include "tcframe/util.hpp"

diff --git a/include/tcframe/spec/core/BaseTestSpec.hpp b/include/tcframe/spec/core/BaseTestSpec.hpp
@@ -4,11 +4,9 @@
 #include <string>
 #include <vector>
 
-#include "GradingConfig.hpp"
-#include "MultipleTestCasesConfig.hpp"
 #include "SeedSetter.hpp"
 #include "Spec.hpp"
-#include "StyleConfig.hpp"
+#include "tcframe/spec/config.hpp"
 #include "tcframe/spec/random.hpp"
 #include "tcframe/util.hpp"
 

diff --git a/include/tcframe/spec/core/Spec.hpp b/include/tcframe/spec/core/Spec.hpp
@@ -1,10 +1,7 @@
 #pragma once
 
-#include "GradingConfig.hpp"
-#include "MultipleTestCasesConfig.hpp"
 #include "SeedSetter.hpp"
-#include "StyleConfig.hpp"
-#include "tcframe/spec/constraint.hpp"
+#include "tcframe/spec/config.hpp"
 #include "tcframe/spec/constraint.hpp"
 #include "tcframe/spec/io.hpp"
 #include "tcframe/spec/testcase.hpp"