Skip to content

Commit 62653a5

Browse files
CppCXYCppCXY
committed
整理代码
1 parent 8436ceb commit 62653a5

20 files changed

+526
-669
lines changed

‎.clang-format‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Generated from CLion C/C++ Code Style settings
21
BasedOnStyle: LLVM
32
AccessModifierOffset: -4
43
AlignAfterOpenBracket: Align
@@ -9,8 +8,7 @@ AllowAllConstructorInitializersOnNextLine: false
98
AllowAllParametersOfDeclarationOnNextLine: false
109
AllowShortBlocksOnASingleLine: Always
1110
AllowShortCaseLabelsOnASingleLine: false
12-
AllowShortFunctionsOnASingleLine: All
13-
AllowShortIfStatementsOnASingleLine: Always
11+
AllowShortFunctionsOnASingleLine: None
1412
AllowShortLambdasOnASingleLine: All
1513
AllowShortLoopsOnASingleLine: true
1614
AlwaysBreakAfterReturnType: None
@@ -63,4 +61,4 @@ SpacesInContainerLiterals: false
6361
SpacesInParentheses: false
6462
SpacesInSquareBrackets: false
6563
TabWidth: 4
66-
UseTab: Never
64+
UseTab: ForIndentation

‎CMakeSettings.json‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎emmy_core/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ target_include_directories(emmy_core PUBLIC
1818
PRIVATE src
1919
)
2020

21-
target_sources(emmy_core PUBLIC
22-
${emmy_SOURCE_DIR}/include/emmy_core/emmy_core.h
21+
target_sources(emmy_core PRIVATE
2322
${emmy_core_SOURCE_DIR}/src/emmy_core.cpp
2423
)
2524

‎emmy_core/src/emmy_core.cpp‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,15 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include "emmy_core/emmy_core.h"
17-
#include "emmy_debugger/emmy_helper.h"
16+
17+
//#define EMMY_CORE_VERSION "1.0.0"
18+
#include "emmy_debugger/emmy_debugger_lib.h"
1819
#include "emmy_debugger/emmy_facade.h"
20+
#ifdef _MSC_VER
21+
#define EMMY_CORE_EXPORT __declspec(dllexport)
22+
#else
23+
#define EMMY_CORE_EXPORT extern
24+
#endif
1925

2026
static const luaL_Reg lib[] = {
2127
{"tcpListen", tcpListen},
@@ -32,7 +38,7 @@ static const luaL_Reg lib[] = {
3238
extern "C" {
3339
EMMY_CORE_EXPORT int luaopen_emmy_core(struct lua_State* L) {
3440
EmmyFacade::Get().SetWorkMode(WorkMode::EmmyCore);
35-
if (!install_emmy_core(L))
41+
if (!install_emmy_debugger(L))
3642
return false;
3743
luaL_newlibtable(L, lib);
3844
luaL_setfuncs(L, lib, 0);

‎emmy_debugger/CMakeLists.txt‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,8 @@ target_include_directories(emmy_debugger PUBLIC
1616
PRIVATE src
1717
)
1818

19-
target_sources(emmy_debugger PUBLIC
20-
21-
${emmy_SOURCE_DIR}/include/emmy_debugger/emmy_debugger.h
22-
${emmy_SOURCE_DIR}/include/emmy_debugger/emmy_debugger_manager.h
23-
${emmy_SOURCE_DIR}/include/emmy_debugger/emmy_facade.h
24-
${emmy_SOURCE_DIR}/include/emmy_debugger/hook_state.h
25-
${emmy_SOURCE_DIR}/include/emmy_debugger/lua_version.h
26-
${emmy_SOURCE_DIR}/include/emmy_debugger/transporter.h
27-
${emmy_SOURCE_DIR}/include/emmy_debugger/types.h
28-
${emmy_SOURCE_DIR}/include/emmy_debugger/emmy_helper.h
29-
30-
${emmy_SOURCE_DIR}/include/emmy_debugger/api/lua_api.h
31-
32-
${emmy_SOURCE_DIR}/include/emmy_debugger/proto/pipeline_client_transporter.h
33-
${emmy_SOURCE_DIR}/include/emmy_debugger/proto/pipeline_server_transporter.h
34-
${emmy_SOURCE_DIR}/include/emmy_debugger/proto/socket_client_transporter.h
35-
${emmy_SOURCE_DIR}/include/emmy_debugger/proto/socket_server_transporter.h
36-
19+
target_sources(emmy_debugger
20+
PRIVATE
3721
#src/api
3822
${emmy_debugger_SOURCE_DIR}/src/api/lua_api.cpp
3923
${emmy_debugger_SOURCE_DIR}/src/api/lua_state.cpp
@@ -48,11 +32,13 @@ target_sources(emmy_debugger PUBLIC
4832
${emmy_debugger_SOURCE_DIR}/src/emmy_debugger.cpp
4933
${emmy_debugger_SOURCE_DIR}/src/emmy_debugger_manager.cpp
5034
${emmy_debugger_SOURCE_DIR}/src/emmy_facade.cpp
51-
${emmy_debugger_SOURCE_DIR}/src/emmy_helper.cpp
35+
${emmy_debugger_SOURCE_DIR}/src/emmy_debugger_lib.cpp
5236
${emmy_debugger_SOURCE_DIR}/src/hook_state.cpp
5337
${emmy_debugger_SOURCE_DIR}/src/stack.cpp
5438
${emmy_debugger_SOURCE_DIR}/src/transporter.cpp
5539
${emmy_debugger_SOURCE_DIR}/src/lua_version.cpp
40+
${emmy_debugger_SOURCE_DIR}/src/extension_point.cpp
41+
${emmy_debugger_SOURCE_DIR}/src/util.cpp
5642
)
5743

5844

‎emmy_debugger/src/emmy_debugger.cpp‎

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include <cstring>
2121
#include "emmy_debugger/emmy_facade.h"
2222
#include "emmy_debugger/hook_state.h"
23-
#include "emmy_debugger/emmy_helper.h"
2423
#include "emmy_debugger/lua_version.h"
24+
#include "emmy_debugger/util.h"
2525

2626
#define CACHE_TABLE_NAME "_emmy_cache_table_"
2727
#define CACHE_QUERY_NAME "_emmy_query_table_"
@@ -180,29 +180,7 @@ bool Debugger::IsMainCoroutine(lua_State* L) const
180180
return L == mainL;
181181
}
182182

183-
lua_State* Debugger::queryParentThread(lua_State* L)
184-
{
185-
lua_State* PL;
186-
const int t = lua_gettop(L);
187-
lua_getglobal(L, "emmyHelper");
188-
if (lua_istable(L, -1))
189-
{
190-
lua_getfield(L, -1, "queryParentThread");
191-
if (lua_isfunction(L, -1))
192-
{
193-
const auto r = lua_pcall(L, 0, 1, 0);
194-
if (r == LUA_OK)
195-
{
196-
PL = lua_tothread(L, -1);
197-
}
198-
}
199-
}
200-
lua_settop(L, t);
201-
202-
return PL;
203-
}
204-
205-
bool Debugger::GetStacks(std::vector<std::shared_ptr<Stack>>& stacks, StackAllocatorCB alloc)
183+
bool Debugger::GetStacks(std::vector<std::shared_ptr<Stack>>& stacks)
206184
{
207185
if (!currentL)
208186
{
@@ -227,7 +205,7 @@ bool Debugger::GetStacks(std::vector<std::shared_ptr<Stack>>& stacks, StackAlloc
227205
{
228206
continue;
229207
}
230-
auto stack = alloc();
208+
auto stack = std::make_shared<Stack>();
231209
stack->file = GetFile(&ar);
232210
stack->functionName = getDebugName(&ar) == nullptr ? "" : getDebugName(&ar);
233211
stack->level = totalLevel++;
@@ -282,7 +260,8 @@ bool Debugger::GetStacks(std::vector<std::shared_ptr<Stack>>& stacks, StackAlloc
282260
level++;
283261
}
284262

285-
lua_State* PL = queryParentThread(L);
263+
// TODO
264+
lua_State* PL = manager->extension.QueryParentThread(L);
286265

287266
if (PL != nullptr)
288267
{
@@ -453,7 +432,7 @@ void Debugger::GetVariable(lua_State* L, std::shared_ptr<Variable> variable, int
453432

454433
if (queryHelper && (type == LUA_TTABLE || type == LUA_TUSERDATA || type == LUA_TFUNCTION))
455434
{
456-
if (query_variable(L, variable, typeName, index, depth))
435+
if (manager->extension.QueryVariable(L, variable, typeName, index, depth))
457436
{
458437
return;
459438
}
@@ -1045,7 +1024,7 @@ bool Debugger::Eval(std::shared_ptr<EvalContext> evalContext, bool force)
10451024
return true;
10461025
}
10471026

1048-
int lastlevel(lua_State* L)
1027+
int LastLevel(lua_State* L)
10491028
{
10501029
int level = 0;
10511030

@@ -1072,11 +1051,11 @@ bool Debugger::DoEval(std::shared_ptr<EvalContext> evalContext)
10721051

10731052
while (L != nullptr)
10741053
{
1075-
int level = lastlevel(L);
1054+
int level = LastLevel(L);
10761055
if (innerLevel > level)
10771056
{
10781057
innerLevel -= level;
1079-
L = queryParentThread(L);
1058+
L = manager->extension.QueryParentThread(L);
10801059
}
10811060
else
10821061
{

0 commit comments

Comments
 (0)