From eef2dd2173107af699fad790d5d23762ea1c5eb4 Mon Sep 17 00:00:00 2001 From: Chris Punches Date: Fri, 9 Jun 2017 00:49:56 -0400 Subject: [PATCH] suite reimpl started, good stopping point --- .idea/workspace.xml | 209 ++++++++++-------- cmake-build-debug/CMakeFiles/Makefile.cmake | 70 ------ .../CMakeFiles/ftests.dir/DependInfo.cmake | 2 +- .../CMakeFiles/ftests.dir/build.make | 38 ++-- .../CMakeFiles/ftests.dir/cmake_clean.cmake | 2 +- .../CMakeFiles/ftests.dir/depend.make | 66 +++++- .../CMakeFiles/ftests.dir/link.txt | 2 +- cmake-build-debug/Makefile | 36 +-- cmake-build-debug/ftests.cbp | 4 +- src/loaders/JSON_Loader.h | 2 +- src/loaders/Plan.cpp | 5 +- src/loaders/Suite.cpp | 2 +- src/loaders/Suite.h | 1 - 13 files changed, 228 insertions(+), 211 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1548331..700400d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -15,8 +15,10 @@ - - + + + + @@ -556,12 +580,12 @@ - + - @@ -578,17 +602,17 @@ + - + - @@ -644,8 +668,8 @@ - - + + @@ -703,8 +727,8 @@ - - + + @@ -749,7 +773,7 @@ - + @@ -895,17 +919,6 @@ - - - - - - - - - - - @@ -913,14 +926,6 @@ - - - - - - - - @@ -972,14 +977,6 @@ - - - - - - - - @@ -1050,17 +1047,6 @@ - - - - - - - - - - - @@ -1069,32 +1055,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1103,5 +1063,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cmake-build-debug/CMakeFiles/Makefile.cmake b/cmake-build-debug/CMakeFiles/Makefile.cmake index 34ca575..cfe6b7d 100644 --- a/cmake-build-debug/CMakeFiles/Makefile.cmake +++ b/cmake-build-debug/CMakeFiles/Makefile.cmake @@ -11,83 +11,18 @@ set(CMAKE_MAKEFILE_DEPENDS "CMakeFiles/3.5.1/CMakeCCompiler.cmake" "CMakeFiles/3.5.1/CMakeCXXCompiler.cmake" "CMakeFiles/3.5.1/CMakeSystem.cmake" - "CMakeFiles/feature_tests.c" - "CMakeFiles/feature_tests.cxx" - "/usr/share/cmake-3.5/Modules/CMakeCCompiler.cmake.in" - "/usr/share/cmake-3.5/Modules/CMakeCCompilerABI.c" "/usr/share/cmake-3.5/Modules/CMakeCInformation.cmake" - "/usr/share/cmake-3.5/Modules/CMakeCXXCompiler.cmake.in" - "/usr/share/cmake-3.5/Modules/CMakeCXXCompilerABI.cpp" "/usr/share/cmake-3.5/Modules/CMakeCXXInformation.cmake" "/usr/share/cmake-3.5/Modules/CMakeCommonLanguageInclude.cmake" - "/usr/share/cmake-3.5/Modules/CMakeCompilerIdDetection.cmake" - "/usr/share/cmake-3.5/Modules/CMakeDetermineCCompiler.cmake" - "/usr/share/cmake-3.5/Modules/CMakeDetermineCXXCompiler.cmake" - "/usr/share/cmake-3.5/Modules/CMakeDetermineCompileFeatures.cmake" - "/usr/share/cmake-3.5/Modules/CMakeDetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/CMakeDetermineCompilerABI.cmake" - "/usr/share/cmake-3.5/Modules/CMakeDetermineCompilerId.cmake" - "/usr/share/cmake-3.5/Modules/CMakeDetermineSystem.cmake" "/usr/share/cmake-3.5/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake" - "/usr/share/cmake-3.5/Modules/CMakeFindBinUtils.cmake" "/usr/share/cmake-3.5/Modules/CMakeFindCodeBlocks.cmake" "/usr/share/cmake-3.5/Modules/CMakeGenericSystem.cmake" "/usr/share/cmake-3.5/Modules/CMakeLanguageInformation.cmake" - "/usr/share/cmake-3.5/Modules/CMakeParseArguments.cmake" - "/usr/share/cmake-3.5/Modules/CMakeParseImplicitLinkInfo.cmake" - "/usr/share/cmake-3.5/Modules/CMakeSystem.cmake.in" "/usr/share/cmake-3.5/Modules/CMakeSystemSpecificInformation.cmake" "/usr/share/cmake-3.5/Modules/CMakeSystemSpecificInitialize.cmake" - "/usr/share/cmake-3.5/Modules/CMakeTestCCompiler.cmake" - "/usr/share/cmake-3.5/Modules/CMakeTestCXXCompiler.cmake" - "/usr/share/cmake-3.5/Modules/CMakeTestCompilerCommon.cmake" - "/usr/share/cmake-3.5/Modules/CMakeUnixFindMake.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/ADSP-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/ARMCC-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/AppleClang-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/Borland-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/Clang-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/Clang-DetermineCompilerInternal.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/Compaq-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/Cray-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/Embarcadero-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/Fujitsu-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/GHS-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/GNU-C-FeatureTests.cmake" "/usr/share/cmake-3.5/Modules/Compiler/GNU-C.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/GNU-CXX-FeatureTests.cmake" "/usr/share/cmake-3.5/Modules/Compiler/GNU-CXX.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/GNU-DetermineCompiler.cmake" "/usr/share/cmake-3.5/Modules/Compiler/GNU.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/HP-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/HP-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/IAR-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/Intel-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/MIPSpro-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/MSVC-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/PGI-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/PathScale-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/SCO-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/SDCC-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/SunPro-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/TI-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/Watcom-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/XL-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/XL-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/zOS-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.5/Modules/Internal/FeatureTesting.cmake" - "/usr/share/cmake-3.5/Modules/MultiArchCross.cmake" - "/usr/share/cmake-3.5/Modules/Platform/Linux-CXX.cmake" "/usr/share/cmake-3.5/Modules/Platform/Linux-GNU-C.cmake" "/usr/share/cmake-3.5/Modules/Platform/Linux-GNU-CXX.cmake" "/usr/share/cmake-3.5/Modules/Platform/Linux-GNU.cmake" @@ -103,11 +38,6 @@ set(CMAKE_MAKEFILE_OUTPUTS # Byproducts of CMake generate step: set(CMAKE_MAKEFILE_PRODUCTS - "CMakeFiles/3.5.1/CMakeSystem.cmake" - "CMakeFiles/3.5.1/CMakeCCompiler.cmake" - "CMakeFiles/3.5.1/CMakeCXXCompiler.cmake" - "CMakeFiles/3.5.1/CMakeCCompiler.cmake" - "CMakeFiles/3.5.1/CMakeCXXCompiler.cmake" "CMakeFiles/CMakeDirectoryInformation.cmake" ) diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/DependInfo.cmake b/cmake-build-debug/CMakeFiles/ftests.dir/DependInfo.cmake index e485705..746f233 100644 --- a/cmake-build-debug/CMakeFiles/ftests.dir/DependInfo.cmake +++ b/cmake-build-debug/CMakeFiles/ftests.dir/DependInfo.cmake @@ -7,7 +7,7 @@ set(CMAKE_DEPENDS_CHECK_CXX "/home/phanes/Development/internal/ftests/examplar.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o" "/home/phanes/Development/internal/ftests/src/json/jsoncpp.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o" "/home/phanes/Development/internal/ftests/src/loaders/Conf.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o" - "/home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o" + "/home/phanes/Development/internal/ftests/src/loaders/JSON_Loader.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o" "/home/phanes/Development/internal/ftests/src/loaders/Plan.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o" "/home/phanes/Development/internal/ftests/src/loaders/Suite.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o" "/home/phanes/Development/internal/ftests/src/loaders/Task.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Task.cpp.o" diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/build.make b/cmake-build-debug/CMakeFiles/ftests.dir/build.make index b8c4e33..ac5d9bb 100644 --- a/cmake-build-debug/CMakeFiles/ftests.dir/build.make +++ b/cmake-build-debug/CMakeFiles/ftests.dir/build.make @@ -129,28 +129,28 @@ CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.provides: CMakeFiles/ftests.dir/src CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.provides.build: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o -CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o: CMakeFiles/ftests.dir/flags.make -CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o: ../src/loaders/JLoader.cpp - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o -c /home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp +CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o: CMakeFiles/ftests.dir/flags.make +CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o: ../src/loaders/JSON_Loader.cpp + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o" + /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o -c /home/phanes/Development/internal/ftests/src/loaders/JSON_Loader.cpp -CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.i: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.i" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp > CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.i +CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.i" + /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/src/loaders/JSON_Loader.cpp > CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.i -CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.s: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.s" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp -o CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.s +CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.s" + /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/src/loaders/JSON_Loader.cpp -o CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.s -CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.requires: +CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.requires: -.PHONY : CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.requires +.PHONY : CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.requires -CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.provides: CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.requires - $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.provides.build -.PHONY : CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.provides +CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.provides: CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.requires + $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.provides.build +.PHONY : CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.provides -CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.provides.build: CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o +CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.provides.build: CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o: CMakeFiles/ftests.dir/flags.make @@ -302,7 +302,7 @@ ftests_OBJECTS = \ "CMakeFiles/ftests.dir/examplar.cpp.o" \ "CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o" \ "CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o" \ -"CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o" \ +"CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o" \ "CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o" \ "CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o" \ "CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o" \ @@ -316,7 +316,7 @@ ftests_EXTERNAL_OBJECTS = ftests: CMakeFiles/ftests.dir/examplar.cpp.o ftests: CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o ftests: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o -ftests: CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o +ftests: CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o ftests: CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o ftests: CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o ftests: CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o @@ -336,7 +336,7 @@ CMakeFiles/ftests.dir/build: ftests CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/examplar.cpp.o.requires CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o.requires CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.requires -CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.requires +CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.requires CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o.requires CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o.requires CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o.requires diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/cmake_clean.cmake b/cmake-build-debug/CMakeFiles/ftests.dir/cmake_clean.cmake index 4d65666..67fdbfa 100644 --- a/cmake-build-debug/CMakeFiles/ftests.dir/cmake_clean.cmake +++ b/cmake-build-debug/CMakeFiles/ftests.dir/cmake_clean.cmake @@ -2,7 +2,7 @@ file(REMOVE_RECURSE "CMakeFiles/ftests.dir/examplar.cpp.o" "CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o" "CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o" - "CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o" + "CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o" "CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o" "CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o" "CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o" diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/depend.make b/cmake-build-debug/CMakeFiles/ftests.dir/depend.make index d8ca731..25f6ef4 100644 --- a/cmake-build-debug/CMakeFiles/ftests.dir/depend.make +++ b/cmake-build-debug/CMakeFiles/ftests.dir/depend.make @@ -1,2 +1,64 @@ -# Empty dependencies file for ftests. -# This may be replaced when dependencies are built. +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 3.5 + +CMakeFiles/ftests.dir/examplar.cpp.o: ../examplar.cpp +CMakeFiles/ftests.dir/examplar.cpp.o: ../src/json/json.h +CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/Conf.h +CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/JSON_Loader.h +CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/Plan.h +CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/Suite.h +CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/Task.h +CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/Unit.h +CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/loaders.h + +CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o: ../src/json/json.h +CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o: ../src/json/jsoncpp.cpp + +CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o: ../src/json/json.h +CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o: ../src/loaders/Conf.cpp +CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o: ../src/loaders/Conf.h +CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o: ../src/loaders/JSON_Loader.h + +CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o: ../src/json/json.h +CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o: ../src/loaders/JSON_Loader.cpp +CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o: ../src/loaders/JSON_Loader.h +CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o: ../src/loaders/helpers.h + +CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/json/json.h +CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/JSON_Loader.h +CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/Plan.cpp +CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/Plan.h +CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/Suite.h +CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/Task.h +CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/Unit.h + +CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o: ../src/json/json.h +CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o: ../src/loaders/JSON_Loader.h +CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o: ../src/loaders/Suite.cpp +CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o: ../src/loaders/Suite.h +CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o: ../src/loaders/Unit.h + +CMakeFiles/ftests.dir/src/loaders/Task.cpp.o: ../src/json/json.h +CMakeFiles/ftests.dir/src/loaders/Task.cpp.o: ../src/loaders/JSON_Loader.h +CMakeFiles/ftests.dir/src/loaders/Task.cpp.o: ../src/loaders/Suite.h +CMakeFiles/ftests.dir/src/loaders/Task.cpp.o: ../src/loaders/Task.cpp +CMakeFiles/ftests.dir/src/loaders/Task.cpp.o: ../src/loaders/Task.h +CMakeFiles/ftests.dir/src/loaders/Task.cpp.o: ../src/loaders/Unit.h + +CMakeFiles/ftests.dir/src/loaders/Unit.cpp.o: ../src/json/json.h +CMakeFiles/ftests.dir/src/loaders/Unit.cpp.o: ../src/loaders/Unit.cpp +CMakeFiles/ftests.dir/src/loaders/Unit.cpp.o: ../src/loaders/Unit.h + +CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o: ../src/loaders/helpers.cpp +CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o: ../src/loaders/helpers.h + +CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/json/json.h +CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/Conf.h +CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/JSON_Loader.h +CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/Plan.h +CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/Suite.h +CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/Task.h +CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/Unit.h +CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/loaders.cpp +CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/loaders.h + diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/link.txt b/cmake-build-debug/CMakeFiles/ftests.dir/link.txt index 8a319f7..99fd14c 100644 --- a/cmake-build-debug/CMakeFiles/ftests.dir/link.txt +++ b/cmake-build-debug/CMakeFiles/ftests.dir/link.txt @@ -1 +1 @@ -/usr/bin/c++ -g CMakeFiles/ftests.dir/examplar.cpp.o CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o CMakeFiles/ftests.dir/src/loaders/Unit.cpp.o CMakeFiles/ftests.dir/src/loaders/Task.cpp.o -o ftests +/usr/bin/c++ -g CMakeFiles/ftests.dir/examplar.cpp.o CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o CMakeFiles/ftests.dir/src/loaders/Unit.cpp.o CMakeFiles/ftests.dir/src/loaders/Task.cpp.o -o ftests diff --git a/cmake-build-debug/Makefile b/cmake-build-debug/Makefile index e8a2299..d429c14 100644 --- a/cmake-build-debug/Makefile +++ b/cmake-build-debug/Makefile @@ -204,32 +204,32 @@ src/loaders/Conf.cpp.s: $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Conf.cpp.s .PHONY : src/loaders/Conf.cpp.s -src/loaders/JLoader.o: src/loaders/JLoader.cpp.o +src/loaders/JSON_Loader.o: src/loaders/JSON_Loader.cpp.o -.PHONY : src/loaders/JLoader.o +.PHONY : src/loaders/JSON_Loader.o # target to build an object file -src/loaders/JLoader.cpp.o: - $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o -.PHONY : src/loaders/JLoader.cpp.o +src/loaders/JSON_Loader.cpp.o: + $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o +.PHONY : src/loaders/JSON_Loader.cpp.o -src/loaders/JLoader.i: src/loaders/JLoader.cpp.i +src/loaders/JSON_Loader.i: src/loaders/JSON_Loader.cpp.i -.PHONY : src/loaders/JLoader.i +.PHONY : src/loaders/JSON_Loader.i # target to preprocess a source file -src/loaders/JLoader.cpp.i: - $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.i -.PHONY : src/loaders/JLoader.cpp.i +src/loaders/JSON_Loader.cpp.i: + $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.i +.PHONY : src/loaders/JSON_Loader.cpp.i -src/loaders/JLoader.s: src/loaders/JLoader.cpp.s +src/loaders/JSON_Loader.s: src/loaders/JSON_Loader.cpp.s -.PHONY : src/loaders/JLoader.s +.PHONY : src/loaders/JSON_Loader.s # target to generate assembly for a file -src/loaders/JLoader.cpp.s: - $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.s -.PHONY : src/loaders/JLoader.cpp.s +src/loaders/JSON_Loader.cpp.s: + $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.s +.PHONY : src/loaders/JSON_Loader.cpp.s src/loaders/Plan.o: src/loaders/Plan.cpp.o @@ -411,9 +411,9 @@ help: @echo "... src/loaders/Conf.o" @echo "... src/loaders/Conf.i" @echo "... src/loaders/Conf.s" - @echo "... src/loaders/JLoader.o" - @echo "... src/loaders/JLoader.i" - @echo "... src/loaders/JLoader.s" + @echo "... src/loaders/JSON_Loader.o" + @echo "... src/loaders/JSON_Loader.i" + @echo "... src/loaders/JSON_Loader.s" @echo "... src/loaders/Plan.o" @echo "... src/loaders/Plan.i" @echo "... src/loaders/Plan.s" diff --git a/cmake-build-debug/ftests.cbp b/cmake-build-debug/ftests.cbp index 868dead..231803a 100644 --- a/cmake-build-debug/ftests.cbp +++ b/cmake-build-debug/ftests.cbp @@ -96,10 +96,10 @@ - + - + diff --git a/src/loaders/JSON_Loader.h b/src/loaders/JSON_Loader.h index 09a8079..6e4040a 100644 --- a/src/loaders/JSON_Loader.h +++ b/src/loaders/JSON_Loader.h @@ -31,6 +31,6 @@ public: // safely handle key retrieval (if we want it to be safe) // next iter should be: - int JSON_Loader::get_key( Json::Value &input, std::string key, bool verbose, bool safety); + int get_key( Json::Value &input, std::string key, bool verbose, bool safety); }; #endif //FTESTS_JLOADER_H diff --git a/src/loaders/Plan.cpp b/src/loaders/Plan.cpp index 46c360c..9e732b3 100644 --- a/src/loaders/Plan.cpp +++ b/src/loaders/Plan.cpp @@ -41,11 +41,14 @@ Task Plan::get_task(std::string provided_name) return * returnable; } -Plan::Plan( std::string filename ): JSON_Loader( filename ) +Plan::Plan( std::string filename ): JSON_Loader() /* Plan loads a file and deserializes the Unit JSON object to Task types as a vector member * Plan { vector } */ { + // plan always loads from file + this->load_json_file( filename ); + Json::Value raw_tasks = this->as_serialized()["plan"]; for ( int index = 0; index < raw_tasks.size(); index++ ) diff --git a/src/loaders/Suite.cpp b/src/loaders/Suite.cpp index 2cfc357..01b1cfd 100644 --- a/src/loaders/Suite.cpp +++ b/src/loaders/Suite.cpp @@ -1,7 +1,7 @@ #include "Suite.h" Suite::Suite(): JSON_Loader() {} -Suite::Suite( std::string filename ): JSON_Loader( filename ) +Suite::Suite( std::string filename ): JSON_Loader() /* Suite loads a file and deserializes the Unit JSON object to Unit types as a vector member * Suite { vector } */ diff --git a/src/loaders/Suite.h b/src/loaders/Suite.h index cab9606..046c0df 100644 --- a/src/loaders/Suite.h +++ b/src/loaders/Suite.h @@ -14,7 +14,6 @@ class Suite: public JSON_Loader public: // constructor Suite( std::string filename ); - Suite(); int load_file( std::string filename ); // returns the unit type identified by name or null