重构，组织解析类

DesParser/DesParser.pro

@@ -8,7 +8,7 @@ CONFIG -= app_bundle
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \
-        LexicalBase.cpp \
+        LexFoundation.cpp \
         ParseFrame.cpp \
         StoryChainDocumentParser.cpp \
         StoryUnitDocumentParser.cpp \
@@ -28,7 +28,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
 
 HEADERS += \
-    LexicalBase.h \
+    LexFoundation.h \
     ParseFrame.h \
     StoryChainDocumentParser.h \
     StoryUnitDocumentParser.h \

DesParser/LexFoundation.cpp

@@ -1,9 +1,9 @@
-#include "LexicalBase.h"
+#include "LexFoundation.h"
 #include <tuple>
 
 using namespace Lex;
 
-LexicalBase::LexicalBase(QList<LexUnit> seqence, const QString UnknownToken)
+LexFoundation::LexFoundation(QList<LexDef> seqence, const QString UnknownToken)
 	: unknown_token(UnknownToken), lexical_seq(seqence)
 {
 	empty_seq << '\t' << '\b' << ' ' << '\r' << EOF;
@@ -12,7 +12,7 @@ LexicalBase::LexicalBase(QList<LexUnit> seqence, const QString UnknownToken)
 typedef int lexunit_index;
 typedef int match_start;
 
-QList<LexResult> LexicalBase::push(int row, int col, const QChar w)
+QList<LexResult> LexFoundation::push(int row, int col, const QChar w)
 {
 	QList<LexResult> result;
 
@@ -44,7 +44,7 @@ QList<LexResult> LexicalBase::push(int row, int col, const QChar w)
 	return mid_result;
 }
 
-QList<LexResult> LexicalBase::lexical_parse(const QString & segment)
+QList<LexResult> LexFoundation::lexical_parse(const QString & segment)
 {
 	// 获取匹配词法分析
 	QList<LexResult> result;

DesParser/LexFoundation.h

@@ -4,12 +4,12 @@
 #include <QList>
 
 namespace Lex {
-	class LexicalBase;
+    class LexFoundation;
 
 	/**
 	 * 解析基准定义单元.
 	 */
-	struct LexUnit 
+    struct LexDef
 	{
 		QString TokenType;									// Token字符
 		QString RegExpression;								// 词法解析表达式
@@ -24,7 +24,7 @@ namespace Lex {
 		QString Text;											// 内容
 		int StartRow, StartCol, EndRow, EndCol;	// 波及范围
 
-		friend class LexicalBase;
+        friend class LexFoundation;
 	private:
 		int index_at_segment;
 	};
@@ -48,11 +48,11 @@ namespace Lex {
 	/**
 	 * 基础词法分析器.
 	 */
-	class LexicalBase
+    class LexFoundation
 	{
 	public:
-		explicit LexicalBase(QList<LexUnit> seqence, const QString UnknownToken);
+        explicit LexFoundation(QList<LexDef> seqence, const QString UnknownToken);
-		virtual ~LexicalBase() = default;
+        virtual ~LexFoundation() = default;
 
 		/**
 		 * 词法分析器累积解析单个字符流.
@@ -69,7 +69,7 @@ namespace Lex {
 		QList<QChar> empty_seq;
 
 		QList<XChar> code_acc; 
-		QList<LexUnit> lexical_seq;
+        QList<LexDef> lexical_seq;
 
 		QList<LexResult> lexical_parse(const QString &segment);
 	};

DesParser/ParseFrame.cpp

@@ -2,17 +2,19 @@
 #include "WordsPeak.h"
 
 using namespace Parse;
+using namespace Parse::Result;
+using namespace Syntax;
 using namespace Lex;
 
-Parse::ParseFrame::ParseFrame() {}
+ParseFrame::ParseFrame() {}
 
-QList<DesNode*> Parse::ParseFrame::analysis(DocCore*doc, const QString & path)
+QList<DesNode*> ParseFrame::analysis(DocCore*doc, const QString & path)
 {
-	ForwardStream stream;
+    ExStream stream;
 	if (stream.initSource(path))
 		return QList<DesNode*>();
 
-	LexicalBase token_s(this->token_seqs, this->unknown_token);
+    LexFoundation token_s(this->token_seqs, this->unknown_token);
 
 	QList<LexResult> lex_seqence;
 	std::tuple<int, int, QChar> temp;
@@ -42,18 +44,18 @@ QList<DesNode*> Parse::ParseFrame::analysis(DocCore*doc, const QString & path)
 	return xrets;
 }
 
-void Parse::ParseFrame::appendTokensDefine(QList<LexUnit> seqs, const QString & unknown_token)
+void ParseFrame::appendTokensDefine(QList<LexDef> seqs, const QString & unknown_token)
 {
 	this->unknown_token = unknown_token;
 	token_seqs.append(seqs);
 }
 
-void Parse::ParseFrame::appendParser(SyntaxParser * u)
+void ParseFrame::appendParser(SyntaxParser * u)
 {
 	cascade_parsers << u;
 }
 
-Parse::ParseResult Parse::ParseFrame::inner_parse(QList<LexResult> &lex_seqence, QList<SyntaxParser*> parsers, QList<DesNode*> &nodes_out)
+ParseResult ParseFrame::inner_parse(QList<LexResult> &lex_seqence, QList<SyntaxParser*> parsers, QList<DesNode*> &nodes_out)
 {
 	QList<DesNode*> nodes;
 

DesParser/ParseFrame.h

@@ -3,7 +3,7 @@
 #include <QList>
 #include "SyntaxBase.h"
 
-namespace Parse
+namespace Syntax
 {
 	/**
 	 * 基础解析器框架.
@@ -14,17 +14,19 @@ namespace Parse
 		explicit ParseFrame();
 		virtual ~ParseFrame() = default;
 
-		QList<DesNode*> analysis(DocCore *doc, const QString &path);
+        QList<Parse::Result::DesNode*> analysis(Parse::Result::DocCore *doc, const QString &path);
 
 	protected:
-		void appendTokensDefine(QList<Lex::LexUnit> seqs, const QString &unknown_token);
+        void appendTokensDefine(QList<Lex::LexDef> seqs, const QString &unknown_token);
-		void appendParser(SyntaxParser* u);
+        void appendParser(Syntax::SyntaxParser* u);
 
 	private:
 		QString unknown_token;
-		QList<Lex::LexUnit> token_seqs;
+        QList<Lex::LexDef> token_seqs;
         QList<SyntaxParser*> cascade_parsers;
 
-		Parse::ParseResult Parse::ParseFrame::inner_parse(QList<Lex::LexResult> &lex_seqence, QList<SyntaxParser*> parsers, QList<DesNode*> &nodes_out);
+        ParseResult ParseFrame::inner_parse(QList<Lex::LexResult> &lex_seqence,
+                                                          QList<Syntax::SyntaxParser*> parsers,
+                                                          QList<Parse::Result::DesNode*> &nodes_out);
 	};
 }

DesParser/StoryChainDocumentParser.cpp

@@ -4,6 +4,7 @@ using namespace Parse;
 using namespace Lex;
 using namespace Syntax;
 using namespace Syntax::Defines;
+using namespace Parse::Result;
 
 // storychain 解析器================================================
 NodeStoryChainParser::NodeStoryChainParser(ProjectCore *core)

DesParser/StoryChainDocumentParser.h

@@ -17,7 +17,7 @@ namespace Parse
 	/**
 	 * 故事脉络节点定义.
 	 */
-	class NodeStoryChain : public NamedNode
+    class NodeStoryChain : public Result::NamedNode
 	{
 	public:
 		/**
@@ -25,7 +25,7 @@ namespace Parse
 		 * 
 		 * \param src_path 源文件路径
 		 */
-		explicit NodeStoryChain(DocCore *doc, const QString &name);
+        explicit NodeStoryChain(Result::DocCore *doc, const QString &name);
 		virtual ~NodeStoryChain() = default;
 
 		/**
@@ -41,7 +41,7 @@ namespace Parse
 			return 0;
 		}
 		virtual QString name() const override;
-		virtual DocCore * document() const override;
+        virtual Result::DocCore * document() const override;
 		virtual int typeValue() const override;
 		virtual DesNode * parent() const override;
 		virtual void appendChild(DesNode * ins) override;
@@ -50,7 +50,7 @@ namespace Parse
 		virtual QString toString() const override;
 
 	private:
-		DocCore *const doc_store;
+        Result::DocCore *const doc_store;
 		QString name_store;
 		QList<DesNode*> children_nodes;
 	};
@@ -61,19 +61,19 @@ namespace Parse
 	class NodeStoryChainParser : public Syntax::XSyntaxBase
 	{
 	public:
-		NodeStoryChainParser(ProjectCore *core);
+        NodeStoryChainParser(Result::ProjectCore *core);
 		virtual ~NodeStoryChainParser() = default;
 
-		ProjectCore* project() const;
+        Result::ProjectCore* project() const;
 
 	private:
-		ProjectCore *pjt_ref;
+        Result::ProjectCore *pjt_ref;
 	};
 
 	/**
 	 * 故事节点.
 	 */
-	class NodeStoryPoint : public NamedNode
+    class NodeStoryPoint : public Result::NamedNode
 	{
 	public:
 		explicit NodeStoryPoint(NodeStoryChain *chain, const QString &name);
@@ -90,7 +90,7 @@ namespace Parse
 		inline virtual int depth() const override {
 			return chain_store->depth() + 1;
 		}
-		virtual DocCore * document() const override;
+        virtual Result::DocCore * document() const override;
 		virtual int typeValue() const override;
 		virtual DesNode * parent() const override;
 		virtual void appendChild(DesNode * ins) override;
@@ -115,7 +115,7 @@ namespace Parse
 		virtual ~NodeStoryPointParser() = default;
 
 		NodeStoryChainParser* storyChainParser() const;
-		virtual DocCore* docRef() const override;
+        virtual Result::DocCore* docRef() const override;
 
 	private:
 		NodeStoryChainParser *const parent_parser;
@@ -124,7 +124,7 @@ namespace Parse
 	/**
 	 * 节点描述内容节点.
 	 */
-	class NodeStoryDesGroup : public DesNode
+    class NodeStoryDesGroup : public Result::DesNode
 	{
 	public:
 		NodeStoryDesGroup(DesNode *parent_refer);
@@ -134,7 +134,7 @@ namespace Parse
 		inline virtual int depth() const override {
 			return parent_refer->depth() + 1;
 		}
-		virtual DocCore * document() const override;
+        virtual Result::DocCore * document() const override;
 		virtual int typeValue() const override;
 		virtual DesNode * parent() const override;
 		virtual void appendChild(DesNode * ins) override;
@@ -160,7 +160,7 @@ namespace Parse
 	/**
 	 * 描述内容文字块.
 	 */
-	class NodeStoryDesBlock : public DesNode
+    class NodeStoryDesBlock : public Result::DesNode
 	{
 	public:
         explicit NodeStoryDesBlock(DesNode *parent_node, const QString &text);
@@ -170,7 +170,7 @@ namespace Parse
 		inline virtual int depth() const override {
 			return parent_refer->depth() + 1;
 		}
-		virtual DocCore * document() const override;
+        virtual Result::DocCore * document() const override;
 		virtual int typeValue() const override;
 		virtual DesNode * parent() const override;
 		virtual void appendChild(DesNode * ins) override;
@@ -183,10 +183,10 @@ namespace Parse
 		QString text_block;
 	};
 
-	class StoryChainDocumentParser : public ParseFrame
+    class StoryChainDocumentParser : public Syntax::ParseFrame
 	{
 	public:
-		StoryChainDocumentParser(ProjectCore *pjt);
+        StoryChainDocumentParser(Result::ProjectCore *pjt);
 		virtual ~StoryChainDocumentParser() = default;
 	};
 }

DesParser/StoryUnitDocumentParser.cpp

@@ -1,6 +1,7 @@
 #include "StoryUnitDocumentParser.h"
 
 using namespace Parse;
+using namespace Parse::Result;
 using namespace Lex;
 using namespace Syntax;
 using namespace Syntax::Defines;
@@ -95,7 +96,7 @@ QString NodeStoryFragment::toString() const
     QString rets = QString(depth(), ' ') + "#情节 " + name() + "{";
 	for (auto cin : children_nodes)
 		rets += "\n" + QString(depth(), ' ') + cin->toString();
-	return rets + "}";
+    return rets + "\n"+QString(depth(), ' ') + "}";
 }
 
 QString NodeStoryFragment::name() const

DesParser/StoryUnitDocumentParser.h

@@ -7,10 +7,10 @@ namespace Parse {
 	/**
 	 * 故事单元.
 	 */
-	class NodeStoryUnit : public NamedNode
+    class NodeStoryUnit : public Result::NamedNode
 	{
 	public:
-		explicit NodeStoryUnit(DocCore *doc, const QString &name);
+        explicit NodeStoryUnit(Result::DocCore *doc, const QString &name);
 		virtual ~NodeStoryUnit() = default;
 
 		// 通过 NamedNode
@@ -20,7 +20,7 @@ namespace Parse {
 		inline virtual int depth() const override {
 			return 0;
 		}
-		virtual DocCore * document() const override;
+        virtual Result::DocCore * document() const override;
 		virtual int typeValue() const override;
 		virtual DesNode * parent() const override;
 		virtual void appendChild(DesNode * ins) override;
@@ -29,7 +29,7 @@ namespace Parse {
 		virtual QString toString() const override;
 
 	private:
-		DocCore *doc_ref;
+        Result::DocCore *doc_ref;
 		QString name_store;
 
 		QList<DesNode*> children_nodes;
@@ -39,18 +39,18 @@ namespace Parse {
 	class NodeStoryUnitParser : public Syntax::XSyntaxBase
 	{
 	public:
-		NodeStoryUnitParser(ProjectCore *core);
+        NodeStoryUnitParser(Result::ProjectCore *core);
 
-		ProjectCore* project() const;
+        Result::ProjectCore* project() const;
 
 	private:
-		ProjectCore *const pjt_core;
+        Result::ProjectCore *const pjt_core;
 	};
 
 	/**
 	 * 故事情节节点.
 	 */
-	class NodeStoryFragment : public NamedNode
+    class NodeStoryFragment : public Result::NamedNode
 	{
 	public:
 		explicit NodeStoryFragment(NodeStoryUnit* unit, const QString &name);
@@ -60,7 +60,7 @@ namespace Parse {
 		inline virtual int depth() const override {
 			return unit_ins->depth() + 1;
 		}
-		virtual DocCore * document() const override;
+        virtual Result::DocCore * document() const override;
 		virtual int typeValue() const override;
 		virtual DesNode * parent() const override;
 		virtual void appendChild(DesNode * ins) override;
@@ -85,7 +85,7 @@ namespace Parse {
 		NodeStoryFragmentParser(NodeStoryUnitParser *pparser);
 
 		NodeStoryUnitParser * nodeStoryUnitParser() const;
-		DocCore * docRef() const;
+        Result::DocCore * docRef() const;
 
 	private:
 		NodeStoryUnitParser *const parent_parser;
@@ -94,7 +94,7 @@ namespace Parse {
 	/**
 	 * 故事脉络节点引用.
 	 */
-    class NodeStoryPointRefer : public DesNode
+    class NodeStoryPointRefer : public Result::DesNode
 	{
 	public:
         explicit NodeStoryPointRefer(DesNode *parent, const QString &chain, const QString &point);
@@ -104,7 +104,7 @@ namespace Parse {
 		inline virtual int depth() const override {
 			return parent_ins->depth() + 1;
 		}
-		virtual DocCore * document() const override;
+        virtual Result::DocCore * document() const override;
 		virtual int typeValue() const override;
 		virtual DesNode * parent() const override;
 		virtual void appendChild(DesNode * ins) override;
@@ -148,8 +148,12 @@ namespace Parse {
 
 	/**
 	 * 故事情节有序注释，单独解析
+     * #注解 注解名 序列名 值 {
+     *      注解段落
+     *      注解段落
+     * }
 	 */
-	class NodeStoryFragmentComment : public NamedNode
+    class NodeStoryFragmentComment : public Result::NamedNode
 	{
 	public:
 		NodeStoryFragmentComment(DesNode *parent, const QString &order, const QString &name);
@@ -162,7 +166,7 @@ namespace Parse {
 		{
 			return parent_ins->depth() + 1;
 		}
-		virtual DocCore * document() const override;
+        virtual Result::DocCore * document() const override;
 		virtual int typeValue() const override;
 		virtual DesNode * parent() const override;
 		virtual void appendChild(DesNode * ins) override;
@@ -179,9 +183,9 @@ namespace Parse {
 	};
 
 
-	class StoryUnitDocumentParser : public ParseFrame
+    class StoryUnitDocumentParser : public Syntax::ParseFrame
 	{
 	public:
-		StoryUnitDocumentParser(ProjectCore *ins);
+        StoryUnitDocumentParser(Result::ProjectCore *ins);
 	};
 }

DesParser/SyntaxBase.cpp

@@ -3,10 +3,13 @@
 
 using namespace Parse;
 using namespace Lex;
+using namespace Syntax;
+using namespace Parse::Result;
 
-class Unknown : public DesNode
+namespace Parse {
-{
+    class Unknown : public DesNode
-public:
+    {
+    public:
         explicit Unknown(DocCore *ins)
         : doc_store(ins) {}
 
@@ -27,14 +30,14 @@ public:
         {
             return nullptr;
         }
-	virtual void appendChild(DesNode * ins) override
+        virtual void appendChild(DesNode *) override
         {
         }
         virtual QList<DesNode*> children() const override
         {
             return QList<DesNode*>();
         }
-	virtual bool check(QList<QString>& reasons) const override
+        virtual bool check(QList<QString>&) const override
         {
             return true;
         }
@@ -42,88 +45,89 @@ public:
         {
             return QString();
         }
-private:
+    private:
         DocCore *const doc_store;
-};
+    };
 
-Parse::Words::Words(DesNode* host, DocCore *doc, const QString & value, int row, int col)
+}
-	: value_store(value), row_store(row), col_store(col)
+Words::Words(Result::DesNode *host, DocCore *doc, const QString & value, int row, int col)
+    : value_store(value), row_store(row), col_store(col), desnode_store(host), docpresent_store(doc)
 {
 }
 
-int Parse::Words::row() const
+int Words::row() const
 {
 	return row_store;
 }
 
-int Parse::Words::column() const
+int Words::column() const
 {
 	return col_store;
 }
 
-int Parse::Words::length() const
+int Words::length() const
 {
 	return value_store.length();
 }
 
-DesNode * Parse::Words::host() const
+DesNode * Words::host() const
 {
 	return desnode_store;
 }
 
-DocCore * Parse::Words::doc() const
+DocCore * Words::doc() const
 {
 	return docpresent_store;
 }
 
-QString Parse::Words::toString() const
+QString Words::toString() const
 {
 	return value_store;
 }
 
-Parse::DocCore::DocCore(ProjectCore * core, const QString & path)
+DocCore::DocCore(ProjectCore * core, const QString & path)
-	: core_store(core), file_path_store(path), unknown_host(new Unknown(this))
+    : unknown_host(new Unknown(this)), core_store(core), file_path_store(path)
 {
 }
 
-DesNode * Parse::DocCore::unknowns() const
+DesNode * DocCore::unknowns() const
 {
 	return unknown_host;
 }
 
-ProjectCore * Parse::DocCore::project() const
+ProjectCore * DocCore::project() const
 {
 	return core_store;
 }
 
-void Parse::DocCore::rename(const QString & new_name)
+void DocCore::rename(const QString & new_name)
 {
 	file_path_store = new_name;
 }
 
-QString Parse::DocCore::filePath() const
+QString DocCore::filePath() const
 {
 	return file_path_store;
 }
 
-QString Parse::DocCore::fileName() const
+QString DocCore::fileName() const
 {
 	return QFileInfo(file_path_store).fileName();
 }
 
-void Parse::DocCore::clear()
+void DocCore::clear()
 {
 	nodes_store.clear();
 }
 
-int Parse::DocCore::append(Words * ins)
+int DocCore::append(Words * ins)
 {
 	nodes_store << ins;
 
 	return 0;
 }
 
-Words * Parse::DocCore::getWords(int row, int col) const
+Words * DocCore::getWords(int row, int col) const
 {
 	for (auto it : nodes_store)
 		if (it->row() == row && it->column() <= col && it->column() + it->length() >= col)

DesParser/SyntaxBase.h

@@ -3,23 +3,28 @@
 #include <QString>
 #include <functional>
 #include <QList>
-#include "LexicalBase.h"
+#include "LexFoundation.h"
 #include "comndef.h"
 
 namespace Parse 
 {
-	class NamedNode;
+    namespace Result {
-	class DocCore;
         class ProjectCore;
         class DesNode;
+        class NamedNode;
+        class DocCore;
+    }
 
+
+    namespace Result
+    {
         /**
          * 词语块，可以通过文档未知直接获取.
          */
         class Words
         {
         public:
-		explicit Words(DesNode* host, DocCore *doc, const QString &value, int row, int col);
+            explicit Words(Result::DesNode* host, Result::DocCore *doc, const QString &value, int row, int col);
             virtual ~Words() = default;
 
             /**
@@ -48,14 +53,14 @@ namespace Parse
              *
              * \return
              */
-		virtual DesNode* host() const;
+            virtual Result::DesNode* host() const;
 
             /**
              * 隶属文档实例.
              *
              * \return 实例
              */
-		virtual DocCore* doc() const;
+            virtual Result::DocCore* doc() const;
 
             /**
              * 获取文本内容.
@@ -67,8 +72,8 @@ namespace Parse
         private:
             QString value_store;
             int row_store, col_store;
-		DesNode *desnode_store;
+            Result::DesNode *desnode_store;
-		DocCore *docpresent_store;
+            Result::DocCore *docpresent_store;
         };
 
         /**
@@ -135,10 +140,11 @@ namespace Parse
             virtual QString toString() const = 0;
         };
 
+
         /**
          * 声明描述节点.
          */
-	class NamedNode : public DesNode
+        class NamedNode : public  Result::DesNode
         {
         public:
             virtual ~NamedNode() = default;
@@ -152,7 +158,6 @@ namespace Parse
 
         };
 
-
         /**
          * 文档实例.
          */
@@ -167,7 +172,7 @@ namespace Parse
              *
              * \return
              */
-		DesNode* unknowns() const;
+            Result::DesNode* unknowns() const;
 
             /**
              * 项目实例.
@@ -221,7 +226,7 @@ namespace Parse
             Words* getWords(int row, int col) const;
 
         private:
-		DesNode *const unknown_host;
+            Result::DesNode *const unknown_host;
             ProjectCore *const core_store;
             QString file_path_store;
             QList<Words*> nodes_store;
@@ -245,14 +250,14 @@ namespace Parse
              * \param file_path 文档路径
              * \return 实例
              */
-		virtual DocCore* queryDocument(const QString &file_path) const;
+            virtual Parse::Result::DocCore* queryDocument(const QString &file_path) const;
-		virtual void replaceDocument(DocCore *ins);
+            virtual void replaceDocument(Parse::Result::DocCore *ins);
 
-		virtual DesNode* queryChain(const QString & name) const;
+            virtual Parse::Result::DesNode* queryChain(const QString & name) const;
-		virtual DesNode* queryPoint(NamedNode* chain, const QString &name) const;
+            virtual Parse::Result::DesNode* queryPoint(Parse::Result::NamedNode* chain, const QString &name) const;
 
-		virtual DesNode* queryUnit(const QString &name) const;
+            virtual Parse::Result::DesNode* queryUnit(const QString &name) const;
-		virtual DesNode* queryFragment(NamedNode *unit, const QString &name) const;
+            virtual Parse::Result::DesNode* queryFragment(Parse::Result::NamedNode *unit, const QString &name) const;
 
             /**
              * 查询指定顺序下的节点序列.
@@ -261,10 +266,17 @@ namespace Parse
              * \param unit 指定单元下的序列，nullptr代表全局范围
              * \return
              */
-		virtual QList<NamedNode*> queryFragmentsOrderby(const QString &type, NamedNode* unit = nullptr) const;
+            virtual QList<Parse::Result::NamedNode*> queryFragmentsOrderby(const QString &type, Parse::Result::NamedNode* unit = nullptr) const;
 
         };
 
+
+    }
+}
+
+namespace Syntax {
+
+
     /**
      * 解析结果标志.
      */
@@ -289,14 +301,14 @@ namespace Parse
          *
          * \param ins
          */
-		virtual void docActive(DocCore *ins) = 0;
+        virtual void docActive(Parse::Result::DocCore *ins) = 0;
 
         /**
          * 当前指向的文档.
          *
          * \return 文档实例
          */
-		virtual DocCore* docRef() const = 0;
+        virtual Parse::Result::DocCore* docRef() const = 0;
         /**
          * 适配当前解析.
          *
@@ -331,7 +343,7 @@ namespace Parse
          *
          * \return
          */
-		virtual DesNode* currNode() const = 0;
+        virtual Parse::Result::DesNode* currNode() const = 0;
 
     public:
         /**

DesParser/WordsPeak.cpp

@@ -1,19 +1,19 @@
 #include "WordsPeak.h"
 #include <QDebug>
 
-using namespace Parse;
+using namespace Lex;
 
-ForwardStream::ForwardStream() :file_target(nullptr), text_input(nullptr),
+ExStream::ExStream() :file_target(nullptr), text_input(nullptr),
 current_line(""), current_row(-1), current_col(0) {}
 
-ForwardStream::~ForwardStream() {
+ExStream::~ExStream() {
 	if (file_target)
 		delete file_target;
 	if (text_input)
 		delete text_input;
 }
 
-int ForwardStream::initSource(const QString & path)
+int ExStream::initSource(const QString & path)
 {
 	if (file_target)
 		delete file_target;
@@ -31,7 +31,7 @@ int ForwardStream::initSource(const QString & path)
 	return 0;
 }
 
-std::tuple<ForwardStream::n_row, ForwardStream::n_col, QChar> Parse::ForwardStream::read()
+std::tuple<ExStream::n_row, ExStream::n_col, QChar> ExStream::read()
 {
 	if (current_col >= current_line.length()) {
 		if (!text_input->atEnd()) {

DesParser/WordsPeak.h

@@ -4,14 +4,14 @@
 #include <QFile>
 #include <tuple>
 
-namespace Parse {
+namespace Lex {
-	class ForwardStream
+    class ExStream
 	{
 	public:
 		typedef int n_row;
 		typedef int n_col;
-		explicit ForwardStream();
+        explicit ExStream();
-		virtual ~ForwardStream();
+        virtual ~ExStream();
 
 		/**
 		 * 初始化文件指向.

DesParser/XSyntaxBase.cpp

@@ -1,6 +1,7 @@
 #include "XSyntaxBase.h"
 
 using namespace Parse;
+using namespace Parse::Result;
 using namespace Syntax;
 using namespace Lex;
 using namespace Defines;

DesParser/XSyntaxBase.h

@@ -2,7 +2,7 @@
 #include <QString>
 #include <QList>
 #include <QHash>
-#include "LexicalBase.h"
+#include "LexFoundation.h"
 #include "SyntaxBase.h"
 
 namespace Syntax 
@@ -178,7 +178,7 @@ namespace Syntax
     {
     public:
         ParseRule(XSyntaxBase *host, const QString &rule_name, unsigned short level,
-                  std::function<Parse::ParseResult(const QList<Lex::LexResult>&, int)>);
+                  std::function<ParseResult(const QList<Lex::LexResult>&, int)>);
         virtual ~ParseRule() = default;
 
         int level() const;
@@ -186,7 +186,7 @@ namespace Syntax
 
         void addExpression(const QString &name, const QList<Defines::Elm> &_defines);
         std::tuple<bool, int> tokensMatch(const QList<Lex::LexResult> &token) const;
-        Parse::ParseResult syntaxTrigger(const QList<Lex::LexResult>& srcs, int count);
+        ParseResult syntaxTrigger(const QList<Lex::LexResult>& srcs, int count);
 
     private:
         XSyntaxBase *const host_ins;
@@ -194,7 +194,7 @@ namespace Syntax
         QString name_store;
         QList<Expression*> expression_list;
 
-        std::function<Parse::ParseResult(const QList<Lex::LexResult>&, int)> exc_store;
+        std::function<ParseResult(const QList<Lex::LexResult>&, int)> exc_store;
     };
 
 
@@ -210,7 +210,7 @@ namespace Syntax
     /**
      * 基础解析器模型.
      */
-    class XSyntaxBase : public Parse::SyntaxParser
+    class XSyntaxBase : public Syntax::SyntaxParser
     {
     public:
         explicit XSyntaxBase(const QString &section, MatchType type = MatchType::Entirely);
@@ -219,19 +219,19 @@ namespace Syntax
         Element *get_element(const QString &name);
 
         // 通过 Parse::SyntaxParser 继承
-        virtual void docActive(Parse::DocCore *ins) override;
+        virtual void docActive(Parse::Result::DocCore *ins) override;
-        virtual Parse::DocCore *docRef() const override;
+        virtual Parse::Result::DocCore *docRef() const override;
         virtual bool applied(const QList<Lex::LexResult>& seqs) override;
         virtual void reset() override;
-        virtual Parse::ParseResult parse(QList<Lex::LexResult>& seqs) override;
+        virtual ParseResult parse(QList<Lex::LexResult>& seqs) override;
-        virtual QList<Parse::SyntaxParser*> children() const override;
+        virtual QList<Syntax::SyntaxParser*> children() const override;
 
-        virtual Parse::DesNode * currNode() const override;
+        virtual Parse::Result::DesNode * currNode() const override;
 
     protected:
-        ParseRule* addRule(const QString &name, unsigned short level, std::function<Parse::ParseResult(const QList<Lex::LexResult>&, int)> exc);
+        ParseRule* addRule(const QString &name, unsigned short level, std::function<ParseResult(const QList<Lex::LexResult>&, int)> exc);
-        virtual void addChild(QList<Parse::SyntaxParser*> parsers) override;
+        virtual void addChild(QList<Syntax::SyntaxParser*> parsers) override;
-        void refocusNode(Parse::DesNode *ins);
+        void refocusNode(Parse::Result::DesNode *ins);
 
         Expression* set_common_expression(const QString &name, const QList<Defines::Elm> &defines);
 
@@ -239,12 +239,12 @@ namespace Syntax
         MatchType target_type;
         QString section_name;
         int current_level;
-        Parse::DesNode *current_node;
+        Parse::Result::DesNode *current_node;
-        Parse::DocCore *src_ref;
+        Parse::Result::DocCore *src_ref;
 
         QHash<QString, Element*> elements_store;
         QHash<QString, Expression*> expressions_store;
-        QList<Parse::SyntaxParser*> child_parsers;
+        QList<Syntax::SyntaxParser*> child_parsers;
 
         QHash<QString, ParseRule*> rule_collect;
     };

DesParser/main.cpp

@@ -7,6 +7,7 @@
 #include "ParseFrame.h"
 
 using namespace Parse;
+using namespace Parse::Result;
 
 int main(int argc, char *argv[])
 {