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

Refactored CppTypePrinter to be more easily extensible.

pull/696/head
Joao Matos 9 years ago
parent
26b4dfa549
commit
e1fae44c64
3 changed files with 68 additions and 64 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. 123
      src/AST/CppTypePrinter.cs
  2. 2
      src/Generator/Generators/CLI/CLIMarshal.cs
  3. 7
      src/Generator/Types/TypeMap.cs

123
src/AST/CppTypePrinter.cs
Unescape View File

@ -21,31 +21,30 @@ namespace CppSharp.AST
public class CppTypePrinter : ITypePrinter<string>, IDeclVisitor<string> public class CppTypePrinter : ITypePrinter<string>, IDeclVisitor<string>
{ {
public CppTypePrintFlavorKind PrintFlavorKind; public CppTypePrintFlavorKind PrintFlavorKind { get; set; }
public CppTypePrintScopeKind PrintScopeKind; public CppTypePrintScopeKind PrintScopeKind { get; set; }
public bool PrintLogicalNames; public bool PrintLogicalNames { get; set; }
public bool PrintTypeQualifiers; public bool PrintTypeQualifiers { get; set; }
public bool PrintTypeModifiers { get; set; } public bool PrintTypeModifiers { get; set; }
public bool PrintVariableArrayAsPointers { get; set; } public bool PrintVariableArrayAsPointers { get; set; }
public CppTypePrinter(bool printTypeQualifiers = true, bool printTypeModifiers = true) public CppTypePrinter()
{ {
PrintFlavorKind = CppTypePrintFlavorKind.Cpp; PrintFlavorKind = CppTypePrintFlavorKind.Cpp;
PrintScopeKind = CppTypePrintScopeKind.GlobalQualified; PrintScopeKind = CppTypePrintScopeKind.GlobalQualified;
PrintTypeQualifiers = printTypeQualifiers; PrintTypeQualifiers = true;
PrintTypeModifiers = printTypeModifiers; PrintTypeModifiers = true;
} }
public bool ResolveTypedefs { get; set; } public bool ResolveTypedefs { get; set; }
public string VisitTagType(TagType tag, TypeQualifiers quals) public virtual string VisitTagType(TagType tag, TypeQualifiers quals)
{ {
var qual = PrintTypeQualifiers && quals.IsConst ? "const " : string.Empty; var qual = PrintTypeQualifiers && quals.IsConst ? "const " : string.Empty;
return string.Format("{0}{1}", qual, tag.Declaration.Visit(this)); return string.Format("{0}{1}", qual, tag.Declaration.Visit(this));
} }
public string VisitArrayType(ArrayType array, TypeQualifiers quals) public virtual string VisitArrayType(ArrayType array, TypeQualifiers quals)
{ {
var typeName = array.Type.Visit(this); var typeName = array.Type.Visit(this);
@ -76,7 +75,7 @@ namespace CppSharp.AST
return string.Empty; return string.Empty;
} }
public string VisitPointerType(PointerType pointer, TypeQualifiers quals) public virtual string VisitPointerType(PointerType pointer, TypeQualifiers quals)
{ {
var pointee = pointer.Pointee; var pointee = pointer.Pointee;
@ -99,17 +98,17 @@ namespace CppSharp.AST
return string.Format("{0}{1}{2}", qual, pointeeType, mod); return string.Format("{0}{1}{2}", qual, pointeeType, mod);
} }
public string VisitMemberPointerType(MemberPointerType member, TypeQualifiers quals) public virtual string VisitMemberPointerType(MemberPointerType member, TypeQualifiers quals)
{ {
return string.Empty; return string.Empty;
} }
public string VisitBuiltinType(BuiltinType builtin, TypeQualifiers quals) public virtual string VisitBuiltinType(BuiltinType builtin, TypeQualifiers quals)
{ {
return VisitPrimitiveType(builtin.Type); return VisitPrimitiveType(builtin.Type);
} }
public string VisitPrimitiveType(PrimitiveType primitive) public virtual string VisitPrimitiveType(PrimitiveType primitive)
{ {
switch (primitive) switch (primitive)
{ {
@ -143,7 +142,7 @@ namespace CppSharp.AST
throw new NotSupportedException(); throw new NotSupportedException();
} }
public string VisitTypedefType(TypedefType typedef, TypeQualifiers quals) public virtual string VisitTypedefType(TypedefType typedef, TypeQualifiers quals)
{ {
if (ResolveTypedefs) if (ResolveTypedefs)
{ {
@ -154,17 +153,17 @@ namespace CppSharp.AST
return GetDeclName(typedef.Declaration); return GetDeclName(typedef.Declaration);
} }
public string VisitAttributedType(AttributedType attributed, TypeQualifiers quals) public virtual string VisitAttributedType(AttributedType attributed, TypeQualifiers quals)
{ {
return attributed.Modified.Visit(this); return attributed.Modified.Visit(this);
} }
public string VisitDecayedType(DecayedType decayed, TypeQualifiers quals) public virtual string VisitDecayedType(DecayedType decayed, TypeQualifiers quals)
{ {
return decayed.Decayed.Visit(this); return decayed.Decayed.Visit(this);
} }
public string VisitTemplateSpecializationType(TemplateSpecializationType template, TypeQualifiers quals) public virtual string VisitTemplateSpecializationType(TemplateSpecializationType template, TypeQualifiers quals)
{ {
var specialization = template.GetClassTemplateSpecialization(); var specialization = template.GetClassTemplateSpecialization();
if (specialization == null) if (specialization == null)
@ -173,7 +172,7 @@ namespace CppSharp.AST
return VisitClassTemplateSpecializationDecl(specialization); return VisitClassTemplateSpecializationDecl(specialization);
} }
public string VisitDependentTemplateSpecializationType( public virtual string VisitDependentTemplateSpecializationType(
DependentTemplateSpecializationType template, TypeQualifiers quals) DependentTemplateSpecializationType template, TypeQualifiers quals)
{ {
if (template.Desugared.Type != null) if (template.Desugared.Type != null)
@ -181,7 +180,7 @@ namespace CppSharp.AST
return string.Empty; return string.Empty;
} }
public string VisitTemplateParameterType(TemplateParameterType param, TypeQualifiers quals) public virtual string VisitTemplateParameterType(TemplateParameterType param, TypeQualifiers quals)
{ {
if (param.Parameter.Name == null) if (param.Parameter.Name == null)
return string.Empty; return string.Empty;
@ -189,41 +188,41 @@ namespace CppSharp.AST
return param.Parameter.Name; return param.Parameter.Name;
} }
public string VisitTemplateParameterSubstitutionType( public virtual string VisitTemplateParameterSubstitutionType(
TemplateParameterSubstitutionType param, TypeQualifiers quals) TemplateParameterSubstitutionType param, TypeQualifiers quals)
{ {
return param.Replacement.Visit(this); return param.Replacement.Visit(this);
} }
public string VisitInjectedClassNameType(InjectedClassNameType injected, TypeQualifiers quals) public virtual string VisitInjectedClassNameType(InjectedClassNameType injected, TypeQualifiers quals)
{ {
return injected.Class.Visit(this); return injected.Class.Visit(this);
} }
public string VisitDependentNameType(DependentNameType dependent, TypeQualifiers quals) public virtual string VisitDependentNameType(DependentNameType dependent, TypeQualifiers quals)
{ {
return dependent.Desugared.Type != null ? dependent.Desugared.Visit(this) : string.Empty; return dependent.Desugared.Type != null ? dependent.Desugared.Visit(this) : string.Empty;
} }
public string VisitPackExpansionType(PackExpansionType packExpansionType, TypeQualifiers quals) public virtual string VisitPackExpansionType(PackExpansionType packExpansionType, TypeQualifiers quals)
{ {
return string.Empty; return string.Empty;
} }
public string VisitUnaryTransformType(UnaryTransformType unaryTransformType, TypeQualifiers quals) public virtual string VisitUnaryTransformType(UnaryTransformType unaryTransformType, TypeQualifiers quals)
{ {
if (unaryTransformType.Desugared.Type != null) if (unaryTransformType.Desugared.Type != null)
return unaryTransformType.Desugared.Visit(this); return unaryTransformType.Desugared.Visit(this);
return unaryTransformType.BaseType.Visit(this); return unaryTransformType.BaseType.Visit(this);
} }
public string VisitVectorType(VectorType vectorType, TypeQualifiers quals) public virtual string VisitVectorType(VectorType vectorType, TypeQualifiers quals)
{ {
// an incomplete implementation but we'd hardly need anything better // an incomplete implementation but we'd hardly need anything better
return "__attribute__()"; return "__attribute__()";
} }
public string VisitCILType(CILType type, TypeQualifiers quals) public virtual string VisitCILType(CILType type, TypeQualifiers quals)
{ {
if (type.Type == typeof(string)) if (type.Type == typeof(string))
return quals.IsConst ? "const char*" : "char*"; return quals.IsConst ? "const char*" : "char*";
@ -231,22 +230,22 @@ namespace CppSharp.AST
throw new NotImplementedException(string.Format("Unhandled .NET type: {0}", type.Type)); throw new NotImplementedException(string.Format("Unhandled .NET type: {0}", type.Type));
} }
public string VisitUnsupportedType(UnsupportedType type, TypeQualifiers quals) public virtual string VisitUnsupportedType(UnsupportedType type, TypeQualifiers quals)
{ {
return string.Empty; return string.Empty;
} }
public string VisitPrimitiveType(PrimitiveType type, TypeQualifiers quals) public virtual string VisitPrimitiveType(PrimitiveType type, TypeQualifiers quals)
{ {
throw new System.NotImplementedException(); throw new System.NotImplementedException();
} }
public string VisitDeclaration(Declaration decl, TypeQualifiers quals) public virtual string VisitDeclaration(Declaration decl, TypeQualifiers quals)
{ {
throw new System.NotImplementedException(); throw new System.NotImplementedException();
} }
public string VisitFunctionType(FunctionType function, TypeQualifiers quals) public virtual string VisitFunctionType(FunctionType function, TypeQualifiers quals)
{ {
var arguments = function.Parameters; var arguments = function.Parameters;
var returnType = function.ReturnType; var returnType = function.ReturnType;
@ -258,7 +257,7 @@ namespace CppSharp.AST
return string.Format("{0} ({1})", returnType.Visit(this), args); return string.Format("{0} ({1})", returnType.Visit(this), args);
} }
public string VisitParameters(IEnumerable<Parameter> @params, public virtual string VisitParameters(IEnumerable<Parameter> @params,
bool hasNames = true) bool hasNames = true)
{ {
var args = new List<string>(); var args = new List<string>();
@ -272,7 +271,7 @@ namespace CppSharp.AST
return string.Join(", ", args); return string.Join(", ", args);
} }
public string VisitParameter(Parameter arg, bool hasName = true) public virtual string VisitParameter(Parameter arg, bool hasName = true)
{ {
var type = arg.Type.Visit(this, arg.QualifiedType.Qualifiers); var type = arg.Type.Visit(this, arg.QualifiedType.Qualifiers);
var name = arg.Name; var name = arg.Name;
@ -285,12 +284,12 @@ namespace CppSharp.AST
return printName ? string.Format("{0} {1}", type, name) : type; return printName ? string.Format("{0} {1}", type, name) : type;
} }
public string VisitDelegate(FunctionType function) public virtual string VisitDelegate(FunctionType function)
{ {
throw new System.NotImplementedException(); throw new System.NotImplementedException();
} }
public string GetDeclName(Declaration declaration) public virtual string GetDeclName(Declaration declaration)
{ {
switch (PrintScopeKind) switch (PrintScopeKind)
{ {
@ -308,17 +307,17 @@ namespace CppSharp.AST
throw new NotSupportedException(); throw new NotSupportedException();
} }
public string VisitDeclaration(Declaration decl) public virtual string VisitDeclaration(Declaration decl)
{ {
return GetDeclName(decl); return GetDeclName(decl);
} }
public string VisitClassDecl(Class @class) public virtual string VisitClassDecl(Class @class)
{ {
return VisitDeclaration(@class); return VisitDeclaration(@class);
} }
public string VisitClassTemplateSpecializationDecl(ClassTemplateSpecialization specialization) public virtual string VisitClassTemplateSpecializationDecl(ClassTemplateSpecialization specialization)
{ {
return string.Format("{0}<{1}>", specialization.TemplatedDecl.Visit(this), return string.Format("{0}<{1}>", specialization.TemplatedDecl.Visit(this),
string.Join(", ", string.Join(", ",
@ -327,97 +326,97 @@ namespace CppSharp.AST
!(a.Type.Type is DependentNameType)).Select(a => a.Type.Visit(this)))); !(a.Type.Type is DependentNameType)).Select(a => a.Type.Visit(this))));
} }
public string VisitFieldDecl(Field field) public virtual string VisitFieldDecl(Field field)
{ {
return VisitDeclaration(field); return VisitDeclaration(field);
} }
public string VisitFunctionDecl(Function function) public virtual string VisitFunctionDecl(Function function)
{ {
return VisitDeclaration(function); return VisitDeclaration(function);
} }
public string VisitMethodDecl(Method method) public virtual string VisitMethodDecl(Method method)
{ {
return VisitDeclaration(method); return VisitDeclaration(method);
} }
public string VisitParameterDecl(Parameter parameter) public virtual string VisitParameterDecl(Parameter parameter)
{ {
return VisitParameter(parameter, hasName: false); return VisitParameter(parameter, hasName: false);
} }
public string VisitTypedefDecl(TypedefDecl typedef) public virtual string VisitTypedefDecl(TypedefDecl typedef)
{ {
return VisitDeclaration(typedef); return VisitDeclaration(typedef);
} }
public string VisitTypeAliasDecl(TypeAlias typeAlias) public virtual string VisitTypeAliasDecl(TypeAlias typeAlias)
{ {
return VisitDeclaration(typeAlias); return VisitDeclaration(typeAlias);
} }
public string VisitEnumDecl(Enumeration @enum) public virtual string VisitEnumDecl(Enumeration @enum)
{ {
return VisitDeclaration(@enum); return VisitDeclaration(@enum);
} }
public string VisitEnumItemDecl(Enumeration.Item item) public virtual string VisitEnumItemDecl(Enumeration.Item item)
{ {
return VisitDeclaration(item); return VisitDeclaration(item);
} }
public string VisitVariableDecl(Variable variable) public virtual string VisitVariableDecl(Variable variable)
{ {
return VisitDeclaration(variable); return VisitDeclaration(variable);
} }
public string VisitClassTemplateDecl(ClassTemplate template) public virtual string VisitClassTemplateDecl(ClassTemplate template)
{ {
return VisitDeclaration(template); return VisitDeclaration(template);
} }
public string VisitFunctionTemplateDecl(FunctionTemplate template) public virtual string VisitFunctionTemplateDecl(FunctionTemplate template)
{ {
return VisitDeclaration(template); return VisitDeclaration(template);
} }
public string VisitMacroDefinition(MacroDefinition macro) public virtual string VisitMacroDefinition(MacroDefinition macro)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public string VisitNamespace(Namespace @namespace) public virtual string VisitNamespace(Namespace @namespace)
{ {
return VisitDeclaration(@namespace); return VisitDeclaration(@namespace);
} }
public string VisitEvent(Event @event) public virtual string VisitEvent(Event @event)
{ {
return string.Empty; return string.Empty;
} }
public string VisitProperty(Property property) public virtual string VisitProperty(Property property)
{ {
return VisitDeclaration(property); return VisitDeclaration(property);
} }
public string VisitFriend(Friend friend) public virtual string VisitFriend(Friend friend)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public string ToString(Type type) public virtual string ToString(Type type)
{ {
return type.Visit(this); return type.Visit(this);
} }
public string VisitTemplateTemplateParameterDecl(TemplateTemplateParameter templateTemplateParameter) public virtual string VisitTemplateTemplateParameterDecl(TemplateTemplateParameter templateTemplateParameter)
{ {
return templateTemplateParameter.Name; return templateTemplateParameter.Name;
} }
public string VisitTemplateParameterDecl(TypeTemplateParameter templateParameter) public virtual string VisitTemplateParameterDecl(TypeTemplateParameter templateParameter)
{ {
if (templateParameter.DefaultArgument.Type == null) if (templateParameter.DefaultArgument.Type == null)
return templateParameter.Name; return templateParameter.Name;
@ -426,7 +425,7 @@ namespace CppSharp.AST
templateParameter.DefaultArgument.Visit(this)); templateParameter.DefaultArgument.Visit(this));
} }
public string VisitNonTypeTemplateParameterDecl(NonTypeTemplateParameter nonTypeTemplateParameter) public virtual string VisitNonTypeTemplateParameterDecl(NonTypeTemplateParameter nonTypeTemplateParameter)
{ {
if (nonTypeTemplateParameter.DefaultArgument == null) if (nonTypeTemplateParameter.DefaultArgument == null)
return nonTypeTemplateParameter.Name; return nonTypeTemplateParameter.Name;
@ -435,22 +434,22 @@ namespace CppSharp.AST
nonTypeTemplateParameter.DefaultArgument.String); nonTypeTemplateParameter.DefaultArgument.String);
} }
public string VisitTypeAliasTemplateDecl(TypeAliasTemplate typeAliasTemplate) public virtual string VisitTypeAliasTemplateDecl(TypeAliasTemplate typeAliasTemplate)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public string VisitFunctionTemplateSpecializationDecl(FunctionTemplateSpecialization specialization) public virtual string VisitFunctionTemplateSpecializationDecl(FunctionTemplateSpecialization specialization)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public string VisitVarTemplateDecl(VarTemplate template) public virtual string VisitVarTemplateDecl(VarTemplate template)
{ {
return VisitDeclaration(template); return VisitDeclaration(template);
} }
public string VisitVarTemplateSpecializationDecl(VarTemplateSpecialization template) public virtual string VisitVarTemplateSpecializationDecl(VarTemplateSpecialization template)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }

2
src/Generator/Generators/CLI/CLIMarshal.cs
Unescape View File

@ -124,7 +124,7 @@ namespace CppSharp.Generators.CLI
var returnVarName = Context.ReturnVarName; var returnVarName = Context.ReturnVarName;
if (quals.IsConst != Context.ReturnType.Qualifiers.IsConst) if (quals.IsConst != Context.ReturnType.Qualifiers.IsConst)
{ {
var nativeTypePrinter = new CppTypePrinter(false); var nativeTypePrinter = new CppTypePrinter { PrintTypeQualifiers = false };
var returnType = Context.ReturnType.Type.Desugar(); var returnType = Context.ReturnType.Type.Desugar();
var constlessPointer = new PointerType() var constlessPointer = new PointerType()
{ {

7
src/Generator/Types/TypeMap.cs
Unescape View File

@ -201,7 +201,12 @@ namespace CppSharp.Types
public bool FindTypeMap(Type type, out TypeMap typeMap) public bool FindTypeMap(Type type, out TypeMap typeMap)
{ {
var typePrinter = new CppTypePrinter(false, false) { PrintLogicalNames = true }; var typePrinter = new CppTypePrinter
{
PrintTypeQualifiers = false,
PrintTypeModifiers = false,
PrintLogicalNames = true
};
var template = type as TemplateSpecializationType; var template = type as TemplateSpecializationType;
if (template != null) if (template != null)

Write Preview
Loading…
Cancel
Save