Grammar换成Lexer，Grammar用作生成AST Tree

README.md

@@ -12,9 +12,9 @@
 ## src目录解析
 
 - `AST` 语法树
-- `Grammar` 语法器，提供Token识别的规则及种类
+- `Grammar` 语法器，解析`Token`供`Tokenizer`读取使用
 - `Output` 输出器，将解析的内容输出（并不执行）
-- `Lexer` 词法分析器，二次解析`Token`供`Tokenizer`读取使用
+- `Lexer` 词法分析器，提供Token识别的规则及种类
 - `Parser` 语法解析器，生成语法树
 - `Reader` 读取器，供`Lexer`读取使用
 - `Token` 所有的Token

src/Grammar/DefaultGrammar.php

@@ -61,4 +61,4 @@ class DefaultGrammar implements GrammarInterface
     {
         return $this->undefinedTokenType;
     }
-}
+}

src/Grammar/GrammarInterface.php

@@ -24,4 +24,4 @@ interface GrammarInterface
      * @date 2021/1/26 16:27
      */
     public function getUndefinedTokenType(): string;
-}
+}

src/Lexer/DefaultLexer.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * @filename DefaultLexer.php
+ * @author Jerry Yan <792602257@qq.com>
+ * @date 2021/3/17 11:56
+ */
+
+
+namespace JerryYan\DSL\Lexer;
+
+
+use JerryYan\DSL\Token\{
+    Token,
+    TokenCurry,
+    TokenDefine,
+    TokenFake,
+    TokenLogicAnd,
+    TokenLogicEqual,
+    TokenLogicFake,
+    TokenLogicGreater,
+    TokenLogicLess,
+    TokenLogicNot,
+    TokenLogicNotEqual,
+    TokenLogicOr,
+    TokenNumber,
+    TokenUseVariable,
+    TokenVariable
+};
+
+class DefaultLexer implements LexerInterface
+{
+    protected $tokens = [
+        Token::FAKE => TokenFake::class,
+        Token::CURRY => TokenCurry::class,
+        Token::LOGIC_AND => TokenLogicAnd::class,
+        Token::LOGIC_OR => TokenLogicOr::class,
+        Token::LOGIC_NOT => TokenLogicNot::class,
+        Token::LOGIC_EQUAL => TokenLogicEqual::class,
+        Token::LOGIC_NOT_EQUAL => TokenLogicNotEqual::class,
+        Token::LOGIC_GREATER => TokenLogicGreater::class,
+        Token::LOGIC_LESS => TokenLogicLess::class,
+        Token::LOGIC_FAKE => TokenLogicFake::class,
+        Token::VARIABLE => TokenVariable::class,
+        Token::NUMBER => TokenNumber::class,
+        Token::DEFINE => TokenDefine::class,
+        Token::USE_VARIABLE => TokenUseVariable::class,
+    ];
+
+    protected $undefinedTokenType = TokenVariable::class;
+
+    /**
+     * @inheritDoc
+     */
+    public function getTokenTypes(): array
+    {
+        return $this->tokens;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUndefinedTokenType(): string
+    {
+        return $this->undefinedTokenType;
+    }
+
+}

src/Lexer/LexerInterface.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * @filename LexerInterface.php
+ * @author Jerry Yan <792602257@qq.com>
+ * @date 2021/3/17 11:55
+ */
+
+
+namespace JerryYan\DSL\Lexer;
+
+
+interface LexerInterface
+{
+    /**
+     * @return array<string, class-string>
+     * @author Jerry Yan <792602257@qq.com>
+     * @date 2021/1/26 16:27
+     */
+    public function getTokenTypes(): array;
+
+    /**
+     * @return class-string
+     * @author Jerry Yan <792602257@qq.com>
+     * @date 2021/1/26 16:27
+     */
+    public function getUndefinedTokenType(): string;
+}

src/Token/TokenInterface.php

@@ -9,6 +9,12 @@
 namespace JerryYan\DSL\Token;
 
 
+/**
+ * Token链表基础结构
+ * @package JerryYan\DSL\Token
+ * @author Jerry Yan <792602257@qq.com>
+ * @date 2021/2/22 14:00
+ */
 abstract class TokenInterface
 {
     /** @var ?TokenInterface 上一个Token */
@@ -27,11 +33,23 @@ abstract class TokenInterface
         $this->_raw = $original;
     }
 
-    public function setPrevToken(?TokenInterface $token): void
+    /**
+     * 设置链表上级
+     * @param self|null $token
+     * @author Jerry Yan <792602257@qq.com>
+     * @date 2021/2/22 14:01
+     */
+    public function setPrevToken(?self $token): void
     {
         $this->prevToken = $token;
     }
-    public function setNextToken(TokenInterface $token): void
+    /**
+     * 设置链表下级
+     * @param self|null $token
+     * @author Jerry Yan <792602257@qq.com>
+     * @date 2021/2/22 14:02
+     */
+    public function setNextToken(?self $token): void
     {
         $this->nextToken = $token;
     }

src/Tokenizer/Tokenizer.php

@@ -9,7 +9,7 @@
 namespace JerryYan\DSL\Tokenizer;
 
 
-use JerryYan\DSL\Grammar\GrammarInterface;
+use JerryYan\DSL\Lexer\LexerInterface;
 use JerryYan\DSL\Reader\ReaderInterface;
 use JerryYan\DSL\Token\TokenInterface;
 
@@ -21,17 +21,17 @@ class Tokenizer extends TokenizerInterface
     protected $tokenNameMapping = [];
     /** @var array<string, class-string<TokenInterface>> Token别名映射 */
     protected $regexNameMapping = [];
-    /** @var GrammarInterface 语法器 */
-    protected $grammar;
+    /** @var LexerInterface 语法器 */
+    protected $lexer;
 
-    public function __construct(GrammarInterface $grammar)
+    public function __construct(LexerInterface $lexer)
     {
-        $this->grammar = $grammar;
+        $this->lexer = $lexer;
         /**
          * @var string $key
          * @var TokenInterface $token
          */
-        foreach ($grammar->getTokenTypes() as $key=>$token) {
+        foreach ($lexer->getTokenTypes() as $key=> $token) {
             $this->tokenMapping[$key] = $token;
             foreach ($token::$alias as $name) {
                 $this->tokenNameMapping[$name] = $key;
@@ -81,10 +81,10 @@ class Tokenizer extends TokenizerInterface
             }
         }
         if (!isset($this->tokenMapping[$name])) {
-            $undefinedType = $this->grammar->getUndefinedTokenType();
+            $undefinedType = $this->lexer->getUndefinedTokenType();
             return new $undefinedType($originalName);
         } else {
             return new $this->tokenMapping[$name]($originalName);
         }
     }
-}
+}

tests/Output/RawOutputTest.php

@@ -7,7 +7,7 @@
 
 namespace JerryYan\DSL\Test\Output;
 
-use JerryYan\DSL\Grammar\DefaultGrammar;
+use JerryYan\DSL\Lexer\DefaultLexer;
 use JerryYan\DSL\Output\RawOutput;
 use JerryYan\DSL\Reader\StringReader;
 use JerryYan\DSL\Tokenizer\Tokenizer;
@@ -15,12 +15,13 @@ use PHPUnit\Framework\TestCase;
 
 class RawOutputTest extends TestCase
 {
-    private $text = "当 另外那个 与 另外一个 不相等时 或者 那个 和 这个 等于 -0.5 的时候";
+    private $text = " 当 另外那个 与 另外一个 不相等时  或者 那个 和 这个  等于 -0.5 的时候";
+    private $expect = "当 另外那个 与 另外一个 不相等时 或者 那个 和 这个 等于 -0.5 的时候";
     private $output;
 
     protected function setUp(): void
     {
-        $tokenizer = new Tokenizer(new DefaultGrammar());
+        $tokenizer = new Tokenizer(new DefaultLexer());
         $reader = new StringReader($this->text);
         $token = $tokenizer->tokenize($reader);
         $this->output = new RawOutput($token);
@@ -28,6 +29,6 @@ class RawOutputTest extends TestCase
 
     public function testOutput()
     {
-        $this->assertEquals($this->text, $this->output->output(), '输出与预期不一致');
+        $this->assertEquals($this->expect, $this->output->output(), '输出与预期不一致');
     }
 }

tests/Tokenizer/TokenizerTest.php

@@ -7,7 +7,7 @@
 
 namespace JerryYan\DSL\Test\Tokenizer;
 
-use JerryYan\DSL\Grammar\DefaultGrammar;
+use JerryYan\DSL\Lexer\DefaultLexer;
 use JerryYan\DSL\Reader\StringReader;
 use JerryYan\DSL\Token\TokenCurry;
 use JerryYan\DSL\Token\TokenLogicAnd;
@@ -41,9 +41,10 @@ class TokenizerTest extends TestCase
         TokenNumber::class,
         TokenLogicFake::class,
     ];
+
     protected function setUp(): void
     {
-        $this->tokenizer = new Tokenizer(new DefaultGrammar());
+        $this->tokenizer = new Tokenizer(new DefaultLexer());
         $this->reader = new StringReader($this->text);
     }
 
@@ -55,7 +56,7 @@ class TokenizerTest extends TestCase
         do {
             $this->assertInstanceOf($this->textTokenType[$index], $tokens);
             $tokens = $tokens->getNextToken();
-            $index ++;
+            $index++;
         } while ($tokens->hasNextToken());
     }
 }