Merge pull request #66 from juanjux/fix/spurious_simple_identifier

Removed unneeded SimpleIdentifier, mark ellipsis as Incomplete

Author: juanjux

ANNOTATION.md

@@ -112,7 +112,7 @@ var AnnotationRules = On(Any).Self(
 			SimpleIdentifier),
 		On(HasInternalType(pyast.AsyncFunctionDef)).Roles(FunctionDeclaration,
 			FunctionDeclarationName, SimpleIdentifier, Incomplete),
-		On(HasInternalType("FunctionDef.decorator_list")).Roles(Call, SimpleIdentifier, Incomplete),
+		On(HasInternalType("FunctionDef.decorator_list")).Roles(Call, Incomplete),
 		On(HasInternalType("FunctionDef.body")).Roles(FunctionDeclarationBody),
 		// FIXME: change to FunctionDeclarationArgumentS once the PR has been merged
 		On(HasInternalType(pyast.Arguments)).Roles(FunctionDeclarationArgument, Incomplete).Children(
@@ -132,12 +132,11 @@ var AnnotationRules = On(Any).Self(
 			// TODO: create an issue for the SDK
 			On(HasInternalType("arguments.defaults")).Roles(FunctionDeclarationArgumentDefaultValue, Incomplete),
 			On(HasInternalType("arguments.keywords")).Roles(FunctionDeclarationArgumentDefaultValue, Incomplete),
-			On(HasInternalType("AsyncFunctionDef.decorator_list")).Roles(Call, SimpleIdentifier, Incomplete),
+			On(HasInternalType("AsyncFunctionDef.decorator_list")).Roles(Call, Incomplete),
 			On(HasInternalType("AsyncFunctionDef.body")).Roles(FunctionDeclarationBody),
 			// FIXME: change to FunctionDeclarationArgumentS once the PR has been merged
 		),
-		On(HasInternalType(pyast.Lambda)).Roles(FunctionDeclaration, SimpleIdentifier, Expression,
-			Incomplete).Children(
+		On(HasInternalType(pyast.Lambda)).Roles(FunctionDeclaration, Expression, Incomplete).Children(
 			On(HasInternalType("Lambda.body")).Roles(FunctionDeclarationBody),
 			// FIXME: change to FunctionDeclarationArgumentS once the PR has been merged
 			On(HasInternalType(pyast.Arguments)).Roles(FunctionDeclarationArgument, Incomplete).Children(
@@ -156,9 +155,9 @@ var AnnotationRules = On(Any).Self(
 				//		defaults  [2,3]
 				// TODO: create an issue for the SDK
 				On(HasInternalType("arguments.defaults")).Roles(FunctionDeclarationArgumentDefaultValue,
-					SimpleIdentifier, Incomplete),
+					Incomplete),
 				On(HasInternalType("arguments.keywords")).Roles(FunctionDeclarationArgumentDefaultValue,
-					SimpleIdentifier, Incomplete),
+					Incomplete),
 			),
 		),
 
@@ -317,7 +316,7 @@ var AnnotationRules = On(Any).Self(
 
 		// 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
-		On(HasInternalType(pyast.Ellipsis)).Roles(SimpleIdentifier),
+		On(HasInternalType(pyast.Ellipsis)).Roles(SimpleIdentifier, Incomplete),
 
 		// List/Map/Set comprehensions. We map the "for x in y" to ForEach roles and the
 		// "if something" to If* roles. FIXME: missing the top comprehension roles in the UAST, change

driver/normalizer/annotation.go

@@ -473,7 +473,7 @@ Module {
 .  .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  2: FunctionDef.decorator_list {
-.  .  .  .  .  .  .  .  .  Roles: Call,SimpleIdentifier,Incomplete
+.  .  .  .  .  .  .  .  .  Roles: Call,Incomplete
 .  .  .  .  .  .  .  .  .  Properties: {
 .  .  .  .  .  .  .  .  .  .  promotedPropertyList: true
 .  .  .  .  .  .  .  .  .  }
@@ -667,7 +667,7 @@ Module {
 .  .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  2: FunctionDef.decorator_list {
-.  .  .  .  .  .  .  .  .  Roles: Call,SimpleIdentifier,Incomplete
+.  .  .  .  .  .  .  .  .  Roles: Call,Incomplete
 .  .  .  .  .  .  .  .  .  Properties: {
 .  .  .  .  .  .  .  .  .  .  promotedPropertyList: true
 .  .  .  .  .  .  .  .  .  }

tests/classdef.py.uast

@@ -48,7 +48,7 @@ Module {
 .  .  .  .  .  }
 .  .  .  .  .  Children: {
 .  .  .  .  .  .  0: Ellipsis {
-.  .  .  .  .  .  .  Roles: SimpleIdentifier
+.  .  .  .  .  .  .  Roles: SimpleIdentifier,Incomplete
 .  .  .  .  .  .  .  TOKEN "PythonEllipsisOperator"
 .  .  .  .  .  .  .  StartPosition: {
 .  .  .  .  .  .  .  .  Offset: 1

tests/ellipsis.py.uast

@@ -65,7 +65,7 @@ Module {
 .  .  .  .  .  }
 .  .  .  .  }
 .  .  .  .  2: FunctionDef.decorator_list {
-.  .  .  .  .  Roles: Call,SimpleIdentifier,Incomplete
+.  .  .  .  .  Roles: Call,Incomplete
 .  .  .  .  .  Properties: {
 .  .  .  .  .  .  promotedPropertyList: true
 .  .  .  .  .  }
@@ -180,7 +180,7 @@ Module {
 .  .  .  .  .  }
 .  .  .  .  }
 .  .  .  .  2: FunctionDef.decorator_list {
-.  .  .  .  .  Roles: Call,SimpleIdentifier,Incomplete
+.  .  .  .  .  Roles: Call,Incomplete
 .  .  .  .  .  Properties: {
 .  .  .  .  .  .  promotedPropertyList: true
 .  .  .  .  .  }

tests/functiondef_decorated.py.uast

@@ -31,7 +31,7 @@ Module {
 .  .  .  }
 .  .  .  Children: {
 .  .  .  .  0: Lambda {
-.  .  .  .  .  Roles: FunctionDeclaration,SimpleIdentifier,Expression,Incomplete
+.  .  .  .  .  Roles: FunctionDeclaration,Expression,Incomplete
 .  .  .  .  .  StartPosition: {
 .  .  .  .  .  .  Offset: 0
 .  .  .  .  .  .  Line: 1