Move custom operator handling to scanner.c

.github/workflows/top-repos.yml

@@ -55,6 +55,16 @@ jobs:
           - 41
           - 42
           - 43
+          - 44
+          - 45
+          - 46
+          - 47
+          - 48
+          - 49
+          - 50
+          - 51
+          - 52
+          - 53
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}

corpus/expressions.txt

@@ -1142,3 +1142,24 @@ async(async: async, qos: qos, flags: flags) {
             (simple_identifier)
             (call_suffix
               (value_arguments))))))))
+
+================================================================================
+Assigning to the result of a force unwrap
+================================================================================
+
+stat[lang]! += 1
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (assignment
+    (directly_assignable_expression
+      (postfix_expression
+        (call_expression
+          (simple_identifier)
+          (call_suffix
+            (value_arguments
+              (value_argument
+                (simple_identifier)))))
+        (bang)))
+    (integer_literal)))

corpus/functions.txt

@@ -354,6 +354,8 @@ precedencegroup MyPrecedence {
 
 infix operator -=- : MyPrecedence
 
+infix operator •
+
 --------------------------------------------------------------------------------
 
 (source_file
@@ -371,7 +373,9 @@ infix operator -=- : MyPrecedence
         (simple_identifier))))
   (operator_declaration
     (custom_operator)
-    (simple_identifier)))
+    (simple_identifier))
+  (operator_declaration
+    (custom_operator)))
 
 ================================================================================
 Custom operator with another operator as a prefix

grammar.js

@@ -79,22 +79,6 @@ if (tree_sitter_version_supports_emoji()) {
   LEXICAL_IDENTIFIER = /[_\p{XID_Start}][_\p{XID_Continue}]*/;
 }
 
-const CUSTOM_OPERATORS = token(
-  choice(
-    // https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID418
-    // This supports a subset of the operators that Swift does but I'm really not concerned about the esoteric ones.
-    // Someone who wants unicode support can add it. What this does do is:
-    // * Avoid the reserved operators by saying that certain characters are only available if you don't start with them.
-    // * Entirely forbid `<` as the last char because it creates ambiguity with type arguments
-    /[\\<>&?=][\/=\-+!*%<>&|^?~\.]*[\/=\-+!*%>&|^?~]+/,
-    /[\-+!*%|^~]+[\/=\-+!*%<>&|^?~]*[\/=\-+!*%>&|^?~]+/,
-    /[\-+!*%|^~\.]+[\/=\-+!*%<>&|^?~\.]*[\/=\-+!*%>&|^?~\.]+/,
-    /[\/]+[=\-+!*%<>&|^?~]*[=\-+!*%>&|^?~]+/,
-    /[\/]+[=\-+!*%<>&|^?~\.]*[=\-+!*%>&|^?~\.]+/
-  )
-);
-// XXX need custom scanner for:
-// * Custom operators and `<` for type arguments
 module.exports = grammar({
   name: "swift",
   conflicts: ($) => [
@@ -115,12 +99,10 @@ module.exports = grammar({
     // After a `{` in a function or switch context, it's ambigous whether we're starting a set of local statements or
     // applying some modifiers to a capture or pattern.
     [$.modifiers],
-    // Custom operators get weird special handling for `<` characters in silly stuff like `func =<<<<T>(...)`
-    [$.custom_operator],
-    [$._prefix_unary_operator, $._referenceable_operator],
     // `+(...)` is ambigously either "call the function produced by a reference to the operator `+`" or "use the unary
     // operator `+` on the result of the parenthetical expression."
     [$._additive_operator, $._prefix_unary_operator],
+    [$._referenceable_operator, $._prefix_unary_operator],
     // `{ [self, b, c] ...` could be a capture list or an array literal depending on what else happens.
     [$.capture_list_item, $.self_expression],
     [$.capture_list_item, $._expression],
@@ -249,6 +231,7 @@ module.exports = grammar({
     $._as_quest_custom,
     $._as_bang_custom,
     $._async_keyword_custom,
+    $._custom_operator,
   ],
   inline: ($) => [$._locally_permitted_modifiers],
   rules: {
@@ -658,7 +641,7 @@ module.exports = grammar({
           field("rhs", $._expr_hack_at_ternary_binary_suffix)
         )
       ),
-    custom_operator: ($) => seq(CUSTOM_OPERATORS, optional("<")),
+    custom_operator: ($) => choice(token(/[\/]+[*]+/), $._custom_operator),
     // Suffixes
     navigation_suffix: ($) =>
       seq(
@@ -870,7 +853,7 @@ module.exports = grammar({
       prec.left(
         PRECS.lambda,
         seq(
-          "{",
+          choice("{", "^{"),
           optional($._lambda_type_declaration),
           optional($.statements),
           "}"
@@ -1066,7 +1049,8 @@ module.exports = grammar({
         $.navigation_expression,
         $.call_expression,
         $.tuple_expression,
-        $.self_expression
+        $.self_expression,
+        $.postfix_expression // Since `x[...]! = y` is legal
       ),
     ////////////////////////////////
     // Statements - https://docs.swift.org/swift-book/ReferenceManual/Statements.html
@@ -1423,14 +1407,7 @@ module.exports = grammar({
     _non_constructor_function_decl: ($) =>
       seq(
         "func",
-        field(
-          "name",
-          choice(
-            $.simple_identifier,
-            $._referenceable_operator,
-            $._bitwise_binary_operator
-          )
-        )
+        field("name", choice($.simple_identifier, $._referenceable_operator))
       ),
     _referenceable_operator: ($) =>
       choice(
@@ -1440,10 +1417,15 @@ module.exports = grammar({
         $._multiplicative_operator,
         $._equality_operator,
         $._comparison_operator,
+        $._assignment_and_operator,
         "++",
         "--",
         $.bang,
-        "~"
+        "~",
+        "|",
+        "^",
+        "<<",
+        ">>"
       ),
     // Hide the fact that certain symbols come from the custom scanner by aliasing them to their
     // string variants. This keeps us from having to see them in the syntax tree (which would be
@@ -1587,7 +1569,7 @@ module.exports = grammar({
       seq(
         choice("prefix", "infix", "postfix"),
         "operator",
-        $.custom_operator,
+        $._referenceable_operator,
         optional(seq(":", $.simple_identifier)),
         optional($.deprecated_operator_declaration_body)
       ),

script-data/known_failures.txt

@@ -1 +1 @@
-firefox-ios/Shared/Functions.swift
+ReactKit/ReactKitTests/OperationTests.swift

script-data/top-repositories.txt

@@ -41,3 +41,13 @@ Nuke kean/Nuke 11.1.1
 Swinject Swinject/Swinject 2.8.2
 GRDB groue/GRDB.swift v6.0.0-beta.3 0 2
 GRDB groue/GRDB.swift v6.0.0-beta.3 1 2
+Dance saoudrizwan/Dance v1.0.7
+StyleKit 146BC/StyleKit 0.7.0
+ReactKit ReactKit/ReactKit 0.12.0
+JASON delba/JASON 3.1.1
+Side-Menu Yalantis/Side-Menu.iOS 2.0.2
+C4iOS C4Labs/C4iOS 3.0.1
+Taylor izqui/Taylor 0.4.5
+Runes thoughtbot/Runes v5.1.0
+Overdrive saidsikira/Overdrive 0.3
+Tactile delba/Tactile 3.0.1