CPPASTDoStatement should have DoWhile role (#57)

CPPASTDoStatement should have `DoWhile` role

Signed-off-by: Brandon Fergerson <[email protected]>

Author: BFergerson

driver/normalizer/annotation.go

@@ -325,9 +325,9 @@ var Annotations = []Mapping{
 	}, role.Statement, role.While),
 
 	AnnotateType("CPPASTDoStatement", ObjRoles{
-		"Prop_Body":      {role.While},
-		"Prop_Condition": {role.While, role.Condition},
-	}, role.Statement, role.While),
+		"Prop_Body":      {role.DoWhile},
+		"Prop_Condition": {role.DoWhile, role.Condition},
+	}, role.Statement, role.DoWhile),
 
 	AnnotateType("CPPASTSwitchStatement", ObjRoles{
 		"Prop_Body":                 {role.Switch},

fixtures/do_while.cpp.sem.uast

@@ -203,7 +203,7 @@
                            },
                         },
                         { '@type': "cpp:CPPASTDoStatement",
-                           '@role': [Statement, While],
+                           '@role': [DoWhile, Statement],
                            '@pos': { '@type': "uast:Positions",
                               start: { '@type': "uast:Position",
                                  offset: 30,
@@ -217,7 +217,7 @@
                               },
                            },
                            'Prop_Body': { '@type': "uast:Block",
-                              '@role': [While],
+                              '@role': [DoWhile],
                               '@pos': { '@type': "uast:Positions",
                                  start: { '@type': "uast:Position",
                                     offset: 33,
@@ -479,7 +479,7 @@
                            },
                            'Prop_Condition': { '@type': "cpp:CPPASTBinaryExpression",
                               '@token': "<=",
-                              '@role': [Binary, Condition, Expression, LessThanOrEqual, Relational, While],
+                              '@role': [Binary, Condition, DoWhile, Expression, LessThanOrEqual, Relational],
                               '@pos': { '@type': "uast:Positions",
                                  start: { '@type': "uast:Position",
                                     offset: 95,

fixtures/do_while.cpp.uast

@@ -199,7 +199,7 @@
                   },
                },
                { '@type': "CPPASTDoStatement",
-                  '@role': [Statement, While],
+                  '@role': [DoWhile, Statement],
                   '@pos': { '@type': "uast:Positions",
                      start: { '@type': "uast:Position",
                         offset: 30,
@@ -213,7 +213,7 @@
                      },
                   },
                   'Prop_Body': { '@type': "CPPASTCompoundStatement",
-                     '@role': [Body, While],
+                     '@role': [Body, DoWhile],
                      '@pos': { '@type': "uast:Positions",
                         start: { '@type': "uast:Position",
                            offset: 33,
@@ -477,7 +477,7 @@
                   },
                   'Prop_Condition': { '@type': "CPPASTBinaryExpression",
                      '@token': "<=",
-                     '@role': [Binary, Condition, Expression, LessThanOrEqual, Relational, While],
+                     '@role': [Binary, Condition, DoWhile, Expression, LessThanOrEqual, Relational],
                      '@pos': { '@type': "uast:Positions",
                         start: { '@type': "uast:Position",
                            offset: 95,