Changeset 90409 in webkit

Timestamp:

Jul 5, 2011 3:20:53 PM (13 years ago)

Author:

Adam Roben

Message:

Make prepare-ChangeLog include modified Perl functions in its ChangeLog template

This is a very simple first cut. Functions must start with a line that starts with "sub "
and end with a line that starts with a closing brace. No leading whitespace is allowed.
Package names aren't parsed at all.

Fixes <​http://webkit.org/b/21591> prepare-ChangeLog should know how to find functions in
Perl files

Reviewed by David Kilzer.

• Scripts/prepare-ChangeLog: Removed redundant code that ignored certain files when

searching for function line ranges. This is already done inside the get_function_line_ranges
function.
(get_function_line_ranges): Cleaned up coding style a little bit. Call
get_function_line_ranges_for_perl for files with .pl and .pm extensions. For files with an
unknown extension or no extension, read the shebang line to try to determine the script
interpreter. Call get_function_line_ranges_for_perl if the interpreter seems to be Perl.
(get_function_line_ranges_for_perl): Added. Does extremely basic parsing of the file to find
lines starting with "sub " or "}".

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-05  Adam Roben  <aroben@apple.com>
+
+        Make prepare-ChangeLog include modified Perl functions in its ChangeLog template
+
+        This is a very simple first cut. Functions must start with a line that starts with "sub "
+        and end with a line that starts with a closing brace. No leading whitespace is allowed.
+        Package names aren't parsed at all.
+
+        Fixes <http://webkit.org/b/21591> prepare-ChangeLog should know how to find functions in
+        Perl files
+
+        Reviewed by David Kilzer.
+
+        * Scripts/prepare-ChangeLog: Removed redundant code that ignored certain files when
+        searching for function line ranges. This is already done inside the get_function_line_ranges
+        function.
+        (get_function_line_ranges): Cleaned up coding style a little bit. Call
+        get_function_line_ranges_for_perl for files with .pl and .pm extensions. For files with an
+        unknown extension or no extension, read the shebang line to try to determine the script
+        interpreter. Call get_function_line_ranges_for_perl if the interpreter seems to be Perl.
+        (get_function_line_ranges_for_perl): Added. Does extremely basic parsing of the file to find
+        lines starting with "sub " or "}".
+
 2011-07-05  Adam Roben  <aroben@apple.com>
 

trunk/Tools/Scripts/prepare-ChangeLog

@@ -90 +90 @@
 sub get_function_line_ranges_for_java($$);
 sub get_function_line_ranges_for_javascript($$);
+sub get_function_line_ranges_for_perl($$);
 sub get_selector_line_ranges_for_css($$);
 sub method_decl_to_selector($);
@@ -208 +209 @@
     print STDERR "  Extracting affected function names from source files.\n";
     foreach my $file (keys %changed_line_ranges) {
-        # Only look for function names in certain source files.
-        next unless $file =~ /\.(c|cpp|m|mm|h|java|js)/;
-    
         # Find all the functions in the file.
         open SOURCE, $file or next;
@@ -495 +493 @@
     my ($file_handle, $file_name) = @_;
 
-    if ($file_name =~ /\.(c|cpp|m|mm|h)$/) {
-        return get_function_line_ranges_for_c ($file_handle, $file_name);
-    } elsif ($file_name =~ /\.java$/) {
-        return get_function_line_ranges_for_java ($file_handle, $file_name);
-    } elsif ($file_name =~ /\.js$/) {
-        return get_function_line_ranges_for_javascript ($file_handle, $file_name);
-    } elsif ($file_name =~ /\.css$/) {
-        return get_selector_line_ranges_for_css ($file_handle, $file_name);
-    }
+    # Try to determine the source language based on the file extension.
+
+    return get_function_line_ranges_for_c($file_handle, $file_name) if $file_name =~ /\.(c|cpp|m|mm|h)$/;
+    return get_function_line_ranges_for_java($file_handle, $file_name) if $file_name =~ /\.java$/;
+    return get_function_line_ranges_for_javascript($file_handle, $file_name) if $file_name =~ /\.js$/;
+    return get_selector_line_ranges_for_css($file_handle, $file_name) if $file_name =~ /\.css$/;
+    return get_function_line_ranges_for_perl($file_handle, $file_name) if $file_name =~ /\.p[lm]$/;
+
+    # Try to determine the source language based on the script interpreter.
+
+    my $first_line = <$file_handle>;
+    seek($file_handle, 0, 0);
+
+    return () unless $first_line =~ /^#!(\S+)/;
+    my $interpreter = $1;
+
+    return get_function_line_ranges_for_perl($file_handle, $file_name) if $interpreter =~ /perl$/;
+
     return ();
 }
@@ -1198 +1205 @@
     warn "mismatched braces in $fileName\n" if $bracesDepth;
     warn "mismatched parentheses in $fileName\n" if $parenthesesDepth;
+
+    return @ranges;
+}
+
+# Read a file and get all the line ranges of the things that look like Perl functions. Functions
+# start on a line that starts with "sub ", and end on the first line starting with "}" thereafter.
+#
+# Result is a list of triples: [ start_line, end_line, function ].
+
+sub get_function_line_ranges_for_perl($$)
+{
+    my ($fileHandle, $fileName) = @_;
+
+    my @ranges;
+
+    my $currentFunction = "";
+    my $start = 0;
+
+    while (<$fileHandle>) {
+        if (/^sub\s+([^(\s]+)/) {
+            # Skip over forward declarations, which don't contain a brace and end with a semicolon.
+            next if !/{/ && /;$/;
+
+            if ($currentFunction) {
+                warn "nested functions found at top-level at $fileName:$.\n";
+                next;
+            }
+            $currentFunction = $1;
+            $start = $.;
+        }
+        if (index($_, "}") == 0) {
+            next unless $start;
+            push(@ranges, [$start, $., $currentFunction]);
+            $currentFunction = "";
+            $start = 0;
+            next;
+        }
+    }
 
     return @ranges;