carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 21:30:12 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Prefix most macro names with CARBON_ (#1232)

Browse Source 
I'm doing this to avoid macro name conflicts, following https://google.github.io/styleguide/cppguide.html#Preprocessor_Macros: "If you do export a macro from a header, it must have a globally unique name. To achieve this, it must be named with a prefix consisting of your project's namespace name (but upper case)."

Commands run:

```
sed -i 's/\(DCHECK\|CHECK\|FATAL\|MAKE_UNIQUE_NAME\|MAKE_UNIQUE_NAME_IMPL\|RAW_EXITING_STREAM\|RETURN_IF_ERROR\|RETURN_IF_ERROR_IMPL\|ASSIGN_OR_RETURN\|ASSIGN_OR_RETURN_IMPL\|DIAGNOSTIC_KIND\|RETURN_IF_STACK_LIMITED\)(/CARBON_\1(/g' $(git ls-files *.cpp *.h *.lpp *.ypp *.def ':!third_party')
sed -i 's/#undef DIAGNOSTIC_KIND/#undef CARBON_DIAGNOSTIC_KIND/' toolchain/diagnostics/diagnostic_registry.def
```

Note this isn't *quite* everything, but it's intended to be a large pass at everything:

```
╚╡git grep '#define ' *.cpp *.h *.lpp *.ypp *.def ':!third_party' | grep -v '#define CARBON' | grep -v _H_
explorer/syntax/lexer.lpp:  #define YY_USER_ACTION                                             \
explorer/syntax/lexer.lpp:  #define SIMPLE_TOKEN(name) \
explorer/syntax/lexer.lpp:  #define ARG_TOKEN(name, arg) \
explorer/syntax/parse_and_lex_context.h:#define YY_DECL                                                         \
migrate_cpp/cpp_refactoring/var_decl.cpp:#define ABSTRACT_TYPE(Class, Base)
migrate_cpp/cpp_refactoring/var_decl.cpp:#define TYPE(Class, Base)     \
```

We may in particular want to do a pass to clean up #ifdef guards and make them be CARBON_ rooted.
This commit is contained in:
Jon Meow
2022-05-06 15:30:25 -07:00
committed by GitHub
parent c4fecf720f
commit af694b97cb
57 changed files with 869 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/check_test.cpp
+7 -7
View File
@@ -9,11 +9,11 @@
namespace Carbon::Testing {
namespace {
TEST(CheckTest, CheckTrue) { CHECK(true); }
TEST(CheckTest, CheckTrue) { CARBON_CHECK(true); }
TEST(CheckTest, CheckFalse) {
// TODO: figure out why we can't use \\d+ instead of .+ in these patterns.
ASSERT_DEATH({ CHECK(false); },
ASSERT_DEATH({ CARBON_CHECK(false); },
"Stack trace:\n"
".+\n"
"CHECK failure at common/check_test.cpp:.+: false\n");
@@ -25,12 +25,12 @@ TEST(CheckTest, CheckTrueCallbackNotUsed) {
called = true;
return "called";
};
CHECK(true) << callback();
CARBON_CHECK(true) << callback();
EXPECT_FALSE(called);
}
TEST(CheckTest, CheckFalseMessage) {
ASSERT_DEATH({ CHECK(false) << "msg"; },
ASSERT_DEATH({ CARBON_CHECK(false) << "msg"; },
"CHECK failure at common/check_test.cpp:.+: false: msg\n");
}
@@ -38,15 +38,15 @@ TEST(CheckTest, CheckOutputForms) {
const char msg[] = "msg";
std::string str = "str";
int i = 1;
CHECK(true) << msg << str << i << 0;
CARBON_CHECK(true) << msg << str << i << 0;
}
TEST(CheckTest, Fatal) {
ASSERT_DEATH({ FATAL() << "msg"; },
ASSERT_DEATH({ CARBON_FATAL() << "msg"; },
"FATAL failure at common/check_test.cpp:.+: msg\n");
}
auto FatalNoReturnRequired() -> int { FATAL() << "msg"; }
auto FatalNoReturnRequired() -> int { CARBON_FATAL() << "msg"; }
TEST(ErrorTest, FatalNoReturnRequired) {
ASSERT_DEATH({ FatalNoReturnRequired(); },