diff --git a/WsNovelParser.sln b/WsNovelParser.sln index 1fdd6fa..8cc136e 100644 --- a/WsNovelParser.sln +++ b/WsNovelParser.sln @@ -23,6 +23,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{8548B2EE-059F-40ED-B393-9513E6095930}" ProjectSection(SolutionItems) = preProject 报告20240618-1929.diagsession = 报告20240618-1929.diagsession + 报告20240619-1206.diagsession = 报告20240619-1206.diagsession EndProjectSection EndProject Global diff --git a/WsNovelParser/WsNovelParser.vcxproj b/WsNovelParser/WsNovelParser.vcxproj index 444933f..e3c07d6 100644 --- a/WsNovelParser/WsNovelParser.vcxproj +++ b/WsNovelParser/WsNovelParser.vcxproj @@ -43,7 +43,7 @@ 5.12.11_msvc2017_64 - core + core;xml release @@ -66,16 +66,23 @@ nsc + $(SolutionDir)libToken;$(SolutionDir)libSyntax;$(SolutionDir)libParse;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + nsc libToken.lib;libSyntax.lib;libParse.lib;%(AdditionalDependencies) - stdcpp20 - /Zc:char8_t- %(AdditionalOptions) + Default + + + libToken.lib;libSyntax.lib;libParse.lib;%(AdditionalDependencies);$(Qt_LIBS_) + + true diff --git a/WsNovelParser/WsNovelParser.vcxproj.user b/WsNovelParser/WsNovelParser.vcxproj.user index f29c08d..fe96f15 100644 --- a/WsNovelParser/WsNovelParser.vcxproj.user +++ b/WsNovelParser/WsNovelParser.vcxproj.user @@ -5,13 +5,18 @@ WindowsLocalDebugger --path "D:\手作小说\科学+修仙+创造世界" + + --path "D:\手作小说\科学+修仙+创造世界" + WindowsLocalDebugger + $(SolutionDir)$(Platform)\$(Configuration)\ + - 2024-06-19T03:41:21.9792038Z + 2024-06-19T04:38:19.5151106Z - 2024-06-19T03:41:22.1198275Z + 2024-06-19T04:51:19.6494512Z diff --git a/WsNovelParser/htmlprint.cpp b/WsNovelParser/htmlprint.cpp index 5d705ac..0d5c172 100644 --- a/WsNovelParser/htmlprint.cpp +++ b/WsNovelParser/htmlprint.cpp @@ -163,8 +163,7 @@ void FragmentRef::buildSliceHTML(QDomElement& dom_parent) const { [&](QDomElement& parent_element, const QList> children) { for (auto& child : children) { auto doc_ins = parent_element.ownerDocument(); - switch ((NovelNode)child->element()->typeMark()) - { + switch ((NovelNode)child->element()->typeMark()) { case NovelNode::TextSection: { auto text_inst = std::dynamic_pointer_cast(child->element()); auto dom_p = doc_ins.createElement("p"); diff --git a/libParse/libParse.vcxproj b/libParse/libParse.vcxproj index c491c08..42abeb7 100644 --- a/libParse/libParse.vcxproj +++ b/libParse/libParse.vcxproj @@ -65,16 +65,22 @@ $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)libToken\;$(SolutionDir)libSyntax\;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) - libToken.lib;libSyntax.lib;%(AdditionalDependencies) + libToken.lib;libSyntax.lib;%(AdditionalDependencies);$(Qt_LIBS_) - stdcpp20 - /Zc:char8_t- %(AdditionalOptions) + Default + + + libToken.lib;libSyntax.lib;%(AdditionalDependencies);$(Qt_LIBS_) + + true diff --git a/libParse/libParse.vcxproj.user b/libParse/libParse.vcxproj.user index 1471a2c..c214441 100644 --- a/libParse/libParse.vcxproj.user +++ b/libParse/libParse.vcxproj.user @@ -5,12 +5,12 @@ WindowsLocalDebugger - 2024-06-19T03:41:22.1667034Z + 2024-06-19T04:38:19.8243177Z - 2024-06-19T03:41:22.2604525Z + 2024-06-19T04:38:19.9003239Z diff --git a/libParse/parse_novel.cpp b/libParse/parse_novel.cpp index 9572168..b126154 100644 --- a/libParse/parse_novel.cpp +++ b/libParse/parse_novel.cpp @@ -10,8 +10,8 @@ using namespace ast_gen; using namespace lib_syntax; using namespace example_novel; -void FragmentExistsCheck::exists_check(std::shared_ptr root, - std::shared_ptr target) const { +void FragmentExistsCheck::exists_check(std::shared_ptr root, + std::shared_ptr target) const { if (target->element()->typeMark() == (int)NovelNode::FragmentRefer) { auto refer = std::dynamic_pointer_cast(target->element()); auto signature = refer->storyRefer() + u8"&" + refer->fragmentRefer(); @@ -23,15 +23,15 @@ void FragmentExistsCheck::exists_check(std::shared_ptr root) const { - this->exists_check(std::dynamic_pointer_cast(root->element()), root); +void FragmentExistsCheck::validCheck(std::shared_ptr root) const { + this->exists_check(std::dynamic_pointer_cast(root->element()), root); } QString FragmentExistsCheck::name() const { return u8"FragmentExistsCheck"; } -QList> example_novel::FragmentGraphCheck::refers_cycle_check( +QList> FragmentGraphCheck::refers_cycle_check( std::shared_ptr item, QList> prevs) const { if (prevs.contains(item)) { return prevs << item; @@ -60,7 +60,7 @@ std::shared_ptr FragmentGraphCheck::getElement(const QStrin return elements_store[signature]; } -QList> example_novel::FragmentGraphCheck::getHangoutNodes() { +QList> FragmentGraphCheck::getHangoutNodes() { QList> values; for (auto node_item : elements_store) { @@ -76,7 +76,7 @@ QList> example_novel::FragmentGraphCheck::g return values; } -bool example_novel::FragmentGraphCheck::nodeDismantle(std::shared_ptr inst) { +bool FragmentGraphCheck::nodeDismantle(std::shared_ptr inst) { bool flag = false; for (auto item : inst->nextList()) { @@ -87,11 +87,11 @@ bool example_novel::FragmentGraphCheck::nodeDismantle(std::shared_ptr root) const +void FragmentGraphCheck::validCheck(std::shared_ptr root) const { - std::function>(std::shared_ptr)> story_peak - = [&](std::shared_ptr root)->QList> { - QList> return_temp; + std::function>(std::shared_ptr)> story_peak + = [&](std::shared_ptr root)->QList> { + QList> return_temp; auto type_mark = (NovelNode)root->element()->typeMark(); if (type_mark == NovelNode::StoryDefine) { @@ -146,14 +146,14 @@ void FragmentGraphCheck::validCheck(std::shared_ptr node)->QString { + auto get_name = [](std::shared_ptr node)->QString { switch (node->element()->typeMark()) { case (int)NovelNode::FragmentDefine: { - auto def_node = std::dynamic_pointer_cast(node->element()); + auto def_node = std::dynamic_pointer_cast(node->element()); return def_node->signature(); }break; case (int)NovelNode::FragmentRefer: { - auto ref_node = std::dynamic_pointer_cast(node->element()); + auto ref_node = std::dynamic_pointer_cast(node->element()); return ref_node->referSignature(); }break; } @@ -199,7 +199,7 @@ void FragmentGraphCheck::validCheck(std::shared_ptr$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)libToken\;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) - libToken.lib;%(AdditionalDependencies) + libToken.lib;%(AdditionalDependencies);$(Qt_LIBS_) - stdcpp20 - /Zc:char8_t- %(AdditionalOptions) + Default + + + libToken.lib;%(AdditionalDependencies);$(Qt_LIBS_) + + true diff --git a/libSyntax/libSyntax.vcxproj.user b/libSyntax/libSyntax.vcxproj.user index 79b07d0..021ef64 100644 --- a/libSyntax/libSyntax.vcxproj.user +++ b/libSyntax/libSyntax.vcxproj.user @@ -5,12 +5,12 @@ WindowsLocalDebugger - 2024-06-19T03:41:22.4167016Z + 2024-06-19T04:38:19.7103238Z - 2024-06-19T03:41:22.5104526Z + 2024-06-19T04:38:19.7823175Z diff --git a/libToken/libToken.vcxproj b/libToken/libToken.vcxproj index b37c693..67c06e5 100644 --- a/libToken/libToken.vcxproj +++ b/libToken/libToken.vcxproj @@ -66,13 +66,12 @@ - stdcpp20 + Default - stdcpp20 - /Zc:char8_t- %(AdditionalOptions) + Default diff --git a/libToken/libToken.vcxproj.user b/libToken/libToken.vcxproj.user index 2a2203b..e606f13 100644 --- a/libToken/libToken.vcxproj.user +++ b/libToken/libToken.vcxproj.user @@ -2,12 +2,12 @@ - 2024-06-19T03:41:22.3229534Z + 2024-06-19T04:38:19.9403175Z - 2024-06-19T03:41:22.3698305Z + 2024-06-19T04:38:20.0313172Z