Changeset 104402 in webkit

Timestamp:

Jan 8, 2012 8:46:40 AM (12 years ago)

Author:

haraken@chromium.org

Message:

Rewrite the CSS parser of prepare-ChangeLog with unittests.
​https://bugs.webkit.org/show_bug.cgi?id=75202

Reviewed by David Kilzer.

The current CSS parser can just parse simple CSSes like

foo bar baz {

property1: value;
property2: value;

}

, and cannot parse comments nor a CSS in which a selector and {
appears in different lines. This patch rewrites the CSS parser
(i.e. get_selector_line_ranges_for_css()) so that it can parse more CSSes
shown in css_unittests.css.

Test: Scripts/webkitperl/prepare-ChangeLog_unittest/resources/css_unittests.css

• Scripts/prepare-ChangeLog:

(get_selector_line_ranges_for_css):

• Scripts/webkitperl/prepare-ChangeLog_unittest/parser_unittests.pl:
• Scripts/webkitperl/prepare-ChangeLog_unittest/resources/css_unittests-expected.txt: Added.
• Scripts/webkitperl/prepare-ChangeLog_unittest/resources/css_unittests.css: Added.

(element1):
(element2):
(element3):
(element4.p):
(element5.p.q.r.s):
(element6#p):
(element7 element8):
(element9.p element10.q):
(element11#p element12#q):
(element13, element14):
(.p):
(#p):
(.p element15 #q element16.r element17#s):
(element18:target):
(element19):
(element20):
(element21):
(element22):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/prepare-ChangeLog (modified) (2 diffs)
• Scripts/webkitperl/prepare-ChangeLog_unittest/parser_unittests.pl (modified) (3 diffs)
• Scripts/webkitperl/prepare-ChangeLog_unittest/resources/css_unittests-expected.txt (added)
• Scripts/webkitperl/prepare-ChangeLog_unittest/resources/css_unittests.css (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-01-04  Kentaro Hara  <haraken@chromium.org>
+
+        Rewrite the CSS parser of prepare-ChangeLog with unittests.
+        https://bugs.webkit.org/show_bug.cgi?id=75202
+
+        Reviewed by David Kilzer.
+
+        The current CSS parser can just parse simple CSSes like
+
+            foo bar baz {
+                property1: value;
+                property2: value;
+            }
+
+        , and cannot parse comments nor a CSS in which a selector and {
+        appears in different lines. This patch rewrites the CSS parser
+        (i.e. get_selector_line_ranges_for_css()) so that it can parse more CSSes
+        shown in css_unittests.css.
+
+        Test: Scripts/webkitperl/prepare-ChangeLog_unittest/resources/css_unittests.css
+
+        * Scripts/prepare-ChangeLog:
+        (get_selector_line_ranges_for_css):
+        * Scripts/webkitperl/prepare-ChangeLog_unittest/parser_unittests.pl:
+        * Scripts/webkitperl/prepare-ChangeLog_unittest/resources/css_unittests-expected.txt: Added.
+        * Scripts/webkitperl/prepare-ChangeLog_unittest/resources/css_unittests.css: Added.
+        (element1):
+        (element2):
+        (element3):
+        (element4.p):
+        (element5.p.q.r.s):
+        (element6#p):
+        (element7 element8):
+        (element9.p element10.q):
+        (element11#p element12#q):
+        (element13, element14):
+        (.p):
+        (#p):
+        (.p element15 #q element16.r element17#s):
+        (element18:target):
+        (element19):
+        (element20):
+        (element21):
+        (element22):
+
 2012-01-04  Kentaro Hara  <haraken@chromium.org>
 

trunk/Tools/Scripts/prepare-ChangeLog

@@ -1394 +1394 @@
 # anything before an opening brace on a line. A selector starts at the line containing the opening
 # brace and ends at the closing brace.
-# FIXME: Comments are parsed just like uncommented text.
 #
 # Result is a list of triples: [ start_line, end_line, selector ].
@@ -1406 +1405 @@
     my $currentSelector = "";
     my $start = 0;
+    my $inComment = 0;
+    my $inBrace = 0;
 
     while (<$fileHandle>) {
-        if (/^[ \t]*(.*[^ \t])[ \t]*{/) {
-            $currentSelector = $1;
-            $start = $.;
-        }
-        if (index($_, "}") >= 0) {
-            unless ($start) {
-                warn "mismatched braces in $fileName\n";
-                next;
-            }
-            push(@ranges, [$start, $., $currentSelector]);
-            $currentSelector = "";
-            $start = 0;
-            next;
+        foreach my $token (split m-(\{|\}|/\*|\*/)-, $_) {
+            if ($token eq "{") {
+                if (!$inComment) {
+                    warn "mismatched brace found in $fileName\n" if $inBrace;
+                    $inBrace = 1;
+                }
+            } elsif ($token eq "}") {
+                if (!$inComment) {
+                    warn "mismatched brace found in $fileName\n" if !$inBrace;
+                    $inBrace = 0;
+                    push(@ranges, [$start, $., $currentSelector]);
+                    $currentSelector = "";
+                    $start = 0;
+                }
+            } elsif ($token eq "/*") {
+                $inComment = 1;
+            } elsif ($token eq "*/") {
+                warn "mismatched comment found in $fileName\n" if !$inComment;
+                $inComment = 0;
+            } else {
+                if (!$inComment and !$inBrace and $token !~ /^[\s\t]*$/) {
+                    $token =~ s/^[\s\t]*|[\s\t]*$//g;
+                    $currentSelector = $token;
+                    $start = $.;
+                }
+            }
         }
     }

trunk/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/parser_unittests.pl

@@ -33 +33 @@
 use LoadAsModule qw(PrepareChangeLog prepare-ChangeLog);
 
-my %testFiles = ("perl_unittests.pl" => "perl",
-                 "python_unittests.py" => "python",
-                 "java_unittests.java" => "java",
-                 "cpp_unittests.cpp" => "cpp",
-                 "javascript_unittests.js" => "javascript",
+my %testFiles = ("perl_unittests.pl" => "get_function_line_ranges_for_perl",
+                 "python_unittests.py" => "get_function_line_ranges_for_python",
+                 "java_unittests.java" => "get_function_line_ranges_for_java",
+                 "cpp_unittests.cpp" => "get_function_line_ranges_for_cpp",
+                 "javascript_unittests.js" => "get_function_line_ranges_for_javascript",
+                 "css_unittests.css" => "get_selector_line_ranges_for_css",
                 );
 
@@ -47 +48 @@
     my $basename = $testFile;
     $basename = $1 if $basename =~ /^(.*)\.[^\.]*$/;
-    push @testSet, {language => $testFiles{$testFile},
+    push @testSet, {method => $testFiles{$testFile},
                     inputFile => File::Spec->catdir($FindBin::Bin, "resources", $testFile),
                     expectedFile => File::Spec->catdir($FindBin::Bin, "resources", $basename . "-expected.txt")};
@@ -55 +56 @@
 foreach my $test (@testSet) {
     open FH, "< $test->{inputFile}" or die "Cannot open $test->{inputFile}: $!";
-    my $parser = eval "\\&PrepareChangeLog::get_function_line_ranges_for_$test->{language}";
+    my $parser = eval "\\&PrepareChangeLog::$test->{method}";
     my @actualOutput = $parser->(\*FH, $test->{inputFile});;
     close FH;