Added support for catch breakpoints

fixes #269

Author: ZofiaZementa

.gdbinit

@@ -327,6 +327,7 @@ def format_value(value, compact=None):
 def fetch_breakpoints(watchpoints=False, pending=False):
     # fetch breakpoints addresses
     parsed_breakpoints = dict()
+    catch_what_regex = re.compile(r'([^,]+".*")?[^,]*')
     for line in run('info breakpoints').split('\n'):
         # just keep numbered lines
         if not line or not line[0].isdigit():
@@ -342,7 +343,11 @@ def fetch_breakpoints(watchpoints=False, pending=False):
                 address = None if is_multiple or is_pending else int(fields[4], 16)
                 is_enabled = fields[3] == 'y'
                 address_info = address, is_enabled
-                parsed_breakpoints[number] = [address_info], is_pending
+                parsed_breakpoints[number] = [address_info], is_pending, ''
+            elif len(fields) >= 5 and fields[1] == 'catchpoint':
+                # only take before comma, but ignore commas in quotes
+                what = catch_what_regex.search(' '.join(fields[4:]))[0].strip()
+                parsed_breakpoints[number] = [], False, what
             elif len(fields) >= 3 and number in parsed_breakpoints:
                 # add this address to the list of multiple locations
                 address = int(fields[2], 16)
@@ -351,7 +356,7 @@ def fetch_breakpoints(watchpoints=False, pending=False):
                 parsed_breakpoints[number][0].append(address_info)
             else:
                 # watchpoints
-                parsed_breakpoints[number] = [], False
+                parsed_breakpoints[number] = [], False, ''
         except ValueError:
             pass
     # fetch breakpoints from the API and complement with address and source
@@ -362,7 +367,7 @@ def fetch_breakpoints(watchpoints=False, pending=False):
         # skip internal breakpoints
         if gdb_breakpoint.number < 0:
             continue
-        addresses, is_pending = parsed_breakpoints[gdb_breakpoint.number]
+        addresses, is_pending, what = parsed_breakpoints[gdb_breakpoint.number]
         is_pending = getattr(gdb_breakpoint, 'pending', is_pending)
         if not pending and is_pending:
             continue
@@ -379,6 +384,7 @@ def fetch_breakpoints(watchpoints=False, pending=False):
         breakpoint['temporary'] = gdb_breakpoint.temporary
         breakpoint['hit_count'] = gdb_breakpoint.hit_count
         breakpoint['pending'] = is_pending
+        breakpoint['what'] = what
         # add addresses and source information
         breakpoint['addresses'] = []
         for address, is_enabled in addresses:
@@ -2223,7 +2229,8 @@ class Breakpoints(Dashboard.Module):
         gdb.BP_WATCHPOINT: 'watch',
         gdb.BP_HARDWARE_WATCHPOINT: 'write watch',
         gdb.BP_READ_WATCHPOINT: 'read watch',
-        gdb.BP_ACCESS_WATCHPOINT: 'access watch'
+        gdb.BP_ACCESS_WATCHPOINT: 'access watch',
+        gdb.BP_CATCHPOINT: 'catch'
     }
 
     def label(self):
@@ -2273,6 +2280,9 @@ class Breakpoints(Dashboard.Module):
                 # format user location
                 location = breakpoint['location']
                 line += ' for {}'.format(ansi(location, style))
+            elif breakpoint['type'] == gdb.BP_CATCHPOINT:
+                what = breakpoint['what']
+                line += ' {}'.format(ansi(what, style))
             else:
                 # format user expression
                 expression = breakpoint['expression']