diff --git a/test/fixtures/python/assert-statement.diff+A.txt b/test/fixtures/python/assert-statement.diff+A.txt index dc8848cc1..e1f09d636 100644 --- a/test/fixtures/python/assert-statement.diff+A.txt +++ b/test/fixtures/python/assert-statement.diff+A.txt @@ -1,11 +1,11 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (Identifier) - (Empty))+} -{+(Comment)+} -{+(Call + (Empty)) + (Comment) + (Call (Identifier) (Identifier) (Identifier) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/assert-statement.diff+B.txt b/test/fixtures/python/assert-statement.diff+B.txt index 24f4f6b70..4f7090cea 100644 --- a/test/fixtures/python/assert-statement.diff+B.txt +++ b/test/fixtures/python/assert-statement.diff+B.txt @@ -1,11 +1,11 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (Identifier) (Identifier) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (Identifier) - (Empty))+} -{+(Comment)+}) + (Empty)) + (Comment))+} diff --git a/test/fixtures/python/assert-statement.diff-A.txt b/test/fixtures/python/assert-statement.diff-A.txt index d92ea0f59..1522db3ed 100644 --- a/test/fixtures/python/assert-statement.diff-A.txt +++ b/test/fixtures/python/assert-statement.diff-A.txt @@ -1,11 +1,11 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (Identifier) - (Empty))-} -{-(Comment)-} -{-(Call + (Empty)) + (Comment) + (Call (Identifier) (Identifier) (Identifier) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/assert-statement.diff-B.txt b/test/fixtures/python/assert-statement.diff-B.txt index ec4d86e11..57538c12c 100644 --- a/test/fixtures/python/assert-statement.diff-B.txt +++ b/test/fixtures/python/assert-statement.diff-B.txt @@ -1,11 +1,11 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (Identifier) (Identifier) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (Identifier) - (Empty))-} -{-(Comment)-}) + (Empty)) + (Comment))-} diff --git a/test/fixtures/python/assignment.diff+A.txt b/test/fixtures/python/assignment.diff+A.txt index 01dfffed1..d3f756732 100644 --- a/test/fixtures/python/assignment.diff+A.txt +++ b/test/fixtures/python/assignment.diff+A.txt @@ -1,16 +1,16 @@ -(Program -{+(Assignment +{+(Program + (Assignment (Identifier) - (Integer))+} -{+(Assignment + (Integer)) + (Assignment ( (Identifier) (Identifier)) ( (Integer) - (Integer)))+} -{+(Assignment + (Integer))) + (Assignment (Identifier) ( (Integer) - (Integer)))+}) + (Integer))))+} diff --git a/test/fixtures/python/assignment.diff+B.txt b/test/fixtures/python/assignment.diff+B.txt index 9ad3aae69..b403888f0 100644 --- a/test/fixtures/python/assignment.diff+B.txt +++ b/test/fixtures/python/assignment.diff+B.txt @@ -1,16 +1,16 @@ -(Program -{+(Assignment +{+(Program + (Assignment ( (Identifier) (Identifier)) ( (Integer) - (Integer)))+} -{+(Assignment + (Integer))) + (Assignment (Identifier) - (Integer))+} -{+(Assignment + (Integer)) + (Assignment (Identifier) ( (Integer) - (Integer)))+}) + (Integer))))+} diff --git a/test/fixtures/python/assignment.diff-A.txt b/test/fixtures/python/assignment.diff-A.txt index a9c4aa161..2aef29993 100644 --- a/test/fixtures/python/assignment.diff-A.txt +++ b/test/fixtures/python/assignment.diff-A.txt @@ -1,16 +1,16 @@ -(Program -{-(Assignment +{-(Program + (Assignment (Identifier) - (Integer))-} -{-(Assignment + (Integer)) + (Assignment ( (Identifier) (Identifier)) ( (Integer) - (Integer)))-} -{-(Assignment + (Integer))) + (Assignment (Identifier) ( (Integer) - (Integer)))-}) + (Integer))))-} diff --git a/test/fixtures/python/assignment.diff-B.txt b/test/fixtures/python/assignment.diff-B.txt index f2918e115..b00c0e1d6 100644 --- a/test/fixtures/python/assignment.diff-B.txt +++ b/test/fixtures/python/assignment.diff-B.txt @@ -1,16 +1,16 @@ -(Program -{-(Assignment +{-(Program + (Assignment ( (Identifier) (Identifier)) ( (Integer) - (Integer)))-} -{-(Assignment + (Integer))) + (Assignment (Identifier) - (Integer))-} -{-(Assignment + (Integer)) + (Assignment (Identifier) ( (Integer) - (Integer)))-}) + (Integer))))-} diff --git a/test/fixtures/python/async-function-definition.diff+A.txt b/test/fixtures/python/async-function-definition.diff+A.txt index 80354b705..836ce3d23 100644 --- a/test/fixtures/python/async-function-definition.diff+A.txt +++ b/test/fixtures/python/async-function-definition.diff+A.txt @@ -1,13 +1,13 @@ -(Program -{+(Annotation +{+(Program + (Annotation (Annotation (Function (Identifier) ( (Identifier))) (Empty)) - (Identifier))+} -{+(Annotation + (Identifier)) + (Annotation (Annotation (Function (Identifier) @@ -16,8 +16,8 @@ ( (Identifier))) (Empty)) - (Identifier))+} -{+(Annotation + (Identifier)) + (Annotation (Annotation (Function (Identifier) @@ -25,4 +25,4 @@ ( (Identifier))) (Empty)) - (Identifier))+}) + (Identifier)))+} diff --git a/test/fixtures/python/async-function-definition.diff+B.txt b/test/fixtures/python/async-function-definition.diff+B.txt index 4548f13f0..f6f5f49c5 100644 --- a/test/fixtures/python/async-function-definition.diff+B.txt +++ b/test/fixtures/python/async-function-definition.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(Annotation +{+(Program + (Annotation (Annotation (Function (Identifier) @@ -8,16 +8,16 @@ ( (Identifier))) (Empty)) - (Identifier))+} -{+(Annotation + (Identifier)) + (Annotation (Annotation (Function (Identifier) ( (Identifier))) (Empty)) - (Identifier))+} -{+(Annotation + (Identifier)) + (Annotation (Annotation (Function (Identifier) @@ -25,4 +25,4 @@ ( (Identifier))) (Empty)) - (Identifier))+}) + (Identifier)))+} diff --git a/test/fixtures/python/async-function-definition.diff-A.txt b/test/fixtures/python/async-function-definition.diff-A.txt index 4e3a7b125..269535aef 100644 --- a/test/fixtures/python/async-function-definition.diff-A.txt +++ b/test/fixtures/python/async-function-definition.diff-A.txt @@ -1,13 +1,13 @@ -(Program -{-(Annotation +{-(Program + (Annotation (Annotation (Function (Identifier) ( (Identifier))) (Empty)) - (Identifier))-} -{-(Annotation + (Identifier)) + (Annotation (Annotation (Function (Identifier) @@ -16,8 +16,8 @@ ( (Identifier))) (Empty)) - (Identifier))-} -{-(Annotation + (Identifier)) + (Annotation (Annotation (Function (Identifier) @@ -25,4 +25,4 @@ ( (Identifier))) (Empty)) - (Identifier))-}) + (Identifier)))-} diff --git a/test/fixtures/python/async-function-definition.diff-B.txt b/test/fixtures/python/async-function-definition.diff-B.txt index aa2c2b656..d40a1cd11 100644 --- a/test/fixtures/python/async-function-definition.diff-B.txt +++ b/test/fixtures/python/async-function-definition.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(Annotation +{-(Program + (Annotation (Annotation (Function (Identifier) @@ -8,16 +8,16 @@ ( (Identifier))) (Empty)) - (Identifier))-} -{-(Annotation + (Identifier)) + (Annotation (Annotation (Function (Identifier) ( (Identifier))) (Empty)) - (Identifier))-} -{-(Annotation + (Identifier)) + (Annotation (Annotation (Function (Identifier) @@ -25,4 +25,4 @@ ( (Identifier))) (Empty)) - (Identifier))-}) + (Identifier)))-} diff --git a/test/fixtures/python/attribute.diff+A.txt b/test/fixtures/python/attribute.diff+A.txt index c7905c8c8..181f0e3a0 100644 --- a/test/fixtures/python/attribute.diff+A.txt +++ b/test/fixtures/python/attribute.diff+A.txt @@ -1,4 +1,4 @@ -(Program -{+(MemberAccess +{+(Program + (MemberAccess (Identifier) - (Identifier))+}) + (Identifier)))+} diff --git a/test/fixtures/python/attribute.diff+B.txt b/test/fixtures/python/attribute.diff+B.txt index ba7685832..e0d25aa20 100644 --- a/test/fixtures/python/attribute.diff+B.txt +++ b/test/fixtures/python/attribute.diff+B.txt @@ -1,6 +1,6 @@ -(Program -{+(MemberAccess +{+(Program + (MemberAccess (MemberAccess (Identifier) (Identifier)) - (Identifier))+}) + (Identifier)))+} diff --git a/test/fixtures/python/attribute.diff-A.txt b/test/fixtures/python/attribute.diff-A.txt index 8c1f7baa7..51bfe4c57 100644 --- a/test/fixtures/python/attribute.diff-A.txt +++ b/test/fixtures/python/attribute.diff-A.txt @@ -1,4 +1,4 @@ -(Program -{-(MemberAccess +{-(Program + (MemberAccess (Identifier) - (Identifier))-}) + (Identifier)))-} diff --git a/test/fixtures/python/attribute.diff-B.txt b/test/fixtures/python/attribute.diff-B.txt index ce6cea0c8..1f994281c 100644 --- a/test/fixtures/python/attribute.diff-B.txt +++ b/test/fixtures/python/attribute.diff-B.txt @@ -1,6 +1,6 @@ -(Program -{-(MemberAccess +{-(Program + (MemberAccess (MemberAccess (Identifier) (Identifier)) - (Identifier))-}) + (Identifier)))-} diff --git a/test/fixtures/python/augmented-assignment.diff+A.txt b/test/fixtures/python/augmented-assignment.diff+A.txt index cc56f8828..6dd4147c8 100644 --- a/test/fixtures/python/augmented-assignment.diff+A.txt +++ b/test/fixtures/python/augmented-assignment.diff+A.txt @@ -1,16 +1,16 @@ -(Program -{+(Assignment +{+(Program + (Assignment (Identifier) (Plus (Identifier) - (Integer)))+} -{+(Assignment + (Integer))) + (Assignment (Identifier) (RShift (Identifier) - (Integer)))+} -{+(Assignment + (Integer))) + (Assignment (Identifier) (DividedBy (Identifier) - (Integer)))+}) + (Integer))))+} diff --git a/test/fixtures/python/augmented-assignment.diff+B.txt b/test/fixtures/python/augmented-assignment.diff+B.txt index 97583ce35..3b837c175 100644 --- a/test/fixtures/python/augmented-assignment.diff+B.txt +++ b/test/fixtures/python/augmented-assignment.diff+B.txt @@ -1,16 +1,16 @@ -(Program -{+(Assignment +{+(Program + (Assignment (Identifier) (RShift (Identifier) - (Integer)))+} -{+(Assignment + (Integer))) + (Assignment (Identifier) (DividedBy (Identifier) - (Integer)))+} -{+(Assignment + (Integer))) + (Assignment (Identifier) (Plus (Identifier) - (Integer)))+}) + (Integer))))+} diff --git a/test/fixtures/python/augmented-assignment.diff-A.txt b/test/fixtures/python/augmented-assignment.diff-A.txt index f3545ae0d..696438860 100644 --- a/test/fixtures/python/augmented-assignment.diff-A.txt +++ b/test/fixtures/python/augmented-assignment.diff-A.txt @@ -1,16 +1,16 @@ -(Program -{-(Assignment +{-(Program + (Assignment (Identifier) (Plus (Identifier) - (Integer)))-} -{-(Assignment + (Integer))) + (Assignment (Identifier) (RShift (Identifier) - (Integer)))-} -{-(Assignment + (Integer))) + (Assignment (Identifier) (DividedBy (Identifier) - (Integer)))-}) + (Integer))))-} diff --git a/test/fixtures/python/augmented-assignment.diff-B.txt b/test/fixtures/python/augmented-assignment.diff-B.txt index 2278cdb8b..f59377eef 100644 --- a/test/fixtures/python/augmented-assignment.diff-B.txt +++ b/test/fixtures/python/augmented-assignment.diff-B.txt @@ -1,16 +1,16 @@ -(Program -{-(Assignment +{-(Program + (Assignment (Identifier) (RShift (Identifier) - (Integer)))-} -{-(Assignment + (Integer))) + (Assignment (Identifier) (DividedBy (Identifier) - (Integer)))-} -{-(Assignment + (Integer))) + (Assignment (Identifier) (Plus (Identifier) - (Integer)))-}) + (Integer))))-} diff --git a/test/fixtures/python/await.diff+A.txt b/test/fixtures/python/await.diff+A.txt index a6178db44..ebe5eb3f3 100644 --- a/test/fixtures/python/await.diff+A.txt +++ b/test/fixtures/python/await.diff+A.txt @@ -1,12 +1,12 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (Plus (Integer) ( (Integer))) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (Identifier) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/await.diff+B.txt b/test/fixtures/python/await.diff+B.txt index a6178db44..ebe5eb3f3 100644 --- a/test/fixtures/python/await.diff+B.txt +++ b/test/fixtures/python/await.diff+B.txt @@ -1,12 +1,12 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (Plus (Integer) ( (Integer))) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (Identifier) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/await.diff-A.txt b/test/fixtures/python/await.diff-A.txt index f375a31ad..e2fdf5afd 100644 --- a/test/fixtures/python/await.diff-A.txt +++ b/test/fixtures/python/await.diff-A.txt @@ -1,12 +1,12 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (Plus (Integer) ( (Integer))) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (Identifier) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/await.diff-B.txt b/test/fixtures/python/await.diff-B.txt index f375a31ad..e2fdf5afd 100644 --- a/test/fixtures/python/await.diff-B.txt +++ b/test/fixtures/python/await.diff-B.txt @@ -1,12 +1,12 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (Plus (Integer) ( (Integer))) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (Identifier) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/binary-operator.diff+A.txt b/test/fixtures/python/binary-operator.diff+A.txt index 2abd767f3..cc1ec933a 100644 --- a/test/fixtures/python/binary-operator.diff+A.txt +++ b/test/fixtures/python/binary-operator.diff+A.txt @@ -1,49 +1,49 @@ -(Program -{+(Plus +{+(Program + (Plus (Identifier) ( - (Identifier)))+} -{+(Minus + (Identifier))) + (Minus (Identifier) ( - (Identifier)))+} -{+(Times + (Identifier))) + (Times (Identifier) ( - (Identifier)))+} -{+(DividedBy + (Identifier))) + (DividedBy (Identifier) ( - (Identifier)))+} -{+(Modulo + (Identifier))) + (Modulo (Identifier) ( - (Identifier)))+} -{+(DividedBy + (Identifier))) + (DividedBy (Identifier) ( - (Identifier)))+} -{+(Power + (Identifier))) + (Power (Identifier) ( - (Identifier)))+} -{+(BOr + (Identifier))) + (BOr (Identifier) ( - (Identifier)))+} -{+(BAnd + (Identifier))) + (BAnd (Identifier) ( - (Identifier)))+} -{+(BXOr + (Identifier))) + (BXOr (Identifier) ( - (Identifier)))+} -{+(LShift + (Identifier))) + (LShift (Identifier) ( - (Identifier)))+} -{+(RShift + (Identifier))) + (RShift (Identifier) ( - (Identifier)))+}) + (Identifier))))+} diff --git a/test/fixtures/python/binary-operator.diff+B.txt b/test/fixtures/python/binary-operator.diff+B.txt index d180ae6c4..aa7a2978c 100644 --- a/test/fixtures/python/binary-operator.diff+B.txt +++ b/test/fixtures/python/binary-operator.diff+B.txt @@ -1,49 +1,49 @@ -(Program -{+(RShift +{+(Program + (RShift (Identifier) ( - (Identifier)))+} -{+(LShift + (Identifier))) + (LShift (Identifier) ( - (Identifier)))+} -{+(BXOr + (Identifier))) + (BXOr (Identifier) ( - (Identifier)))+} -{+(BAnd + (Identifier))) + (BAnd (Identifier) ( - (Identifier)))+} -{+(Modulo + (Identifier))) + (Modulo (Identifier) ( - (Identifier)))+} -{+(Power + (Identifier))) + (Power (Identifier) ( - (Identifier)))+} -{+(DividedBy + (Identifier))) + (DividedBy (Identifier) ( - (Identifier)))+} -{+(Modulo + (Identifier))) + (Modulo (Identifier) ( - (Identifier)))+} -{+(DividedBy + (Identifier))) + (DividedBy (Identifier) ( - (Identifier)))+} -{+(Times + (Identifier))) + (Times (Identifier) ( - (Identifier)))+} -{+(Minus + (Identifier))) + (Minus (Identifier) ( - (Identifier)))+} -{+(Plus + (Identifier))) + (Plus (Identifier) ( - (Identifier)))+}) + (Identifier))))+} diff --git a/test/fixtures/python/binary-operator.diff-A.txt b/test/fixtures/python/binary-operator.diff-A.txt index 391737a1b..6a4f377e2 100644 --- a/test/fixtures/python/binary-operator.diff-A.txt +++ b/test/fixtures/python/binary-operator.diff-A.txt @@ -1,49 +1,49 @@ -(Program -{-(Plus +{-(Program + (Plus (Identifier) ( - (Identifier)))-} -{-(Minus + (Identifier))) + (Minus (Identifier) ( - (Identifier)))-} -{-(Times + (Identifier))) + (Times (Identifier) ( - (Identifier)))-} -{-(DividedBy + (Identifier))) + (DividedBy (Identifier) ( - (Identifier)))-} -{-(Modulo + (Identifier))) + (Modulo (Identifier) ( - (Identifier)))-} -{-(DividedBy + (Identifier))) + (DividedBy (Identifier) ( - (Identifier)))-} -{-(Power + (Identifier))) + (Power (Identifier) ( - (Identifier)))-} -{-(BOr + (Identifier))) + (BOr (Identifier) ( - (Identifier)))-} -{-(BAnd + (Identifier))) + (BAnd (Identifier) ( - (Identifier)))-} -{-(BXOr + (Identifier))) + (BXOr (Identifier) ( - (Identifier)))-} -{-(LShift + (Identifier))) + (LShift (Identifier) ( - (Identifier)))-} -{-(RShift + (Identifier))) + (RShift (Identifier) ( - (Identifier)))-}) + (Identifier))))-} diff --git a/test/fixtures/python/binary-operator.diff-B.txt b/test/fixtures/python/binary-operator.diff-B.txt index ef6a73074..e0566c0e5 100644 --- a/test/fixtures/python/binary-operator.diff-B.txt +++ b/test/fixtures/python/binary-operator.diff-B.txt @@ -1,49 +1,49 @@ -(Program -{-(RShift +{-(Program + (RShift (Identifier) ( - (Identifier)))-} -{-(LShift + (Identifier))) + (LShift (Identifier) ( - (Identifier)))-} -{-(BXOr + (Identifier))) + (BXOr (Identifier) ( - (Identifier)))-} -{-(BAnd + (Identifier))) + (BAnd (Identifier) ( - (Identifier)))-} -{-(Modulo + (Identifier))) + (Modulo (Identifier) ( - (Identifier)))-} -{-(Power + (Identifier))) + (Power (Identifier) ( - (Identifier)))-} -{-(DividedBy + (Identifier))) + (DividedBy (Identifier) ( - (Identifier)))-} -{-(Modulo + (Identifier))) + (Modulo (Identifier) ( - (Identifier)))-} -{-(DividedBy + (Identifier))) + (DividedBy (Identifier) ( - (Identifier)))-} -{-(Times + (Identifier))) + (Times (Identifier) ( - (Identifier)))-} -{-(Minus + (Identifier))) + (Minus (Identifier) ( - (Identifier)))-} -{-(Plus + (Identifier))) + (Plus (Identifier) ( - (Identifier)))-}) + (Identifier))))-} diff --git a/test/fixtures/python/boolean-operator.diff+A.txt b/test/fixtures/python/boolean-operator.diff+A.txt index b80b3a4a1..d548c182a 100644 --- a/test/fixtures/python/boolean-operator.diff+A.txt +++ b/test/fixtures/python/boolean-operator.diff+A.txt @@ -1,9 +1,9 @@ -(Program -{+(And +{+(Program + (And (Identifier) ( - (Identifier)))+} -{+(Or + (Identifier))) + (Or (Identifier) ( - (Identifier)))+}) + (Identifier))))+} diff --git a/test/fixtures/python/boolean-operator.diff+B.txt b/test/fixtures/python/boolean-operator.diff+B.txt index 2c498b01e..a8c411d17 100644 --- a/test/fixtures/python/boolean-operator.diff+B.txt +++ b/test/fixtures/python/boolean-operator.diff+B.txt @@ -1,9 +1,9 @@ -(Program -{+(Or +{+(Program + (Or (Identifier) ( - (Identifier)))+} -{+(And + (Identifier))) + (And (Identifier) ( - (Identifier)))+}) + (Identifier))))+} diff --git a/test/fixtures/python/boolean-operator.diff-A.txt b/test/fixtures/python/boolean-operator.diff-A.txt index ed46f6561..54427db3b 100644 --- a/test/fixtures/python/boolean-operator.diff-A.txt +++ b/test/fixtures/python/boolean-operator.diff-A.txt @@ -1,9 +1,9 @@ -(Program -{-(And +{-(Program + (And (Identifier) ( - (Identifier)))-} -{-(Or + (Identifier))) + (Or (Identifier) ( - (Identifier)))-}) + (Identifier))))-} diff --git a/test/fixtures/python/boolean-operator.diff-B.txt b/test/fixtures/python/boolean-operator.diff-B.txt index f758d84bd..06e29a64e 100644 --- a/test/fixtures/python/boolean-operator.diff-B.txt +++ b/test/fixtures/python/boolean-operator.diff-B.txt @@ -1,9 +1,9 @@ -(Program -{-(Or +{-(Program + (Or (Identifier) ( - (Identifier)))-} -{-(And + (Identifier))) + (And (Identifier) ( - (Identifier)))-}) + (Identifier))))-} diff --git a/test/fixtures/python/boolean.diff+A.txt b/test/fixtures/python/boolean.diff+A.txt index b842407e8..645e4277b 100644 --- a/test/fixtures/python/boolean.diff+A.txt +++ b/test/fixtures/python/boolean.diff+A.txt @@ -1,4 +1,4 @@ -(Program -{+(Boolean)+} -{+(Boolean)+} -{+(Boolean)+}) +{+(Program + (Boolean) + (Boolean) + (Boolean))+} diff --git a/test/fixtures/python/boolean.diff+B.txt b/test/fixtures/python/boolean.diff+B.txt index b842407e8..645e4277b 100644 --- a/test/fixtures/python/boolean.diff+B.txt +++ b/test/fixtures/python/boolean.diff+B.txt @@ -1,4 +1,4 @@ -(Program -{+(Boolean)+} -{+(Boolean)+} -{+(Boolean)+}) +{+(Program + (Boolean) + (Boolean) + (Boolean))+} diff --git a/test/fixtures/python/boolean.diff-A.txt b/test/fixtures/python/boolean.diff-A.txt index 8388ea4de..106a60029 100644 --- a/test/fixtures/python/boolean.diff-A.txt +++ b/test/fixtures/python/boolean.diff-A.txt @@ -1,4 +1,4 @@ -(Program -{-(Boolean)-} -{-(Boolean)-} -{-(Boolean)-}) +{-(Program + (Boolean) + (Boolean) + (Boolean))-} diff --git a/test/fixtures/python/boolean.diff-B.txt b/test/fixtures/python/boolean.diff-B.txt index 8388ea4de..106a60029 100644 --- a/test/fixtures/python/boolean.diff-B.txt +++ b/test/fixtures/python/boolean.diff-B.txt @@ -1,4 +1,4 @@ -(Program -{-(Boolean)-} -{-(Boolean)-} -{-(Boolean)-}) +{-(Program + (Boolean) + (Boolean) + (Boolean))-} diff --git a/test/fixtures/python/break-statement.diff+A.txt b/test/fixtures/python/break-statement.diff+A.txt index 24be7edbd..3db8d946b 100644 --- a/test/fixtures/python/break-statement.diff+A.txt +++ b/test/fixtures/python/break-statement.diff+A.txt @@ -1,3 +1,3 @@ -(Program -{+(Break - (Identifier))+}) +{+(Program + (Break + (Identifier)))+} diff --git a/test/fixtures/python/break-statement.diff+B.txt b/test/fixtures/python/break-statement.diff+B.txt index 666d9dadb..d7ef08baa 100644 --- a/test/fixtures/python/break-statement.diff+B.txt +++ b/test/fixtures/python/break-statement.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(Break - (Identifier))+} -{+(Break - (Identifier))+}) +{+(Program + (Break + (Identifier)) + (Break + (Identifier)))+} diff --git a/test/fixtures/python/break-statement.diff-A.txt b/test/fixtures/python/break-statement.diff-A.txt index cab6bcbb3..b4d6a10d3 100644 --- a/test/fixtures/python/break-statement.diff-A.txt +++ b/test/fixtures/python/break-statement.diff-A.txt @@ -1,3 +1,3 @@ -(Program -{-(Break - (Identifier))-}) +{-(Program + (Break + (Identifier)))-} diff --git a/test/fixtures/python/break-statement.diff-B.txt b/test/fixtures/python/break-statement.diff-B.txt index 6d767c9fa..a5ff18d2b 100644 --- a/test/fixtures/python/break-statement.diff-B.txt +++ b/test/fixtures/python/break-statement.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(Break - (Identifier))-} -{-(Break - (Identifier))-}) +{-(Program + (Break + (Identifier)) + (Break + (Identifier)))-} diff --git a/test/fixtures/python/call.diff+A.txt b/test/fixtures/python/call.diff+A.txt index c7e60992e..d4c7a77b6 100644 --- a/test/fixtures/python/call.diff+A.txt +++ b/test/fixtures/python/call.diff+A.txt @@ -1,13 +1,13 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (Identifier) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (Identifier) (Identifier) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/call.diff+B.txt b/test/fixtures/python/call.diff+B.txt index 1a393914d..a632d4698 100644 --- a/test/fixtures/python/call.diff+B.txt +++ b/test/fixtures/python/call.diff+B.txt @@ -1,19 +1,19 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (Identifier) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (Identifier) (Identifier) - (Empty))+} -{+(Call + (Empty)) + (Call (MemberAccess (Identifier) (Identifier)) (Integer) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/call.diff-A.txt b/test/fixtures/python/call.diff-A.txt index 789881961..63dfa6ca3 100644 --- a/test/fixtures/python/call.diff-A.txt +++ b/test/fixtures/python/call.diff-A.txt @@ -1,13 +1,13 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (Identifier) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (Identifier) (Identifier) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/call.diff-B.txt b/test/fixtures/python/call.diff-B.txt index a23125ea8..eada9376f 100644 --- a/test/fixtures/python/call.diff-B.txt +++ b/test/fixtures/python/call.diff-B.txt @@ -1,19 +1,19 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (Identifier) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (Identifier) (Identifier) - (Empty))-} -{-(Call + (Empty)) + (Call (MemberAccess (Identifier) (Identifier)) (Integer) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/class-definition.diff+A.txt b/test/fixtures/python/class-definition.diff+A.txt index ac85ccb48..1f0a10134 100644 --- a/test/fixtures/python/class-definition.diff+A.txt +++ b/test/fixtures/python/class-definition.diff+A.txt @@ -1,5 +1,5 @@ -(Program -{+(Class +{+(Program + (Class (Identifier) (Annotation (Function @@ -8,12 +8,12 @@ ( (Return (Identifier)))) - (Empty)))+} -{+(Class + (Empty))) + (Class (Identifier) (NoOp - (Identifier)))+} -{+(Class + (Identifier))) + (Class (Identifier) (Identifier) (Annotation @@ -23,4 +23,4 @@ ( (Return (Empty)))) - (Empty)))+}) + (Empty))))+} diff --git a/test/fixtures/python/class-definition.diff+B.txt b/test/fixtures/python/class-definition.diff+B.txt index 438304cc5..a1e71e206 100644 --- a/test/fixtures/python/class-definition.diff+B.txt +++ b/test/fixtures/python/class-definition.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(Class +{+(Program + (Class (Identifier) (Identifier) (Annotation @@ -9,8 +9,8 @@ ( (Return (Empty)))) - (Empty)))+} -{+(Class + (Empty))) + (Class (Identifier) (Annotation (Function @@ -19,4 +19,4 @@ ( (Return (Identifier)))) - (Empty)))+}) + (Empty))))+} diff --git a/test/fixtures/python/class-definition.diff-A.txt b/test/fixtures/python/class-definition.diff-A.txt index 840d39d12..8df2ec830 100644 --- a/test/fixtures/python/class-definition.diff-A.txt +++ b/test/fixtures/python/class-definition.diff-A.txt @@ -1,5 +1,5 @@ -(Program -{-(Class +{-(Program + (Class (Identifier) (Annotation (Function @@ -8,12 +8,12 @@ ( (Return (Identifier)))) - (Empty)))-} -{-(Class + (Empty))) + (Class (Identifier) (NoOp - (Identifier)))-} -{-(Class + (Identifier))) + (Class (Identifier) (Identifier) (Annotation @@ -23,4 +23,4 @@ ( (Return (Empty)))) - (Empty)))-}) + (Empty))))-} diff --git a/test/fixtures/python/class-definition.diff-B.txt b/test/fixtures/python/class-definition.diff-B.txt index 83d25523d..58c3a9940 100644 --- a/test/fixtures/python/class-definition.diff-B.txt +++ b/test/fixtures/python/class-definition.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(Class +{-(Program + (Class (Identifier) (Identifier) (Annotation @@ -9,8 +9,8 @@ ( (Return (Empty)))) - (Empty)))-} -{-(Class + (Empty))) + (Class (Identifier) (Annotation (Function @@ -19,4 +19,4 @@ ( (Return (Identifier)))) - (Empty)))-}) + (Empty))))-} diff --git a/test/fixtures/python/comment.diff+A.txt b/test/fixtures/python/comment.diff+A.txt index d4ad6624c..bb7677838 100644 --- a/test/fixtures/python/comment.diff+A.txt +++ b/test/fixtures/python/comment.diff+A.txt @@ -1,3 +1,3 @@ -(Program -{+(Comment)+} -{+(Comment)+}) +{+(Program + (Comment) + (Comment))+} diff --git a/test/fixtures/python/comment.diff+B.txt b/test/fixtures/python/comment.diff+B.txt index 690d52c1d..c51f4fce5 100644 --- a/test/fixtures/python/comment.diff+B.txt +++ b/test/fixtures/python/comment.diff+B.txt @@ -1,4 +1,4 @@ -(Program -{+(Comment)+} -{+(Comment)+} -{+(Comment)+}) +{+(Program + (Comment) + (Comment) + (Comment))+} diff --git a/test/fixtures/python/comment.diff-A.txt b/test/fixtures/python/comment.diff-A.txt index 2ff10adde..13721e346 100644 --- a/test/fixtures/python/comment.diff-A.txt +++ b/test/fixtures/python/comment.diff-A.txt @@ -1,3 +1,3 @@ -(Program -{-(Comment)-} -{-(Comment)-}) +{-(Program + (Comment) + (Comment))-} diff --git a/test/fixtures/python/comment.diff-B.txt b/test/fixtures/python/comment.diff-B.txt index 677c94eeb..9d2a76890 100644 --- a/test/fixtures/python/comment.diff-B.txt +++ b/test/fixtures/python/comment.diff-B.txt @@ -1,4 +1,4 @@ -(Program -{-(Comment)-} -{-(Comment)-} -{-(Comment)-}) +{-(Program + (Comment) + (Comment) + (Comment))-} diff --git a/test/fixtures/python/comparison-operator.diff+A.txt b/test/fixtures/python/comparison-operator.diff+A.txt index 113009fa9..8eb5343f9 100644 --- a/test/fixtures/python/comparison-operator.diff+A.txt +++ b/test/fixtures/python/comparison-operator.diff+A.txt @@ -1,45 +1,45 @@ -(Program -{+(LessThan +{+(Program + (LessThan (Identifier) ( - (Identifier)))+} -{+(LessThanEqual + (Identifier))) + (LessThanEqual (Identifier) ( - (Identifier)))+} -{+(Not + (Identifier))) + (Not (Equal (Identifier) ( - (Identifier))))+} -{+(GreaterThanEqual + (Identifier)))) + (GreaterThanEqual (Identifier) ( - (Identifier)))+} -{+(GreaterThan + (Identifier))) + (GreaterThan (Identifier) ( - (Identifier)))+} -{+(Not + (Identifier))) + (Not (Equal (Identifier) ( - (Identifier))))+} -{+(Member + (Identifier)))) + (Member (Identifier) ( - (Identifier)))+} -{+(Equal + (Identifier))) + (Equal (Identifier) ( - (Identifier)))+} -{+(Not + (Identifier))) + (Not (Member (Identifier) ( - (Identifier))))+} -{+(Not + (Identifier)))) + (Not (Equal (Identifier) ( - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/comparison-operator.diff+B.txt b/test/fixtures/python/comparison-operator.diff+B.txt index 5ffcfbd98..47b7f8aef 100644 --- a/test/fixtures/python/comparison-operator.diff+B.txt +++ b/test/fixtures/python/comparison-operator.diff+B.txt @@ -1,45 +1,45 @@ -(Program -{+(Not +{+(Program + (Not (Equal (Identifier) ( - (Identifier))))+} -{+(Not + (Identifier)))) + (Not (Member (Identifier) ( - (Identifier))))+} -{+(Equal + (Identifier)))) + (Equal (Identifier) ( - (Identifier)))+} -{+(Member + (Identifier))) + (Member (Identifier) ( - (Identifier)))+} -{+(Not + (Identifier))) + (Not (Equal (Identifier) ( - (Identifier))))+} -{+(GreaterThan + (Identifier)))) + (GreaterThan (Identifier) ( - (Identifier)))+} -{+(GreaterThanEqual + (Identifier))) + (GreaterThanEqual (Identifier) ( - (Identifier)))+} -{+(Not + (Identifier))) + (Not (Equal (Identifier) ( - (Identifier))))+} -{+(LessThanEqual + (Identifier)))) + (LessThanEqual (Identifier) ( - (Identifier)))+} -{+(LessThan + (Identifier))) + (LessThan (Identifier) ( - (Identifier)))+}) + (Identifier))))+} diff --git a/test/fixtures/python/comparison-operator.diff-A.txt b/test/fixtures/python/comparison-operator.diff-A.txt index 93b109beb..dceef2c8f 100644 --- a/test/fixtures/python/comparison-operator.diff-A.txt +++ b/test/fixtures/python/comparison-operator.diff-A.txt @@ -1,45 +1,45 @@ -(Program -{-(LessThan +{-(Program + (LessThan (Identifier) ( - (Identifier)))-} -{-(LessThanEqual + (Identifier))) + (LessThanEqual (Identifier) ( - (Identifier)))-} -{-(Not + (Identifier))) + (Not (Equal (Identifier) ( - (Identifier))))-} -{-(GreaterThanEqual + (Identifier)))) + (GreaterThanEqual (Identifier) ( - (Identifier)))-} -{-(GreaterThan + (Identifier))) + (GreaterThan (Identifier) ( - (Identifier)))-} -{-(Not + (Identifier))) + (Not (Equal (Identifier) ( - (Identifier))))-} -{-(Member + (Identifier)))) + (Member (Identifier) ( - (Identifier)))-} -{-(Equal + (Identifier))) + (Equal (Identifier) ( - (Identifier)))-} -{-(Not + (Identifier))) + (Not (Member (Identifier) ( - (Identifier))))-} -{-(Not + (Identifier)))) + (Not (Equal (Identifier) ( - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/comparison-operator.diff-B.txt b/test/fixtures/python/comparison-operator.diff-B.txt index 3bc6ca280..8718ba79e 100644 --- a/test/fixtures/python/comparison-operator.diff-B.txt +++ b/test/fixtures/python/comparison-operator.diff-B.txt @@ -1,45 +1,45 @@ -(Program -{-(Not +{-(Program + (Not (Equal (Identifier) ( - (Identifier))))-} -{-(Not + (Identifier)))) + (Not (Member (Identifier) ( - (Identifier))))-} -{-(Equal + (Identifier)))) + (Equal (Identifier) ( - (Identifier)))-} -{-(Member + (Identifier))) + (Member (Identifier) ( - (Identifier)))-} -{-(Not + (Identifier))) + (Not (Equal (Identifier) ( - (Identifier))))-} -{-(GreaterThan + (Identifier)))) + (GreaterThan (Identifier) ( - (Identifier)))-} -{-(GreaterThanEqual + (Identifier))) + (GreaterThanEqual (Identifier) ( - (Identifier)))-} -{-(Not + (Identifier))) + (Not (Equal (Identifier) ( - (Identifier))))-} -{-(LessThanEqual + (Identifier)))) + (LessThanEqual (Identifier) ( - (Identifier)))-} -{-(LessThan + (Identifier))) + (LessThan (Identifier) ( - (Identifier)))-}) + (Identifier))))-} diff --git a/test/fixtures/python/concatenated-string.diff+A.txt b/test/fixtures/python/concatenated-string.diff+A.txt index e95b3a3e6..1650688b1 100644 --- a/test/fixtures/python/concatenated-string.diff+A.txt +++ b/test/fixtures/python/concatenated-string.diff+A.txt @@ -1,2 +1,2 @@ -(Program -{+(TextElement)+}) +{+(Program + (TextElement))+} diff --git a/test/fixtures/python/concatenated-string.diff+B.txt b/test/fixtures/python/concatenated-string.diff+B.txt index e95b3a3e6..1650688b1 100644 --- a/test/fixtures/python/concatenated-string.diff+B.txt +++ b/test/fixtures/python/concatenated-string.diff+B.txt @@ -1,2 +1,2 @@ -(Program -{+(TextElement)+}) +{+(Program + (TextElement))+} diff --git a/test/fixtures/python/concatenated-string.diff-A.txt b/test/fixtures/python/concatenated-string.diff-A.txt index 4c154200d..2b93aea4a 100644 --- a/test/fixtures/python/concatenated-string.diff-A.txt +++ b/test/fixtures/python/concatenated-string.diff-A.txt @@ -1,2 +1,2 @@ -(Program -{-(TextElement)-}) +{-(Program + (TextElement))-} diff --git a/test/fixtures/python/concatenated-string.diff-B.txt b/test/fixtures/python/concatenated-string.diff-B.txt index 4c154200d..2b93aea4a 100644 --- a/test/fixtures/python/concatenated-string.diff-B.txt +++ b/test/fixtures/python/concatenated-string.diff-B.txt @@ -1,2 +1,2 @@ -(Program -{-(TextElement)-}) +{-(Program + (TextElement))-} diff --git a/test/fixtures/python/conditional-expression.diff+A.txt b/test/fixtures/python/conditional-expression.diff+A.txt index 3731ba863..1c53289a7 100644 --- a/test/fixtures/python/conditional-expression.diff+A.txt +++ b/test/fixtures/python/conditional-expression.diff+A.txt @@ -1,15 +1,15 @@ -(Program -{+(If +{+(Program + (If (Identifier) (Call (Identifier) (Empty)) ( - (Identifier)))+} -{+(Assignment + (Identifier))) + (Assignment (Identifier) (If (Identifier) (Identifier) ( - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/conditional-expression.diff+B.txt b/test/fixtures/python/conditional-expression.diff+B.txt index 9dc0cc2c5..dfc68e8e8 100644 --- a/test/fixtures/python/conditional-expression.diff+B.txt +++ b/test/fixtures/python/conditional-expression.diff+B.txt @@ -1,12 +1,12 @@ -(Program -{+(Assignment +{+(Program + (Assignment (Identifier) (If (Identifier) (Identifier) ( - (Identifier))))+} -{+(If + (Identifier)))) + (If (Identifier) (Call (Identifier) @@ -14,4 +14,4 @@ ( (Call (Identifier) - (Empty))))+}) + (Empty)))))+} diff --git a/test/fixtures/python/conditional-expression.diff-A.txt b/test/fixtures/python/conditional-expression.diff-A.txt index 7093ce05e..1bdcb1a7f 100644 --- a/test/fixtures/python/conditional-expression.diff-A.txt +++ b/test/fixtures/python/conditional-expression.diff-A.txt @@ -1,15 +1,15 @@ -(Program -{-(If +{-(Program + (If (Identifier) (Call (Identifier) (Empty)) ( - (Identifier)))-} -{-(Assignment + (Identifier))) + (Assignment (Identifier) (If (Identifier) (Identifier) ( - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/conditional-expression.diff-B.txt b/test/fixtures/python/conditional-expression.diff-B.txt index db85f45ed..be18bdf3f 100644 --- a/test/fixtures/python/conditional-expression.diff-B.txt +++ b/test/fixtures/python/conditional-expression.diff-B.txt @@ -1,12 +1,12 @@ -(Program -{-(Assignment +{-(Program + (Assignment (Identifier) (If (Identifier) (Identifier) ( - (Identifier))))-} -{-(If + (Identifier)))) + (If (Identifier) (Call (Identifier) @@ -14,4 +14,4 @@ ( (Call (Identifier) - (Empty))))-}) + (Empty)))))-} diff --git a/test/fixtures/python/continue-statement.diff+A.txt b/test/fixtures/python/continue-statement.diff+A.txt index 50800eda2..c290413ff 100644 --- a/test/fixtures/python/continue-statement.diff+A.txt +++ b/test/fixtures/python/continue-statement.diff+A.txt @@ -1,3 +1,3 @@ -(Program -{+(Continue - (Identifier))+}) +{+(Program + (Continue + (Identifier)))+} diff --git a/test/fixtures/python/continue-statement.diff+B.txt b/test/fixtures/python/continue-statement.diff+B.txt index 943e703c0..68e1d84f0 100644 --- a/test/fixtures/python/continue-statement.diff+B.txt +++ b/test/fixtures/python/continue-statement.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(Continue - (Identifier))+} -{+(Continue - (Identifier))+}) +{+(Program + (Continue + (Identifier)) + (Continue + (Identifier)))+} diff --git a/test/fixtures/python/continue-statement.diff-A.txt b/test/fixtures/python/continue-statement.diff-A.txt index ed6ca22fc..006786ef4 100644 --- a/test/fixtures/python/continue-statement.diff-A.txt +++ b/test/fixtures/python/continue-statement.diff-A.txt @@ -1,3 +1,3 @@ -(Program -{-(Continue - (Identifier))-}) +{-(Program + (Continue + (Identifier)))-} diff --git a/test/fixtures/python/continue-statement.diff-B.txt b/test/fixtures/python/continue-statement.diff-B.txt index 7d1d9dd0b..1e0fed9cf 100644 --- a/test/fixtures/python/continue-statement.diff-B.txt +++ b/test/fixtures/python/continue-statement.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(Continue - (Identifier))-} -{-(Continue - (Identifier))-}) +{-(Program + (Continue + (Identifier)) + (Continue + (Identifier)))-} diff --git a/test/fixtures/python/decorated-definition.diff+A.txt b/test/fixtures/python/decorated-definition.diff+A.txt index 94793fd4e..59148f4db 100644 --- a/test/fixtures/python/decorated-definition.diff+A.txt +++ b/test/fixtures/python/decorated-definition.diff+A.txt @@ -1,5 +1,5 @@ -(Program -{+(Decorator +{+(Program + (Decorator (ScopeResolution (Identifier) (Identifier)) @@ -52,4 +52,4 @@ (Identifier) ( (Identifier))) - (Empty)))))))))))+}) + (Empty))))))))))))+} diff --git a/test/fixtures/python/decorated-definition.diff+B.txt b/test/fixtures/python/decorated-definition.diff+B.txt index ba08558f5..6826ee203 100644 --- a/test/fixtures/python/decorated-definition.diff+B.txt +++ b/test/fixtures/python/decorated-definition.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(Decorator +{+(Program + (Decorator (ScopeResolution (Identifier) (Identifier)) @@ -34,4 +34,4 @@ (Identifier) ( (Identifier))) - (Empty))))))))+}) + (Empty)))))))))+} diff --git a/test/fixtures/python/decorated-definition.diff-A.txt b/test/fixtures/python/decorated-definition.diff-A.txt index 1e0260ca9..410f380ca 100644 --- a/test/fixtures/python/decorated-definition.diff-A.txt +++ b/test/fixtures/python/decorated-definition.diff-A.txt @@ -1,5 +1,5 @@ -(Program -{-(Decorator +{-(Program + (Decorator (ScopeResolution (Identifier) (Identifier)) @@ -52,4 +52,4 @@ (Identifier) ( (Identifier))) - (Empty)))))))))))-}) + (Empty))))))))))))-} diff --git a/test/fixtures/python/decorated-definition.diff-B.txt b/test/fixtures/python/decorated-definition.diff-B.txt index 0ba7b34d1..269c52b5d 100644 --- a/test/fixtures/python/decorated-definition.diff-B.txt +++ b/test/fixtures/python/decorated-definition.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(Decorator +{-(Program + (Decorator (ScopeResolution (Identifier) (Identifier)) @@ -34,4 +34,4 @@ (Identifier) ( (Identifier))) - (Empty))))))))-}) + (Empty)))))))))-} diff --git a/test/fixtures/python/delete-statement.diff+A.txt b/test/fixtures/python/delete-statement.diff+A.txt index b0c292679..2f91fdac9 100644 --- a/test/fixtures/python/delete-statement.diff+A.txt +++ b/test/fixtures/python/delete-statement.diff+A.txt @@ -1,5 +1,5 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (Subscript (Identifier) @@ -7,4 +7,4 @@ (Subscript (Identifier) (Integer)) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/delete-statement.diff+B.txt b/test/fixtures/python/delete-statement.diff+B.txt index b0c292679..2f91fdac9 100644 --- a/test/fixtures/python/delete-statement.diff+B.txt +++ b/test/fixtures/python/delete-statement.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (Subscript (Identifier) @@ -7,4 +7,4 @@ (Subscript (Identifier) (Integer)) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/delete-statement.diff-A.txt b/test/fixtures/python/delete-statement.diff-A.txt index 4abecb668..59bf8fa31 100644 --- a/test/fixtures/python/delete-statement.diff-A.txt +++ b/test/fixtures/python/delete-statement.diff-A.txt @@ -1,5 +1,5 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (Subscript (Identifier) @@ -7,4 +7,4 @@ (Subscript (Identifier) (Integer)) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/delete-statement.diff-B.txt b/test/fixtures/python/delete-statement.diff-B.txt index 4abecb668..59bf8fa31 100644 --- a/test/fixtures/python/delete-statement.diff-B.txt +++ b/test/fixtures/python/delete-statement.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (Subscript (Identifier) @@ -7,4 +7,4 @@ (Subscript (Identifier) (Integer)) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/dictionary-comprehension.diff+A.txt b/test/fixtures/python/dictionary-comprehension.diff+A.txt index 0a0629c0d..e519b2c5f 100644 --- a/test/fixtures/python/dictionary-comprehension.diff+A.txt +++ b/test/fixtures/python/dictionary-comprehension.diff+A.txt @@ -1,5 +1,5 @@ -(Program -{+(Comprehension +{+(Program + (Comprehension (KeyValue (Identifier) (Identifier)) @@ -7,8 +7,8 @@ ( ( (Identifier)) - (Identifier))))+} -{+(Comprehension + (Identifier)))) + (Comprehension (KeyValue (Identifier) (Identifier)) @@ -18,4 +18,4 @@ (Identifier)) (Identifier)) ( - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/dictionary-comprehension.diff+B.txt b/test/fixtures/python/dictionary-comprehension.diff+B.txt index 6d7491704..29d6981e1 100644 --- a/test/fixtures/python/dictionary-comprehension.diff+B.txt +++ b/test/fixtures/python/dictionary-comprehension.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(Comprehension +{+(Program + (Comprehension (KeyValue (Identifier) (Identifier)) @@ -9,8 +9,8 @@ (Identifier)) (Identifier)) ( - (Identifier))))+} -{+(Comprehension + (Identifier)))) + (Comprehension (KeyValue (Identifier) (Integer)) @@ -18,4 +18,4 @@ ( ( (Identifier)) - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/dictionary-comprehension.diff-A.txt b/test/fixtures/python/dictionary-comprehension.diff-A.txt index b72d50ff5..27c7e6a00 100644 --- a/test/fixtures/python/dictionary-comprehension.diff-A.txt +++ b/test/fixtures/python/dictionary-comprehension.diff-A.txt @@ -1,5 +1,5 @@ -(Program -{-(Comprehension +{-(Program + (Comprehension (KeyValue (Identifier) (Identifier)) @@ -7,8 +7,8 @@ ( ( (Identifier)) - (Identifier))))-} -{-(Comprehension + (Identifier)))) + (Comprehension (KeyValue (Identifier) (Identifier)) @@ -18,4 +18,4 @@ (Identifier)) (Identifier)) ( - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/dictionary-comprehension.diff-B.txt b/test/fixtures/python/dictionary-comprehension.diff-B.txt index 00a4f021f..c8c423a74 100644 --- a/test/fixtures/python/dictionary-comprehension.diff-B.txt +++ b/test/fixtures/python/dictionary-comprehension.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(Comprehension +{-(Program + (Comprehension (KeyValue (Identifier) (Identifier)) @@ -9,8 +9,8 @@ (Identifier)) (Identifier)) ( - (Identifier))))-} -{-(Comprehension + (Identifier)))) + (Comprehension (KeyValue (Identifier) (Integer)) @@ -18,4 +18,4 @@ ( ( (Identifier)) - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/dictionary.diff+A.txt b/test/fixtures/python/dictionary.diff+A.txt index b52b5453e..3ecc83e42 100644 --- a/test/fixtures/python/dictionary.diff+A.txt +++ b/test/fixtures/python/dictionary.diff+A.txt @@ -1,13 +1,13 @@ -(Program -{+(Hash)+} -{+(Hash +{+(Program + (Hash) + (Hash (KeyValue (Identifier) - (Integer)))+} -{+(Hash + (Integer))) + (Hash (KeyValue (Identifier) (Identifier)) (KeyValue (Identifier) - (Identifier)))+}) + (Identifier))))+} diff --git a/test/fixtures/python/dictionary.diff+B.txt b/test/fixtures/python/dictionary.diff+B.txt index c522c7a57..e56806dee 100644 --- a/test/fixtures/python/dictionary.diff+B.txt +++ b/test/fixtures/python/dictionary.diff+B.txt @@ -1,10 +1,10 @@ -(Program -{+(Hash +{+(Program + (Hash (KeyValue (Identifier) - (Integer)))+} -{+(Hash)+} -{+(Assignment + (Integer))) + (Hash) + (Assignment (Identifier) (Hash (Comment) @@ -13,4 +13,4 @@ (Identifier)) (KeyValue (Identifier) - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/dictionary.diff-A.txt b/test/fixtures/python/dictionary.diff-A.txt index 21569773a..190fa3928 100644 --- a/test/fixtures/python/dictionary.diff-A.txt +++ b/test/fixtures/python/dictionary.diff-A.txt @@ -1,13 +1,13 @@ -(Program -{-(Hash)-} -{-(Hash +{-(Program + (Hash) + (Hash (KeyValue (Identifier) - (Integer)))-} -{-(Hash + (Integer))) + (Hash (KeyValue (Identifier) (Identifier)) (KeyValue (Identifier) - (Identifier)))-}) + (Identifier))))-} diff --git a/test/fixtures/python/dictionary.diff-B.txt b/test/fixtures/python/dictionary.diff-B.txt index a0d38a895..00d6a9145 100644 --- a/test/fixtures/python/dictionary.diff-B.txt +++ b/test/fixtures/python/dictionary.diff-B.txt @@ -1,10 +1,10 @@ -(Program -{-(Hash +{-(Program + (Hash (KeyValue (Identifier) - (Integer)))-} -{-(Hash)-} -{-(Assignment + (Integer))) + (Hash) + (Assignment (Identifier) (Hash (Comment) @@ -13,4 +13,4 @@ (Identifier)) (KeyValue (Identifier) - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/dotted-name.diff+A.txt b/test/fixtures/python/dotted-name.diff+A.txt index 7cb7ec108..41c1e89cc 100644 --- a/test/fixtures/python/dotted-name.diff+A.txt +++ b/test/fixtures/python/dotted-name.diff+A.txt @@ -1,9 +1,9 @@ -(Program -{+(MemberAccess +{+(Program + (MemberAccess (Identifier) - (Identifier))+} -{+(MemberAccess + (Identifier)) + (MemberAccess (MemberAccess (Identifier) (Identifier)) - (Identifier))+}) + (Identifier)))+} diff --git a/test/fixtures/python/dotted-name.diff+B.txt b/test/fixtures/python/dotted-name.diff+B.txt index f6836ed6f..fa2e1c6e7 100644 --- a/test/fixtures/python/dotted-name.diff+B.txt +++ b/test/fixtures/python/dotted-name.diff+B.txt @@ -1,9 +1,9 @@ -(Program -{+(MemberAccess +{+(Program + (MemberAccess (MemberAccess (Identifier) (Identifier)) - (Identifier))+} -{+(MemberAccess + (Identifier)) + (MemberAccess (Identifier) - (Identifier))+}) + (Identifier)))+} diff --git a/test/fixtures/python/dotted-name.diff-A.txt b/test/fixtures/python/dotted-name.diff-A.txt index ce96c9f3b..db78e7dde 100644 --- a/test/fixtures/python/dotted-name.diff-A.txt +++ b/test/fixtures/python/dotted-name.diff-A.txt @@ -1,9 +1,9 @@ -(Program -{-(MemberAccess +{-(Program + (MemberAccess (Identifier) - (Identifier))-} -{-(MemberAccess + (Identifier)) + (MemberAccess (MemberAccess (Identifier) (Identifier)) - (Identifier))-}) + (Identifier)))-} diff --git a/test/fixtures/python/dotted-name.diff-B.txt b/test/fixtures/python/dotted-name.diff-B.txt index 84b0b8bf5..77d78bf56 100644 --- a/test/fixtures/python/dotted-name.diff-B.txt +++ b/test/fixtures/python/dotted-name.diff-B.txt @@ -1,9 +1,9 @@ -(Program -{-(MemberAccess +{-(Program + (MemberAccess (MemberAccess (Identifier) (Identifier)) - (Identifier))-} -{-(MemberAccess + (Identifier)) + (MemberAccess (Identifier) - (Identifier))-}) + (Identifier)))-} diff --git a/test/fixtures/python/ellipsis.diff+A.txt b/test/fixtures/python/ellipsis.diff+A.txt index 213ff81c2..d0ba267ed 100644 --- a/test/fixtures/python/ellipsis.diff+A.txt +++ b/test/fixtures/python/ellipsis.diff+A.txt @@ -1,3 +1,3 @@ -(Program -{+(Ellipsis)+} -{+(Ellipsis)+}) +{+(Program + (Ellipsis) + (Ellipsis))+} diff --git a/test/fixtures/python/ellipsis.diff+B.txt b/test/fixtures/python/ellipsis.diff+B.txt index 71b5b430c..179eb5c1a 100644 --- a/test/fixtures/python/ellipsis.diff+B.txt +++ b/test/fixtures/python/ellipsis.diff+B.txt @@ -1,2 +1,2 @@ -(Program -{+(Ellipsis)+}) +{+(Program + (Ellipsis))+} diff --git a/test/fixtures/python/ellipsis.diff-A.txt b/test/fixtures/python/ellipsis.diff-A.txt index 2d79c1682..367c8058d 100644 --- a/test/fixtures/python/ellipsis.diff-A.txt +++ b/test/fixtures/python/ellipsis.diff-A.txt @@ -1,3 +1,3 @@ -(Program -{-(Ellipsis)-} -{-(Ellipsis)-}) +{-(Program + (Ellipsis) + (Ellipsis))-} diff --git a/test/fixtures/python/ellipsis.diff-B.txt b/test/fixtures/python/ellipsis.diff-B.txt index 7b289c46a..f85a2709b 100644 --- a/test/fixtures/python/ellipsis.diff-B.txt +++ b/test/fixtures/python/ellipsis.diff-B.txt @@ -1,2 +1,2 @@ -(Program -{-(Ellipsis)-}) +{-(Program + (Ellipsis))-} diff --git a/test/fixtures/python/exec-statement.diff+A.txt b/test/fixtures/python/exec-statement.diff+A.txt index f17efe7a1..8b6a08cc6 100644 --- a/test/fixtures/python/exec-statement.diff+A.txt +++ b/test/fixtures/python/exec-statement.diff+A.txt @@ -1,16 +1,16 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (TextElement) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (TextElement) (Null) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (TextElement) (Identifier) (Identifier) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/exec-statement.diff+B.txt b/test/fixtures/python/exec-statement.diff+B.txt index 02986ca22..fd22b2232 100644 --- a/test/fixtures/python/exec-statement.diff+B.txt +++ b/test/fixtures/python/exec-statement.diff+B.txt @@ -1,16 +1,16 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (TextElement) (Identifier) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (TextElement) (Identifier) (Identifier) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (TextElement) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/exec-statement.diff-A.txt b/test/fixtures/python/exec-statement.diff-A.txt index c686e6ebb..fa7bbda3c 100644 --- a/test/fixtures/python/exec-statement.diff-A.txt +++ b/test/fixtures/python/exec-statement.diff-A.txt @@ -1,16 +1,16 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (TextElement) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (TextElement) (Null) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (TextElement) (Identifier) (Identifier) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/exec-statement.diff-B.txt b/test/fixtures/python/exec-statement.diff-B.txt index 13f6661b4..b29332565 100644 --- a/test/fixtures/python/exec-statement.diff-B.txt +++ b/test/fixtures/python/exec-statement.diff-B.txt @@ -1,16 +1,16 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (TextElement) (Identifier) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (TextElement) (Identifier) (Identifier) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (TextElement) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/expression-statement.diff+A.txt b/test/fixtures/python/expression-statement.diff+A.txt index 52734fd80..0c299bc63 100644 --- a/test/fixtures/python/expression-statement.diff+A.txt +++ b/test/fixtures/python/expression-statement.diff+A.txt @@ -1,14 +1,14 @@ -(Program -{+(Identifier)+} -{+(Plus +{+(Program + (Identifier) + (Plus (Identifier) ( - (Identifier)))+} -{+( + (Identifier))) + ( (Integer) (Integer) - (Integer))+} -{+( + (Integer)) + ( (Integer) (Integer) - (Integer))+}) + (Integer)))+} diff --git a/test/fixtures/python/expression-statement.diff+B.txt b/test/fixtures/python/expression-statement.diff+B.txt index 5899cb8c6..30eeea76f 100644 --- a/test/fixtures/python/expression-statement.diff+B.txt +++ b/test/fixtures/python/expression-statement.diff+B.txt @@ -1,14 +1,14 @@ -(Program -{+( +{+(Program + ( (Integer) (Integer) - (Integer))+} -{+(Identifier)+} -{+( + (Integer)) + (Identifier) + ( (Integer) (Integer) - (Integer))+} -{+(Plus + (Integer)) + (Plus (Identifier) ( - (Identifier)))+}) + (Identifier))))+} diff --git a/test/fixtures/python/expression-statement.diff-A.txt b/test/fixtures/python/expression-statement.diff-A.txt index 3e298d7b4..d0ae3e6de 100644 --- a/test/fixtures/python/expression-statement.diff-A.txt +++ b/test/fixtures/python/expression-statement.diff-A.txt @@ -1,14 +1,14 @@ -(Program -{-(Identifier)-} -{-(Plus +{-(Program + (Identifier) + (Plus (Identifier) ( - (Identifier)))-} -{-( + (Identifier))) + ( (Integer) (Integer) - (Integer))-} -{-( + (Integer)) + ( (Integer) (Integer) - (Integer))-}) + (Integer)))-} diff --git a/test/fixtures/python/expression-statement.diff-B.txt b/test/fixtures/python/expression-statement.diff-B.txt index 2f0d4b58b..6eaec177f 100644 --- a/test/fixtures/python/expression-statement.diff-B.txt +++ b/test/fixtures/python/expression-statement.diff-B.txt @@ -1,14 +1,14 @@ -(Program -{-( +{-(Program + ( (Integer) (Integer) - (Integer))-} -{-(Identifier)-} -{-( + (Integer)) + (Identifier) + ( (Integer) (Integer) - (Integer))-} -{-(Plus + (Integer)) + (Plus (Identifier) ( - (Identifier)))-}) + (Identifier))))-} diff --git a/test/fixtures/python/float.diff+A.txt b/test/fixtures/python/float.diff+A.txt index 8ea1458ef..438a5dd0e 100644 --- a/test/fixtures/python/float.diff+A.txt +++ b/test/fixtures/python/float.diff+A.txt @@ -1,12 +1,12 @@ -(Program -{+(Negate - (Float))+} -{+(Float)+} -{+(Float)+} -{+(Float)+} -{+(Float)+} -{+(Float)+} -{+(Float)+} -{+(Float)+} -{+(Float)+} -{+(Float)+}) +{+(Program + (Negate + (Float)) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float))+} diff --git a/test/fixtures/python/float.diff+B.txt b/test/fixtures/python/float.diff+B.txt index 8ea1458ef..438a5dd0e 100644 --- a/test/fixtures/python/float.diff+B.txt +++ b/test/fixtures/python/float.diff+B.txt @@ -1,12 +1,12 @@ -(Program -{+(Negate - (Float))+} -{+(Float)+} -{+(Float)+} -{+(Float)+} -{+(Float)+} -{+(Float)+} -{+(Float)+} -{+(Float)+} -{+(Float)+} -{+(Float)+}) +{+(Program + (Negate + (Float)) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float))+} diff --git a/test/fixtures/python/float.diff-A.txt b/test/fixtures/python/float.diff-A.txt index e7438b2c5..c7e6c6e6d 100644 --- a/test/fixtures/python/float.diff-A.txt +++ b/test/fixtures/python/float.diff-A.txt @@ -1,12 +1,12 @@ -(Program -{-(Negate - (Float))-} -{-(Float)-} -{-(Float)-} -{-(Float)-} -{-(Float)-} -{-(Float)-} -{-(Float)-} -{-(Float)-} -{-(Float)-} -{-(Float)-}) +{-(Program + (Negate + (Float)) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float))-} diff --git a/test/fixtures/python/float.diff-B.txt b/test/fixtures/python/float.diff-B.txt index e7438b2c5..c7e6c6e6d 100644 --- a/test/fixtures/python/float.diff-B.txt +++ b/test/fixtures/python/float.diff-B.txt @@ -1,12 +1,12 @@ -(Program -{-(Negate - (Float))-} -{-(Float)-} -{-(Float)-} -{-(Float)-} -{-(Float)-} -{-(Float)-} -{-(Float)-} -{-(Float)-} -{-(Float)-} -{-(Float)-}) +{-(Program + (Negate + (Float)) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float) + (Float))-} diff --git a/test/fixtures/python/for-statement.diff+A.txt b/test/fixtures/python/for-statement.diff+A.txt index 4d647cbf4..6a1478e02 100644 --- a/test/fixtures/python/for-statement.diff+A.txt +++ b/test/fixtures/python/for-statement.diff+A.txt @@ -1,5 +1,5 @@ -(Program -{+(Else +{+(Program + (Else (ForEach ( (Identifier) @@ -24,8 +24,8 @@ (Call (Identifier) (Identifier) - (Empty))))+} -{+(ForEach + (Empty)))) + (ForEach ( (Identifier)) (Array @@ -36,4 +36,4 @@ (Tuple (Integer))) ( - (Identifier)))+}) + (Identifier))))+} diff --git a/test/fixtures/python/for-statement.diff+B.txt b/test/fixtures/python/for-statement.diff+B.txt index 7d0ef8936..220c7f618 100644 --- a/test/fixtures/python/for-statement.diff+B.txt +++ b/test/fixtures/python/for-statement.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(ForEach +{+(Program + (ForEach ( (Identifier)) (Array @@ -10,8 +10,8 @@ (Tuple (Integer))) ( - (Identifier)))+} -{+(Else + (Identifier))) + (Else (ForEach ( (Identifier) @@ -36,4 +36,4 @@ (Call (Identifier) (Identifier) - (Empty))))+}) + (Empty)))))+} diff --git a/test/fixtures/python/for-statement.diff-A.txt b/test/fixtures/python/for-statement.diff-A.txt index 0a36a92b2..011e57f5a 100644 --- a/test/fixtures/python/for-statement.diff-A.txt +++ b/test/fixtures/python/for-statement.diff-A.txt @@ -1,5 +1,5 @@ -(Program -{-(Else +{-(Program + (Else (ForEach ( (Identifier) @@ -24,8 +24,8 @@ (Call (Identifier) (Identifier) - (Empty))))-} -{-(ForEach + (Empty)))) + (ForEach ( (Identifier)) (Array @@ -36,4 +36,4 @@ (Tuple (Integer))) ( - (Identifier)))-}) + (Identifier))))-} diff --git a/test/fixtures/python/for-statement.diff-B.txt b/test/fixtures/python/for-statement.diff-B.txt index b2eba62ef..4f17d5d7c 100644 --- a/test/fixtures/python/for-statement.diff-B.txt +++ b/test/fixtures/python/for-statement.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(ForEach +{-(Program + (ForEach ( (Identifier)) (Array @@ -10,8 +10,8 @@ (Tuple (Integer))) ( - (Identifier)))-} -{-(Else + (Identifier))) + (Else (ForEach ( (Identifier) @@ -36,4 +36,4 @@ (Call (Identifier) (Identifier) - (Empty))))-}) + (Empty)))))-} diff --git a/test/fixtures/python/function-definition.diff+A.txt b/test/fixtures/python/function-definition.diff+A.txt index 8d8947553..f14ce36e4 100644 --- a/test/fixtures/python/function-definition.diff+A.txt +++ b/test/fixtures/python/function-definition.diff+A.txt @@ -1,26 +1,26 @@ -(Program -{+(Annotation +{+(Program + (Annotation (Function (Identifier) ( (Identifier))) - (Empty))+} -{+(Annotation + (Empty)) + (Annotation (Function (Identifier) (Identifier) ( (Identifier))) - (Empty))+} -{+(Annotation + (Empty)) + (Annotation (Function (Identifier) (Identifier) (Identifier) ( (Identifier))) - (Empty))+} -{+(Annotation + (Empty)) + (Annotation (Function (Identifier) (Assignment @@ -28,8 +28,8 @@ (Identifier)) ( (Identifier))) - (Empty))+} -{+(Annotation + (Empty)) + (Annotation (Function (Identifier) (Annotation @@ -40,4 +40,4 @@ (Identifier) ( (Identifier))) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/function-definition.diff+B.txt b/test/fixtures/python/function-definition.diff+B.txt index 4d3e24be7..f93248a02 100644 --- a/test/fixtures/python/function-definition.diff+B.txt +++ b/test/fixtures/python/function-definition.diff+B.txt @@ -1,26 +1,26 @@ -(Program -{+(Annotation +{+(Program + (Annotation (Function (Identifier) (Identifier) (Identifier) ( (Identifier))) - (Empty))+} -{+(Annotation + (Empty)) + (Annotation (Function (Identifier) ( (Identifier))) - (Empty))+} -{+(Annotation + (Empty)) + (Annotation (Function (Identifier) (Identifier) ( (Identifier))) - (Empty))+} -{+(Annotation + (Empty)) + (Annotation (Function (Identifier) (Annotation @@ -31,4 +31,4 @@ (Identifier) ( (Identifier))) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/function-definition.diff-A.txt b/test/fixtures/python/function-definition.diff-A.txt index 15606913e..3b97ceec1 100644 --- a/test/fixtures/python/function-definition.diff-A.txt +++ b/test/fixtures/python/function-definition.diff-A.txt @@ -1,26 +1,26 @@ -(Program -{-(Annotation +{-(Program + (Annotation (Function (Identifier) ( (Identifier))) - (Empty))-} -{-(Annotation + (Empty)) + (Annotation (Function (Identifier) (Identifier) ( (Identifier))) - (Empty))-} -{-(Annotation + (Empty)) + (Annotation (Function (Identifier) (Identifier) (Identifier) ( (Identifier))) - (Empty))-} -{-(Annotation + (Empty)) + (Annotation (Function (Identifier) (Assignment @@ -28,8 +28,8 @@ (Identifier)) ( (Identifier))) - (Empty))-} -{-(Annotation + (Empty)) + (Annotation (Function (Identifier) (Annotation @@ -40,4 +40,4 @@ (Identifier) ( (Identifier))) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/function-definition.diff-B.txt b/test/fixtures/python/function-definition.diff-B.txt index 43acf669b..8648c3e9d 100644 --- a/test/fixtures/python/function-definition.diff-B.txt +++ b/test/fixtures/python/function-definition.diff-B.txt @@ -1,26 +1,26 @@ -(Program -{-(Annotation +{-(Program + (Annotation (Function (Identifier) (Identifier) (Identifier) ( (Identifier))) - (Empty))-} -{-(Annotation + (Empty)) + (Annotation (Function (Identifier) ( (Identifier))) - (Empty))-} -{-(Annotation + (Empty)) + (Annotation (Function (Identifier) (Identifier) ( (Identifier))) - (Empty))-} -{-(Annotation + (Empty)) + (Annotation (Function (Identifier) (Annotation @@ -31,4 +31,4 @@ (Identifier) ( (Identifier))) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/generator-expression.diff+A.txt b/test/fixtures/python/generator-expression.diff+A.txt index eff821575..f44f999e0 100644 --- a/test/fixtures/python/generator-expression.diff+A.txt +++ b/test/fixtures/python/generator-expression.diff+A.txt @@ -1,15 +1,15 @@ -(Program -{+(Comprehension +{+(Program + (Comprehension (Identifier) ( ( ( (Identifier)) - (Identifier))))+} -{+(Comprehension + (Identifier)))) + (Comprehension (Identifier) ( ( ( (Identifier)) - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/generator-expression.diff+B.txt b/test/fixtures/python/generator-expression.diff+B.txt index c9f561d3c..049bd38b4 100644 --- a/test/fixtures/python/generator-expression.diff+B.txt +++ b/test/fixtures/python/generator-expression.diff+B.txt @@ -1,12 +1,12 @@ -(Program -{+(Comprehension +{+(Program + (Comprehension (Identifier) ( ( ( (Identifier)) - (Identifier))))+} -{+(Comprehension + (Identifier)))) + (Comprehension (Plus (Identifier) ( @@ -15,4 +15,4 @@ ( ( (Identifier)) - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/generator-expression.diff-A.txt b/test/fixtures/python/generator-expression.diff-A.txt index 8b87577cf..08aff59dc 100644 --- a/test/fixtures/python/generator-expression.diff-A.txt +++ b/test/fixtures/python/generator-expression.diff-A.txt @@ -1,15 +1,15 @@ -(Program -{-(Comprehension +{-(Program + (Comprehension (Identifier) ( ( ( (Identifier)) - (Identifier))))-} -{-(Comprehension + (Identifier)))) + (Comprehension (Identifier) ( ( ( (Identifier)) - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/generator-expression.diff-B.txt b/test/fixtures/python/generator-expression.diff-B.txt index bfd1ca29e..3425c4b82 100644 --- a/test/fixtures/python/generator-expression.diff-B.txt +++ b/test/fixtures/python/generator-expression.diff-B.txt @@ -1,12 +1,12 @@ -(Program -{-(Comprehension +{-(Program + (Comprehension (Identifier) ( ( ( (Identifier)) - (Identifier))))-} -{-(Comprehension + (Identifier)))) + (Comprehension (Plus (Identifier) ( @@ -15,4 +15,4 @@ ( ( (Identifier)) - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/global-statement.diff+A.txt b/test/fixtures/python/global-statement.diff+A.txt index 0ae2888bf..08a933b0b 100644 --- a/test/fixtures/python/global-statement.diff+A.txt +++ b/test/fixtures/python/global-statement.diff+A.txt @@ -1,10 +1,10 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (Identifier) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (Identifier) (Identifier) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/global-statement.diff+B.txt b/test/fixtures/python/global-statement.diff+B.txt index 998045c0e..c918897c5 100644 --- a/test/fixtures/python/global-statement.diff+B.txt +++ b/test/fixtures/python/global-statement.diff+B.txt @@ -1,10 +1,10 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (Identifier) (Identifier) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (Identifier) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/global-statement.diff-A.txt b/test/fixtures/python/global-statement.diff-A.txt index d6b0a351e..dc2517428 100644 --- a/test/fixtures/python/global-statement.diff-A.txt +++ b/test/fixtures/python/global-statement.diff-A.txt @@ -1,10 +1,10 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (Identifier) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (Identifier) (Identifier) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/global-statement.diff-B.txt b/test/fixtures/python/global-statement.diff-B.txt index ec24007cd..cf13adf6e 100644 --- a/test/fixtures/python/global-statement.diff-B.txt +++ b/test/fixtures/python/global-statement.diff-B.txt @@ -1,10 +1,10 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (Identifier) (Identifier) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (Identifier) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/identifier.diff+A.txt b/test/fixtures/python/identifier.diff+A.txt index 82f9a41a0..34d10f2c2 100644 --- a/test/fixtures/python/identifier.diff+A.txt +++ b/test/fixtures/python/identifier.diff+A.txt @@ -1,2 +1,2 @@ -(Program -{+(Identifier)+}) +{+(Program + (Identifier))+} diff --git a/test/fixtures/python/identifier.diff+B.txt b/test/fixtures/python/identifier.diff+B.txt index 24acb8b90..1a3508581 100644 --- a/test/fixtures/python/identifier.diff+B.txt +++ b/test/fixtures/python/identifier.diff+B.txt @@ -1,3 +1,3 @@ -(Program -{+(Identifier)+} -{+(Identifier)+}) +{+(Program + (Identifier) + (Identifier))+} diff --git a/test/fixtures/python/identifier.diff-A.txt b/test/fixtures/python/identifier.diff-A.txt index 0afa34a53..090dfdffe 100644 --- a/test/fixtures/python/identifier.diff-A.txt +++ b/test/fixtures/python/identifier.diff-A.txt @@ -1,2 +1,2 @@ -(Program -{-(Identifier)-}) +{-(Program + (Identifier))-} diff --git a/test/fixtures/python/identifier.diff-B.txt b/test/fixtures/python/identifier.diff-B.txt index ed2b204ea..3cebf713c 100644 --- a/test/fixtures/python/identifier.diff-B.txt +++ b/test/fixtures/python/identifier.diff-B.txt @@ -1,3 +1,3 @@ -(Program -{-(Identifier)-} -{-(Identifier)-}) +{-(Program + (Identifier) + (Identifier))-} diff --git a/test/fixtures/python/if-statement.diff+A.txt b/test/fixtures/python/if-statement.diff+A.txt index 49580784c..cc18dd728 100644 --- a/test/fixtures/python/if-statement.diff+A.txt +++ b/test/fixtures/python/if-statement.diff+A.txt @@ -1,5 +1,5 @@ -(Program -{+(If +{+(Program + (If (Identifier) ( (Identifier) @@ -11,4 +11,4 @@ (Identifier)) ( (Identifier) - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/if-statement.diff+B.txt b/test/fixtures/python/if-statement.diff+B.txt index 6ad4f9f1a..740a67069 100644 --- a/test/fixtures/python/if-statement.diff+B.txt +++ b/test/fixtures/python/if-statement.diff+B.txt @@ -1,7 +1,7 @@ -(Program -{+(If +{+(Program + (If (Identifier) ( (Identifier) (Identifier)) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/if-statement.diff-A.txt b/test/fixtures/python/if-statement.diff-A.txt index b0449efa2..603f779fc 100644 --- a/test/fixtures/python/if-statement.diff-A.txt +++ b/test/fixtures/python/if-statement.diff-A.txt @@ -1,5 +1,5 @@ -(Program -{-(If +{-(Program + (If (Identifier) ( (Identifier) @@ -11,4 +11,4 @@ (Identifier)) ( (Identifier) - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/if-statement.diff-B.txt b/test/fixtures/python/if-statement.diff-B.txt index 341367a39..136df723b 100644 --- a/test/fixtures/python/if-statement.diff-B.txt +++ b/test/fixtures/python/if-statement.diff-B.txt @@ -1,7 +1,7 @@ -(Program -{-(If +{-(Program + (If (Identifier) ( (Identifier) (Identifier)) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/import-from-statement.diff+A.txt b/test/fixtures/python/import-from-statement.diff+A.txt index 5d649e546..c9780a2cc 100644 --- a/test/fixtures/python/import-from-statement.diff+A.txt +++ b/test/fixtures/python/import-from-statement.diff+A.txt @@ -1,17 +1,17 @@ -(Program -{+(Import +{+(Program + (Import (ScopeResolution (Identifier)) (ScopeResolution - (Identifier)))+} -{+(Import + (Identifier))) + (Import (ScopeResolution (Identifier)) (ScopeResolution (Identifier)) (ScopeResolution - (Identifier)))+} -{+(Import + (Identifier))) + (Import (ScopeResolution (Identifier)) - (Identifier))+}) + (Identifier)))+} diff --git a/test/fixtures/python/import-from-statement.diff+B.txt b/test/fixtures/python/import-from-statement.diff+B.txt index 5d649e546..c9780a2cc 100644 --- a/test/fixtures/python/import-from-statement.diff+B.txt +++ b/test/fixtures/python/import-from-statement.diff+B.txt @@ -1,17 +1,17 @@ -(Program -{+(Import +{+(Program + (Import (ScopeResolution (Identifier)) (ScopeResolution - (Identifier)))+} -{+(Import + (Identifier))) + (Import (ScopeResolution (Identifier)) (ScopeResolution (Identifier)) (ScopeResolution - (Identifier)))+} -{+(Import + (Identifier))) + (Import (ScopeResolution (Identifier)) - (Identifier))+}) + (Identifier)))+} diff --git a/test/fixtures/python/import-from-statement.diff-A.txt b/test/fixtures/python/import-from-statement.diff-A.txt index 82e16ab99..7615fa0c0 100644 --- a/test/fixtures/python/import-from-statement.diff-A.txt +++ b/test/fixtures/python/import-from-statement.diff-A.txt @@ -1,17 +1,17 @@ -(Program -{-(Import +{-(Program + (Import (ScopeResolution (Identifier)) (ScopeResolution - (Identifier)))-} -{-(Import + (Identifier))) + (Import (ScopeResolution (Identifier)) (ScopeResolution (Identifier)) (ScopeResolution - (Identifier)))-} -{-(Import + (Identifier))) + (Import (ScopeResolution (Identifier)) - (Identifier))-}) + (Identifier)))-} diff --git a/test/fixtures/python/import-from-statement.diff-B.txt b/test/fixtures/python/import-from-statement.diff-B.txt index 82e16ab99..7615fa0c0 100644 --- a/test/fixtures/python/import-from-statement.diff-B.txt +++ b/test/fixtures/python/import-from-statement.diff-B.txt @@ -1,17 +1,17 @@ -(Program -{-(Import +{-(Program + (Import (ScopeResolution (Identifier)) (ScopeResolution - (Identifier)))-} -{-(Import + (Identifier))) + (Import (ScopeResolution (Identifier)) (ScopeResolution (Identifier)) (ScopeResolution - (Identifier)))-} -{-(Import + (Identifier))) + (Import (ScopeResolution (Identifier)) - (Identifier))-}) + (Identifier)))-} diff --git a/test/fixtures/python/import-statement.diff+A.txt b/test/fixtures/python/import-statement.diff+A.txt index f60265bb5..4d694ce91 100644 --- a/test/fixtures/python/import-statement.diff+A.txt +++ b/test/fixtures/python/import-statement.diff+A.txt @@ -1,13 +1,13 @@ -(Program -{+(Import +{+(Program + (Import (ScopeResolution (Identifier)) (Let (Identifier) (ScopeResolution (Identifier)) - (Empty)))+} -{+(Import + (Empty))) + (Import (Let (Identifier) (ScopeResolution @@ -15,4 +15,4 @@ (Identifier)) (Empty)) (ScopeResolution - (Identifier)))+}) + (Identifier))))+} diff --git a/test/fixtures/python/import-statement.diff+B.txt b/test/fixtures/python/import-statement.diff+B.txt index bf6ca7c68..f9080731b 100644 --- a/test/fixtures/python/import-statement.diff+B.txt +++ b/test/fixtures/python/import-statement.diff+B.txt @@ -1,13 +1,13 @@ -(Program -{+(Import +{+(Program + (Import (ScopeResolution (Identifier)) (ScopeResolution - (Identifier)))+} -{+(Import + (Identifier))) + (Import (Let (Identifier) (ScopeResolution (Identifier) (Identifier)) - (Empty)))+}) + (Empty))))+} diff --git a/test/fixtures/python/import-statement.diff-A.txt b/test/fixtures/python/import-statement.diff-A.txt index e0dabaf6e..1d34b2ebf 100644 --- a/test/fixtures/python/import-statement.diff-A.txt +++ b/test/fixtures/python/import-statement.diff-A.txt @@ -1,13 +1,13 @@ -(Program -{-(Import +{-(Program + (Import (ScopeResolution (Identifier)) (Let (Identifier) (ScopeResolution (Identifier)) - (Empty)))-} -{-(Import + (Empty))) + (Import (Let (Identifier) (ScopeResolution @@ -15,4 +15,4 @@ (Identifier)) (Empty)) (ScopeResolution - (Identifier)))-}) + (Identifier))))-} diff --git a/test/fixtures/python/import-statement.diff-B.txt b/test/fixtures/python/import-statement.diff-B.txt index 7cf219025..07e939470 100644 --- a/test/fixtures/python/import-statement.diff-B.txt +++ b/test/fixtures/python/import-statement.diff-B.txt @@ -1,13 +1,13 @@ -(Program -{-(Import +{-(Program + (Import (ScopeResolution (Identifier)) (ScopeResolution - (Identifier)))-} -{-(Import + (Identifier))) + (Import (Let (Identifier) (ScopeResolution (Identifier) (Identifier)) - (Empty)))-}) + (Empty))))-} diff --git a/test/fixtures/python/integer.diff+A.txt b/test/fixtures/python/integer.diff+A.txt index 10f2103cc..01c2d2e22 100644 --- a/test/fixtures/python/integer.diff+A.txt +++ b/test/fixtures/python/integer.diff+A.txt @@ -1,16 +1,16 @@ -(Program -{+(Negate - (Integer))+} -{+(Integer)+} -{+(Integer)+} -{+(Integer)+} -{+(Negate - (Integer))+} -{+(Integer)+} -{+(Integer)+} -{+(Integer)+} -{+(Integer)+} -{+(Integer)+} -{+(Integer)+} -{+(Integer)+} -{+(Integer)+}) +{+(Program + (Negate + (Integer)) + (Integer) + (Integer) + (Integer) + (Negate + (Integer)) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer))+} diff --git a/test/fixtures/python/integer.diff+B.txt b/test/fixtures/python/integer.diff+B.txt index 10f2103cc..01c2d2e22 100644 --- a/test/fixtures/python/integer.diff+B.txt +++ b/test/fixtures/python/integer.diff+B.txt @@ -1,16 +1,16 @@ -(Program -{+(Negate - (Integer))+} -{+(Integer)+} -{+(Integer)+} -{+(Integer)+} -{+(Negate - (Integer))+} -{+(Integer)+} -{+(Integer)+} -{+(Integer)+} -{+(Integer)+} -{+(Integer)+} -{+(Integer)+} -{+(Integer)+} -{+(Integer)+}) +{+(Program + (Negate + (Integer)) + (Integer) + (Integer) + (Integer) + (Negate + (Integer)) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer))+} diff --git a/test/fixtures/python/integer.diff-A.txt b/test/fixtures/python/integer.diff-A.txt index 1acc261d7..4bfc9d06d 100644 --- a/test/fixtures/python/integer.diff-A.txt +++ b/test/fixtures/python/integer.diff-A.txt @@ -1,16 +1,16 @@ -(Program -{-(Negate - (Integer))-} -{-(Integer)-} -{-(Integer)-} -{-(Integer)-} -{-(Negate - (Integer))-} -{-(Integer)-} -{-(Integer)-} -{-(Integer)-} -{-(Integer)-} -{-(Integer)-} -{-(Integer)-} -{-(Integer)-} -{-(Integer)-}) +{-(Program + (Negate + (Integer)) + (Integer) + (Integer) + (Integer) + (Negate + (Integer)) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer))-} diff --git a/test/fixtures/python/integer.diff-B.txt b/test/fixtures/python/integer.diff-B.txt index 1acc261d7..4bfc9d06d 100644 --- a/test/fixtures/python/integer.diff-B.txt +++ b/test/fixtures/python/integer.diff-B.txt @@ -1,16 +1,16 @@ -(Program -{-(Negate - (Integer))-} -{-(Integer)-} -{-(Integer)-} -{-(Integer)-} -{-(Negate - (Integer))-} -{-(Integer)-} -{-(Integer)-} -{-(Integer)-} -{-(Integer)-} -{-(Integer)-} -{-(Integer)-} -{-(Integer)-} -{-(Integer)-}) +{-(Program + (Negate + (Integer)) + (Integer) + (Integer) + (Integer) + (Negate + (Integer)) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer) + (Integer))-} diff --git a/test/fixtures/python/keyword-identifier.diff+A.txt b/test/fixtures/python/keyword-identifier.diff+A.txt index 24acb8b90..1a3508581 100644 --- a/test/fixtures/python/keyword-identifier.diff+A.txt +++ b/test/fixtures/python/keyword-identifier.diff+A.txt @@ -1,3 +1,3 @@ -(Program -{+(Identifier)+} -{+(Identifier)+}) +{+(Program + (Identifier) + (Identifier))+} diff --git a/test/fixtures/python/keyword-identifier.diff+B.txt b/test/fixtures/python/keyword-identifier.diff+B.txt index 24acb8b90..1a3508581 100644 --- a/test/fixtures/python/keyword-identifier.diff+B.txt +++ b/test/fixtures/python/keyword-identifier.diff+B.txt @@ -1,3 +1,3 @@ -(Program -{+(Identifier)+} -{+(Identifier)+}) +{+(Program + (Identifier) + (Identifier))+} diff --git a/test/fixtures/python/keyword-identifier.diff-A.txt b/test/fixtures/python/keyword-identifier.diff-A.txt index ed2b204ea..3cebf713c 100644 --- a/test/fixtures/python/keyword-identifier.diff-A.txt +++ b/test/fixtures/python/keyword-identifier.diff-A.txt @@ -1,3 +1,3 @@ -(Program -{-(Identifier)-} -{-(Identifier)-}) +{-(Program + (Identifier) + (Identifier))-} diff --git a/test/fixtures/python/keyword-identifier.diff-B.txt b/test/fixtures/python/keyword-identifier.diff-B.txt index ed2b204ea..3cebf713c 100644 --- a/test/fixtures/python/keyword-identifier.diff-B.txt +++ b/test/fixtures/python/keyword-identifier.diff-B.txt @@ -1,3 +1,3 @@ -(Program -{-(Identifier)-} -{-(Identifier)-}) +{-(Program + (Identifier) + (Identifier))-} diff --git a/test/fixtures/python/lambda.diff+A.txt b/test/fixtures/python/lambda.diff+A.txt index 509984478..385af3c3b 100644 --- a/test/fixtures/python/lambda.diff+A.txt +++ b/test/fixtures/python/lambda.diff+A.txt @@ -1,5 +1,5 @@ -(Program -{+(Annotation +{+(Program + (Annotation (Function (Identifier) ( @@ -7,4 +7,4 @@ (Integer) ( (Integer))))) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/lambda.diff+B.txt b/test/fixtures/python/lambda.diff+B.txt index c01e30f58..48f78860e 100644 --- a/test/fixtures/python/lambda.diff+B.txt +++ b/test/fixtures/python/lambda.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(Annotation +{+(Program + (Annotation (Function (Identifier) (Identifier) @@ -8,4 +8,4 @@ (Identifier) ( (Integer))))) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/lambda.diff-A.txt b/test/fixtures/python/lambda.diff-A.txt index fe638f0df..2fbb2a457 100644 --- a/test/fixtures/python/lambda.diff-A.txt +++ b/test/fixtures/python/lambda.diff-A.txt @@ -1,5 +1,5 @@ -(Program -{-(Annotation +{-(Program + (Annotation (Function (Identifier) ( @@ -7,4 +7,4 @@ (Integer) ( (Integer))))) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/lambda.diff-B.txt b/test/fixtures/python/lambda.diff-B.txt index 27fa91638..98517fb6d 100644 --- a/test/fixtures/python/lambda.diff-B.txt +++ b/test/fixtures/python/lambda.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(Annotation +{-(Program + (Annotation (Function (Identifier) (Identifier) @@ -8,4 +8,4 @@ (Identifier) ( (Integer))))) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/list-comprehension.diff+A.txt b/test/fixtures/python/list-comprehension.diff+A.txt index a62ef23a7..471c86cb4 100644 --- a/test/fixtures/python/list-comprehension.diff+A.txt +++ b/test/fixtures/python/list-comprehension.diff+A.txt @@ -1,12 +1,12 @@ -(Program -{+(Comprehension +{+(Program + (Comprehension (Identifier) ( ( ( (Identifier)) - (Identifier))))+} -{+(Comprehension + (Identifier)))) + (Comprehension (Identifier) ( ( @@ -14,4 +14,4 @@ (Identifier)) (Identifier)) ( - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/list-comprehension.diff+B.txt b/test/fixtures/python/list-comprehension.diff+B.txt index 13f916e62..13f2c2df7 100644 --- a/test/fixtures/python/list-comprehension.diff+B.txt +++ b/test/fixtures/python/list-comprehension.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(Comprehension +{+(Program + (Comprehension (Identifier) ( ( @@ -17,8 +17,8 @@ ( (Call (Identifier) - (Empty)))))+} -{+(Comprehension + (Empty))))) + (Comprehension (Plus (Identifier) ( @@ -27,4 +27,4 @@ ( ( (Identifier)) - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/list-comprehension.diff-A.txt b/test/fixtures/python/list-comprehension.diff-A.txt index f29ddbe00..689c96f62 100644 --- a/test/fixtures/python/list-comprehension.diff-A.txt +++ b/test/fixtures/python/list-comprehension.diff-A.txt @@ -1,12 +1,12 @@ -(Program -{-(Comprehension +{-(Program + (Comprehension (Identifier) ( ( ( (Identifier)) - (Identifier))))-} -{-(Comprehension + (Identifier)))) + (Comprehension (Identifier) ( ( @@ -14,4 +14,4 @@ (Identifier)) (Identifier)) ( - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/list-comprehension.diff-B.txt b/test/fixtures/python/list-comprehension.diff-B.txt index 9106e7b17..088b3d5ac 100644 --- a/test/fixtures/python/list-comprehension.diff-B.txt +++ b/test/fixtures/python/list-comprehension.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(Comprehension +{-(Program + (Comprehension (Identifier) ( ( @@ -17,8 +17,8 @@ ( (Call (Identifier) - (Empty)))))-} -{-(Comprehension + (Empty))))) + (Comprehension (Plus (Identifier) ( @@ -27,4 +27,4 @@ ( ( (Identifier)) - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/list.diff+A.txt b/test/fixtures/python/list.diff+A.txt index b83aa2423..db927f631 100644 --- a/test/fixtures/python/list.diff+A.txt +++ b/test/fixtures/python/list.diff+A.txt @@ -1,10 +1,10 @@ -(Program -{+(Array)+} -{+(Array +{+(Program + (Array) + (Array (Integer) (Integer) - (Integer))+} -{+(Array + (Integer)) + (Array (Identifier) (Identifier) - (Identifier))+}) + (Identifier)))+} diff --git a/test/fixtures/python/list.diff+B.txt b/test/fixtures/python/list.diff+B.txt index 3e79b03e3..ecaafda07 100644 --- a/test/fixtures/python/list.diff+B.txt +++ b/test/fixtures/python/list.diff+B.txt @@ -1,8 +1,8 @@ -(Program -{+(Array - (Identifier))+} -{+(Array +{+(Program + (Array + (Identifier)) + (Array (Integer) - (Integer))+} -{+(Array - (Identifier))+}) + (Integer)) + (Array + (Identifier)))+} diff --git a/test/fixtures/python/list.diff-A.txt b/test/fixtures/python/list.diff-A.txt index aeaadd42d..3d579a7e0 100644 --- a/test/fixtures/python/list.diff-A.txt +++ b/test/fixtures/python/list.diff-A.txt @@ -1,10 +1,10 @@ -(Program -{-(Array)-} -{-(Array +{-(Program + (Array) + (Array (Integer) (Integer) - (Integer))-} -{-(Array + (Integer)) + (Array (Identifier) (Identifier) - (Identifier))-}) + (Identifier)))-} diff --git a/test/fixtures/python/list.diff-B.txt b/test/fixtures/python/list.diff-B.txt index 6991c3725..7d650a155 100644 --- a/test/fixtures/python/list.diff-B.txt +++ b/test/fixtures/python/list.diff-B.txt @@ -1,8 +1,8 @@ -(Program -{-(Array - (Identifier))-} -{-(Array +{-(Program + (Array + (Identifier)) + (Array (Integer) - (Integer))-} -{-(Array - (Identifier))-}) + (Integer)) + (Array + (Identifier)))-} diff --git a/test/fixtures/python/non-local-statement.diff+A.txt b/test/fixtures/python/non-local-statement.diff+A.txt index 83ebcbf43..ebe114540 100644 --- a/test/fixtures/python/non-local-statement.diff+A.txt +++ b/test/fixtures/python/non-local-statement.diff+A.txt @@ -1,5 +1,5 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (Identifier) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/non-local-statement.diff+B.txt b/test/fixtures/python/non-local-statement.diff+B.txt index 83ebcbf43..ebe114540 100644 --- a/test/fixtures/python/non-local-statement.diff+B.txt +++ b/test/fixtures/python/non-local-statement.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (Identifier) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/non-local-statement.diff-A.txt b/test/fixtures/python/non-local-statement.diff-A.txt index 1ad548230..5a09a859d 100644 --- a/test/fixtures/python/non-local-statement.diff-A.txt +++ b/test/fixtures/python/non-local-statement.diff-A.txt @@ -1,5 +1,5 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (Identifier) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/non-local-statement.diff-B.txt b/test/fixtures/python/non-local-statement.diff-B.txt index 1ad548230..5a09a859d 100644 --- a/test/fixtures/python/non-local-statement.diff-B.txt +++ b/test/fixtures/python/non-local-statement.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (Identifier) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/none.diff+A.txt b/test/fixtures/python/none.diff+A.txt index c5be90432..02c1e2cc3 100644 --- a/test/fixtures/python/none.diff+A.txt +++ b/test/fixtures/python/none.diff+A.txt @@ -1,3 +1,3 @@ -(Program -{+(Null)+} -{+(Null)+}) +{+(Program + (Null) + (Null))+} diff --git a/test/fixtures/python/none.diff+B.txt b/test/fixtures/python/none.diff+B.txt index a989e50bd..3236b4bdb 100644 --- a/test/fixtures/python/none.diff+B.txt +++ b/test/fixtures/python/none.diff+B.txt @@ -1,2 +1,2 @@ -(Program -{+(Null)+}) +{+(Program + (Null))+} diff --git a/test/fixtures/python/none.diff-A.txt b/test/fixtures/python/none.diff-A.txt index d34ca4976..0d8644276 100644 --- a/test/fixtures/python/none.diff-A.txt +++ b/test/fixtures/python/none.diff-A.txt @@ -1,3 +1,3 @@ -(Program -{-(Null)-} -{-(Null)-}) +{-(Program + (Null) + (Null))-} diff --git a/test/fixtures/python/none.diff-B.txt b/test/fixtures/python/none.diff-B.txt index 87f63dc86..3b5bc62c8 100644 --- a/test/fixtures/python/none.diff-B.txt +++ b/test/fixtures/python/none.diff-B.txt @@ -1,2 +1,2 @@ -(Program -{-(Null)-}) +{-(Program + (Null))-} diff --git a/test/fixtures/python/not.diff+A.txt b/test/fixtures/python/not.diff+A.txt index 306ec17a4..f2f6f66f6 100644 --- a/test/fixtures/python/not.diff+A.txt +++ b/test/fixtures/python/not.diff+A.txt @@ -1,3 +1,3 @@ -(Program -{+(Not - (Identifier))+}) +{+(Program + (Not + (Identifier)))+} diff --git a/test/fixtures/python/not.diff+B.txt b/test/fixtures/python/not.diff+B.txt index c6f82810b..8d5026a81 100644 --- a/test/fixtures/python/not.diff+B.txt +++ b/test/fixtures/python/not.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(Not - (Identifier))+} -{+(Not - (Identifier))+}) +{+(Program + (Not + (Identifier)) + (Not + (Identifier)))+} diff --git a/test/fixtures/python/not.diff-A.txt b/test/fixtures/python/not.diff-A.txt index 7d6edcb10..b482c0767 100644 --- a/test/fixtures/python/not.diff-A.txt +++ b/test/fixtures/python/not.diff-A.txt @@ -1,3 +1,3 @@ -(Program -{-(Not - (Identifier))-}) +{-(Program + (Not + (Identifier)))-} diff --git a/test/fixtures/python/not.diff-B.txt b/test/fixtures/python/not.diff-B.txt index f077f48d4..334d8b310 100644 --- a/test/fixtures/python/not.diff-B.txt +++ b/test/fixtures/python/not.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(Not - (Identifier))-} -{-(Not - (Identifier))-}) +{-(Program + (Not + (Identifier)) + (Not + (Identifier)))-} diff --git a/test/fixtures/python/pass-statement.diff+A.txt b/test/fixtures/python/pass-statement.diff+A.txt index 03a23ca3d..1e1b131dc 100644 --- a/test/fixtures/python/pass-statement.diff+A.txt +++ b/test/fixtures/python/pass-statement.diff+A.txt @@ -1,3 +1,3 @@ -(Program -{+(NoOp - (Identifier))+}) +{+(Program + (NoOp + (Identifier)))+} diff --git a/test/fixtures/python/pass-statement.diff+B.txt b/test/fixtures/python/pass-statement.diff+B.txt index 11389fcad..70371b90c 100644 --- a/test/fixtures/python/pass-statement.diff+B.txt +++ b/test/fixtures/python/pass-statement.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(NoOp - (Identifier))+} -{+(NoOp - (Identifier))+}) +{+(Program + (NoOp + (Identifier)) + (NoOp + (Identifier)))+} diff --git a/test/fixtures/python/pass-statement.diff-A.txt b/test/fixtures/python/pass-statement.diff-A.txt index 480916ee2..cb20ebbd8 100644 --- a/test/fixtures/python/pass-statement.diff-A.txt +++ b/test/fixtures/python/pass-statement.diff-A.txt @@ -1,3 +1,3 @@ -(Program -{-(NoOp - (Identifier))-}) +{-(Program + (NoOp + (Identifier)))-} diff --git a/test/fixtures/python/pass-statement.diff-B.txt b/test/fixtures/python/pass-statement.diff-B.txt index 1b9e24eac..1d4b65dfa 100644 --- a/test/fixtures/python/pass-statement.diff-B.txt +++ b/test/fixtures/python/pass-statement.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(NoOp - (Identifier))-} -{-(NoOp - (Identifier))-}) +{-(Program + (NoOp + (Identifier)) + (NoOp + (Identifier)))-} diff --git a/test/fixtures/python/print-statement.diff+A.txt b/test/fixtures/python/print-statement.diff+A.txt index f35eef5f8..f987bb865 100644 --- a/test/fixtures/python/print-statement.diff+A.txt +++ b/test/fixtures/python/print-statement.diff+A.txt @@ -1,21 +1,21 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (Identifier) (Identifier) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (Identifier) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (Or (Integer) ( (Integer))) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (Or (Integer) @@ -25,4 +25,4 @@ (Integer) ( (Integer))) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/print-statement.diff+B.txt b/test/fixtures/python/print-statement.diff+B.txt index f35eef5f8..f987bb865 100644 --- a/test/fixtures/python/print-statement.diff+B.txt +++ b/test/fixtures/python/print-statement.diff+B.txt @@ -1,21 +1,21 @@ -(Program -{+(Call +{+(Program + (Call (Identifier) (Identifier) (Identifier) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (Identifier) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (Or (Integer) ( (Integer))) - (Empty))+} -{+(Call + (Empty)) + (Call (Identifier) (Or (Integer) @@ -25,4 +25,4 @@ (Integer) ( (Integer))) - (Empty))+}) + (Empty)))+} diff --git a/test/fixtures/python/print-statement.diff-A.txt b/test/fixtures/python/print-statement.diff-A.txt index 9eda0e67e..4d4508de5 100644 --- a/test/fixtures/python/print-statement.diff-A.txt +++ b/test/fixtures/python/print-statement.diff-A.txt @@ -1,21 +1,21 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (Identifier) (Identifier) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (Identifier) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (Or (Integer) ( (Integer))) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (Or (Integer) @@ -25,4 +25,4 @@ (Integer) ( (Integer))) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/print-statement.diff-B.txt b/test/fixtures/python/print-statement.diff-B.txt index 9eda0e67e..4d4508de5 100644 --- a/test/fixtures/python/print-statement.diff-B.txt +++ b/test/fixtures/python/print-statement.diff-B.txt @@ -1,21 +1,21 @@ -(Program -{-(Call +{-(Program + (Call (Identifier) (Identifier) (Identifier) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (Identifier) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (Or (Integer) ( (Integer))) - (Empty))-} -{-(Call + (Empty)) + (Call (Identifier) (Or (Integer) @@ -25,4 +25,4 @@ (Integer) ( (Integer))) - (Empty))-}) + (Empty)))-} diff --git a/test/fixtures/python/raise-statement.diff+A.txt b/test/fixtures/python/raise-statement.diff+A.txt index 58665bf3d..f838d0ff9 100644 --- a/test/fixtures/python/raise-statement.diff+A.txt +++ b/test/fixtures/python/raise-statement.diff+A.txt @@ -1,16 +1,16 @@ -(Program -{+(Throw - ([]))+} -{+(Throw +{+(Program + (Throw + ([])) + (Throw ( (Call (Identifier) (TextElement) - (Empty))))+} -{+(Throw + (Empty)))) + (Throw ( (Call (Identifier) (TextElement) (Empty)) - (Identifier)))+}) + (Identifier))))+} diff --git a/test/fixtures/python/raise-statement.diff+B.txt b/test/fixtures/python/raise-statement.diff+B.txt index eb26732d9..7757da97e 100644 --- a/test/fixtures/python/raise-statement.diff+B.txt +++ b/test/fixtures/python/raise-statement.diff+B.txt @@ -1,16 +1,16 @@ -(Program -{+(Throw +{+(Program + (Throw ( (Call (Identifier) (TextElement) - (Empty))))+} -{+(Throw + (Empty)))) + (Throw ( (Call (Identifier) (TextElement) (Empty)) - (Identifier)))+} -{+(Throw - ([]))+}) + (Identifier))) + (Throw + ([])))+} diff --git a/test/fixtures/python/raise-statement.diff-A.txt b/test/fixtures/python/raise-statement.diff-A.txt index 1c92e5f95..c0bce3a7e 100644 --- a/test/fixtures/python/raise-statement.diff-A.txt +++ b/test/fixtures/python/raise-statement.diff-A.txt @@ -1,16 +1,16 @@ -(Program -{-(Throw - ([]))-} -{-(Throw +{-(Program + (Throw + ([])) + (Throw ( (Call (Identifier) (TextElement) - (Empty))))-} -{-(Throw + (Empty)))) + (Throw ( (Call (Identifier) (TextElement) (Empty)) - (Identifier)))-}) + (Identifier))))-} diff --git a/test/fixtures/python/raise-statement.diff-B.txt b/test/fixtures/python/raise-statement.diff-B.txt index 391a854cf..bab86626c 100644 --- a/test/fixtures/python/raise-statement.diff-B.txt +++ b/test/fixtures/python/raise-statement.diff-B.txt @@ -1,16 +1,16 @@ -(Program -{-(Throw +{-(Program + (Throw ( (Call (Identifier) (TextElement) - (Empty))))-} -{-(Throw + (Empty)))) + (Throw ( (Call (Identifier) (TextElement) (Empty)) - (Identifier)))-} -{-(Throw - ([]))-}) + (Identifier))) + (Throw + ([])))-} diff --git a/test/fixtures/python/return-statement.diff+A.txt b/test/fixtures/python/return-statement.diff+A.txt index e5fb87a1b..644e7b7d7 100644 --- a/test/fixtures/python/return-statement.diff+A.txt +++ b/test/fixtures/python/return-statement.diff+A.txt @@ -1,13 +1,13 @@ -(Program -{+(Return - (Empty))+} -{+(Return +{+(Program + (Return + (Empty)) + (Return ( (Plus (Identifier) ( (Identifier))) - (Identifier)))+} -{+(Return + (Identifier))) + (Return (Not - (Identifier)))+}) + (Identifier))))+} diff --git a/test/fixtures/python/return-statement.diff+B.txt b/test/fixtures/python/return-statement.diff+B.txt index 795976fca..e7eb5be41 100644 --- a/test/fixtures/python/return-statement.diff+B.txt +++ b/test/fixtures/python/return-statement.diff+B.txt @@ -1,13 +1,13 @@ -(Program -{+(Return +{+(Program + (Return ( (Plus (Identifier) ( (Identifier))) - (Identifier)))+} -{+(Return - (Empty))+} -{+(Return + (Identifier))) + (Return + (Empty)) + (Return (Not - (Identifier)))+}) + (Identifier))))+} diff --git a/test/fixtures/python/return-statement.diff-A.txt b/test/fixtures/python/return-statement.diff-A.txt index cbc8ca420..4d5d4736d 100644 --- a/test/fixtures/python/return-statement.diff-A.txt +++ b/test/fixtures/python/return-statement.diff-A.txt @@ -1,13 +1,13 @@ -(Program -{-(Return - (Empty))-} -{-(Return +{-(Program + (Return + (Empty)) + (Return ( (Plus (Identifier) ( (Identifier))) - (Identifier)))-} -{-(Return + (Identifier))) + (Return (Not - (Identifier)))-}) + (Identifier))))-} diff --git a/test/fixtures/python/return-statement.diff-B.txt b/test/fixtures/python/return-statement.diff-B.txt index 24ed15f3b..da7420b90 100644 --- a/test/fixtures/python/return-statement.diff-B.txt +++ b/test/fixtures/python/return-statement.diff-B.txt @@ -1,13 +1,13 @@ -(Program -{-(Return +{-(Program + (Return ( (Plus (Identifier) ( (Identifier))) - (Identifier)))-} -{-(Return - (Empty))-} -{-(Return + (Identifier))) + (Return + (Empty)) + (Return (Not - (Identifier)))-}) + (Identifier))))-} diff --git a/test/fixtures/python/set-comprehension.diff+A.txt b/test/fixtures/python/set-comprehension.diff+A.txt index eff821575..f44f999e0 100644 --- a/test/fixtures/python/set-comprehension.diff+A.txt +++ b/test/fixtures/python/set-comprehension.diff+A.txt @@ -1,15 +1,15 @@ -(Program -{+(Comprehension +{+(Program + (Comprehension (Identifier) ( ( ( (Identifier)) - (Identifier))))+} -{+(Comprehension + (Identifier)))) + (Comprehension (Identifier) ( ( ( (Identifier)) - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/set-comprehension.diff+B.txt b/test/fixtures/python/set-comprehension.diff+B.txt index c9f561d3c..049bd38b4 100644 --- a/test/fixtures/python/set-comprehension.diff+B.txt +++ b/test/fixtures/python/set-comprehension.diff+B.txt @@ -1,12 +1,12 @@ -(Program -{+(Comprehension +{+(Program + (Comprehension (Identifier) ( ( ( (Identifier)) - (Identifier))))+} -{+(Comprehension + (Identifier)))) + (Comprehension (Plus (Identifier) ( @@ -15,4 +15,4 @@ ( ( (Identifier)) - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/set-comprehension.diff-A.txt b/test/fixtures/python/set-comprehension.diff-A.txt index 8b87577cf..08aff59dc 100644 --- a/test/fixtures/python/set-comprehension.diff-A.txt +++ b/test/fixtures/python/set-comprehension.diff-A.txt @@ -1,15 +1,15 @@ -(Program -{-(Comprehension +{-(Program + (Comprehension (Identifier) ( ( ( (Identifier)) - (Identifier))))-} -{-(Comprehension + (Identifier)))) + (Comprehension (Identifier) ( ( ( (Identifier)) - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/set-comprehension.diff-B.txt b/test/fixtures/python/set-comprehension.diff-B.txt index bfd1ca29e..3425c4b82 100644 --- a/test/fixtures/python/set-comprehension.diff-B.txt +++ b/test/fixtures/python/set-comprehension.diff-B.txt @@ -1,12 +1,12 @@ -(Program -{-(Comprehension +{-(Program + (Comprehension (Identifier) ( ( ( (Identifier)) - (Identifier))))-} -{-(Comprehension + (Identifier)))) + (Comprehension (Plus (Identifier) ( @@ -15,4 +15,4 @@ ( ( (Identifier)) - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/set.diff+A.txt b/test/fixtures/python/set.diff+A.txt index 0523ad791..5c4a21994 100644 --- a/test/fixtures/python/set.diff+A.txt +++ b/test/fixtures/python/set.diff+A.txt @@ -1,6 +1,6 @@ -(Program -{+(Hash)+} -{+(Set +{+(Program + (Hash) + (Set (Integer) (Integer) - (Integer))+}) + (Integer)))+} diff --git a/test/fixtures/python/set.diff+B.txt b/test/fixtures/python/set.diff+B.txt index 469dddaca..a529e3ee8 100644 --- a/test/fixtures/python/set.diff+B.txt +++ b/test/fixtures/python/set.diff+B.txt @@ -1,7 +1,7 @@ -(Program -{+(Set - (Integer))+} -{+(Set +{+(Program + (Set + (Integer)) + (Set (Integer) (Integer) - (Integer))+}) + (Integer)))+} diff --git a/test/fixtures/python/set.diff-A.txt b/test/fixtures/python/set.diff-A.txt index 4d4850b08..650a8fb35 100644 --- a/test/fixtures/python/set.diff-A.txt +++ b/test/fixtures/python/set.diff-A.txt @@ -1,6 +1,6 @@ -(Program -{-(Hash)-} -{-(Set +{-(Program + (Hash) + (Set (Integer) (Integer) - (Integer))-}) + (Integer)))-} diff --git a/test/fixtures/python/set.diff-B.txt b/test/fixtures/python/set.diff-B.txt index 3c5d616f3..745982c25 100644 --- a/test/fixtures/python/set.diff-B.txt +++ b/test/fixtures/python/set.diff-B.txt @@ -1,7 +1,7 @@ -(Program -{-(Set - (Integer))-} -{-(Set +{-(Program + (Set + (Integer)) + (Set (Integer) (Integer) - (Integer))-}) + (Integer)))-} diff --git a/test/fixtures/python/slice.diff+A.txt b/test/fixtures/python/slice.diff+A.txt index 3030d20c6..30733deb5 100644 --- a/test/fixtures/python/slice.diff+A.txt +++ b/test/fixtures/python/slice.diff+A.txt @@ -1,26 +1,26 @@ -(Program -{+(Subscript +{+(Program + (Subscript (Identifier) (Enumeration (Empty) (Empty) - (Empty)))+} -{+(Subscript + (Empty))) + (Subscript (Identifier) (Enumeration (Integer) (Empty) - (Empty)))+} -{+(Subscript + (Empty))) + (Subscript (Identifier) (Enumeration (Integer) (Integer) (Empty)) - (Ellipsis))+} -{+(Subscript + (Ellipsis)) + (Subscript (Identifier) (Enumeration (Empty) (Empty) - (Empty)))+}) + (Empty))))+} diff --git a/test/fixtures/python/slice.diff+B.txt b/test/fixtures/python/slice.diff+B.txt index 3776fed07..738de8c30 100644 --- a/test/fixtures/python/slice.diff+B.txt +++ b/test/fixtures/python/slice.diff+B.txt @@ -1,26 +1,26 @@ -(Program -{+(Subscript +{+(Program + (Subscript (Identifier) (Enumeration (Integer) (Integer) (Empty)) - (Ellipsis))+} -{+(Subscript + (Ellipsis)) + (Subscript (Identifier) (Enumeration (Empty) (Empty) - (Empty)))+} -{+(Subscript + (Empty))) + (Subscript (Identifier) (Enumeration (Integer) (Empty) - (Empty)))+} -{+(Subscript + (Empty))) + (Subscript (Identifier) (Enumeration (Empty) (Empty) - (Empty)))+}) + (Empty))))+} diff --git a/test/fixtures/python/slice.diff-A.txt b/test/fixtures/python/slice.diff-A.txt index d36633b9e..ad949f9e6 100644 --- a/test/fixtures/python/slice.diff-A.txt +++ b/test/fixtures/python/slice.diff-A.txt @@ -1,26 +1,26 @@ -(Program -{-(Subscript +{-(Program + (Subscript (Identifier) (Enumeration (Empty) (Empty) - (Empty)))-} -{-(Subscript + (Empty))) + (Subscript (Identifier) (Enumeration (Integer) (Empty) - (Empty)))-} -{-(Subscript + (Empty))) + (Subscript (Identifier) (Enumeration (Integer) (Integer) (Empty)) - (Ellipsis))-} -{-(Subscript + (Ellipsis)) + (Subscript (Identifier) (Enumeration (Empty) (Empty) - (Empty)))-}) + (Empty))))-} diff --git a/test/fixtures/python/slice.diff-B.txt b/test/fixtures/python/slice.diff-B.txt index 285dedb46..a500552f5 100644 --- a/test/fixtures/python/slice.diff-B.txt +++ b/test/fixtures/python/slice.diff-B.txt @@ -1,26 +1,26 @@ -(Program -{-(Subscript +{-(Program + (Subscript (Identifier) (Enumeration (Integer) (Integer) (Empty)) - (Ellipsis))-} -{-(Subscript + (Ellipsis)) + (Subscript (Identifier) (Enumeration (Empty) (Empty) - (Empty)))-} -{-(Subscript + (Empty))) + (Subscript (Identifier) (Enumeration (Integer) (Empty) - (Empty)))-} -{-(Subscript + (Empty))) + (Subscript (Identifier) (Enumeration (Empty) (Empty) - (Empty)))-}) + (Empty))))-} diff --git a/test/fixtures/python/string.diff+A.txt b/test/fixtures/python/string.diff+A.txt index 09f6b11e7..c756a7070 100644 --- a/test/fixtures/python/string.diff+A.txt +++ b/test/fixtures/python/string.diff+A.txt @@ -1,10 +1,10 @@ -(Program -{+(TextElement)+} -{+(TextElement)+} -{+(TextElement)+} -{+(TextElement)+} -{+(TextElement)+} -{+(TextElement)+} -{+(TextElement)+} -{+(TextElement)+} -{+(TextElement)+}) +{+(Program + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement))+} diff --git a/test/fixtures/python/string.diff+B.txt b/test/fixtures/python/string.diff+B.txt index 22acdc2c6..c6d75c969 100644 --- a/test/fixtures/python/string.diff+B.txt +++ b/test/fixtures/python/string.diff+B.txt @@ -1,9 +1,9 @@ -(Program -{+(TextElement)+} -{+(TextElement)+} -{+(TextElement)+} -{+(TextElement)+} -{+(TextElement)+} -{+(TextElement)+} -{+(TextElement)+} -{+(TextElement)+}) +{+(Program + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement))+} diff --git a/test/fixtures/python/string.diff-A.txt b/test/fixtures/python/string.diff-A.txt index 943739480..3c2db32c7 100644 --- a/test/fixtures/python/string.diff-A.txt +++ b/test/fixtures/python/string.diff-A.txt @@ -1,10 +1,10 @@ -(Program -{-(TextElement)-} -{-(TextElement)-} -{-(TextElement)-} -{-(TextElement)-} -{-(TextElement)-} -{-(TextElement)-} -{-(TextElement)-} -{-(TextElement)-} -{-(TextElement)-}) +{-(Program + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement))-} diff --git a/test/fixtures/python/string.diff-B.txt b/test/fixtures/python/string.diff-B.txt index a08a8faed..8db0080a8 100644 --- a/test/fixtures/python/string.diff-B.txt +++ b/test/fixtures/python/string.diff-B.txt @@ -1,9 +1,9 @@ -(Program -{-(TextElement)-} -{-(TextElement)-} -{-(TextElement)-} -{-(TextElement)-} -{-(TextElement)-} -{-(TextElement)-} -{-(TextElement)-} -{-(TextElement)-}) +{-(Program + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement) + (TextElement))-} diff --git a/test/fixtures/python/subscript.diff+A.txt b/test/fixtures/python/subscript.diff+A.txt index 3dd68d7f2..ad714ee01 100644 --- a/test/fixtures/python/subscript.diff+A.txt +++ b/test/fixtures/python/subscript.diff+A.txt @@ -1,4 +1,4 @@ -(Program -{+(Subscript +{+(Program + (Subscript (Identifier) - (Identifier))+}) + (Identifier)))+} diff --git a/test/fixtures/python/subscript.diff+B.txt b/test/fixtures/python/subscript.diff+B.txt index 3dd68d7f2..ad714ee01 100644 --- a/test/fixtures/python/subscript.diff+B.txt +++ b/test/fixtures/python/subscript.diff+B.txt @@ -1,4 +1,4 @@ -(Program -{+(Subscript +{+(Program + (Subscript (Identifier) - (Identifier))+}) + (Identifier)))+} diff --git a/test/fixtures/python/subscript.diff-A.txt b/test/fixtures/python/subscript.diff-A.txt index 35fbe2e77..fd27202c0 100644 --- a/test/fixtures/python/subscript.diff-A.txt +++ b/test/fixtures/python/subscript.diff-A.txt @@ -1,4 +1,4 @@ -(Program -{-(Subscript +{-(Program + (Subscript (Identifier) - (Identifier))-}) + (Identifier)))-} diff --git a/test/fixtures/python/subscript.diff-B.txt b/test/fixtures/python/subscript.diff-B.txt index 35fbe2e77..fd27202c0 100644 --- a/test/fixtures/python/subscript.diff-B.txt +++ b/test/fixtures/python/subscript.diff-B.txt @@ -1,4 +1,4 @@ -(Program -{-(Subscript +{-(Program + (Subscript (Identifier) - (Identifier))-}) + (Identifier)))-} diff --git a/test/fixtures/python/try-statement.diff+A.txt b/test/fixtures/python/try-statement.diff+A.txt index 887ef8ec9..a762d4629 100644 --- a/test/fixtures/python/try-statement.diff+A.txt +++ b/test/fixtures/python/try-statement.diff+A.txt @@ -1,5 +1,5 @@ -(Program -{+(Try +{+(Program + (Try (Identifier) (Identifier) (Catch @@ -27,11 +27,11 @@ ( (Identifier) (Identifier)) - ([])))+} -{+(Try + ([]))) + (Try (Identifier) (Identifier) (Finally ( (Identifier) - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/try-statement.diff+B.txt b/test/fixtures/python/try-statement.diff+B.txt index da5b9fda7..b2a61480a 100644 --- a/test/fixtures/python/try-statement.diff+B.txt +++ b/test/fixtures/python/try-statement.diff+B.txt @@ -1,10 +1,10 @@ -(Program -{+(Try +{+(Program + (Try (Identifier) (Finally ( - (Identifier))))+} -{+(Try + (Identifier)))) + (Try (Identifier) (Catch ( @@ -27,4 +27,4 @@ (Catch ( (Identifier)) - ([])))+}) + ([]))))+} diff --git a/test/fixtures/python/try-statement.diff-A.txt b/test/fixtures/python/try-statement.diff-A.txt index ba9e3357f..8daf50897 100644 --- a/test/fixtures/python/try-statement.diff-A.txt +++ b/test/fixtures/python/try-statement.diff-A.txt @@ -1,5 +1,5 @@ -(Program -{-(Try +{-(Program + (Try (Identifier) (Identifier) (Catch @@ -27,11 +27,11 @@ ( (Identifier) (Identifier)) - ([])))-} -{-(Try + ([]))) + (Try (Identifier) (Identifier) (Finally ( (Identifier) - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/try-statement.diff-B.txt b/test/fixtures/python/try-statement.diff-B.txt index 3660db764..b1a029ada 100644 --- a/test/fixtures/python/try-statement.diff-B.txt +++ b/test/fixtures/python/try-statement.diff-B.txt @@ -1,10 +1,10 @@ -(Program -{-(Try +{-(Program + (Try (Identifier) (Finally ( - (Identifier))))-} -{-(Try + (Identifier)))) + (Try (Identifier) (Catch ( @@ -27,4 +27,4 @@ (Catch ( (Identifier)) - ([])))-}) + ([]))))-} diff --git a/test/fixtures/python/tuple.diff+A.txt b/test/fixtures/python/tuple.diff+A.txt index 26f73f4d8..68252bbf7 100644 --- a/test/fixtures/python/tuple.diff+A.txt +++ b/test/fixtures/python/tuple.diff+A.txt @@ -1,8 +1,8 @@ -(Program -{+(Tuple +{+(Program + (Tuple (Identifier) - (Identifier))+} -{+(Tuple + (Identifier)) + (Tuple (Identifier) (Identifier) - (Identifier))+}) + (Identifier)))+} diff --git a/test/fixtures/python/tuple.diff+B.txt b/test/fixtures/python/tuple.diff+B.txt index a85e2b69d..751bdae10 100644 --- a/test/fixtures/python/tuple.diff+B.txt +++ b/test/fixtures/python/tuple.diff+B.txt @@ -1,10 +1,10 @@ -(Program -{+(Tuple +{+(Program + (Tuple (Identifier) (Identifier) - (Identifier))+} -{+(Tuple + (Identifier)) + (Tuple (Identifier) - (Identifier))+} -{+(Tuple - (Identifier))+}) + (Identifier)) + (Tuple + (Identifier)))+} diff --git a/test/fixtures/python/tuple.diff-A.txt b/test/fixtures/python/tuple.diff-A.txt index 82a744206..15557d2d3 100644 --- a/test/fixtures/python/tuple.diff-A.txt +++ b/test/fixtures/python/tuple.diff-A.txt @@ -1,8 +1,8 @@ -(Program -{-(Tuple +{-(Program + (Tuple (Identifier) - (Identifier))-} -{-(Tuple + (Identifier)) + (Tuple (Identifier) (Identifier) - (Identifier))-}) + (Identifier)))-} diff --git a/test/fixtures/python/tuple.diff-B.txt b/test/fixtures/python/tuple.diff-B.txt index 10e6d56f3..401ec5514 100644 --- a/test/fixtures/python/tuple.diff-B.txt +++ b/test/fixtures/python/tuple.diff-B.txt @@ -1,10 +1,10 @@ -(Program -{-(Tuple +{-(Program + (Tuple (Identifier) (Identifier) - (Identifier))-} -{-(Tuple + (Identifier)) + (Tuple (Identifier) - (Identifier))-} -{-(Tuple - (Identifier))-}) + (Identifier)) + (Tuple + (Identifier)))-} diff --git a/test/fixtures/python/unary-operator.diff+A.txt b/test/fixtures/python/unary-operator.diff+A.txt index e09f8cd82..df65c3b40 100644 --- a/test/fixtures/python/unary-operator.diff+A.txt +++ b/test/fixtures/python/unary-operator.diff+A.txt @@ -1,6 +1,6 @@ -(Program -{+(Negate - (Identifier))+} -{+(Identifier)+} -{+(Complement - (Identifier))+}) +{+(Program + (Negate + (Identifier)) + (Identifier) + (Complement + (Identifier)))+} diff --git a/test/fixtures/python/unary-operator.diff+B.txt b/test/fixtures/python/unary-operator.diff+B.txt index 9e08c0baf..d2af8f708 100644 --- a/test/fixtures/python/unary-operator.diff+B.txt +++ b/test/fixtures/python/unary-operator.diff+B.txt @@ -1,6 +1,6 @@ -(Program -{+(Complement - (Identifier))+} -{+(Negate - (Identifier))+} -{+(Identifier)+}) +{+(Program + (Complement + (Identifier)) + (Negate + (Identifier)) + (Identifier))+} diff --git a/test/fixtures/python/unary-operator.diff-A.txt b/test/fixtures/python/unary-operator.diff-A.txt index 470e88d71..ba8899327 100644 --- a/test/fixtures/python/unary-operator.diff-A.txt +++ b/test/fixtures/python/unary-operator.diff-A.txt @@ -1,6 +1,6 @@ -(Program -{-(Negate - (Identifier))-} -{-(Identifier)-} -{-(Complement - (Identifier))-}) +{-(Program + (Negate + (Identifier)) + (Identifier) + (Complement + (Identifier)))-} diff --git a/test/fixtures/python/unary-operator.diff-B.txt b/test/fixtures/python/unary-operator.diff-B.txt index 3d032d8b5..24cb60646 100644 --- a/test/fixtures/python/unary-operator.diff-B.txt +++ b/test/fixtures/python/unary-operator.diff-B.txt @@ -1,6 +1,6 @@ -(Program -{-(Complement - (Identifier))-} -{-(Negate - (Identifier))-} -{-(Identifier)-}) +{-(Program + (Complement + (Identifier)) + (Negate + (Identifier)) + (Identifier))-} diff --git a/test/fixtures/python/while-statement.diff+A.txt b/test/fixtures/python/while-statement.diff+A.txt index c29fc4a90..e115371f3 100644 --- a/test/fixtures/python/while-statement.diff+A.txt +++ b/test/fixtures/python/while-statement.diff+A.txt @@ -1,5 +1,5 @@ -(Program -{+(While +{+(Program + (While (Identifier) ( (NoOp @@ -7,4 +7,4 @@ (Break (Identifier)) (Continue - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/while-statement.diff+B.txt b/test/fixtures/python/while-statement.diff+B.txt index b8e88af66..29158037d 100644 --- a/test/fixtures/python/while-statement.diff+B.txt +++ b/test/fixtures/python/while-statement.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(While +{+(Program + (While (Identifier) ( (Break @@ -7,4 +7,4 @@ (Continue (Identifier)) (NoOp - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/while-statement.diff-A.txt b/test/fixtures/python/while-statement.diff-A.txt index 9470d54ee..e9fc1cf7e 100644 --- a/test/fixtures/python/while-statement.diff-A.txt +++ b/test/fixtures/python/while-statement.diff-A.txt @@ -1,5 +1,5 @@ -(Program -{-(While +{-(Program + (While (Identifier) ( (NoOp @@ -7,4 +7,4 @@ (Break (Identifier)) (Continue - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/while-statement.diff-B.txt b/test/fixtures/python/while-statement.diff-B.txt index 6ee32722c..fb5ef33ac 100644 --- a/test/fixtures/python/while-statement.diff-B.txt +++ b/test/fixtures/python/while-statement.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(While +{-(Program + (While (Identifier) ( (Break @@ -7,4 +7,4 @@ (Continue (Identifier)) (NoOp - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/with-statement.diff+A.txt b/test/fixtures/python/with-statement.diff+A.txt index 125356cff..2b241c5e0 100644 --- a/test/fixtures/python/with-statement.diff+A.txt +++ b/test/fixtures/python/with-statement.diff+A.txt @@ -1,6 +1,6 @@ -(Program -{+(Let +{+(Program + (Let (Identifier) (Identifier) ( - (Identifier)))+}) + (Identifier))))+} diff --git a/test/fixtures/python/with-statement.diff+B.txt b/test/fixtures/python/with-statement.diff+B.txt index 125356cff..2b241c5e0 100644 --- a/test/fixtures/python/with-statement.diff+B.txt +++ b/test/fixtures/python/with-statement.diff+B.txt @@ -1,6 +1,6 @@ -(Program -{+(Let +{+(Program + (Let (Identifier) (Identifier) ( - (Identifier)))+}) + (Identifier))))+} diff --git a/test/fixtures/python/with-statement.diff-A.txt b/test/fixtures/python/with-statement.diff-A.txt index 45bd512ba..8ec0dea53 100644 --- a/test/fixtures/python/with-statement.diff-A.txt +++ b/test/fixtures/python/with-statement.diff-A.txt @@ -1,6 +1,6 @@ -(Program -{-(Let +{-(Program + (Let (Identifier) (Identifier) ( - (Identifier)))-}) + (Identifier))))-} diff --git a/test/fixtures/python/with-statement.diff-B.txt b/test/fixtures/python/with-statement.diff-B.txt index 45bd512ba..8ec0dea53 100644 --- a/test/fixtures/python/with-statement.diff-B.txt +++ b/test/fixtures/python/with-statement.diff-B.txt @@ -1,6 +1,6 @@ -(Program -{-(Let +{-(Program + (Let (Identifier) (Identifier) ( - (Identifier)))-}) + (Identifier))))-} diff --git a/test/fixtures/python/with.diff+A.txt b/test/fixtures/python/with.diff+A.txt index 12295050e..91e697718 100644 --- a/test/fixtures/python/with.diff+A.txt +++ b/test/fixtures/python/with.diff+A.txt @@ -1,5 +1,5 @@ -(Program -{+(Let +{+(Program + (Let (Identifier) (Call (Identifier) @@ -17,4 +17,4 @@ ( (Assignment (Identifier) - (Boolean))))))+}) + (Boolean)))))))+} diff --git a/test/fixtures/python/with.diff+B.txt b/test/fixtures/python/with.diff+B.txt index 518881737..6f815b71f 100644 --- a/test/fixtures/python/with.diff+B.txt +++ b/test/fixtures/python/with.diff+B.txt @@ -1,5 +1,5 @@ -(Program -{+(Let +{+(Program + (Let (Empty) (MemberAccess (Identifier) @@ -7,8 +7,8 @@ ( (Assignment (Identifier) - (Boolean))))+} -{+( + (Boolean)))) + ( (Let (Empty) (Call @@ -31,4 +31,4 @@ (Identifier) (Empty)) ( - (Identifier))))+}) + (Identifier)))))+} diff --git a/test/fixtures/python/with.diff-A.txt b/test/fixtures/python/with.diff-A.txt index 433bde4f4..b4ad484ea 100644 --- a/test/fixtures/python/with.diff-A.txt +++ b/test/fixtures/python/with.diff-A.txt @@ -1,5 +1,5 @@ -(Program -{-(Let +{-(Program + (Let (Identifier) (Call (Identifier) @@ -17,4 +17,4 @@ ( (Assignment (Identifier) - (Boolean))))))-}) + (Boolean)))))))-} diff --git a/test/fixtures/python/with.diff-B.txt b/test/fixtures/python/with.diff-B.txt index b965f40ac..054ec0f71 100644 --- a/test/fixtures/python/with.diff-B.txt +++ b/test/fixtures/python/with.diff-B.txt @@ -1,5 +1,5 @@ -(Program -{-(Let +{-(Program + (Let (Empty) (MemberAccess (Identifier) @@ -7,8 +7,8 @@ ( (Assignment (Identifier) - (Boolean))))-} -{-( + (Boolean)))) + ( (Let (Empty) (Call @@ -31,4 +31,4 @@ (Identifier) (Empty)) ( - (Identifier))))-}) + (Identifier)))))-} diff --git a/test/fixtures/python/yield.diff+A.txt b/test/fixtures/python/yield.diff+A.txt index d66beb05b..92e79d877 100644 --- a/test/fixtures/python/yield.diff+A.txt +++ b/test/fixtures/python/yield.diff+A.txt @@ -1,3 +1,3 @@ -(Program -{+(Yield - (Empty))+}) +{+(Program + (Yield + (Empty)))+} diff --git a/test/fixtures/python/yield.diff+B.txt b/test/fixtures/python/yield.diff+B.txt index 9bab3a4c3..e69de29bb 100644 --- a/test/fixtures/python/yield.diff+B.txt +++ b/test/fixtures/python/yield.diff+B.txt @@ -1,2 +0,0 @@ -{-(Program - (Program))-} diff --git a/test/fixtures/python/yield.diff-A.txt b/test/fixtures/python/yield.diff-A.txt index 4ac4fe7a9..11747d59a 100644 --- a/test/fixtures/python/yield.diff-A.txt +++ b/test/fixtures/python/yield.diff-A.txt @@ -1,3 +1,3 @@ -(Program -{-(Yield - (Empty))-}) +{-(Program + (Yield + (Empty)))-} diff --git a/test/fixtures/python/yield.diff-B.txt b/test/fixtures/python/yield.diff-B.txt index 658491748..e69de29bb 100644 --- a/test/fixtures/python/yield.diff-B.txt +++ b/test/fixtures/python/yield.diff-B.txt @@ -1,2 +0,0 @@ -{+(Program - (Program))+}