Browse Source

Updated to LLVM/Clang 253162/253161 respectively.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/585/merge
Dimitar Dobrev 10 years ago
parent
commit
1ba4493bf6
  1. 2
      build/Clang-commit
  2. 2
      build/LLVM-commit
  3. 1
      src/AST/Method.cs
  4. 2
      src/Core/Parser/ASTConverter.cs
  5. 3
      src/CppParser/AST.h
  6. 3
      src/CppParser/Bindings/CLI/AST.h
  7. 3
      src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/AST.cs
  8. 3
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs
  9. 3
      src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/AST.cs
  10. 3
      src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs
  11. 9
      src/CppParser/Parser.cpp
  12. 7648
      src/CppParser/Targets.cpp
  13. 1
      src/Generator/AST/Utils.cs
  14. 1
      src/Generator/Passes/CheckOperatorsOverloads.cs

2
build/Clang-commit

@ -1 +1 @@
41edf4ec7304ddfdf9225d225586804f394a5cf4 4f60e73bd8c2ee40ef6d419e15860bfbfba4c619

2
build/LLVM-commit

@ -1 +1 @@
9a4e2cb3295f286dafc41b7e18619bc150880611 f79c5ce90bae0f60ffa44491a6eccf5af18deb60

1
src/AST/Method.cs

@ -64,6 +64,7 @@ namespace CppSharp.AST
Call, Call,
Subscript, Subscript,
Conditional, Conditional,
Coawait,
Conversion, Conversion,
ExplicitConversion ExplicitConversion
} }

2
src/Core/Parser/ASTConverter.cs

@ -1139,6 +1139,8 @@ namespace CppSharp
return AST.CXXOperatorKind.Subscript; return AST.CXXOperatorKind.Subscript;
case CXXOperatorKind.Conditional: case CXXOperatorKind.Conditional:
return AST.CXXOperatorKind.Conditional; return AST.CXXOperatorKind.Conditional;
case CXXOperatorKind.Coawait:
return AST.CXXOperatorKind.Coawait;
default: default:
throw new ArgumentOutOfRangeException("operatorKind"); throw new ArgumentOutOfRangeException("operatorKind");
} }

3
src/CppParser/AST.h

@ -595,7 +595,8 @@ enum class CXXOperatorKind
Arrow, Arrow,
Call, Call,
Subscript, Subscript,
Conditional Conditional,
Coawait
}; };
class FunctionTemplateSpecialization; class FunctionTemplateSpecialization;

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

@ -214,7 +214,8 @@ namespace CppSharp
Arrow = 40, Arrow = 40,
Call = 41, Call = 41,
Subscript = 42, Subscript = 42,
Conditional = 43 Conditional = 43,
Coawait = 44
}; };
public enum struct CallingConvention public enum struct CallingConvention

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

@ -119,7 +119,8 @@ namespace CppSharp
Arrow = 40, Arrow = 40,
Call = 41, Call = 41,
Subscript = 42, Subscript = 42,
Conditional = 43 Conditional = 43,
Coawait = 44
} }
public enum CallingConvention public enum CallingConvention

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

@ -119,7 +119,8 @@ namespace CppSharp
Arrow = 40, Arrow = 40,
Call = 41, Call = 41,
Subscript = 42, Subscript = 42,
Conditional = 43 Conditional = 43,
Coawait = 44
} }
public enum CallingConvention public enum CallingConvention

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

@ -119,7 +119,8 @@ namespace CppSharp
Arrow = 40, Arrow = 40,
Call = 41, Call = 41,
Subscript = 42, Subscript = 42,
Conditional = 43 Conditional = 43,
Coawait = 44
} }
public enum CallingConvention public enum CallingConvention

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

@ -119,7 +119,8 @@ namespace CppSharp
Arrow = 40, Arrow = 40,
Call = 41, Call = 41,
Subscript = 42, Subscript = 42,
Conditional = 43 Conditional = 43,
Coawait = 44
} }
public enum CallingConvention public enum CallingConvention

9
src/CppParser/Parser.cpp

@ -125,10 +125,6 @@ ConvertToClangTargetCXXABI(CppSharp::CppParser::AST::CppAbi abi)
llvm_unreachable("Unsupported C++ ABI."); llvm_unreachable("Unsupported C++ ABI.");
} }
// Defined in Targets.cpp
clang::TargetInfo * CreateTargetInfo(clang::DiagnosticsEngine &Diags,
const std::shared_ptr<clang::TargetOptions> &Opts);
void Parser::SetupHeader() void Parser::SetupHeader()
{ {
using namespace clang; using namespace clang;
@ -180,7 +176,7 @@ void Parser::SetupHeader()
if (!Opts->TargetTriple.empty()) if (!Opts->TargetTriple.empty())
TO->Triple = llvm::Triple::normalize(Opts->TargetTriple); TO->Triple = llvm::Triple::normalize(Opts->TargetTriple);
TargetInfo* TI = CreateTargetInfo(C->getDiagnostics(), TO); TargetInfo* TI = TargetInfo::CreateTargetInfo(C->getDiagnostics(), TO);
if (!TI) if (!TI)
{ {
// We might have no target info due to an invalid user-provided triple. // We might have no target info due to an invalid user-provided triple.
@ -191,7 +187,6 @@ void Parser::SetupHeader()
assert(TI && "Expected valid target info"); assert(TI && "Expected valid target info");
TI->setCXXABI(TargetABI);
C->setTarget(TI); C->setTarget(TI);
C->createFileManager(); C->createFileManager();
@ -3142,7 +3137,7 @@ ParserResult* Parser::ParseHeader(const std::string& File, ParserResult* res)
auto FileEntry = C->getPreprocessor().getHeaderSearchInfo().LookupFile(File, auto FileEntry = C->getPreprocessor().getHeaderSearchInfo().LookupFile(File,
clang::SourceLocation(), /*isAngled*/true, clang::SourceLocation(), /*isAngled*/true,
nullptr, Dir, Includers, nullptr, nullptr, nullptr); nullptr, Dir, Includers, nullptr, nullptr, nullptr, nullptr);
if (!FileEntry) if (!FileEntry)
{ {
res->Kind = ParserResultKind::FileNotFound; res->Kind = ParserResultKind::FileNotFound;

7648
src/CppParser/Targets.cpp

File diff suppressed because it is too large Load Diff

1
src/Generator/AST/Utils.cs

@ -190,6 +190,7 @@ namespace CppSharp.AST
case CXXOperatorKind.Arrow: case CXXOperatorKind.Arrow:
case CXXOperatorKind.Call: case CXXOperatorKind.Call:
case CXXOperatorKind.Conditional: case CXXOperatorKind.Conditional:
case CXXOperatorKind.Coawait:
case CXXOperatorKind.New: case CXXOperatorKind.New:
case CXXOperatorKind.Delete: case CXXOperatorKind.Delete:
case CXXOperatorKind.Array_New: case CXXOperatorKind.Array_New:

1
src/Generator/Passes/CheckOperatorsOverloads.cs

@ -256,6 +256,7 @@ namespace CppSharp.Passes
case CXXOperatorKind.Arrow: case CXXOperatorKind.Arrow:
case CXXOperatorKind.Call: case CXXOperatorKind.Call:
case CXXOperatorKind.Conditional: case CXXOperatorKind.Conditional:
case CXXOperatorKind.Coawait:
case CXXOperatorKind.New: case CXXOperatorKind.New:
case CXXOperatorKind.Delete: case CXXOperatorKind.Delete:
case CXXOperatorKind.Array_New: case CXXOperatorKind.Array_New:

Loading…
Cancel
Save