mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 08:24:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

sig refactor

Browse source
This commit is contained in:
Anthony Scopatz 2015-01-25 10:56:04 -06:00
parent 9f5694f80a
commit a774de5c82
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/test_parser.py
View file

@ -292,7 +292,8 @@ def test_list_three():
yield check_ast, '[1, 42, 65,]'
"""
DEBUG_LEVEL = 100
#DEBUG_LEVEL = 1
#DEBUG_LEVEL = 100

31
xonsh/parser.py
View file

@ -936,18 +936,23 @@ class Parser(object):
"""
p1 = p[1]
if len(p) == 2:
p0 = p1
elif p1 == '(':
p2 = p[2]
if p2 is None:
p0 = ast.Tuple(elts=[], ctx=ast.Load(), lineno=self.lineno,
col_offset=self.col)
else:
p0 = p2[0] if len(p2) == 1 else p2
# plain-old atoms
p[0] = p1
return
# lists and such
p2 = p[2]
p2 = [] if p2 is None else p2
if p1 == '(' and len(p2) == 1:
# fix for grouping
p[0] = p2[0]
return
# clean p2
p2 = p2[:1] if (len(p2) == 2 and p2[1] is None) else p2
if p1 == '(':
p0 = ast.Tuple(elts=p2, ctx=ast.Load(), lineno=self.lineno,
col_offset=self.col)
elif p1 == '[':
p2 = p[2]
elts = [] if p2 is None else p2
p0 = ast.List(elts=elts, ctx=ast.Load(), lineno=self.lineno,
p0 = ast.List(elts=p2, ctx=ast.Load(), lineno=self.lineno,
col_offset=self.col)
else:
assert False
@ -989,8 +994,10 @@ class Parser(object):
p1, p2 = p[1], p[2]
p0 = [p1]
if len(p) == 3:
if p2 is None or p2 == ',':
if p2 is None:
pass
elif p2 == ',':
p0.append(None)
else:
assert False
elif len(p) == 4: