commit 87e1f77d81fe724619d7298baf8cc9d32351e9eb
author Caroline Tice <ctice@apple.com> Mon Jun 13 20:20:29 2011 +0000
committer Caroline Tice <ctice@apple.com> Mon Jun 13 20:20:29 2011 +0000
tree 7d44f4397f0a027e38ba2cdf1a7aee93878b46a4
parent 8e432fa9ca1f8f191ac11d68fffb50805ae44417

More prompt-timing cleanups:  Make multi-line expressions
use the asynchronous stream mechanism rather than writing
directly to the Debugger's output & error streams.



git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@132930 91177308-0d34-0410-b5e6-96231b3b80d8

source/Commands/CommandObjectExpression.cpp

diff --git a/source/Commands/CommandObjectExpression.cpp b/source/Commands/CommandObjectExpression.cpp
index 4c8b152..e43e9bf 100644
--- a/source/Commands/CommandObjectExpression.cpp
+++ b/source/Commands/CommandObjectExpression.cpp
@@ -234,9 +234,13 @@
     case eInputReaderDone:
 		if (cmd_object_expr->m_expr_lines.size() > 0)
         {
+            StreamSP output_stream = reader.GetDebugger().GetAsyncOutputStream();
+            StreamSP error_stream = reader.GetDebugger().GetAsyncErrorStream();
             cmd_object_expr->EvaluateExpression (cmd_object_expr->m_expr_lines.c_str(), 
-                                                 reader.GetDebugger().GetOutputStream(), 
-                                                 reader.GetDebugger().GetErrorStream());
+                                                 output_stream.get(), 
+                                                 error_stream.get());
+            output_stream->Flush();
+            error_stream->Flush();
         }
         break;
     }
@@ -248,8 +252,8 @@
 CommandObjectExpression::EvaluateExpression 
 (
     const char *expr, 
-    Stream &output_stream, 
-    Stream &error_stream,
+    Stream *output_stream, 
+    Stream *error_stream,
     CommandReturnObject *result
 )
 {
@@ -307,7 +311,7 @@
                 if (m_options.format != eFormatDefault)
                     result_valobj_sp->SetFormat (m_options.format);
 
-                ValueObject::DumpValueObject (output_stream,
+                ValueObject::DumpValueObject (*(output_stream),
                                               result_valobj_sp.get(),   // Variable object to dump
                                               result_valobj_sp->GetName().GetCString(),// Root object name
                                               0,                        // Pointer depth to traverse (zero means stop at pointers)
@@ -324,7 +328,7 @@
             }
             else
             {
-                error_stream.PutCString(result_valobj_sp->GetError().AsCString());
+                error_stream->PutCString(result_valobj_sp->GetError().AsCString());
                 if (result)
                     result->SetStatus (eReturnStatusFailed);
             }
@@ -332,7 +336,7 @@
     }
     else
     {
-        error_stream.Printf ("error: invalid execution context for expression\n");
+        error_stream->Printf ("error: invalid execution context for expression\n");
         return false;
     }
         
@@ -426,7 +430,7 @@
     if (expr == NULL)
         expr = command;
     
-    if (EvaluateExpression (expr, result.GetOutputStream(), result.GetErrorStream(), &result))
+    if (EvaluateExpression (expr, &(result.GetOutputStream()), &(result.GetErrorStream()), &result))
         return true;
 
     result.SetStatus (eReturnStatusFailed);