Skip to content

Commit 044c8b4

Browse files
Fixed bug with <memory>, improved .gitignore
1 parent 929bb35 commit 044c8b4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+203
-1684
lines changed

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@ cmake_install.cmake
1212
install_manifest.txt
1313
compile_commands.json
1414
CTestTestfile.cmake
15+
grammar.output
16+
grammar.tab.c
17+
tests/parser.hpp
18+
tests/parser.cpp
19+
CMakeFiles/*
20+

CMakeFiles/CMakeOutput.log

+98-1,346
Large diffs are not rendered by default.

CMakeFiles/Compiler.dir/CXX.includecache

+2-2
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ SymbolTable.h
331331
/home/gregory/Compiler/src/SymbolTable/SymbolTable.h
332332
../ErrorStorage/ErrorStorage.h
333333
/home/gregory/Compiler/src/ErrorStorage/ErrorStorage.h
334-
memory
334+
tr1/memory
335335
-
336336

337337
/home/gregory/Compiler/src/SymbolTable/TypeChecker.cpp
@@ -487,7 +487,7 @@ SymbolTable.h
487487
src/SymbolTable/SymbolTable.h
488488
../ErrorStorage/ErrorStorage.h
489489
src/ErrorStorage/ErrorStorage.h
490-
memory
490+
tr1/memory
491491
-
492492

493493
src/Visitor.h

CMakeFiles/Compiler.dir/lexer.cpp.o

-1.51 KB
Binary file not shown.
Binary file not shown.
-26.6 KB
Binary file not shown.

CMakeFiles/Makefile.cmake

+68
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,89 @@ set(CMAKE_MAKEFILE_DEPENDS
1010
"CMakeFiles/3.5.2/CMakeCCompiler.cmake"
1111
"CMakeFiles/3.5.2/CMakeCXXCompiler.cmake"
1212
"CMakeFiles/3.5.2/CMakeSystem.cmake"
13+
"CMakeFiles/feature_tests.c"
14+
"CMakeFiles/feature_tests.cxx"
1315
"CMakeLists.txt"
16+
"/usr/share/cmake-3.5/Modules/CMakeCCompiler.cmake.in"
17+
"/usr/share/cmake-3.5/Modules/CMakeCCompilerABI.c"
1418
"/usr/share/cmake-3.5/Modules/CMakeCInformation.cmake"
19+
"/usr/share/cmake-3.5/Modules/CMakeCXXCompiler.cmake.in"
20+
"/usr/share/cmake-3.5/Modules/CMakeCXXCompilerABI.cpp"
1521
"/usr/share/cmake-3.5/Modules/CMakeCXXInformation.cmake"
1622
"/usr/share/cmake-3.5/Modules/CMakeCommonLanguageInclude.cmake"
23+
"/usr/share/cmake-3.5/Modules/CMakeCompilerIdDetection.cmake"
24+
"/usr/share/cmake-3.5/Modules/CMakeDetermineCCompiler.cmake"
25+
"/usr/share/cmake-3.5/Modules/CMakeDetermineCXXCompiler.cmake"
26+
"/usr/share/cmake-3.5/Modules/CMakeDetermineCompileFeatures.cmake"
27+
"/usr/share/cmake-3.5/Modules/CMakeDetermineCompiler.cmake"
28+
"/usr/share/cmake-3.5/Modules/CMakeDetermineCompilerABI.cmake"
29+
"/usr/share/cmake-3.5/Modules/CMakeDetermineCompilerId.cmake"
30+
"/usr/share/cmake-3.5/Modules/CMakeDetermineSystem.cmake"
31+
"/usr/share/cmake-3.5/Modules/CMakeFindBinUtils.cmake"
1732
"/usr/share/cmake-3.5/Modules/CMakeGenericSystem.cmake"
1833
"/usr/share/cmake-3.5/Modules/CMakeLanguageInformation.cmake"
1934
"/usr/share/cmake-3.5/Modules/CMakeParseArguments.cmake"
35+
"/usr/share/cmake-3.5/Modules/CMakeParseImplicitLinkInfo.cmake"
36+
"/usr/share/cmake-3.5/Modules/CMakeSystem.cmake.in"
2037
"/usr/share/cmake-3.5/Modules/CMakeSystemSpecificInformation.cmake"
2138
"/usr/share/cmake-3.5/Modules/CMakeSystemSpecificInitialize.cmake"
39+
"/usr/share/cmake-3.5/Modules/CMakeTestCCompiler.cmake"
40+
"/usr/share/cmake-3.5/Modules/CMakeTestCXXCompiler.cmake"
41+
"/usr/share/cmake-3.5/Modules/CMakeTestCompilerCommon.cmake"
2242
"/usr/share/cmake-3.5/Modules/CTest.cmake"
2343
"/usr/share/cmake-3.5/Modules/CTestTargets.cmake"
2444
"/usr/share/cmake-3.5/Modules/CTestUseLaunchers.cmake"
45+
"/usr/share/cmake-3.5/Modules/Compiler/ADSP-DetermineCompiler.cmake"
46+
"/usr/share/cmake-3.5/Modules/Compiler/ARMCC-DetermineCompiler.cmake"
47+
"/usr/share/cmake-3.5/Modules/Compiler/AppleClang-DetermineCompiler.cmake"
48+
"/usr/share/cmake-3.5/Modules/Compiler/Borland-DetermineCompiler.cmake"
49+
"/usr/share/cmake-3.5/Modules/Compiler/Clang-DetermineCompiler.cmake"
50+
"/usr/share/cmake-3.5/Modules/Compiler/Clang-DetermineCompilerInternal.cmake"
51+
"/usr/share/cmake-3.5/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake"
52+
"/usr/share/cmake-3.5/Modules/Compiler/Compaq-C-DetermineCompiler.cmake"
53+
"/usr/share/cmake-3.5/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake"
54+
"/usr/share/cmake-3.5/Modules/Compiler/Cray-DetermineCompiler.cmake"
55+
"/usr/share/cmake-3.5/Modules/Compiler/Embarcadero-DetermineCompiler.cmake"
56+
"/usr/share/cmake-3.5/Modules/Compiler/Fujitsu-DetermineCompiler.cmake"
57+
"/usr/share/cmake-3.5/Modules/Compiler/GHS-DetermineCompiler.cmake"
58+
"/usr/share/cmake-3.5/Modules/Compiler/GNU-C-FeatureTests.cmake"
2559
"/usr/share/cmake-3.5/Modules/Compiler/GNU-C.cmake"
60+
"/usr/share/cmake-3.5/Modules/Compiler/GNU-CXX-FeatureTests.cmake"
2661
"/usr/share/cmake-3.5/Modules/Compiler/GNU-CXX.cmake"
62+
"/usr/share/cmake-3.5/Modules/Compiler/GNU-DetermineCompiler.cmake"
2763
"/usr/share/cmake-3.5/Modules/Compiler/GNU.cmake"
64+
"/usr/share/cmake-3.5/Modules/Compiler/HP-C-DetermineCompiler.cmake"
65+
"/usr/share/cmake-3.5/Modules/Compiler/HP-CXX-DetermineCompiler.cmake"
66+
"/usr/share/cmake-3.5/Modules/Compiler/IAR-DetermineCompiler.cmake"
67+
"/usr/share/cmake-3.5/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake"
68+
"/usr/share/cmake-3.5/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake"
69+
"/usr/share/cmake-3.5/Modules/Compiler/Intel-DetermineCompiler.cmake"
70+
"/usr/share/cmake-3.5/Modules/Compiler/MIPSpro-DetermineCompiler.cmake"
71+
"/usr/share/cmake-3.5/Modules/Compiler/MSVC-DetermineCompiler.cmake"
72+
"/usr/share/cmake-3.5/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake"
73+
"/usr/share/cmake-3.5/Modules/Compiler/PGI-DetermineCompiler.cmake"
74+
"/usr/share/cmake-3.5/Modules/Compiler/PathScale-DetermineCompiler.cmake"
75+
"/usr/share/cmake-3.5/Modules/Compiler/SCO-DetermineCompiler.cmake"
76+
"/usr/share/cmake-3.5/Modules/Compiler/SDCC-C-DetermineCompiler.cmake"
77+
"/usr/share/cmake-3.5/Modules/Compiler/SunPro-C-DetermineCompiler.cmake"
78+
"/usr/share/cmake-3.5/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake"
79+
"/usr/share/cmake-3.5/Modules/Compiler/TI-DetermineCompiler.cmake"
80+
"/usr/share/cmake-3.5/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake"
81+
"/usr/share/cmake-3.5/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake"
82+
"/usr/share/cmake-3.5/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake"
83+
"/usr/share/cmake-3.5/Modules/Compiler/Watcom-DetermineCompiler.cmake"
84+
"/usr/share/cmake-3.5/Modules/Compiler/XL-C-DetermineCompiler.cmake"
85+
"/usr/share/cmake-3.5/Modules/Compiler/XL-CXX-DetermineCompiler.cmake"
86+
"/usr/share/cmake-3.5/Modules/Compiler/zOS-C-DetermineCompiler.cmake"
87+
"/usr/share/cmake-3.5/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake"
2888
"/usr/share/cmake-3.5/Modules/DartConfiguration.tcl.in"
2989
"/usr/share/cmake-3.5/Modules/FindBISON.cmake"
3090
"/usr/share/cmake-3.5/Modules/FindFLEX.cmake"
3191
"/usr/share/cmake-3.5/Modules/FindPackageHandleStandardArgs.cmake"
3292
"/usr/share/cmake-3.5/Modules/FindPackageMessage.cmake"
93+
"/usr/share/cmake-3.5/Modules/Internal/FeatureTesting.cmake"
94+
"/usr/share/cmake-3.5/Modules/MultiArchCross.cmake"
95+
"/usr/share/cmake-3.5/Modules/Platform/Linux-CXX.cmake"
3396
"/usr/share/cmake-3.5/Modules/Platform/Linux-GNU-C.cmake"
3497
"/usr/share/cmake-3.5/Modules/Platform/Linux-GNU-CXX.cmake"
3598
"/usr/share/cmake-3.5/Modules/Platform/Linux-GNU.cmake"
@@ -45,6 +108,11 @@ set(CMAKE_MAKEFILE_OUTPUTS
45108

46109
# Byproducts of CMake generate step:
47110
set(CMAKE_MAKEFILE_PRODUCTS
111+
"CMakeFiles/3.5.2/CMakeSystem.cmake"
112+
"CMakeFiles/3.5.2/CMakeCCompiler.cmake"
113+
"CMakeFiles/3.5.2/CMakeCXXCompiler.cmake"
114+
"CMakeFiles/3.5.2/CMakeCCompiler.cmake"
115+
"CMakeFiles/3.5.2/CMakeCXXCompiler.cmake"
48116
"DartConfiguration.tcl"
49117
"CMakeFiles/CMakeDirectoryInformation.cmake"
50118
)

CMakeFiles/cppcheck.dir/depend.internal

-3
This file was deleted.

CMakeFiles/cppcheck.dir/depend.make

-3
This file was deleted.

CTestTestfile.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,3 @@ add_test(good_/home/gregory/Compiler/tests/good/factorial.java "/home/gregory/Co
3535
add_test(good_/home/gregory/Compiler/tests/good/linear-search.java "/home/gregory/Compiler/tests/test.sh" "/home/gregory/Compiler/tests/good/linear-search.java" "0")
3636
add_test(good_/home/gregory/Compiler/tests/good/linked-list.java "/home/gregory/Compiler/tests/test.sh" "/home/gregory/Compiler/tests/good/linked-list.java" "0")
3737
add_test(good_/home/gregory/Compiler/tests/good/quick-sort.java "/home/gregory/Compiler/tests/test.sh" "/home/gregory/Compiler/tests/good/quick-sort.java" "0")
38-
add_test(good_/home/gregory/Compiler/tests/good/tree-visitor.java "/home/gregory/Compiler/tests/test.sh" "/home/gregory/Compiler/tests/good/tree-visitor.java" "0")

DartConfiguration.tcl

-10
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@
44

55

66
# Configuration directories and files
7-
<<<<<<< Updated upstream
8-
SourceDirectory: /home/tna0y/Desktop/kryloff/Compiler
9-
BuildDirectory: /home/tna0y/Desktop/kryloff/Compiler
10-
=======
117
SourceDirectory: /home/gregory/Compiler
128
BuildDirectory: /home/gregory/Compiler
13-
>>>>>>> Stashed changes
149

1510
# Where to place the cost data store
1611
CostDataFile:
@@ -38,13 +33,8 @@ ScpCommand: /usr/bin/scp
3833
NightlyStartTime: 00:00:00 EDT
3934

4035
# Commands for the build/test/submit cycle
41-
<<<<<<< Updated upstream
42-
ConfigureCommand: "/home/tna0y/Desktop/cmake-3.13.2-Linux-x86_64/bin/cmake" "/home/tna0y/Desktop/kryloff/Compiler"
43-
MakeCommand: /home/tna0y/Desktop/cmake-3.13.2-Linux-x86_64/bin/cmake --build . --config "${CTEST_CONFIGURATION_TYPE}"
44-
=======
4536
ConfigureCommand: "/usr/bin/cmake" "/home/gregory/Compiler"
4637
MakeCommand: /usr/bin/cmake --build . --config "${CTEST_CONFIGURATION_TYPE}"
47-
>>>>>>> Stashed changes
4838
DefaultCTestConfigurationType: Release
4939

5040
# version control

bin/Compiler

-3.77 KB
Binary file not shown.

0 commit comments

Comments
 (0)