Browse Source
Fix IndexError (issue #754)
tags/gm/2021-09-23T00Z/github.com--lark-parser-lark/0.11.1
Chanic Panic
5 years ago
1 changed files with 12 additions and 7 deletions
Unified View
Diff Options
+ 12
- 7
lark/parsers/earley_forest.py
View File
| @@ -459,15 +459,20 @@ class PackedData(): | |||||
| that comes from the left child and the right child. | that comes from the left child and the right child. | ||||
| """ | """ | ||||
| class _NoData(): | |||||
| pass | |||||
| NO_DATA = _NoData() | |||||
| def __init__(self, node, data): | def __init__(self, node, data): | ||||
| self.left = None | |||||
| self.right = None | |||||
| self.left = self.NO_DATA | |||||
| self.right = self.NO_DATA | |||||
| if data: | if data: | ||||
| if node.left: | |||||
| if node.left is not None: | |||||
| self.left = data[0] | self.left = data[0] | ||||
| if len(data) > 1 and node.right: | |||||
| if len(data) > 1: | |||||
| self.right = data[1] | self.right = data[1] | ||||
| elif node.right: | |||||
| else: | |||||
| self.right = data[0] | self.right = data[0] | ||||
| class ForestToParseTree(ForestTransformer): | class ForestToParseTree(ForestTransformer): | ||||
| @@ -558,12 +563,12 @@ class ForestToParseTree(ForestTransformer): | |||||
| children = [] | children = [] | ||||
| assert len(data) <= 2 | assert len(data) <= 2 | ||||
| data = PackedData(node, data) | data = PackedData(node, data) | ||||
| if data.left is not None: | |||||
| if data.left is not PackedData.NO_DATA: | |||||
| if node.left.is_intermediate and isinstance(data.left, list): | if node.left.is_intermediate and isinstance(data.left, list): | ||||
| children += data.left | children += data.left | ||||
| else: | else: | ||||
| children.append(data.left) | children.append(data.left) | ||||
| if data.right is not None: | |||||
| if data.right is not PackedData.NO_DATA: | |||||
| children.append(data.right) | children.append(data.right) | ||||
| if node.parent.is_intermediate: | if node.parent.is_intermediate: | ||||
| return children | return children | ||||