Attachment 219537 Details for Bug 125853 – Proposed patch

[patch] Proposed patch

proposedpatch.patch (text/plain), 2.49 KB, created by Dániel Bátyai on 2013-12-18 08:27:06 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Dániel Bátyai

Created: 2013-12-18 08:27:06 PST

Size: 2.49 KB

patch

obsolete

>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index c9673fd..c989d8b 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2013-12-18  DÃ¡niel BÃ¡tyai  <dbatyai.u-szeged@partner.samsung.com>
>+
>+        prepare-ChangeLog doesn't handle templates properly
>+        https://bugs.webkit.org/show_bug.cgi?id=125853
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/prepare-ChangeLog:
>+        (get_function_line_ranges_for_cpp):
>+        * Scripts/webkitperl/prepare-ChangeLog_unittest/resources/cpp_unittests-expected.txt:
>+        * Scripts/webkitperl/prepare-ChangeLog_unittest/resources/cpp_unittests.cpp:
>+        (Class110<TemplateClass>::func36):
>+
> 2013-12-17  Jer Noble  <jer.noble@apple.com>
> 
>         Fix TimeRanges::intersectWith
>diff --git a/Tools/Scripts/prepare-ChangeLog b/Tools/Scripts/prepare-ChangeLog
>index e6e7897..41d6b56 100755
>--- a/Tools/Scripts/prepare-ChangeLog
>+++ b/Tools/Scripts/prepare-ChangeLog
>@@ -762,7 +762,7 @@ sub get_function_line_ranges_for_cpp($$)
> 
> 
>         # Find function, interface and method names.
>-        while (m&((?:[[:word:]]+::)*operator(?:[ \t]*|[^()]*)|[[:word:]:~]+|[(){}:;=])|\@(?:implementation|interface|protocol)\s+(\w+)[^{]*&g) {
>+        while (m&((?:[[:word:]]+::)*operator(?:[ \t]*|[^()]*)|[[:word:]<>:~]+|[(){}:;=])|\@(?:implementation|interface|protocol)\s+(\w+)[^{]*&g) {
>             # Skip an array definition at the top level.
>             # e.g. static int arr[] = { 1, 2, 3 };
>             if ($1) {
>diff --git a/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/resources/cpp_unittests-expected.txt b/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/resources/cpp_unittests-expected.txt
>index c58560e..8f11f7a 100644
>--- a/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/resources/cpp_unittests-expected.txt
>+++ b/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/resources/cpp_unittests-expected.txt
>@@ -217,5 +217,10 @@
>       '320',
>       'Class108::func35'
>     ],
>+    [
>+      '391',
>+      '393',
>+      'Class110<TemplateClass>::func36'
>+    ]
>   ]
> }
>diff --git a/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/resources/cpp_unittests.cpp b/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/resources/cpp_unittests.cpp
>index 015a694..936f80b 100644
>--- a/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/resources/cpp_unittests.cpp
>+++ b/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/resources/cpp_unittests.cpp
>@@ -387,3 +387,7 @@ class Class109 {
> };
> 
> };
>+
>+void Class110<TemplateClass>::func36()
>+{
>+}

Actions: View | Formatted Diff | Diff

Attachments on bug 125853: 219512 | 219513 | 219530 | 219537