Browse Source

Update to latest llvm/clang

pull/157/head
Michael Ciccotti 12 years ago committed by Øystein Krog
parent
commit
a15b40733b
  1. 7
      src/CppParser/Parser.cpp
  2. 7
      src/Parser/Parser.cpp

7
src/CppParser/Parser.cpp

@ -119,7 +119,6 @@ void Parser::SetupHeader()
TargetOptions& TO = Inv->getTargetOpts(); TargetOptions& TO = Inv->getTargetOpts();
TargetABI = (Opts->Abi == CppAbi::Microsoft) ? TargetCXXABI::Microsoft TargetABI = (Opts->Abi == CppAbi::Microsoft) ? TargetCXXABI::Microsoft
: TargetCXXABI::GenericItanium; : TargetCXXABI::GenericItanium;
TO.CXXABI = GetCXXABIString(TargetABI);
TO.Triple = llvm::sys::getDefaultTargetTriple(); TO.Triple = llvm::sys::getDefaultTargetTriple();
if (!Opts->TargetTriple.empty()) if (!Opts->TargetTriple.empty())
@ -1406,12 +1405,12 @@ Type* Parser::WalkType(clang::QualType QualType, clang::TypeLoc* TL,
WalkType(FP->getResultType(), &RL)); WalkType(FP->getResultType(), &RL));
F->CallingConvention = ConvertCallConv(FP->getCallConv()); F->CallingConvention = ConvertCallConv(FP->getCallConv());
for (unsigned i = 0; i < FP->getNumArgs(); ++i) for (unsigned i = 0; i < FP->getNumParams(); ++i)
{ {
auto FA = new Parameter(); auto FA = new Parameter();
if (FTL) if (FTL)
{ {
auto PVD = FTL.getArg(i); auto PVD = FTL.getParam(i);
HandleDeclaration(PVD, FA); HandleDeclaration(PVD, FA);
@ -1422,7 +1421,7 @@ Type* Parser::WalkType(clang::QualType QualType, clang::TypeLoc* TL,
} }
else else
{ {
auto Arg = FP->getArgType(i); auto Arg = FP->getParamType(i);
FA->Name = ""; FA->Name = "";
FA->QualifiedType = GetQualifiedType(Arg, WalkType(Arg)); FA->QualifiedType = GetQualifiedType(Arg, WalkType(Arg));
} }

7
src/Parser/Parser.cpp

@ -122,7 +122,6 @@ void Parser::SetupHeader()
TargetOptions& TO = Inv->getTargetOpts(); TargetOptions& TO = Inv->getTargetOpts();
TargetABI = (Opts->Abi == CppAbi::Microsoft) ? TargetCXXABI::Microsoft TargetABI = (Opts->Abi == CppAbi::Microsoft) ? TargetCXXABI::Microsoft
: TargetCXXABI::GenericItanium; : TargetCXXABI::GenericItanium;
TO.CXXABI = GetCXXABIString(TargetABI);
TO.Triple = llvm::sys::getDefaultTargetTriple(); TO.Triple = llvm::sys::getDefaultTargetTriple();
if (!System::String::IsNullOrWhiteSpace(Opts->TargetTriple)) if (!System::String::IsNullOrWhiteSpace(Opts->TargetTriple))
@ -1429,12 +1428,12 @@ CppSharp::AST::Type^ Parser::WalkType(clang::QualType QualType, clang::TypeLoc*
WalkType(FP->getResultType(), &RL)); WalkType(FP->getResultType(), &RL));
F->CallingConvention = ConvertCallConv(FP->getCallConv()); F->CallingConvention = ConvertCallConv(FP->getCallConv());
for (unsigned i = 0; i < FP->getNumArgs(); ++i) for (unsigned i = 0; i < FP->getNumParams(); ++i)
{ {
auto FA = gcnew CppSharp::AST::Parameter(); auto FA = gcnew CppSharp::AST::Parameter();
if (FTL) if (FTL)
{ {
auto PVD = FTL.getArg(i); auto PVD = FTL.getParam(i);
HandleDeclaration(PVD, FA); HandleDeclaration(PVD, FA);
@ -1445,7 +1444,7 @@ CppSharp::AST::Type^ Parser::WalkType(clang::QualType QualType, clang::TypeLoc*
} }
else else
{ {
auto Arg = FP->getArgType(i); auto Arg = FP->getParamType(i);
FA->Name = ""; FA->Name = "";
FA->QualifiedType = GetQualifiedType(Arg, WalkType(Arg)); FA->QualifiedType = GetQualifiedType(Arg, WalkType(Arg));
} }

Loading…
Cancel
Save