Skip to content
Permalink
Browse files
prepare-ChangeLog doesn't handle templates properly
https://bugs.webkit.org/show_bug.cgi?id=125853

Patch by Dániel Bátyai <dbatyai.u-szeged@partner.samsung.com> on 2013-12-18
Reviewed by Daniel Bates.

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

Canonical link: https://commits.webkit.org/143918@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@160769 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
dbatyai authored and webkit-commit-queue committed Dec 18, 2013
1 parent ec6694b commit a77824fb297990f6988f601b2189d7ac866e7df1
Showing 4 changed files with 23 additions and 1 deletion.
@@ -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 Daniel Bates.

* 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-18 Dániel Bátyai <Batyai.Daniel@stud.u-szeged.hu>

Move expectation parsing out of the constructor of TestExpectations
@@ -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) {
@@ -217,5 +217,10 @@
'320',
'Class108::func35'
],
[
'391',
'393',
'Class110<TemplateClass>::func36'
]
]
}
@@ -387,3 +387,7 @@ class Class109 {
};

};

void Class110<TemplateClass>::func36()
{
}

0 comments on commit a77824f

Please sign in to comment.