New fix and fixture: macros could be expanded anywhere

Signed-off-by: Juanjo Alvarez <[email protected]>

Author: Juanjo Alvarez

driver/normalizer/normalizer.go

@@ -260,6 +260,7 @@ var Normalizers = []Mapping{
 		Fields{
 			{Name: "IsDefaulted", Op: AnyNode(nil)},
 			{Name: "IsDeleted", Op: AnyNode(nil)},
+			{Name: "ExpandedFromMacro", Optional: "optMacro1", Op: AnyNode(nil)},
 			{Name: "Prop_Body", Optional: "optBody", Op: Var("body")},
 
 			{Name: "Prop_DeclSpecifier", Op: Cases("retTypeCase",
@@ -285,6 +286,7 @@ var Normalizers = []Mapping{
 					{Name: "IsVirtual", Op: AnyNode(nil)},
 					{Name: "IsVolatile", Op: AnyNode(nil)},
 					{Name: "StorageClass", Op: AnyNode(nil)},
+					{Name: "ExpandedFromMacro", Optional: "optMacro2", Op: AnyNode(nil)},
 					{Name: "Type", Op: String("void")},
 				},
 				// unspecified (ie constructor/destructors)
@@ -308,6 +310,7 @@ var Normalizers = []Mapping{
 					{Name: "IsVirtual", Op: AnyNode(nil)},
 					{Name: "IsVolatile", Op: AnyNode(nil)},
 					{Name: "StorageClass", Op: AnyNode(nil)},
+					{Name: "ExpandedFromMacro", Optional: "optMacro3", Op: AnyNode(nil)},
 					{Name: "Type", Op: String("unspecified")},
 				},
 				Fields{
@@ -331,6 +334,7 @@ var Normalizers = []Mapping{
 					{Name: "IsVirtual", Op: AnyNode(nil)},
 					{Name: "IsVolatile", Op: AnyNode(nil)},
 					{Name: "StorageClass", Op: Var("StorageClass")},
+					{Name: "ExpandedFromMacro", Optional: "optMacro4", Op: AnyNode(nil)},
 					{Name: "Type", Op: Var("retType")},
 				},
 				Fields{
@@ -348,6 +352,7 @@ var Normalizers = []Mapping{
 					{Name: "IsTypeName", Op: AnyNode(nil)},
 					{Name: "IsVirtual", Op: AnyNode(nil)},
 					{Name: "IsVolatile", Op: AnyNode(nil)},
+					{Name: "ExpandedFromMacro", Optional: "optMacro5", Op: AnyNode(nil)},
 					{Name: "Prop_Name", Op: Var("retType")},
 				},
 			)},
@@ -361,6 +366,7 @@ var Normalizers = []Mapping{
 				{Name: "IsOverride", Op: AnyNode(nil)},
 				{Name: "IsPureVirtual", Op: AnyNode(nil)},
 				{Name: "IsVolatile", Op: AnyNode(nil)},
+				{Name: "ExpandedFromMacro", Optional: "optMacro6", Op: AnyNode(nil)},
 				{Name: "Prop_NoexceptExpression", Optional: "declNoExcept", Op: AnyNode(nil)},
 				{Name: "Prop_VirtSpecifiers", Optional: "declVirtSpecs", Op: AnyNode(nil)},
 
@@ -395,6 +401,7 @@ var Normalizers = []Mapping{
 						{Name: "DeclaresParameterPack", Op: AnyNode(nil)},
 						{Name: "Prop_PointerOperators", Optional: "optPointerOps", Op: AnyNode(nil)},
 						{Name: "Prop_Initializer", Optional: "optInitializer", Op: Var("ainit")},
+						{Name: "ExpandedFromMacro", Optional: "optMacro7", Op: AnyNode(nil)},
 					},
 					Fields{
 						{Name: uast.KeyType, Op: String("CPPASTArrayDeclarator")},
@@ -404,6 +411,7 @@ var Normalizers = []Mapping{
 						{Name: "DeclaresParameterPack", Op: AnyNode(nil)},
 						{Name: "Prop_ArrayModifiers", Op: AnyNode(nil)},
 						{Name: "Prop_Initializer", Optional: "optInitializer", Op: Var("ainit")},
+						{Name: "ExpandedFromMacro", Optional: "optMacro8", Op: AnyNode(nil)},
 					},
 				))},
 			}},