SILO-GROUP
/
rex
1
0
Fork 0
Code Issues 2 Pull Requests Releases 4 Activity

fixed units and unit collection type, kinda

master
Chris Punches 2017-04-19 00:59:05 -04:00
parent f43c3066d2
commit 39a8145744
12 changed files with 193 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

311
.idea/workspace.xml
View File

@ -33,20 +33,18 @@
<file leaf-file-name="main.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/main.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding>
<element signature="e#146#321#0" expanded="true" />
</folding>
<state relative-caret-position="144">
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="loaders.h" pinned="false" current-in-tab="true">
<file leaf-file-name="loaders.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/loaders.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="30" column="37" lean-forward="true" selection-start-line="30" selection-start-column="37" selection-end-line="30" selection-end-column="37" />
<state relative-caret-position="324">
<caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding>
<element signature="e#0#2#0" expanded="true" />
</folding>
@ -54,31 +52,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="config.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cmake-build-debug/config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="4" column="28" lean-forward="false" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test.plan" pinned="false" current-in-tab="false">
<file leaf-file-name="test.plan" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/test.plan">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="all_test.units" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="11" column="40" lean-forward="false" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="40" />
<state relative-caret-position="90">
<caret line="5" column="1" lean-forward="true" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
<folding />
</state>
</provider>
@ -91,164 +69,31 @@
<file leaf-file-name="loaders.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/loaders.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1080">
<caret line="60" column="64" lean-forward="false" selection-start-line="60" selection-start-column="64" selection-end-line="60" selection-end-column="64" />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#2#0" expanded="true" />
<element signature="e#1907#2041#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="main.cpp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/main.cpp">
<file leaf-file-name="all_test.units" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding>
<element signature="e#146#321#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="jsoncpp.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/jsoncpp.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1558">
<caret line="3113" column="23" lean-forward="true" selection-start-line="3113" selection-start-column="23" selection-end-line="3113" selection-end-column="23" />
<state relative-caret-position="342">
<caret line="19" column="8" lean-forward="false" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="json.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/json/json.h">
<file leaf-file-name="main.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/main.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="568">
<caret line="874" column="8" lean-forward="false" selection-start-line="874" selection-start-column="8" selection-end-line="874" selection-end-column="8" />
<folding>
<element signature="e#0#64#0" expanded="true" />
<element signature="e#314#2985#0" expanded="true" />
<element signature="e#2987#3060#0" expanded="true" />
<element signature="e#3244#3303#0" expanded="true" />
<element signature="e#3375#3448#0" expanded="true" />
<element signature="e#4168#4242#0" expanded="true" />
<element signature="e#4303#4376#0" expanded="true" />
<element signature="e#5103#5176#0" expanded="true" />
<element signature="e#5649#5708#0" expanded="true" />
<element signature="e#6473#6546#0" expanded="true" />
<element signature="e#7383#7462#0" expanded="true" />
<element signature="e#7757#8005#0" expanded="false" />
<element signature="e#8108#8144#0" expanded="false" />
<element signature="e#8186#8286#0" expanded="false" />
<element signature="e#8619#8655#0" expanded="false" />
<element signature="e#8967#9039#0" expanded="false" />
<element signature="e#9132#9167#0" expanded="false" />
<element signature="e#9229#9273#0" expanded="false" />
<element signature="e#9318#9426#0" expanded="false" />
<element signature="e#10966#11039#0" expanded="true" />
<element signature="e#11703#11722#0" expanded="false" />
<element signature="e#12134#12207#0" expanded="true" />
<element signature="e#12993#13164#0" expanded="true" />
<element signature="e#13201#13425#0" expanded="true" />
<element signature="e#13454#13692#0" expanded="true" />
<element signature="e#13728#13803#0" expanded="true" />
<element signature="e#14306#14379#0" expanded="true" />
<element signature="e#15036#15057#0" expanded="false" />
<element signature="e#15102#15119#0" expanded="false" />
<element signature="e#15213#15240#0" expanded="false" />
<element signature="e#15270#15297#0" expanded="false" />
<element signature="e#15306#15368#0" expanded="true" />
<element signature="e#15533#15582#0" expanded="false" />
<element signature="e#15677#15705#0" expanded="false" />
<element signature="e#15723#15801#0" expanded="true" />
<element signature="e#15870#15923#0" expanded="false" />
<element signature="e#16008#16057#0" expanded="true" />
<element signature="e#16076#16199#0" expanded="true" />
<element signature="e#16449#16626#0" expanded="true" />
<element signature="e#16731#16917#0" expanded="true" />
<element signature="e#17193#17249#0" expanded="true" />
<element signature="e#18086#18515#0" expanded="true" />
<element signature="e#18757#20136#0" expanded="true" />
<element signature="e#23048#23102#0" expanded="false" />
<element signature="e#23207#23682#0" expanded="true" />
<element signature="e#24048#24615#0" expanded="true" />
<element signature="e#24764#24803#0" expanded="false" />
<element signature="e#25775#25862#0" expanded="false" />
<element signature="e#25942#26050#0" expanded="true" />
<element signature="e#26144#26185#0" expanded="false" />
<element signature="e#29831#30188#0" expanded="true" />
<element signature="e#30259#30548#0" expanded="false" />
<element signature="e#31166#31333#0" expanded="false" />
<element signature="e#32454#32627#0" expanded="true" />
<element signature="e#32837#33003#0" expanded="true" />
<element signature="e#33483#33590#0" expanded="false" />
<element signature="e#36054#36152#0" expanded="true" />
<element signature="e#36477#36874#0" expanded="true" />
<element signature="e#37864#37913#0" expanded="true" />
<element signature="e#39828#39888#0" expanded="true" />
<element signature="e#40273#40326#0" expanded="true" />
<element signature="e#40887#40938#0" expanded="true" />
<element signature="e#41340#41393#0" expanded="true" />
<element signature="e#42285#42358#0" expanded="true" />
<element signature="e#43202#43280#0" expanded="true" />
<element signature="e#43349#43402#0" expanded="false" />
<element signature="e#43505#43653#0" expanded="true" />
<element signature="e#43742#43951#0" expanded="true" />
<element signature="e#44071#44147#0" expanded="true" />
<element signature="e#44163#44252#0" expanded="true" />
<element signature="e#44292#44962#0" expanded="true" />
<element signature="e#45053#45876#0" expanded="true" />
<element signature="e#46191#46559#0" expanded="true" />
<element signature="e#46679#46978#0" expanded="true" />
<element signature="e#47034#47420#0" expanded="true" />
<element signature="e#47484#47752#0" expanded="true" />
<element signature="e#47825#48191#0" expanded="true" />
<element signature="e#48284#48430#0" expanded="true" />
<element signature="e#50900#50953#0" expanded="true" />
<element signature="e#51019#51774#0" expanded="true" />
<element signature="e#51959#52096#0" expanded="true" />
<element signature="e#52184#52447#0" expanded="true" />
<element signature="e#52635#54310#0" expanded="true" />
<element signature="e#54459#54576#0" expanded="true" />
<element signature="e#54625#54677#0" expanded="true" />
<element signature="e#54722#54934#0" expanded="true" />
<element signature="e#54987#55180#0" expanded="true" />
<element signature="e#55234#55370#0" expanded="true" />
<element signature="e#55494#55929#0" expanded="true" />
<element signature="e#56086#56106#0" expanded="false" />
<element signature="e#56208#56281#0" expanded="true" />
<element signature="e#56939#56957#0" expanded="false" />
<element signature="e#57002#57019#0" expanded="false" />
<element signature="e#57058#57136#0" expanded="true" />
<element signature="e#57205#57258#0" expanded="false" />
<element signature="e#57375#57682#0" expanded="true" />
<element signature="e#57836#58160#0" expanded="true" />
<element signature="e#58231#58274#0" expanded="true" />
<element signature="e#58340#58477#0" expanded="true" />
<element signature="e#58571#58723#0" expanded="true" />
<element signature="e#58820#59227#0" expanded="true" />
<element signature="e#59419#60374#0" expanded="true" />
<element signature="e#60472#60556#0" expanded="true" />
<element signature="e#60618#60735#0" expanded="true" />
<element signature="e#60783#60835#0" expanded="true" />
<element signature="e#60880#61094#0" expanded="true" />
<element signature="e#61149#61272#0" expanded="true" />
<element signature="e#61386#61748#0" expanded="true" />
<element signature="e#61892#62167#0" expanded="true" />
<element signature="e#62497#63466#0" expanded="true" />
<element signature="e#63614#63816#0" expanded="true" />
<element signature="e#64621#65699#0" expanded="true" />
<element signature="e#65839#66125#0" expanded="true" />
<element signature="e#67649#67669#0" expanded="false" />
<element signature="e#67765#67838#0" expanded="true" />
<element signature="e#68485#68504#0" expanded="false" />
<element signature="e#68560#68579#0" expanded="false" />
<element signature="e#68625#68818#0" expanded="true" />
<element signature="e#69490#70083#0" expanded="false" />
<element signature="e#70386#70459#0" expanded="true" />
</folding>
<state relative-caret-position="144">
<caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@ -263,12 +108,13 @@
<option value="$PROJECT_DIR$/config.json" />
<option value="$PROJECT_DIR$/units/units.conf" />
<option value="$PROJECT_DIR$/plan.conf" />
<option value="$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units" />
<option value="$PROJECT_DIR$/CMakeLists.txt" />
<option value="$PROJECT_DIR$/cmake-build-debug/config.json" />
<option value="$PROJECT_DIR$/cmake-build-debug/conf/test.plan" />
<option value="$PROJECT_DIR$/src/loaders.h" />
<option value="$PROJECT_DIR$/src/loaders.cpp" />
<option value="$PROJECT_DIR$/cmake-build-debug/config.json" />
<option value="$PROJECT_DIR$/main.cpp" />
<option value="$PROJECT_DIR$/src/loaders.cpp" />
<option value="$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units" />
</list>
</option>
</component>
@ -375,6 +221,28 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="ftests" />
<option name="myItemType" value="com.jetbrains.cidr.projectView.CidrFilesViewHelper$MyProjectTreeStructure$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="ftests" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="cmake-build-debug" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="conf" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="units" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
</panes>
@ -589,12 +457,12 @@
<updated>1491540343823</updated>
<workItem from="1491540345736" duration="17928000" />
<workItem from="1491759279673" duration="614000" />
<workItem from="1492298506932" duration="27510000" />
<workItem from="1492298506932" duration="34826000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="46052000" />
<option name="totallyTimeSpent" value="53368000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -617,7 +485,7 @@
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1407334" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2499049" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2499049" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32903865" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@ -629,6 +497,27 @@
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925636" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295342" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="CMake" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="true" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1407334" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32903865" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1103081" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="LuaJ" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925636" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2499049" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="processedProjectFiles" value="true" />
@ -666,26 +555,36 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units">
<entry file="file://$PROJECT_DIR$/src/jsoncpp.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="11" column="40" lean-forward="false" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="40" />
<state relative-caret-position="1558">
<caret line="3113" column="23" lean-forward="true" selection-start-line="3113" selection-start-column="23" selection-end-line="3113" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding>
<element signature="e#0#2#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/test.plan">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="90">
<caret line="5" column="1" lean-forward="true" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/jsoncpp.cpp">
<entry file="file://$PROJECT_DIR$/cmake-build-debug/config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1558">
<caret line="3113" column="23" lean-forward="true" selection-start-line="3113" selection-start-column="23" selection-end-line="3113" selection-end-column="23" />
<state relative-caret-position="18">
<caret line="1" column="44" lean-forward="false" selection-start-line="1" selection-start-column="44" selection-end-line="1" selection-end-column="44" />
<folding />
</state>
</provider>
@ -819,41 +718,29 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cmake-build-debug/config.json">
<entry file="file://$PROJECT_DIR$/main.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="4" column="28" lean-forward="false" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
<state relative-caret-position="144">
<caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1080">
<caret line="60" column="64" lean-forward="false" selection-start-line="60" selection-start-column="64" selection-end-line="60" selection-end-column="64" />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#2#0" expanded="true" />
<element signature="e#1907#2041#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders.h">
<entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="30" column="37" lean-forward="true" selection-start-line="30" selection-start-column="37" selection-end-line="30" selection-end-column="37" />
<folding>
<element signature="e#0#2#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding>
<element signature="e#146#321#0" expanded="true" />
</folding>
<state relative-caret-position="342">
<caret line="19" column="8" lean-forward="false" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>

14
cmake-build-debug/CMakeFiles/ftests.dir/CXX.includecache
View File

@ -9,14 +9,8 @@
/home/phanes/Development/internal/ftests/main.cpp
iostream
-
fstream
-
src/json/json.h
/home/phanes/Development/internal/ftests/src/json/json.h
string
-
src/json/json-forwards.h
/home/phanes/Development/internal/ftests/src/json/json-forwards.h
src/loaders.h
/home/phanes/Development/internal/ftests/src/loaders.h
@ -187,14 +181,6 @@ float.h
/home/phanes/Development/internal/ftests/src/loaders.cpp
loaders.h
/home/phanes/Development/internal/ftests/src/loaders.h
json/json.h
/home/phanes/Development/internal/ftests/src/json/json.h
json/json-forwards.h
/home/phanes/Development/internal/ftests/src/json/json-forwards.h
iostream
-
fstream
-
sys/stat.h
-

BIN
cmake-build-debug/CMakeFiles/ftests.dir/main.cpp.o
View File

Binary file not shown.

BIN
cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o
View File

Binary file not shown.

10
cmake-build-debug/conf/test.plan
View File

@ -1,6 +1,6 @@
{
"plan": [
{ "name": "gcc is present", "depends on": [ null ] },
{ "name": "gcYou are not c can compile", "depends on": [ "gcc is present" ] }
]
}
"plan": [
{ "name": "gcc is present", "depends on": [ null ] },
{ "name": "gcYou are not c can compile", "depends on": [ "gcc is present" ] }
]
}

39
cmake-build-debug/conf/units/all_test.units
View File

@ -1,19 +1,22 @@
{
"name": "gcc is present",
"target": "./ubuntu/xenial/check_gcc_present.run",
"output": "present",
"rectifier": "./ubuntu/xenial/install_gcc",
"active": true,
"required": true,
"rectify": true
},
{
"name": "gcc can compile",
"target": "./ubuntu/xenial/check_gcc_compiles.run",
"output": "can compile",
"rectifier": "",
"active": true,
"required": true,
"rectify": false
}
"units": [
{
"name": "gcc is present",
"target": "./ubuntu/xenial/check_gcc_present.run",
"output": "present",
"rectifier": "./ubuntu/xenial/install_gcc",
"active": true,
"required": true,
"rectify": true
},
{
"name": "gcc can compile",
"target": "./ubuntu/xenial/check_gcc_compiles.run",
"output": "can compile",
"rectifier": "",
"active": true,
"required": true,
"rectify": false
}
]
}

7
cmake-build-debug/config.json
View File

@ -1,7 +1,4 @@
{
"units_path": "./conf/units",
"plan_path": "./conf/test.plan",
"arr_test": [
"rt", "te", "ter", "ter"
]
"units_path": "./conf/units/all_test.units",
"plan_path": "./conf/test.plan"
}

BIN
cmake-build-debug/ftests
View File

Binary file not shown.

20
cmake-build-debug/ftests.cbp
View File

@ -84,20 +84,20 @@
</MakeCommands>
</Target>
</Build>
<Unit filename="/home/phanes/Development/internal/ftests/main.cpp">
<UnitHolder filename="/home/phanes/Development/internal/ftests/main.cpp">
<Option target="ftests"/>
</Unit>
<Unit filename="/home/phanes/Development/internal/ftests/src/jsoncpp.cpp">
</UnitHolder>
<UnitHolder filename="/home/phanes/Development/internal/ftests/src/jsoncpp.cpp">
<Option target="ftests"/>
</Unit>
<Unit filename="/home/phanes/Development/internal/ftests/src/loaders.cpp">
</UnitHolder>
<UnitHolder filename="/home/phanes/Development/internal/ftests/src/loaders.cpp">
<Option target="ftests"/>
</Unit>
<Unit filename="/home/phanes/Development/internal/ftests/src/loaders.h">
</UnitHolder>
<UnitHolder filename="/home/phanes/Development/internal/ftests/src/loaders.h">
<Option target="ftests"/>
</Unit>
<Unit filename="/home/phanes/Development/internal/ftests/CMakeLists.txt">
</UnitHolder>
<UnitHolder filename="/home/phanes/Development/internal/ftests/CMakeLists.txt">
<Option virtualFolder="CMake Files\" />
</Unit>
</UnitHolder>
</Project>
</CodeBlocks_project_file>

12
main.cpp
View File

@ -1,21 +1,11 @@
#include <iostream>
#include <fstream>
#include "src/json/json.h"
#include <string>
#include "src/json/json-forwards.h"
#include "src/loaders.h"
/*configuration load_config_file( std::string filename )
{
json j_conf = json_file_to_json_obj( filename );
configuration appconfig = j_conf;
return appconfig;
}*/
int main()
{
Conf jsonLoader = Conf("config.json");
UnitHolder units = UnitHolder( jsonLoader.get_units_path() );
std::cout << jsonLoader.get_units_path();
return 0;
}

42
src/loaders.cpp
View File

@ -1,15 +1,6 @@
//
// Created by phanes on 4/16/17.
//
#include "loaders.h"
#include "json/json.h"
#include "json/json-forwards.h"
#include <iostream>
#include <fstream>
#include <sys/stat.h>
inline bool exists(const std::string& name)
{
struct stat buffer;
@ -33,7 +24,7 @@ JLoader::JLoader( std::string filename )
if (! parsingSuccessful )
{
std::cerr << "Failed to parse " << filename << ":\n\t" << reader.getFormattedErrorMessages();
exit(1);
exit( 1 );
} else {
std::cout << "Parsed " << filename << " with " << this->json_root.size() << " elements." << std::endl;
}
@ -44,15 +35,40 @@ Json::Value JLoader::get_root()
return this->json_root;
}
Unit::Unit( std::string filename ): JLoader( filename )
Unit::Unit( Json::Value loader_root )
{
this->name = loader_root.get("name", "?").asString();
this->target = loader_root.get("target", "?").asString();
this->output = loader_root.get("output", "?").asString();
this->rectifier = loader_root.get("rectifier", "?").asString();
this->active = loader_root.get("active", "?").asString();
this->required = loader_root.get("required", "?").asString();
this->rectify = loader_root.get("rectify", "?").asString();
}
std::string Unit::get_name() { return this->name; }
std::string Unit::get_target() { return this->target; }
std::string Unit::get_output() { return this->output; }
std::string Unit::get_rectifier() { return this->rectifier; }
std::string Unit::get_active() { return this->active; }
std::string Unit::get_required() { return this->required; }
std::string Unit::get_rectify() { return this->rectify; }
UnitHolder::UnitHolder( std::string filename ): JLoader( filename )
{
/* UnitHolder loads a file and deserializes the Unit JSON object to Unit types as a vector member
* UnitHolder { vector<Unit> }
*/
Json::Value raw_units = this->get_root()["units"];
for ( int index = 0; index < raw_units.size(); index++ )
{
this->Units.push_back(Unit( raw_units[index] ));
}
};
Plan::Plan( std::string filename ): JLoader( filename )
{
// TODO: Implement
};
Conf::Conf( std::string filename ): JLoader( filename )

34
src/loaders.h
View File

@ -22,29 +22,48 @@ class JLoader
Json::Value get_root();
};
class Unit: public JLoader
class Unit
{
private:
Json::Value json_root;
std::string name;
std::string target;
std::string output;
std::string rectifier;
std::string active;
std::string required;
std::string rectify;
public:
Unit( Json::Value loader_root );
std::string get_name();
std::string get_target();
std::string get_output();
std::string get_rectifier();
std::string get_active();
std::string get_required();
std::string get_rectify();
};
class UnitHolder: public JLoader
{
private:
std::vector<Unit> Units;
public:
using JLoader::JLoader;
Unit( std::string filename );
UnitHolder( std::string filename );
};
class Plan: public JLoader
{
private:
Json::Value json_root;
public:
using JLoader::JLoader;
Plan( std::string filename );
};
class Conf: public JLoader
{
private:
Json::Value json_root;
std::string plan_path;
std::string units_path;
@ -55,5 +74,4 @@ class Conf: public JLoader
std::string get_units_path();
};
#endif //FTESTS_LOADERS_H