Browse Source

Updated to LLVM/Clang revisions 339502/339494 respectively.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/1139/head
Dimitar Dobrev 7 years ago
parent
commit
c8536b4141
  1. 2
      build/Clang-commit
  2. 2
      build/LLVM-commit
  3. 4
      src/AST/Type.cs
  4. 5
      src/CppParser/AST.h
  5. 33
      src/CppParser/Bindings/CLI/AST.h
  6. 913
      src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
  7. 7
      src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std-symbols.cpp
  8. 16
      src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
  9. 913
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
  10. 7
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std-symbols.cpp
  11. 4
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
  12. 913
      src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
  13. 7
      src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std-symbols.cpp
  14. 16
      src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs
  15. 913
      src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
  16. 8
      src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std-symbols.cpp
  17. 622
      src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs
  18. 913
      src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
  19. 8
      src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std-symbols.cpp
  20. 622
      src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs
  21. 913
      src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
  22. 7
      src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std-symbols.cpp
  23. 4
      src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
  24. 8
      src/CppParser/Parser.cpp
  25. 8
      src/Parser/ASTConverter.cs

2
build/Clang-commit

@ -1 +1 @@ @@ -1 +1 @@
ffc5930a5cffb23df03565739b8820d14a19d4bf
bbae650adb7a55c54b95efbb1b52c35101f3703c

2
build/LLVM-commit

@ -1 +1 @@ @@ -1 +1 @@
9bde5fb8f8ea44d6ef0f2edb4f54cbff7a0aee53
bfd4fdf0e5ff0908e3c5274e7879589ccb1a65fe

4
src/AST/Type.cs

@ -231,7 +231,9 @@ namespace CppSharp.AST @@ -231,7 +231,9 @@ namespace CppSharp.AST
Dynamic,
MSAny,
BasicNoexcept,
ComputedNoexcept,
DependentNoexcept,
NoexceptFalse,
NoexceptTrue,
Unevaluated,
Uninstantiated,
Unparsed

5
src/CppParser/AST.h

@ -110,7 +110,9 @@ enum class ExceptionSpecType @@ -110,7 +110,9 @@ enum class ExceptionSpecType
Dynamic,
MSAny,
BasicNoexcept,
ComputedNoexcept,
DependentNoexcept,
NoexceptFalse,
NoexceptTrue,
Unevaluated,
Uninstantiated,
Unparsed
@ -695,6 +697,7 @@ enum class CXXOperatorKind @@ -695,6 +697,7 @@ enum class CXXOperatorKind
ExclaimEqual,
LessEqual,
GreaterEqual,
Spaceship,
AmpAmp,
PipePipe,
PlusPlus,

33
src/CppParser/Bindings/CLI/AST.h

@ -277,17 +277,18 @@ namespace CppSharp @@ -277,17 +277,18 @@ namespace CppSharp
ExclaimEqual = 31,
LessEqual = 32,
GreaterEqual = 33,
AmpAmp = 34,
PipePipe = 35,
PlusPlus = 36,
MinusMinus = 37,
Comma = 38,
ArrowStar = 39,
Arrow = 40,
Call = 41,
Subscript = 42,
Conditional = 43,
Coawait = 44
Spaceship = 34,
AmpAmp = 35,
PipePipe = 36,
PlusPlus = 37,
MinusMinus = 38,
Comma = 39,
ArrowStar = 40,
Arrow = 41,
Call = 42,
Subscript = 43,
Conditional = 44,
Coawait = 45
};
public enum struct CallingConvention
@ -395,10 +396,12 @@ namespace CppSharp @@ -395,10 +396,12 @@ namespace CppSharp
Dynamic = 2,
MSAny = 3,
BasicNoexcept = 4,
ComputedNoexcept = 5,
Unevaluated = 6,
Uninstantiated = 7,
Unparsed = 8
DependentNoexcept = 5,
NoexceptFalse = 6,
NoexceptTrue = 7,
Unevaluated = 8,
Uninstantiated = 9,
Unparsed = 10
};
public enum struct ArchType

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

File diff suppressed because it is too large Load Diff

7
src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std-symbols.cpp

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
#include <string>
template __attribute__((visibility("default"))) std::allocator<char>::allocator() noexcept;
template __attribute__((visibility("default"))) std::basic_string<char, std::char_traits<char>, std::allocator<char>>::basic_string(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>::value_type*, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>::allocator_type&);
template __attribute__((visibility("default"))) std::basic_string<char, std::char_traits<char>, std::allocator<char>>::~basic_string() noexcept;
template __attribute__((visibility("default"))) const std::basic_string<char, std::char_traits<char>, std::allocator<char>>::value_type* std::basic_string<char, std::char_traits<char>, std::allocator<char>>::c_str() const noexcept;
template class __attribute__((visibility("default"))) std::char_traits<char>;
template class __attribute__((visibility("default"))) std::allocator<char>;
template class __attribute__((visibility("default"))) std::basic_string<char, std::char_traits<char>, std::allocator<char>>;

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

@ -727,22 +727,22 @@ namespace Std @@ -727,22 +727,22 @@ namespace Std
public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
{
[FieldOffset(0)]
internal global::Std.BasicString.Rep._.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C _;
internal global::Std.BasicString.Rep._.__Internal _;
}
namespace _
{
[StructLayout(LayoutKind.Explicit, Size = 12)]
public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
public unsafe partial struct __Internal
{
[FieldOffset(0)]
internal global::Std.BasicString.Long.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C __l;
internal global::Std.BasicString.Long.__Internal __l;
[FieldOffset(0)]
internal global::Std.BasicString.Short.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C __s;
[FieldOffset(0)]
internal global::Std.BasicString.Raw.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C __r;
internal global::Std.BasicString.Raw.__Internal __r;
}
}
@ -752,7 +752,7 @@ namespace Std @@ -752,7 +752,7 @@ namespace Std
namespace Long
{
[StructLayout(LayoutKind.Explicit, Size = 12)]
public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
public unsafe partial struct __Internal
{
[FieldOffset(0)]
internal uint __cap_;
@ -772,7 +772,7 @@ namespace Std @@ -772,7 +772,7 @@ namespace Std
public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
{
[FieldOffset(0)]
internal global::Std.BasicString.Short._.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C _;
internal global::Std.BasicString.Short._.__Internal _;
[FieldOffset(1)]
internal fixed sbyte __data_[11];
@ -781,7 +781,7 @@ namespace Std @@ -781,7 +781,7 @@ namespace Std
namespace _
{
[StructLayout(LayoutKind.Explicit, Size = 1)]
public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
public unsafe partial struct __Internal
{
[FieldOffset(0)]
internal byte __size_;
@ -797,7 +797,7 @@ namespace Std @@ -797,7 +797,7 @@ namespace Std
namespace Raw
{
[StructLayout(LayoutKind.Explicit, Size = 12)]
public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
public unsafe partial struct __Internal
{
[FieldOffset(0)]
internal fixed uint __words[3];

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

File diff suppressed because it is too large Load Diff

7
src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std-symbols.cpp

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
#include <string>
template __declspec(dllexport) std::allocator<char>::allocator() noexcept;
template __declspec(dllexport) std::basic_string<char, std::char_traits<char>, std::allocator<char>>::basic_string(const char* const, const std::allocator<char>&);
template __declspec(dllexport) std::basic_string<char, std::char_traits<char>, std::allocator<char>>::~basic_string() noexcept;
template __declspec(dllexport) const char* std::basic_string<char, std::char_traits<char>, std::allocator<char>>::c_str() const noexcept;
template class __declspec(dllexport) std::char_traits<char>;
template class __declspec(dllexport) std::allocator<char>;
template class __declspec(dllexport) std::basic_string<char, std::char_traits<char>, std::allocator<char>>;

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

@ -598,7 +598,7 @@ namespace Std @@ -598,7 +598,7 @@ namespace Std
public unsafe partial struct __Internalc__N_std_S__String_val____N_std_S__Simple_types__C
{
[FieldOffset(0)]
internal global::Std.StringVal.Bxty.__Internalc__N_std_S__String_val____N_std_S__Simple_types__C _Bx;
internal global::Std.StringVal.Bxty.__Internal _Bx;
[FieldOffset(16)]
internal uint _Mysize;
@ -610,7 +610,7 @@ namespace Std @@ -610,7 +610,7 @@ namespace Std
namespace Bxty
{
[StructLayout(LayoutKind.Explicit, Size = 16)]
public unsafe partial struct __Internalc__N_std_S__String_val____N_std_S__Simple_types__C
public unsafe partial struct __Internal
{
[FieldOffset(0)]
internal fixed sbyte _Buf[16];

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

File diff suppressed because it is too large Load Diff

7
src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std-symbols.cpp

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
#include <string>
template __attribute__((visibility("default"))) std::allocator<char>::allocator() noexcept;
template __attribute__((visibility("default"))) std::basic_string<char, std::char_traits<char>, std::allocator<char>>::basic_string(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>::value_type*, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>::allocator_type&);
template __attribute__((visibility("default"))) std::basic_string<char, std::char_traits<char>, std::allocator<char>>::~basic_string() noexcept;
template __attribute__((visibility("default"))) const std::basic_string<char, std::char_traits<char>, std::allocator<char>>::value_type* std::basic_string<char, std::char_traits<char>, std::allocator<char>>::c_str() const noexcept;
template class __attribute__((visibility("default"))) std::char_traits<char>;
template class __attribute__((visibility("default"))) std::allocator<char>;
template class __attribute__((visibility("default"))) std::basic_string<char, std::char_traits<char>, std::allocator<char>>;

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

@ -727,22 +727,22 @@ namespace Std @@ -727,22 +727,22 @@ namespace Std
public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
{
[FieldOffset(0)]
internal global::Std.BasicString.Rep._.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C _;
internal global::Std.BasicString.Rep._.__Internal _;
}
namespace _
{
[StructLayout(LayoutKind.Explicit, Size = 24)]
public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
public unsafe partial struct __Internal
{
[FieldOffset(0)]
internal global::Std.BasicString.Long.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C __l;
internal global::Std.BasicString.Long.__Internal __l;
[FieldOffset(0)]
internal global::Std.BasicString.Short.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C __s;
[FieldOffset(0)]
internal global::Std.BasicString.Raw.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C __r;
internal global::Std.BasicString.Raw.__Internal __r;
}
}
@ -752,7 +752,7 @@ namespace Std @@ -752,7 +752,7 @@ namespace Std
namespace Long
{
[StructLayout(LayoutKind.Explicit, Size = 24)]
public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
public unsafe partial struct __Internal
{
[FieldOffset(0)]
internal ulong __cap_;
@ -772,7 +772,7 @@ namespace Std @@ -772,7 +772,7 @@ namespace Std
public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
{
[FieldOffset(0)]
internal global::Std.BasicString.Short._.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C _;
internal global::Std.BasicString.Short._.__Internal _;
[FieldOffset(1)]
internal fixed sbyte __data_[23];
@ -781,7 +781,7 @@ namespace Std @@ -781,7 +781,7 @@ namespace Std
namespace _
{
[StructLayout(LayoutKind.Explicit, Size = 1)]
public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
public unsafe partial struct __Internal
{
[FieldOffset(0)]
internal byte __size_;
@ -797,7 +797,7 @@ namespace Std @@ -797,7 +797,7 @@ namespace Std
namespace Raw
{
[StructLayout(LayoutKind.Explicit, Size = 24)]
public unsafe partial struct __Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C
public unsafe partial struct __Internal
{
[FieldOffset(0)]
internal fixed ulong __words[3];

913
src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs

File diff suppressed because it is too large Load Diff

8
src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std-symbols.cpp

@ -1,8 +1,6 @@ @@ -1,8 +1,6 @@
#include <string>
template std::allocator<char>::allocator();
template std::allocator<char>::~allocator();
template std::basic_string<char, std::char_traits<char>, std::allocator<char>>::basic_string(const char*, const std::allocator<char>&);
template std::basic_string<char, std::char_traits<char>, std::allocator<char>>::~basic_string();
template const char* std::basic_string<char, std::char_traits<char>, std::allocator<char>>::c_str() const noexcept;
template class std::char_traits<char>;
template class std::allocator<char>;
template class std::basic_string<char, std::char_traits<char>, std::allocator<char>>;

622
src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs

File diff suppressed because it is too large Load Diff

913
src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs

File diff suppressed because it is too large Load Diff

8
src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std-symbols.cpp

@ -1,8 +1,6 @@ @@ -1,8 +1,6 @@
#include <string>
template std::allocator<char>::allocator();
template std::allocator<char>::~allocator();
template std::basic_string<char, std::char_traits<char>, std::allocator<char>>::basic_string(const char*, const std::allocator<char>&);
template std::basic_string<char, std::char_traits<char>, std::allocator<char>>::~basic_string() noexcept;
template const char* std::basic_string<char, std::char_traits<char>, std::allocator<char>>::c_str() const noexcept;
template class std::char_traits<char>;
template class std::allocator<char>;
template class std::basic_string<char, std::char_traits<char>, std::allocator<char>>;

622
src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

7
src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std-symbols.cpp

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
#include <string>
template __declspec(dllexport) std::allocator<char>::allocator() noexcept;
template __declspec(dllexport) std::basic_string<char, std::char_traits<char>, std::allocator<char>>::basic_string(const char* const, const std::allocator<char>&);
template __declspec(dllexport) std::basic_string<char, std::char_traits<char>, std::allocator<char>>::~basic_string() noexcept;
template __declspec(dllexport) const char* std::basic_string<char, std::char_traits<char>, std::allocator<char>>::c_str() const noexcept;
template class __declspec(dllexport) std::char_traits<char>;
template class __declspec(dllexport) std::allocator<char>;
template class __declspec(dllexport) std::basic_string<char, std::char_traits<char>, std::allocator<char>>;

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

@ -598,7 +598,7 @@ namespace Std @@ -598,7 +598,7 @@ namespace Std
public unsafe partial struct __Internalc__N_std_S__String_val____N_std_S__Simple_types__C
{
[FieldOffset(0)]
internal global::Std.StringVal.Bxty.__Internalc__N_std_S__String_val____N_std_S__Simple_types__C _Bx;
internal global::Std.StringVal.Bxty.__Internal _Bx;
[FieldOffset(16)]
internal ulong _Mysize;
@ -610,7 +610,7 @@ namespace Std @@ -610,7 +610,7 @@ namespace Std
namespace Bxty
{
[StructLayout(LayoutKind.Explicit, Size = 16)]
public unsafe partial struct __Internalc__N_std_S__String_val____N_std_S__Simple_types__C
public unsafe partial struct __Internal
{
[FieldOffset(0)]
internal fixed sbyte _Buf[16];

8
src/CppParser/Parser.cpp

@ -2090,8 +2090,12 @@ static ExceptionSpecType ConvertExceptionType(clang::ExceptionSpecificationType @@ -2090,8 +2090,12 @@ static ExceptionSpecType ConvertExceptionType(clang::ExceptionSpecificationType
{
case ExceptionSpecificationType::EST_BasicNoexcept:
return ExceptionSpecType::BasicNoexcept;
case ExceptionSpecificationType::EST_ComputedNoexcept:
return ExceptionSpecType::ComputedNoexcept;
case ExceptionSpecificationType::EST_DependentNoexcept:
return ExceptionSpecType::DependentNoexcept;
case ExceptionSpecificationType::EST_NoexceptFalse:
return ExceptionSpecType::NoexceptFalse;
case ExceptionSpecificationType::EST_NoexceptTrue:
return ExceptionSpecType::NoexceptTrue;
case ExceptionSpecificationType::EST_Dynamic:
return ExceptionSpecType::Dynamic;
case ExceptionSpecificationType::EST_DynamicNone:

8
src/Parser/ASTConverter.cs

@ -552,8 +552,12 @@ namespace CppSharp @@ -552,8 +552,12 @@ namespace CppSharp
return AST.ExceptionSpecType.MSAny;
case ExceptionSpecType.BasicNoexcept:
return AST.ExceptionSpecType.BasicNoexcept;
case ExceptionSpecType.ComputedNoexcept:
return AST.ExceptionSpecType.ComputedNoexcept;
case ExceptionSpecType.DependentNoexcept:
return AST.ExceptionSpecType.DependentNoexcept;
case ExceptionSpecType.NoexceptFalse:
return AST.ExceptionSpecType.NoexceptFalse;
case ExceptionSpecType.NoexceptTrue:
return AST.ExceptionSpecType.NoexceptTrue;
case ExceptionSpecType.Unevaluated:
return AST.ExceptionSpecType.Unevaluated;
case ExceptionSpecType.Uninstantiated:

Loading…
Cancel
Save