diff --git a/StoryPresent/cmp_present.cpp b/StoryPresent/cmp_present.cpp index 6ee213b..093957c 100644 --- a/StoryPresent/cmp_present.cpp +++ b/StoryPresent/cmp_present.cpp @@ -88,7 +88,7 @@ void StoryChangePresent::type_change(int idx) { _curr_refslice->loadCurrentSlice(nullptr); _change_model->clear(); - QList> fragms; + QList> fragms; if (!idx) { fragms = base_compare.changeCompare(Type::UpstreamAlter, g_old); } @@ -138,7 +138,7 @@ void StoryChangePresent::fragment_selected(const QModelIndex& item) { auto story_inst = this->base_compare.graphBind()[story_item->text()]; auto fragm_slice = story_inst->getFragment(fragm_item->text()); - auto fragm_def = dynamic_pointer_cast(fragm_slice); + auto fragm_def = dynamic_pointer_cast(fragm_slice); _defn_fragment->loadCurrentSlice(fragm_def); connect(_story_appoint, QOverload::of(&QComboBox::currentIndexChanged), @@ -151,7 +151,7 @@ void StoryChangePresent::fragment_selected(const QModelIndex& item) { } void StoryChangePresent::storyline_selected(const QString& line) { - auto def_fragm = dynamic_pointer_cast(_defn_fragment->currentSlice()); + auto def_fragm = dynamic_pointer_cast(_defn_fragment->currentSlice()); auto flag = _story_appoint->currentData(); for (auto slice : def_fragm->referSlices()) { @@ -215,7 +215,7 @@ QVariant StorylineModel::data(const QModelIndex& index, int role) const { } case SliceType::FragmentDefines: { - auto node = dynamic_pointer_cast(curr_node); + auto node = dynamic_pointer_cast(curr_node); return node->getTextNode()->getLines(); } case SliceType::PointRefers: @@ -257,7 +257,7 @@ bool StorylineModel::setData(const QModelIndex& index, const QVariant& value, in }break; case SliceType::FragmentDefines: { - auto defnode = dynamic_pointer_cast(curr_node); + auto defnode = dynamic_pointer_cast(curr_node); defnode->getTextNode()->setLines(value.toString()); }break; case SliceType::PointRefers: diff --git a/StoryPresent/storyline_compare.cpp b/StoryPresent/storyline_compare.cpp index f782b46..9a72d23 100644 --- a/StoryPresent/storyline_compare.cpp +++ b/StoryPresent/storyline_compare.cpp @@ -13,9 +13,9 @@ const QHash>& compare::Compare return _graph_base; } -QList> +QList> Compare::changeCompare(Type _type, const QHash>& g_old) const { - QList> values; + QList> values; for (auto& type : _graph_base.keys()) { if (g_old.contains(type)) { @@ -26,15 +26,15 @@ Compare::changeCompare(Type _type, const QHash> QList fragmets_define; while (story_new_temp) { if (story_new_temp->type() == SliceType::FragmentDefines) { - auto fragm = std::dynamic_pointer_cast(story_new_temp); + auto fragm = std::dynamic_pointer_cast(story_new_temp); fragmets_define << fragm->name(); } story_new_temp = story_new_temp->nextSlice(); } for (auto fragm : fragmets_define) { - auto fragm_this = std::dynamic_pointer_cast(story_new->getFragment(fragm)); - auto fragm_peer = std::dynamic_pointer_cast(story_old->getFragment(fragm)); + auto fragm_this = std::dynamic_pointer_cast(story_new->getFragment(fragm)); + auto fragm_peer = std::dynamic_pointer_cast(story_old->getFragment(fragm)); if (fragm_peer) { if (_type == Type::FragmentAlter) { if (fragment_check(fragm_this, fragm_peer)) @@ -52,7 +52,7 @@ Compare::changeCompare(Type _type, const QHash> return values; } -bool Compare::fragment_check(std::shared_ptr a, std::shared_ptr b) const +bool Compare::fragment_check(std::shared_ptr a, std::shared_ptr b) const { auto texts_a = a->getTextNode(); auto texts_b = b->getTextNode(); @@ -138,8 +138,8 @@ bool Compare::upstream_check(std::shared_ptr a, std::shared_ptr(prev_slice_a)->getTextNode()->getLines(); - desc_b = std::dynamic_pointer_cast(prev_slice_b)->getTextNode()->getLines(); + desc_a = std::dynamic_pointer_cast(prev_slice_a)->getTextNode()->getLines(); + desc_b = std::dynamic_pointer_cast(prev_slice_b)->getTextNode()->getLines(); } break; } @@ -149,8 +149,8 @@ bool Compare::upstream_check(std::shared_ptr a, std::shared_ptrtype() == SliceType::FragmentDefines) { - auto slices_a = std::dynamic_pointer_cast(a)->referSlices(); - auto slices_b = std::dynamic_pointer_cast(b)->referSlices(); + auto slices_a = std::dynamic_pointer_cast(a)->referSlices(); + auto slices_b = std::dynamic_pointer_cast(b)->referSlices(); if(slices_a.size() != slices_b.size()) return true; diff --git a/StoryPresent/storyline_compare.h b/StoryPresent/storyline_compare.h index 598111c..934f1d8 100644 --- a/StoryPresent/storyline_compare.h +++ b/StoryPresent/storyline_compare.h @@ -17,7 +17,7 @@ namespace compare { const QHash> &graphBind() const; - QList> changeCompare(Type type, + QList> changeCompare(Type type, const QHash>& g_old) const; private: @@ -27,7 +27,7 @@ namespace compare { * @param b 旧情节 * @return true-有变更 */ - bool fragment_check(std::shared_ptr a, std::shared_ptr b) const; + bool fragment_check(std::shared_ptr a, std::shared_ptr b) const; /* * @brief 情节上游内容比较 * @param a 本情节 diff --git a/StoryPresent/storypresent.cpp b/StoryPresent/storypresent.cpp index 66dcc9c..2a6a55b 100644 --- a/StoryPresent/storypresent.cpp +++ b/StoryPresent/storypresent.cpp @@ -50,7 +50,7 @@ void StoryPresent::loadXAST(const QString& ast_path) switch (frag_temp->type()) { case SliceType::FragmentDefines: { - auto arrow_tail = std::dynamic_pointer_cast(frag_temp)->name() + u8"@" + story_line->name(); + auto arrow_tail = std::dynamic_pointer_cast(frag_temp)->name() + u8"@" + story_line->name(); arrows << graph_data::Arrow(arrow_start, arrow_tail); arrow_start = arrow_tail; }break; @@ -85,7 +85,7 @@ void StoryPresent::nodeClickAccept(const QPointF& pos, const QString& node_name) switch (temp_node->type()) { case SliceType::FragmentDefines: { - auto fragm = std::dynamic_pointer_cast(temp_node); + auto fragm = std::dynamic_pointer_cast(temp_node); node_names << QString(u8"%1@%2").arg(fragm->name(), node_name); }break; case SliceType::PointRefers: @@ -113,7 +113,7 @@ void StoryPresent::nodeClickAccept(const QPointF& pos, const QString& node_name) auto splits = node_name.split(u8"@", QString::SkipEmptyParts); auto story_line = this->_story_graph[splits.last()]; auto fragm_slice = story_line->getFragment(splits.first()); - auto fragm_defn = std::dynamic_pointer_cast(fragm_slice); + auto fragm_defn = std::dynamic_pointer_cast(fragm_slice); auto refers = fragm_defn->referSlices(); diff --git a/StoryPresent/xast_parse.cpp b/StoryPresent/xast_parse.cpp index cfd10f3..b24ad33 100644 --- a/StoryPresent/xast_parse.cpp +++ b/StoryPresent/xast_parse.cpp @@ -82,7 +82,7 @@ shared_ptr StoryDefine::getFragment(const QString& name) { auto temp_node = this->firstChild(); while (temp_node) { if (temp_node->type() == SliceType::FragmentDefines) { - if (dynamic_pointer_cast(temp_node)->name() == name) + if (dynamic_pointer_cast(temp_node)->name() == name) return temp_node; } temp_node = temp_node->nextSlice(); @@ -98,24 +98,24 @@ uint StoryDefine::index() const { return this->sort_store; } -FragmentDefine::FragmentDefine(const QString& name, shared_ptr pnode) +PointDefines::PointDefines(const QString& name, shared_ptr pnode) : __DesElement(SliceType::FragmentDefines, static_pointer_cast(pnode)), name_store(name) { } -QString FragmentDefine::name() const { +QString PointDefines::name() const { return name_store; } -QList> FragmentDefine::referSlices() const { +QList> PointDefines::referSlices() const { return this->refs_list; } -void FragmentDefine::appendRefer(shared_ptr slice) { +void PointDefines::appendRefer(shared_ptr slice) { if (this->refs_list.contains(slice)) return; this->refs_list << slice; } -QList FragmentDefine::nameSet() const { +QList PointDefines::nameSet() const { return parentSlice().lock()->nameSet() << name(); } @@ -151,11 +151,11 @@ QString FragmentRefer::fragmentRefer() const { return this->fragment_refers; } -weak_ptr FragmentRefer::referTarget() const { +weak_ptr FragmentRefer::referTarget() const { return this->refer_targets; } -void FragmentRefer::setReferTowards(shared_ptr target) { +void FragmentRefer::setReferTowards(shared_ptr target) { this->refer_targets = target; } @@ -341,9 +341,9 @@ shared_ptr XAST_Parser::text_paragraph_build(shared_ptr<__Collect return inst; } -shared_ptr XAST_Parser::fragment_define_build(shared_ptr pnode, const QDomElement& e) { +shared_ptr XAST_Parser::fragment_define_build(shared_ptr pnode, const QDomElement& e) { auto fname = e.attribute(u8"name"); - auto fragm = make_shared(fname, pnode); + auto fragm = make_shared(fname, pnode); auto temp_elm = e.firstChildElement(); while (!temp_elm.isNull()) { @@ -380,7 +380,7 @@ void XAST_Parser::fragments_plait(QHash> story_ auto refer_inst = static_pointer_cast(slice); auto story_target = story_map[refer_inst->storyRefer()]; auto fragm_target = story_target->getFragment(refer_inst->fragmentRefer()); - auto fragm_cast = static_pointer_cast(fragm_target); + auto fragm_cast = static_pointer_cast(fragm_target); fragm_cast->appendRefer(refer_inst); refer_inst->setReferTowards(fragm_cast); @@ -507,7 +507,7 @@ void xast_parse::XAST_Parser::write_story(std::shared_ptr inst, con this->write_text(1, std::dynamic_pointer_cast(temp), o); break; case SliceType::FragmentDefines: - this->write_fragmdef(1, std::dynamic_pointer_cast(temp), o); + this->write_fragmdef(1, std::dynamic_pointer_cast(temp), o); break; case SliceType::PointRefers: this->write_fragmref(1, std::dynamic_pointer_cast(temp), o); @@ -529,7 +529,7 @@ void xast_parse::XAST_Parser::write_text(int dep, std::shared_ptr out << QString(dep * 2, ' ') << text << "\n"; } -void xast_parse::XAST_Parser::write_fragmdef(int dep, std::shared_ptr inst, QTextStream& out) +void xast_parse::XAST_Parser::write_fragmdef(int dep, std::shared_ptr inst, QTextStream& out) { out << QString(dep * 2, ' ') << QString(u8"{情节 %1\n").arg(inst->name()); this->write_text(dep + 1, inst->getTextNode(), out); diff --git a/StoryPresent/xast_parse.h b/StoryPresent/xast_parse.h index 3b70b33..5033181 100644 --- a/StoryPresent/xast_parse.h +++ b/StoryPresent/xast_parse.h @@ -133,14 +133,14 @@ namespace xast_parse { /// /// 情节定义节点 /// - class FragmentDefine : public __DesElement { + class PointDefines : public __DesElement { private: QString name_store; QList> refs_list; public: - FragmentDefine(const QString& name, std::shared_ptr pnode); - virtual ~FragmentDefine() = default; + PointDefines(const QString& name, std::shared_ptr pnode); + virtual ~PointDefines() = default; virtual QString name() const; @@ -156,7 +156,7 @@ namespace xast_parse { class FragmentRefer : public __DesElement { private: QString story_refers, fragment_refers; - std::weak_ptr refer_targets; + std::weak_ptr refer_targets; public: FragmentRefer(const QString& story, const QString& fragm, std::shared_ptr pnode); @@ -165,8 +165,8 @@ namespace xast_parse { virtual QString storyRefer() const; virtual QString fragmentRefer() const; - virtual std::weak_ptr referTarget() const; - virtual void setReferTowards(std::shared_ptr target); + virtual std::weak_ptr referTarget() const; + virtual void setReferTowards(std::shared_ptr target); // IElementSlice virtual QList nameSet() const override; @@ -237,7 +237,7 @@ namespace xast_parse { uint text_sections_count(const QList& elms); std::shared_ptr text_paragraph_build(std::shared_ptr<__CollectionElement> pnode, QList& elms, uint count); - std::shared_ptr fragment_define_build(std::shared_ptr pnode, const QDomElement& e); + std::shared_ptr fragment_define_build(std::shared_ptr pnode, const QDomElement& e); std::shared_ptr fragment_refer_build(std::shared_ptr<__CollectionElement> pnode, const QDomElement& e); void fragments_plait(QHash> story_map, std::shared_ptr reflist); @@ -247,7 +247,7 @@ namespace xast_parse { void write_rank(std::shared_ptr inst, const QDir &odir); void write_story(std::shared_ptr inst, const QDir &odir); void write_text(int dep, std::shared_ptr inst, QTextStream &out); - void write_fragmdef(int dep, std::shared_ptr inst, QTextStream& out); + void write_fragmdef(int dep, std::shared_ptr inst, QTextStream& out); void write_fragmref(int dep, std::shared_ptr inst, QTextStream& out); void write_volume(std::shared_ptr inst, const QDir &odir); diff --git a/WsNovelParser/htmlprint.cpp b/WsNovelParser/htmlprint.cpp index bca5ad6..0e96227 100644 --- a/WsNovelParser/htmlprint.cpp +++ b/WsNovelParser/htmlprint.cpp @@ -236,7 +236,7 @@ QList> Fragment::additionals() const { void Fragment::buildSliceHTML(QDomElement& parent) const { auto syntax_access = this->accessPeers(); - auto fragment_inst = std::dynamic_pointer_cast(syntax_access->element()); + auto fragment_inst = std::dynamic_pointer_cast(syntax_access->element()); auto doc = parent.ownerDocument(); auto dom_fragment = doc.createElement("div"); @@ -264,7 +264,7 @@ void Fragment::buildSliceHTML(QDomElement& parent) const { void Fragment::buildPageHTML(QDomElement& parent) const { auto syntax_access = this->accessPeers(); - auto fragment_inst = std::dynamic_pointer_cast(syntax_access->element()); + auto fragment_inst = std::dynamic_pointer_cast(syntax_access->element()); auto doc = parent.ownerDocument(); auto dom_fragment = doc.createElement("div"); @@ -437,7 +437,7 @@ QString printer::tools_printer::storylines_paint(const QListelements()) { auto fragment_peers = frag->accessPeers()->element(); if (fragment_peers->typeMark() == (int)example_novel::NovelNode::PointDefines) { - auto fragment_elem = std::dynamic_pointer_cast(fragment_peers); + auto fragment_elem = std::dynamic_pointer_cast(fragment_peers); auto node_name = fragment_elem->signature(); node_records[node_name] = frag; @@ -480,7 +480,7 @@ QString printer::tools_printer::volumes_paint(const QListelements()) { auto fragment_peers = frag->accessPeers()->element(); if (fragment_peers->typeMark() == (int)example_novel::NovelNode::PointDefines) { - auto fragment_elem = std::dynamic_pointer_cast(fragment_peers); + auto fragment_elem = std::dynamic_pointer_cast(fragment_peers); node_records[fragment_elem->signature()] = frag; nodes_description += get_node_name(frag) + QString(u8"[label=\"%1\",shape=\"ellipse\"]\n").arg(fragment_elem->name()); } @@ -761,7 +761,7 @@ bool printer::AstGenerate::visit(std::shared_ptr s } auto current_story = element_stack.last(); - auto fragment_node = std::dynamic_pointer_cast(syntax_element->element()); + auto fragment_node = std::dynamic_pointer_cast(syntax_element->element()); auto dom_fragment = doc.createElement(u8"fragment"); current_story.appendChild(dom_fragment); element_stack.append(dom_fragment); diff --git a/libParse/parse_novel.cpp b/libParse/parse_novel.cpp index 47df5fd..4f2d716 100644 --- a/libParse/parse_novel.cpp +++ b/libParse/parse_novel.cpp @@ -126,7 +126,7 @@ void FragmentGraphCheck::validCheck(std::shared_ptr root) c for (auto frag_primitive : fragment_items) { switch (frag_primitive->element()->typeMark()) { case (int)NovelNode::PointDefines: { - auto target_node = std::dynamic_pointer_cast(frag_primitive->element()); + auto target_node = std::dynamic_pointer_cast(frag_primitive->element()); auto finst = std::make_shared(target_node); self->setElement(finst); @@ -158,7 +158,7 @@ void FragmentGraphCheck::validCheck(std::shared_ptr root) c auto get_name = [](std::shared_ptr node)->QString { switch (node->element()->typeMark()) { case (int)NovelNode::PointDefines: { - 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::PointRefers: { @@ -215,9 +215,9 @@ QString FragmentGraphCheck::name() const { return u8"情节网络有效性检查器"; } -FragmentGraphHelper::FragmentGraphHelper(std::shared_ptr node) : node_peer(node) {} +FragmentGraphHelper::FragmentGraphHelper(std::shared_ptr node) : node_peer(node) {} -std::shared_ptr FragmentGraphHelper::nodePeer() const +std::shared_ptr FragmentGraphHelper::nodePeer() const { return this->node_peer; } diff --git a/libParse/parse_novel.h b/libParse/parse_novel.h index 901bcf2..39fa653 100644 --- a/libParse/parse_novel.h +++ b/libParse/parse_novel.h @@ -41,14 +41,14 @@ namespace example_novel { class FragmentGraphHelper : public std::enable_shared_from_this { private: - std::shared_ptr node_peer; + std::shared_ptr node_peer; QList> next_nodes; uint indegree = 0; public: - FragmentGraphHelper(std::shared_ptr node); + FragmentGraphHelper(std::shared_ptr node); - std::shared_ptr nodePeer() const; + std::shared_ptr nodePeer() const; void appendNext(std::shared_ptr node); QList> nextList() const; diff --git a/libSyntax/ast_novel.cpp b/libSyntax/ast_novel.cpp index c673429..473e595 100644 --- a/libSyntax/ast_novel.cpp +++ b/libSyntax/ast_novel.cpp @@ -57,24 +57,24 @@ QString PointRefers::signature() const { } -FragmentDefine::FragmentDefine(std::shared_ptr rule_bind) +PointDefines::PointDefines(std::shared_ptr rule_bind) : AbstractImpl(rule_bind) {} -QString FragmentDefine::name() const { return name_store; } +QString PointDefines::name() const { return name_store; } -void example_novel::FragmentDefine::setName(const QString& nm) +void example_novel::PointDefines::setName(const QString& nm) { this->name_store = nm; } -int FragmentDefine::typeMark() const { return (int)NovelNode::PointDefines; } +int PointDefines::typeMark() const { return (int)NovelNode::PointDefines; } -bool FragmentDefine::isAnonymous() const +bool PointDefines::isAnonymous() const { return false; } -QString FragmentDefine::signature() const { return parent()->signature() + u8"&" + name(); } +QString PointDefines::signature() const { return parent()->signature() + u8"&" + name(); } StoryDefine::StoryDefine(std::shared_ptr rule_bind) diff --git a/libSyntax/ast_novel.h b/libSyntax/ast_novel.h index b487919..4545ff3 100644 --- a/libSyntax/ast_novel.h +++ b/libSyntax/ast_novel.h @@ -67,9 +67,9 @@ namespace example_novel { QString story_refs, fragment_ref; }; - class LIBSYNTAX_EXPORT FragmentDefine : public AbstractImpl { + class LIBSYNTAX_EXPORT PointDefines : public AbstractImpl { public: - FragmentDefine(std::shared_ptr rule_bind); + PointDefines(std::shared_ptr rule_bind); QString name() const; void setName(const QString& nm); diff --git a/libSyntax/syntax_novel.cpp b/libSyntax/syntax_novel.cpp index 8fb35d2..70b35d0 100644 --- a/libSyntax/syntax_novel.cpp +++ b/libSyntax/syntax_novel.cpp @@ -47,14 +47,14 @@ auto decl_expr = ElementRule(u8"decl_section", (int)NovelExprs::DES })) ); -void frags_nmset(std::shared_ptr inst, std::shared_ptr token) { +void frags_nmset(std::shared_ptr inst, std::shared_ptr token) { inst->setName(token->content()); } -auto fragment_decl = ElementRule(u8"fragment_define", (int)NovelExprs::FRAG_DEFINES).reloadRule( +auto fragment_decl = ElementRule(u8"fragment_define", (int)NovelExprs::FRAG_DEFINES).reloadRule( std::make_shared(Rules{ - MR(FragmentDefine, leftb), MR(FragmentDefine, frag_key), MER(FragmentDefine, frags_nmset, name_text) } << + MR(PointDefines, leftb), MR(PointDefines, frag_key), MER(PointDefines, frags_nmset, name_text) } << OptR(decl_expr) << - MR(FragmentDefine, rightb) + MR(PointDefines, rightb) )); void frags_snm_set(std::shared_ptr inst, std::shared_ptr token) {