Removed OpMult from Incomplete Pow node. Marked type annotation nodes as incomplete

- Integration tests

Author: Juanjo Alvarez

ANNOTATION.md

@@ -22,7 +22,7 @@
 | /self::\*\[@InternalType='Module'\]//\*\[@InternalType='Div'\] | OpDivide |
 | /self::\*\[@InternalType='Module'\]//\*\[@InternalType='Mod'\] | OpMod |
 | /self::\*\[@InternalType='Module'\]//\*\[@InternalType='FloorDiv'\] | OpDivide, Incomplete |
-| /self::\*\[@InternalType='Module'\]//\*\[@InternalType='Pow'\] | OpMultiply, Incomplete |
+| /self::\*\[@InternalType='Module'\]//\*\[@InternalType='Pow'\] | Incomplete |
 | /self::\*\[@InternalType='Module'\]//\*\[@InternalType='MatMult'\] | OpMultiply, Incomplete |
 | /self::\*\[@InternalType='Module'\]//\*\[@InternalType='LShift'\] | OpBitwiseLeftShift |
 | /self::\*\[@InternalType='Module'\]//\*\[@InternalType='RShift'\] | OpBitwiseRightShift |
@@ -157,8 +157,8 @@
 | /self::\*\[@InternalType='Module'\]//\*\[@InternalType='Print'\]/\*\[@internalRole\]\[@internalRole='nl'\] | CallPositionalArgument |
 | /self::\*\[@InternalType='Module'\]//\*\[@InternalType='Print'\]/\*\[@internalRole\]\[@internalRole='values'\] | CallPositionalArgument |
 | /self::\*\[@InternalType='Module'\]//\*\[@InternalType='Print'\]/\*\[@internalRole\]\[@internalRole='values'\]/\*\[\*\] | CallPositionalArgument |
-| /self::\*\[@InternalType='Module'\]//\*\[@internalRole\]\[@internalRole='annotation'\] | Comment |
-| /self::\*\[@InternalType='Module'\]//\*\[@internalRole\]\[@internalRole='returns'\] | Comment |
+| /self::\*\[@InternalType='Module'\]//\*\[@internalRole\]\[@internalRole='annotation'\] | Comment, Incomplete |
+| /self::\*\[@InternalType='Module'\]//\*\[@internalRole\]\[@internalRole='returns'\] | Comment, Incomplete |
 | /self::\*\[@InternalType='Module'\]//\*\[@InternalType='Ellipsis'\] | SimpleIdentifier |
 | /self::\*\[@InternalType='Module'\]//\*\[@InternalType='comprehension'\] | ForEach, Expression |
 | /self::\*\[@InternalType='Module'\]//\*\[@InternalType='comprehension'\]/\*\[@internalRole\]\[@internalRole='iter'\] | ForUpdate, Statement |

driver/normalizer/annotation.go

@@ -80,9 +80,8 @@ var AnnotationRules = On(Any).Self(
 		On(HasInternalType(pyast.Mult)).Roles(OpMultiply),
 		On(HasInternalType(pyast.Div)).Roles(OpDivide),
 		On(HasInternalType(pyast.Mod)).Roles(OpMod),
-		// TODO: currently without mapping in the UAST
 		On(HasInternalType(pyast.FloorDiv)).Roles(OpDivide, Incomplete),
-		On(HasInternalType(pyast.Pow)).Roles(OpMultiply, Incomplete),
+		On(HasInternalType(pyast.Pow)).Roles(Incomplete),
 		On(HasInternalType(pyast.MatMult)).Roles(OpMultiply, Incomplete),
 
 		// Bitwise operators
@@ -333,9 +332,9 @@ var AnnotationRules = On(Any).Self(
 		// information by themselves and this we consider it comments (some preprocessors or linters can use
 		// them, the runtimes ignore them). The TOKEN will take the annotation in the UAST node so
 		// the information is keept in any case.
-		// FIXME: change to Annotation when PR 112 is merged
-		On(HasInternalRole("annotation")).Roles(Comment),
-		On(HasInternalRole("returns")).Roles(Comment),
+		// FIXME: need annotation or type UAST roles
+		On(HasInternalRole("annotation")).Roles(Comment, Incomplete),
+		On(HasInternalRole("returns")).Roles(Comment, Incomplete),
 
 		// Python very odd ellipsis operator. Has a special rule in tonoder synthetic tokens
 		// map to load it with the token "PythonEllipsisOperator" and gets the role SimpleIdentifier

tests/aritmeticops.py.uast

@@ -594,7 +594,7 @@ Module {
 .  .  .  .  .  .  .  }
 .  .  .  .  .  .  }
 .  .  .  .  .  .  1: Pow {
-.  .  .  .  .  .  .  Roles: BinaryExpressionOp,OpMultiply,Incomplete
+.  .  .  .  .  .  .  Roles: BinaryExpressionOp,Incomplete
 .  .  .  .  .  .  .  TOKEN "**"
 .  .  .  .  .  .  .  StartPosition: {
 .  .  .  .  .  .  .  .  Offset: 26

tests/declarations_annotated.py.uast

@@ -32,7 +32,7 @@ Module {
 .  .  .  }
 .  .  .  Children: {
 .  .  .  .  0: Name {
-.  .  .  .  .  Roles: SimpleIdentifier,Expression,Comment
+.  .  .  .  .  Roles: SimpleIdentifier,Expression,Comment,Incomplete
 .  .  .  .  .  TOKEN "int"
 .  .  .  .  .  StartPosition: {
 .  .  .  .  .  .  Offset: 3
@@ -105,7 +105,7 @@ Module {
 .  .  .  }
 .  .  .  Children: {
 .  .  .  .  0: Name {
-.  .  .  .  .  Roles: SimpleIdentifier,Expression,Comment
+.  .  .  .  .  Roles: SimpleIdentifier,Expression,Comment,Incomplete
 .  .  .  .  .  TOKEN "str"
 .  .  .  .  .  StartPosition: {
 .  .  .  .  .  .  Offset: 14

tests/functiondef_annotated.py.uast

@@ -67,7 +67,7 @@ Module {
 .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  Children: {
 .  .  .  .  .  .  .  .  0: Name {
-.  .  .  .  .  .  .  .  .  Roles: SimpleIdentifier,Expression,Comment
+.  .  .  .  .  .  .  .  .  Roles: SimpleIdentifier,Expression,Comment,Incomplete
 .  .  .  .  .  .  .  .  .  TOKEN "int"
 .  .  .  .  .  .  .  .  .  StartPosition: {
 .  .  .  .  .  .  .  .  .  .  Offset: 19
@@ -104,7 +104,7 @@ Module {
 .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  Children: {
 .  .  .  .  .  .  .  .  0: Name {
-.  .  .  .  .  .  .  .  .  Roles: SimpleIdentifier,Expression,Comment
+.  .  .  .  .  .  .  .  .  Roles: SimpleIdentifier,Expression,Comment,Incomplete
 .  .  .  .  .  .  .  .  .  TOKEN "str"
 .  .  .  .  .  .  .  .  .  StartPosition: {
 .  .  .  .  .  .  .  .  .  .  Offset: 30
@@ -141,7 +141,7 @@ Module {
 .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  Children: {
 .  .  .  .  .  .  .  .  0: Name {
-.  .  .  .  .  .  .  .  .  Roles: SimpleIdentifier,Expression,Comment
+.  .  .  .  .  .  .  .  .  Roles: SimpleIdentifier,Expression,Comment,Incomplete
 .  .  .  .  .  .  .  .  .  TOKEN "MyType"
 .  .  .  .  .  .  .  .  .  StartPosition: {
 .  .  .  .  .  .  .  .  .  .  Offset: 41
@@ -179,7 +179,7 @@ Module {
 .  .  .  .  .  }
 .  .  .  .  }
 .  .  .  .  2: Name {
-.  .  .  .  .  Roles: SimpleIdentifier,Expression,Comment
+.  .  .  .  .  Roles: SimpleIdentifier,Expression,Comment,Incomplete
 .  .  .  .  .  TOKEN "Tuple"
 .  .  .  .  .  StartPosition: {
 .  .  .  .  .  .  Offset: 52