diff options
author | Ryo Nihei <nihei.dev@gmail.com> | 2021-02-24 23:05:54 +0900 |
---|---|---|
committer | Ryo Nihei <nihei.dev@gmail.com> | 2021-02-25 00:39:23 +0900 |
commit | 0d4795245765669f4c7aa033e988833d5f78c9a3 (patch) | |
tree | d6d50edfb57a19b1a4664edc583d9a2f2db12dd4 /compiler/ast_test.go | |
parent | Add range expression (diff) | |
download | tre-0d4795245765669f4c7aa033e988833d5f78c9a3.tar.gz tre-0d4795245765669f4c7aa033e988833d5f78c9a3.tar.xz |
Refactoring
* Remove token field from symbolNode
* Simplify notation of nested nodes
* Simplify arguments of newSymbolNode()
Diffstat (limited to 'compiler/ast_test.go')
-rw-r--r-- | compiler/ast_test.go | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/compiler/ast_test.go b/compiler/ast_test.go index 735ccf8..7ea59e2 100644 --- a/compiler/ast_test.go +++ b/compiler/ast_test.go @@ -13,21 +13,21 @@ func TestASTNode(t *testing.T) { last symbolPositionSet }{ { - root: newSymbolNode(nil, 0, 1), + root: newSymbolNodeWithPos(0, 1), nullable: false, first: newSymbolPositionSet().add(1), last: newSymbolPositionSet().add(1), }, { - root: newEndMarkerNode(1, 1), + root: newEndMarkerNodeWithPos(1, 1), nullable: false, first: newSymbolPositionSet().add(1), last: newSymbolPositionSet().add(1), }, { root: newConcatNode( - newSymbolNode(nil, 0, 1), - newSymbolNode(nil, 0, 2), + newSymbolNodeWithPos(0, 1), + newSymbolNodeWithPos(0, 2), ), nullable: false, first: newSymbolPositionSet().add(1), @@ -35,8 +35,8 @@ func TestASTNode(t *testing.T) { }, { root: newConcatNode( - newRepeatNode(newSymbolNode(nil, 0, 1)), - newSymbolNode(nil, 0, 2), + newRepeatNode(newSymbolNodeWithPos(0, 1)), + newSymbolNodeWithPos(0, 2), ), nullable: false, first: newSymbolPositionSet().add(1).add(2), @@ -44,8 +44,8 @@ func TestASTNode(t *testing.T) { }, { root: newConcatNode( - newSymbolNode(nil, 0, 1), - newRepeatNode(newSymbolNode(nil, 0, 2)), + newSymbolNodeWithPos(0, 1), + newRepeatNode(newSymbolNodeWithPos(0, 2)), ), nullable: false, first: newSymbolPositionSet().add(1), @@ -53,8 +53,8 @@ func TestASTNode(t *testing.T) { }, { root: newConcatNode( - newRepeatNode(newSymbolNode(nil, 0, 1)), - newRepeatNode(newSymbolNode(nil, 0, 2)), + newRepeatNode(newSymbolNodeWithPos(0, 1)), + newRepeatNode(newSymbolNodeWithPos(0, 2)), ), nullable: true, first: newSymbolPositionSet().add(1).add(2), @@ -62,8 +62,8 @@ func TestASTNode(t *testing.T) { }, { root: newAltNode( - newSymbolNode(nil, 0, 1), - newSymbolNode(nil, 0, 2), + newSymbolNodeWithPos(0, 1), + newSymbolNodeWithPos(0, 2), ), nullable: false, first: newSymbolPositionSet().add(1).add(2), @@ -71,8 +71,8 @@ func TestASTNode(t *testing.T) { }, { root: newAltNode( - newRepeatNode(newSymbolNode(nil, 0, 1)), - newSymbolNode(nil, 0, 2), + newRepeatNode(newSymbolNodeWithPos(0, 1)), + newSymbolNodeWithPos(0, 2), ), nullable: true, first: newSymbolPositionSet().add(1).add(2), @@ -80,8 +80,8 @@ func TestASTNode(t *testing.T) { }, { root: newAltNode( - newSymbolNode(nil, 0, 1), - newRepeatNode(newSymbolNode(nil, 0, 2)), + newSymbolNodeWithPos(0, 1), + newRepeatNode(newSymbolNodeWithPos(0, 2)), ), nullable: true, first: newSymbolPositionSet().add(1).add(2), @@ -89,21 +89,21 @@ func TestASTNode(t *testing.T) { }, { root: newAltNode( - newRepeatNode(newSymbolNode(nil, 0, 1)), - newRepeatNode(newSymbolNode(nil, 0, 2)), + newRepeatNode(newSymbolNodeWithPos(0, 1)), + newRepeatNode(newSymbolNodeWithPos(0, 2)), ), nullable: true, first: newSymbolPositionSet().add(1).add(2), last: newSymbolPositionSet().add(1).add(2), }, { - root: newRepeatNode(newSymbolNode(nil, 0, 1)), + root: newRepeatNode(newSymbolNodeWithPos(0, 1)), nullable: true, first: newSymbolPositionSet().add(1), last: newSymbolPositionSet().add(1), }, { - root: newOptionNode(newSymbolNode(nil, 0, 1)), + root: newOptionNode(newSymbolNodeWithPos(0, 1)), nullable: true, first: newSymbolPositionSet().add(1), last: newSymbolPositionSet().add(1), |