[llvm-commits] CVS: llvm/tools/llvmc/CompilerDriver.cpp CompilerDriver.h ConfigLexer.h Configuration.cpp Configuration.h llvmc.cpp
Misha Brukman
brukman at cs.uiuc.edu
Thu Apr 21 16:59:56 PDT 2005
Changes in directory llvm/tools/llvmc:
CompilerDriver.cpp updated: 1.28 -> 1.29
CompilerDriver.h updated: 1.16 -> 1.17
ConfigLexer.h updated: 1.11 -> 1.12
Configuration.cpp updated: 1.17 -> 1.18
Configuration.h updated: 1.6 -> 1.7
llvmc.cpp updated: 1.23 -> 1.24
---
Log message:
Remove trailing whitespace
---
Diffs of the changes: (+108 -108)
CompilerDriver.cpp | 82 ++++++++++++++++++++++++++---------------------------
CompilerDriver.h | 18 +++++------
ConfigLexer.h | 10 +++---
Configuration.cpp | 70 ++++++++++++++++++++++-----------------------
Configuration.h | 14 ++++-----
llvmc.cpp | 22 +++++++-------
6 files changed, 108 insertions(+), 108 deletions(-)
Index: llvm/tools/llvmc/CompilerDriver.cpp
diff -u llvm/tools/llvmc/CompilerDriver.cpp:1.28 llvm/tools/llvmc/CompilerDriver.cpp:1.29
--- llvm/tools/llvmc/CompilerDriver.cpp:1.28 Tue Apr 19 23:51:29 2005
+++ llvm/tools/llvmc/CompilerDriver.cpp Thu Apr 21 18:59:45 2005
@@ -1,11 +1,11 @@
//===- CompilerDriver.cpp - The LLVM Compiler Driver ------------*- C++ -*-===//
//
-//
+//
// The LLVM Compiler Infrastructure
//
-// This file was developed by Reid Spencer and is distributed under the
+// This file was developed by Reid Spencer and is distributed under the
// University of Illinois Open Source License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file implements the bulk of the LLVM Compiler Driver (llvmc).
@@ -48,7 +48,7 @@
}
void DumpConfigData(CompilerDriver::ConfigData* cd, const std::string& type ){
- std::cerr << "Configuration Data For '" << cd->langName << "' (" << type
+ std::cerr << "Configuration Data For '" << cd->langName << "' (" << type
<< ")\n";
std::cerr << "PreProcessor: ";
DumpAction(&cd->PreProcessor);
@@ -64,7 +64,7 @@
/// This specifies the passes to run for OPT_FAST_COMPILE (-O1)
/// which should reduce the volume of code and make compilation
-/// faster. This is also safe on any llvm module.
+/// faster. This is also safe on any llvm module.
static const char* DefaultFastCompileOptimizations[] = {
"-simplifycfg", "-mem2reg", "-instcombine"
};
@@ -76,7 +76,7 @@
CompilerDriverImpl(ConfigDataProvider& confDatProv )
: cdp(&confDatProv)
, finalPhase(LINKING)
- , optLevel(OPT_FAST_COMPILE)
+ , optLevel(OPT_FAST_COMPILE)
, Flags(0)
, machine()
, LibraryPaths()
@@ -108,16 +108,16 @@
/// @name Methods
/// @{
public:
- virtual void setFinalPhase( Phases phase ) {
- finalPhase = phase;
+ virtual void setFinalPhase( Phases phase ) {
+ finalPhase = phase;
}
- virtual void setOptimization( OptimizationLevels level ) {
- optLevel = level;
+ virtual void setOptimization( OptimizationLevels level ) {
+ optLevel = level;
}
virtual void setDriverFlags( unsigned flags ) {
- Flags = flags & DRIVER_FLAGS_MASK;
+ Flags = flags & DRIVER_FLAGS_MASK;
}
virtual void setOutputMachine( const std::string& machineName ) {
@@ -194,7 +194,7 @@
}
}
- sys::Path MakeTempFile(const std::string& basename,
+ sys::Path MakeTempFile(const std::string& basename,
const std::string& suffix ) {
sys::Path result(TempDir);
if (!result.appendFile(basename))
@@ -204,8 +204,8 @@
return result;
}
- Action* GetAction(ConfigData* cd,
- const sys::Path& input,
+ Action* GetAction(ConfigData* cd,
+ const sys::Path& input,
const sys::Path& output,
Phases phase)
{
@@ -243,7 +243,7 @@
// Get specific options for each kind of action type
StringVector& addargs = AdditionalArgs[phase];
// Add specific options for each kind of action type
- action->args.insert(action->args.end(), addargs.begin(),
+ action->args.insert(action->args.end(), addargs.begin(),
addargs.end());
}
} else
@@ -263,7 +263,7 @@
case 'f':
if (*PI == "%fOpts%") {
if (!fOptions.empty())
- action->args.insert(action->args.end(), fOptions.begin(),
+ action->args.insert(action->args.end(), fOptions.begin(),
fOptions.end());
} else
found = false;
@@ -297,13 +297,13 @@
action->args.push_back(output.toString());
} else if (*PI == "%opt%") {
if (!isSet(EMIT_RAW_FLAG)) {
- if (cd->opts.size() > static_cast<unsigned>(optLevel) &&
+ if (cd->opts.size() > static_cast<unsigned>(optLevel) &&
!cd->opts[optLevel].empty())
- action->args.insert(action->args.end(),
+ action->args.insert(action->args.end(),
cd->opts[optLevel].begin(),
cd->opts[optLevel].end());
else
- throw std::string("Optimization options for level ") +
+ throw std::string("Optimization options for level ") +
utostr(unsigned(optLevel)) + " were not specified";
}
} else
@@ -335,7 +335,7 @@
case 'M':
if (*PI == "%Mopts%") {
if (!MOptions.empty())
- action->args.insert(action->args.end(), MOptions.begin(),
+ action->args.insert(action->args.end(), MOptions.begin(),
MOptions.end());
} else
found = false;
@@ -355,7 +355,7 @@
}
if (!found) {
// Did it even look like a substitution?
- if (PI->length()>1 && (*PI)[0] == '%' &&
+ if (PI->length()>1 && (*PI)[0] == '%' &&
(*PI)[PI->length()-1] == '%') {
throw std::string("Invalid substitution token: '") + *PI +
"' for command '" + pat->program.toString() + "'";
@@ -392,7 +392,7 @@
"' is not executable.");
// Invoke the program
- const char** Args = (const char**)
+ const char** Args = (const char**)
alloca(sizeof(const char*)*(action->args.size()+2));
Args[0] = action->program.toString().c_str();
for (unsigned i = 1; i != action->args.size(); ++i)
@@ -421,7 +421,7 @@
fullpath.setFile(link_item);
if (fullpath.readable())
return fullpath;
- for (PathVector::iterator PI = LibraryPaths.begin(),
+ for (PathVector::iterator PI = LibraryPaths.begin(),
PE = LibraryPaths.end(); PI != PE; ++PI) {
fullpath.setDirectory(PI->toString());
fullpath.appendFile(link_item);
@@ -431,11 +431,11 @@
fullpath.appendSuffix("a");
} else {
fullpath.appendSuffix("bc");
- if (fullpath.readable())
+ if (fullpath.readable())
return fullpath;
fullpath.elideSuffix();
fullpath.appendSuffix("o");
- if (fullpath.readable())
+ if (fullpath.readable())
return fullpath;
fullpath = *PI;
fullpath.appendFile(std::string("lib") + link_item);
@@ -472,7 +472,7 @@
// If we didn't find the file in any of the library search paths
// we have to bail. No where else to look.
if (fullpath.isEmpty()) {
- err =
+ err =
std::string("Can't find linkage item '") + link_item.toString() + "'";
return false;
}
@@ -494,7 +494,7 @@
while ( LI != LE ) {
if (!ProcessLinkageItem(sys::Path(*LI),set,err)) {
if (err.empty()) {
- err = std::string("Library '") + *LI +
+ err = std::string("Library '") + *LI +
"' is not valid for linking but is required by file '" +
fullpath.toString() + "'";
} else {
@@ -506,7 +506,7 @@
}
} else if (err.empty()) {
err = std::string(
- "The dependent libraries could not be extracted from '") +
+ "The dependent libraries could not be extracted from '") +
fullpath.toString();
return false;
}
@@ -534,7 +534,7 @@
std::cerr << "OutputMachine = " << machine << "\n";
InputList::const_iterator I = InpList.begin();
while ( I != InpList.end() ) {
- std::cerr << "Input: " << I->first << "(" << I->second
+ std::cerr << "Input: " << I->first << "(" << I->second
<< ")\n";
++I;
}
@@ -571,11 +571,11 @@
// Get the suffix of the file name
const std::string& ftype = I->second;
- // If its a library, bytecode file, or object file, save
- // it for linking below and short circuit the
+ // If its a library, bytecode file, or object file, save
+ // it for linking below and short circuit the
// pre-processing/translation/assembly phases
if (ftype.empty() || ftype == "o" || ftype == "bc" || ftype=="a") {
- // We shouldn't get any of these types of files unless we're
+ // We shouldn't get any of these types of files unless we're
// later going to link. Enforce this limit now.
if (finalPhase != LINKING) {
throw std::string(
@@ -593,8 +593,8 @@
// for this kind of file.
ConfigData* cd = cdp->ProvideConfigData(I->second);
if (cd == 0)
- throw std::string("Files of type '") + I->second +
- "' are not recognized.";
+ throw std::string("Files of type '") + I->second +
+ "' are not recognized.";
if (isSet(DEBUG_FLAG))
DumpConfigData(cd,I->second);
@@ -631,11 +631,11 @@
} else if (finalPhase == PREPROCESSING) {
throw cd->langName + " does not support pre-processing";
} else if (action.isSet(REQUIRED_FLAG)) {
- throw std::string("Don't know how to pre-process ") +
+ throw std::string("Don't know how to pre-process ") +
cd->langName + " files";
}
- // Short-circuit remaining actions if all they want is
+ // Short-circuit remaining actions if all they want is
// pre-processing
if (finalPhase == PREPROCESSING) { continue; };
@@ -653,7 +653,7 @@
actions.push_back(GetAction(cd,InFile,Output,TRANSLATION));
}
} else {
- sys::Path TempFile(MakeTempFile(I->first.getBasename(),"trans"));
+ sys::Path TempFile(MakeTempFile(I->first.getBasename(),"trans"));
actions.push_back(GetAction(cd,InFile,TempFile,TRANSLATION));
InFile = TempFile;
}
@@ -674,7 +674,7 @@
} else if (finalPhase == TRANSLATION) {
throw cd->langName + " does not support translation";
} else if (action.isSet(REQUIRED_FLAG)) {
- throw std::string("Don't know how to translate ") +
+ throw std::string("Don't know how to translate ") +
cd->langName + " files";
}
@@ -717,7 +717,7 @@
} else if (finalPhase == OPTIMIZATION) {
throw cd->langName + " does not support optimization";
} else if (action.isSet(REQUIRED_FLAG)) {
- throw std::string("Don't know how to optimize ") +
+ throw std::string("Don't know how to optimize ") +
cd->langName + " files";
}
}
@@ -762,7 +762,7 @@
// Put the action on the list
actions.push_back(action);
- // Short circuit the rest of the loop, we don't want to link
+ // Short circuit the rest of the loop, we don't want to link
continue;
}
@@ -816,7 +816,7 @@
// Add in all the linkage items we generated. This includes the
// output from the translation/optimization phases as well as any
// -l arguments specified.
- for (PathVector::const_iterator I=LinkageItems.begin(),
+ for (PathVector::const_iterator I=LinkageItems.begin(),
E=LinkageItems.end(); I != E; ++I )
link->args.push_back(I->toString());
Index: llvm/tools/llvmc/CompilerDriver.h
diff -u llvm/tools/llvmc/CompilerDriver.h:1.16 llvm/tools/llvmc/CompilerDriver.h:1.17
--- llvm/tools/llvmc/CompilerDriver.h:1.16 Sun Dec 19 12:00:56 2004
+++ llvm/tools/llvmc/CompilerDriver.h Thu Apr 21 18:59:45 2005
@@ -1,10 +1,10 @@
//===- CompilerDriver.h - Compiler Driver -----------------------*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
-// This file was developed by Reid Spencer and is distributed under the
+// This file was developed by Reid Spencer and is distributed under the
// University of Illinois Open Source License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file declares the CompilerDriver class which implements the bulk of the
@@ -23,7 +23,7 @@
/// The driver's purpose is to make it easier for compiler writers and users
/// of LLVM to utilize the compiler toolkits and LLVM toolset by learning only
/// the interface of one program (llvmc).
- ///
+ ///
/// @see llvmc.cpp
/// @brief The interface to the LLVM Compiler Driver.
class CompilerDriver {
@@ -43,7 +43,7 @@
enum Phases {
PREPROCESSING, ///< Source language combining, filtering, substitution
TRANSLATION, ///< Translate source -> LLVM bytecode/assembly
- OPTIMIZATION, ///< Optimize translation result
+ OPTIMIZATION, ///< Optimize translation result
ASSEMBLY, ///< Convert program to executable
LINKING, ///< Link bytecode and native code
NUM_PHASES ///< Always last!
@@ -92,7 +92,7 @@
struct ConfigData {
ConfigData();
std::string version; ///< The version number.
- std::string langName; ///< The name of the source language
+ std::string langName; ///< The name of the source language
StringTable opts; ///< The o10n options for each level
StringVector libpaths; ///< The library paths
Action PreProcessor; ///< PreProcessor command line
@@ -105,7 +105,7 @@
/// This pure virtual interface class defines the interface between the
/// CompilerDriver and other software that provides ConfigData objects to
/// it. The CompilerDriver must be configured to use an object of this
- /// type so it can obtain the configuration data.
+ /// type so it can obtain the configuration data.
/// @see setConfigDataProvider
/// @brief Configuration Data Provider interface
class ConfigDataProvider {
@@ -116,7 +116,7 @@
/// These flags control various actions of the compiler driver. They are
/// used by adding the needed flag values together and passing them to the
- /// compiler driver's setDriverFlags method.
+ /// compiler driver's setDriverFlags method.
/// @see setDriverFlags
/// @brief Driver specific flags
enum DriverFlags {
@@ -163,7 +163,7 @@
virtual void setOutputMachine(const std::string& machineName) = 0;
/// @brief Set the options for a given phase.
- virtual void setPhaseArgs(Phases phase, const StringVector& opts) = 0;
+ virtual void setPhaseArgs(Phases phase, const StringVector& opts) = 0;
/// @brief Set Library Paths
virtual void setIncludePaths(const StringVector& paths) = 0;
Index: llvm/tools/llvmc/ConfigLexer.h
diff -u llvm/tools/llvmc/ConfigLexer.h:1.11 llvm/tools/llvmc/ConfigLexer.h:1.12
--- llvm/tools/llvmc/ConfigLexer.h:1.11 Tue Nov 23 17:35:50 2004
+++ llvm/tools/llvmc/ConfigLexer.h Thu Apr 21 18:59:45 2005
@@ -1,10 +1,10 @@
//===- ConfigLexer.h - ConfigLexer Declarations -----------------*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
-// This file was developed by Reid Spencer and is distributed under the
+// This file was developed by Reid Spencer and is distributed under the
// University of Illinois Open Source License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file declares the types and data needed by ConfigLexer.l
@@ -37,7 +37,7 @@
}
virtual ~InputProvider();
virtual unsigned read(char *buf, unsigned max_size) = 0;
- virtual void error(const std::string& msg);
+ virtual void error(const std::string& msg);
virtual void checkErrors();
private:
@@ -62,7 +62,7 @@
FOPTS_SUBST, ///< The substitution item %fOpts%
IN_SUBST, ///< The substitution item %in%
INCLS_SUBST, ///< The substitution item %incls%
- INTEGER, ///< An integer
+ INTEGER, ///< An integer
LANG, ///< The name "lang" (and variants)
LIBPATHS, ///< The name "libpaths" (and variants)
LIBS, ///< The name "libs" (and variants)
Index: llvm/tools/llvmc/Configuration.cpp
diff -u llvm/tools/llvmc/Configuration.cpp:1.17 llvm/tools/llvmc/Configuration.cpp:1.18
--- llvm/tools/llvmc/Configuration.cpp:1.17 Fri Dec 10 18:14:15 2004
+++ llvm/tools/llvmc/Configuration.cpp Thu Apr 21 18:59:45 2005
@@ -1,10 +1,10 @@
//===- Configuration.cpp - Configuration Data Mgmt --------------*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
-// This file was developed by Reid Spencer and is distributed under the
+// This file was developed by Reid Spencer and is distributed under the
// University of Illinois Open Source License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file implements the parsing of configuration files for the LLVM Compiler
@@ -34,7 +34,7 @@
InputProvider::~InputProvider() {}
void InputProvider::error(const std::string& msg) {
- std::cerr << name << ":" << ConfigLexerState.lineNum << ": Error: " <<
+ std::cerr << name << ":" << ConfigLexerState.lineNum << ": Error: " <<
msg << "\n";
errCount++;
}
@@ -53,7 +53,7 @@
class FileInputProvider : public InputProvider {
public:
FileInputProvider(const std::string & fname)
- : InputProvider(fname)
+ : InputProvider(fname)
, F(fname.c_str()) {
ConfigLexerInput = this;
}
@@ -71,7 +71,7 @@
std::ifstream F;
};
- cl::opt<bool> DumpTokens("dump-tokens", cl::Optional, cl::Hidden,
+ cl::opt<bool> DumpTokens("dump-tokens", cl::Optional, cl::Hidden,
cl::init(false), cl::desc("Dump lexical tokens (debug use only)."));
struct Parser
@@ -90,14 +90,14 @@
InputProvider* provider;
CompilerDriver::ConfigData* confDat;
- inline int next() {
+ inline int next() {
token = Configlex();
- if (DumpTokens)
+ if (DumpTokens)
std::cerr << token << "\n";
return token;
}
- inline bool next_is_real() {
+ inline bool next_is_real() {
next();
return (token != EOLTOK) && (token != ERRORTOK) && (token != 0);
}
@@ -117,7 +117,7 @@
while (next_is_real()) {
switch (token ) {
case STRING :
- case OPTION :
+ case OPTION :
result += ConfigLexerState.StringVal;
break;
case SEPARATOR:
@@ -229,27 +229,27 @@
case LIBS:
parseLibs();
break;
- case NAME:
- confDat->langName = parseName();
+ case NAME:
+ confDat->langName = parseName();
break;
- case OPT1:
- parseOptionList(confDat->opts[CompilerDriver::OPT_FAST_COMPILE]);
+ case OPT1:
+ parseOptionList(confDat->opts[CompilerDriver::OPT_FAST_COMPILE]);
break;
- case OPT2:
- parseOptionList(confDat->opts[CompilerDriver::OPT_SIMPLE]);
+ case OPT2:
+ parseOptionList(confDat->opts[CompilerDriver::OPT_SIMPLE]);
break;
- case OPT3:
- parseOptionList(confDat->opts[CompilerDriver::OPT_AGGRESSIVE]);
+ case OPT3:
+ parseOptionList(confDat->opts[CompilerDriver::OPT_AGGRESSIVE]);
break;
- case OPT4:
- parseOptionList(confDat->opts[CompilerDriver::OPT_LINK_TIME]);
+ case OPT4:
+ parseOptionList(confDat->opts[CompilerDriver::OPT_LINK_TIME]);
break;
- case OPT5:
+ case OPT5:
parseOptionList(
confDat->opts[CompilerDriver::OPT_AGGRESSIVE_LINK_TIME]);
break;
- default:
- error("Expecting 'name' or 'optN' after 'lang.'");
+ default:
+ error("Expecting 'name' or 'optN' after 'lang.'");
break;
}
}
@@ -295,7 +295,7 @@
break;
}
next();
- } while (token != SPACE && token != EOFTOK && token != EOLTOK &&
+ } while (token != SPACE && token != EOFTOK && token != EOLTOK &&
token != ERRORTOK);
return !str.empty();
}
@@ -312,7 +312,7 @@
case SPACE:
next();
/* FALL THROUGH */
- default:
+ default:
{
std::string progname;
if (parseProgramName(progname))
@@ -402,7 +402,7 @@
if (next() != SEPARATOR)
error("Expecting '.'");
switch (next()) {
- case COMMAND:
+ case COMMAND:
parseCommand(confDat->Translator);
break;
case REQUIRED:
@@ -414,7 +414,7 @@
case PREPROCESSES:
if (parseBoolean())
confDat->Translator.set(CompilerDriver::PREPROCESSES_FLAG);
- else
+ else
confDat->Translator.clear(CompilerDriver::PREPROCESSES_FLAG);
break;
case OUTPUT:
@@ -464,8 +464,8 @@
confDat->Translator.clear(CompilerDriver::OUTPUT_IS_ASM_FLAG);
break;
default:
- error(std::string("Expecting 'command', 'preprocesses', "
- "'translates' or 'output' but found '") +
+ error(std::string("Expecting 'command', 'preprocesses', "
+ "'translates' or 'output' but found '") +
ConfigLexerState.StringVal + "' instead");
break;
}
@@ -509,7 +509,7 @@
case LINKER: parseLinker(); break;
case EOLTOK: break; // just ignore
case ERRORTOK:
- default:
+ default:
error("Invalid top level configuration item");
break;
}
@@ -548,7 +548,7 @@
confFile.setDirectory(conf);
confFile.appendFile(ftype);
if (!confFile.readable())
- throw std::string("Configuration file for '") + ftype +
+ throw std::string("Configuration file for '") + ftype +
"' is not available.";
} else {
// Try the user's home directory
@@ -569,7 +569,7 @@
confFile = sys::Path::GetLLVMDefaultConfigDir();
confFile.appendFile(ftype);
if (!confFile.readable()) {
- throw std::string("Configuration file for '") + ftype +
+ throw std::string("Configuration file for '") + ftype +
"' is not available.";
}
}
@@ -579,12 +579,12 @@
confFile = configDir;
confFile.appendFile(ftype);
if (!confFile.readable())
- throw std::string("Configuration file for '") + ftype +
+ throw std::string("Configuration file for '") + ftype +
"' is not available.";
}
FileInputProvider fip( confFile.toString() );
if (!fip.okay()) {
- throw std::string("Configuration file for '") + ftype +
+ throw std::string("Configuration file for '") + ftype +
"' is not available.";
}
result = new CompilerDriver::ConfigData();
@@ -603,7 +603,7 @@
Configurations.clear();
}
-CompilerDriver::ConfigData*
+CompilerDriver::ConfigData*
LLVMC_ConfigDataProvider::ProvideConfigData(const std::string& filetype) {
CompilerDriver::ConfigData* result = 0;
if (!Configurations.empty()) {
Index: llvm/tools/llvmc/Configuration.h
diff -u llvm/tools/llvmc/Configuration.h:1.6 llvm/tools/llvmc/Configuration.h:1.7
--- llvm/tools/llvmc/Configuration.h:1.6 Mon Oct 25 14:09:41 2004
+++ llvm/tools/llvmc/Configuration.h Thu Apr 21 18:59:45 2005
@@ -1,10 +1,10 @@
//===- Configuration.h - Configuration Data Mgmt ----------------*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
-// This file was developed by Reid Spencer and is distributed under the
+// This file was developed by Reid Spencer and is distributed under the
// University of Illinois Open Source License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file declares the LLVMC_ConfigDataProvider class which implements the
@@ -22,7 +22,7 @@
/// The driver's purpose is to make it easier for compiler writers and users
/// of LLVM to utilize the compiler toolkits and LLVM toolset by learning only
/// the interface of one program (llvmc).
- ///
+ ///
/// @see llvmc.cpp
/// @brief The interface to the LLVM Compiler Driver.
class LLVMC_ConfigDataProvider : public CompilerDriver::ConfigDataProvider {
@@ -35,12 +35,12 @@
/// @{
public:
/// @brief Provide the configuration data to the CompilerDriver.
- virtual CompilerDriver::ConfigData*
+ virtual CompilerDriver::ConfigData*
ProvideConfigData(const std::string& filetype);
/// @brief Allow the configuration directory to be set
- virtual void setConfigDir(const sys::Path& dirName) {
- configDir = dirName;
+ virtual void setConfigDir(const sys::Path& dirName) {
+ configDir = dirName;
}
private:
Index: llvm/tools/llvmc/llvmc.cpp
diff -u llvm/tools/llvmc/llvmc.cpp:1.23 llvm/tools/llvmc/llvmc.cpp:1.24
--- llvm/tools/llvmc/llvmc.cpp:1.23 Fri Feb 18 14:00:05 2005
+++ llvm/tools/llvmc/llvmc.cpp Thu Apr 21 18:59:45 2005
@@ -1,17 +1,17 @@
//===--- llvmc.cpp - The LLVM Compiler Driver -------------------*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file was developed by Reid Spencer and is distributed under the
// University of Illinois Open Source License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This tool provides a single point of access to the LLVM compilation tools.
// It has many options. To discover the options supported please refer to the
// tools' manual page (docs/CommandGuide/html/llvmc.html) or run the tool with
// the --help option.
-//
+//
//===------------------------------------------------------------------------===
#include "CompilerDriver.h"
@@ -28,7 +28,7 @@
//=== PHASE OPTIONS
//===------------------------------------------------------------------------===
cl::opt<CompilerDriver::Phases> FinalPhase(cl::Optional,
- cl::desc("Choose final phase of compilation:"),
+ cl::desc("Choose final phase of compilation:"),
cl::init(CompilerDriver::LINKING),
cl::values(
clEnumValN(CompilerDriver::PREPROCESSING,"E",
@@ -71,7 +71,7 @@
//===------------------------------------------------------------------------===
cl::list<std::string> PreprocessorToolOpts("Tpre", cl::ZeroOrMore,
- cl::desc("Pass specific options to the pre-processor"),
+ cl::desc("Pass specific options to the pre-processor"),
cl::value_desc("option"));
cl::alias PreprocessorToolOptsAlias("Wp,", cl::ZeroOrMore,
@@ -111,7 +111,7 @@
cl::desc("Pass through -W options to compiler tools"),
cl::value_desc("option"));
-cl::list<std::string> BOpt("B", cl::ZeroOrMore, cl::Prefix,
+cl::list<std::string> BOpt("B", cl::ZeroOrMore, cl::Prefix,
cl::desc("Specify path to find llvmc sub-tools"),
cl::value_desc("dir"));
@@ -126,7 +126,7 @@
cl::desc("Specify base name of libraries to link to"), cl::value_desc("lib"));
cl::list<std::string> Includes("I", cl::Prefix,
- cl::desc("Specify location to search for included source"),
+ cl::desc("Specify location to search for included source"),
cl::value_desc("dir"));
cl::list<std::string> Defines("D", cl::Prefix,
@@ -137,7 +137,7 @@
//=== OUTPUT OPTIONS
//===------------------------------------------------------------------------===
-cl::opt<std::string> OutputFilename("o",
+cl::opt<std::string> OutputFilename("o",
cl::desc("Override output filename"), cl::value_desc("file"));
cl::opt<std::string> OutputMachine("m", cl::Prefix,
@@ -169,10 +169,10 @@
cl::opt<bool> Verbose("verbose", cl::Optional, cl::init(false),
cl::desc("Print out each action taken"));
-cl::alias VerboseAlias("v", cl::Optional,
+cl::alias VerboseAlias("v", cl::Optional,
cl::desc("Alias for -verbose"), cl::aliasopt(Verbose));
-cl::opt<bool> Debug("debug", cl::Optional, cl::init(false),
+cl::opt<bool> Debug("debug", cl::Optional, cl::init(false),
cl::Hidden, cl::desc("Print out debugging information"));
cl::alias DebugAlias("d", cl::Optional,
@@ -258,7 +258,7 @@
try {
// Parse the command line options
- cl::ParseCommandLineOptions(argc, argv,
+ cl::ParseCommandLineOptions(argc, argv,
" LLVM Compiler Driver (llvmc)\n\n"
" This program provides easy invocation of the LLVM tool set\n"
" and other compiler tools.\n"
More information about the llvm-commits
mailing list