Skip to content

Commit 8510029

Browse files
CppCXYCppCXY
committed
reformat
1 parent ac5aa98 commit 8510029

7 files changed

Lines changed: 236 additions & 185 deletions

File tree

‎emmy_core/CMakeLists.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
cmake_minimum_required(VERSION 3.14)
22

3-
project (emmy_core)
3+
project(emmy_core)
44

55
add_library(emmy_core SHARED)
66

77
add_dependencies(
8-
emmy_core
9-
emmy_debugger
8+
emmy_core
9+
emmy_debugger
1010
)
1111

1212
set_target_properties(emmy_core PROPERTIES PREFIX "")
1313

1414
target_include_directories(emmy_core
15-
PRIVATE src
15+
PRIVATE src
1616
)
1717

1818
target_sources(emmy_core PRIVATE
19-
src/emmy_core.cpp
19+
src/emmy_core.cpp
2020
)
2121

2222
target_link_libraries(
23-
emmy_core
24-
PRIVATE emmy_debugger
23+
emmy_core
24+
PRIVATE emmy_debugger
2525
)
2626

2727
install(
28-
TARGETS emmy_core
29-
LIBRARY DESTINATION bin
30-
RUNTIME DESTINATION bin
28+
TARGETS emmy_core
29+
LIBRARY DESTINATION bin
30+
RUNTIME DESTINATION bin
3131
)

‎emmy_debugger/CMakeLists.txt‎

Lines changed: 75 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,122 @@
11
cmake_minimum_required(VERSION 3.14)
22

3-
project (emmy_debugger)
3+
project(emmy_debugger)
44

55
add_library(emmy_debugger STATIC)
66

77
add_dependencies(
8-
emmy_debugger
9-
uv_a
8+
emmy_debugger
9+
uv_a
1010
)
1111

12-
target_include_directories(emmy_debugger PUBLIC
13-
${emmy_debugger_SOURCE_DIR}/include
14-
${emmy_SOURCE_DIR}/third-party/nlohmann/include
15-
${emmy_SOURCE_DIR}/third-party/libuv-1.29.0/include
16-
PRIVATE src
12+
target_include_directories(emmy_debugger PUBLIC
13+
${emmy_debugger_SOURCE_DIR}/include
14+
${emmy_SOURCE_DIR}/third-party/nlohmann/include
15+
${emmy_SOURCE_DIR}/third-party/libuv-1.29.0/include
16+
PRIVATE src
1717
)
1818

19-
target_sources(emmy_debugger
20-
PRIVATE
21-
#src/api
22-
src/api/lua_api.cpp
23-
src/api/lua_state.cpp
24-
src/api/lua_version.cpp
25-
26-
#src/transporter
27-
src/transporter/pipeline_client_transporter.cpp
28-
src/transporter/pipeline_server_transporter.cpp
29-
src/transporter/socket_client_transporter.cpp
30-
src/transporter/socket_server_transporter.cpp
31-
src/transporter/transporter.cpp
32-
33-
#src/debugger
34-
src/debugger/emmy_debugger.cpp
35-
src/debugger/emmy_debugger_manager.cpp
36-
src/debugger/emmy_debugger_lib.cpp
37-
src/debugger/hook_state.cpp
38-
src/debugger/extension_point.cpp
39-
40-
#src/proto
41-
src/proto/proto.cpp
42-
src/proto/proto_handler.cpp
43-
44-
#src/arena
45-
src/arena/arena.cpp
46-
47-
#src
48-
src/emmy_facade.cpp
49-
src/util.cpp
19+
target_sources(emmy_debugger
20+
PRIVATE
21+
#src/api
22+
src/api/lua_api.cpp
23+
src/api/lua_state.cpp
24+
src/api/lua_version.cpp
25+
26+
#src/transporter
27+
src/transporter/pipeline_client_transporter.cpp
28+
src/transporter/pipeline_server_transporter.cpp
29+
src/transporter/socket_client_transporter.cpp
30+
src/transporter/socket_server_transporter.cpp
31+
src/transporter/transporter.cpp
32+
33+
#src/debugger
34+
src/debugger/emmy_debugger.cpp
35+
src/debugger/emmy_debugger_manager.cpp
36+
src/debugger/emmy_debugger_lib.cpp
37+
src/debugger/hook_state.cpp
38+
src/debugger/extension_point.cpp
39+
40+
#src/proto
41+
src/proto/proto.cpp
42+
src/proto/proto_handler.cpp
43+
44+
#src/arena
45+
src/arena/arena.cpp
46+
47+
#src
48+
src/emmy_facade.cpp
49+
src/util.cpp
5050
)
5151

5252

5353
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
54-
target_compile_options(emmy_debugger PUBLIC /utf-8)
54+
target_compile_options(emmy_debugger PUBLIC /utf-8)
5555
endif ()
5656

5757

58-
if(NOT WIN32)
58+
if (NOT WIN32)
5959
target_compile_options(emmy_debugger PUBLIC -fPIC)
60-
endif()
60+
endif ()
6161

62-
if(EMMY_USE_LUA_SOURCE)
62+
if (EMMY_USE_LUA_SOURCE)
6363
target_compile_definitions(emmy_debugger PUBLIC -DEMMY_USE_LUA_SOURCE)
64-
target_include_directories(emmy_debugger PUBLIC
65-
${emmy_SOURCE_DIR}/third-party/${EMMY_LUA_DIR}/src
66-
)
67-
if(${EMMY_LUA_VERSION} STREQUAL "jit")
68-
target_link_directories(emmy_debugger PUBLIC
64+
target_include_directories(emmy_debugger PUBLIC
6965
${emmy_SOURCE_DIR}/third-party/${EMMY_LUA_DIR}/src
66+
)
67+
if (${EMMY_LUA_VERSION} STREQUAL "jit")
68+
target_link_directories(emmy_debugger PUBLIC
69+
${emmy_SOURCE_DIR}/third-party/${EMMY_LUA_DIR}/src
7070
)
7171
target_link_libraries(
72-
emmy_debugger
73-
PRIVATE lua51.lib
72+
emmy_debugger
73+
PRIVATE lua51.lib
7474
)
7575
target_sources(emmy_debugger
76-
PRIVATE
77-
src/api/lua_state/lua_state_jit.cpp
76+
PRIVATE
77+
src/api/lua_state/lua_state_jit.cpp
7878
)
79-
else()
79+
else ()
8080
add_dependencies(emmy_debugger lua${EMMY_LUA_VERSION})
8181
target_link_libraries(
82-
emmy_debugger
83-
PUBLIC lua${EMMY_LUA_VERSION}
82+
emmy_debugger
83+
PUBLIC lua${EMMY_LUA_VERSION}
8484
)
8585
target_sources(emmy_debugger
86-
PRIVATE
87-
src/api/lua_state/lua_state_${EMMY_LUA_VERSION}.cpp
86+
PRIVATE
87+
src/api/lua_state/lua_state_${EMMY_LUA_VERSION}.cpp
8888
)
89-
endif()
89+
endif ()
9090

9191

92-
93-
elseif(EMMY_COMPILE_AS_LIB)
92+
elseif (EMMY_COMPILE_AS_LIB)
9493
message("emmy build as lib")
9594
target_compile_definitions(emmy_debugger PUBLIC -DEMMY_USE_LUA_SOURCE)
9695
target_sources(emmy_debugger
97-
PRIVATE
98-
src/api/lua_state/lua_state_${EMMY_LUA_VERSION}.cpp
96+
PRIVATE
97+
src/api/lua_state/lua_state_${EMMY_LUA_VERSION}.cpp
9998
)
100-
else()
99+
else ()
101100
target_include_directories(emmy_debugger PRIVATE
102-
${emmy_SOURCE_DIR}/third-party
101+
${emmy_SOURCE_DIR}/third-party
103102
)
104103

105104
target_sources(emmy_debugger
106-
PUBLIC
107-
src/api/lua_api_loader.cpp
105+
PUBLIC
106+
src/api/lua_api_loader.cpp
108107

109-
PRIVATE
110-
src/api/lua_state/lua_state_54.cpp
111-
src/api/lua_state/lua_state_53.cpp
112-
src/api/lua_state/lua_state_52.cpp
113-
src/api/lua_state/lua_state_51.cpp
114-
src/api/lua_state/lua_state_jit.cpp
108+
PRIVATE
109+
src/api/lua_state/lua_state_54.cpp
110+
src/api/lua_state/lua_state_53.cpp
111+
src/api/lua_state/lua_state_52.cpp
112+
src/api/lua_state/lua_state_51.cpp
113+
src/api/lua_state/lua_state_jit.cpp
115114
)
116-
117-
endif(EMMY_USE_LUA_SOURCE)
115+
116+
endif (EMMY_USE_LUA_SOURCE)
118117

119118

120119
target_link_libraries(
121-
emmy_debugger
122-
PUBLIC uv_a
120+
emmy_debugger
121+
PUBLIC uv_a
123122
)

‎emmy_debugger/include/emmy_debugger/proto/proto.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ enum ValueType {
1010
}
1111

1212
enum VariableNameType {
13-
NString, NNumber, NComplex,
13+
NString, NNumber, NComplex,
1414
}
1515

1616
interface Variable {
@@ -45,13 +45,15 @@ interface InitRsp {
4545
interface AddBreakPointReq {
4646
breakPoints: BreakPoint[];
4747
}
48+
4849
interface AddBreakPointRsp {
4950
}
5051

5152
// remove breakpoint
5253
interface RemoveBreakPointReq {
5354
breakPoints: BreakPoint[];
5455
}
56+
5557
interface RemoveBreakPointRsp {
5658
}
5759

@@ -68,6 +70,7 @@ enum DebugAction {
6870
interface ActionReq {
6971
action: DebugAction;
7072
}
73+
7174
interface ActionRsp {
7275
}
7376

0 commit comments

Comments
 (0)