Mercurial > projects > ldc
diff gen/cl_helpers.cpp @ 1650:40bd4a0d4870
Update to work with LLVM 2.7.
Removed use of dyn_cast, llvm no compiles
without exceptions and rtti by
default. We do need exceptions for the libconfig stuff, but rtti isn't
necessary (anymore).
Debug info needs to be rewritten, as in LLVM 2.7 the format has
completely changed. To have something to look at while rewriting, the
old code has been wrapped inside #ifndef DISABLE_DEBUG_INFO , this means
that you have to define this to compile at the moment.
Updated tango 0.99.9 patch to include updated EH runtime code, which is
needed for LLVM 2.7 as well.
author | Tomas Lindquist Olsen |
---|---|
date | Wed, 19 May 2010 12:42:32 +0200 |
parents | b30fe7e1dbb9 |
children |
line wrap: on
line diff
--- a/gen/cl_helpers.cpp Fri Mar 19 09:31:25 2010 +0100 +++ b/gen/cl_helpers.cpp Wed May 19 12:42:32 2010 +0200 @@ -17,19 +17,19 @@ return c; } -bool FlagParser::parse(cl::Option &O, const char *ArgName, const std::string &Arg, bool &Val) { +bool FlagParser::parse(cl::Option &O, llvm::StringRef ArgName, llvm::StringRef Arg, bool &Val) { // Make a std::string out of it to make comparisons easier // (and avoid repeated conversion) - std::string argname = ArgName; - + llvm::StringRef argname = ArgName; + typedef std::vector<std::pair<std::string, bool> >::iterator It; for (It I = switches.begin(), E = switches.end(); I != E; ++I) { - std::string name = I->first; + llvm::StringRef name = I->first; if (name == argname - || (name.length() < argname.length() - && argname.substr(0, name.length()) == name - && argname[name.length()] == '=')) { - + || (name.size() < argname.size() + && argname.substr(0, name.size()) == name + && argname[name.size()] == '=')) { + if (!cl::parser<bool>::parse(O, ArgName, Arg, Val)) { Val = (Val == I->second); return false; @@ -41,10 +41,10 @@ return true; } -void FlagParser::getExtraOptionNames(std::vector<const char*> &Names) { +void FlagParser::getExtraOptionNames(llvm::SmallVectorImpl<const char*> &Names) { typedef std::vector<std::pair<std::string, bool> >::iterator It; for (It I = switches.begin() + 1, E = switches.end(); I != E; ++I) { - Names.push_back(I->first.c_str()); + Names.push_back(I->first.data()); } } @@ -60,7 +60,7 @@ } } } - + void MultiSetter::operator=(bool val) { typedef std::vector<bool*>::iterator It; for (It I = locations.begin(), E = locations.end(); I != E; ++I) { @@ -72,7 +72,7 @@ void ArrayAdapter::push_back(const char* cstr) { if (!cstr || !*cstr) error("Expected argument to '-%s'", name); - + if (!*arrp) *arrp = new Array; (*arrp)->push(mem.strdup(cstr));