VimPlug/parso
1
0
Fork 0
mirror of https://github.com/davidhalter/parso.git synced 2026-01-01 00:53:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Finish the stack in a way we want to.

Browse Source
This commit is contained in:
Dave Halter
2018-06-28 00:59:55 +02:00
parent 97cdb448d4
commit 52fc8fc569
2 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
parso/parser.py
View File

@@ -130,15 +130,20 @@ class BaseParser(object):
for token in tokens:
self._add_token(token)
while self.stack and self.stack[-1].dfa.is_final:
self._pop()
while True:
tos = self.stack[-1]
if not tos.dfa.is_final:
# We never broke out -- EOF is too soon -- Unfinished statement.
# However, the error recovery might have added the token again, if
# the stack is empty, we're fine.
raise InternalParseError(
"incomplete input", token.type, token.value, token.start_pos
)
if self.stack:
# We never broke out -- EOF is too soon -- Unfinished statement.
# However, the error recovery might have added the token again, if
# the stack is empty, we're fine.
raise InternalParseError("incomplete input", token.type, token.value, token.start_pos)
return self.rootnode
if len(self.stack) > 1:
self._pop()
else:
return self.convert_node(tos.nonterminal, tos.nodes)
def error_recovery(self, token):
if self._error_recovery:
@@ -199,8 +204,4 @@ class BaseParser(object):
else:
new_node = self.convert_node(tos.dfa.from_rule, tos.nodes)
try:
self.stack[-1].nodes.append(new_node)
except IndexError:
# Stack is empty, set the rootnode.
self.rootnode = new_node
self.stack[-1].nodes.append(new_node)

12
parso/python/parser.py
View File

@@ -89,17 +89,7 @@ class Parser(BaseParser):
tokens = self._recovery_tokenize(tokens)
node = super(Parser, self).parse(tokens)
if self._start_nonterminal == 'file_input' != node.type:
# If there's only one statement, we get back a non-module. That's
# not what we want, we want a module, so we add it here:
node = self.convert_node(
'file_input',
[node]
)
return node
return super(Parser, self).parse(tokens)
def convert_node(self, nonterminal, children):
"""