diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 23720d5b4857e3b8e94bdf7a8f9aef5843775a24..a09d19f29d55bc66660941bdef853f367274ac83 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,61 +11,7 @@ </configurations> </component> <component name="ChangeListManager"> - <list default="true" id="39f5efe2-a2de-48e5-b3f3-f882c0cd5883" name="Default" comment=""> - <change beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" /> - <change beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" /> - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeCache.txt" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeCache.txt" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.9.6/CMakeSystem.cmake" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.9.6/CMakeSystem.cmake" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.9.6/CompilerIdC/a.out" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.9.6/CompilerIdC/a.out" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.9.6/CompilerIdCXX/a.out" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.9.6/CompilerIdCXX/a.out" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeOutput.log" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeOutput.log" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile.cmake" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile.cmake" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/1" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/10" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/11" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/12" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/13" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/2" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/3" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/4" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/5" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/6" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/7" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/8" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/9" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/count.txt" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/TargetDirectories.txt" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/TargetDirectories.txt" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-log.txt" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-log.txt" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/C.includecache" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/DependInfo.cmake" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/DependInfo.cmake" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/app/mc_ast_to_dot.c.o" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/app/mcc.c.o" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/build.make" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/build.make" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/builddir/mcc@sha/scanner.c.o" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/builddir/meson-private/sanitycheckc.c.o" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/depend.internal" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/depend.make" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/depend.make" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/flags.make" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/flags.make" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/resources/mc_builtins.c.o" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/src/ast.c.o" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/src/ast_print.c.o" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/src/ast_visit.c.o" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/test/unit/parser_test.c.o" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/vendor/cutest/AllTests.c.o" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/vendor/cutest/CuTest.c.o" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/mcc.dir/vendor/cutest/CuTestTest.c.o" afterPath="" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/Makefile" afterPath="$PROJECT_DIR$/cmake-build-debug/Makefile" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake" afterPath="$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake" /> - <change beforePath="$PROJECT_DIR$/cmake-build-debug/mcc.cbp" afterPath="$PROJECT_DIR$/cmake-build-debug/mcc.cbp" /> - <change beforePath="$PROJECT_DIR$/include/mcc/ast.h" afterPath="$PROJECT_DIR$/include/mcc/ast.h" /> - <change beforePath="$PROJECT_DIR$/src/ast.c" afterPath="$PROJECT_DIR$/src/ast.c" /> - <change beforePath="$PROJECT_DIR$/src/ast_print.c" afterPath="$PROJECT_DIR$/src/ast_print.c" /> - <change beforePath="$PROJECT_DIR$/src/ast_visit.c" afterPath="$PROJECT_DIR$/src/ast_visit.c" /> - <change beforePath="$PROJECT_DIR$/src/symbol_table_validate.c" afterPath="$PROJECT_DIR$/src/symbol_table_validate.c" /> - </list> + <list default="true" id="39f5efe2-a2de-48e5-b3f3-f882c0cd5883" name="Default" comment="" /> <ignored path="$PROJECT_DIR$/cmake-build-debug/" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -91,7 +37,7 @@ <entry file="file://$PROJECT_DIR$/src/utils/dynamic_array.c"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="165"> - <caret line="11" column="14" lean-forward="true" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> + <caret line="11" column="14" lean-forward="false" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> <folding /> </state> </provider> @@ -101,7 +47,7 @@ <entry file="file://$PROJECT_DIR$/include/mcc/ast.h"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="249"> - <caret line="389" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="421" selection-end-column="0" /> + <caret line="389" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="421" selection-end-column="0" /> <folding> <element signature="e#531#551#0" expanded="true" /> </folding> @@ -113,7 +59,7 @@ <entry file="file://$PROJECT_DIR$/src/ast.c"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="669"> - <caret line="663" column="0" lean-forward="true" selection-start-line="663" selection-start-column="0" selection-end-line="663" selection-end-column="0" /> + <caret line="663" column="0" lean-forward="false" selection-start-line="663" selection-start-column="0" selection-end-line="663" selection-end-column="0" /> <folding /> </state> </provider> @@ -123,7 +69,7 @@ <entry file="file://$PROJECT_DIR$/src/ast_print.c"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="474"> - <caret line="569" column="0" lean-forward="true" selection-start-line="569" selection-start-column="0" selection-end-line="569" selection-end-column="0" /> + <caret line="569" column="0" lean-forward="false" selection-start-line="569" selection-start-column="0" selection-end-line="569" selection-end-column="0" /> <folding> <element signature="e#0#26#0" expanded="true" /> </folding> @@ -135,7 +81,7 @@ <entry file="file://$PROJECT_DIR$/src/ast_visit.c"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="324"> - <caret line="276" column="21" lean-forward="true" selection-start-line="276" selection-start-column="21" selection-end-line="276" selection-end-column="21" /> + <caret line="276" column="21" lean-forward="false" selection-start-line="276" selection-start-column="21" selection-end-line="276" selection-end-column="21" /> <folding /> </state> </provider> @@ -145,7 +91,7 @@ <entry file="file://$PROJECT_DIR$/src/symbol_table_validate.c"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="736"> - <caret line="85" column="28" lean-forward="true" selection-start-line="85" selection-start-column="28" selection-end-line="85" selection-end-column="28" /> + <caret line="85" column="28" lean-forward="false" selection-start-line="85" selection-start-column="28" selection-end-line="85" selection-end-column="28" /> <folding /> </state> </provider> @@ -154,8 +100,8 @@ <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/.gitignore"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="60"> - <caret line="4" column="5" lean-forward="false" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" /> + <state relative-caret-position="75"> + <caret line="5" column="17" lean-forward="true" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> <folding /> </state> </provider> @@ -463,17 +409,18 @@ <workItem from="1558684953700" duration="8343000" /> <workItem from="1558966443176" duration="20480000" /> <workItem from="1559072660582" duration="473000" /> - <workItem from="1559158754963" duration="298000" /> + <workItem from="1559158754963" duration="433000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="341667000" /> + <option name="totallyTimeSpent" value="341802000" /> </component> <component name="ToolWindowManager"> <frame x="0" y="23" width="1920" height="969" extended-state="0" /> + <editor active="true" /> <layout> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19895834" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19895834" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <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="CMake" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15528634" sideWeight="0.48385417" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12597547" sideWeight="0.50416666" order="7" side_tool="true" content_ui="tabs" /> @@ -833,7 +780,7 @@ <entry file="file://$PROJECT_DIR$/src/utils/dynamic_array.c"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="165"> - <caret line="11" column="14" lean-forward="true" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> + <caret line="11" column="14" lean-forward="false" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> <folding /> </state> </provider> @@ -841,7 +788,7 @@ <entry file="file://$PROJECT_DIR$/include/mcc/ast.h"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="249"> - <caret line="389" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="421" selection-end-column="0" /> + <caret line="389" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="421" selection-end-column="0" /> <folding> <element signature="e#531#551#0" expanded="true" /> </folding> @@ -851,7 +798,7 @@ <entry file="file://$PROJECT_DIR$/src/ast.c"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="669"> - <caret line="663" column="0" lean-forward="true" selection-start-line="663" selection-start-column="0" selection-end-line="663" selection-end-column="0" /> + <caret line="663" column="0" lean-forward="false" selection-start-line="663" selection-start-column="0" selection-end-line="663" selection-end-column="0" /> <folding /> </state> </provider> @@ -859,7 +806,7 @@ <entry file="file://$PROJECT_DIR$/src/ast_print.c"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="474"> - <caret line="569" column="0" lean-forward="true" selection-start-line="569" selection-start-column="0" selection-end-line="569" selection-end-column="0" /> + <caret line="569" column="0" lean-forward="false" selection-start-line="569" selection-start-column="0" selection-end-line="569" selection-end-column="0" /> <folding> <element signature="e#0#26#0" expanded="true" /> </folding> @@ -869,7 +816,7 @@ <entry file="file://$PROJECT_DIR$/src/ast_visit.c"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="324"> - <caret line="276" column="21" lean-forward="true" selection-start-line="276" selection-start-column="21" selection-end-line="276" selection-end-column="21" /> + <caret line="276" column="21" lean-forward="false" selection-start-line="276" selection-start-column="21" selection-end-line="276" selection-end-column="21" /> <folding /> </state> </provider> @@ -877,15 +824,15 @@ <entry file="file://$PROJECT_DIR$/src/symbol_table_validate.c"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="736"> - <caret line="85" column="28" lean-forward="true" selection-start-line="85" selection-start-column="28" selection-end-line="85" selection-end-column="28" /> + <caret line="85" column="28" lean-forward="false" selection-start-line="85" selection-start-column="28" selection-end-line="85" selection-end-column="28" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/.gitignore"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="60"> - <caret line="4" column="5" lean-forward="false" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" /> + <state relative-caret-position="75"> + <caret line="5" column="17" lean-forward="true" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> <folding /> </state> </provider>