*** 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

2 files changed, 258 insertions, 113 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
index 93d53c7de71..5c0d3fc9cc3 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
@@ -5,13 +5,14 @@ Test the printing of anonymous and named namespace variables.
 from __future__ import print_function
 
 
-
-import os, time
+import os
+import time
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
+
 class NamespaceBreakpointTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
@@ -21,7 +22,12 @@ class NamespaceBreakpointTestCase(TestBase):
         """Test that we can set breakpoints correctly by basename to find all functions whose basename is "func"."""
         self.build()
 
-        names = [ "func()", "func(int)", "A::B::func()", "A::func()", "A::func(int)"]
+        names = [
+            "func()",
+            "func(int)",
+            "A::B::func()",
+            "A::func()",
+            "A::func(int)"]
 
         # Create a target by the debugger.
         exe = os.path.join(os.getcwd(), "a.out")
@@ -30,11 +36,15 @@ class NamespaceBreakpointTestCase(TestBase):
         module_list = lldb.SBFileSpecList()
         module_list.Append(lldb.SBFileSpec(exe, False))
         cu_list = lldb.SBFileSpecList()
-        # Set a breakpoint by name "func" which should pick up all functions whose basename is "func"
-        bp = target.BreakpointCreateByName ("func", lldb.eFunctionNameTypeAuto, module_list, cu_list);
+        # Set a breakpoint by name "func" which should pick up all functions
+        # whose basename is "func"
+        bp = target.BreakpointCreateByName(
+            "func", lldb.eFunctionNameTypeAuto, module_list, cu_list)
         for bp_loc in bp:
             name = bp_loc.GetAddress().GetFunction().GetName()
-            self.assertTrue(name in names, "make sure breakpoint locations are correct for 'func' with eFunctionNameTypeAuto")        
+            self.assertTrue(
+                name in names,
+                "make sure breakpoint locations are correct for 'func' with eFunctionNameTypeAuto")
 
     @expectedFailureAll(bugnumber="llvm.org/pr28548", compiler="gcc")
     def test_breakpoints_func_full(self):
@@ -42,7 +52,7 @@ class NamespaceBreakpointTestCase(TestBase):
            (no namespaces)."""
         self.build()
 
-        names = [ "func()", "func(int)"]
+        names = ["func()", "func(int)"]
 
         # Create a target by the debugger.
         exe = os.path.join(os.getcwd(), "a.out")
@@ -52,18 +62,22 @@ class NamespaceBreakpointTestCase(TestBase):
         module_list.Append(lldb.SBFileSpec(exe, False))
         cu_list = lldb.SBFileSpecList()
 
-        # Set a breakpoint by name "func" whose fullly qualified named matches "func" which 
-        # should pick up only functions whose basename is "func" and has no containing context
-        bp = target.BreakpointCreateByName ("func", lldb.eFunctionNameTypeFull, module_list, cu_list);
+        # Set a breakpoint by name "func" whose fullly qualified named matches "func" which
+        # should pick up only functions whose basename is "func" and has no
+        # containing context
+        bp = target.BreakpointCreateByName(
+            "func", lldb.eFunctionNameTypeFull, module_list, cu_list)
         for bp_loc in bp:
             name = bp_loc.GetAddress().GetFunction().GetName()
-            self.assertTrue(name in names, "make sure breakpoint locations are correct for 'func' with eFunctionNameTypeFull")        
+            self.assertTrue(
+                name in names,
+                "make sure breakpoint locations are correct for 'func' with eFunctionNameTypeFull")
 
     def test_breakpoints_a_func_full(self):
         """Test that we can set breakpoints correctly by fullname to find all functions whose fully qualified name is "A::func"."""
         self.build()
 
-        names = [ "A::func()", "A::func(int)"]
+        names = ["A::func()", "A::func(int)"]
 
         # Create a target by the debugger.
         exe = os.path.join(os.getcwd(), "a.out")
@@ -73,12 +87,16 @@ class NamespaceBreakpointTestCase(TestBase):
         module_list.Append(lldb.SBFileSpec(exe, False))
         cu_list = lldb.SBFileSpecList()
 
-        # Set a breakpoint by name "A::func" whose fullly qualified named matches "A::func" which 
-        # should pick up only functions whose basename is "func" and is contained in the "A" namespace
-        bp = target.BreakpointCreateByName ("A::func", lldb.eFunctionNameTypeFull, module_list, cu_list);
+        # Set a breakpoint by name "A::func" whose fullly qualified named matches "A::func" which
+        # should pick up only functions whose basename is "func" and is
+        # contained in the "A" namespace
+        bp = target.BreakpointCreateByName(
+            "A::func", lldb.eFunctionNameTypeFull, module_list, cu_list)
         for bp_loc in bp:
             name = bp_loc.GetAddress().GetFunction().GetName()
-            self.assertTrue(name in names, "make sure breakpoint locations are correct for 'A::func' with eFunctionNameTypeFull")        
+            self.assertTrue(
+                name in names,
+                "make sure breakpoint locations are correct for 'A::func' with eFunctionNameTypeFull")
 
 
 class NamespaceTestCase(TestBase):
@@ -88,14 +106,15 @@ class NamespaceTestCase(TestBase):
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
-        # Find the line numbers for declarations of namespace variables i and j.
-        self.line_var_i = line_number('main.cpp',
-                '// Find the line number for anonymous namespace variable i.')
-        self.line_var_j = line_number('main.cpp',
-                '// Find the line number for named namespace variable j.')
+        # Find the line numbers for declarations of namespace variables i and
+        # j.
+        self.line_var_i = line_number(
+            'main.cpp', '// Find the line number for anonymous namespace variable i.')
+        self.line_var_j = line_number(
+            'main.cpp', '// Find the line number for named namespace variable j.')
         # And the line number to break at.
         self.line_break = line_number('main.cpp',
-                '// Set break point at this line.')
+                                      '// Set break point at this line.')
         # Break inside do {} while and evaluate value
         self.line_break_ns1 = line_number('main.cpp', '// Evaluate ns1::value')
         self.line_break_ns2 = line_number('main.cpp', '// Evaluate ns2::value')
@@ -104,8 +123,8 @@ class NamespaceTestCase(TestBase):
         self.runCmd(command, RUN_SUCCEEDED)
         # The stop reason of the thread should be breakpoint.
         self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
-            substrs = ['stopped',
-                       'stop reason = breakpoint'])
+                    substrs=['stopped',
+                             'stop reason = breakpoint'])
 
     # rdar://problem/8668674
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24764")
@@ -114,22 +133,39 @@ class NamespaceTestCase(TestBase):
         self.build()
         self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
 
-        lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line_break_ns1, num_expected_locations=1, loc_exact=True)
-        lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line_break_ns2, num_expected_locations=1, loc_exact=True)
-        lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line_break, num_expected_locations=1, loc_exact=True)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "main.cpp",
+            self.line_break_ns1,
+            num_expected_locations=1,
+            loc_exact=True)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "main.cpp",
+            self.line_break_ns2,
+            num_expected_locations=1,
+            loc_exact=True)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "main.cpp",
+            self.line_break,
+            num_expected_locations=1,
+            loc_exact=True)
 
         self.runToBkpt("run")
         # Evaluate ns1::value
-        self.expect("expression -- value", startstr = "(int) $0 = 100")
+        self.expect("expression -- value", startstr="(int) $0 = 100")
 
         self.runToBkpt("continue")
         # Evaluate ns2::value
-        self.expect("expression -- value", startstr = "(int) $1 = 200")
-        
+        self.expect("expression -- value", startstr="(int) $1 = 200")
+
         self.runToBkpt("continue")
-        # On Mac OS X, gcc 4.2 emits the wrong debug info with respect to types.
+        # On Mac OS X, gcc 4.2 emits the wrong debug info with respect to
+        # types.
         slist = ['(int) a = 12', 'anon_uint', 'a_uint', 'b_uint', 'y_uint']
-        if self.platformIsDarwin() and self.getCompiler() in ['clang', 'llvm-gcc']:
+        if self.platformIsDarwin() and self.getCompiler() in [
+                'clang', 'llvm-gcc']:
             slist = ['(int) a = 12',
                      '::my_uint_t', 'anon_uint = 0',
                      '(A::uint_t) a_uint = 1',
@@ -138,16 +174,20 @@ class NamespaceTestCase(TestBase):
 
         # 'frame variable' displays the local variables with type information.
         self.expect('frame variable', VARIABLES_DISPLAYED_CORRECTLY,
-            substrs = slist)
+                    substrs=slist)
 
         # 'frame variable' with basename 'i' should work.
-        self.expect("frame variable --show-declaration --show-globals i",
-            startstr = "main.cpp:%d: (int) (anonymous namespace)::i = 3" % self.line_var_i)
+        self.expect(
+            "frame variable --show-declaration --show-globals i",
+            startstr="main.cpp:%d: (int) (anonymous namespace)::i = 3" %
+            self.line_var_i)
         # main.cpp:12: (int) (anonymous namespace)::i = 3
 
         # 'frame variable' with basename 'j' should work, too.
-        self.expect("frame variable --show-declaration --show-globals j",
-            startstr = "main.cpp:%d: (int) A::B::j = 4" % self.line_var_j)
+        self.expect(
+            "frame variable --show-declaration --show-globals j",
+            startstr="main.cpp:%d: (int) A::B::j = 4" %
+            self.line_var_j)
         # main.cpp:19: (int) A::B::j = 4
 
         # 'frame variable' should support address-of operator.
@@ -155,41 +195,44 @@ class NamespaceTestCase(TestBase):
 
         # 'frame variable' with fully qualified name 'A::B::j' should work.
         self.expect("frame variable A::B::j", VARIABLES_DISPLAYED_CORRECTLY,
-            startstr = '(int) A::B::j = 4',
-            patterns = [' = 4'])
+                    startstr='(int) A::B::j = 4',
+                    patterns=[' = 4'])
 
         # So should the anonymous namespace case.
-        self.expect("frame variable '(anonymous namespace)::i'", VARIABLES_DISPLAYED_CORRECTLY,
-            startstr = '(int) (anonymous namespace)::i = 3',
-            patterns = [' = 3'])
+        self.expect(
+            "frame variable '(anonymous namespace)::i'",
+            VARIABLES_DISPLAYED_CORRECTLY,
+            startstr='(int) (anonymous namespace)::i = 3',
+            patterns=[' = 3'])
 
         # rdar://problem/8660275
         # test/namespace: 'expression -- i+j' not working
         # This has been fixed.
         self.expect("expression -- i + j",
-            startstr = "(int) $2 = 7")
+                    startstr="(int) $2 = 7")
         # (int) $2 = 7
 
         self.runCmd("expression -- i")
         self.runCmd("expression -- j")
 
         # rdar://problem/8668674
-        # expression command with fully qualified namespace for a variable does not work
+        # expression command with fully qualified namespace for a variable does
+        # not work
         self.expect("expression -- ::i", VARIABLES_DISPLAYED_CORRECTLY,
-            patterns = [' = 3'])
+                    patterns=[' = 3'])
         self.expect("expression -- A::B::j", VARIABLES_DISPLAYED_CORRECTLY,
-            patterns = [' = 4'])
+                    patterns=[' = 4'])
 
         # expression command with function in anonymous namespace
         self.expect("expression -- myanonfunc(3)",
-            patterns = [' = 6'])
+                    patterns=[' = 6'])
 
         # global namespace qualification with function in anonymous namespace
         self.expect("expression -- ::myanonfunc(4)",
-            patterns = [' = 8'])
+                    patterns=[' = 8'])
 
         self.expect("p myanonfunc",
-            patterns = ['\(anonymous namespace\)::myanonfunc\(int\)'])
+                    patterns=['\(anonymous namespace\)::myanonfunc\(int\)'])
 
-        self.expect("p variadic_sum",
-            patterns = ['\(anonymous namespace\)::variadic_sum\(int, ...\)'])
+        self.expect("p variadic_sum", patterns=[
+                    '\(anonymous namespace\)::variadic_sum\(int, ...\)'])
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py
index 12e8eef40cf..18e45d9798a 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py
@@ -5,12 +5,14 @@ Test the printing of anonymous and named namespace variables.
 from __future__ import print_function
 
 
-import os, time
+import os
+import time
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
+
 class NamespaceLookupTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
@@ -19,88 +21,131 @@ class NamespaceLookupTestCase(TestBase):
         # Call super's setUp().
         TestBase.setUp(self)
         # Break inside different scopes and evaluate value
-        self.line_break_global_scope = line_number('ns.cpp', '// BP_global_scope')
+        self.line_break_global_scope = line_number(
+            'ns.cpp', '// BP_global_scope')
         self.line_break_file_scope = line_number('ns2.cpp', '// BP_file_scope')
         self.line_break_ns_scope = line_number('ns2.cpp', '// BP_ns_scope')
-        self.line_break_nested_ns_scope = line_number('ns2.cpp', '// BP_nested_ns_scope')
-        self.line_break_nested_ns_scope_after_using = line_number('ns2.cpp', '// BP_nested_ns_scope_after_using')
-        self.line_break_before_using_directive = line_number('ns3.cpp', '// BP_before_using_directive')
-        self.line_break_after_using_directive = line_number('ns3.cpp', '// BP_after_using_directive')
+        self.line_break_nested_ns_scope = line_number(
+            'ns2.cpp', '// BP_nested_ns_scope')
+        self.line_break_nested_ns_scope_after_using = line_number(
+            'ns2.cpp', '// BP_nested_ns_scope_after_using')
+        self.line_break_before_using_directive = line_number(
+            'ns3.cpp', '// BP_before_using_directive')
+        self.line_break_after_using_directive = line_number(
+            'ns3.cpp', '// BP_after_using_directive')
 
     def runToBkpt(self, command):
         self.runCmd(command, RUN_SUCCEEDED)
         # The stop reason of the thread should be breakpoint.
         self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
-            substrs = ['stopped',
-                       'stop reason = breakpoint'])
-
-    @expectedFailureAll(oslist=["windows", "linux", "freebsd"], bugnumber="llvm.org/pr25819")
+                    substrs=['stopped',
+                             'stop reason = breakpoint'])
+
+    @expectedFailureAll(
+        oslist=[
+            "windows",
+            "linux",
+            "freebsd"],
+        bugnumber="llvm.org/pr25819")
     def test_scope_lookup_with_run_command(self):
         """Test scope lookup of functions in lldb."""
         self.build()
         self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
 
-        lldbutil.run_break_set_by_file_and_line (self, "ns.cpp", self.line_break_global_scope, num_expected_locations=1, loc_exact=False)
-        lldbutil.run_break_set_by_file_and_line (self, "ns2.cpp", self.line_break_ns_scope, num_expected_locations=1, loc_exact=False)
-        lldbutil.run_break_set_by_file_and_line (self, "ns2.cpp", self.line_break_nested_ns_scope, num_expected_locations=1, loc_exact=False)
-        lldbutil.run_break_set_by_file_and_line (self, "ns2.cpp", self.line_break_nested_ns_scope_after_using, num_expected_locations=1, loc_exact=False)
-        lldbutil.run_break_set_by_file_and_line (self, "ns3.cpp", self.line_break_before_using_directive, num_expected_locations=1, loc_exact=False)
-        lldbutil.run_break_set_by_file_and_line (self, "ns3.cpp", self.line_break_after_using_directive, num_expected_locations=1, loc_exact=False)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "ns.cpp",
+            self.line_break_global_scope,
+            num_expected_locations=1,
+            loc_exact=False)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "ns2.cpp",
+            self.line_break_ns_scope,
+            num_expected_locations=1,
+            loc_exact=False)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "ns2.cpp",
+            self.line_break_nested_ns_scope,
+            num_expected_locations=1,
+            loc_exact=False)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "ns2.cpp",
+            self.line_break_nested_ns_scope_after_using,
+            num_expected_locations=1,
+            loc_exact=False)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "ns3.cpp",
+            self.line_break_before_using_directive,
+            num_expected_locations=1,
+            loc_exact=False)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "ns3.cpp",
+            self.line_break_after_using_directive,
+            num_expected_locations=1,
+            loc_exact=False)
 
         # Run to BP_global_scope at global scope
         self.runToBkpt("run")
         # Evaluate func() - should call ::func()
-        self.expect("expr -- func()", startstr = "(int) $0 = 1")
+        self.expect("expr -- func()", startstr="(int) $0 = 1")
         # Evaluate A::B::func() - should call A::B::func()
-        self.expect("expr -- A::B::func()", startstr = "(int) $1 = 4")
+        self.expect("expr -- A::B::func()", startstr="(int) $1 = 4")
         # Evaluate func(10) - should call ::func(int)
-        self.expect("expr -- func(10)", startstr = "(int) $2 = 11")
+        self.expect("expr -- func(10)", startstr="(int) $2 = 11")
         # Evaluate ::func() - should call A::func()
-        self.expect("expr -- ::func()", startstr = "(int) $3 = 1")
+        self.expect("expr -- ::func()", startstr="(int) $3 = 1")
         # Evaluate A::foo() - should call A::foo()
-        self.expect("expr -- A::foo()", startstr = "(int) $4 = 42")
+        self.expect("expr -- A::foo()", startstr="(int) $4 = 42")
 
         # Continue to BP_ns_scope at ns scope
         self.runToBkpt("continue")
         # Evaluate func(10) - should call A::func(int)
-        self.expect("expr -- func(10)", startstr = "(int) $5 = 13")
+        self.expect("expr -- func(10)", startstr="(int) $5 = 13")
         # Evaluate B::func() - should call B::func()
-        self.expect("expr -- B::func()", startstr = "(int) $6 = 4")
+        self.expect("expr -- B::func()", startstr="(int) $6 = 4")
         # Evaluate func() - should call A::func()
-        self.expect("expr -- func()", startstr = "(int) $7 = 3")
+        self.expect("expr -- func()", startstr="(int) $7 = 3")
 
         # Continue to BP_nested_ns_scope at nested ns scope
         self.runToBkpt("continue")
         # Evaluate func() - should call A::B::func()
-        self.expect("expr -- func()", startstr = "(int) $8 = 4")
+        self.expect("expr -- func()", startstr="(int) $8 = 4")
         # Evaluate A::func() - should call A::func()
-        self.expect("expr -- A::func()", startstr = "(int) $9 = 3")
+        self.expect("expr -- A::func()", startstr="(int) $9 = 3")
 
         # Evaluate func(10) - should call A::func(10)
         # NOTE: Under the rules of C++, this test would normally get an error
         # because A::B::func() hides A::func(), but lldb intentionally
         # disobeys these rules so that the intended overload can be found
         # by only removing duplicates if they have the same type.
-        self.expect("expr -- func(10)", startstr = "(int) $10 = 13")
+        self.expect("expr -- func(10)", startstr="(int) $10 = 13")
 
-        # Continue to BP_nested_ns_scope_after_using at nested ns scope after using declaration
+        # Continue to BP_nested_ns_scope_after_using at nested ns scope after
+        # using declaration
         self.runToBkpt("continue")
         # Evaluate A::func(10) - should call A::func(int)
-        self.expect("expr -- A::func(10)", startstr = "(int) $11 = 13")
+        self.expect("expr -- A::func(10)", startstr="(int) $11 = 13")
 
-        # Continue to BP_before_using_directive at global scope before using declaration
+        # Continue to BP_before_using_directive at global scope before using
+        # declaration
         self.runToBkpt("continue")
         # Evaluate ::func() - should call ::func()
-        self.expect("expr -- ::func()", startstr = "(int) $12 = 1")
+        self.expect("expr -- ::func()", startstr="(int) $12 = 1")
         # Evaluate B::func() - should call B::func()
-        self.expect("expr -- B::func()", startstr = "(int) $13 = 4")
+        self.expect("expr -- B::func()", startstr="(int) $13 = 4")
 
-        # Continue to BP_after_using_directive at global scope after using declaration
+        # Continue to BP_after_using_directive at global scope after using
+        # declaration
         self.runToBkpt("continue")
         # Evaluate ::func() - should call ::func()
-        self.expect("expr -- ::func()", startstr = "(int) $14 = 1")
+        self.expect("expr -- ::func()", startstr="(int) $14 = 1")
         # Evaluate B::func() - should call B::func()
-        self.expect("expr -- B::func()", startstr = "(int) $15 = 4")
+        self.expect("expr -- B::func()", startstr="(int) $15 = 4")
 
     @unittest2.expectedFailure("lldb scope lookup of functions bugs")
     def test_function_scope_lookup_with_run_command(self):
@@ -108,26 +153,36 @@ class NamespaceLookupTestCase(TestBase):
         self.build()
         self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
 
-        lldbutil.run_break_set_by_file_and_line (self, "ns.cpp", self.line_break_global_scope, num_expected_locations=1, loc_exact=False)
-        lldbutil.run_break_set_by_file_and_line (self, "ns2.cpp", self.line_break_ns_scope, num_expected_locations=1, loc_exact=False)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "ns.cpp",
+            self.line_break_global_scope,
+            num_expected_locations=1,
+            loc_exact=False)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "ns2.cpp",
+            self.line_break_ns_scope,
+            num_expected_locations=1,
+            loc_exact=False)
 
         # Run to BP_global_scope at global scope
         self.runToBkpt("run")
         # Evaluate foo() - should call ::foo()
         # FIXME: lldb finds Y::foo because lookup for variables is done
         # before functions.
-        self.expect("expr -- foo()", startstr = "(int) $0 = 42")
+        self.expect("expr -- foo()", startstr="(int) $0 = 42")
         # Evaluate ::foo() - should call ::foo()
         # FIXME: lldb finds Y::foo because lookup for variables is done
         # before functions and :: is ignored.
-        self.expect("expr -- ::foo()", startstr = "(int) $1 = 42")
+        self.expect("expr -- ::foo()", startstr="(int) $1 = 42")
 
         # Continue to BP_ns_scope at ns scope
         self.runToBkpt("continue")
         # Evaluate foo() - should call A::foo()
         # FIXME: lldb finds Y::foo because lookup for variables is done
         # before functions.
-        self.expect("expr -- foo()", startstr = "(int) $2 = 42")
+        self.expect("expr -- foo()", startstr="(int) $2 = 42")
 
     @unittest2.expectedFailure("lldb file scope lookup bugs")
     def test_file_scope_lookup_with_run_command(self):
@@ -135,14 +190,19 @@ class NamespaceLookupTestCase(TestBase):
         self.build()
         self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
 
-        lldbutil.run_break_set_by_file_and_line (self, "ns2.cpp", self.line_break_file_scope, num_expected_locations=1, loc_exact=False)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "ns2.cpp",
+            self.line_break_file_scope,
+            num_expected_locations=1,
+            loc_exact=False)
 
         # Run to BP_file_scope at file scope
         self.runToBkpt("run")
         # Evaluate func() - should call static ns2.cpp:func()
         # FIXME: This test fails because lldb doesn't know about file scopes so
         # finds the global ::func().
-        self.expect("expr -- func()", startstr = "(int) $0 = 2")
+        self.expect("expr -- func()", startstr="(int) $0 = 2")
 
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr25819")
     def test_scope_lookup_before_using_with_run_command(self):
@@ -150,30 +210,51 @@ class NamespaceLookupTestCase(TestBase):
         self.build()
         self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
 
-        lldbutil.run_break_set_by_file_and_line (self, "ns3.cpp", self.line_break_before_using_directive, num_expected_locations=1, loc_exact=False)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "ns3.cpp",
+            self.line_break_before_using_directive,
+            num_expected_locations=1,
+            loc_exact=False)
 
-        # Run to BP_before_using_directive at global scope before using declaration
+        # Run to BP_before_using_directive at global scope before using
+        # declaration
         self.runToBkpt("run")
         # Evaluate func() - should call ::func()
-        self.expect("expr -- func()", startstr = "(int) $0 = 1")
+        self.expect("expr -- func()", startstr="(int) $0 = 1")
 
     # NOTE: this test may fail on older systems that don't emit import
     # entries in DWARF - may need to add checks for compiler versions here.
-    @skipIf(compiler="gcc", oslist=["linux"], debug_info=["dwo"]) # Skip to avoid crash
-    @expectedFailureAll(oslist=["windows", "linux", "freebsd"], bugnumber="llvm.org/pr25819")
+    @skipIf(
+        compiler="gcc",
+        oslist=["linux"],
+        debug_info=["dwo"])  # Skip to avoid crash
+    @expectedFailureAll(
+        oslist=[
+            "windows",
+            "linux",
+            "freebsd"],
+        bugnumber="llvm.org/pr25819")
     def test_scope_after_using_directive_lookup_with_run_command(self):
         """Test scope lookup after using directive in lldb."""
         self.build()
         self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
 
-        lldbutil.run_break_set_by_file_and_line (self, "ns3.cpp", self.line_break_after_using_directive, num_expected_locations=1, loc_exact=False)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "ns3.cpp",
+            self.line_break_after_using_directive,
+            num_expected_locations=1,
+            loc_exact=False)
 
-        # Run to BP_after_using_directive at global scope after using declaration
+        # Run to BP_after_using_directive at global scope after using
+        # declaration
         self.runToBkpt("run")
         # Evaluate func2() - should call A::func2()
-        self.expect("expr -- func2()", startstr = "(int) $0 = 3")
+        self.expect("expr -- func2()", startstr="(int) $0 = 3")
 
-    @unittest2.expectedFailure("lldb scope lookup after using declaration bugs")
+    @unittest2.expectedFailure(
+        "lldb scope lookup after using declaration bugs")
     # NOTE: this test may fail on older systems that don't emit import
     # emtries in DWARF - may need to add checks for compiler versions here.
     def test_scope_after_using_declaration_lookup_with_run_command(self):
@@ -181,12 +262,18 @@ class NamespaceLookupTestCase(TestBase):
         self.build()
         self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
 
-        lldbutil.run_break_set_by_file_and_line (self, "ns2.cpp", self.line_break_nested_ns_scope_after_using, num_expected_locations=1, loc_exact=False)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "ns2.cpp",
+            self.line_break_nested_ns_scope_after_using,
+            num_expected_locations=1,
+            loc_exact=False)
 
-        # Run to BP_nested_ns_scope_after_using at nested ns scope after using declaration
+        # Run to BP_nested_ns_scope_after_using at nested ns scope after using
+        # declaration
         self.runToBkpt("run")
         # Evaluate func() - should call A::func()
-        self.expect("expr -- func()", startstr = "(int) $0 = 3")
+        self.expect("expr -- func()", startstr="(int) $0 = 3")
 
     @unittest2.expectedFailure("lldb scope lookup ambiguity after using bugs")
     def test_scope_ambiguity_after_using_lookup_with_run_command(self):
@@ -194,22 +281,38 @@ class NamespaceLookupTestCase(TestBase):
         self.build()
         self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
 
-        lldbutil.run_break_set_by_file_and_line (self, "ns3.cpp", self.line_break_after_using_directive, num_expected_locations=1, loc_exact=False)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "ns3.cpp",
+            self.line_break_after_using_directive,
+            num_expected_locations=1,
+            loc_exact=False)
 
-        # Run to BP_after_using_directive at global scope after using declaration
+        # Run to BP_after_using_directive at global scope after using
+        # declaration
         self.runToBkpt("run")
         # Evaluate func() - should get error: ambiguous
         # FIXME: This test fails because lldb removes duplicates if they have
         # the same type.
-        self.expect("expr -- func()", startstr = "error")
-
-    @expectedFailureAll(oslist=["windows", "linux", "freebsd"], bugnumber="llvm.org/pr25819")
+        self.expect("expr -- func()", startstr="error")
+
+    @expectedFailureAll(
+        oslist=[
+            "windows",
+            "linux",
+            "freebsd"],
+        bugnumber="llvm.org/pr25819")
     def test_scope_lookup_shadowed_by_using_with_run_command(self):
         """Test scope lookup shadowed by using in lldb."""
         self.build()
         self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
 
-        lldbutil.run_break_set_by_file_and_line (self, "ns2.cpp", self.line_break_nested_ns_scope, num_expected_locations=1, loc_exact=False)
+        lldbutil.run_break_set_by_file_and_line(
+            self,
+            "ns2.cpp",
+            self.line_break_nested_ns_scope,
+            num_expected_locations=1,
+            loc_exact=False)
 
         # Run to BP_nested_ns_scope at nested ns scope
         self.runToBkpt("run")
@@ -218,5 +321,4 @@ class NamespaceLookupTestCase(TestBase):
         # because A::B::func() shadows A::func(), but lldb intentionally
         # disobeys these rules so that the intended overload can be found
         # by only removing duplicates if they have the same type.
-        self.expect("expr -- func(10)", startstr = "(int) $0 = 13")
-
+        self.expect("expr -- func(10)", startstr="(int) $0 = 13")