pimhwang
/
CppSharp
mirror of https://github.com/mono/CppSharp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Synced new and old parser. 

* Implemented missing parts in regards to class templates.
* Fixed couple of class member initialization issues in C++ AST classes.
* Make code more look alike so it's easier to compare them.
* All tests pass now with old and new parser. Especially the nasty STL one with the ostream typedef.
pull/245/head
Elias Holzer 11 years ago
parent
3f813bc3ee
commit
d3fb9289cf
15 changed files with 688 additions and 1011 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/AST/ASTVisitor.cs
  2. 18
      src/AST/Type.cs
  3. 2
      src/AST/TypeExtensions.cs
  4. 89
      src/Core/Parser/ASTConverter.cs
  5. 59
      src/CppParser/AST.cpp
  6. 6
      src/CppParser/AST.h
  7. 12
      src/CppParser/Bindings/CLI/AST.cpp
  8. 22
      src/CppParser/Bindings/CLI/AST.h
  9. 1
      src/CppParser/Bindings/CLI/CppParser.h
  10. 1265
      src/CppParser/Bindings/CSharp/AST.cs
  11. 60
      src/CppParser/Bindings/CSharp/CppParser.cs
  12. 79
      src/CppParser/Bindings/CSharp/Target.cs
  13. 43
      src/CppParser/Parser.cpp
  14. 37
      src/Parser/Parser.cpp

4
src/AST/ASTVisitor.cs
Unescape View File

@ -84,7 +84,7 @@ namespace CppSharp.AST
if (array.SizeType == ArrayType.ArraySize.Dependent) if (array.SizeType == ArrayType.ArraySize.Dependent)
return false; return false;
return array.Type.Visit(this, quals); return array.QualifiedType.Visit(this);
} }
public virtual bool VisitFunctionType(FunctionType function, TypeQualifiers quals) public virtual bool VisitFunctionType(FunctionType function, TypeQualifiers quals)
@ -119,7 +119,7 @@ namespace CppSharp.AST
if (!VisitType(member, quals)) if (!VisitType(member, quals))
return false; return false;
return member.Pointee.Visit(this, quals); return member.QualifiedPointee.Visit(this);
} }
public virtual bool VisitBuiltinType(BuiltinType builtin, TypeQualifiers quals) public virtual bool VisitBuiltinType(BuiltinType builtin, TypeQualifiers quals)

18
src/AST/Type.cs
Unescape View File

@ -136,7 +136,7 @@ namespace CppSharp.AST
} }
// Type of the array elements. // Type of the array elements.
public Type Type; public QualifiedType QualifiedType;
// Size type of array. // Size type of array.
public ArraySize SizeType; public ArraySize SizeType;
@ -144,6 +144,11 @@ namespace CppSharp.AST
// In case of a constant size array. // In case of a constant size array.
public long Size; public long Size;
public Type Type
{
get { return QualifiedType.Type; }
}
public override T Visit<T>(ITypeVisitor<T> visitor, TypeQualifiers quals) public override T Visit<T>(ITypeVisitor<T> visitor, TypeQualifiers quals)
{ {
return visitor.VisitArrayType(this, quals); return visitor.VisitArrayType(this, quals);
@ -153,7 +158,7 @@ namespace CppSharp.AST
{ {
var type = obj as ArrayType; var type = obj as ArrayType;
if (type == null) return false; if (type == null) return false;
var equals = Type.Equals(type.Type) && SizeType.Equals(type.SizeType); var equals = QualifiedType.Equals(type.QualifiedType) && SizeType.Equals(type.SizeType);
if (SizeType == ArraySize.Constant) if (SizeType == ArraySize.Constant)
equals &= Size.Equals(type.Size); equals &= Size.Equals(type.Size);
@ -266,7 +271,12 @@ namespace CppSharp.AST
/// </summary> /// </summary>
public class MemberPointerType : Type public class MemberPointerType : Type
{ {
public Type Pointee; public QualifiedType QualifiedPointee;
public Type Pointee
{
get { return QualifiedPointee.Type; }
}
public override T Visit<T>(ITypeVisitor<T> visitor, TypeQualifiers quals) public override T Visit<T>(ITypeVisitor<T> visitor, TypeQualifiers quals)
{ {
@ -278,7 +288,7 @@ namespace CppSharp.AST
var pointer = obj as MemberPointerType; var pointer = obj as MemberPointerType;
if (pointer == null) return false; if (pointer == null) return false;
return Pointee.Equals(pointer.Pointee); return QualifiedPointee.Equals(pointer.QualifiedPointee);
} }
public override int GetHashCode() public override int GetHashCode()

2
src/AST/TypeExtensions.cs
Unescape View File

@ -197,7 +197,7 @@
return ptr.Pointee; return ptr.Pointee;
var memberPtr = t as MemberPointerType; var memberPtr = t as MemberPointerType;
if (memberPtr != null) if (memberPtr != null)
return memberPtr.Pointee; return memberPtr.QualifiedPointee.Type;
return null; return null;
} }

89
src/Core/Parser/ASTConverter.cs
Unescape View File

@ -354,7 +354,7 @@ namespace CppSharp
{ {
Size = type.Size, Size = type.Size,
SizeType = VisitArraySizeType(type.SizeType), SizeType = VisitArraySizeType(type.SizeType),
Type = VisitQualified(type.QualifiedType).Type QualifiedType = VisitQualified(type.QualifiedType)
}; };
VisitType(type, _type); VisitType(type, _type);
return _type; return _type;
@ -408,7 +408,7 @@ namespace CppSharp
{ {
var _type = new CppSharp.AST.MemberPointerType(); var _type = new CppSharp.AST.MemberPointerType();
VisitType(type, _type); VisitType(type, _type);
_type.Pointee = VisitQualified(type.Pointee).Type; _type.QualifiedPointee = VisitQualified(type.Pointee);
return _type; return _type;
} }
@ -502,8 +502,8 @@ namespace CppSharp
public override AST.Type VisitTemplateParameterSubstitution(TemplateParameterSubstitutionType type) public override AST.Type VisitTemplateParameterSubstitution(TemplateParameterSubstitutionType type)
{ {
throw new NotImplementedException();
var _type = new CppSharp.AST.TemplateParameterSubstitutionType(); var _type = new CppSharp.AST.TemplateParameterSubstitutionType();
_type.Replacement = VisitQualified(type.Replacement);
VisitType(type, _type); VisitType(type, _type);
return _type; return _type;
} }
@ -1262,7 +1262,12 @@ namespace CppSharp
{ {
var _decl = new AST.ClassTemplate(); var _decl = new AST.ClassTemplate();
VisitTemplate(decl, _decl); VisitTemplate(decl, _decl);
for (uint i = 0; i < decl.SpecializationsCount; ++i)
{
var spec = decl.getSpecializations(i);
var _spec = (AST.ClassTemplateSpecialization)Visit(spec);
_decl.Specializations.Add(_spec);
}
return _decl; return _decl;
} }
@ -1270,21 +1275,83 @@ namespace CppSharp
ClassTemplateSpecialization decl) ClassTemplateSpecialization decl)
{ {
var _decl = new AST.ClassTemplateSpecialization(); var _decl = new AST.ClassTemplateSpecialization();
VisitClassTemplateSpecialization(decl, _decl);
return _decl;
}
private void VisitClassTemplateSpecialization(ClassTemplateSpecialization decl, AST.ClassTemplateSpecialization _decl)
{
VisitClass(decl, _decl); VisitClass(decl, _decl);
_decl.SpecializationKind = VisitSpecializationKind(decl.SpecializationKind);
_decl.TemplatedDecl = (AST.ClassTemplate)Visit(decl.TemplatedDecl);
for (uint i = 0; i < decl.ArgumentsCount; ++i)
{
var arg = decl.getArguments(i);
var _arg = VisitTemplateArgument(arg);
_decl.Arguments.Add(_arg);
}
}
//for (uint i = 0; i < decl.ArgumentsCount; ++i) private AST.TemplateArgument VisitTemplateArgument(TemplateArgument arg)
//{ {
// var _arg = decl.getArguments(i); var _arg = new AST.TemplateArgument();
// _decl.Arguments.Add(_arg); _arg.Kind = VisitTemplateArgumentKind(arg.Kind);
//} _arg.Type = typeConverter.VisitQualified(arg.Type);
_arg.Declaration = Visit(arg.Declaration);
_arg.Integral = arg.Integral;
return _arg;
}
return _decl; private AST.TemplateArgument.ArgumentKind VisitTemplateArgumentKind(TemplateArgument.ArgumentKind argumentKind)
{
switch (argumentKind)
{
case TemplateArgument.ArgumentKind.Declaration:
return AST.TemplateArgument.ArgumentKind.Declaration;
case TemplateArgument.ArgumentKind.Expression:
return AST.TemplateArgument.ArgumentKind.Expression;
case TemplateArgument.ArgumentKind.Integral:
return AST.TemplateArgument.ArgumentKind.Integral;
case TemplateArgument.ArgumentKind.NullPtr:
return AST.TemplateArgument.ArgumentKind.NullPtr;
case TemplateArgument.ArgumentKind.Pack:
return AST.TemplateArgument.ArgumentKind.Pack;
case TemplateArgument.ArgumentKind.Template:
return AST.TemplateArgument.ArgumentKind.Template;
case TemplateArgument.ArgumentKind.TemplateExpansion:
return AST.TemplateArgument.ArgumentKind.TemplateExpansion;
case TemplateArgument.ArgumentKind.Type:
return AST.TemplateArgument.ArgumentKind.Type;
default:
throw new NotImplementedException();
}
}
private AST.TemplateSpecializationKind VisitSpecializationKind(TemplateSpecializationKind templateSpecializationKind)
{
switch (templateSpecializationKind)
{
case TemplateSpecializationKind.ExplicitInstantiationDeclaration:
return AST.TemplateSpecializationKind.ExplicitInstantiationDeclaration;
case TemplateSpecializationKind.ExplicitInstantiationDefinition:
return AST.TemplateSpecializationKind.ExplicitInstantiationDefinition;
case TemplateSpecializationKind.ExplicitSpecialization:
return AST.TemplateSpecializationKind.ExplicitSpecialization;
case TemplateSpecializationKind.ImplicitInstantiation:
return AST.TemplateSpecializationKind.ImplicitInstantiation;
case TemplateSpecializationKind.Undeclared:
return AST.TemplateSpecializationKind.Undeclared;
default:
throw new NotImplementedException();
}
} }
public override AST.Declaration VisitClassTemplatePartialSpecialization( public override AST.Declaration VisitClassTemplatePartialSpecialization(
ClassTemplatePartialSpecialization decl) ClassTemplatePartialSpecialization decl)
{ {
throw new NotImplementedException(); var _decl = new AST.ClassTemplatePartialSpecialization();
VisitClassTemplateSpecialization(decl, _decl);
return _decl;
} }
public override AST.Declaration VisitFunctionTemplate(FunctionTemplate decl) public override AST.Declaration VisitFunctionTemplate(FunctionTemplate decl)

59
src/CppParser/AST.cpp
Unescape View File

@ -55,6 +55,9 @@ AttributedType::AttributedType() : Type(TypeKind::Attributed) {}
DecayedType::DecayedType() : Type(TypeKind::Decayed) {} DecayedType::DecayedType() : Type(TypeKind::Decayed) {}
// Template
Template::Template(DeclarationKind kind) : Declaration(kind) {}
TemplateArgument::TemplateArgument() : Declaration(0) {} TemplateArgument::TemplateArgument() : Declaration(0) {}
TemplateSpecializationType::TemplateSpecializationType() TemplateSpecializationType::TemplateSpecializationType()
@ -136,8 +139,10 @@ DEF_STRING(Declaration, Name)
DEF_STRING(Declaration, DebugText) DEF_STRING(Declaration, DebugText)
DEF_VECTOR(Declaration, PreprocessedEntity*, PreprocessedEntities) DEF_VECTOR(Declaration, PreprocessedEntity*, PreprocessedEntities)
DeclarationContext::DeclarationContext() : IsAnonymous(false), DeclarationContext::DeclarationContext(DeclarationKind kind)
Declaration(DeclarationKind::DeclarationContext) {} : Declaration(kind)
, IsAnonymous(false)
{}
DEF_VECTOR(DeclarationContext, Namespace*, Namespaces) DEF_VECTOR(DeclarationContext, Namespace*, Namespaces)
DEF_VECTOR(DeclarationContext, Enumeration*, Enums) DEF_VECTOR(DeclarationContext, Enumeration*, Enums)
@ -355,6 +360,18 @@ Function* DeclarationContext::FindFunction(const std::string& Name, bool Create)
return function; return function;
} }
ClassTemplate*
DeclarationContext::FindClassTemplate(void* OriginalPtr)
{
auto foundTemplate = std::find_if(Templates.begin(), Templates.end(),
[&](Template* t) { return t->OriginalPtr == OriginalPtr; });
if (foundTemplate != Templates.end())
return static_cast<ClassTemplate*>(*foundTemplate);
return nullptr;
}
FunctionTemplate* FunctionTemplate*
DeclarationContext::FindFunctionTemplate(void* OriginalPtr) DeclarationContext::FindFunctionTemplate(void* OriginalPtr)
{ {
@ -450,7 +467,20 @@ Field::Field() : Declaration(DeclarationKind::Field), Class(0) {}
AccessSpecifierDecl::AccessSpecifierDecl() AccessSpecifierDecl::AccessSpecifierDecl()
: Declaration(DeclarationKind::AccessSpecifier) {} : Declaration(DeclarationKind::AccessSpecifier) {}
Class::Class() : Layout(0) { Kind = DeclarationKind::Class; } Class::Class()
: DeclarationContext(DeclarationKind::Class)
, IsPOD(false)
, IsAbstract(false)
, IsUnion(false)
, IsDynamic(false)
, IsPolymorphic(false)
, HasNonTrivialDefaultConstructor(false)
, HasNonTrivialCopyConstructor(false)
, HasNonTrivialDestructor(false)
, IsExternCContext(false)
, Layout(0)
{
}
DEF_VECTOR(Class, BaseClassSpecifier*, Bases) DEF_VECTOR(Class, BaseClassSpecifier*, Bases)
DEF_VECTOR(Class, Field*, Fields) DEF_VECTOR(Class, Field*, Fields)
@ -462,7 +492,7 @@ Template::Template() : Declaration(DeclarationKind::Template),
DEF_VECTOR(Template, TemplateParameter, Parameters) DEF_VECTOR(Template, TemplateParameter, Parameters)
ClassTemplate::ClassTemplate() { Kind = DeclarationKind::ClassTemplate; } ClassTemplate::ClassTemplate() : Template(DeclarationKind::ClassTemplate) {}
DEF_VECTOR(ClassTemplate, ClassTemplateSpecialization*, Specializations) DEF_VECTOR(ClassTemplate, ClassTemplateSpecialization*, Specializations)
@ -474,9 +504,13 @@ DEF_VECTOR(ClassTemplateSpecialization, TemplateArgument, Arguments)
ClassTemplatePartialSpecialization::ClassTemplatePartialSpecialization() ClassTemplatePartialSpecialization::ClassTemplatePartialSpecialization()
{ Kind = DeclarationKind::ClassTemplatePartialSpecialization; } { Kind = DeclarationKind::ClassTemplatePartialSpecialization; }
FunctionTemplate::FunctionTemplate() { Kind = DeclarationKind::FunctionTemplate; } FunctionTemplate::FunctionTemplate() : Template(DeclarationKind::FunctionTemplate) {}
Namespace::Namespace() : IsInline(false) { Kind = DeclarationKind::Namespace; } Namespace::Namespace()
: DeclarationContext(DeclarationKind::Namespace)
, IsInline(false)
{
}
PreprocessedEntity::PreprocessedEntity() PreprocessedEntity::PreprocessedEntity()
: Declaration(DeclarationKind::PreprocessedEntity), : Declaration(DeclarationKind::PreprocessedEntity),
@ -504,7 +538,13 @@ DEF_VECTOR(ASTContext, TranslationUnit*, TranslationUnits)
ClassTemplateSpecialization* ClassTemplate::FindSpecialization(void* ptr) ClassTemplateSpecialization* ClassTemplate::FindSpecialization(void* ptr)
{ {
return 0; auto foundSpec = std::find_if(Specializations.begin(), Specializations.end(),
[&](ClassTemplateSpecialization* cts) { return cts->OriginalPtr == ptr; });
if (foundSpec != Specializations.end())
return static_cast<ClassTemplateSpecialization*>(*foundSpec);
return nullptr;
} }
ClassTemplateSpecialization* ClassTemplateSpecialization*
@ -515,7 +555,10 @@ ClassTemplate::FindSpecialization(TemplateSpecializationType type)
ClassTemplatePartialSpecialization* ClassTemplate::FindPartialSpecialization(void* ptr) ClassTemplatePartialSpecialization* ClassTemplate::FindPartialSpecialization(void* ptr)
{ {
return 0; auto foundSpec = FindSpecialization(ptr);
if (foundSpec != nullptr)
return static_cast<ClassTemplatePartialSpecialization*>(foundSpec);
return nullptr;
} }
ClassTemplatePartialSpecialization* ClassTemplatePartialSpecialization*

6
src/CppParser/AST.h
Unescape View File

@ -380,12 +380,13 @@ struct Function;
struct TypedefDecl; struct TypedefDecl;
struct Namespace; struct Namespace;
struct Template; struct Template;
struct ClassTemplate;
struct FunctionTemplate; struct FunctionTemplate;
struct Variable; struct Variable;
struct CS_API DeclarationContext : public Declaration struct CS_API DeclarationContext : public Declaration
{ {
DECLARE_DECL_KIND(DeclarationContext, DeclarationContext) DeclarationContext(DeclarationKind kind);
CS_IGNORE Declaration* FindAnonymous(uint64_t key); CS_IGNORE Declaration* FindAnonymous(uint64_t key);
@ -398,6 +399,7 @@ struct CS_API DeclarationContext : public Declaration
CS_IGNORE Class* FindClass(const std::string& Name, bool IsComplete, CS_IGNORE Class* FindClass(const std::string& Name, bool IsComplete,
bool Create = false); bool Create = false);
CS_IGNORE ClassTemplate* FindClassTemplate(void* OriginalPtr);
CS_IGNORE FunctionTemplate* FindFunctionTemplate(void* OriginalPtr); CS_IGNORE FunctionTemplate* FindFunctionTemplate(void* OriginalPtr);
CS_IGNORE FunctionTemplate* FindFunctionTemplate(const std::string& Name, CS_IGNORE FunctionTemplate* FindFunctionTemplate(const std::string& Name,
const std::vector<TemplateParameter>& Params); const std::vector<TemplateParameter>& Params);
@ -574,7 +576,6 @@ struct CS_API Variable : public Declaration
CppSharp::CppParser::AST::QualifiedType QualifiedType; CppSharp::CppParser::AST::QualifiedType QualifiedType;
}; };
struct DeclarationContext;
struct PreprocessedEntity; struct PreprocessedEntity;
struct CS_API BaseClassSpecifier struct CS_API BaseClassSpecifier
@ -624,6 +625,7 @@ struct CS_API Class : public DeclarationContext
struct CS_API Template : public Declaration struct CS_API Template : public Declaration
{ {
Template(DeclarationKind kind);
DECLARE_DECL_KIND(Template, Template) DECLARE_DECL_KIND(Template, Template)
Declaration* TemplatedDecl; Declaration* TemplatedDecl;
VECTOR(TemplateParameter, Parameters) VECTOR(TemplateParameter, Parameters)

12
src/CppParser/Bindings/CLI/AST.cpp
Unescape View File

@ -1236,10 +1236,11 @@ CppSharp::Parser::AST::DeclarationContext::DeclarationContext(System::IntPtr nat
auto __native = (::CppSharp::CppParser::AST::DeclarationContext*)native.ToPointer(); auto __native = (::CppSharp::CppParser::AST::DeclarationContext*)native.ToPointer();
} }
CppSharp::Parser::AST::DeclarationContext::DeclarationContext() CppSharp::Parser::AST::DeclarationContext::DeclarationContext(CppSharp::Parser::AST::DeclarationKind kind)
: CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr) : CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr)
{ {
NativePtr = new ::CppSharp::CppParser::AST::DeclarationContext(); auto arg0 = (::CppSharp::CppParser::AST::DeclarationKind)kind;
NativePtr = new ::CppSharp::CppParser::AST::DeclarationContext(arg0);
} }
CppSharp::Parser::AST::Namespace^ CppSharp::Parser::AST::DeclarationContext::getNamespaces(unsigned int i) CppSharp::Parser::AST::Namespace^ CppSharp::Parser::AST::DeclarationContext::getNamespaces(unsigned int i)
@ -2222,6 +2223,13 @@ CppSharp::Parser::AST::Template::Template(System::IntPtr native)
auto __native = (::CppSharp::CppParser::AST::Template*)native.ToPointer(); auto __native = (::CppSharp::CppParser::AST::Template*)native.ToPointer();
} }
CppSharp::Parser::AST::Template::Template(CppSharp::Parser::AST::DeclarationKind kind)
: CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr)
{
auto arg0 = (::CppSharp::CppParser::AST::DeclarationKind)kind;
NativePtr = new ::CppSharp::CppParser::AST::Template(arg0);
}
CppSharp::Parser::AST::Template::Template() CppSharp::Parser::AST::Template::Template()
: CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr) : CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr)
{ {

22
src/CppParser/Bindings/CLI/AST.h
Unescape View File

@ -221,6 +221,15 @@ namespace CppSharp
UnusedFunctionPointer = 7 UnusedFunctionPointer = 7
}; };
public enum struct TemplateSpecializationKind
{
Undeclared = 0,
ImplicitInstantiation = 1,
ExplicitSpecialization = 2,
ExplicitInstantiationDeclaration = 3,
ExplicitInstantiationDefinition = 4
};
public enum struct PrimitiveType public enum struct PrimitiveType
{ {
Null = 0, Null = 0,
@ -269,15 +278,6 @@ namespace CppSharp
FunctionBody = 5 FunctionBody = 5
}; };
public enum struct TemplateSpecializationKind
{
Undeclared = 0,
ImplicitInstantiation = 1,
ExplicitSpecialization = 2,
ExplicitInstantiationDeclaration = 3,
ExplicitInstantiationDefinition = 4
};
public ref class Type : ICppInstance public ref class Type : ICppInstance
{ {
public: public:
@ -1008,7 +1008,7 @@ namespace CppSharp
DeclarationContext(::CppSharp::CppParser::AST::DeclarationContext* native); DeclarationContext(::CppSharp::CppParser::AST::DeclarationContext* native);
DeclarationContext(System::IntPtr native); DeclarationContext(System::IntPtr native);
DeclarationContext(); DeclarationContext(CppSharp::Parser::AST::DeclarationKind kind);
property unsigned int NamespacesCount property unsigned int NamespacesCount
{ {
@ -1554,6 +1554,8 @@ namespace CppSharp
Template(::CppSharp::CppParser::AST::Template* native); Template(::CppSharp::CppParser::AST::Template* native);
Template(System::IntPtr native); Template(System::IntPtr native);
Template(CppSharp::Parser::AST::DeclarationKind kind);
Template(); Template();
property unsigned int ParametersCount property unsigned int ParametersCount

1
src/CppParser/Bindings/CLI/CppParser.h
Unescape View File

@ -11,6 +11,7 @@ namespace CppSharp
enum struct ParserResultKind; enum struct ParserResultKind;
enum struct SourceLocationKind; enum struct SourceLocationKind;
ref class ClangParser; ref class ClangParser;
ref class Parser;
ref class ParserDiagnostic; ref class ParserDiagnostic;
ref class ParserOptions; ref class ParserOptions;
ref class ParserResult; ref class ParserResult;

1265
src/CppParser/Bindings/CSharp/AST.cs
View File

File diff suppressed because it is too large Load Diff

60
src/CppParser/Bindings/CSharp/CppParser.cs
Unescape View File

@ -40,47 +40,26 @@ namespace CppSharp
[StructLayout(LayoutKind.Explicit, Size = 124)] [StructLayout(LayoutKind.Explicit, Size = 124)]
public struct Internal public struct Internal
{ {
[FieldOffset(0)]
internal Std.Vector Arguments;
[FieldOffset(12)]
internal Std.String FileName;
[FieldOffset(36)]
internal Std.Vector IncludeDirs;
[FieldOffset(48)]
internal Std.Vector SystemIncludeDirs;
[FieldOffset(60)]
internal Std.Vector Defines;
[FieldOffset(72)]
internal Std.Vector LibraryDirs;
[FieldOffset(84)] [FieldOffset(84)]
internal global::System.IntPtr ASTContext; public global::System.IntPtr ASTContext;
[FieldOffset(88)] [FieldOffset(88)]
internal int ToolSetToUse; public int ToolSetToUse;
[FieldOffset(92)]
internal Std.String TargetTriple;
[FieldOffset(116)] [FieldOffset(116)]
internal CppSharp.Parser.AST.CppAbi Abi; public CppSharp.Parser.AST.CppAbi Abi;
[FieldOffset(120)] [FieldOffset(120)]
internal bool NoStandardIncludes; public bool NoStandardIncludes;
[FieldOffset(121)] [FieldOffset(121)]
internal bool NoBuiltinIncludes; public bool NoBuiltinIncludes;
[FieldOffset(122)] [FieldOffset(122)]
internal bool MicrosoftMode; public bool MicrosoftMode;
[FieldOffset(123)] [FieldOffset(123)]
internal bool Verbose; public bool Verbose;
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@ -488,20 +467,14 @@ namespace CppSharp
[StructLayout(LayoutKind.Explicit, Size = 60)] [StructLayout(LayoutKind.Explicit, Size = 60)]
public struct Internal public struct Internal
{ {
[FieldOffset(0)]
internal Std.String FileName;
[FieldOffset(24)]
internal Std.String Message;
[FieldOffset(48)] [FieldOffset(48)]
internal CppSharp.Parser.ParserDiagnosticLevel Level; public CppSharp.Parser.ParserDiagnosticLevel Level;
[FieldOffset(52)] [FieldOffset(52)]
internal int LineNumber; public int LineNumber;
[FieldOffset(56)] [FieldOffset(56)]
internal int ColumnNumber; public int ColumnNumber;
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@ -656,20 +629,17 @@ namespace CppSharp
public unsafe partial class ParserResult : IDisposable public unsafe partial class ParserResult : IDisposable
{ {
[StructLayout(LayoutKind.Explicit, Size = 24)] [StructLayout(LayoutKind.Explicit, Size = 28)]
public struct Internal public struct Internal
{ {
[FieldOffset(0)] [FieldOffset(0)]
internal CppSharp.Parser.ParserResultKind Kind; public CppSharp.Parser.ParserResultKind Kind;
[FieldOffset(4)]
internal Std.Vector Diagnostics;
[FieldOffset(16)] [FieldOffset(16)]
internal global::System.IntPtr ASTContext; public global::System.IntPtr ASTContext;
[FieldOffset(20)] [FieldOffset(20)]
internal global::System.IntPtr Library; public global::System.IntPtr Library;
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@ -721,7 +691,7 @@ namespace CppSharp
public ParserResult() public ParserResult()
{ {
__Instance = Marshal.AllocHGlobal(24); __Instance = Marshal.AllocHGlobal(28);
Internal.ctor_0(__Instance); Internal.ctor_0(__Instance);
} }

79
src/CppParser/Bindings/CSharp/Target.cs
Unescape View File

@ -30,122 +30,119 @@ namespace CppSharp
[StructLayout(LayoutKind.Explicit, Size = 176)] [StructLayout(LayoutKind.Explicit, Size = 176)]
public struct Internal public struct Internal
{ {
[FieldOffset(0)]
internal Std.String ABI;
[FieldOffset(24)] [FieldOffset(24)]
internal CppSharp.Parser.ParserIntType Char16Type; public CppSharp.Parser.ParserIntType Char16Type;
[FieldOffset(28)] [FieldOffset(28)]
internal CppSharp.Parser.ParserIntType Char32Type; public CppSharp.Parser.ParserIntType Char32Type;
[FieldOffset(32)] [FieldOffset(32)]
internal CppSharp.Parser.ParserIntType Int64Type; public CppSharp.Parser.ParserIntType Int64Type;
[FieldOffset(36)] [FieldOffset(36)]
internal CppSharp.Parser.ParserIntType IntMaxType; public CppSharp.Parser.ParserIntType IntMaxType;
[FieldOffset(40)] [FieldOffset(40)]
internal CppSharp.Parser.ParserIntType IntPtrType; public CppSharp.Parser.ParserIntType IntPtrType;
[FieldOffset(44)] [FieldOffset(44)]
internal CppSharp.Parser.ParserIntType SizeType; public CppSharp.Parser.ParserIntType SizeType;
[FieldOffset(48)] [FieldOffset(48)]
internal CppSharp.Parser.ParserIntType UIntMaxType; public CppSharp.Parser.ParserIntType UIntMaxType;
[FieldOffset(52)] [FieldOffset(52)]
internal CppSharp.Parser.ParserIntType WCharType; public CppSharp.Parser.ParserIntType WCharType;
[FieldOffset(56)] [FieldOffset(56)]
internal CppSharp.Parser.ParserIntType WIntType; public CppSharp.Parser.ParserIntType WIntType;
[FieldOffset(60)] [FieldOffset(60)]
internal uint BoolAlign; public uint BoolAlign;
[FieldOffset(64)] [FieldOffset(64)]
internal uint BoolWidth; public uint BoolWidth;
[FieldOffset(68)] [FieldOffset(68)]
internal uint CharAlign; public uint CharAlign;
[FieldOffset(72)] [FieldOffset(72)]
internal uint CharWidth; public uint CharWidth;
[FieldOffset(76)] [FieldOffset(76)]
internal uint Char16Align; public uint Char16Align;
[FieldOffset(80)] [FieldOffset(80)]
internal uint Char16Width; public uint Char16Width;
[FieldOffset(84)] [FieldOffset(84)]
internal uint Char32Align; public uint Char32Align;
[FieldOffset(88)] [FieldOffset(88)]
internal uint Char32Width; public uint Char32Width;
[FieldOffset(92)] [FieldOffset(92)]
internal uint HalfAlign; public uint HalfAlign;
[FieldOffset(96)] [FieldOffset(96)]
internal uint HalfWidth; public uint HalfWidth;
[FieldOffset(100)] [FieldOffset(100)]
internal uint FloatAlign; public uint FloatAlign;
[FieldOffset(104)] [FieldOffset(104)]
internal uint FloatWidth; public uint FloatWidth;
[FieldOffset(108)] [FieldOffset(108)]
internal uint DoubleAlign; public uint DoubleAlign;
[FieldOffset(112)] [FieldOffset(112)]
internal uint DoubleWidth; public uint DoubleWidth;
[FieldOffset(116)] [FieldOffset(116)]
internal uint ShortAlign; public uint ShortAlign;
[FieldOffset(120)] [FieldOffset(120)]
internal uint ShortWidth; public uint ShortWidth;
[FieldOffset(124)] [FieldOffset(124)]
internal uint IntAlign; public uint IntAlign;
[FieldOffset(128)] [FieldOffset(128)]
internal uint IntWidth; public uint IntWidth;
[FieldOffset(132)] [FieldOffset(132)]
internal uint IntMaxTWidth; public uint IntMaxTWidth;
[FieldOffset(136)] [FieldOffset(136)]
internal uint LongAlign; public uint LongAlign;
[FieldOffset(140)] [FieldOffset(140)]
internal uint LongWidth; public uint LongWidth;
[FieldOffset(144)] [FieldOffset(144)]
internal uint LongDoubleAlign; public uint LongDoubleAlign;
[FieldOffset(148)] [FieldOffset(148)]
internal uint LongDoubleWidth; public uint LongDoubleWidth;
[FieldOffset(152)] [FieldOffset(152)]
internal uint LongLongAlign; public uint LongLongAlign;
[FieldOffset(156)] [FieldOffset(156)]
internal uint LongLongWidth; public uint LongLongWidth;
[FieldOffset(160)] [FieldOffset(160)]
internal uint PointerAlign; public uint PointerAlign;
[FieldOffset(164)] [FieldOffset(164)]
internal uint PointerWidth; public uint PointerWidth;
[FieldOffset(168)] [FieldOffset(168)]
internal uint WCharAlign; public uint WCharAlign;
[FieldOffset(172)] [FieldOffset(172)]
internal uint WCharWidth; public uint WCharWidth;
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,

43
src/CppParser/Parser.cpp
Unescape View File

@ -791,13 +791,18 @@ ClassTemplate* Parser::WalkClassTemplate(clang::ClassTemplateDecl* TD)
auto NS = GetNamespace(TD); auto NS = GetNamespace(TD);
assert(NS && "Expected a valid namespace"); assert(NS && "Expected a valid namespace");
ClassTemplate* CT = new ClassTemplate(); auto CT = NS->FindClassTemplate((void*) TD);
HandleDeclaration(TD, CT); if (CT != nullptr)
return CT;
CT->TemplatedDecl = WalkRecordCXX(TD->getTemplatedDecl()); CT = new ClassTemplate();
HandleDeclaration(TD, CT);
CT->_Namespace = NS;
NS->Templates.push_back(CT); NS->Templates.push_back(CT);
CT->TemplatedDecl = WalkRecordCXX(TD->getTemplatedDecl());
auto TPL = TD->getTemplateParameters(); auto TPL = TD->getTemplateParameters();
for(auto it = TPL->begin(); it != TPL->end(); ++it) for(auto it = TPL->begin(); it != TPL->end(); ++it)
{ {
@ -1107,10 +1112,15 @@ DeclarationContext* Parser::GetNamespace(clang::Decl* D,
continue; continue;
} }
case Decl::ClassTemplateSpecialization: case Decl::ClassTemplateSpecialization:
{
auto CTSpec = cast<ClassTemplateSpecializationDecl>(Ctx);
DC = WalkClassTemplateSpecialization(CTSpec);
continue;
}
case Decl::ClassTemplatePartialSpecialization: case Decl::ClassTemplatePartialSpecialization:
{ {
// FIXME: Ignore ClassTemplateSpecialization namespaces... auto CTPSpec = cast<ClassTemplatePartialSpecializationDecl>(Ctx);
// We might be able to translate these to C# nested types. DC = WalkClassTemplatePartialSpecialization(CTPSpec);
continue; continue;
} }
default: default:
@ -1487,8 +1497,6 @@ Type* Parser::WalkType(clang::QualType QualType, clang::TypeLoc* TL,
F->Parameters.push_back(FA); F->Parameters.push_back(FA);
} }
return F;
Ty = F; Ty = F;
break; break;
} }
@ -1684,6 +1692,7 @@ Type* Parser::WalkType(clang::QualType QualType, clang::TypeLoc* TL,
{ {
// TODO: stubbed // TODO: stubbed
Ty = new PackExpansionType(); Ty = new PackExpansionType();
break;
} }
case clang::Type::Decltype: case clang::Type::Decltype:
{ {
@ -1838,7 +1847,6 @@ void Parser::WalkFunction(clang::FunctionDecl* FD, Function* F,
auto NS = GetNamespace(FD); auto NS = GetNamespace(FD);
assert(NS && "Expected a valid namespace"); assert(NS && "Expected a valid namespace");
F->OriginalPtr = (void*) FD;
F->Name = FD->getNameAsString(); F->Name = FD->getNameAsString();
F->_Namespace = NS; F->_Namespace = NS;
F->IsVariadic = FD->isVariadic(); F->IsVariadic = FD->isVariadic();
@ -2321,18 +2329,13 @@ Declaration* Parser::WalkDeclaration(clang::Decl* D,
ClassTemplateDecl* TD = cast<ClassTemplateDecl>(D); ClassTemplateDecl* TD = cast<ClassTemplateDecl>(D);
auto Template = WalkClassTemplate(TD); auto Template = WalkClassTemplate(TD);
auto NS = GetNamespace(TD);
Template->_Namespace = NS;
NS->Templates.push_back(Template);
Decl = Template; Decl = Template;
break; break;
} }
case Decl::ClassTemplateSpecialization: case Decl::ClassTemplateSpecialization:
{ {
auto TS = cast<ClassTemplateSpecializationDecl>(D); auto TS = cast<ClassTemplateSpecializationDecl>(D);
auto CT = new ClassTemplateSpecialization(); auto CT = WalkClassTemplateSpecialization(TS);
HandleDeclaration(TS, CT);
Decl = CT; Decl = CT;
break; break;
@ -2340,8 +2343,7 @@ Declaration* Parser::WalkDeclaration(clang::Decl* D,
case Decl::ClassTemplatePartialSpecialization: case Decl::ClassTemplatePartialSpecialization:
{ {
auto TS = cast<ClassTemplatePartialSpecializationDecl>(D); auto TS = cast<ClassTemplatePartialSpecializationDecl>(D);
auto CT = new ClassTemplatePartialSpecialization(); auto CT = WalkClassTemplatePartialSpecialization(TS);
HandleDeclaration(TS, CT);
Decl = CT; Decl = CT;
break; break;
@ -2349,13 +2351,9 @@ Declaration* Parser::WalkDeclaration(clang::Decl* D,
case Decl::FunctionTemplate: case Decl::FunctionTemplate:
{ {
FunctionTemplateDecl* TD = cast<FunctionTemplateDecl>(D); FunctionTemplateDecl* TD = cast<FunctionTemplateDecl>(D);
auto Template = WalkFunctionTemplate(TD); auto FT = WalkFunctionTemplate(TD);
auto NS = GetNamespace(TD);
Template->_Namespace = NS;
NS->Templates.push_back(Template);
Decl = Template; Decl = FT;
break; break;
} }
case Decl::Enum: case Decl::Enum:
@ -2447,6 +2445,7 @@ Declaration* Parser::WalkDeclaration(clang::Decl* D,
case Decl::UnresolvedUsingValue: case Decl::UnresolvedUsingValue:
case Decl::IndirectField: case Decl::IndirectField:
case Decl::StaticAssert: case Decl::StaticAssert:
case Decl::TypeAliasTemplate:
break; break;
default: default:
{ {

37
src/Parser/Parser.cpp
Unescape View File

@ -541,6 +541,10 @@ CppSharp::AST::Class^ Parser::WalkRecordCXX(clang::CXXRecordDecl* Record)
if (Record->isInjectedClassName()) if (Record->isInjectedClassName())
return nullptr; return nullptr;
// skip va_list_tag as in clang: lib/Sema/SemaLookup.cpp
if (Record->getDeclName() == C->getSema().VAListTagName)
return nullptr;
auto NS = GetNamespace(Record); auto NS = GetNamespace(Record);
assert(NS && "Expected a valid namespace"); assert(NS && "Expected a valid namespace");
@ -616,6 +620,8 @@ void Parser::WalkRecordCXX(clang::CXXRecordDecl* Record,
if (hasLayout) if (hasLayout)
{ {
Layout = &C->getASTContext().getASTRecordLayout(Record); Layout = &C->getASTContext().getASTRecordLayout(Record);
if (!RC->Layout)
RC->Layout = gcnew CppSharp::AST::ClassLayout();
RC->Layout->Alignment = (int)Layout-> getAlignment().getQuantity(); RC->Layout->Alignment = (int)Layout-> getAlignment().getQuantity();
RC->Layout->Size = (int)Layout->getSize().getQuantity(); RC->Layout->Size = (int)Layout->getSize().getQuantity();
RC->Layout->DataSize = (int)Layout->getDataSize().getQuantity(); RC->Layout->DataSize = (int)Layout->getDataSize().getQuantity();
@ -681,7 +687,9 @@ void Parser::WalkRecordCXX(clang::CXXRecordDecl* Record,
CppSharp::AST::BaseClassSpecifier^ Base = gcnew CppSharp::AST::BaseClassSpecifier(); CppSharp::AST::BaseClassSpecifier^ Base = gcnew CppSharp::AST::BaseClassSpecifier();
Base->Access = ConvertToAccess(BS.getAccessSpecifier()); Base->Access = ConvertToAccess(BS.getAccessSpecifier());
Base->IsVirtual = BS.isVirtual(); Base->IsVirtual = BS.isVirtual();
Base->Type = WalkType(BS.getType(), &BS.getTypeSourceInfo()->getTypeLoc());
auto BSTL = BS.getTypeSourceInfo()->getTypeLoc();
Base->Type = WalkType(BS.getType(), &BSTL);
RC->Bases->Add(Base); RC->Bases->Add(Base);
} }
@ -1377,9 +1385,12 @@ CppSharp::AST::Type^ Parser::WalkType(clang::QualType QualType, clang::TypeLoc*
if (TL && !TL->isNull()) Next = TL->getNextTypeLoc(); if (TL && !TL->isNull()) Next = TL->getNextTypeLoc();
auto Type = gcnew CppSharp::AST::DecayedType(); auto Type = gcnew CppSharp::AST::DecayedType();
Type->Decayed = GetQualifiedType(DT->getDecayedType(), WalkType(DT->getDecayedType(), &Next)); Type->Decayed = GetQualifiedType(DT->getDecayedType(),
Type->Original = GetQualifiedType(DT->getOriginalType(), WalkType(DT->getOriginalType(), &Next)); WalkType(DT->getDecayedType(), &Next));
Type->Pointee = GetQualifiedType(DT->getPointeeType(), WalkType(DT->getPointeeType(), &Next)); Type->Original = GetQualifiedType(DT->getOriginalType(),
WalkType(DT->getOriginalType(), &Next));
Type->Pointee = GetQualifiedType(DT->getPointeeType(),
WalkType(DT->getPointeeType(), &Next));
Ty = Type; Ty = Type;
break; break;
@ -1423,7 +1434,8 @@ CppSharp::AST::Type^ Parser::WalkType(clang::QualType QualType, clang::TypeLoc*
if (TL && !TL->isNull()) Next = TL->getNextTypeLoc(); if (TL && !TL->isNull()) Next = TL->getNextTypeLoc();
auto A = gcnew CppSharp::AST::ArrayType(); auto A = gcnew CppSharp::AST::ArrayType();
A->Type = WalkType(AT->getElementType(), &Next); A->QualifiedType = GetQualifiedType(AT->getElementType(),
WalkType(AT->getElementType(), &Next));
A->SizeType = CppSharp::AST::ArrayType::ArraySize::Constant; A->SizeType = CppSharp::AST::ArrayType::ArraySize::Constant;
A->Size = AST->getConstantArrayElementCount(AT); A->Size = AST->getConstantArrayElementCount(AT);
@ -1438,7 +1450,8 @@ CppSharp::AST::Type^ Parser::WalkType(clang::QualType QualType, clang::TypeLoc*
if (TL && !TL->isNull()) Next = TL->getNextTypeLoc(); if (TL && !TL->isNull()) Next = TL->getNextTypeLoc();
auto A = gcnew CppSharp::AST::ArrayType(); auto A = gcnew CppSharp::AST::ArrayType();
A->Type = WalkType(AT->getElementType(), &Next); A->QualifiedType = GetQualifiedType(AT->getElementType(),
WalkType(AT->getElementType(), &Next));
A->SizeType = CppSharp::AST::ArrayType::ArraySize::Incomplete; A->SizeType = CppSharp::AST::ArrayType::ArraySize::Incomplete;
Ty = A; Ty = A;
@ -1452,7 +1465,8 @@ CppSharp::AST::Type^ Parser::WalkType(clang::QualType QualType, clang::TypeLoc*
if (TL && !TL->isNull()) Next = TL->getNextTypeLoc(); if (TL && !TL->isNull()) Next = TL->getNextTypeLoc();
auto A = gcnew CppSharp::AST::ArrayType(); auto A = gcnew CppSharp::AST::ArrayType();
A->Type = WalkType(AT->getElementType(), &Next); A->QualifiedType = GetQualifiedType(AT->getElementType(),
WalkType(AT->getElementType(), &Next));
A->SizeType = CppSharp::AST::ArrayType::ArraySize::Dependent; A->SizeType = CppSharp::AST::ArrayType::ArraySize::Dependent;
//A->Size = AT->getSizeExpr(); //A->Size = AT->getSizeExpr();
@ -1519,11 +1533,13 @@ CppSharp::AST::Type^ Parser::WalkType(clang::QualType QualType, clang::TypeLoc*
case Type::MemberPointer: case Type::MemberPointer:
{ {
auto MP = Type->getAs<clang::MemberPointerType>(); auto MP = Type->getAs<clang::MemberPointerType>();
TypeLoc Next; TypeLoc Next;
if (TL && !TL->isNull()) Next = TL->getNextTypeLoc(); if (TL && !TL->isNull()) Next = TL->getNextTypeLoc();
auto MPT = gcnew CppSharp::AST::MemberPointerType(); auto MPT = gcnew CppSharp::AST::MemberPointerType();
MPT->Pointee = WalkType(MP->getPointeeType(), &Next); MPT->QualifiedPointee = GetQualifiedType(MP->getPointeeType(),
WalkType(MP->getPointeeType(), &Next));
Ty = MPT; Ty = MPT;
break; break;
@ -1571,7 +1587,8 @@ CppSharp::AST::Type^ Parser::WalkType(clang::QualType QualType, clang::TypeLoc*
Arg.Kind = CppSharp::AST::TemplateArgument::ArgumentKind::Type; Arg.Kind = CppSharp::AST::TemplateArgument::ArgumentKind::Type;
TypeLoc ArgTL; TypeLoc ArgTL;
ArgTL = ArgLoc.getTypeSourceInfo()->getTypeLoc(); ArgTL = ArgLoc.getTypeSourceInfo()->getTypeLoc();
Arg.Type = GetQualifiedType(TA.getAsType(), WalkType(TA.getAsType(), &ArgTL)); Arg.Type = GetQualifiedType(TA.getAsType(),
WalkType(TA.getAsType(), &ArgTL));
break; break;
} }
case TemplateArgument::Declaration: case TemplateArgument::Declaration:
@ -2159,7 +2176,7 @@ CppSharp::AST::PreprocessedEntity^ Parser::WalkPreprocessedEntity(
return nullptr; return nullptr;
Entity->OriginalPtr = System::IntPtr(PPEntity); Entity->OriginalPtr = System::IntPtr(PPEntity);
Entity->Namespace = GetTranslationUnit(PPEntity->getSourceRange().getBegin(), NULL); Entity->Namespace = GetTranslationUnit(PPEntity->getSourceRange().getBegin());
if (Decl->GetType() == CppSharp::AST::TranslationUnit::typeid) if (Decl->GetType() == CppSharp::AST::TranslationUnit::typeid)
{ {

Write Preview
Loading…
Cancel
Save