diff options
author | Sean Callanan <scallanan@apple.com> | 2016-05-09 21:13:27 +0000 |
---|---|---|
committer | Sean Callanan <scallanan@apple.com> | 2016-05-09 21:13:27 +0000 |
commit | f52c40c57faf034e429a1d4f66b33fb93b0ac5bd (patch) | |
tree | 0d82fd94537d19abe123a3c4b487e566546077e5 /lldb/source/Commands/CommandObjectExpression.cpp | |
parent | a12f6d3c7bb5d600371a6b25773a0096a0e801c4 (diff) | |
download | llvm-f52c40c57faf034e429a1d4f66b33fb93b0ac5bd.zip llvm-f52c40c57faf034e429a1d4f66b33fb93b0ac5bd.tar.gz llvm-f52c40c57faf034e429a1d4f66b33fb93b0ac5bd.tar.bz2 |
Fixed multiline expressions, and removed some dead code.
IOHandlerLinesUpdated() does nothing, and IOHandlerIsInputComplete should be
implemented but isn't. This means that multiline expressions don't work. This
patch fixes that. Test case to follow in the next commit.
llvm-svn: 268970
Diffstat (limited to 'lldb/source/Commands/CommandObjectExpression.cpp')
-rw-r--r-- | lldb/source/Commands/CommandObjectExpression.cpp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp index 431b3d4..ff350a5 100644 --- a/lldb/source/Commands/CommandObjectExpression.cpp +++ b/lldb/source/Commands/CommandObjectExpression.cpp @@ -451,28 +451,21 @@ CommandObjectExpression::IOHandlerInputComplete (IOHandler &io_handler, std::str error_sp->Flush(); } -LineStatus -CommandObjectExpression::IOHandlerLinesUpdated (IOHandler &io_handler, - StringList &lines, - uint32_t line_idx, - Error &error) +bool +CommandObjectExpression::IOHandlerIsInputComplete (IOHandler &io_handler, + StringList &lines) { - if (line_idx == UINT32_MAX) + // An empty lines is used to indicate the end of input + const size_t num_lines = lines.GetSize(); + if (num_lines > 0 && lines[num_lines - 1].empty()) { - // Remove the last line from "lines" so it doesn't appear - // in our final expression + // Remove the last empty line from "lines" so it doesn't appear + // in our resulting input and return true to indicate we are done + // getting lines lines.PopBack(); - error.Clear(); - return LineStatus::Done; - } - else if (line_idx + 1 == lines.GetSize()) - { - // The last line was edited, if this line is empty, then we are done - // getting our multiple lines. - if (lines[line_idx].empty()) - return LineStatus::Done; + return true; } - return LineStatus::Success; + return false; } void |