commit 399107a9365f40d82804be46a08820f72dbef6f5
author Greg Clayton <gclayton@apple.com> Wed Feb 13 23:57:48 2013 +0000
committer Greg Clayton <gclayton@apple.com> Wed Feb 13 23:57:48 2013 +0000
tree 995ad5ec7e370468053d18d6e12ff8306d9131a5
parent 090edf7e67226b32a478ea67e11d324f95090252

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

llvm-svn: 175108

lldb/source/Expression/ClangUtilityFunction.cpp

diff --git a/lldb/source/Expression/ClangUtilityFunction.cpp b/lldb/source/Expression/ClangUtilityFunction.cpp
index c259162..2f41ae9 100644
--- a/lldb/source/Expression/ClangUtilityFunction.cpp
+++ b/lldb/source/Expression/ClangUtilityFunction.cpp
@@ -22,39 +22,13 @@
 #include "lldb/Expression/ClangExpressionDeclMap.h"
 #include "lldb/Expression/ClangExpressionParser.h"
 #include "lldb/Expression/ClangUtilityFunction.h"
+#include "lldb/Expression/ExpressionSourceCode.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Target.h"
 
 using namespace lldb_private;
 
-static const char *g_global_defines =
-"#undef NULL                       \n"
-"#undef Nil                        \n"
-"#undef nil                        \n"
-"#undef YES                        \n"
-"#undef NO                         \n"
-"#define NULL ((int)0)             \n"
-"#define Nil ((Class)0)            \n"
-"#define nil ((id)0)               \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";
-
-
 //------------------------------------------------------------------
 /// Constructor
 ///
@@ -67,7 +41,7 @@
 ClangUtilityFunction::ClangUtilityFunction (const char *text, 
                                             const char *name) :
     ClangExpression (),
-    m_function_text (g_global_defines),
+    m_function_text (ExpressionSourceCode::g_expression_prefix),
     m_function_name (name)
 {
     if (text && text[0])