[Lldb-commits] [PATCH] D52627: [lldb] Start a new line for the next output if there are no symbols in the current symtab

[Aaron Smith via Phabricator via lldb-commits]

asmith created this revision.
asmith added reviewers: zturner, aleksandr.urakov, lldb-commits.

Repository:
  rLLDB LLDB

https://reviews.llvm.org/D52627

Files:
  source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
  source/Plugins/ExpressionParser/Clang/ClangUserExpression.h
  source/Symbol/Symtab.cpp


Index: source/Symbol/Symtab.cpp
===================================================================
--- source/Symbol/Symtab.cpp
+++ source/Symbol/Symtab.cpp
@@ -139,6 +139,8 @@
       }
       break;
     }
+  } else {
+    s->PutCString("\n");
   }
 }
 
Index: source/Plugins/ExpressionParser/Clang/ClangUserExpression.h
===================================================================
--- source/Plugins/ExpressionParser/Clang/ClangUserExpression.h
+++ source/Plugins/ExpressionParser/Clang/ClangUserExpression.h
@@ -204,7 +204,7 @@
   /// The absolute character position in the transformed source code where the
   /// user code (as typed by the user) starts. If the variable is empty, then 
we
   /// were not able to calculate this position.
-  llvm::Optional<size_t> m_user_expression_start_pos;
+  llvm::Optional<unsigned> m_user_expression_start_pos;
   ResultDelegate m_result_delegate;
 };
 
Index: source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
===================================================================
--- source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
+++ source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
@@ -620,7 +620,7 @@
 ///     The column in the line that contains the absolute position.
 ///     The first character in a line is indexed as 0.
 //------------------------------------------------------------------
-static void AbsPosToLineColumnPos(size_t abs_pos, llvm::StringRef code,
+static void AbsPosToLineColumnPos(unsigned abs_pos, llvm::StringRef code,
                                   unsigned &line, unsigned &column) {
   // Reset to code position to beginning of the file.
   line = 0;



Index: source/Symbol/Symtab.cpp
===================================================================
--- source/Symbol/Symtab.cpp
+++ source/Symbol/Symtab.cpp
@@ -139,6 +139,8 @@
       }
       break;
     }
+  } else {
+    s->PutCString("\n");
   }
 }
 
Index: source/Plugins/ExpressionParser/Clang/ClangUserExpression.h
===================================================================
--- source/Plugins/ExpressionParser/Clang/ClangUserExpression.h
+++ source/Plugins/ExpressionParser/Clang/ClangUserExpression.h
@@ -204,7 +204,7 @@
   /// The absolute character position in the transformed source code where the
   /// user code (as typed by the user) starts. If the variable is empty, then we
   /// were not able to calculate this position.
-  llvm::Optional<size_t> m_user_expression_start_pos;
+  llvm::Optional<unsigned> m_user_expression_start_pos;
   ResultDelegate m_result_delegate;
 };
 
Index: source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
===================================================================
--- source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
+++ source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
@@ -620,7 +620,7 @@
 ///     The column in the line that contains the absolute position.
 ///     The first character in a line is indexed as 0.
 //------------------------------------------------------------------
-static void AbsPosToLineColumnPos(size_t abs_pos, llvm::StringRef code,
+static void AbsPosToLineColumnPos(unsigned abs_pos, llvm::StringRef code,
                                   unsigned &line, unsigned &column) {
   // Reset to code position to beginning of the file.
   line = 0;

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits