1 files changed, 21 insertions, 111 deletions

diff --git a/lldb/source/Expression/ClangPersistentVariables.cpp b/lldb/source/Expression/ClangPersistentVariables.cpp
index 7e1664889cc..f014811fb17 100644
--- a/lldb/source/Expression/ClangPersistentVariables.cpp
+++ b/lldb/source/Expression/ClangPersistentVariables.cpp
@@ -15,119 +15,10 @@
 
 using namespace lldb_private;
 
-Error
-ClangPersistentVariable::Print (Stream &output_stream,
-                                ExecutionContext &exe_ctx,
-                                lldb::Format format,
-                                bool show_types,
-                                bool show_summary,
-                                bool verbose)
-{
-    Error err;
-    
-    Value val;
-    
-    clang::ASTContext *ast_context = m_user_type.GetASTContext();
-    
-    val.SetContext (Value::eContextTypeOpaqueClangQualType, m_user_type.GetOpaqueQualType ());
-    val.SetValueType (Value::eValueTypeHostAddress);
-    val.GetScalar() = (uint64_t)Data ();
-    
-    val.ResolveValue (&exe_ctx, ast_context);
-    
-    if (val.GetContextType () == Value::eContextTypeInvalid &&
-        val.GetValueType () == Value::eValueTypeScalar &&
-        format == lldb::eFormatDefault)
-    {
-        // The expression result is just a scalar with no special formatting
-        val.GetScalar ().GetValue (&output_stream, show_types);
-        output_stream.EOL ();
-        return err;
-    }
-    
-    // The expression result is more complext and requires special handling
-    DataExtractor data;
-    Error expr_error = val.GetValueAsData (&exe_ctx, ast_context, data, 0);
-    
-    if (!expr_error.Success ())
-    {
-        err.SetErrorToGenericError ();
-        err.SetErrorStringWithFormat ("Couldn't resolve result value: %s", expr_error.AsCString ());
-        return err;
-    }
-    
-    if (format == lldb::eFormatDefault)
-        format = val.GetValueDefaultFormat ();
-    
-    void *clang_type = val.GetValueOpaqueClangQualType ();
-    
-    output_stream.Printf("%s = ", m_name.AsCString("<anonymous>"));
-    
-    if (clang_type)
-    {
-        if (show_types)
-            output_stream.Printf("(%s) ", ClangASTType::GetClangTypeName (clang_type).GetCString());
-        
-        ClangASTType::DumpValue (ast_context,               // The ASTContext that the clang type belongs to
-                                 clang_type,                // The opaque clang type we want to dump that value of
-                                 &exe_ctx,                  // The execution context for memory and variable access
-                                 &output_stream,            // Stream to dump to
-                                 format,                    // Format to use when dumping
-                                 data,                      // A buffer containing the bytes for the clang type
-                                 0,                         // Byte offset within "data" where value is
-                                 data.GetByteSize (),       // Size in bytes of the value we are dumping
-                                 0,                         // Bitfield bit size
-                                 0,                         // Bitfield bit offset
-                                 show_types,                // Show types?
-                                 show_summary,              // Show summary?
-                                 verbose,                   // Debug logging output?
-                                 UINT32_MAX);               // Depth to dump in case this is an aggregate type
-    }
-    else
-    {
-        data.Dump (&output_stream,          // Stream to dump to
-                   0,                       // Byte offset within "data"
-                   format,                  // Format to use when dumping
-                   data.GetByteSize (),     // Size in bytes of each item we are dumping
-                   1,                       // Number of items to dump
-                   UINT32_MAX,              // Number of items per line
-                   LLDB_INVALID_ADDRESS,    // Invalid address, don't show any offset/address context
-                   0,                       // Bitfield bit size
-                   0);                      // Bitfield bit offset
-    }
-    
-    output_stream.EOL();
-    
-    return err;
-}
-
 ClangPersistentVariables::ClangPersistentVariables () :
-    m_variables(),
-    m_result_counter(0)
+    ClangExpressionVariableStore()
 {
-}
-
-ClangPersistentVariable *
-ClangPersistentVariables::CreateVariable (ConstString name, 
-                                          TypeFromUser user_type)
-{    
-    ClangPersistentVariable new_var(name, user_type);
-    
-    if (m_variables.find(name) != m_variables.end())
-        return NULL;
-    
-    m_variables[name] = new_var;
-    
-    return &m_variables[name];
-}
-
-ClangPersistentVariable *
-ClangPersistentVariables::GetVariable (ConstString name)
-{    
-    if (m_variables.find(name) == m_variables.end())
-        return NULL;
-    
-    return &m_variables[name];
+    m_result_counter = 0;
 }
 
 void
@@ -140,3 +31,22 @@ ClangPersistentVariables::GetNextResultName (std::string &name)
     
     name = s.GetString();
 }
+
+bool
+ClangPersistentVariables::CreatePersistentVariable(const char   *name,
+                                                   TypeFromUser  user_type)
+{
+    if (GetVariable(name))
+            return false;
+
+    ClangExpressionVariable &pvar (VariableAtIndex(CreateVariable()));
+
+    pvar.m_name = name;
+    pvar.m_user_type = user_type;
+
+    pvar.EnableDataVars();
+    
+    pvar.m_data_vars->m_data = new DataBufferHeap(pvar.Size(), 0);
+    
+    return true;
+}
\ No newline at end of file