弃用rapidjson，改为nlohmann/json

Author: CppCXY

.gitignore

@@ -2,3 +2,4 @@
 build
 .vs
 out
+build_script

CMakeLists.txt

@@ -26,7 +26,7 @@ elseif(${EMMY_LUA_VERSION} STREQUAL "jit")
     #add_definitions(-DEMMY_LUA_JIT_SUPPORT_LUA_SETFUNCS)
 endif()
 
-add_definitions(-DEMMY_CORE_VERSION="1.3.0")
+add_definitions(-DEMMY_CORE_VERSION="1.4.0")
 
 if(EMMY_USE_LUA_SOURCE)
     add_definitions(-DEMMY_USE_LUA_SOURCE)

emmy_debugger/CMakeLists.txt

@@ -11,7 +11,7 @@ add_dependencies(
 
 target_include_directories(emmy_debugger PUBLIC 
     ${emmy_SOURCE_DIR}/include
-    ${emmy_SOURCE_DIR}/third-party/rapidjson-1.1.0/include
+    ${emmy_SOURCE_DIR}/third-party/nlohmann/include
     ${emmy_SOURCE_DIR}/third-party/libuv-1.29.0/include
     PRIVATE src
 )
@@ -55,7 +55,6 @@ target_sources(emmy_debugger PUBLIC
     ${emmy_debugger_SOURCE_DIR}/src/lua_version.cpp
 )
 
-target_compile_definitions(emmy_debugger PUBLIC -DRAPIDJSON_HAS_STDSTRING)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 	target_compile_options(emmy_debugger PUBLIC /utf-8)
@@ -121,8 +120,6 @@ else()
         ${emmy_debugger_SOURCE_DIR}/src/api/lua_state/lua_state_jit.cpp
     )
 
-
-
 endif(EMMY_USE_LUA_SOURCE)
 
 

emmy_debugger/src/emmy_debugger.cpp

@@ -15,6 +15,7 @@
 */
 #include "emmy_debugger/emmy_debugger.h"
 #include <algorithm>
+#include <cassert>
 #include <sstream>
 #include "emmy_debugger/emmy_facade.h"
 #include "emmy_debugger/hook_state.h"
@@ -928,6 +929,9 @@ bool Debugger::DoEval(std::shared_ptr<EvalContext> evalContext)
 	}
 	// LOAD AS "return expr"
 	std::string statement = "return ";
+	// 如果是 aaa:bbbb 则纠正为aaa.bbbb
+
+
 	statement.append(evalContext->expr);
 	int r = luaL_loadstring(L, statement.c_str());
 	if (r == LUA_ERRSYNTAX)