Browse Source

Fixed a null pointer exception when parsing files with unnamed enums.

pull/229/head
Elias Holzer 11 years ago
parent
commit
23a0fc2339
  1. 5
      src/AST/Namespace.cs
  2. 30
      src/Parser/Parser.cpp

5
src/AST/Namespace.cs

@ -178,6 +178,11 @@ namespace CppSharp.AST
return null; return null;
return @namespace.FindEnum(enumName, createDecl); return @namespace.FindEnum(enumName, createDecl);
}
public Enumeration FindEnum(IntPtr ptr)
{
return Enums.FirstOrDefault(f => f.OriginalPtr == ptr);
} }
public Function FindFunction(string name, bool createDecl = false) public Function FindFunction(string name, bool createDecl = false)

30
src/Parser/Parser.cpp

@ -1713,19 +1713,25 @@ CppSharp::AST::Enumeration^ Parser::WalkEnum(clang::EnumDecl* ED)
auto NS = GetNamespace(ED); auto NS = GetNamespace(ED);
assert(NS && "Expected a valid namespace"); assert(NS && "Expected a valid namespace");
auto Name = marshalString<E_UTF8>(GetTagDeclName(ED)); auto E = NS->FindEnum(System::IntPtr(ED->getCanonicalDecl()));
CppSharp::AST::Enumeration^ E = nullptr; if (E && !E->IsIncomplete)
if (!System::String::IsNullOrEmpty(Name)) return E;
E = NS->FindEnum(Name, /*Create=*/false);
else if (!E)
{ {
// Enum with no identifier - try to find existing enum through enum items auto Name = marshalString<E_UTF8>(GetTagDeclName(ED));
for (auto it = ED->enumerator_begin(); it != ED->enumerator_end(); ++it) if (!System::String::IsNullOrEmpty(Name))
E = NS->FindEnum(Name, /*Create=*/false);
else
{ {
EnumConstantDecl* ECD = (*it); // Enum with no identifier - try to find existing enum through enum items
auto EnumItemName = marshalString<E_UTF8>(ECD->getNameAsString()); for (auto it = ED->enumerator_begin(); it != ED->enumerator_end(); ++it)
E = NS->FindEnumWithItem(EnumItemName); {
break; EnumConstantDecl* ECD = (*it);
auto EnumItemName = marshalString<E_UTF8>(ECD->getNameAsString());
E = NS->FindEnumWithItem(EnumItemName);
break;
}
} }
} }
@ -1734,11 +1740,13 @@ CppSharp::AST::Enumeration^ Parser::WalkEnum(clang::EnumDecl* ED)
if (!E) if (!E)
{ {
auto Name = marshalString<E_UTF8>(GetTagDeclName(ED));
if (!System::String::IsNullOrEmpty(Name)) if (!System::String::IsNullOrEmpty(Name))
E = NS->FindEnum(Name, /*Create=*/true); E = NS->FindEnum(Name, /*Create=*/true);
else else
{ {
E = gcnew CppSharp::AST::Enumeration(); E = gcnew CppSharp::AST::Enumeration();
E->Name = Name;
E->Namespace = NS; E->Namespace = NS;
NS->Enums->Add(E); NS->Enums->Add(E);
} }

Loading…
Cancel
Save