Browse Source

Rename TypeDatabase to TypeMaps.

pull/719/head
Joao Matos 9 years ago
parent
commit
8076e5f1c6
  1. 6
      src/Generator/Passes/CheckIgnoredDecls.cs
  2. 4
      src/Generator/Passes/HandleDefaultParamValuesPass.cs
  3. 2
      src/Generator/Passes/Pass.cs

6
src/Generator/Passes/CheckIgnoredDecls.cs

@ -377,7 +377,7 @@ namespace CppSharp.Passes
private bool IsTypeComplete(Type type) private bool IsTypeComplete(Type type)
{ {
TypeMap typeMap; TypeMap typeMap;
if (TypeDatabase.FindTypeMap(type, out typeMap) && !typeMap.IsIgnored) if (TypeMaps.FindTypeMap(type, out typeMap) && !typeMap.IsIgnored)
return true; return true;
var desugared = type.Desugar(); var desugared = type.Desugar();
@ -394,7 +394,7 @@ namespace CppSharp.Passes
private bool IsTypeIgnored(Type type) private bool IsTypeIgnored(Type type)
{ {
var checker = new TypeIgnoreChecker(TypeDatabase); var checker = new TypeIgnoreChecker(TypeMaps);
type.Visit(checker); type.Visit(checker);
return checker.IsIgnored; return checker.IsIgnored;
@ -407,7 +407,7 @@ namespace CppSharp.Passes
return true; return true;
TypeMap typeMap; TypeMap typeMap;
return TypeDatabase.FindTypeMap(decl, out typeMap) ? typeMap.IsIgnored : decl.Ignore; return TypeMaps.FindTypeMap(decl, out typeMap) ? typeMap.IsIgnored : decl.Ignore;
} }
#endregion #endregion

4
src/Generator/Passes/HandleDefaultParamValuesPass.cs

@ -144,7 +144,7 @@ namespace CppSharp.Passes
var typePrinter = new CSharpTypePrinter(Context); var typePrinter = new CSharpTypePrinter(Context);
typePrinter.PushMarshalKind(CSharpMarshalKind.DefaultExpression); typePrinter.PushMarshalKind(CSharpMarshalKind.DefaultExpression);
var typePrinterResult = type.Visit(typePrinter).Type; var typePrinterResult = type.Visit(typePrinter).Type;
if (TypeDatabase.FindTypeMap(decl, type, out typeMap)) if (TypeMaps.FindTypeMap(decl, type, out typeMap))
{ {
var typeInSignature = typeMap.CSharpSignatureType( var typeInSignature = typeMap.CSharpSignatureType(
typePrinter.TypePrinterContext).SkipPointerRefs().Desugar(); typePrinter.TypePrinterContext).SkipPointerRefs().Desugar();
@ -292,7 +292,7 @@ namespace CppSharp.Passes
TypeMap typeMap; TypeMap typeMap;
if ((function.Parameters.Count == 0 || if ((function.Parameters.Count == 0 ||
HasSingleZeroArgExpression(function)) && HasSingleZeroArgExpression(function)) &&
TypeDatabase.FindTypeMap(desugared, out typeMap)) TypeMaps.FindTypeMap(desugared, out typeMap))
{ {
var typeInSignature = typeMap.CSharpSignatureType(new CSharpTypePrinterContext var typeInSignature = typeMap.CSharpSignatureType(new CSharpTypePrinterContext
{ {

2
src/Generator/Passes/Pass.cs

@ -15,7 +15,7 @@ namespace CppSharp.Passes
public IDiagnostics Diagnostics { get { return Context.Diagnostics; } } public IDiagnostics Diagnostics { get { return Context.Diagnostics; } }
public DriverOptions Options { get { return Context.Options; } } public DriverOptions Options { get { return Context.Options; } }
public ASTContext ASTContext { get { return Context.ASTContext; } } public ASTContext ASTContext { get { return Context.ASTContext; } }
public TypeMapDatabase TypeDatabase { get { return Context.TypeMaps; } } public TypeMapDatabase TypeMaps { get { return Context.TypeMaps; } }
public bool ClearVisitedDeclarations = false; public bool ClearVisitedDeclarations = false;

Loading…
Cancel
Save