Changeset 189355 in webkit

Timestamp:

Sep 4, 2015 10:43:19 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

prepare-ChangeLog needs to know how to parse Swift files.
​https://bugs.webkit.org/show_bug.cgi?id=148784
<rdar://problem/22510062>

Patch by Jason Marcell <​jmarcell@apple.com> on 2015-09-04
Reviewed by Darin Adler.

• Scripts/prepare-ChangeLog:

(get_function_line_ranges): Added entry for get_function_line_ranges_for_swift.
(get_function_line_ranges_for_swift): Added function that knows how to parse Swift code.
(parseSwiftFunctionArgs): Added function that knows how to parse Swift function arguments.

• Scripts/webkitperl/prepare-ChangeLog_unittest/parser_unittests.pl: Added.
• Scripts/webkitperl/prepare-ChangeLog_unittest/resources/swift_unittests-expected.txt: Ditto.
• Scripts/webkitperl/prepare-ChangeLog_unittest/resources/swift_unittests.swift: Ditto.

(freeFunction): Ditto.
(MyClass.function): Ditto.
(MyClass.functionWithArgument(_:)): Ditto.
(MyClass.functionWithMoreArguments(_:arg2:)): Ditto.
(MyClass.functionWithNamedFirstArgument(argument:)): Ditto.
(MyClass.functionWithNamedFirstAndSecondArgument(first:second:)): Ditto.
(MyClass.classFunction): Ditto.
(MyClass.readWriteComputedVariable): Ditto.
(MyClass.readOnlyComputedVariable): Ditto.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2015-09-04  Jason Marcell  <jmarcell@apple.com>
+
+        prepare-ChangeLog needs to know how to parse Swift files.
+        https://bugs.webkit.org/show_bug.cgi?id=148784
+        <rdar://problem/22510062>
+
+        Reviewed by Darin Adler.
+
+        * Scripts/prepare-ChangeLog:
+        (get_function_line_ranges): Added entry for get_function_line_ranges_for_swift.
+        (get_function_line_ranges_for_swift): Added function that knows how to parse Swift code.
+        (parseSwiftFunctionArgs): Added function that knows how to parse Swift function arguments.
+        * Scripts/webkitperl/prepare-ChangeLog_unittest/parser_unittests.pl: Added.
+        * Scripts/webkitperl/prepare-ChangeLog_unittest/resources/swift_unittests-expected.txt: Ditto.
+        * Scripts/webkitperl/prepare-ChangeLog_unittest/resources/swift_unittests.swift: Ditto.
+        (freeFunction): Ditto.
+        (MyClass.function): Ditto.
+        (MyClass.functionWithArgument(_:)): Ditto.
+        (MyClass.functionWithMoreArguments(_:arg2:)): Ditto.
+        (MyClass.functionWithNamedFirstArgument(argument:)): Ditto.
+        (MyClass.functionWithNamedFirstAndSecondArgument(first:second:)): Ditto.
+        (MyClass.classFunction): Ditto.
+        (MyClass.readWriteComputedVariable): Ditto.
+        (MyClass.readOnlyComputedVariable): Ditto.
+
 2015-09-04  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/Scripts/prepare-ChangeLog

@@ -93 +93 @@
 sub get_function_line_ranges_for_perl($$);
 sub get_selector_line_ranges_for_css($$);
+sub get_function_line_ranges_for_swift($$);
+sub parseSwiftFunctionArgs($);
 sub isAddedStatus($);
 sub isConflictStatus($$$);
@@ -640 +642 @@
     return get_function_line_ranges_for_perl($file_handle, $file_name) if $file_name =~ /\.p[lm]$/;
     return get_function_line_ranges_for_python($file_handle, $file_name) if $file_name =~ /\.py$/ or $file_name =~ /master\.cfg$/;
+    return get_function_line_ranges_for_swift($file_handle, $file_name) if $file_name =~ /\.swift$/;
 
     # Try to determine the source language based on the script interpreter.
@@ -1719 +1722 @@
 
     return @ranges;
+}
+
+# Read a file and get all the line ranges of the things that look like Swift classes, methods,
+# or functions.
+#
+# Result is a list of triples: [ start_line, end_line, function ].
+
+sub get_function_line_ranges_for_swift($$)
+{
+    my ($fileHandle, $fileName) = @_;
+
+    my @ranges;
+
+    my $currentFunction = "";
+    my $currentClass = "";
+    my $functionStart = 0;
+    my $classStart = 0;
+    my $functionScopeDepth = 0;
+    my $classScopeDepth = 0;
+    my $scopeDepth = 0;
+
+    while (<$fileHandle>) {
+        chomp;
+        next if (/^\s*\/\/.*/);
+        if (/func\s+([\w_][\w\d_]*)\((.*)\)/ || /var\s+([\w_][\w\d_]*):\s+/) {
+            $functionScopeDepth = $scopeDepth;
+            $currentFunction = $1;
+            if ($2) {
+                $currentFunction = "$currentFunction(". parseSwiftFunctionArgs($2) . ")";
+            }
+            if ($currentClass) {
+                $currentFunction = "$currentClass.$currentFunction";
+            }
+            $functionStart = $.;
+        } elsif (/class\s+([\w_][\w\d_]*)/) {
+            $classScopeDepth = $scopeDepth;
+            $currentClass = $1;
+            $classStart = $.;
+        }
+        if (index($_, "{") > -1) {
+            $scopeDepth++;
+        }
+        if (index($_, "}") > -1) {
+            $scopeDepth--;
+        }
+        if ($scopeDepth == $functionScopeDepth) {
+            next unless $functionStart;
+            push(@ranges, [$functionStart, $., $currentFunction]);
+            $currentFunction = "";
+            $functionStart = 0;
+        } elsif ($scopeDepth == $classScopeDepth) {
+            next unless $classStart;
+            $currentClass = "";
+            $classStart = 0;
+        }
+    }
+
+    return @ranges;
+}
+
+sub parseSwiftFunctionArgs($)
+{
+    my ($functionArgs) = @_;
+    my @words = split /, /, $functionArgs;
+    my $argCount = scalar(@words);
+    if ($argCount == 0) {
+        return "";
+    } elsif ($argCount > 0) {
+        # If the first argument is unnamed, give it the name "_"
+        $words[0] =~ s/^(\w+: .*)/_ $1/;
+        return join("", map { $_ =~ s/^(\w+).*/$1/; "$_:" } @words);
+    } else {
+        warn "Unknown argument count.\n";
+    }
 }
 

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

@@ -44 +44 @@
                  "css_unittests.css" => "get_selector_line_ranges_for_css",
                  "css_unittests_warning.css" => "get_selector_line_ranges_for_css",
+                 "swift_unittests.swift" => "get_function_line_ranges_for_swift",
                 );