caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Centralized the expression prefixes that are used for both expressions and utility functions.

Browse Source 
llvm-svn: 175108
This commit is contained in:
Greg Clayton
2013-02-13 23:57:48 +00:00
parent 090edf7e67
commit 399107a936
3 changed files with 35 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lldb/source/Expression/ExpressionSourceCode.cpp
View File

@@ -13,31 +13,33 @@
using namespace lldb_private;
static const char *global_defines =
"#undef NULL \n"
"#undef Nil \n"
"#undef nil \n"
"#undef YES \n"
"#undef NO \n"
"#define NULL (__null) \n"
"#define Nil (__null) \n"
"#define nil (__null) \n"
"#define YES ((BOOL)1) \n"
"#define NO ((BOOL)0) \n"
"typedef signed char BOOL; \n"
"typedef signed __INT8_TYPE__ int8_t;\n"
"typedef unsigned __INT8_TYPE__ uint8_t;\n"
"typedef signed __INT16_TYPE__ int16_t;\n"
"typedef unsigned __INT16_TYPE__ uint16_t;\n"
"typedef signed __INT32_TYPE__ int32_t;\n"
"typedef unsigned __INT32_TYPE__ uint32_t;\n"
"typedef signed __INT64_TYPE__ int64_t;\n"
"typedef unsigned __INT64_TYPE__ uint64_t;\n"
"typedef signed __INTPTR_TYPE__ intptr_t;\n"
"typedef unsigned __INTPTR_TYPE__ uintptr_t;\n"
"typedef __SIZE_TYPE__ size_t; \n"
"typedef __PTRDIFF_TYPE__ ptrdiff_t;\n"
"typedef unsigned short unichar;\n";
const char *
ExpressionSourceCode::g_expression_prefix = R"(
#undef NULL
#undef Nil
#undef nil
#undef YES
#undef NO
#define NULL (__null)
#define Nil (__null)
#define nil (__null)
#define YES ((BOOL)1)
#define NO ((BOOL)0)
typedef signed char BOOL;
typedef signed __INT8_TYPE__ int8_t;
typedef unsigned __INT8_TYPE__ uint8_t;
typedef signed __INT16_TYPE__ int16_t;
typedef unsigned __INT16_TYPE__ uint16_t;
typedef signed __INT32_TYPE__ int32_t;
typedef unsigned __INT32_TYPE__ uint32_t;
typedef signed __INT64_TYPE__ int64_t;
typedef unsigned __INT64_TYPE__ uint64_t;
typedef signed __INTPTR_TYPE__ intptr_t;
typedef unsigned __INTPTR_TYPE__ uintptr_t;
typedef __SIZE_TYPE__ size_t;
typedef __PTRDIFF_TYPE__ ptrdiff_t;
typedef unsigned short unichar;
)";
bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrapping_language, bool const_object, bool static_method) const
@@ -69,7 +71,7 @@ bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrappi
" %s; \n"
"} \n",
m_prefix.c_str(),
global_defines,
g_expression_prefix,
m_name.c_str(),
m_body.c_str());
break;
@@ -82,7 +84,7 @@ bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrappi
" %s; \n"
"} \n",
m_prefix.c_str(),
global_defines,
g_expression_prefix,
m_name.c_str(),
(const_object ? "const" : ""),
m_body.c_str());
@@ -102,7 +104,7 @@ bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrappi
"} \n"
"@end \n",
m_prefix.c_str(),
global_defines,
g_expression_prefix,
m_name.c_str(),
m_name.c_str(),
m_body.c_str());
@@ -121,7 +123,7 @@ bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrappi
"} \n"
"@end \n",
m_prefix.c_str(),
global_defines,
g_expression_prefix,
m_name.c_str(),
m_name.c_str(),
m_body.c_str());