Unified: More fixes after Swift syntax bump

Author: jketema

unified/extractor/tests/corpus/swift/control-flow/defer-statement.output

@@ -62,8 +62,8 @@ sourceFile
                       calledExpression:
                         declReferenceExpr
                           baseName: identifier "print"
-          name: identifier "withCleanup"
           modifiers:
+          name: identifier "withCleanup"
           signature:
             functionSignature
               parameterClause:

unified/extractor/tests/corpus/swift/control-flow/discard-statement.output

@@ -13,6 +13,7 @@ sourceFile
       item:
         structDecl
           attributes:
+          modifiers:
           name: identifier "Resource"
           inheritanceClause:
             inheritanceClause
@@ -46,10 +47,10 @@ sourceFile
                                     declReferenceExpr
                                       baseName: self
                                   discardKeyword: discard
-                      name: identifier "close"
                       modifiers:
                         declModifier
                           name: consuming
+                      name: identifier "close"
                       signature:
                         functionSignature
                           parameterClause:
@@ -58,7 +59,6 @@ sourceFile
                               rightParen: )
                               parameters:
                       funcKeyword: func
-          modifiers:
           structKeyword: struct
 
 ---

unified/extractor/tests/corpus/swift/control-flow/fallthrough.output

@@ -60,8 +60,8 @@ sourceFile
                             declReferenceExpr
                               baseName: identifier "x"
                           switchKeyword: switch
-          name: identifier "classify"
           modifiers:
+          name: identifier "classify"
           signature:
             functionSignature
               parameterClause:

unified/extractor/tests/corpus/swift/expressions/super-expression.output

@@ -20,6 +20,7 @@ sourceFile
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "Base"
           memberBlock:
             memberBlock
@@ -52,8 +53,8 @@ sourceFile
                           leftBrace: {
                           rightBrace: }
                           statements:
-                      name: identifier "update"
                       modifiers:
+                      name: identifier "update"
                       signature:
                         functionSignature
                           parameterClause:
@@ -62,12 +63,12 @@ sourceFile
                               rightParen: )
                               parameters:
                       funcKeyword: func
-          modifiers:
           classKeyword: class
     codeBlockItem
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "Derived"
           inheritanceClause:
             inheritanceClause
@@ -125,10 +126,10 @@ sourceFile
                                       base:
                                         superExpr
                                           superKeyword: super
-                      name: identifier "update"
                       modifiers:
                         declModifier
                           name: override
+                      name: identifier "update"
                       signature:
                         functionSignature
                           parameterClause:
@@ -137,7 +138,6 @@ sourceFile
                               rightParen: )
                               parameters:
                       funcKeyword: func
-          modifiers:
           classKeyword: class
 
 ---

unified/extractor/tests/corpus/swift/expressions/unsafe-expression.output

@@ -15,8 +15,8 @@ sourceFile
               leftBrace: {
               rightBrace: }
               statements:
-          name: identifier "doWork"
           modifiers:
+          name: identifier "doWork"
           signature:
             functionSignature
               parameterClause:

unified/extractor/tests/corpus/swift/functions/attributed-parameter-types.output

@@ -21,6 +21,7 @@ sourceFile
               leftBrace: {
               rightBrace: }
               statements:
+          modifiers:
           name: identifier "f"
           genericParameterClause:
             genericParameterClause
@@ -34,7 +35,6 @@ sourceFile
                   name: identifier "T"
               leftAngle: <
               rightAngle: >
-          modifiers:
           signature:
             functionSignature
               parameterClause:

unified/extractor/tests/corpus/swift/functions/constructor-call-with-type-arguments.output

@@ -11,18 +11,19 @@ sourceFile
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "Foo"
           memberBlock:
             memberBlock
               leftBrace: {
               rightBrace: }
               members:
-          modifiers:
           classKeyword: class
     codeBlockItem
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "C"
           genericParameterClause:
             genericParameterClause
@@ -37,7 +38,6 @@ sourceFile
               leftBrace: {
               rightBrace: }
               members:
-          modifiers:
           classKeyword: class
     codeBlockItem
       item:

unified/extractor/tests/corpus/swift/functions/function-with-default-parameter-value.output

@@ -30,8 +30,8 @@ sourceFile
                       calledExpression:
                         declReferenceExpr
                           baseName: identifier "print"
-          name: identifier "greet"
           modifiers:
+          name: identifier "greet"
           signature:
             functionSignature
               parameterClause:

unified/extractor/tests/corpus/swift/functions/function-with-inout-parameter.output

@@ -28,8 +28,8 @@ sourceFile
                       rightOperand:
                         integerLiteralExpr
                           literal: integerLiteral "1"
-          name: identifier "increment"
           modifiers:
+          name: identifier "increment"
           signature:
             functionSignature
               parameterClause:

unified/extractor/tests/corpus/swift/functions/function-with-named-parameters.output

@@ -30,8 +30,8 @@ sourceFile
                       calledExpression:
                         declReferenceExpr
                           baseName: identifier "print"
-          name: identifier "greet"
           modifiers:
+          name: identifier "greet"
           signature:
             functionSignature
               parameterClause: