[SharpGen] Anonymous declarations have empty names in CastXML

jwollen · jwollen · commit b40375b4e77c · 2015-09-20T01:50:13.000+09:00
diff --git a/Source/Tools/SharpGen/Parser/CppParser.cs b/Source/Tools/SharpGen/Parser/CppParser.cs
@@ -620,7 +620,7 @@ private void Parse(StreamReader reader)
                             //if (structName.Length > 4 && structName.StartsWith("tag") && Char.IsUpper(structName[3]))
                             //    structName = structName.Substring(3);
 
-                            if (structName.StartsWith("tag") || structName.StartsWith("_"))
+                            if (structName.StartsWith("tag") || structName.StartsWith("_") || string.IsNullOrEmpty(structName))
                             {
                                 var typeName = xTypedef.AttributeValue("name");
                                 xStruct.SetAttributeValue("name", typeName);
@@ -1111,7 +1111,7 @@ private CppEnum ParseEnum(XElement xElement)
             var cppEnum = new CppEnum() { Name = xElement.AttributeValue("name") };
 
             // Doh! Anonymous Enum, need to handle them!
-            if (cppEnum.Name.StartsWith("$"))
+            if (cppEnum.Name.StartsWith("$") || string.IsNullOrEmpty(cppEnum.Name))
             {
                 var includeFrom = GetIncludeIdFromFileId(xElement.AttributeValue("file"));
 

Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,7 @@ private void Parse(StreamReader reader)`
`620`	`620`	`//if (structName.Length > 4 && structName.StartsWith("tag") && Char.IsUpper(structName[3]))`
`621`	`621`	`// structName = structName.Substring(3);`
`622`	`622`
`623`		`- if (structName.StartsWith("tag") \|\| structName.StartsWith("_"))`
	`623`	`+ if (structName.StartsWith("tag") \|\| structName.StartsWith("_") \|\| string.IsNullOrEmpty(structName))`
`624`	`624`	`{`
`625`	`625`	`var typeName = xTypedef.AttributeValue("name");`
`626`	`626`	`xStruct.SetAttributeValue("name", typeName);`
`@@ -1111,7 +1111,7 @@ private CppEnum ParseEnum(XElement xElement)`
`1111`	`1111`	`var cppEnum = new CppEnum() { Name = xElement.AttributeValue("name") };`
`1112`	`1112`
`1113`	`1113`	`// Doh! Anonymous Enum, need to handle them!`
`1114`		`- if (cppEnum.Name.StartsWith("$"))`
	`1114`	`+ if (cppEnum.Name.StartsWith("$") \|\| string.IsNullOrEmpty(cppEnum.Name))`
`1115`	`1115`	`{`
`1116`	`1116`	`var includeFrom = GetIncludeIdFromFileId(xElement.AttributeValue("file"));`
`1117`	`1117`