Merge pull request #21 from X-FRI/main

update compiler, support vs2022

.clang-format

@@ -22,7 +22,7 @@ BreakBeforeTernaryOperators:	true
 BreakConstructorInitializersBeforeComma:	true
 AllowAllArgumentsOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
-ColumnLimit: 80
+ColumnLimit: 120
 CommentPragmas:	'^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine:	true
 ConstructorInitializerIndentWidth:	2
@@ -47,11 +47,11 @@ MacroBlockBegin:	''
 MacroBlockEnd:	''
 MaxEmptyLinesToKeep:	1
 NamespaceIndentation: All
-PenaltyBreakComment:	80
-PenaltyBreakFirstLessLess:	80
-PenaltyBreakString:	80
-PenaltyExcessCharacter:	80
-PenaltyReturnTypeOnItsOwnLine:	80
+PenaltyBreakComment:	120
+PenaltyBreakFirstLessLess:	120
+PenaltyBreakString:	120
+PenaltyExcessCharacter:	120
+PenaltyReturnTypeOnItsOwnLine:	120
 PointerAlignment:	Middle
 ReflowComments:	true
 SortIncludes:	"Never"

.gitignore

@@ -12,11 +12,6 @@ build/
 
 compile_commands.json
 
-compiler/lexer/flex_lexer.cpp
-compiler/parser/bison_parser.cpp
-compiler/parser/bison_parser.hpp
-compiler/parser/location.hh
-
 .ninja_deps
 .ninja_log
 

CMakeLists.txt

@@ -8,23 +8,24 @@ cmake_policy(SET CMP0091 NEW)
 project(swallow VERSION 0.0.1 LANGUAGES CXX)
 
 # target
-set(CMAKE_C_COMPILER "/usr/bin/clang")
-set(CMAKE_CXX_COMPILER "/usr/bin/clang++")
 add_library(base SHARED "")
 set_target_properties(base PROPERTIES OUTPUT_NAME "base")
-set_target_properties(base PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/build/linux/x86_64/release")
+set_target_properties(base PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/build/linux/x86_64/debug")
 target_compile_options(base PRIVATE
     $<$<COMPILE_LANGUAGE:C>:-m64>
     $<$<COMPILE_LANGUAGE:CXX>:-m64>
-    $<$<COMPILE_LANGUAGE:C>:-DNDEBUG>
-    $<$<COMPILE_LANGUAGE:CXX>:-DNDEBUG>
 )
 set_target_properties(base PROPERTIES CXX_EXTENSIONS OFF)
 target_compile_features(base PRIVATE cxx_std_20)
 if(MSVC)
-    target_compile_options(base PRIVATE $<$<CONFIG:Release>:-Ox -fp:fast>)
+    target_compile_options(base PRIVATE $<$<CONFIG:Debug>:-Od>)
 else()
-    target_compile_options(base PRIVATE -O3)
+    target_compile_options(base PRIVATE -O0)
+endif()
+if(MSVC)
+    target_compile_options(base PRIVATE -Zi)
+else()
+    target_compile_options(base PRIVATE -g)
 endif()
 if(MSVC)
     set_property(TARGET base PROPERTY
@@ -38,11 +39,9 @@ target_sources(base PRIVATE
 )
 
 # target
-set(CMAKE_C_COMPILER "/usr/bin/clang")
-set(CMAKE_CXX_COMPILER "/usr/bin/clang++")
 add_executable(swc "")
 set_target_properties(swc PROPERTIES OUTPUT_NAME "swc")
-set_target_properties(swc PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/build/linux/x86_64/release")
+set_target_properties(swc PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/build/linux/x86_64/debug")
 add_dependencies(swc base)
 target_include_directories(swc PRIVATE
     compiler
@@ -56,20 +55,18 @@ target_include_directories(swc PRIVATE
 target_compile_options(swc PRIVATE
     $<$<COMPILE_LANGUAGE:C>:-m64>
     $<$<COMPILE_LANGUAGE:CXX>:-m64>
-    $<$<COMPILE_LANGUAGE:C>:-DNDEBUG>
-    $<$<COMPILE_LANGUAGE:CXX>:-DNDEBUG>
-    $<$<COMPILE_LANGUAGE:CXX>:-stdlib=libc++>
 )
 set_target_properties(swc PROPERTIES CXX_EXTENSIONS OFF)
 target_compile_features(swc PRIVATE cxx_std_20)
 if(MSVC)
-    target_compile_options(swc PRIVATE $<$<CONFIG:Release>:-Ox -fp:fast>)
+    target_compile_options(swc PRIVATE $<$<CONFIG:Debug>:-Od>)
 else()
-    target_compile_options(swc PRIVATE -O3)
+    target_compile_options(swc PRIVATE -O0)
 endif()
 if(MSVC)
+    target_compile_options(swc PRIVATE -Zi)
 else()
-    target_compile_options(swc PRIVATE -fvisibility=hidden)
+    target_compile_options(swc PRIVATE -g)
 endif()
 if(MSVC)
     set_property(TARGET swc PROPERTY
@@ -79,55 +76,52 @@ target_link_libraries(swc PRIVATE
     base
 )
 target_link_directories(swc PRIVATE
-    build/linux/x86_64/release
+    build/linux/x86_64/debug
 )
 target_link_options(swc PRIVATE
     -m64
 )
 target_sources(swc PRIVATE
     compiler/compiler.cpp
-    compiler/ast/g-machine.cpp
-    compiler/ast/dump.cpp
     compiler/ast/ast.cpp
+    compiler/ast/dump.cpp
+    compiler/ast/g-machine.cpp
     compiler/ast/type.cpp
     compiler/diagnostics/utils.cpp
-    compiler/diagnostics/reporter.cpp
     compiler/diagnostics/diagnostics.cpp
-    compiler/g-machine/instruction.cpp
+    compiler/diagnostics/reporter.cpp
     compiler/g-machine/binop.cpp
     compiler/g-machine/environment.cpp
+    compiler/g-machine/instruction.cpp
     compiler/lexer/lexer.cpp
     compiler/lexer/flex_lexer.cpp
     compiler/parser/parser.cpp
     compiler/parser/bison_parser.cpp
-    compiler/type/type.cpp
     compiler/type/dump.cpp
     compiler/type/environment.cpp
+    compiler/type/type.cpp
 )
 
 # target
-set(CMAKE_C_COMPILER "/usr/bin/clang")
-set(CMAKE_CXX_COMPILER "/usr/bin/clang++")
 add_executable(swi "")
 set_target_properties(swi PROPERTIES OUTPUT_NAME "swi")
-set_target_properties(swi PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/build/linux/x86_64/release")
+set_target_properties(swi PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/build/linux/x86_64/debug")
 add_dependencies(swi swc)
 target_compile_options(swi PRIVATE
     $<$<COMPILE_LANGUAGE:C>:-m64>
     $<$<COMPILE_LANGUAGE:CXX>:-m64>
-    $<$<COMPILE_LANGUAGE:C>:-DNDEBUG>
-    $<$<COMPILE_LANGUAGE:CXX>:-DNDEBUG>
 )
 set_target_properties(swi PROPERTIES CXX_EXTENSIONS OFF)
 target_compile_features(swi PRIVATE cxx_std_20)
 if(MSVC)
-    target_compile_options(swi PRIVATE $<$<CONFIG:Release>:-Ox -fp:fast>)
+    target_compile_options(swi PRIVATE $<$<CONFIG:Debug>:-Od>)
 else()
-    target_compile_options(swi PRIVATE -O3)
+    target_compile_options(swi PRIVATE -O0)
 endif()
 if(MSVC)
+    target_compile_options(swi PRIVATE -Zi)
 else()
-    target_compile_options(swi PRIVATE -fvisibility=hidden)
+    target_compile_options(swi PRIVATE -g)
 endif()
 if(MSVC)
     set_property(TARGET swi PROPERTY
@@ -137,7 +131,7 @@ target_link_libraries(swi PRIVATE
     base
 )
 target_link_directories(swi PRIVATE
-    build/linux/x86_64/release
+    build/linux/x86_64/debug
 )
 target_link_options(swi PRIVATE
     -m64

compiler/ast/ast.cpp

@@ -81,8 +81,7 @@ namespace swallow::compiler::type
     Environment typeEnvironment;
 
     auto intType = Type::Ptr(new Base("Int"));
-    auto binopType = Type::Ptr(
-      new Arrow(intType, Type::Ptr(new type::Arrow(intType, intType))));
+    auto binopType = Type::Ptr(new Arrow(intType, Type::Ptr(new type::Arrow(intType, intType))));
 
     typeEnvironment.Bind("+", binopType);
     typeEnvironment.Bind("-", binopType);