Merge pull request #48 from abeaumont/fix/switch-statement-roles

Fix switch statement annotations

Author: abeaumont

ANNOTATION.md

@@ -65,10 +65,10 @@
 | /self::\*\[@InternalType='CompilationUnit'\]//\*\[@InternalType='IfStatement'\]/\*\[@internalRole\]\[@internalRole='elseStatement'\] | If, Else, Body |
 | /self::\*\[@InternalType='CompilationUnit'\]//\*\[@InternalType='SwitchStatement'\] | Statement, Switch |
 | /self::\*\[@InternalType='CompilationUnit'\]//\*\[@InternalType='SwitchStatement'\]/\*\[@internalRole\]\[@internalRole='expression'\] | Expression, Switch |
-| /self::\*\[@InternalType='CompilationUnit'\]//\*\[@InternalType='SwitchStatement'\]/\*\[@InternalType='SwitchCase'\] | Statement, Switch, Case |
-| /self::\*\[@InternalType='CompilationUnit'\]//\*\[@InternalType='SwitchStatement'\]/\*\[@InternalType='SwitchCase'\]/self::\*\[child::\*\] | Switch, Case |
+| /self::\*\[@InternalType='CompilationUnit'\]//\*\[@InternalType='SwitchStatement'\]/\*\[@InternalType='SwitchCase'\] | Statement, Switch |
+| /self::\*\[@InternalType='CompilationUnit'\]//\*\[@InternalType='SwitchStatement'\]/\*\[@InternalType='SwitchCase'\]/self::\*\[child::\*\] | Case |
 | /self::\*\[@InternalType='CompilationUnit'\]//\*\[@InternalType='SwitchStatement'\]/\*\[@InternalType='SwitchCase'\]/self::\*\[child::\*\]/\*\[@internalRole\]\[@internalRole='expression'\] | Expression, Switch, Case, Condition |
-| /self::\*\[@InternalType='CompilationUnit'\]//\*\[@InternalType='SwitchStatement'\]/\*\[@InternalType='SwitchCase'\]/self::\*\[not\(child::\*\)\] | Switch, Default |
+| /self::\*\[@InternalType='CompilationUnit'\]//\*\[@InternalType='SwitchStatement'\]/\*\[@InternalType='SwitchCase'\]/self::\*\[not\(child::\*\)\] | Default |
 | /self::\*\[@InternalType='CompilationUnit'\]//\*\[@InternalType='SwitchStatement'\]/\*\[@InternalType='ExpressionStatement'\] | Switch, Case, Body |
 | /self::\*\[@InternalType='CompilationUnit'\]//\*\[@InternalType='EnhancedForStatement'\] | Statement, For, Iterator |
 | /self::\*\[@InternalType='CompilationUnit'\]//\*\[@InternalType='EnhancedForStatement'\]/\*\[@internalRole\]\[@internalRole='parameter'\] | For, Iterator |

driver/normalizer/annotation.go

@@ -116,11 +116,11 @@ var AnnotationRules = On(jdt.CompilationUnit).Roles(uast.File).Descendants(
 
 	On(jdt.SwitchStatement).Roles(uast.Statement, uast.Switch).Children(
 		On(jdt.PropertyExpression).Roles(uast.Expression, uast.Switch),
-		On(jdt.SwitchCase).Roles(uast.Statement, uast.Switch, uast.Case).Self(
-			On(HasChild(Any)).Roles(uast.Switch, uast.Case).Children(
+		On(jdt.SwitchCase).Roles(uast.Statement, uast.Switch).Self(
+			On(HasChild(Any)).Roles(uast.Case).Children(
 				On(jdt.PropertyExpression).Roles(uast.Expression, uast.Switch, uast.Case, uast.Condition),
 			),
-			On(Not(HasChild(Any))).Roles(uast.Switch, uast.Default),
+			On(Not(HasChild(Any))).Roles(uast.Default),
 		),
 		// FIXME: Switch case bodies are not enclosed in a block, thus it may
 		// contain an arbitrary number of statements (of any kind). So this

tests/switch.uast

@@ -119,7 +119,7 @@ CompilationUnit {
 .  .  .  .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  .  .  1: SwitchCase {
-.  .  .  .  .  .  .  .  .  .  .  Roles: Statement,Switch,Case,Switch,Case
+.  .  .  .  .  .  .  .  .  .  .  Roles: Statement,Switch,Case
 .  .  .  .  .  .  .  .  .  .  .  Properties: {
 .  .  .  .  .  .  .  .  .  .  .  .  internalRole: statements
 .  .  .  .  .  .  .  .  .  .  .  }
@@ -236,7 +236,7 @@ CompilationUnit {
 .  .  .  .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  .  .  3: SwitchCase {
-.  .  .  .  .  .  .  .  .  .  .  Roles: Statement,Switch,Case,Switch,Case
+.  .  .  .  .  .  .  .  .  .  .  Roles: Statement,Switch,Case
 .  .  .  .  .  .  .  .  .  .  .  Properties: {
 .  .  .  .  .  .  .  .  .  .  .  .  internalRole: statements
 .  .  .  .  .  .  .  .  .  .  .  }
@@ -353,7 +353,7 @@ CompilationUnit {
 .  .  .  .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  .  .  5: SwitchCase {
-.  .  .  .  .  .  .  .  .  .  .  Roles: Statement,Switch,Case,Switch,Case
+.  .  .  .  .  .  .  .  .  .  .  Roles: Statement,Switch,Case
 .  .  .  .  .  .  .  .  .  .  .  Properties: {
 .  .  .  .  .  .  .  .  .  .  .  .  internalRole: statements
 .  .  .  .  .  .  .  .  .  .  .  }
@@ -580,7 +580,7 @@ CompilationUnit {
 .  .  .  .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  .  .  11: SwitchCase {
-.  .  .  .  .  .  .  .  .  .  .  Roles: Statement,Switch,Case,Switch,Default
+.  .  .  .  .  .  .  .  .  .  .  Roles: Statement,Switch,Default
 .  .  .  .  .  .  .  .  .  .  .  Properties: {
 .  .  .  .  .  .  .  .  .  .  .  .  internalRole: statements
 .  .  .  .  .  .  .  .  .  .  .  }