Skip to content

Commit 6fc8624

Browse files
committed
feat: 代码预处理器和 WingCStruct 相关更新;
1 parent 89637ce commit 6fc8624

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+14686
-6650
lines changed

CMakeLists.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,17 @@ set(CSTRUCT_GRAMMAR
110110
src/grammar/c/CStructLexer.h
111111
src/grammar/c/CStructParser.h)
112112

113-
set(ANTLR4_GRAMMAR ${NUMCAL_GRAMMAR} ${CSTRUCT_GRAMMAR})
113+
set(ASCONSOLE_GRAMMAR
114+
src/grammar/ASConsole/AngelscriptConsoleLexer.cpp
115+
src/grammar/ASConsole/AngelscriptConsoleParser.cpp
116+
src/grammar/ASConsole/AngelscriptConsoleParserBaseVisitor.cpp
117+
src/grammar/ASConsole/AngelscriptConsoleParserVisitor.cpp
118+
src/grammar/ASConsole/AngelscriptConsoleLexer.h
119+
src/grammar/ASConsole/AngelscriptConsoleParser.h
120+
src/grammar/ASConsole/AngelscriptConsoleParserBaseVisitor.h
121+
src/grammar/ASConsole/AngelscriptConsoleParserVisitor.h)
122+
123+
set(ANTLR4_GRAMMAR ${NUMCAL_GRAMMAR} ${CSTRUCT_GRAMMAR} ${ASCONSOLE_GRAMMAR})
114124

115125
set(ANGEL_SCRIPT_ADDON_ROOT
116126
"${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/AngelScript/sdk/add_on")
@@ -297,8 +307,6 @@ set(CLASS_SRC
297307
src/class/appmanager.h
298308
src/class/appmanager.cpp
299309
src/class/angelscripthelper.h
300-
src/class/qascodeparser.h
301-
src/class/qascodeparser.cpp
302310
src/class/ascompletion.cpp
303311
src/class/ascompletion.h
304312
src/class/asbuilder.h

lang/zh_CN/winghex_zh_CN.ts

Lines changed: 24 additions & 285 deletions
Large diffs are not rendered by default.

lang/zh_TW/winghex_zh_TW.ts

Lines changed: 24 additions & 285 deletions
Large diffs are not rendered by default.

src/class/asbuilder.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ int asBuilder::build(asIScriptModule *module) {
3232

3333
module->ResetGlobalVars();
3434

35-
for (auto &mod : modifiedScripts) {
36-
module->AddScriptSection(mod.section.toUtf8(), mod.script.data(),
37-
mod.script.size());
35+
for (auto &mod : scriptData()) {
36+
auto script = mod.result.script.toUtf8();
37+
module->AddScriptSection(mod.section.toUtf8(), script.data(),
38+
script.size());
3839
}
3940

4041
int r = module->Build();

0 commit comments

Comments
 (0)