*** This commit represents a complete reformatting of the LLDB source code

*** to conform to clang-format’s LLVM style.  This kind of mass change has
*** two obvious implications:

Firstly, merging this particular commit into a downstream fork may be a huge
effort.  Alternatively, it may be worth merging all changes up to this commit,
performing the same reformatting operation locally, and then discarding the
merge for this particular commit.  The commands used to accomplish this
reformatting were as follows (with current working directory as the root of
the repository):

    find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} +
    find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ;

The version of clang-format used was 3.9.0, and autopep8 was 1.2.4.

Secondly, “blame” style tools will generally point to this commit instead of
a meaningful prior commit.  There are alternatives available that will attempt
to look through this change and find the appropriate prior commit.  YMMV.

llvm-svn: 280751

1 files changed, 66 insertions, 29 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
index c48cee1bd2b..f43bbb7515c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
@@ -6,8 +6,8 @@ parser.
 from __future__ import print_function
 
 
-
-import os, time
+import os
+import time
 import shutil
 import subprocess
 import lldb
@@ -15,6 +15,7 @@ from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
+
 @skipUnlessDarwin
 class TestObjCBreakpoints(TestBase):
 
@@ -34,20 +35,37 @@ class TestObjCBreakpoints(TestBase):
         self.line = line_number(self.main_source, '// Set breakpoint here')
 
     def check_category_breakpoints(self):
-        name_bp = self.target.BreakpointCreateByName ("myCategoryFunction")
-        selector_bp = self.target.BreakpointCreateByName ("myCategoryFunction", lldb.eFunctionNameTypeSelector, lldb.SBFileSpecList(), lldb.SBFileSpecList())
-        self.assertTrue(name_bp.GetNumLocations() == selector_bp.GetNumLocations(), 'Make sure setting a breakpoint by name "myCategoryFunction" sets a breakpoint even though it is in a category')
+        name_bp = self.target.BreakpointCreateByName("myCategoryFunction")
+        selector_bp = self.target.BreakpointCreateByName(
+            "myCategoryFunction",
+            lldb.eFunctionNameTypeSelector,
+            lldb.SBFileSpecList(),
+            lldb.SBFileSpecList())
+        self.assertTrue(
+            name_bp.GetNumLocations() == selector_bp.GetNumLocations(),
+            'Make sure setting a breakpoint by name "myCategoryFunction" sets a breakpoint even though it is in a category')
         for bp_loc in selector_bp:
             function_name = bp_loc.GetAddress().GetSymbol().GetName()
-            self.assertTrue(" myCategoryFunction]" in function_name, 'Make sure all function names have " myCategoryFunction]" in their names')
-            
-        category_bp = self.target.BreakpointCreateByName ("-[MyClass(MyCategory) myCategoryFunction]")
-        stripped_bp = self.target.BreakpointCreateByName ("-[MyClass myCategoryFunction]")
-        stripped2_bp = self.target.BreakpointCreateByName ("[MyClass myCategoryFunction]")
-        self.assertTrue(category_bp.GetNumLocations() == 1, "Make sure we can set a breakpoint using a full objective C function name with the category included (-[MyClass(MyCategory) myCategoryFunction])")
-        self.assertTrue(stripped_bp.GetNumLocations() == 1, "Make sure we can set a breakpoint using a full objective C function name without the category included (-[MyClass myCategoryFunction])")
-        self.assertTrue(stripped2_bp.GetNumLocations() == 1, "Make sure we can set a breakpoint using a full objective C function name without the category included ([MyClass myCategoryFunction])")
-        
+            self.assertTrue(
+                " myCategoryFunction]" in function_name,
+                'Make sure all function names have " myCategoryFunction]" in their names')
+
+        category_bp = self.target.BreakpointCreateByName(
+            "-[MyClass(MyCategory) myCategoryFunction]")
+        stripped_bp = self.target.BreakpointCreateByName(
+            "-[MyClass myCategoryFunction]")
+        stripped2_bp = self.target.BreakpointCreateByName(
+            "[MyClass myCategoryFunction]")
+        self.assertTrue(
+            category_bp.GetNumLocations() == 1,
+            "Make sure we can set a breakpoint using a full objective C function name with the category included (-[MyClass(MyCategory) myCategoryFunction])")
+        self.assertTrue(
+            stripped_bp.GetNumLocations() == 1,
+            "Make sure we can set a breakpoint using a full objective C function name without the category included (-[MyClass myCategoryFunction])")
+        self.assertTrue(
+            stripped2_bp.GetNumLocations() == 1,
+            "Make sure we can set a breakpoint using a full objective C function name without the category included ([MyClass myCategoryFunction])")
+
     def check_objc_breakpoints(self, have_dsym):
         """Test constant string generation amd comparison by the expression parser."""
 
@@ -60,36 +78,55 @@ class TestObjCBreakpoints(TestBase):
         self.assertTrue(self.target, VALID_TARGET)
 
         #----------------------------------------------------------------------
-        # Set breakpoints on all selectors whose name is "count". This should 
-        # catch breakpoints that are both C functions _and_ anything whose 
+        # Set breakpoints on all selectors whose name is "count". This should
+        # catch breakpoints that are both C functions _and_ anything whose
         # selector is "count" because just looking at "count" we can't tell
         # definitively if the name is a selector or a C function
         #----------------------------------------------------------------------
-        name_bp = self.target.BreakpointCreateByName ("count")
-        selector_bp = self.target.BreakpointCreateByName ("count", lldb.eFunctionNameTypeSelector, lldb.SBFileSpecList(), lldb.SBFileSpecList())
-        self.assertTrue(name_bp.GetNumLocations() >= selector_bp.GetNumLocations(), 'Make sure we get at least the same amount of breakpoints if not more when setting by name "count"')
-        self.assertTrue(selector_bp.GetNumLocations() > 50, 'Make sure we find a lot of "count" selectors') # There are 93 on the latest MacOSX
+        name_bp = self.target.BreakpointCreateByName("count")
+        selector_bp = self.target.BreakpointCreateByName(
+            "count",
+            lldb.eFunctionNameTypeSelector,
+            lldb.SBFileSpecList(),
+            lldb.SBFileSpecList())
+        self.assertTrue(
+            name_bp.GetNumLocations() >= selector_bp.GetNumLocations(),
+            'Make sure we get at least the same amount of breakpoints if not more when setting by name "count"')
+        self.assertTrue(
+            selector_bp.GetNumLocations() > 50,
+            'Make sure we find a lot of "count" selectors')  # There are 93 on the latest MacOSX
         for bp_loc in selector_bp:
             function_name = bp_loc.GetAddress().GetSymbol().GetName()
-            self.assertTrue(" count]" in function_name, 'Make sure all function names have " count]" in their names')
+            self.assertTrue(
+                " count]" in function_name,
+                'Make sure all function names have " count]" in their names')
 
         #----------------------------------------------------------------------
         # Set breakpoints on all selectors whose name is "isEqual:". This should
         # catch breakpoints that are only ObjC selectors because no C function
         # can end with a :
         #----------------------------------------------------------------------
-        name_bp = self.target.BreakpointCreateByName ("isEqual:")
-        selector_bp = self.target.BreakpointCreateByName ("isEqual:", lldb.eFunctionNameTypeSelector, lldb.SBFileSpecList(), lldb.SBFileSpecList())
-        self.assertTrue(name_bp.GetNumLocations() == selector_bp.GetNumLocations(), 'Make sure setting a breakpoint by name "isEqual:" only sets selector breakpoints')
+        name_bp = self.target.BreakpointCreateByName("isEqual:")
+        selector_bp = self.target.BreakpointCreateByName(
+            "isEqual:",
+            lldb.eFunctionNameTypeSelector,
+            lldb.SBFileSpecList(),
+            lldb.SBFileSpecList())
+        self.assertTrue(
+            name_bp.GetNumLocations() == selector_bp.GetNumLocations(),
+            'Make sure setting a breakpoint by name "isEqual:" only sets selector breakpoints')
         for bp_loc in selector_bp:
             function_name = bp_loc.GetAddress().GetSymbol().GetName()
-            self.assertTrue(" isEqual:]" in function_name, 'Make sure all function names have " isEqual:]" in their names')
-    
+            self.assertTrue(
+                " isEqual:]" in function_name,
+                'Make sure all function names have " isEqual:]" in their names')
+
         self.check_category_breakpoints()
-        
+
         if have_dsym:
             shutil.rmtree(exe + ".dSYM")
-        self.assertTrue(subprocess.call(['/usr/bin/strip', '-Sx', exe]) == 0, 'stripping dylib succeeded')
-        
+        self.assertTrue(subprocess.call(
+            ['/usr/bin/strip', '-Sx', exe]) == 0, 'stripping dylib succeeded')
+
         # Check breakpoints again, this time using the symbol table only
         self.check_category_breakpoints()