Get rid of get_token
This commit is contained in:
parent
9a5df13639
commit
cfafc2e235
@ -45,19 +45,6 @@ class ShellLexer:
|
|||||||
self.state = ' '
|
self.state = ' '
|
||||||
self.token = ''
|
self.token = ''
|
||||||
|
|
||||||
def get_token(self):
|
|
||||||
"Get a token from the input stream (or from stack if it's nonempty)"
|
|
||||||
raw = self.read_token()
|
|
||||||
# Maybe we got EOF instead?
|
|
||||||
if raw == self.eof:
|
|
||||||
return self.eof
|
|
||||||
# Neither inclusion nor EOF
|
|
||||||
if raw != self.eof:
|
|
||||||
log.shlexer.vdebug("token={!r}".format(raw))
|
|
||||||
else:
|
|
||||||
log.shlexer.vdebug("token=EOF")
|
|
||||||
return raw
|
|
||||||
|
|
||||||
def read_token(self):
|
def read_token(self):
|
||||||
"""Read a raw token from the input stream."""
|
"""Read a raw token from the input stream."""
|
||||||
quoted = False
|
quoted = False
|
||||||
@ -136,16 +123,16 @@ class ShellLexer:
|
|||||||
if not quoted and result == '':
|
if not quoted and result == '':
|
||||||
result = None
|
result = None
|
||||||
if result:
|
if result:
|
||||||
log.shlexer.debug("raw token={!r}".format(result))
|
log.shlexer.debug("token={!r}".format(result))
|
||||||
else:
|
else:
|
||||||
log.shlexer.debug("raw token=EOF")
|
log.shlexer.debug("token=EOF")
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def __iter__(self):
|
def __iter__(self):
|
||||||
return self
|
return self
|
||||||
|
|
||||||
def __next__(self):
|
def __next__(self):
|
||||||
token = self.get_token()
|
token = self.read_token()
|
||||||
if token == self.eof:
|
if token == self.eof:
|
||||||
raise StopIteration
|
raise StopIteration
|
||||||
return token
|
return token
|
||||||
|
Loading…
Reference in New Issue
Block a user