Merge branch 'dev'

limuy2022 · Jan 10, 2024 · a7d395d · a7d395d
2 parents b94d330 + ed20645
commit a7d395d
Show file tree

Hide file tree

Showing 17 changed files with 201 additions and 304 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,6 +22,7 @@ rules.ninja
 compile_commands.json
 #clangd缓存
 .cache/
+lib/
 
 #for rust
 target/

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,25 +15,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
 add_subdirectory("cmake_third_party/googletest")
 include_directories("cmake_third_party/googletest/googletest/include", "include")
 
-add_library(language_module)
-target_sources(language_module
-    PUBLIC
-    FILE_SET CXX_MODULES FILES
-    language/language.cppm
-)
-
-message("${LANGUAGE_SOURCES}")
-
-add_library(Chinese language/chinese.cpp)
-
-add_library(English language/english.cpp)
-
-add_library(language language/english.cpp)
-
-target_link_libraries(Chinese language_module)
-target_link_libraries(English language_module)
-target_link_libraries(language language_module)
-
 file(GLOB_RECURSE CPPMSOURCES "*.cppm")
 file(GLOB_RECURSE CPP_SOURCES "src/*.cpp")
 
@@ -50,7 +31,6 @@ target_sources(foo
 add_executable(Trc ${CPP_SOURCES})
 
 target_link_libraries(Trc foo)
-target_link_libraries(Trc language)
 
 
 file(GLOB_RECURSE TEST_SOURCES "tests/unittest/*.cpp")
@@ -69,7 +49,7 @@ add_executable(unittest
    ${TEST_SOURCES}
 )
 target_compile_definitions(unittest PRIVATE "UNITTEST")
-target_link_libraries(unittest testmodulefiles language gtest)
+target_link_libraries(unittest testmodulefiles gtest)
 add_dependencies(Trc flex bison)
 add_dependencies(unittest flex bison)
 

diff --git a/README.md b/README.md
@@ -12,15 +12,15 @@ Using c++ 20 standard and use module feature
 
 But here is a developing ```rust``` instance now!
 
-in directory ```rust```
+[rust_trc](rust/)
 
 ## Goal
 
-#### as easy as Python
+**as easy as Python**
 
-#### as fast as Java
+**as fast as Java**
 
-#### as small as lua
+**as small as lua**
 
 ## project website
 
@@ -43,13 +43,13 @@ trc support many languages，the way to change language is that uses the languag
 
 ### hello world
 
-```
+```go
 println("hello world!")
 ```
 
 ### calculate even numbers from 1 to n
 
-```
+```go
 a := int(input())
 while a > 0 {
     if a %2 == 0{
@@ -61,7 +61,7 @@ while a > 0 {
 
 ### Big num calculation
 
-```
+```go
 a := 1231234561234
 b := a
 println(a)
@@ -85,6 +85,6 @@ QQ:3570249647
 
 | Library         |Usage     |
 |:-----------|:-------|
-| googletest | Uniitest |
+| googletest | Unittest |
 
 Express my thanks to Open-source software contributors!
diff --git a/src/compiler/parser.yy → doc/developer/parser.yy b/src/compiler/parser.yy → doc/developer/parser.yy
diff --git a/src/compiler/token.ll → doc/developer/token.ll b/src/compiler/token.ll → doc/developer/token.ll
diff --git a/language/chinese.cpp b/language/chinese.cpp
diff --git a/language/english.cpp b/language/english.cpp
diff --git a/language/language.cppm b/language/language.cppm
diff --git a/language/xmake.lua b/language/xmake.lua
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ rules.ninja @@
     compile_commands.json
     #clangd缓存
     .cache/
+    lib/
     #for rust
     target/
@@ Expand Down @@