WIP：有减号问题，要移到语法上做

Author: Kingtous

CMakeLists.txt

@@ -9,6 +9,7 @@ SET(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC)
 find_package(LLVM REQUIRED CONFIG)
 include_directories(${LLVM_INCLUDE_DIRS})
 add_definitions(${LLVM_DEFINITIONS})
+message(STATUS "Found llvm in ${LLVM_INCLUDE_DIRS}")
 
 find_package(Clang REQUIRED CONFIG)
 include_directories(${CLANG_INCLUDE_DIRS})
@@ -25,11 +26,11 @@ find_package(Boost COMPONENTS system filesystem thread chrono REQUIRED)
 include_directories(${Boost_INCLUDE_DIR})
 link_directories(${Boost_LIBRARY_DIR})
 
-#find_package(PkgConfig REQUIRED)
-#pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
-#include_directories(${GTK3_INCLUDE_DIRS})
-#link_directories(${GTK3_LIBRARY_DIRS})
-#add_definitions(${GTK3_CFLAGS_OTHER})
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+include_directories(${GTK3_INCLUDE_DIRS})
+link_directories(${GTK3_LIBRARY_DIRS})
+add_definitions(${GTK3_CFLAGS_OTHER})
 # 处理语法分析器
 #find_package(BISON)
 #BISON_TARGET(Parser parser/parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser/Parser.cpp
@@ -39,9 +40,9 @@ link_directories(${Boost_LIBRARY_DIR})
 #set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
 
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
-#message(STATUS "GTK3_INCLUDE_DIRS: ${GTK3_INCLUDE_DIRS}")
-#message(STATUS "GKT3_LIBRARIES: ${GTK3_LIBRARIES}")
-#message(STATUS "GTK3_LINK_LIBRARIES: ${GTK3_LINK_LIBRARIES}")
+message(STATUS "GTK3_INCLUDE_DIRS: ${GTK3_INCLUDE_DIRS}")
+message(STATUS "GKT3_LIBRARIES: ${GTK3_LIBRARIES}")
+message(STATUS "GTK3_LINK_LIBRARIES: ${GTK3_LINK_LIBRARIES}")
 message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 message(STATUS "Using defs in: ${LLVM_DEFINITIONS}")
 message(STATUS "CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}")
@@ -135,19 +136,29 @@ message(STATUS "Found ${llvm_libs}")
 
 # Link against LLVM libraries
 #target_link_libraries(sysyplus_compiler ${llvm_libs})
-target_link_libraries(sysyplus_compiler
-        LLVM
-        ${GTKMM_LIBRARIES}
-        Boost::thread Boost::chrono
-        clangDriver
-        )
+if(WIN32)
+    target_link_libraries(sysyplus_compiler
+            LLVM
+            ${GTKMM_LIBRARIES}
+            Boost::thread Boost::chrono
+            clangDriver
+            wsock32
+            )
+else()
+    target_link_libraries(sysyplus_compiler
+            LLVM
+            ${GTKMM_LIBRARIES}
+            Boost::thread Boost::chrono
+            clangDriver
+            )
+endif()
 
 #message(STATUS "UI逻辑：复制UI:${CMAKE_SOURCE_DIR}/ui/ui -> ${CMAKE_CURRENT_BINARY_DIR}/ui")
 #add_custom_command(TARGET sysyplus_compiler PRE_BUILD
 #        COMMAND ${CMAKE_COMMAND} -E copy_directory
 #        ${CMAKE_SOURCE_DIR}/ui/ui ${CMAKE_CURRENT_BINARY_DIR}/ui)
 
-#message(STATUS "配置目标库")
+message(STATUS "配置目标库")
 #add_subdirectory(module)
 
 # time module

ast/NodeAST.hpp

@@ -22,8 +22,8 @@ enum ASTType {
 };
 
 enum VarType {
-    INT,
-    VOID
+    SYSY_INT,
+    SYSY_VOID
 };
 
 enum BinaryType {

module/web/src/web.hpp

@@ -12,7 +12,12 @@
 #include <boost/bind.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
-
+#ifdef _WIN32
+#include <direct.h>
+    #define getcwd _getcwd // stupid MSFT "deprecation" warning
+#elif
+#include <unistd.h>
+#endif
 //#include <>
 
 /// 客户端状态码

parser/Lexer.cpp

@@ -137,7 +137,8 @@ int Lexer::_getNextToken() {
         identifierStr = char(last_char);
 
 
-        while (ispunct((last_char = getchar()))) {
+        while (ispunct((seek()))) {
+            NEXTCHAR;
             identifierStr += last_char;
             // 注释
             if (identifierStr == "//") {
@@ -147,17 +148,20 @@ int Lexer::_getNextToken() {
                 NEXTCHAR;
                 return _getNextToken();
             }
+            else if (identifierStr == "&&") {
+                NEXTCHAR;
+                return T_AND;
+            }
+            else if (identifierStr == "||") {
+                NEXTCHAR;
+                return T_OR;
+            }
         }
 
-        if (identifierStr == "&&") {
-            return T_AND;
-        }
-        if (identifierStr == "||") {
-            return T_OR;
-        }
         if (identifierStr == "-") {
             // 负数
             if (isdigit(seek())) {
+                NEXTCHAR;
                 int token = _getNextToken();
                 if (token == T_INTEGER) {
                     yylval.int_value = -yylval.int_value;

test/case/webc_test/qsort.sy

@@ -0,0 +1,40 @@
+int qsort(int a[],int left,int right){
+    if (right <= left){
+        ret -1;
+    }
+    int pivot = a[right];
+    int i = left;
+    int j = right - 1;
+    wh(true){
+        wh(a[i] < pivot){
+            i = i + 1;
+        }
+        wh(a[j] > pivot && j >= left){
+            j = j - 1;
+        }
+        if (i < j){
+            int tmp = a[i];
+            a[i] = a[j];
+            a[j] = tmp;
+            i = i + 1;
+            j = j - 1;
+        }
+        el {
+            out;
+        }
+    }
+    int tmp = a[i];
+    a[i] = pivot;
+    pivot = tmp;
+    qsort(a,left,i-1);
+    qsort(a,i+1,right);
+    ret 0;
+}
+
+int main(){
+    int a[5]= {4,7,1,2,3};
+    qsort(a,0,4);
+    lp(int i=0;i<5;i=i+1){
+        echo(a[i]);
+    }
+}