[Lldb-commits] [lldb] r185488 - Import the builtin type prefix before we import the user expression prefix so that the user expression prefix can use the uint, int, size_t, and other types without having to define them.

[Greg Clayton]

Author: gclayton
Date: Tue Jul  2 19:07:54 2013
New Revision: 185488

URL: http://llvm.org/viewvc/llvm-project?rev=185488&view=rev
Log:
Import the builtin type prefix before we import the user expression prefix so that the user expression prefix can use the uint, int, size_t, and other types without having to define them.


Modified:
    lldb/trunk/source/Expression/ExpressionSourceCode.cpp

Modified: lldb/trunk/source/Expression/ExpressionSourceCode.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ExpressionSourceCode.cpp?rev=185488&r1=185487&r2=185488&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ExpressionSourceCode.cpp (original)
+++ lldb/trunk/source/Expression/ExpressionSourceCode.cpp Tue Jul  2 19:07:54 2013
@@ -70,8 +70,8 @@ bool ExpressionSourceCode::GetText (std:
                                "{                              \n"
                                "    %s;                        \n" 
                                "}                              \n",
-                               m_prefix.c_str(),
                                g_expression_prefix,
+                               m_prefix.c_str(),
                                m_name.c_str(),
                                m_body.c_str());
             break;
@@ -83,8 +83,8 @@ bool ExpressionSourceCode::GetText (std:
                                "{                                      \n"
                                "    %s;                                \n" 
                                "}                                      \n",
-                               m_prefix.c_str(),
                                g_expression_prefix,
+                               m_prefix.c_str(),
                                m_name.c_str(),
                                (const_object ? "const" : ""),
                                m_body.c_str());
@@ -103,8 +103,8 @@ bool ExpressionSourceCode::GetText (std:
                                    "    %s;                                                 \n"
                                    "}                                                       \n"
                                    "@end                                                    \n",
-                                   m_prefix.c_str(),
                                    g_expression_prefix,
+                                   m_prefix.c_str(),
                                    m_name.c_str(),
                                    m_name.c_str(),
                                    m_body.c_str());
@@ -122,8 +122,8 @@ bool ExpressionSourceCode::GetText (std:
                                    "    %s;                                                \n"
                                    "}                                                      \n"
                                    "@end                                                   \n",
-                                   m_prefix.c_str(),
                                    g_expression_prefix,
+                                   m_prefix.c_str(),
                                    m_name.c_str(),
                                    m_name.c_str(),
                                    m_body.c_str());