Convert llvmc to use the lib/System interface instead of directly
using Unix operating system calls.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16089 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvmc/Configuration.cpp b/tools/llvmc/Configuration.cpp
index 4770875..a8c6791 100644
--- a/tools/llvmc/Configuration.cpp
+++ b/tools/llvmc/Configuration.cpp
@@ -90,19 +90,19 @@
InputProvider* provider;
CompilerDriver::ConfigData* confDat;
- int next() {
+ inline int next() {
token = Configlex();
if (DumpTokens)
std::cerr << token << "\n";
return token;
}
- bool next_is_real() {
+ inline bool next_is_real() {
next();
return (token != EOLTOK) && (token != ERRORTOK) && (token != 0);
}
- void eatLineRemnant() {
+ inline void eatLineRemnant() {
while (next_is_real()) ;
}
@@ -162,6 +162,8 @@
case STATS_SUBST: optList.push_back("%stats%"); break;
case OPT_SUBST: optList.push_back("%opt%"); break;
case TARGET_SUBST: optList.push_back("%target%"); break;
+ case FORCE_SUBST: optList.push_back("%force%"); break;
+ case VERBOSE_SUBST: optList.push_back("%verbose%"); break;
default:
return false;
}
@@ -229,7 +231,7 @@
action.args.clear();
} else {
if (token == STRING || token == OPTION) {
- action.program = ConfigLexerState.StringVal;
+ action.program.set_file(ConfigLexerState.StringVal);
} else {
error("Expecting a program name");
}
@@ -415,42 +417,46 @@
CompilerDriver::ConfigData*
LLVMC_ConfigDataProvider::ReadConfigData(const std::string& ftype) {
CompilerDriver::ConfigData* result = 0;
- std::string dir_name;
- if (configDir.empty()) {
+ sys::Path confFile;
+ if (configDir.is_empty()) {
// Try the environment variable
const char* conf = getenv("LLVM_CONFIG_DIR");
if (conf) {
- dir_name = conf;
- dir_name += "/";
- if (!::sys::FileIsReadable(dir_name + ftype))
+ confFile.set_directory(conf);
+ confFile.append_file(ftype);
+ if (!confFile.readable())
throw "Configuration file for '" + ftype + "' is not available.";
} else {
// Try the user's home directory
- const char* home = getenv("HOME");
- if (home) {
- dir_name = home;
- dir_name += "/.llvm/etc/";
- if (!::sys::FileIsReadable(dir_name + ftype)) {
- // Okay, try the LLVM installation directory
- dir_name = LLVM_ETCDIR;
- dir_name += "/";
- if (!::sys::FileIsReadable(dir_name + ftype)) {
- // Okay, try the "standard" place
- dir_name = "/etc/llvm/";
- if (!::sys::FileIsReadable(dir_name + ftype)) {
- throw "Configuration file for '" + ftype + "' is not available.";
- }
+ confFile = sys::Path::GetUserHomeDirectory();
+ if (!confFile.is_empty()) {
+ confFile.append_directory(".llvm");
+ confFile.append_directory("etc");
+ confFile.append_file(ftype);
+ if (!confFile.readable())
+ confFile.clear();
+ }
+ if (!confFile.is_empty()) {
+ // Okay, try the LLVM installation directory
+ confFile = sys::Path::GetLLVMConfigDir();
+ confFile.append_file(ftype);
+ if (!confFile.readable()) {
+ // Okay, try the "standard" place
+ confFile = sys::Path::GetLLVMDefaultConfigDir();
+ confFile.append_file(ftype);
+ if (!confFile.readable()) {
+ throw "Configuration file for '" + ftype + "' is not available.";
}
}
}
}
} else {
- dir_name = configDir + "/";
- if (!::sys::FileIsReadable(dir_name + ftype)) {
+ confFile = configDir;
+ confFile.append_file(ftype);
+ if (!confFile.readable())
throw "Configuration file for '" + ftype + "' is not available.";
- }
}
- FileInputProvider fip( dir_name + ftype );
+ FileInputProvider fip( confFile.get() );
if (!fip.okay()) {
throw "Configuration file for '" + ftype + "' is not available.";
}
@@ -459,13 +465,6 @@
return result;
}
-LLVMC_ConfigDataProvider::LLVMC_ConfigDataProvider()
- : Configurations()
- , configDir()
-{
- Configurations.clear();
-}
-
LLVMC_ConfigDataProvider::~LLVMC_ConfigDataProvider()
{
ConfigDataMap::iterator cIt = Configurations.begin();
@@ -491,7 +490,7 @@
// The configuration data doesn't exist, we have to go read it.
result = ReadConfigData(filetype);
// If we got one, cache it
- if ( result != 0 )
+ if (result != 0)
Configurations.insert(std::make_pair(filetype,result));
}
return result; // Might return 0