diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rwxr-xr-x | gdb/make-target-delegates | 20 | ||||
| -rw-r--r-- | gdb/target.h | 3 |
3 files changed, 29 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5b79d6f4453..d17e2f695c7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,4 +1,12 @@ 2018-05-02 Pedro Alves <palves@redhat.com> + + * make-target-delegates (scan_target_h): Don't trim lines here. + Replace sequences of tabs and/or whitespace with a single + whitespace. + (top level, parsing methods): Trim each line before processing it + here. + +2018-05-02 Pedro Alves <palves@redhat.com> John Baldwin <jhb@freebsd.org> * target.h (enum strata) <debug_stratum>: New. diff --git a/gdb/make-target-delegates b/gdb/make-target-delegates index 10853e3e203..83a1afcadfb 100755 --- a/gdb/make-target-delegates +++ b/gdb/make-target-delegates @@ -102,7 +102,6 @@ sub scan_target_h() { # Strip // comments. $_ =~ s,//.*$,,; - $_ = trim ($_); $all_the_text .= $_; } @@ -110,6 +109,21 @@ sub scan_target_h() { # Now strip out the C comments. $all_the_text =~ s,/\*(.*?)\*/,,g; + # Replace sequences of tabs and/or whitespace with a single + # whitespace character. We need the whitespace because the method + # may have been split between multiple lines, like e.g.: + # + # virtual std::vector<long_type_name> + # my_long_method_name () + # TARGET_DEFAULT_IGNORE (); + # + # If we didn't preserve the whitespace, then we'd end up with: + # + # virtual std::vector<long_type_name>my_long_method_name ()TARGET_DEFAULT_IGNORE () + # + # ... which wouldn't later be parsed correctly. + $all_the_text =~ s/[\t\s]+/ /g; + return split (/;/, $all_the_text); } @@ -348,6 +362,10 @@ print "\n"; @argtypes_array = (); foreach $current_line (@lines) { + # See comments in scan_target_h. Here we strip away the leading + # and trailing whitespace. + $current_line = trim ($current_line); + next unless $current_line =~ m/$METHOD/; my $name = $+{name}; diff --git a/gdb/target.h b/gdb/target.h index b23b7625be3..f78eb459dc1 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1067,7 +1067,8 @@ struct target_ops /* Return a vector of all tracepoints markers string id ID, or all markers if ID is NULL. */ - virtual std::vector<static_tracepoint_marker> static_tracepoint_markers_by_strid (const char *id) + virtual std::vector<static_tracepoint_marker> + static_tracepoint_markers_by_strid (const char *id) TARGET_DEFAULT_NORETURN (tcomplain ()); /* Return a traceframe info object describing the current |