github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-11-24 17:04:47 +03:00
Code Issues Projects Releases Wiki Activity

Flatten out python trees a bit

Browse Source
This commit is contained in:
Timothy Clem 2018-01-19 07:51:01 -08:00
parent 03a8b4fe40
commit a1fb0a1ee5
62 changed files with 468 additions and 669 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Language/Python/Assignment.hs
View File

@ -169,17 +169,13 @@ expressionChoices =
]
expressions :: Assignment
expressions = makeTerm <$> location <*> manyTerm expression
expressions = makeTerm'' <$> location <*> manyTerm expression
expressionStatement :: Assignment
expressionStatement = mk <$> symbol ExpressionStatement <*> children (someTerm expression)
where mk _ [child] = child
mk location children = makeTerm location children
expressionStatement = makeTerm'' <$> symbol ExpressionStatement <*> children (someTerm expression)
expressionList :: Assignment
expressionList = mk <$> symbol ExpressionList <*> children (someTerm expression)
where mk _ [child] = child
mk location children = makeTerm location children
expressionList = makeTerm'' <$> symbol ExpressionList <*> children (someTerm expression)
listSplat :: Assignment
listSplat = makeTerm <$> symbol ListSplat <*> (Syntax.Identifier <$> source)

16
test/fixtures/python/async-function-definition.diffA-B.txt vendored
View File

@ -5,17 +5,15 @@
{+(Identifier)+}
{+(Identifier)+}
{+(Identifier)+}
{+(
{+(Identifier)+})+})+}
{+(Identifier)+})+}
{+(Empty)+})+}
{+(Identifier)+})+}
(Annotation
(Annotation
(Function
(Identifier)
(
{ (Identifier)
->(Identifier) }))
{ (Identifier)
->(Identifier) })
(Empty))
(Identifier))
(Annotation
@ -26,9 +24,8 @@
{ (Identifier)
->(Identifier) }
{-(Identifier)-}
(
{ (Identifier)
->(Identifier) }))
{ (Identifier)
->(Identifier) })
(Empty))
(Identifier))
{-(Annotation
@ -36,7 +33,6 @@
{-(Function
{-(Identifier)-}
{-(Identifier)-}
{-(
{-(Identifier)-})-})-}
{-(Identifier)-})-}
{-(Empty)-})-}
{-(Identifier)-})-})

16
test/fixtures/python/async-function-definition.diffB-A.txt vendored
View File

@ -5,17 +5,15 @@
{-(Identifier)-}
{-(Identifier)-}
{-(Identifier)-}
{-(
{-(Identifier)-})-})-}
{-(Identifier)-})-}
{-(Empty)-})-}
{-(Identifier)-})-}
(Annotation
(Annotation
(Function
(Identifier)
(
{ (Identifier)
->(Identifier) }))
{ (Identifier)
->(Identifier) })
(Empty))
(Identifier))
(Annotation
@ -26,9 +24,8 @@
{ (Identifier)
->(Identifier) }
{+(Identifier)+}
(
{ (Identifier)
->(Identifier) }))
{ (Identifier)
->(Identifier) })
(Empty))
(Identifier))
{+(Annotation
@ -36,7 +33,6 @@
{+(Function
{+(Identifier)+}
{+(Identifier)+}
{+(
{+(Identifier)+})+})+}
{+(Identifier)+})+}
{+(Empty)+})+}
{+(Identifier)+})+})

9
test/fixtures/python/async-function-definition.parseA.txt vendored
View File

@ -3,8 +3,7 @@
(Annotation
(Function
(Identifier)
(
(Identifier)))
(Identifier))
(Empty))
(Identifier))
(Annotation
@ -13,8 +12,7 @@
(Identifier)
(Identifier)
(Identifier)
(
(Identifier)))
(Identifier))
(Empty))
(Identifier))
(Annotation
@ -22,7 +20,6 @@
(Function
(Identifier)
(Identifier)
(
(Identifier)))
(Identifier))
(Empty))
(Identifier)))

9
test/fixtures/python/async-function-definition.parseB.txt vendored
View File

@ -5,16 +5,14 @@
(Identifier)
(Identifier)
(Identifier)
(
(Identifier)))
(Identifier))
(Empty))
(Identifier))
(Annotation
(Annotation
(Function
(Identifier)
(
(Identifier)))
(Identifier))
(Empty))
(Identifier))
(Annotation
@ -22,7 +20,6 @@
(Function
(Identifier)
(Identifier)
(
(Identifier)))
(Identifier))
(Empty))
(Identifier)))

43
test/fixtures/python/class-definition.diffA-B.txt vendored
View File

@ -3,33 +3,28 @@
{ (Identifier)
->(Identifier) }
{+(Identifier)+}
(
(Annotation
(Function
(Annotation
(Function
{ (Identifier)
->(Identifier) }
(Identifier)
(Return
{ (Identifier)
->(Identifier) }
(Identifier)
(
(Return
{ (Identifier)
->(Empty) })))
(Empty))))
->(Empty) }))
(Empty)))
{-(Class
{-(Identifier)-}
{-(
{-(NoOp
{-(Empty)-})-})-})-}
{-(NoOp
{-(Empty)-})-})-}
(Class
(Identifier)
{-(Identifier)-}
(
(Annotation
(Function
{ (Identifier)
->(Identifier) }
(Identifier)
(
(Return
{ (Empty)
->(Identifier) })))
(Empty)))))
(Annotation
(Function
{ (Identifier)
->(Identifier) }
(Identifier)
(Return
{ (Empty)
->(Identifier) }))
(Empty))))

43
test/fixtures/python/class-definition.diffB-A.txt vendored
View File

@ -3,33 +3,28 @@
{ (Identifier)
->(Identifier) }
{-(Identifier)-}
(
(Annotation
(Function
{ (Identifier)
->(Identifier) }
(Identifier)
(
(Return
{ (Empty)
->(Identifier) })))
(Empty))))
(Annotation
(Function
{ (Identifier)
->(Identifier) }
(Identifier)
(Return
{ (Empty)
->(Identifier) }))
(Empty)))
{+(Class
{+(Identifier)+}
{+(
{+(NoOp
{+(Empty)+})+})+})+}
{+(NoOp
{+(Empty)+})+})+}
(Class
(Identifier)
{+(Identifier)+}
(
(Annotation
(Function
(Annotation
(Function
{ (Identifier)
->(Identifier) }
(Identifier)
(Return
{ (Identifier)
->(Identifier) }
(Identifier)
(
(Return
{ (Identifier)
->(Empty) })))
(Empty)))))
->(Empty) }))
(Empty))))

37
test/fixtures/python/class-definition.parseA.txt vendored
View File

@ -1,29 +1,24 @@
(Program
(Class
(Identifier)
(
(Annotation
(Function
(Identifier)
(Identifier)
(
(Return
(Identifier))))
(Empty))))
(Annotation
(Function
(Identifier)
(Identifier)
(Return
(Identifier)))
(Empty)))
(Class
(Identifier)
(
(NoOp
(Empty))))
(NoOp
(Empty)))
(Class
(Identifier)
(Identifier)
(
(Annotation
(Function
(Identifier)
(Identifier)
(
(Return
(Empty))))
(Empty)))))
(Annotation
(Function
(Identifier)
(Identifier)
(Return
(Empty)))
(Empty))))

32
test/fixtures/python/class-definition.parseB.txt vendored
View File

@ -2,23 +2,19 @@
(Class
(Identifier)
(Identifier)
(
(Annotation
(Function
(Identifier)
(Identifier)
(
(Return
(Empty))))
(Empty))))
(Annotation
(Function
(Identifier)
(Identifier)
(Return
(Empty)))
(Empty)))
(Class
(Identifier)
(
(Annotation
(Function
(Identifier)
(Identifier)
(
(Return
(Identifier))))
(Empty)))))
(Annotation
(Function
(Identifier)
(Identifier)
(Return
(Identifier)))
(Empty))))

15
test/fixtures/python/conditional-expression.diffA-B.txt vendored
View File

@ -4,23 +4,20 @@
{+(If
{+(Identifier)+}
{+(Identifier)+}
{+(
{+(Identifier)+})+})+})+}
{+(Identifier)+})+})+}
(If
{ (Identifier)
->(Identifier) }
(Call
(Identifier)
(Empty))
(
{+(Call
{+(Identifier)+}
{+(Empty)+})+}
{-(Identifier)-}))
{ (Identifier)
->(Call
{+(Identifier)+}
{+(Empty)+}) })
{-(Assignment
{-(Identifier)-}
{-(If
{-(Identifier)-}
{-(Identifier)-}
{-(
{-(Identifier)-})-})-})-})
{-(Identifier)-})-})-})

15
test/fixtures/python/conditional-expression.diffB-A.txt vendored
View File

@ -4,8 +4,7 @@
{+(Call
{+(Identifier)+}
{+(Empty)+})+}
{+(
{+(Identifier)+})+})+}
{+(Identifier)+})+}
(Assignment
{ (Identifier)
->(Identifier) }
@ -14,15 +13,13 @@
->(Identifier) }
{ (Identifier)
->(Identifier) }
(
{ (Identifier)
->(Identifier) })))
{ (Identifier)
->(Identifier) }))
{-(If
{-(Identifier)-}
{-(Call
{-(Identifier)-}
{-(Empty)-})-}
{-(
{-(Call
{-(Identifier)-}
{-(Empty)-})-})-})-})
{-(Call
{-(Identifier)-}
{-(Empty)-})-})-})

6
test/fixtures/python/conditional-expression.parseA.txt vendored
View File

@ -4,12 +4,10 @@
(Call
(Identifier)
(Empty))
(
(Identifier)))
(Identifier))
(Assignment
(Identifier)
(If
(Identifier)
(Identifier)
(
(Identifier)))))
(Identifier))))

10
test/fixtures/python/conditional-expression.parseB.txt vendored
View File

@ -4,14 +4,12 @@
(If
(Identifier)
(Identifier)
(
(Identifier))))
(Identifier)))
(If
(Identifier)
(Call
(Identifier)
(Empty))
(
(Call
(Identifier)
(Empty)))))
(Call
(Identifier)
(Empty))))

86
test/fixtures/python/decorated-definition.diffA-B.txt vendored
View File

@ -6,66 +6,62 @@
(Class
{ (Identifier)
->(Identifier) }
(
(Decorator
(ScopeResolution
(Identifier))
([])
(Decorator
(ScopeResolution
(Identifier))
([])
{ (Identifier)
->(Identifier) })
{+(Identifier)+}
{-(Integer)-}
(Decorator
(ScopeResolution
{ (Identifier)
->(Identifier) })
(
{+(Identifier)+}
{-(Integer)-})
{+(Identifier)+}
{-(
{-(Integer)-}
{-(Integer)-})-}
(Decorator
(ScopeResolution
{ (Identifier)
->(Identifier) })
(
{+(Identifier)+}
{-(Integer)-}
{-(Integer)-})
(Decorator
(ScopeResolution
(Identifier))
(
{+(Integer)+}
(Assignment
{ (Identifier)
->(Identifier) }
(Boolean))
(Identifier))
{+(
{+(Integer)+}
{+(Assignment
{+(Identifier)+}
{+(Identifier)+})
{ (Decorator
{+(Boolean)+})+}
{+(Identifier)+}
{+(Identifier)+})+}
{-(Assignment
{-(Identifier)-}
{-(Boolean)-})-}
{ (Decorator
{-(ScopeResolution
{-(Identifier)-})-}
{-(Identifier)-}
{-(Decorator
{-(ScopeResolution
{-(Identifier)-})-}
{-(
{-(Identifier)-})-}
{-(Identifier)-}
{-(Decorator
{-(ScopeResolution
{-(Identifier)-})-}
{-(
{-(Integer)-}
{-(Assignment
{-(Identifier)-}
{-(Boolean)-})-}
{-(Identifier)-}
{-(Identifier)-})-}
{-(Decorator
{-(ScopeResolution
{-(Identifier)-})-}
{-(
{-(Integer)-}
{-(Assignment
{-(Identifier)-}
{-(Boolean)-})-}
{-(Annotation
{-(Function
{-(Identifier)-}
{-(Identifier)-})-}
{-(Annotation
{-(Function
{-(Identifier)-}
{-(
{-(Identifier)-})-})-}
{-(Empty)-})-})-})-})
->(Annotation
{+(Function
{+(Identifier)+}
{+(
{+(Identifier)+})+})+}
{+(Empty)+}) }))))))))
{-(Empty)-})-})-})-})
->(Annotation
{+(Function
{+(Identifier)+}
{+(Identifier)+})+}
{+(Empty)+}) })))))))

86
test/fixtures/python/decorated-definition.diffB-A.txt vendored
View File

@ -6,68 +6,62 @@
(Class
{ (Identifier)
->(Identifier) }
(
(Decorator
(ScopeResolution
(Identifier))
([])
(Decorator
(ScopeResolution
(Identifier))
([])
{ (Identifier)
->(Identifier) })
{+(Integer)+}
{-(Identifier)-}
(Decorator
(ScopeResolution
{ (Identifier)
->(Identifier) })
(
{+(
{+(Integer)+}
{-(Identifier)-})
{+(Integer)+})+}
{-(Identifier)-}
(Decorator
(ScopeResolution
{ (Identifier)
->(Identifier) })
(
{+(Integer)+}
{+(Integer)+}
{-(Identifier)-})
(Decorator
(ScopeResolution
(Identifier))
(
{+(Assignment
{+(Identifier)+}
{+(Boolean)+})+}
{-(Integer)-}
{-(Assignment
{-(Identifier)-}
{-(Boolean)-})-}
(Identifier))
{+(Assignment
{+(Identifier)+}
{+(Boolean)+})+}
{-(
{-(Integer)-}
{-(Assignment
{-(Identifier)-}
{-(Identifier)-})
{ (Annotation
{-(Function
{-(Identifier)-}
{-(
{-(Identifier)-})-})-}
{-(Empty)-})
->(Decorator
{-(Boolean)-})-}
{-(Identifier)-}
{-(Identifier)-})-}
{ (Annotation
{-(Function
{-(Identifier)-}
{-(Identifier)-})-}
{-(Empty)-})
->(Decorator
{+(ScopeResolution
{+(Identifier)+})+}
{+(Identifier)+}
{+(Decorator
{+(ScopeResolution
{+(Identifier)+})+}
{+(
{+(Identifier)+})+}
{+(Identifier)+}
{+(Decorator
{+(ScopeResolution
{+(Identifier)+})+}
{+(
{+(Integer)+}
{+(Assignment
{+(Identifier)+}
{+(Boolean)+})+}
{+(Identifier)+}
{+(Identifier)+})+}
{+(Decorator
{+(ScopeResolution
{+(Identifier)+})+}
{+(
{+(Integer)+}
{+(Assignment
{+(Identifier)+}
{+(Boolean)+})+}
{+(Annotation
{+(Function
{+(Identifier)+}
{+(Identifier)+})+}
{+(Annotation
{+(Function
{+(Identifier)+}
{+(
{+(Identifier)+})+})+}
{+(Empty)+})+})+})+}) }))))))))
{+(Empty)+})+})+})+}) })))))))

44
test/fixtures/python/decorated-definition.parseA.txt vendored
View File

@ -5,52 +5,46 @@
(Identifier))
(Class
(Identifier)
(
(Decorator
(ScopeResolution
(Identifier))
([])
(Decorator
(ScopeResolution
(Identifier))
([])
(Integer)
(Decorator
(ScopeResolution
(Identifier))
(
(Integer)
(Integer))
(Decorator
(ScopeResolution
(Identifier))
(
(Integer)
(Integer))
(Assignment
(Identifier)
(Boolean))
(Decorator
(ScopeResolution
(Identifier))
(
(Assignment
(Identifier)
(Boolean)))
(Identifier)
(Decorator
(ScopeResolution
(Identifier))
(
(Identifier))
(Identifier)
(Decorator
(ScopeResolution
(Identifier))
(
(Integer)
(Assignment
(Identifier)
(Boolean))
(Identifier)
(Identifier))
(Decorator
(ScopeResolution
(Identifier))
(
(Integer)
(Assignment
(Identifier)
(Boolean))
(Annotation
(Function
(Identifier)
(Identifier))
(Annotation
(Function
(Identifier)
(
(Identifier)))
(Empty)))))))))))))
(Empty))))))))))))

32
test/fixtures/python/decorated-definition.parseB.txt vendored
View File

@ -5,34 +5,30 @@
(Identifier))
(Class
(Identifier)
(
(Decorator
(ScopeResolution
(Identifier))
([])
(Decorator
(ScopeResolution
(Identifier))
([])
(Identifier)
(Decorator
(ScopeResolution
(Identifier))
(
(Identifier))
(Identifier)
(Decorator
(ScopeResolution
(Identifier))
(
(Integer)
(Assignment
(Identifier)
(Boolean))
(Identifier)
(Identifier))
(Decorator
(ScopeResolution
(Identifier))
(
(Integer)
(Assignment
(Identifier)
(Boolean))
(Annotation
(Function
(Identifier)
(Identifier))
(Annotation
(Function
(Identifier)
(
(Identifier)))
(Empty))))))))))
(Empty)))))))))

24
test/fixtures/python/dictionary-comprehension.diffA-B.txt vendored
View File

@ -6,14 +6,12 @@
{ (Identifier)
->(Identifier) })
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) })
{+(
{+(Identifier)+})+}))
{+(Identifier)+}
{+(Identifier)+})+}
{ (Identifier)
->(Identifier) }
{-(Identifier)-}))
(Comprehension
(KeyValue
{ (Identifier)
@ -21,11 +19,9 @@
{ (Identifier)
->(Integer) })
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) })
{+(Identifier)+}
{+(Identifier)+}
{-(
{-(Identifier)-})-})))
{-(Identifier)-}
{-(Identifier)-})-}
{-(Identifier)-})))

24
test/fixtures/python/dictionary-comprehension.diffB-A.txt vendored
View File

@ -6,14 +6,12 @@
{ (Identifier)
->(Identifier) })
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) })
{+(Identifier)+}
{+(Identifier)+}
{-(
{-(Identifier)-})-}))
{-(Identifier)-}
{-(Identifier)-})-}
{-(Identifier)-}))
(Comprehension
(KeyValue
{ (Identifier)
@ -21,11 +19,9 @@
{ (Integer)
->(Identifier) })
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) })
{+(
{+(Identifier)+})+})))
{+(Identifier)+}
{+(Identifier)+})+}
{ (Identifier)
->(Identifier) }
{-(Identifier)-})))

12
test/fixtures/python/dictionary-comprehension.parseA.txt vendored
View File

@ -4,18 +4,14 @@
(Identifier)
(Identifier))
(
(
(
(Identifier))
(Identifier))))
(Identifier)
(Identifier)))
(Comprehension
(KeyValue
(Identifier)
(Identifier))
(
(
(
(Identifier))
(Identifier)
(Identifier))
(
(Identifier)))))
(Identifier))))

12
test/fixtures/python/dictionary-comprehension.parseB.txt vendored
View File

@ -5,17 +5,13 @@
(Identifier))
(
(
(
(Identifier))
(Identifier)
(Identifier))
(
(Identifier))))
(Identifier)))
(Comprehension
(KeyValue
(Identifier)
(Integer))
(
(
(
(Identifier))
(Identifier)))))
(Identifier)
(Identifier))))

17
test/fixtures/python/for-statement.diffA-B.txt vendored
View File

@ -1,7 +1,6 @@
(Program
{+(ForEach
{+(
{+(Identifier)+})+}
{+(Identifier)+}
{+(Array
{+(Tuple
{+(Integer)+})+}
@ -34,15 +33,13 @@
(Identifier)
(Identifier)
(Empty))))))
(
(Call
(Identifier)
{ (Identifier)
->(Identifier) }
(Empty))))
(Call
(Identifier)
{ (Identifier)
->(Identifier) }
(Empty)))
{-(ForEach
{-(
{-(Identifier)-})-}
{-(Identifier)-}
{-(Array
{-(Tuple
{-(Integer)-})-}

23
test/fixtures/python/for-statement.diffB-A.txt vendored
View File

@ -20,15 +20,13 @@
{+(Identifier)+}
{+(Identifier)+}
{+(Empty)+})+})+})+})+})+}
{+(
{+(Call
{+(Identifier)+}
{+(Identifier)+}
{+(Empty)+})+})+})+}
{+(Call
{+(Identifier)+}
{+(Identifier)+}
{+(Empty)+})+})+}
(ForEach
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
(Array
(Tuple
(Integer))
@ -60,8 +58,7 @@
{-(Identifier)-}
{-(Identifier)-}
{-(Empty)-})-})-})-})-})-}
{-(
{-(Call
{-(Identifier)-}
{-(Identifier)-}
{-(Empty)-})-})-})-})
{-(Call
{-(Identifier)-}
{-(Identifier)-}
{-(Empty)-})-})-})

12
test/fixtures/python/for-statement.parseA.txt vendored
View File

@ -20,14 +20,12 @@
(Identifier)
(Identifier)
(Empty))))))
(
(Call
(Identifier)
(Identifier)
(Empty))))
(Call
(Identifier)
(Identifier)
(Empty)))
(ForEach
(
(Identifier))
(Identifier)
(Array
(Tuple
(Integer))

12
test/fixtures/python/for-statement.parseB.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(ForEach
(
(Identifier))
(Identifier)
(Array
(Tuple
(Integer))
@ -32,8 +31,7 @@
(Identifier)
(Identifier)
(Empty))))))
(
(Call
(Identifier)
(Identifier)
(Empty)))))
(Call
(Identifier)
(Identifier)
(Empty))))

22
test/fixtures/python/function-definition.diffA-B.txt vendored
View File

@ -2,15 +2,13 @@
{-(Annotation
{-(Function
{-(Identifier)-}
{-(
{-(Identifier)-})-})-}
{-(Identifier)-})-}
{-(Empty)-})-}
{-(Annotation
{-(Function
{-(Identifier)-}
{-(Identifier)-}
{-(
{-(Identifier)-})-})-}
{-(Identifier)-})-}
{-(Empty)-})-}
(Annotation
(Function
@ -19,9 +17,8 @@
->(Identifier) }
{ (Identifier)
->(Identifier) }
(
{ (Identifier)
->(Identifier) }))
{ (Identifier)
->(Identifier) })
(Empty))
(Annotation
(Function
@ -30,16 +27,14 @@
{-(Assignment
{-(Identifier)-}
{-(Identifier)-})-}
(
{ (Identifier)
->(Identifier) }))
{ (Identifier)
->(Identifier) })
(Empty))
{+(Annotation
{+(Function
{+(Identifier)+}
{+(Identifier)+}
{+(
{+(Identifier)+})+})+}
{+(Identifier)+})+}
{+(Empty)+})+}
(Annotation
(Function
@ -53,6 +48,5 @@
->(Identifier) })
{ (Identifier)
->(Identifier) }
(
(Identifier)))
(Identifier))
(Empty)))

21
test/fixtures/python/function-definition.diffB-A.txt vendored
View File

@ -5,17 +5,15 @@
->(Identifier) }
{-(Identifier)-}
{-(Identifier)-}
(
{ (Identifier)
->(Identifier) }))
{ (Identifier)
->(Identifier) })
(Empty))
(Annotation
(Function
(Identifier)
{+(Identifier)+}
(
{ (Identifier)
->(Identifier) }))
{ (Identifier)
->(Identifier) })
(Empty))
(Annotation
(Function
@ -24,9 +22,8 @@
{ (Identifier)
->(Identifier) }
{+(Identifier)+}
(
{ (Identifier)
->(Identifier) }))
{ (Identifier)
->(Identifier) })
(Empty))
{+(Annotation
{+(Function
@ -34,8 +31,7 @@
{+(Assignment
{+(Identifier)+}
{+(Identifier)+})+}
{+(
{+(Identifier)+})+})+}
{+(Identifier)+})+}
{+(Empty)+})+}
(Annotation
(Function
@ -49,6 +45,5 @@
->(Identifier) })
{ (Identifier)
->(Identifier) }
(
(Identifier)))
(Identifier))
(Empty)))

15
test/fixtures/python/function-definition.parseA.txt vendored
View File

@ -2,23 +2,20 @@
(Annotation
(Function
(Identifier)
(
(Identifier)))
(Identifier))
(Empty))
(Annotation
(Function
(Identifier)
(Identifier)
(
(Identifier)))
(Identifier))
(Empty))
(Annotation
(Function
(Identifier)
(Identifier)
(Identifier)
(
(Identifier)))
(Identifier))
(Empty))
(Annotation
(Function
@ -26,8 +23,7 @@
(Assignment
(Identifier)
(Identifier))
(
(Identifier)))
(Identifier))
(Empty))
(Annotation
(Function
@ -38,6 +34,5 @@
(TextElement))
(Identifier))
(Identifier)
(
(Identifier)))
(Identifier))
(Empty)))

12
test/fixtures/python/function-definition.parseB.txt vendored
View File

@ -4,21 +4,18 @@
(Identifier)
(Identifier)
(Identifier)
(
(Identifier)))
(Identifier))
(Empty))
(Annotation
(Function
(Identifier)
(
(Identifier)))
(Identifier))
(Empty))
(Annotation
(Function
(Identifier)
(Identifier)
(
(Identifier)))
(Identifier))
(Empty))
(Annotation
(Function
@ -29,6 +26,5 @@
(Integer))
(Identifier))
(Identifier)
(
(Identifier)))
(Identifier))
(Empty)))

20
test/fixtures/python/generator-expression.diffA-B.txt vendored
View File

@ -3,21 +3,17 @@
{ (Identifier)
->(Identifier) }
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) })))
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }))
(Comprehension
{ (Identifier)
->(Plus
{+(Identifier)+}
{+(Integer)+}) }
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }))))
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) })))

20
test/fixtures/python/generator-expression.diffB-A.txt vendored
View File

@ -3,21 +3,17 @@
{ (Identifier)
->(Identifier) }
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) })))
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }))
(Comprehension
{ (Plus
{-(Identifier)-}
{-(Integer)-})
->(Identifier) }
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }))))
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) })))

12
test/fixtures/python/generator-expression.parseA.txt vendored
View File

@ -2,14 +2,10 @@
(Comprehension
(Identifier)
(
(
(
(Identifier))
(Identifier))))
(Identifier)
(Identifier)))
(Comprehension
(Identifier)
(
(
(
(Identifier))
(Identifier)))))
(Identifier)
(Identifier))))

12
test/fixtures/python/generator-expression.parseB.txt vendored
View File

@ -2,16 +2,12 @@
(Comprehension
(Identifier)
(
(
(
(Identifier))
(Identifier))))
(Identifier)
(Identifier)))
(Comprehension
(Plus
(Identifier)
(Integer))
(
(
(
(Identifier))
(Identifier)))))
(Identifier)
(Identifier))))

7
test/fixtures/python/import-from-statement.diffA-B.txt vendored
View File

@ -4,10 +4,9 @@
{ (Identifier)
->(Identifier) })
(Empty)
(
(ScopeResolution
{ (Identifier)
->(Identifier) })))
(ScopeResolution
{ (Identifier)
->(Identifier) }))
(Import
(ScopeResolution
{ (Identifier)

7
test/fixtures/python/import-from-statement.diffB-A.txt vendored
View File

@ -4,10 +4,9 @@
{ (Identifier)
->(Identifier) })
(Empty)
(
(ScopeResolution
{ (Identifier)
->(Identifier) })))
(ScopeResolution
{ (Identifier)
->(Identifier) }))
(Import
(ScopeResolution
{ (Identifier)

5
test/fixtures/python/import-from-statement.parseA.txt vendored
View File

@ -3,9 +3,8 @@
(ScopeResolution
(Identifier))
(Empty)
(
(ScopeResolution
(Identifier))))
(ScopeResolution
(Identifier)))
(Import
(ScopeResolution
(Identifier))

5
test/fixtures/python/import-from-statement.parseB.txt vendored
View File

@ -3,9 +3,8 @@
(ScopeResolution
(Identifier))
(Empty)
(
(ScopeResolution
(Identifier))))
(ScopeResolution
(Identifier)))
(Import
(ScopeResolution
(Identifier))

9
test/fixtures/python/lambda.diffA-B.txt vendored
View File

@ -3,9 +3,8 @@
(Function
(Empty)
{+(Identifier)+}
(
(Plus
{ (Integer)
->(Identifier) }
(Integer))))
(Plus
{ (Integer)
->(Identifier) }
(Integer)))
(Empty)))

9
test/fixtures/python/lambda.diffB-A.txt vendored
View File

@ -3,9 +3,8 @@
(Function
(Empty)
{-(Identifier)-}
(
(Plus
{ (Identifier)
->(Integer) }
(Integer))))
(Plus
{ (Identifier)
->(Integer) }
(Integer)))
(Empty)))

7
test/fixtures/python/lambda.parseA.txt vendored
View File

@ -2,8 +2,7 @@
(Annotation
(Function
(Empty)
(
(Plus
(Integer)
(Integer))))
(Plus
(Integer)
(Integer)))
(Empty)))

7
test/fixtures/python/lambda.parseB.txt vendored
View File

@ -3,8 +3,7 @@
(Function
(Empty)
(Identifier)
(
(Plus
(Identifier)
(Integer))))
(Plus
(Identifier)
(Integer)))
(Empty)))

38
test/fixtures/python/list-comprehension.diffA-B.txt vendored
View File

@ -3,35 +3,29 @@
{ (Identifier)
->(Identifier) }
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) })
{+(
{+(Call
{+(Identifier)+}
{+(Empty)+})+})+}
{+(
{+(
{+(Identifier)+})+}
{+(Identifier)+}
{+(Identifier)+})+}
{+(Call
{+(Identifier)+}
{+(Empty)+})+}
{+(
{+(Call
{+(Identifier)+}
{+(Empty)+})+})+}))
{+(Identifier)+}
{+(Identifier)+})+}
{+(Call
{+(Identifier)+}
{+(Empty)+})+}
{-(Identifier)-}
{-(Identifier)-}))
(Comprehension
{ (Identifier)
->(Plus
{+(Identifier)+}
{+(Integer)+}) }
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) })
{+(Identifier)+}
{+(Identifier)+}
{-(
{-(Identifier)-})-})))
{-(Identifier)-}
{-(Identifier)-})-}
{-(Identifier)-})))

38
test/fixtures/python/list-comprehension.diffB-A.txt vendored
View File

@ -3,35 +3,29 @@
{ (Identifier)
->(Identifier) }
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) })
{+(Identifier)+}
{+(Identifier)+}
{-(
{-(Call
{-(Identifier)-}
{-(Empty)-})-})-}
{-(
{-(
{-(Identifier)-})-}
{-(Identifier)-}
{-(Identifier)-})-}
{-(Call
{-(Identifier)-}
{-(Empty)-})-}
{-(
{-(Call
{-(Identifier)-}
{-(Empty)-})-})-}))
{-(Identifier)-}
{-(Identifier)-})-}
{-(Call
{-(Identifier)-}
{-(Empty)-})-}))
(Comprehension
{ (Plus
{-(Identifier)-}
{-(Integer)-})
->(Identifier) }
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) })
{+(
{+(Identifier)+})+})))
{+(Identifier)+}
{+(Identifier)+})+}
{ (Identifier)
->(Identifier) }
{-(Identifier)-})))

12
test/fixtures/python/list-comprehension.parseA.txt vendored
View File

@ -2,16 +2,12 @@
(Comprehension
(Identifier)
(
(
(
(Identifier))
(Identifier))))
(Identifier)
(Identifier)))
(Comprehension
(Identifier)
(
(
(
(Identifier))
(Identifier)
(Identifier))
(
(Identifier)))))
(Identifier))))

26
test/fixtures/python/list-comprehension.parseB.txt vendored
View File

@ -3,27 +3,21 @@
(Identifier)
(
(
(
(Identifier))
(Identifier)
(Identifier))
(Call
(Identifier)
(Empty))
(
(Call
(Identifier)
(Empty)))
(
(
(Identifier))
(Identifier)
(Identifier))
(
(Call
(Identifier)
(Empty)))))
(Call
(Identifier)
(Empty))))
(Comprehension
(Plus
(Identifier)
(Integer))
(
(
(
(Identifier))
(Identifier)))))
(Identifier)
(Identifier))))

18
test/fixtures/python/raise-statement.diffA-B.txt vendored
View File

@ -1,10 +1,9 @@
(Program
{+(Throw
{+(
{+(Call
{+(Identifier)+}
{+(TextElement)+}
{+(Empty)+})+})+})+}
{+(Call
{+(Identifier)+}
{+(TextElement)+}
{+(Empty)+})+})+}
{+(Throw
{+(
{+(Call
@ -15,11 +14,10 @@
(Throw
([]))
{-(Throw
{-(
{-(Call
{-(Identifier)-}
{-(TextElement)-}
{-(Empty)-})-})-})-}
{-(Call
{-(Identifier)-}
{-(TextElement)-}
{-(Empty)-})-})-}
{-(Throw
{-(
{-(Call

18
test/fixtures/python/raise-statement.diffB-A.txt vendored
View File

@ -1,10 +1,9 @@
(Program
{-(Throw
{-(
{-(Call
{-(Identifier)-}
{-(TextElement)-}
{-(Empty)-})-})-})-}
{-(Call
{-(Identifier)-}
{-(TextElement)-}
{-(Empty)-})-})-}
{-(Throw
{-(
{-(Call
@ -15,11 +14,10 @@
(Throw
([]))
{+(Throw
{+(
{+(Call
{+(Identifier)+}
{+(TextElement)+}
{+(Empty)+})+})+})+}
{+(Call
{+(Identifier)+}
{+(TextElement)+}
{+(Empty)+})+})+}
{+(Throw
{+(
{+(Call

9
test/fixtures/python/raise-statement.parseA.txt vendored
View File

@ -2,11 +2,10 @@
(Throw
([]))
(Throw
(
(Call
(Identifier)
(TextElement)
(Empty))))
(Call
(Identifier)
(TextElement)
(Empty)))
(Throw
(
(Call

9
test/fixtures/python/raise-statement.parseB.txt vendored
View File

@ -1,10 +1,9 @@
(Program
(Throw
(
(Call
(Identifier)
(TextElement)
(Empty))))
(Call
(Identifier)
(TextElement)
(Empty)))
(Throw
(
(Call

20
test/fixtures/python/set-comprehension.diffA-B.txt vendored
View File

@ -3,21 +3,17 @@
{ (Identifier)
->(Identifier) }
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) })))
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }))
(Comprehension
{ (Identifier)
->(Plus
{+(Identifier)+}
{+(Integer)+}) }
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }))))
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) })))

20
test/fixtures/python/set-comprehension.diffB-A.txt vendored
View File

@ -3,21 +3,17 @@
{ (Identifier)
->(Identifier) }
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) })))
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }))
(Comprehension
{ (Plus
{-(Identifier)-}
{-(Integer)-})
->(Identifier) }
(
(
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }))))
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) })))

12
test/fixtures/python/set-comprehension.parseA.txt vendored
View File

@ -2,14 +2,10 @@
(Comprehension
(Identifier)
(
(
(
(Identifier))
(Identifier))))
(Identifier)
(Identifier)))
(Comprehension
(Identifier)
(
(
(
(Identifier))
(Identifier)))))
(Identifier)
(Identifier))))

12
test/fixtures/python/set-comprehension.parseB.txt vendored
View File

@ -2,16 +2,12 @@
(Comprehension
(Identifier)
(
(
(
(Identifier))
(Identifier))))
(Identifier)
(Identifier)))
(Comprehension
(Plus
(Identifier)
(Integer))
(
(
(
(Identifier))
(Identifier)))))
(Identifier)
(Identifier))))

9
test/fixtures/python/try-statement.diffA-B.txt vendored
View File

@ -3,8 +3,7 @@
{ (Identifier)
->(Identifier) }
{+(Finally
{+(
{+(Identifier)+})+})+}
{+(Identifier)+})+}
{-(Identifier)-}
{-(Catch
{-(
@ -45,8 +44,7 @@
{+(Identifier)+}
{+(Identifier)+}
{+(Empty)+})+}
{+(
{+(Identifier)+})+})+}
{+(Identifier)+})+}
{+(Catch
{+(
{+(Identifier)+}
@ -54,8 +52,7 @@
{+(Identifier)+})+}
{+([])+})+}
{+(Catch
{+(
{+(Identifier)+})+}
{+(Identifier)+}
{+([])+})+}
{-(Identifier)-}
{-(Finally

9
test/fixtures/python/try-statement.diffB-A.txt vendored
View File

@ -30,8 +30,7 @@
{+(Identifier)+})+}
{+([])+})+}
{-(Finally
{-(
{-(Identifier)-})-})-})
{-(Identifier)-})-})
(Try
{ (Identifier)
->(Identifier) }
@ -50,8 +49,7 @@
{-(Identifier)-}
{-(Identifier)-}
{-(Empty)-})-}
{-(
{-(Identifier)-})-})-}
{-(Identifier)-})-}
{-(Catch
{-(
{-(Identifier)-}
@ -59,6 +57,5 @@
{-(Identifier)-})-}
{-([])-})-}
{-(Catch
{-(
{-(Identifier)-})-}
{-(Identifier)-}
{-([])-})-}))

9
test/fixtures/python/try-statement.parseB.txt vendored
View File

@ -2,8 +2,7 @@
(Try
(Identifier)
(Finally
(
(Identifier))))
(Identifier)))
(Try
(Identifier)
(Catch
@ -16,8 +15,7 @@
(Identifier)
(Identifier)
(Empty))
(
(Identifier)))
(Identifier))
(Catch
(
(Identifier)
@ -25,6 +23,5 @@
(Identifier))
([]))
(Catch
(
(Identifier))
(Identifier)
([]))))

14
test/fixtures/python/tuple.diffA-B.txt vendored
View File

@ -1,15 +1,11 @@
(Program
{+(Tuple
{+(Identifier)+}
{+(Identifier)+}
{+(Identifier)+})+}
(Tuple
{-(Identifier)-}
(Identifier)
{+(Identifier)+}
{+(Identifier)+})
{+(
{+(Identifier)+})+}
{-(Tuple
(Tuple
{-(Identifier)-}
{-(Identifier)-}
{-(Identifier)-})-})
(Identifier)
(Identifier))
{+(Identifier)+})

17
test/fixtures/python/tuple.diffB-A.txt vendored
View File

@ -1,14 +1,11 @@
(Program
{+(Tuple
{+(Identifier)+}
{+(Identifier)+})+}
(Tuple
{-(Identifier)-}
{-(Identifier)-}
(Identifier)
{+(Identifier)+})
(Tuple
{+(Identifier)+}
(Identifier)
(Identifier)
{-(Identifier)-})
{-(Tuple
{-(Identifier)-}
{-(Identifier)-})-}
{-(
{-(Identifier)-})-})
(Identifier))
{-(Identifier)-})

3
test/fixtures/python/tuple.parseB.txt vendored
View File

@ -6,5 +6,4 @@
(Tuple
(Identifier)
(Identifier))
(
(Identifier)))
(Identifier))

3
test/fixtures/python/with.diffA-B.txt vendored
View File

@ -15,8 +15,7 @@
(Identifier)
(Boolean))
{-(ForEach
{-(
{-(Identifier)-})-}
{-(Identifier)-}
{-(Identifier)-}
{-(
{-(Assignment

3
test/fixtures/python/with.diffB-A.txt vendored
View File

@ -15,8 +15,7 @@
(Identifier)
(Boolean))
{+(ForEach
{+(
{+(Identifier)+})+}
{+(Identifier)+}
{+(Identifier)+}
{+(
{+(Assignment

3
test/fixtures/python/with.parseA.txt vendored
View File

@ -11,8 +11,7 @@
(Identifier)
(Boolean))
(ForEach
(
(Identifier))
(Identifier)
(Identifier)
(
(Assignment