Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-02-04 00:06:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace llvm::error_code with std::error_code.

Browse Source 
llvm-svn: 210776
This commit is contained in:
Rafael Espindola 2014-06-12 13:32:11 +00:00
parent 559dd851b6
commit 15c5784d3c
12 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang-tools-extra/clang-apply-replacements/include/clang-apply-replacements/Tooling/ApplyReplacements.h
View File

@ -65,7 +65,7 @@ FileToReplacementsMap;
/// ///
/// \returns An error_code indicating success or failure in navigating the /// \returns An error_code indicating success or failure in navigating the
/// directory structure. /// directory structure.
llvm::error_code std::error_code
collectReplacementsFromDirectory(const llvm::StringRef Directory, collectReplacementsFromDirectory(const llvm::StringRef Directory,
TUReplacements &TUs, TUReplacements &TUs,
TUReplacementFiles &TURFiles, TUReplacementFiles &TURFiles,

2
clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp
View File

@ -36,7 +36,7 @@ static void eatDiagnostics(const SMDiagnostic &, void *) {}
namespace clang { namespace clang {
namespace replace { namespace replace {
llvm::error_code std::error_code
collectReplacementsFromDirectory(const llvm::StringRef Directory, collectReplacementsFromDirectory(const llvm::StringRef Directory,
TUReplacements &TUs, TUReplacements &TUs,
TUReplacementFiles & TURFiles, TUReplacementFiles & TURFiles,

8
clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.h
View File

@ -29,16 +29,16 @@ public:
/// ///
/// Returns error_code::success() on successful parse of the strings or /// Returns error_code::success() on successful parse of the strings or
/// an error_code indicating the encountered error. /// an error_code indicating the encountered error.
llvm::error_code readListFromString(llvm::StringRef IncludeString, std::error_code readListFromString(llvm::StringRef IncludeString,
llvm::StringRef ExcludeString); llvm::StringRef ExcludeString);
/// \brief Read and parse the lists of paths from \a IncludeListFile /// \brief Read and parse the lists of paths from \a IncludeListFile
/// and \a ExcludeListFile. Each file should contain one path per line. /// and \a ExcludeListFile. Each file should contain one path per line.
/// ///
/// Returns error_code::success() on successful read and parse of both files /// Returns error_code::success() on successful read and parse of both files
/// or an error_code indicating the encountered error. /// or an error_code indicating the encountered error.
llvm::error_code readListFromFile(llvm::StringRef IncludeListFile, std::error_code readListFromFile(llvm::StringRef IncludeListFile,
llvm::StringRef ExcludeListFile); llvm::StringRef ExcludeListFile);
/// \brief Determine if the given path is in the list of include paths but /// \brief Determine if the given path is in the list of include paths but
/// not in the list of exclude paths. /// not in the list of exclude paths.

8
clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
View File

@ -62,15 +62,15 @@ namespace clang {
namespace tidy { namespace tidy {
/// \brief Parses -line-filter option and stores it to the \c Options. /// \brief Parses -line-filter option and stores it to the \c Options.
llvm::error_code parseLineFilter(const std::string &LineFilter, std::error_code parseLineFilter(const std::string &LineFilter,
clang::tidy::ClangTidyGlobalOptions &Options) { clang::tidy::ClangTidyGlobalOptions &Options) {
llvm::yaml::Input Input(LineFilter); llvm::yaml::Input Input(LineFilter);
Input >> Options.LineFilter; Input >> Options.LineFilter;
return Input.error(); return Input.error();
} }
llvm::error_code parseConfiguration(const std::string &Config, std::error_code parseConfiguration(const std::string &Config,
clang::tidy::ClangTidyOptions &Options) { clang::tidy::ClangTidyOptions &Options) {
llvm::yaml::Input Input(Config); llvm::yaml::Input Input(Config);
Input >> Options; Input >> Options;
return Input.error(); return Input.error();

8
clang-tools-extra/clang-tidy/ClangTidyOptions.h
View File

@ -89,12 +89,12 @@ private:
}; };
/// \brief Parses LineFilter from JSON and stores it to the \p Options. /// \brief Parses LineFilter from JSON and stores it to the \p Options.
llvm::error_code parseLineFilter(const std::string &LineFilter, std::error_code parseLineFilter(const std::string &LineFilter,
clang::tidy::ClangTidyGlobalOptions &Options); clang::tidy::ClangTidyGlobalOptions &Options);
/// \brief Parses configuration from JSON and stores it to the \p Options. /// \brief Parses configuration from JSON and stores it to the \p Options.
llvm::error_code parseConfiguration(const std::string &Config, std::error_code parseConfiguration(const std::string &Config,
clang::tidy::ClangTidyOptions &Options); clang::tidy::ClangTidyOptions &Options);
} // end namespace tidy } // end namespace tidy
} // end namespace clang } // end namespace clang

2
clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
View File

@ -109,7 +109,7 @@ int main(int argc, const char **argv) {
CommonOptionsParser OptionsParser(argc, argv, ClangTidyCategory); CommonOptionsParser OptionsParser(argc, argv, ClangTidyCategory);
clang::tidy::ClangTidyGlobalOptions GlobalOptions; clang::tidy::ClangTidyGlobalOptions GlobalOptions;
if (llvm::error_code Err = if (std::error_code Err =
clang::tidy::parseLineFilter(LineFilter, GlobalOptions)) { clang::tidy::parseLineFilter(LineFilter, GlobalOptions)) {
llvm::errs() << "Invalid LineFilter: " << Err.message() << "\n\nUsage:\n"; llvm::errs() << "Invalid LineFilter: " << Err.message() << "\n\nUsage:\n";
llvm::cl::PrintHelpMessage(/*Hidden=*/false, /*Categorized=*/true); llvm::cl::PrintHelpMessage(/*Hidden=*/false, /*Categorized=*/true);

2
clang-tools-extra/module-map-checker/ModuleMapChecker.h
View File

@ -137,7 +137,7 @@ public:
/// \returns 0 if there were no errors or warnings, 1 if there /// \returns 0 if there were no errors or warnings, 1 if there
/// were warnings, 2 if any other problem, such as a bad /// were warnings, 2 if any other problem, such as a bad
/// module map path argument was specified. /// module map path argument was specified.
llvm::error_code doChecks(); std::error_code doChecks();
// The following functions are called by doChecks. // The following functions are called by doChecks.

2
clang-tools-extra/unittests/clang-modernize/IncludeDirectivesTest.cpp
View File

@ -66,7 +66,7 @@ public:
/// refer to the headers by using '\<FileName\>'. /// refer to the headers by using '\<FileName\>'.
std::string makeHeaderFileName(StringRef FileName) const { std::string makeHeaderFileName(StringRef FileName) const {
SmallString<128> Path; SmallString<128> Path;
llvm::error_code EC = llvm::sys::fs::current_path(Path); std::error_code EC = llvm::sys::fs::current_path(Path);
assert(!EC); assert(!EC);
(void)EC; (void)EC;

16
clang-tools-extra/unittests/clang-modernize/IncludeExcludeTest.cpp
View File

@ -16,11 +16,11 @@
TEST(IncludeExcludeTest, ParseString) { TEST(IncludeExcludeTest, ParseString) {
IncludeExcludeInfo IEManager; IncludeExcludeInfo IEManager;
llvm::error_code Err = IEManager.readListFromString( std::error_code Err = IEManager.readListFromString(
/*include=*/ "a,b/b2,c/c2,d/../d2/../d3", /*include=*/ "a,b/b2,c/c2,d/../d2/../d3",
/*exclude=*/ "a/af.cpp,a/a2,b/b2/b2f.cpp,c/c2"); /*exclude=*/ "a/af.cpp,a/a2,b/b2/b2f.cpp,c/c2");
ASSERT_EQ(Err, llvm::error_code()); ASSERT_EQ(Err, std::error_code());
// If the file does not appear on the include list then it is not safe to // If the file does not appear on the include list then it is not safe to
// transform. Files are not safe to transform by default. // transform. Files are not safe to transform by default.
@ -61,11 +61,11 @@ TEST(IncludeExcludeTest, ParseString) {
TEST(IncludeExcludeTest, ParseStringCases) { TEST(IncludeExcludeTest, ParseStringCases) {
IncludeExcludeInfo IEManager; IncludeExcludeInfo IEManager;
llvm::error_code Err = IEManager.readListFromString( std::error_code Err = IEManager.readListFromString(
/*include=*/ "a/.,b/b2/,c/c2/c3/../../c4/,d/d2/./d3/,/e/e2/.", /*include=*/ "a/.,b/b2/,c/c2/c3/../../c4/,d/d2/./d3/,/e/e2/.",
/*exclude=*/ ""); /*exclude=*/ "");
ASSERT_EQ(Err, llvm::error_code()); ASSERT_EQ(Err, std::error_code());
EXPECT_TRUE(IEManager.isFileIncluded("a/f.cpp")); EXPECT_TRUE(IEManager.isFileIncluded("a/f.cpp"));
EXPECT_TRUE(IEManager.isFileIncluded("b/b2/f.cpp")); EXPECT_TRUE(IEManager.isFileIncluded("b/b2/f.cpp"));
@ -123,10 +123,10 @@ TEST(IncludeExcludeFileTest, UNIXFile) {
ASSERT_NO_FATAL_FAILURE(UnixFiles.CreateFiles(/* UnixMode= */true)); ASSERT_NO_FATAL_FAILURE(UnixFiles.CreateFiles(/* UnixMode= */true));
IncludeExcludeInfo IEManager; IncludeExcludeInfo IEManager;
llvm::error_code Err = IEManager.readListFromFile( std::error_code Err = IEManager.readListFromFile(
UnixFiles.IncludeDataPath.c_str(), UnixFiles.ExcludeDataPath.c_str()); UnixFiles.IncludeDataPath.c_str(), UnixFiles.ExcludeDataPath.c_str());
ASSERT_EQ(Err, llvm::error_code()); ASSERT_EQ(Err, std::error_code());
EXPECT_FALSE(IEManager.isFileIncluded("f.cpp")); EXPECT_FALSE(IEManager.isFileIncluded("f.cpp"));
EXPECT_TRUE(IEManager.isFileIncluded("a/f.cpp")); EXPECT_TRUE(IEManager.isFileIncluded("a/f.cpp"));
@ -138,10 +138,10 @@ TEST(IncludeExcludeFileTest, DOSFile) {
ASSERT_NO_FATAL_FAILURE(DOSFiles.CreateFiles(/* UnixMode= */false)); ASSERT_NO_FATAL_FAILURE(DOSFiles.CreateFiles(/* UnixMode= */false));
IncludeExcludeInfo IEManager; IncludeExcludeInfo IEManager;
llvm::error_code Err = IEManager.readListFromFile( std::error_code Err = IEManager.readListFromFile(
DOSFiles.IncludeDataPath.c_str(), DOSFiles.ExcludeDataPath.c_str()); DOSFiles.IncludeDataPath.c_str(), DOSFiles.ExcludeDataPath.c_str());
ASSERT_EQ(Err, llvm::error_code()); ASSERT_EQ(Err, std::error_code());
EXPECT_FALSE(IEManager.isFileIncluded("f.cpp")); EXPECT_FALSE(IEManager.isFileIncluded("f.cpp"));
EXPECT_TRUE(IEManager.isFileIncluded("a/f.cpp")); EXPECT_TRUE(IEManager.isFileIncluded("a/f.cpp"));

4
clang-tools-extra/unittests/clang-modernize/TransformTest.cpp
View File

@ -124,7 +124,7 @@ TEST(Transform, Timings) {
// file anyway. What is important is that we have an absolute path with which // file anyway. What is important is that we have an absolute path with which
// to use with mapVirtualFile(). // to use with mapVirtualFile().
SmallString<128> CurrentDir; SmallString<128> CurrentDir;
llvm::error_code EC = llvm::sys::fs::current_path(CurrentDir); std::error_code EC = llvm::sys::fs::current_path(CurrentDir);
assert(!EC); assert(!EC);
(void)EC; (void)EC;
@ -237,7 +237,7 @@ TEST(Transform, isFileModifiable) {
// file anyway. What is important is that we have an absolute path with which // file anyway. What is important is that we have an absolute path with which
// to use with mapVirtualFile(). // to use with mapVirtualFile().
SmallString<128> CurrentDir; SmallString<128> CurrentDir;
llvm::error_code EC = llvm::sys::fs::current_path(CurrentDir); std::error_code EC = llvm::sys::fs::current_path(CurrentDir);
assert(!EC); assert(!EC);
(void)EC; (void)EC;

10
clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp
View File

@ -31,7 +31,7 @@ TEST(ParseLineFilter, InvalidFilter) {
TEST(ParseLineFilter, ValidFilter) { TEST(ParseLineFilter, ValidFilter) {
ClangTidyGlobalOptions Options; ClangTidyGlobalOptions Options;
llvm::error_code Error = parseLineFilter( std::error_code Error = parseLineFilter(
"[{\"name\":\"file1.cpp\",\"lines\":[[3,15],[20,30],[42,42]]}," "[{\"name\":\"file1.cpp\",\"lines\":[[3,15],[20,30],[42,42]]},"
"{\"name\":\"file2.h\"}," "{\"name\":\"file2.h\"},"
"{\"name\":\"file3.cc\",\"lines\":[[100,1000]]}]", "{\"name\":\"file3.cc\",\"lines\":[[100,1000]]}]",
@ -56,10 +56,10 @@ TEST(ParseLineFilter, ValidFilter) {
TEST(ParseConfiguration, ValidConfiguration) { TEST(ParseConfiguration, ValidConfiguration) {
ClangTidyOptions Options; ClangTidyOptions Options;
llvm::error_code Error = parseConfiguration("Checks: \"-*,misc-*\"\n" std::error_code Error = parseConfiguration("Checks: \"-*,misc-*\"\n"
"HeaderFilterRegex: \".*\"\n" "HeaderFilterRegex: \".*\"\n"
"AnalyzeTemporaryDtors: true\n", "AnalyzeTemporaryDtors: true\n",
Options); Options);
EXPECT_FALSE(Error); EXPECT_FALSE(Error);
EXPECT_EQ("-*,misc-*", Options.Checks); EXPECT_EQ("-*,misc-*", Options.Checks);
EXPECT_EQ(".*", Options.HeaderFilterRegex); EXPECT_EQ(".*", Options.HeaderFilterRegex);

2
clang-tools-extra/unittests/include/common/Utility.h
View File

@ -12,7 +12,7 @@
// FIXME: copied from unittests/Support/Path.cpp // FIXME: copied from unittests/Support/Path.cpp
#define ASSERT_NO_ERROR(x) \ #define ASSERT_NO_ERROR(x) \
if (llvm::error_code ASSERT_NO_ERROR_ec = x) { \ if (std::error_code ASSERT_NO_ERROR_ec = x) { \
llvm::SmallString<128> MessageStorage; \ llvm::SmallString<128> MessageStorage; \
llvm::raw_svector_ostream Message(MessageStorage); \ llvm::raw_svector_ostream Message(MessageStorage); \
Message << #x ": did not return errc::success.\n" \ Message << #x ": did not return errc::success.\n" \