summaryrefslogtreecommitdiffstats
path: root/lldb/source/Expression/ExpressionSourceCode.cpp
diff options
context:
space:
mode:
authorSean Callanan <scallanan@apple.com>2012-05-31 17:49:31 +0000
committerSean Callanan <scallanan@apple.com>2012-05-31 17:49:31 +0000
commit0c5aabc2c7f1612f9c5b51a1744eb3b9b3d0a740 (patch)
tree311749b52c29c5345c1d5eeca310ad5683b16704 /lldb/source/Expression/ExpressionSourceCode.cpp
parent4f203ea34b3be825e019d173bf14c7577b608ea2 (diff)
downloadbcm5719-llvm-0c5aabc2c7f1612f9c5b51a1744eb3b9b3d0a740.tar.gz
bcm5719-llvm-0c5aabc2c7f1612f9c5b51a1744eb3b9b3d0a740.zip
Made nil resolve as (id)0 and not be looked up
(which regularly conflicts with existing symbols in Objective-C). llvm-svn: 157758
Diffstat (limited to 'lldb/source/Expression/ExpressionSourceCode.cpp')
-rw-r--r--lldb/source/Expression/ExpressionSourceCode.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/lldb/source/Expression/ExpressionSourceCode.cpp b/lldb/source/Expression/ExpressionSourceCode.cpp
index 1d1c2f1a6ab..7004d28fa4c 100644
--- a/lldb/source/Expression/ExpressionSourceCode.cpp
+++ b/lldb/source/Expression/ExpressionSourceCode.cpp
@@ -37,6 +37,8 @@ bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrappi
wrap_stream.Printf("%s \n"
"#undef NULL \n"
"#define NULL 0 \n"
+ "#undef nil \n"
+ "#define nil (id)0 \n"
"typedef unsigned short unichar;\n"
"void \n"
"%s(void *$__lldb_arg) \n"
@@ -51,6 +53,8 @@ bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrappi
wrap_stream.Printf("%s \n"
"#undef NULL \n"
"#define NULL 0 \n"
+ "#undef nil \n"
+ "#define nil (id)0 \n"
"typedef unsigned short unichar; \n"
"void \n"
"$__lldb_class::%s(void *$__lldb_arg) %s\n"
@@ -68,6 +72,8 @@ bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrappi
wrap_stream.Printf("%s \n"
"#undef NULL \n"
"#define NULL 0 \n"
+ "#undef nil \n"
+ "#define nil (id)0 \n"
"typedef unsigned short unichar; \n"
"@interface $__lldb_objc_class ($__lldb_category) \n"
"+(void)%s:(void *)$__lldb_arg; \n"
@@ -88,6 +94,8 @@ bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrappi
wrap_stream.Printf("%s \n"
"#undef NULL \n"
"#define NULL 0 \n"
+ "#undef nil \n"
+ "#define nil (id)0 \n"
"typedef unsigned short unichar; \n"
"@interface $__lldb_objc_class ($__lldb_category) \n"
"-(void)%s:(void *)$__lldb_arg; \n"
OpenPOWER on IntegriCloud