Changeset 181696 in webkit

Timestamp:

Mar 18, 2015, 9:27:07 AM (11 years ago)

Author:

mitz@apple.com

Message:

prepare-ChangeLog doesn't understand C string literals split across multiple lines with \
​https://bugs.webkit.org/show_bug.cgi?id=142815

Reviewed by Darin Adler.

• Scripts/prepare-ChangeLog:

(get_function_line_ranges_for_cpp): If the line ends with a backslash instead of a matching
quotation mark, use new variable $quotation_mark to remember what we are looking for, and
keep consuming the quoted text until the matching quotation mark is reached. Emit the
warning only if a line ends without a backslash before the matching quotation mark was found.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/prepare-ChangeLog (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-03-18  Dan Bernstein  <mitz@apple.com>
+
+        prepare-ChangeLog doesn't understand C string literals split across multiple lines with \
+        https://bugs.webkit.org/show_bug.cgi?id=142815
+
+        Reviewed by Darin Adler.
+
+        * Scripts/prepare-ChangeLog:
+        (get_function_line_ranges_for_cpp): If the line ends with a backslash instead of a matching
+        quotation mark, use new variable $quotation_mark to remember what we are looking for, and
+        keep consuming the quoted text until the matching quotation mark is reached. Emit the
+        warning only if a line ends without a backslash before the matching quotation mark was found.
+
 2015-03-18  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Tools/Scripts/prepare-ChangeLog

@@ -698 +698 @@
     my $in_method_declaration = 0;
     my $in_parentheses = 0;
+    my $quotation_mark;
     my $in_braces = 0;
     my $in_toplevel_array_brace = 0;
@@ -724 +725 @@
 
     while (<$file_handle>) {
+        # Handle continued quoted string.
+        if ($quotation_mark) {
+            if (!s-([^\\]|\\.)*$quotation_mark--) {
+                if (!m-\\$-) {
+                    warn "mismatched quotes at line $. in $file_name\n";
+                    undef $quotation_mark;
+                }
+                next;
+            }
+            undef $quotation_mark;
+        }
+
         # Handle continued multi-line comment.
         if ($in_comment) {
@@ -754 +767 @@
             } else { # ' or "
                 if (!s-$match([^\\]|\\.)*?$match--) {
-                    warn "mismatched quotes at line $. in $file_name\n";
-                    s-$match.*--;
+                    if (!s-$match.*\\$--) {
+                        warn "mismatched quotes at line $. in $file_name\n";
+                        s-$match.*--;
+                    } else {
+                        $quotation_mark = $match;
+                    }
                 }
             }