Browse Source

Removed a redundant parameter from CppTypePrinter.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/614/head
Dimitar Dobrev 10 years ago
parent
commit
ef66b38525
  1. 2
      src/CppParser/Bindings/ParserGen.cs
  2. 2
      src/Generator/Generators/CLI/CLIHeadersTemplate.cs
  3. 10
      src/Generator/Generators/CLI/CLIMarshal.cs
  4. 10
      src/Generator/Generators/CLI/CLISourcesTemplate.cs
  5. 2
      src/Generator/Passes/CheckIgnoredDecls.cs
  6. 2
      src/Generator/Types/CppTypePrinter.cs
  7. 2
      src/Generator/Types/Std/Stdlib.cs
  8. 6
      src/Generator/Types/TypeMap.cs

2
src/CppParser/Bindings/ParserGen.cs

@ -218,7 +218,7 @@ namespace CppSharp
private bool IsStdType(QualifiedType type) private bool IsStdType(QualifiedType type)
{ {
var typePrinter = new CppTypePrinter(Driver.TypeDatabase); var typePrinter = new CppTypePrinter();
var typeName = type.Visit(typePrinter); var typeName = type.Visit(typePrinter);
return typeName.Contains("std::"); return typeName.Contains("std::");

2
src/Generator/Generators/CLI/CLIHeadersTemplate.cs

@ -468,7 +468,7 @@ namespace CppSharp.Generators.CLI
{ {
if (!@event.IsGenerated) continue; if (!@event.IsGenerated) continue;
var cppTypePrinter = new CppTypePrinter(Driver.TypeDatabase); var cppTypePrinter = new CppTypePrinter();
var cppArgs = cppTypePrinter.VisitParameters(@event.Parameters, hasNames: true); var cppArgs = cppTypePrinter.VisitParameters(@event.Parameters, hasNames: true);
WriteLine("private:"); WriteLine("private:");

10
src/Generator/Generators/CLI/CLIMarshal.cs

@ -117,7 +117,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(Context.Driver.TypeDatabase, false); var nativeTypePrinter = new CppTypePrinter(false);
var returnType = Context.ReturnType.Type.Desugar(); var returnType = Context.ReturnType.Type.Desugar();
var constlessPointer = new PointerType() var constlessPointer = new PointerType()
{ {
@ -137,7 +137,7 @@ namespace CppSharp.Generators.CLI
Modifier = pointer.Modifier, Modifier = pointer.Modifier,
QualifiedPointee = new QualifiedType(pointee) QualifiedPointee = new QualifiedType(pointee)
}; };
var nativeTypePrinter = new CppTypePrinter(Context.Driver.TypeDatabase); var nativeTypePrinter = new CppTypePrinter();
var nativeTypeName = desugaredPointer.Visit(nativeTypePrinter, quals); var nativeTypeName = desugaredPointer.Visit(nativeTypePrinter, quals);
Context.Return.Write("reinterpret_cast<{0}>({1})", nativeTypeName, Context.Return.Write("reinterpret_cast<{0}>({1})", nativeTypeName,
returnVarName); returnVarName);
@ -516,7 +516,7 @@ namespace CppSharp.Generators.CLI
{ {
var function = pointee as FunctionType; var function = pointee as FunctionType;
var cppTypePrinter = new CppTypePrinter(Context.Driver.TypeDatabase); var cppTypePrinter = new CppTypePrinter();
var cppTypeName = pointer.Visit(cppTypePrinter, quals); var cppTypeName = pointer.Visit(cppTypePrinter, quals);
return VisitDelegateType(function, cppTypeName); return VisitDelegateType(function, cppTypeName);
@ -545,7 +545,7 @@ namespace CppSharp.Generators.CLI
var finalPointee = pointer.GetFinalPointee(); var finalPointee = pointer.GetFinalPointee();
if (finalPointee.IsPrimitiveType()) if (finalPointee.IsPrimitiveType())
{ {
var cppTypePrinter = new CppTypePrinter(Context.Driver.TypeDatabase); var cppTypePrinter = new CppTypePrinter();
var cppTypeName = pointer.Visit(cppTypePrinter, quals); var cppTypeName = pointer.Visit(cppTypePrinter, quals);
Context.Return.Write("({0})", cppTypeName); Context.Return.Write("({0})", cppTypeName);
@ -613,7 +613,7 @@ namespace CppSharp.Generators.CLI
cppTypeName = "::" + typedef.Declaration.QualifiedOriginalName; cppTypeName = "::" + typedef.Declaration.QualifiedOriginalName;
else else
{ {
var cppTypePrinter = new CppTypePrinter(Context.Driver.TypeDatabase); var cppTypePrinter = new CppTypePrinter();
cppTypeName = decl.Type.Visit(cppTypePrinter, quals); cppTypeName = decl.Type.Visit(cppTypePrinter, quals);
} }

10
src/Generator/Generators/CLI/CLISourcesTemplate.cs

@ -547,7 +547,7 @@ namespace CppSharp.Generators.CLI
WriteLine("if (!{0}Instance)", delegateName); WriteLine("if (!{0}Instance)", delegateName);
WriteStartBraceIndent(); WriteStartBraceIndent();
var typePrinter = new CppTypePrinter(Driver.TypeDatabase); var typePrinter = new CppTypePrinter();
var args = typePrinter.VisitParameters(@event.Parameters, hasNames: false); var args = typePrinter.VisitParameters(@event.Parameters, hasNames: false);
WriteLine("{0}Instance = gcnew {0}(this, &{1}::_{2}Raise);", WriteLine("{0}Instance = gcnew {0}(this, &{1}::_{2}Raise);",
@ -597,7 +597,7 @@ namespace CppSharp.Generators.CLI
private void GenerateEventRaiseWrapper(Event @event, Class @class) private void GenerateEventRaiseWrapper(Event @event, Class @class)
{ {
var typePrinter = new CppTypePrinter(Driver.TypeDatabase); var typePrinter = new CppTypePrinter();
var args = typePrinter.VisitParameters(@event.Parameters, hasNames: true); var args = typePrinter.VisitParameters(@event.Parameters, hasNames: true);
WriteLine("void {0}::_{1}Raise({2})", QualifiedIdentifier(@class), WriteLine("void {0}::_{1}Raise({2})", QualifiedIdentifier(@class),
@ -735,7 +735,7 @@ namespace CppSharp.Generators.CLI
// We cast the value to the base clas type since otherwise there // We cast the value to the base clas type since otherwise there
// could be ambiguous call to overloaded constructors. // could be ambiguous call to overloaded constructors.
var cppTypePrinter = new CppTypePrinter(Driver.TypeDatabase); var cppTypePrinter = new CppTypePrinter();
var nativeTypeName = baseClass.Visit(cppTypePrinter); var nativeTypeName = baseClass.Visit(cppTypePrinter);
Write("({0}*)", nativeTypeName); Write("({0}*)", nativeTypeName);
@ -985,7 +985,7 @@ namespace CppSharp.Generators.CLI
function.OperatorKind == CXXOperatorKind.ExplicitConversion) function.OperatorKind == CXXOperatorKind.ExplicitConversion)
{ {
var method = function as Method; var method = function as Method;
var typePrinter = new CppTypePrinter(Driver.TypeDatabase); var typePrinter = new CppTypePrinter();
var typeName = method.ConversionType.Visit(typePrinter); var typeName = method.ConversionType.Visit(typePrinter);
WriteLine("({0}) {1};", typeName, @params[0].Name); WriteLine("({0}) {1};", typeName, @params[0].Name);
} }
@ -1196,7 +1196,7 @@ namespace CppSharp.Generators.CLI
if (isRef) if (isRef)
{ {
var typePrinter = new CppTypePrinter(Driver.TypeDatabase); var typePrinter = new CppTypePrinter();
var type = paramType.Visit(typePrinter); var type = paramType.Visit(typePrinter);
if (param.IsInOut) if (param.IsInOut)

2
src/Generator/Passes/CheckIgnoredDecls.cs

@ -72,7 +72,7 @@ namespace CppSharp.Passes
var @class = (Class)field.Namespace; var @class = (Class)field.Namespace;
var cppTypePrinter = new CppTypePrinter(Driver.TypeDatabase); var cppTypePrinter = new CppTypePrinter();
var typeName = type.Visit(cppTypePrinter); var typeName = type.Visit(cppTypePrinter);
Log.Debug("Field '{0}::{1}' was ignored due to {2} type '{3}'", Log.Debug("Field '{0}::{1}' was ignored due to {2} type '{3}'",

2
src/Generator/Types/CppTypePrinter.cs

@ -19,7 +19,7 @@ namespace CppSharp.Types
public bool PrintLogicalNames; public bool PrintLogicalNames;
public bool PrintTypeQualifiers; public bool PrintTypeQualifiers;
public CppTypePrinter(ITypeMapDatabase database, bool printTypeQualifiers = true) public CppTypePrinter(bool printTypeQualifiers = true)
{ {
PrintScopeKind = CppTypePrintScopeKind.GlobalQualified; PrintScopeKind = CppTypePrintScopeKind.GlobalQualified;
PrintTypeQualifiers = printTypeQualifiers; PrintTypeQualifiers = printTypeQualifiers;

2
src/Generator/Types/Std/Stdlib.cs

@ -135,7 +135,7 @@ namespace CppSharp.Types.Std
var tmpVarName = "_tmp" + entryString; var tmpVarName = "_tmp" + entryString;
var cppTypePrinter = new CppTypePrinter(ctx.Driver.TypeDatabase); var cppTypePrinter = new CppTypePrinter();
var nativeType = type.Type.Visit(cppTypePrinter); var nativeType = type.Type.Visit(cppTypePrinter);
ctx.SupportBefore.WriteLine("auto {0} = std::vector<{1}>();", ctx.SupportBefore.WriteLine("auto {0} = std::vector<{1}>();",

6
src/Generator/Types/TypeMap.cs

@ -165,8 +165,8 @@ namespace CppSharp.Types
// We try to find type maps from the most qualified to less qualified // We try to find type maps from the most qualified to less qualified
// types. Example: '::std::vector', 'std::vector' and 'vector' // types. Example: '::std::vector', 'std::vector' and 'vector'
var typePrinter = new CppTypePrinter(this) var typePrinter = new CppTypePrinter()
{ {
PrintScopeKind = CppTypePrintScopeKind.GlobalQualified, PrintScopeKind = CppTypePrintScopeKind.GlobalQualified,
PrintLogicalNames = true PrintLogicalNames = true
}; };
@ -196,7 +196,7 @@ namespace CppSharp.Types
public bool FindTypeMap(Type type, out TypeMap typeMap) public bool FindTypeMap(Type type, out TypeMap typeMap)
{ {
var typePrinter = new CppTypePrinter(this); var typePrinter = new CppTypePrinter();
var template = type as TemplateSpecializationType; var template = type as TemplateSpecializationType;
if (template != null) if (template != null)

Loading…
Cancel
Save