From e14f59b1654fbbf64f59cf806687f69cf0e851a9 Mon Sep 17 00:00:00 2001 From: Timothy Clem Date: Mon, 5 Nov 2018 13:12:50 -0800 Subject: [PATCH] Re-generate test with addition of statements in python assignment --- .../async-function-definition.diffA-B.txt | 16 ++-- .../async-function-definition.diffB-A.txt | 16 ++-- .../async-function-definition.parseA.txt | 9 ++- .../async-function-definition.parseB.txt | 9 ++- .../corpus/class-definition.diffA-B.txt | 35 +++++---- .../corpus/class-definition.diffB-A.txt | 35 +++++---- .../python/corpus/class-definition.parseA.txt | 29 ++++--- .../python/corpus/class-definition.parseB.txt | 24 +++--- .../corpus/decorated-definition.diffA-B.txt | 75 ++++++++++--------- .../corpus/decorated-definition.diffB-A.txt | 75 ++++++++++--------- .../corpus/decorated-definition.parseA.txt | 42 ++++++----- .../corpus/decorated-definition.parseB.txt | 28 +++---- .../corpus/function-definition.diffA-B.txt | 22 ++++-- .../corpus/function-definition.diffB-A.txt | 21 ++++-- .../corpus/function-definition.parseA.txt | 15 ++-- .../corpus/function-definition.parseB.txt | 12 ++- .../fixtures/python/corpus/lambda.diffA-B.txt | 9 ++- .../fixtures/python/corpus/lambda.diffB-A.txt | 9 ++- test/fixtures/python/corpus/lambda.parseA.txt | 7 +- test/fixtures/python/corpus/lambda.parseB.txt | 7 +- 20 files changed, 281 insertions(+), 214 deletions(-) diff --git a/test/fixtures/python/corpus/async-function-definition.diffA-B.txt b/test/fixtures/python/corpus/async-function-definition.diffA-B.txt index 4305b7c17..b61708d36 100644 --- a/test/fixtures/python/corpus/async-function-definition.diffA-B.txt +++ b/test/fixtures/python/corpus/async-function-definition.diffA-B.txt @@ -3,20 +3,24 @@ {+(Identifier)+} {+(Identifier)+} {+(Identifier)+} - {+(Identifier)+})+} + {+(Statements + {+(Identifier)+})+})+} (Function (Identifier) - { (Identifier) - ->(Identifier) }) + (Statements + { (Identifier) + ->(Identifier) })) (Function { (Identifier) ->(Identifier) } { (Identifier) ->(Identifier) } {-(Identifier)-} - { (Identifier) - ->(Identifier) }) + (Statements + { (Identifier) + ->(Identifier) })) {-(Function {-(Identifier)-} {-(Identifier)-} - {-(Identifier)-})-}) + {-(Statements + {-(Identifier)-})-})-}) diff --git a/test/fixtures/python/corpus/async-function-definition.diffB-A.txt b/test/fixtures/python/corpus/async-function-definition.diffB-A.txt index 47e341375..942df6397 100644 --- a/test/fixtures/python/corpus/async-function-definition.diffB-A.txt +++ b/test/fixtures/python/corpus/async-function-definition.diffB-A.txt @@ -3,20 +3,24 @@ {-(Identifier)-} {-(Identifier)-} {-(Identifier)-} - {-(Identifier)-})-} + {-(Statements + {-(Identifier)-})-})-} (Function (Identifier) - { (Identifier) - ->(Identifier) }) + (Statements + { (Identifier) + ->(Identifier) })) (Function { (Identifier) ->(Identifier) } { (Identifier) ->(Identifier) } {+(Identifier)+} - { (Identifier) - ->(Identifier) }) + (Statements + { (Identifier) + ->(Identifier) })) {+(Function {+(Identifier)+} {+(Identifier)+} - {+(Identifier)+})+}) + {+(Statements + {+(Identifier)+})+})+}) diff --git a/test/fixtures/python/corpus/async-function-definition.parseA.txt b/test/fixtures/python/corpus/async-function-definition.parseA.txt index a176f2e7d..43f846430 100644 --- a/test/fixtures/python/corpus/async-function-definition.parseA.txt +++ b/test/fixtures/python/corpus/async-function-definition.parseA.txt @@ -1,13 +1,16 @@ (Statements (Function (Identifier) - (Identifier)) + (Statements + (Identifier))) (Function (Identifier) (Identifier) (Identifier) - (Identifier)) + (Statements + (Identifier))) (Function (Identifier) (Identifier) - (Identifier))) + (Statements + (Identifier)))) diff --git a/test/fixtures/python/corpus/async-function-definition.parseB.txt b/test/fixtures/python/corpus/async-function-definition.parseB.txt index 7770cf101..4f6cbd917 100644 --- a/test/fixtures/python/corpus/async-function-definition.parseB.txt +++ b/test/fixtures/python/corpus/async-function-definition.parseB.txt @@ -3,11 +3,14 @@ (Identifier) (Identifier) (Identifier) - (Identifier)) + (Statements + (Identifier))) (Function (Identifier) - (Identifier)) + (Statements + (Identifier))) (Function (Identifier) (Identifier) - (Identifier))) + (Statements + (Identifier)))) diff --git a/test/fixtures/python/corpus/class-definition.diffA-B.txt b/test/fixtures/python/corpus/class-definition.diffA-B.txt index 188477e0a..4738885b6 100644 --- a/test/fixtures/python/corpus/class-definition.diffA-B.txt +++ b/test/fixtures/python/corpus/class-definition.diffA-B.txt @@ -3,24 +3,29 @@ { (Identifier) ->(Identifier) } {+(Identifier)+} - (Function - { (Identifier) - ->(Identifier) } - (Identifier) - (Return + (Statements + (Function { (Identifier) - ->(Empty) }))) + ->(Identifier) } + (Identifier) + (Statements + (Return + { (Identifier) + ->(Empty) }))))) {-(Class {-(Identifier)-} - {-(NoOp - {-(Empty)-})-})-} + {-(Statements + {-(NoOp + {-(Empty)-})-})-})-} (Class (Identifier) {-(Identifier)-} - (Function - { (Identifier) - ->(Identifier) } - (Identifier) - (Return - { (Empty) - ->(Identifier) })))) + (Statements + (Function + { (Identifier) + ->(Identifier) } + (Identifier) + (Statements + (Return + { (Empty) + ->(Identifier) })))))) diff --git a/test/fixtures/python/corpus/class-definition.diffB-A.txt b/test/fixtures/python/corpus/class-definition.diffB-A.txt index a5fe08ce6..0e3a5c83f 100644 --- a/test/fixtures/python/corpus/class-definition.diffB-A.txt +++ b/test/fixtures/python/corpus/class-definition.diffB-A.txt @@ -3,24 +3,29 @@ { (Identifier) ->(Identifier) } {-(Identifier)-} - (Function - { (Identifier) - ->(Identifier) } - (Identifier) - (Return - { (Empty) - ->(Identifier) }))) + (Statements + (Function + { (Identifier) + ->(Identifier) } + (Identifier) + (Statements + (Return + { (Empty) + ->(Identifier) }))))) {+(Class {+(Identifier)+} - {+(NoOp - {+(Empty)+})+})+} + {+(Statements + {+(NoOp + {+(Empty)+})+})+})+} (Class (Identifier) {+(Identifier)+} - (Function - { (Identifier) - ->(Identifier) } - (Identifier) - (Return + (Statements + (Function { (Identifier) - ->(Empty) })))) + ->(Identifier) } + (Identifier) + (Statements + (Return + { (Identifier) + ->(Empty) })))))) diff --git a/test/fixtures/python/corpus/class-definition.parseA.txt b/test/fixtures/python/corpus/class-definition.parseA.txt index c92055402..d413d74c0 100644 --- a/test/fixtures/python/corpus/class-definition.parseA.txt +++ b/test/fixtures/python/corpus/class-definition.parseA.txt @@ -1,20 +1,25 @@ (Statements (Class (Identifier) - (Function - (Identifier) - (Identifier) - (Return - (Identifier)))) + (Statements + (Function + (Identifier) + (Identifier) + (Statements + (Return + (Identifier)))))) (Class (Identifier) - (NoOp - (Empty))) + (Statements + (NoOp + (Empty)))) (Class (Identifier) (Identifier) - (Function - (Identifier) - (Identifier) - (Return - (Empty))))) + (Statements + (Function + (Identifier) + (Identifier) + (Statements + (Return + (Empty))))))) diff --git a/test/fixtures/python/corpus/class-definition.parseB.txt b/test/fixtures/python/corpus/class-definition.parseB.txt index 032c81a52..30cd939cd 100644 --- a/test/fixtures/python/corpus/class-definition.parseB.txt +++ b/test/fixtures/python/corpus/class-definition.parseB.txt @@ -2,15 +2,19 @@ (Class (Identifier) (Identifier) - (Function - (Identifier) - (Identifier) - (Return - (Empty)))) + (Statements + (Function + (Identifier) + (Identifier) + (Statements + (Return + (Empty)))))) (Class (Identifier) - (Function - (Identifier) - (Identifier) - (Return - (Identifier))))) + (Statements + (Function + (Identifier) + (Identifier) + (Statements + (Return + (Identifier))))))) diff --git a/test/fixtures/python/corpus/decorated-definition.diffA-B.txt b/test/fixtures/python/corpus/decorated-definition.diffA-B.txt index fb1da1409..072e0c725 100644 --- a/test/fixtures/python/corpus/decorated-definition.diffA-B.txt +++ b/test/fixtures/python/corpus/decorated-definition.diffA-B.txt @@ -4,51 +4,54 @@ (Class { (Identifier) ->(Identifier) } - (Decorator - (Identifier) - (Statements) + (Statements (Decorator - { (Identifier) - ->(Identifier) } - {+(Identifier)+} - {-(Integer)-} + (Identifier) + (Statements) (Decorator { (Identifier) ->(Identifier) } {+(Identifier)+} - {-(Statements - {-(Integer)-} - {-(Integer)-})-} + {-(Integer)-} (Decorator - (Identifier) - {+(Statements - {+(Integer)+} - {+(Assignment + { (Identifier) + ->(Identifier) } + {+(Identifier)+} + {-(Statements + {-(Integer)-} + {-(Integer)-})-} + (Decorator + (Identifier) + {+(Statements + {+(Integer)+} + {+(Assignment + {+(Identifier)+} + {+(Boolean)+})+} {+(Identifier)+} - {+(Boolean)+})+} - {+(Identifier)+} - {+(Identifier)+})+} - {-(Assignment - {-(Identifier)-} - {-(Boolean)-})-} - { (Decorator - {-(Identifier)-} - {-(Identifier)-} - {-(Decorator + {+(Identifier)+})+} + {-(Assignment + {-(Identifier)-} + {-(Boolean)-})-} + { (Decorator {-(Identifier)-} {-(Identifier)-} {-(Decorator {-(Identifier)-} - {-(Statements - {-(Integer)-} - {-(Assignment + {-(Identifier)-} + {-(Decorator + {-(Identifier)-} + {-(Statements + {-(Integer)-} + {-(Assignment + {-(Identifier)-} + {-(Boolean)-})-} {-(Identifier)-} - {-(Boolean)-})-} - {-(Identifier)-} - {-(Identifier)-})-} - {-(Function - {-(Identifier)-} - {-(Identifier)-})-})-})-}) - ->(Function - {+(Identifier)+} - {+(Identifier)+}) }))))))) + {-(Identifier)-})-} + {-(Function + {-(Identifier)-} + {-(Statements + {-(Identifier)-})-})-})-})-}) + ->(Function + {+(Identifier)+} + {+(Statements + {+(Identifier)+})+}) })))))))) diff --git a/test/fixtures/python/corpus/decorated-definition.diffB-A.txt b/test/fixtures/python/corpus/decorated-definition.diffB-A.txt index 1fd83ea0f..b6c20f57e 100644 --- a/test/fixtures/python/corpus/decorated-definition.diffB-A.txt +++ b/test/fixtures/python/corpus/decorated-definition.diffB-A.txt @@ -4,51 +4,54 @@ (Class { (Identifier) ->(Identifier) } - (Decorator - (Identifier) - (Statements) + (Statements (Decorator - { (Identifier) - ->(Identifier) } - {+(Integer)+} - {-(Identifier)-} + (Identifier) + (Statements) (Decorator { (Identifier) ->(Identifier) } - {+(Statements - {+(Integer)+} - {+(Integer)+})+} + {+(Integer)+} {-(Identifier)-} (Decorator - (Identifier) - {+(Assignment - {+(Identifier)+} - {+(Boolean)+})+} - {-(Statements - {-(Integer)-} - {-(Assignment + { (Identifier) + ->(Identifier) } + {+(Statements + {+(Integer)+} + {+(Integer)+})+} + {-(Identifier)-} + (Decorator + (Identifier) + {+(Assignment + {+(Identifier)+} + {+(Boolean)+})+} + {-(Statements + {-(Integer)-} + {-(Assignment + {-(Identifier)-} + {-(Boolean)-})-} {-(Identifier)-} - {-(Boolean)-})-} - {-(Identifier)-} - {-(Identifier)-})-} - { (Function - {-(Identifier)-} - {-(Identifier)-}) - ->(Decorator - {+(Identifier)+} - {+(Identifier)+} - {+(Decorator + {-(Identifier)-})-} + { (Function + {-(Identifier)-} + {-(Statements + {-(Identifier)-})-}) + ->(Decorator {+(Identifier)+} {+(Identifier)+} {+(Decorator {+(Identifier)+} - {+(Statements - {+(Integer)+} - {+(Assignment + {+(Identifier)+} + {+(Decorator + {+(Identifier)+} + {+(Statements + {+(Integer)+} + {+(Assignment + {+(Identifier)+} + {+(Boolean)+})+} {+(Identifier)+} - {+(Boolean)+})+} - {+(Identifier)+} - {+(Identifier)+})+} - {+(Function - {+(Identifier)+} - {+(Identifier)+})+})+})+}) }))))))) + {+(Identifier)+})+} + {+(Function + {+(Identifier)+} + {+(Statements + {+(Identifier)+})+})+})+})+}) })))))))) diff --git a/test/fixtures/python/corpus/decorated-definition.parseA.txt b/test/fixtures/python/corpus/decorated-definition.parseA.txt index 3c0cebbef..47de1c27d 100644 --- a/test/fixtures/python/corpus/decorated-definition.parseA.txt +++ b/test/fixtures/python/corpus/decorated-definition.parseA.txt @@ -3,37 +3,39 @@ (Identifier) (Class (Identifier) - (Decorator - (Identifier) - (Statements) + (Statements (Decorator (Identifier) - (Integer) + (Statements) (Decorator (Identifier) - (Statements - (Integer) - (Integer)) + (Integer) (Decorator (Identifier) - (Assignment - (Identifier) - (Boolean)) + (Statements + (Integer) + (Integer)) (Decorator (Identifier) - (Identifier) + (Assignment + (Identifier) + (Boolean)) (Decorator (Identifier) (Identifier) (Decorator (Identifier) - (Statements - (Integer) - (Assignment + (Identifier) + (Decorator + (Identifier) + (Statements + (Integer) + (Assignment + (Identifier) + (Boolean)) (Identifier) - (Boolean)) - (Identifier) - (Identifier)) - (Function - (Identifier) - (Identifier)))))))))))) + (Identifier)) + (Function + (Identifier) + (Statements + (Identifier)))))))))))))) diff --git a/test/fixtures/python/corpus/decorated-definition.parseB.txt b/test/fixtures/python/corpus/decorated-definition.parseB.txt index b1e181612..43852a59a 100644 --- a/test/fixtures/python/corpus/decorated-definition.parseB.txt +++ b/test/fixtures/python/corpus/decorated-definition.parseB.txt @@ -3,24 +3,26 @@ (Identifier) (Class (Identifier) - (Decorator - (Identifier) - (Statements) + (Statements (Decorator (Identifier) - (Identifier) + (Statements) (Decorator (Identifier) (Identifier) (Decorator (Identifier) - (Statements - (Integer) - (Assignment + (Identifier) + (Decorator + (Identifier) + (Statements + (Integer) + (Assignment + (Identifier) + (Boolean)) (Identifier) - (Boolean)) - (Identifier) - (Identifier)) - (Function - (Identifier) - (Identifier))))))))) + (Identifier)) + (Function + (Identifier) + (Statements + (Identifier))))))))))) diff --git a/test/fixtures/python/corpus/function-definition.diffA-B.txt b/test/fixtures/python/corpus/function-definition.diffA-B.txt index 57102a3bb..542997246 100644 --- a/test/fixtures/python/corpus/function-definition.diffA-B.txt +++ b/test/fixtures/python/corpus/function-definition.diffA-B.txt @@ -1,31 +1,36 @@ (Statements {-(Function {-(Identifier)-} - {-(Identifier)-})-} + {-(Statements + {-(Identifier)-})-})-} {-(Function {-(Identifier)-} {-(Identifier)-} - {-(Identifier)-})-} + {-(Statements + {-(Identifier)-})-})-} (Function (Identifier) { (Identifier) ->(Identifier) } { (Identifier) ->(Identifier) } - { (Identifier) - ->(Identifier) }) + (Statements + { (Identifier) + ->(Identifier) })) (Function { (Identifier) ->(Identifier) } {-(Assignment {-(Identifier)-} {-(Identifier)-})-} - { (Identifier) - ->(Identifier) }) + (Statements + { (Identifier) + ->(Identifier) })) {+(Function {+(Identifier)+} {+(Identifier)+} - {+(Identifier)+})+} + {+(Statements + {+(Identifier)+})+})+} (Function (Identifier) (Annotation @@ -37,4 +42,5 @@ ->(Identifier) }) { (Identifier) ->(Identifier) } - (Identifier))) + (Statements + (Identifier)))) diff --git a/test/fixtures/python/corpus/function-definition.diffB-A.txt b/test/fixtures/python/corpus/function-definition.diffB-A.txt index 1d22b97cc..bc6698d65 100644 --- a/test/fixtures/python/corpus/function-definition.diffB-A.txt +++ b/test/fixtures/python/corpus/function-definition.diffB-A.txt @@ -4,27 +4,31 @@ ->(Identifier) } {-(Identifier)-} {-(Identifier)-} - { (Identifier) - ->(Identifier) }) + (Statements + { (Identifier) + ->(Identifier) })) (Function (Identifier) {+(Identifier)+} - { (Identifier) - ->(Identifier) }) + (Statements + { (Identifier) + ->(Identifier) })) (Function { (Identifier) ->(Identifier) } { (Identifier) ->(Identifier) } {+(Identifier)+} - { (Identifier) - ->(Identifier) }) + (Statements + { (Identifier) + ->(Identifier) })) {+(Function {+(Identifier)+} {+(Assignment {+(Identifier)+} {+(Identifier)+})+} - {+(Identifier)+})+} + {+(Statements + {+(Identifier)+})+})+} (Function (Identifier) (Annotation @@ -36,4 +40,5 @@ ->(Identifier) }) { (Identifier) ->(Identifier) } - (Identifier))) + (Statements + (Identifier)))) diff --git a/test/fixtures/python/corpus/function-definition.parseA.txt b/test/fixtures/python/corpus/function-definition.parseA.txt index aa88c59fc..cf907b137 100644 --- a/test/fixtures/python/corpus/function-definition.parseA.txt +++ b/test/fixtures/python/corpus/function-definition.parseA.txt @@ -1,22 +1,26 @@ (Statements (Function (Identifier) - (Identifier)) + (Statements + (Identifier))) (Function (Identifier) (Identifier) - (Identifier)) + (Statements + (Identifier))) (Function (Identifier) (Identifier) (Identifier) - (Identifier)) + (Statements + (Identifier))) (Function (Identifier) (Assignment (Identifier) (Identifier)) - (Identifier)) + (Statements + (Identifier))) (Function (Identifier) (Annotation @@ -25,4 +29,5 @@ (TextElement)) (Identifier)) (Identifier) - (Identifier))) + (Statements + (Identifier)))) diff --git a/test/fixtures/python/corpus/function-definition.parseB.txt b/test/fixtures/python/corpus/function-definition.parseB.txt index 84f4ffde1..bb7c1001d 100644 --- a/test/fixtures/python/corpus/function-definition.parseB.txt +++ b/test/fixtures/python/corpus/function-definition.parseB.txt @@ -3,14 +3,17 @@ (Identifier) (Identifier) (Identifier) - (Identifier)) + (Statements + (Identifier))) (Function (Identifier) - (Identifier)) + (Statements + (Identifier))) (Function (Identifier) (Identifier) - (Identifier)) + (Statements + (Identifier))) (Function (Identifier) (Annotation @@ -19,4 +22,5 @@ (Integer)) (Identifier)) (Identifier) - (Identifier))) + (Statements + (Identifier)))) diff --git a/test/fixtures/python/corpus/lambda.diffA-B.txt b/test/fixtures/python/corpus/lambda.diffA-B.txt index 5882e7fe5..7db39b63f 100644 --- a/test/fixtures/python/corpus/lambda.diffA-B.txt +++ b/test/fixtures/python/corpus/lambda.diffA-B.txt @@ -2,7 +2,8 @@ (Function (Empty) {+(Identifier)+} - (Plus - { (Integer) - ->(Identifier) } - (Integer)))) + (Statements + (Plus + { (Integer) + ->(Identifier) } + (Integer))))) diff --git a/test/fixtures/python/corpus/lambda.diffB-A.txt b/test/fixtures/python/corpus/lambda.diffB-A.txt index 5fdd8a8f5..e7ea5a4ffd 100644 --- a/test/fixtures/python/corpus/lambda.diffB-A.txt +++ b/test/fixtures/python/corpus/lambda.diffB-A.txt @@ -2,7 +2,8 @@ (Function (Empty) {-(Identifier)-} - (Plus - { (Identifier) - ->(Integer) } - (Integer)))) + (Statements + (Plus + { (Identifier) + ->(Integer) } + (Integer))))) diff --git a/test/fixtures/python/corpus/lambda.parseA.txt b/test/fixtures/python/corpus/lambda.parseA.txt index 5c5a7469d..4cd515711 100644 --- a/test/fixtures/python/corpus/lambda.parseA.txt +++ b/test/fixtures/python/corpus/lambda.parseA.txt @@ -1,6 +1,7 @@ (Statements (Function (Empty) - (Plus - (Integer) - (Integer)))) + (Statements + (Plus + (Integer) + (Integer))))) diff --git a/test/fixtures/python/corpus/lambda.parseB.txt b/test/fixtures/python/corpus/lambda.parseB.txt index c7fdc36d5..fb0cf2df5 100644 --- a/test/fixtures/python/corpus/lambda.parseB.txt +++ b/test/fixtures/python/corpus/lambda.parseB.txt @@ -2,6 +2,7 @@ (Function (Empty) (Identifier) - (Plus - (Identifier) - (Integer)))) + (Statements + (Plus + (Identifier) + (Integer)))))