6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-15 05:24:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix more -Wshorten-64-to-32 warnings.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@50659 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evan Cheng
2008-05-05 18:30:58 +00:00
parent b61bfdb56e
commit 34cd4a484e
55 changed files with 225 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib/Support/CommandLine.cpp
View File

@ -115,7 +115,7 @@ static void GetOptionInfo(std::vector<Option*> &PositionalOpts,
OptionNames.push_back(O->ArgStr);
// Handle named options.
for (unsigned i = 0, e = OptionNames.size(); i != e; ++i) {
for (size_t i = 0, e = OptionNames.size(); i != e; ++i) {
// Add argument to the argument map!
if (!OptionsMap.insert(std::pair<std::string,Option*>(OptionNames[i],
O)).second) {
@ -223,7 +223,7 @@ static inline bool isPrefixedOrGrouping(const Option *O) {
// see if there options that satisfy the predicate. If we find one, return it,
// otherwise return null.
//
static Option *getOptionPred(std::string Name, unsigned &Length,
static Option *getOptionPred(std::string Name, size_t &Length,
bool (*Pred)(const Option*),
std::map<std::string, Option*> &OptionsMap) {
@ -329,7 +329,7 @@ void cl::ParseEnvironmentOptions(const char *progName, const char *envVar,
// Parse the value of the environment variable into a "command line"
// and hand it off to ParseCommandLineOptions().
ParseCStringVector(newArgv, envValue);
int newArgc = newArgv.size();
int newArgc = static_cast<int>(newArgv.size());
ParseCommandLineOptions(newArgc, &newArgv[0], Overview, ReadResponseFiles);
// Free all the strdup()ed strings.
@ -391,7 +391,7 @@ void cl::ParseCommandLineOptions(int argc, char **argv,
newArgv.push_back(strdup(argv[0]));
ExpandResponseFiles(argc, argv, newArgv);
argv = &newArgv[0];
argc = newArgv.size();
argc = static_cast<int>(newArgv.size());
}
sys::Path progname(argv[0]);
@ -420,7 +420,7 @@ void cl::ParseCommandLineOptions(int argc, char **argv,
// Calculate how many positional values are _required_.
bool UnboundedFound = false;
for (unsigned i = ConsumeAfterOpt != 0, e = PositionalOpts.size();
for (size_t i = ConsumeAfterOpt != 0, e = PositionalOpts.size();
i != e; ++i) {
Option *Opt = PositionalOpts[i];
if (RequiresValue(Opt))
@ -525,7 +525,7 @@ void cl::ParseCommandLineOptions(int argc, char **argv,
if (Handler == 0) {
std::string RealName(ArgName);
if (RealName.size() > 1) {
unsigned Length = 0;
size_t Length = 0;
Option *PGOpt = getOptionPred(RealName, Length, isPrefixedOrGrouping,
Opts);
@ -627,8 +627,8 @@ void cl::ParseCommandLineOptions(int argc, char **argv,
} else if (ConsumeAfterOpt == 0) {
// Positional args have already been handled if ConsumeAfter is specified...
unsigned ValNo = 0, NumVals = PositionalVals.size();
for (unsigned i = 0, e = PositionalOpts.size(); i != e; ++i) {
unsigned ValNo = 0, NumVals = static_cast<unsigned>(PositionalVals.size());
for (size_t i = 0, e = PositionalOpts.size(); i != e; ++i) {
if (RequiresValue(PositionalOpts[i])) {
ProvidePositionalOption(PositionalOpts[i], PositionalVals[ValNo].first,
PositionalVals[ValNo].second);
@ -662,7 +662,7 @@ void cl::ParseCommandLineOptions(int argc, char **argv,
} else {
assert(ConsumeAfterOpt && NumPositionalRequired <= PositionalVals.size());
unsigned ValNo = 0;
for (unsigned j = 1, e = PositionalOpts.size(); j != e; ++j)
for (size_t j = 1, e = PositionalOpts.size(); j != e; ++j)
if (RequiresValue(PositionalOpts[j])) {
ErrorParsing |= ProvidePositionalOption(PositionalOpts[j],
PositionalVals[ValNo].first,
@ -775,13 +775,13 @@ static const char *getValueStr(const Option &O, const char *DefaultMsg) {
//
// Return the width of the option tag for printing...
unsigned alias::getOptionWidth() const {
size_t alias::getOptionWidth() const {
return std::strlen(ArgStr)+6;
}
// Print out the option for the alias.
void alias::printOptionInfo(unsigned GlobalWidth) const {
unsigned L = std::strlen(ArgStr);
void alias::printOptionInfo(size_t GlobalWidth) const {
size_t L = std::strlen(ArgStr);
cout << " -" << ArgStr << std::string(GlobalWidth-L-6, ' ') << " - "
<< HelpStr << "\n";
}
@ -796,8 +796,8 @@ void alias::printOptionInfo(unsigned GlobalWidth) const {
//
// Return the width of the option tag for printing...
unsigned basic_parser_impl::getOptionWidth(const Option &O) const {
unsigned Len = std::strlen(O.ArgStr);
size_t basic_parser_impl::getOptionWidth(const Option &O) const {
size_t Len = std::strlen(O.ArgStr);
if (const char *ValName = getValueName())
Len += std::strlen(getValueStr(O, ValName))+3;
@ -808,7 +808,7 @@ unsigned basic_parser_impl::getOptionWidth(const Option &O) const {
// to-be-maintained width is specified.
//
void basic_parser_impl::printOptionInfo(const Option &O,
unsigned GlobalWidth) const {
size_t GlobalWidth) const {
cout << " -" << O.ArgStr;
if (const char *ValName = getValueName())
@ -926,16 +926,16 @@ unsigned generic_parser_base::findOption(const char *Name) {
// Return the width of the option tag for printing...
unsigned generic_parser_base::getOptionWidth(const Option &O) const {
size_t generic_parser_base::getOptionWidth(const Option &O) const {
if (O.hasArgStr()) {
unsigned Size = std::strlen(O.ArgStr)+6;
size_t Size = std::strlen(O.ArgStr)+6;
for (unsigned i = 0, e = getNumOptions(); i != e; ++i)
Size = std::max(Size, (unsigned)std::strlen(getOption(i))+8);
Size = std::max(Size, std::strlen(getOption(i))+8);
return Size;
} else {
unsigned BaseSize = 0;
size_t BaseSize = 0;
for (unsigned i = 0, e = getNumOptions(); i != e; ++i)
BaseSize = std::max(BaseSize, (unsigned)std::strlen(getOption(i))+8);
BaseSize = std::max(BaseSize, std::strlen(getOption(i))+8);
return BaseSize;
}
}
@ -944,14 +944,14 @@ unsigned generic_parser_base::getOptionWidth(const Option &O) const {
// to-be-maintained width is specified.
//
void generic_parser_base::printOptionInfo(const Option &O,
unsigned GlobalWidth) const {
size_t GlobalWidth) const {
if (O.hasArgStr()) {
unsigned L = std::strlen(O.ArgStr);
size_t L = std::strlen(O.ArgStr);
cout << " -" << O.ArgStr << std::string(GlobalWidth-L-6, ' ')
<< " - " << O.HelpStr << "\n";
for (unsigned i = 0, e = getNumOptions(); i != e; ++i) {
unsigned NumSpaces = GlobalWidth-strlen(getOption(i))-8;
size_t NumSpaces = GlobalWidth-strlen(getOption(i))-8;
cout << " =" << getOption(i) << std::string(NumSpaces, ' ')
<< " - " << getDescription(i) << "\n";
}
@ -959,7 +959,7 @@ void generic_parser_base::printOptionInfo(const Option &O,
if (O.HelpStr[0])
cout << " " << O.HelpStr << "\n";
for (unsigned i = 0, e = getNumOptions(); i != e; ++i) {
unsigned L = std::strlen(getOption(i));
size_t L = std::strlen(getOption(i));
cout << " -" << getOption(i) << std::string(GlobalWidth-L-8, ' ')
<< " - " << getDescription(i) << "\n";
}
@ -974,7 +974,7 @@ void generic_parser_base::printOptionInfo(const Option &O,
namespace {
class HelpPrinter {
unsigned MaxArgLen;
size_t MaxArgLen;
const Option *EmptyArg;
const bool ShowHidden;
@ -1030,7 +1030,7 @@ public:
PositionalOpts[0]->getNumOccurrencesFlag() == ConsumeAfter)
CAOpt = PositionalOpts[0];
for (unsigned i = CAOpt != 0, e = PositionalOpts.size(); i != e; ++i) {
for (size_t i = CAOpt != 0, e = PositionalOpts.size(); i != e; ++i) {
if (PositionalOpts[i]->ArgStr[0])
cout << " --" << PositionalOpts[i]->ArgStr;
cout << " " << PositionalOpts[i]->HelpStr;
@ -1043,11 +1043,11 @@ public:
// Compute the maximum argument length...
MaxArgLen = 0;
for (unsigned i = 0, e = Opts.size(); i != e; ++i)
for (size_t i = 0, e = Opts.size(); i != e; ++i)
MaxArgLen = std::max(MaxArgLen, Opts[i].second->getOptionWidth());
cout << "OPTIONS:\n";
for (unsigned i = 0, e = Opts.size(); i != e; ++i)
for (size_t i = 0, e = Opts.size(); i != e; ++i)
Opts[i].second->printOptionInfo(MaxArgLen);
// Print any extra help the user has declared.