Browse Source

Fixed a regression when generating the parser bindings for OS X.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
cpp_module_crash
Dimitar Dobrev 9 years ago
parent
commit
41cd6e6ab7
  1. 7
      src/AST/ASTVisitor.cs
  2. 10
      src/AST/Type.cs
  3. 2
      src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/AST.cs
  4. 2
      src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppParser.cs
  5. 2
      src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Sources.cs
  6. 2
      src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Target.cs
  7. 2
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs
  8. 2
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs
  9. 2
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Sources.cs
  10. 2
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Target.cs
  11. 2
      src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/AST.cs
  12. 2
      src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppParser.cs
  13. 2
      src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Sources.cs
  14. 2
      src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Target.cs
  15. 2
      src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs
  16. 2
      src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppParser.cs
  17. 2
      src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Sources.cs
  18. 2
      src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Target.cs
  19. 2
      src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/AST.cs
  20. 2
      src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppParser.cs
  21. 2
      src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Sources.cs
  22. 2
      src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Target.cs

7
src/AST/ASTVisitor.cs

@ -179,8 +179,11 @@ namespace CppSharp.AST
} }
} }
return template.IsDependent ? template.Template.Visit(this) : if (template.IsDependent)
template.GetClassTemplateSpecialization().Visit(this); return template.Template.Visit(this);
var specialization = template.GetClassTemplateSpecialization();
return specialization != null && specialization.Visit(this);
} }
public virtual bool VisitTemplateParameterType(TemplateParameterType param, public virtual bool VisitTemplateParameterType(TemplateParameterType param,

10
src/AST/Type.cs

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using CppSharp.AST.Extensions;
namespace CppSharp.AST namespace CppSharp.AST
{ {
@ -636,11 +637,16 @@ namespace CppSharp.AST
public ClassTemplateSpecialization GetClassTemplateSpecialization() public ClassTemplateSpecialization GetClassTemplateSpecialization()
{ {
var tagType = Desugared as TagType; var finalType = Desugared.GetFinalPointee() ?? Desugared;
var tagType = finalType as TagType;
if (tagType != null) if (tagType != null)
return (ClassTemplateSpecialization) tagType.Declaration; return (ClassTemplateSpecialization) tagType.Declaration;
var injectedClassNameType = (InjectedClassNameType) Desugared; var injectedClassNameType = finalType as InjectedClassNameType;
if (injectedClassNameType == null)
return null;
var injectedSpecializationType = (TemplateSpecializationType) var injectedSpecializationType = (TemplateSpecializationType)
injectedClassNameType.InjectedSpecializationType.Type; injectedClassNameType.InjectedSpecializationType.Type;
return injectedSpecializationType.GetClassTemplateSpecialization(); return injectedSpecializationType.GetClassTemplateSpecialization();

2
src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/AST.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppParser.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Sources.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Target.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Sources.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Target.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/AST.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppParser.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Sources.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Target.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppParser.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Sources.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Target.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/AST.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppParser.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Sources.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Target.cs

@ -1,6 +1,8 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// <auto-generated>
// This is autogenerated code by CppSharp. // This is autogenerated code by CppSharp.
// Do not edit this file or all your changes will be lost after re-generation. // Do not edit this file or all your changes will be lost after re-generation.
// </auto-generated>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

Loading…
Cancel
Save