gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consistent argument names.

Browse Source
This commit is contained in:
Vassil Vassilev 2014-04-10 19:19:46 +02:00 committed by sftnight
parent ebad01a510
commit 6bb29c9130
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/cling/Interpreter/DynamicLibraryManager.h
View File

@ -51,11 +51,11 @@ namespace cling {
///\brief Concatenates current include paths and the system include paths
/// and performs a lookup for the filename.
///\param[in] filename - The filename being looked up
///\param[in] libStem - The filename being looked up
///
///\returns the canonical path to the file or empty string if not found
///
std::string lookupLibInPaths(llvm::StringRef filename) const;
std::string lookupLibInPaths(llvm::StringRef libStem) const;
///\brief Concatenates current include paths and the system include paths
@ -73,24 +73,24 @@ namespace cling {
///\brief Looks up a library taking into account the current include paths
/// and the system include paths.
///\param[in] fileStem - The filename being looked up
///\param[in] libStem - The filename being looked up
///
///\returns the canonical path to the file or empty string if not found
///
std::string lookupLibrary(llvm::StringRef fileStem) const;
std::string lookupLibrary(llvm::StringRef libStem) const;
///\brief Loads a shared library.
///
///\param [in] filename - The file to loaded.
///\param [in] libStem - The file to loaded.
///\param [in] permanent - If false, the file can be unloaded later.
///
///\returns kLoadLibSuccess on success, kLoadLibAlreadyLoaded if the library
/// was already loaded, kLoadLibError if the library cannot be found or any
/// other error was encountered.
///
LoadLibResult loadLibrary(const std::string& filename, bool permanent);
LoadLibResult loadLibrary(const std::string& libStem, bool permanent);
void unloadLibrary(llvm::StringRef lib);
void unloadLibrary(llvm::StringRef libStem);
///\brief Returns true if the file was a dynamic library and it was already
/// loaded.

34
lib/Interpreter/DynamicLibraryManager.cpp
View File

@ -179,7 +179,7 @@ namespace cling {
}
std::string
DynamicLibraryManager::lookupLibInPaths(llvm::StringRef filename) const {
DynamicLibraryManager::lookupLibInPaths(llvm::StringRef libStem) const {
llvm::SmallVector<std::string, 128>
Paths(m_Opts.LibSearchPath.begin(), m_Opts.LibSearchPath.end());
Paths.append(m_SystemSearchPaths.begin(), m_SystemSearchPaths.end());
@ -187,7 +187,7 @@ namespace cling {
for (llvm::SmallVectorImpl<std::string>::const_iterator
IPath = Paths.begin(), E = Paths.end();IPath != E; ++IPath) {
llvm::SmallString<512> ThisPath(*IPath); // FIXME: move alloc outside loop
llvm::sys::path::append(ThisPath, filename);
llvm::sys::path::append(ThisPath, libStem);
bool exists;
if (isSharedLib(ThisPath.str(), &exists))
return ThisPath.str();
@ -198,14 +198,14 @@ namespace cling {
}
std::string
DynamicLibraryManager::lookupLibMaybeAddExt(llvm::StringRef filename) const {
DynamicLibraryManager::lookupLibMaybeAddExt(llvm::StringRef libStem) const {
using namespace llvm::sys;
std::string foundDyLib = lookupLibInPaths(filename);
std::string foundDyLib = lookupLibInPaths(libStem);
if (foundDyLib.empty()) {
// Add DyLib extension:
llvm::SmallString<512> filenameWithExt(filename);
llvm::SmallString<512> filenameWithExt(libStem);
#if defined(LLVM_ON_UNIX)
#ifdef __APPLE__
llvm::SmallString<512>::iterator IStemEnd = filenameWithExt.end() - 1;
@ -248,23 +248,23 @@ namespace cling {
}
std::string
DynamicLibraryManager::lookupLibrary(llvm::StringRef fileStem) const {
llvm::SmallString<128> Absolute(fileStem);
DynamicLibraryManager::lookupLibrary(llvm::StringRef libStem) const {
llvm::SmallString<128> Absolute(libStem);
llvm::sys::fs::make_absolute(Absolute);
bool isAbsolute = fileStem == Absolute;
bool isAbsolute = libStem == Absolute;
// If it is an absolute path, don't try iterate over the paths.
if (isAbsolute) {
if (isSharedLib(fileStem))
return fileStem;
if (isSharedLib(libStem))
return libStem;
else
return "";
}
std::string foundName = lookupLibMaybeAddExt(fileStem);
if (foundName.empty() && !fileStem.startswith("lib")) {
std::string foundName = lookupLibMaybeAddExt(libStem);
if (foundName.empty() && !libStem.startswith("lib")) {
// try with "lib" prefix:
foundName = lookupLibMaybeAddExt("lib" + fileStem.str());
foundName = lookupLibMaybeAddExt("lib" + libStem.str());
}
if (isSharedLib(foundName))
@ -273,9 +273,9 @@ namespace cling {
}
DynamicLibraryManager::LoadLibResult
DynamicLibraryManager::loadLibrary(const std::string& filename,
DynamicLibraryManager::loadLibrary(const std::string& libStem,
bool permanent) {
std::string canonicalLoadedLib = lookupLibrary(filename);
std::string canonicalLoadedLib = lookupLibrary(libStem);
if (canonicalLoadedLib.empty())
return kLoadLibNotFound;
@ -309,8 +309,8 @@ namespace cling {
return kLoadLibSuccess;
}
void DynamicLibraryManager::unloadLibrary(llvm::StringRef lib) {
std::string canonicalLoadedLib = lookupLibrary(lib);
void DynamicLibraryManager::unloadLibrary(llvm::StringRef libStem) {
std::string canonicalLoadedLib = lookupLibrary(libStem);
if (!isLibraryLoaded(canonicalLoadedLib))
return;