diff --git a/src/Language/Python/Assignment.hs b/src/Language/Python/Assignment.hs index f72c4bd29..ef645f83c 100644 --- a/src/Language/Python/Assignment.hs +++ b/src/Language/Python/Assignment.hs @@ -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) diff --git a/test/fixtures/python/async-function-definition.diffA-B.txt b/test/fixtures/python/async-function-definition.diffA-B.txt index 327a2d333..6920a1b95 100644 --- a/test/fixtures/python/async-function-definition.diffA-B.txt +++ b/test/fixtures/python/async-function-definition.diffA-B.txt @@ -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)-})-}) diff --git a/test/fixtures/python/async-function-definition.diffB-A.txt b/test/fixtures/python/async-function-definition.diffB-A.txt index 16c78756e..0c47b1a39 100644 --- a/test/fixtures/python/async-function-definition.diffB-A.txt +++ b/test/fixtures/python/async-function-definition.diffB-A.txt @@ -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)+})+}) diff --git a/test/fixtures/python/async-function-definition.parseA.txt b/test/fixtures/python/async-function-definition.parseA.txt index d1cd80ef1..9b61b59ac 100644 --- a/test/fixtures/python/async-function-definition.parseA.txt +++ b/test/fixtures/python/async-function-definition.parseA.txt @@ -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))) diff --git a/test/fixtures/python/async-function-definition.parseB.txt b/test/fixtures/python/async-function-definition.parseB.txt index 55b0b7db9..682a81360 100644 --- a/test/fixtures/python/async-function-definition.parseB.txt +++ b/test/fixtures/python/async-function-definition.parseB.txt @@ -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))) diff --git a/test/fixtures/python/class-definition.diffA-B.txt b/test/fixtures/python/class-definition.diffA-B.txt index c329c75d8..6f620d618 100644 --- a/test/fixtures/python/class-definition.diffA-B.txt +++ b/test/fixtures/python/class-definition.diffA-B.txt @@ -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)))) diff --git a/test/fixtures/python/class-definition.diffB-A.txt b/test/fixtures/python/class-definition.diffB-A.txt index 08655668d..cb63f4546 100644 --- a/test/fixtures/python/class-definition.diffB-A.txt +++ b/test/fixtures/python/class-definition.diffB-A.txt @@ -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)))) diff --git a/test/fixtures/python/class-definition.parseA.txt b/test/fixtures/python/class-definition.parseA.txt index 9294646bb..70b121f0e 100644 --- a/test/fixtures/python/class-definition.parseA.txt +++ b/test/fixtures/python/class-definition.parseA.txt @@ -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)))) diff --git a/test/fixtures/python/class-definition.parseB.txt b/test/fixtures/python/class-definition.parseB.txt index 24624a1d3..02580b0c4 100644 --- a/test/fixtures/python/class-definition.parseB.txt +++ b/test/fixtures/python/class-definition.parseB.txt @@ -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)))) diff --git a/test/fixtures/python/conditional-expression.diffA-B.txt b/test/fixtures/python/conditional-expression.diffA-B.txt index 63dbe230f..c6e760a8d 100644 --- a/test/fixtures/python/conditional-expression.diffA-B.txt +++ b/test/fixtures/python/conditional-expression.diffA-B.txt @@ -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)-})-})-}) diff --git a/test/fixtures/python/conditional-expression.diffB-A.txt b/test/fixtures/python/conditional-expression.diffB-A.txt index 22eb503ae..d5c9ed657 100644 --- a/test/fixtures/python/conditional-expression.diffB-A.txt +++ b/test/fixtures/python/conditional-expression.diffB-A.txt @@ -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)-})-})-}) diff --git a/test/fixtures/python/conditional-expression.parseA.txt b/test/fixtures/python/conditional-expression.parseA.txt index 3933e1afd..18a13549c 100644 --- a/test/fixtures/python/conditional-expression.parseA.txt +++ b/test/fixtures/python/conditional-expression.parseA.txt @@ -4,12 +4,10 @@ (Call (Identifier) (Empty)) - ( - (Identifier))) + (Identifier)) (Assignment (Identifier) (If (Identifier) (Identifier) - ( - (Identifier))))) + (Identifier)))) diff --git a/test/fixtures/python/conditional-expression.parseB.txt b/test/fixtures/python/conditional-expression.parseB.txt index 0b377af84..3e2bdc87c 100644 --- a/test/fixtures/python/conditional-expression.parseB.txt +++ b/test/fixtures/python/conditional-expression.parseB.txt @@ -4,14 +4,12 @@ (If (Identifier) (Identifier) - ( - (Identifier)))) + (Identifier))) (If (Identifier) (Call (Identifier) (Empty)) - ( - (Call - (Identifier) - (Empty))))) + (Call + (Identifier) + (Empty)))) diff --git a/test/fixtures/python/decorated-definition.diffA-B.txt b/test/fixtures/python/decorated-definition.diffA-B.txt index 5e407a32c..610c106b7 100644 --- a/test/fixtures/python/decorated-definition.diffA-B.txt +++ b/test/fixtures/python/decorated-definition.diffA-B.txt @@ -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)+}) }))))))) diff --git a/test/fixtures/python/decorated-definition.diffB-A.txt b/test/fixtures/python/decorated-definition.diffB-A.txt index 476550c4d..1d455c017 100644 --- a/test/fixtures/python/decorated-definition.diffB-A.txt +++ b/test/fixtures/python/decorated-definition.diffB-A.txt @@ -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)+})+})+})+}) }))))))) diff --git a/test/fixtures/python/decorated-definition.parseA.txt b/test/fixtures/python/decorated-definition.parseA.txt index 25dc5dad7..1700dd151 100644 --- a/test/fixtures/python/decorated-definition.parseA.txt +++ b/test/fixtures/python/decorated-definition.parseA.txt @@ -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)))))))))))) diff --git a/test/fixtures/python/decorated-definition.parseB.txt b/test/fixtures/python/decorated-definition.parseB.txt index f5303f810..f3fa37abc 100644 --- a/test/fixtures/python/decorated-definition.parseB.txt +++ b/test/fixtures/python/decorated-definition.parseB.txt @@ -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))))))))) diff --git a/test/fixtures/python/dictionary-comprehension.diffA-B.txt b/test/fixtures/python/dictionary-comprehension.diffA-B.txt index 9230afb5b..44b5c82b0 100644 --- a/test/fixtures/python/dictionary-comprehension.diffA-B.txt +++ b/test/fixtures/python/dictionary-comprehension.diffA-B.txt @@ -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)-}))) diff --git a/test/fixtures/python/dictionary-comprehension.diffB-A.txt b/test/fixtures/python/dictionary-comprehension.diffB-A.txt index a6b913255..932512545 100644 --- a/test/fixtures/python/dictionary-comprehension.diffB-A.txt +++ b/test/fixtures/python/dictionary-comprehension.diffB-A.txt @@ -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)-}))) diff --git a/test/fixtures/python/dictionary-comprehension.parseA.txt b/test/fixtures/python/dictionary-comprehension.parseA.txt index 6059c5bbf..3cdfe0873 100644 --- a/test/fixtures/python/dictionary-comprehension.parseA.txt +++ b/test/fixtures/python/dictionary-comprehension.parseA.txt @@ -4,18 +4,14 @@ (Identifier) (Identifier)) ( - ( - ( - (Identifier)) - (Identifier)))) + (Identifier) + (Identifier))) (Comprehension (KeyValue (Identifier) (Identifier)) ( ( - ( - (Identifier)) + (Identifier) (Identifier)) - ( - (Identifier))))) + (Identifier)))) diff --git a/test/fixtures/python/dictionary-comprehension.parseB.txt b/test/fixtures/python/dictionary-comprehension.parseB.txt index 6a1d1b780..a4da21d92 100644 --- a/test/fixtures/python/dictionary-comprehension.parseB.txt +++ b/test/fixtures/python/dictionary-comprehension.parseB.txt @@ -5,17 +5,13 @@ (Identifier)) ( ( - ( - (Identifier)) + (Identifier) (Identifier)) - ( - (Identifier)))) + (Identifier))) (Comprehension (KeyValue (Identifier) (Integer)) ( - ( - ( - (Identifier)) - (Identifier))))) + (Identifier) + (Identifier)))) diff --git a/test/fixtures/python/for-statement.diffA-B.txt b/test/fixtures/python/for-statement.diffA-B.txt index 55c13a7db..b8d3a9af4 100644 --- a/test/fixtures/python/for-statement.diffA-B.txt +++ b/test/fixtures/python/for-statement.diffA-B.txt @@ -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)-})-} diff --git a/test/fixtures/python/for-statement.diffB-A.txt b/test/fixtures/python/for-statement.diffB-A.txt index d94cab68b..b1a038936 100644 --- a/test/fixtures/python/for-statement.diffB-A.txt +++ b/test/fixtures/python/for-statement.diffB-A.txt @@ -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)-})-})-}) diff --git a/test/fixtures/python/for-statement.parseA.txt b/test/fixtures/python/for-statement.parseA.txt index 64846c930..6811bf720 100644 --- a/test/fixtures/python/for-statement.parseA.txt +++ b/test/fixtures/python/for-statement.parseA.txt @@ -20,14 +20,12 @@ (Identifier) (Identifier) (Empty)))))) - ( - (Call - (Identifier) - (Identifier) - (Empty)))) + (Call + (Identifier) + (Identifier) + (Empty))) (ForEach - ( - (Identifier)) + (Identifier) (Array (Tuple (Integer)) diff --git a/test/fixtures/python/for-statement.parseB.txt b/test/fixtures/python/for-statement.parseB.txt index afc42cc95..eb71bd86b 100644 --- a/test/fixtures/python/for-statement.parseB.txt +++ b/test/fixtures/python/for-statement.parseB.txt @@ -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)))) diff --git a/test/fixtures/python/function-definition.diffA-B.txt b/test/fixtures/python/function-definition.diffA-B.txt index 7b354fe66..1858a3b8f 100644 --- a/test/fixtures/python/function-definition.diffA-B.txt +++ b/test/fixtures/python/function-definition.diffA-B.txt @@ -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))) diff --git a/test/fixtures/python/function-definition.diffB-A.txt b/test/fixtures/python/function-definition.diffB-A.txt index f781195d0..1edd02066 100644 --- a/test/fixtures/python/function-definition.diffB-A.txt +++ b/test/fixtures/python/function-definition.diffB-A.txt @@ -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))) diff --git a/test/fixtures/python/function-definition.parseA.txt b/test/fixtures/python/function-definition.parseA.txt index 6aff7c44f..2725b11ab 100644 --- a/test/fixtures/python/function-definition.parseA.txt +++ b/test/fixtures/python/function-definition.parseA.txt @@ -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))) diff --git a/test/fixtures/python/function-definition.parseB.txt b/test/fixtures/python/function-definition.parseB.txt index 9e27729d4..c9507ccb7 100644 --- a/test/fixtures/python/function-definition.parseB.txt +++ b/test/fixtures/python/function-definition.parseB.txt @@ -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))) diff --git a/test/fixtures/python/generator-expression.diffA-B.txt b/test/fixtures/python/generator-expression.diffA-B.txt index 889af8894..3484c5288 100644 --- a/test/fixtures/python/generator-expression.diffA-B.txt +++ b/test/fixtures/python/generator-expression.diffA-B.txt @@ -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) }))) diff --git a/test/fixtures/python/generator-expression.diffB-A.txt b/test/fixtures/python/generator-expression.diffB-A.txt index 91806a53e..d199e6c54 100644 --- a/test/fixtures/python/generator-expression.diffB-A.txt +++ b/test/fixtures/python/generator-expression.diffB-A.txt @@ -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) }))) diff --git a/test/fixtures/python/generator-expression.parseA.txt b/test/fixtures/python/generator-expression.parseA.txt index d72257bea..5d0fe51fe 100644 --- a/test/fixtures/python/generator-expression.parseA.txt +++ b/test/fixtures/python/generator-expression.parseA.txt @@ -2,14 +2,10 @@ (Comprehension (Identifier) ( - ( - ( - (Identifier)) - (Identifier)))) + (Identifier) + (Identifier))) (Comprehension (Identifier) ( - ( - ( - (Identifier)) - (Identifier))))) + (Identifier) + (Identifier)))) diff --git a/test/fixtures/python/generator-expression.parseB.txt b/test/fixtures/python/generator-expression.parseB.txt index 7acc1010c..4d04bd87e 100644 --- a/test/fixtures/python/generator-expression.parseB.txt +++ b/test/fixtures/python/generator-expression.parseB.txt @@ -2,16 +2,12 @@ (Comprehension (Identifier) ( - ( - ( - (Identifier)) - (Identifier)))) + (Identifier) + (Identifier))) (Comprehension (Plus (Identifier) (Integer)) ( - ( - ( - (Identifier)) - (Identifier))))) + (Identifier) + (Identifier)))) diff --git a/test/fixtures/python/import-from-statement.diffA-B.txt b/test/fixtures/python/import-from-statement.diffA-B.txt index ea30cd6a3..cf3518630 100644 --- a/test/fixtures/python/import-from-statement.diffA-B.txt +++ b/test/fixtures/python/import-from-statement.diffA-B.txt @@ -4,10 +4,9 @@ { (Identifier) ->(Identifier) }) (Empty) - ( - (ScopeResolution - { (Identifier) - ->(Identifier) }))) + (ScopeResolution + { (Identifier) + ->(Identifier) })) (Import (ScopeResolution { (Identifier) diff --git a/test/fixtures/python/import-from-statement.diffB-A.txt b/test/fixtures/python/import-from-statement.diffB-A.txt index 6550c572a..7dec3921e 100644 --- a/test/fixtures/python/import-from-statement.diffB-A.txt +++ b/test/fixtures/python/import-from-statement.diffB-A.txt @@ -4,10 +4,9 @@ { (Identifier) ->(Identifier) }) (Empty) - ( - (ScopeResolution - { (Identifier) - ->(Identifier) }))) + (ScopeResolution + { (Identifier) + ->(Identifier) })) (Import (ScopeResolution { (Identifier) diff --git a/test/fixtures/python/import-from-statement.parseA.txt b/test/fixtures/python/import-from-statement.parseA.txt index f0a913567..500669aa8 100644 --- a/test/fixtures/python/import-from-statement.parseA.txt +++ b/test/fixtures/python/import-from-statement.parseA.txt @@ -3,9 +3,8 @@ (ScopeResolution (Identifier)) (Empty) - ( - (ScopeResolution - (Identifier)))) + (ScopeResolution + (Identifier))) (Import (ScopeResolution (Identifier)) diff --git a/test/fixtures/python/import-from-statement.parseB.txt b/test/fixtures/python/import-from-statement.parseB.txt index f0a913567..500669aa8 100644 --- a/test/fixtures/python/import-from-statement.parseB.txt +++ b/test/fixtures/python/import-from-statement.parseB.txt @@ -3,9 +3,8 @@ (ScopeResolution (Identifier)) (Empty) - ( - (ScopeResolution - (Identifier)))) + (ScopeResolution + (Identifier))) (Import (ScopeResolution (Identifier)) diff --git a/test/fixtures/python/lambda.diffA-B.txt b/test/fixtures/python/lambda.diffA-B.txt index 534890ad4..0c5631fd5 100644 --- a/test/fixtures/python/lambda.diffA-B.txt +++ b/test/fixtures/python/lambda.diffA-B.txt @@ -3,9 +3,8 @@ (Function (Empty) {+(Identifier)+} - ( - (Plus - { (Integer) - ->(Identifier) } - (Integer)))) + (Plus + { (Integer) + ->(Identifier) } + (Integer))) (Empty))) diff --git a/test/fixtures/python/lambda.diffB-A.txt b/test/fixtures/python/lambda.diffB-A.txt index b79ad179a..bed42b97e 100644 --- a/test/fixtures/python/lambda.diffB-A.txt +++ b/test/fixtures/python/lambda.diffB-A.txt @@ -3,9 +3,8 @@ (Function (Empty) {-(Identifier)-} - ( - (Plus - { (Identifier) - ->(Integer) } - (Integer)))) + (Plus + { (Identifier) + ->(Integer) } + (Integer))) (Empty))) diff --git a/test/fixtures/python/lambda.parseA.txt b/test/fixtures/python/lambda.parseA.txt index e5cc4e9b0..3cc3af09a 100644 --- a/test/fixtures/python/lambda.parseA.txt +++ b/test/fixtures/python/lambda.parseA.txt @@ -2,8 +2,7 @@ (Annotation (Function (Empty) - ( - (Plus - (Integer) - (Integer)))) + (Plus + (Integer) + (Integer))) (Empty))) diff --git a/test/fixtures/python/lambda.parseB.txt b/test/fixtures/python/lambda.parseB.txt index 4fd9a75d8..bab436fe7 100644 --- a/test/fixtures/python/lambda.parseB.txt +++ b/test/fixtures/python/lambda.parseB.txt @@ -3,8 +3,7 @@ (Function (Empty) (Identifier) - ( - (Plus - (Identifier) - (Integer)))) + (Plus + (Identifier) + (Integer))) (Empty))) diff --git a/test/fixtures/python/list-comprehension.diffA-B.txt b/test/fixtures/python/list-comprehension.diffA-B.txt index 38547d7f4..a5801dc53 100644 --- a/test/fixtures/python/list-comprehension.diffA-B.txt +++ b/test/fixtures/python/list-comprehension.diffA-B.txt @@ -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)-}))) diff --git a/test/fixtures/python/list-comprehension.diffB-A.txt b/test/fixtures/python/list-comprehension.diffB-A.txt index 53ee58672..a3c181151 100644 --- a/test/fixtures/python/list-comprehension.diffB-A.txt +++ b/test/fixtures/python/list-comprehension.diffB-A.txt @@ -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)-}))) diff --git a/test/fixtures/python/list-comprehension.parseA.txt b/test/fixtures/python/list-comprehension.parseA.txt index 8ea6fae11..dd0a83238 100644 --- a/test/fixtures/python/list-comprehension.parseA.txt +++ b/test/fixtures/python/list-comprehension.parseA.txt @@ -2,16 +2,12 @@ (Comprehension (Identifier) ( - ( - ( - (Identifier)) - (Identifier)))) + (Identifier) + (Identifier))) (Comprehension (Identifier) ( ( - ( - (Identifier)) + (Identifier) (Identifier)) - ( - (Identifier))))) + (Identifier)))) diff --git a/test/fixtures/python/list-comprehension.parseB.txt b/test/fixtures/python/list-comprehension.parseB.txt index cd8029113..de2c92ee8 100644 --- a/test/fixtures/python/list-comprehension.parseB.txt +++ b/test/fixtures/python/list-comprehension.parseB.txt @@ -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)))) diff --git a/test/fixtures/python/raise-statement.diffA-B.txt b/test/fixtures/python/raise-statement.diffA-B.txt index f96cc4efc..35e466cf8 100644 --- a/test/fixtures/python/raise-statement.diffA-B.txt +++ b/test/fixtures/python/raise-statement.diffA-B.txt @@ -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 diff --git a/test/fixtures/python/raise-statement.diffB-A.txt b/test/fixtures/python/raise-statement.diffB-A.txt index b4d6cfd64..48863f31f 100644 --- a/test/fixtures/python/raise-statement.diffB-A.txt +++ b/test/fixtures/python/raise-statement.diffB-A.txt @@ -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 diff --git a/test/fixtures/python/raise-statement.parseA.txt b/test/fixtures/python/raise-statement.parseA.txt index bc3d37f7b..b0ba84d68 100644 --- a/test/fixtures/python/raise-statement.parseA.txt +++ b/test/fixtures/python/raise-statement.parseA.txt @@ -2,11 +2,10 @@ (Throw ([])) (Throw - ( - (Call - (Identifier) - (TextElement) - (Empty)))) + (Call + (Identifier) + (TextElement) + (Empty))) (Throw ( (Call diff --git a/test/fixtures/python/raise-statement.parseB.txt b/test/fixtures/python/raise-statement.parseB.txt index f05adf394..07853776a 100644 --- a/test/fixtures/python/raise-statement.parseB.txt +++ b/test/fixtures/python/raise-statement.parseB.txt @@ -1,10 +1,9 @@ (Program (Throw - ( - (Call - (Identifier) - (TextElement) - (Empty)))) + (Call + (Identifier) + (TextElement) + (Empty))) (Throw ( (Call diff --git a/test/fixtures/python/set-comprehension.diffA-B.txt b/test/fixtures/python/set-comprehension.diffA-B.txt index 889af8894..3484c5288 100644 --- a/test/fixtures/python/set-comprehension.diffA-B.txt +++ b/test/fixtures/python/set-comprehension.diffA-B.txt @@ -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) }))) diff --git a/test/fixtures/python/set-comprehension.diffB-A.txt b/test/fixtures/python/set-comprehension.diffB-A.txt index 91806a53e..d199e6c54 100644 --- a/test/fixtures/python/set-comprehension.diffB-A.txt +++ b/test/fixtures/python/set-comprehension.diffB-A.txt @@ -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) }))) diff --git a/test/fixtures/python/set-comprehension.parseA.txt b/test/fixtures/python/set-comprehension.parseA.txt index d72257bea..5d0fe51fe 100644 --- a/test/fixtures/python/set-comprehension.parseA.txt +++ b/test/fixtures/python/set-comprehension.parseA.txt @@ -2,14 +2,10 @@ (Comprehension (Identifier) ( - ( - ( - (Identifier)) - (Identifier)))) + (Identifier) + (Identifier))) (Comprehension (Identifier) ( - ( - ( - (Identifier)) - (Identifier))))) + (Identifier) + (Identifier)))) diff --git a/test/fixtures/python/set-comprehension.parseB.txt b/test/fixtures/python/set-comprehension.parseB.txt index 7acc1010c..4d04bd87e 100644 --- a/test/fixtures/python/set-comprehension.parseB.txt +++ b/test/fixtures/python/set-comprehension.parseB.txt @@ -2,16 +2,12 @@ (Comprehension (Identifier) ( - ( - ( - (Identifier)) - (Identifier)))) + (Identifier) + (Identifier))) (Comprehension (Plus (Identifier) (Integer)) ( - ( - ( - (Identifier)) - (Identifier))))) + (Identifier) + (Identifier)))) diff --git a/test/fixtures/python/try-statement.diffA-B.txt b/test/fixtures/python/try-statement.diffA-B.txt index a472c50e7..ab0d4b8a8 100644 --- a/test/fixtures/python/try-statement.diffA-B.txt +++ b/test/fixtures/python/try-statement.diffA-B.txt @@ -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 diff --git a/test/fixtures/python/try-statement.diffB-A.txt b/test/fixtures/python/try-statement.diffB-A.txt index 502e882e9..50f6d6864 100644 --- a/test/fixtures/python/try-statement.diffB-A.txt +++ b/test/fixtures/python/try-statement.diffB-A.txt @@ -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)-} {-([])-})-})) diff --git a/test/fixtures/python/try-statement.parseB.txt b/test/fixtures/python/try-statement.parseB.txt index 1ff1030ff..77180043b 100644 --- a/test/fixtures/python/try-statement.parseB.txt +++ b/test/fixtures/python/try-statement.parseB.txt @@ -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) ([])))) diff --git a/test/fixtures/python/tuple.diffA-B.txt b/test/fixtures/python/tuple.diffA-B.txt index bbf65ff69..d0fdb2952 100644 --- a/test/fixtures/python/tuple.diffA-B.txt +++ b/test/fixtures/python/tuple.diffA-B.txt @@ -1,15 +1,11 @@ (Program -{+(Tuple - {+(Identifier)+} - {+(Identifier)+} - {+(Identifier)+})+} (Tuple {-(Identifier)-} (Identifier) + {+(Identifier)+} {+(Identifier)+}) -{+( - {+(Identifier)+})+} -{-(Tuple + (Tuple {-(Identifier)-} - {-(Identifier)-} - {-(Identifier)-})-}) + (Identifier) + (Identifier)) +{+(Identifier)+}) diff --git a/test/fixtures/python/tuple.diffB-A.txt b/test/fixtures/python/tuple.diffB-A.txt index eeaeb3a3e..2418ffb6a 100644 --- a/test/fixtures/python/tuple.diffB-A.txt +++ b/test/fixtures/python/tuple.diffB-A.txt @@ -1,14 +1,11 @@ (Program -{+(Tuple - {+(Identifier)+} - {+(Identifier)+})+} + (Tuple + {-(Identifier)-} + {-(Identifier)-} + (Identifier) + {+(Identifier)+}) (Tuple {+(Identifier)+} (Identifier) - (Identifier) - {-(Identifier)-}) -{-(Tuple - {-(Identifier)-} - {-(Identifier)-})-} -{-( - {-(Identifier)-})-}) + (Identifier)) +{-(Identifier)-}) diff --git a/test/fixtures/python/tuple.parseB.txt b/test/fixtures/python/tuple.parseB.txt index a7b6549fd..fb142601c 100644 --- a/test/fixtures/python/tuple.parseB.txt +++ b/test/fixtures/python/tuple.parseB.txt @@ -6,5 +6,4 @@ (Tuple (Identifier) (Identifier)) - ( - (Identifier))) + (Identifier)) diff --git a/test/fixtures/python/with.diffA-B.txt b/test/fixtures/python/with.diffA-B.txt index bea4444db..cbe67a91b 100644 --- a/test/fixtures/python/with.diffA-B.txt +++ b/test/fixtures/python/with.diffA-B.txt @@ -15,8 +15,7 @@ (Identifier) (Boolean)) {-(ForEach - {-( - {-(Identifier)-})-} + {-(Identifier)-} {-(Identifier)-} {-( {-(Assignment diff --git a/test/fixtures/python/with.diffB-A.txt b/test/fixtures/python/with.diffB-A.txt index 339ae0231..66585dba9 100644 --- a/test/fixtures/python/with.diffB-A.txt +++ b/test/fixtures/python/with.diffB-A.txt @@ -15,8 +15,7 @@ (Identifier) (Boolean)) {+(ForEach - {+( - {+(Identifier)+})+} + {+(Identifier)+} {+(Identifier)+} {+( {+(Assignment diff --git a/test/fixtures/python/with.parseA.txt b/test/fixtures/python/with.parseA.txt index 3f73411a5..b417c619c 100644 --- a/test/fixtures/python/with.parseA.txt +++ b/test/fixtures/python/with.parseA.txt @@ -11,8 +11,7 @@ (Identifier) (Boolean)) (ForEach - ( - (Identifier)) + (Identifier) (Identifier) ( (Assignment