Allow subscripting of argless bangcalls

Addresses wcjohnson/lightscript#50
wcjohnson · Oct 19, 2017 · 60e1682 · 60e1682
1 parent b3eeb55
commit 60e1682
Show file tree

Hide file tree

Showing 13 changed files with 665 additions and 7 deletions.
diff --git a/src/plugins/bangCall.js b/src/plugins/bangCall.js
@@ -18,6 +18,17 @@ export default function(parser) {
     );
   };
 
+  pp.couldBeginSubscript = function() {
+    return (
+      this.match(tt.bracketL) ||
+      this.match(tt.parenL) ||
+      this.match(tt.dot) ||
+      this.match(tt.tilde) ||
+      this.match(tt.elvis) ||
+      this.isBang()
+    );
+  };
+
   // c/p parseExprListItem
   pp.parseBangArg = function () {
     let elt;
@@ -47,8 +58,18 @@ export default function(parser) {
       return this.finishNode(node, nodeType);
     }
 
+    // Disambiguate no-whitespace-after-! situations.
     if (this.state.lastTokEnd === this.state.start) {
-      this.unexpected(null, "Whitespace required between `!` and first argument.");
+      // If next token could initiate a subscript, treat as no-arg bang call with
+      // subscript.
+      if (this.couldBeginSubscript()) {
+        return this.finishNode(node, nodeType);
+      }
+
+      // Otherwise parse error.
+      if (this.state.type.startsExpr) {
+        this.unexpected(null, "Whitespace required between `!` and first argument.");
+      }
     }
 
     // Collect state

diff --git a/test/fixtures/bang-call/illegal/double-illegal/options.json b/test/fixtures/bang-call/illegal/double-illegal/options.json
diff --git a/test/fixtures/bang-call/illegal/paren-illegal/options.json b/test/fixtures/bang-call/illegal/paren-illegal/options.json
diff --git a/...ang-call/illegal/double-illegal/actual.js → ...ang-call/subscripts/double-bang/actual.js b/...ang-call/illegal/double-illegal/actual.js → ...ang-call/subscripts/double-bang/actual.js
diff --git a/test/fixtures/bang-call/subscripts/double-bang/expected.json b/test/fixtures/bang-call/subscripts/double-bang/expected.json
@@ -0,0 +1,104 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 6,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 6,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 0,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            }
+          },
+          "callee": {
+            "type": "CallExpression",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              }
+            },
+            "callee": {
+              "type": "Identifier",
+              "start": 0,
+              "end": 4,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 4
+                },
+                "identifierName": "bang"
+              },
+              "name": "bang"
+            },
+            "arguments": [],
+            "extra": {
+              "bang": true
+            }
+          },
+          "arguments": [],
+          "extra": {
+            "bang": true
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/...bang-call/illegal/paren-illegal/actual.js → ...g-call/subscripts/no-space-call/actual.js b/...bang-call/illegal/paren-illegal/actual.js → ...g-call/subscripts/no-space-call/actual.js
diff --git a/test/fixtures/bang-call/subscripts/no-space-call/expected.json b/test/fixtures/bang-call/subscripts/no-space-call/expected.json
@@ -0,0 +1,162 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "callee": {
+            "type": "CallExpression",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              }
+            },
+            "callee": {
+              "type": "Identifier",
+              "start": 0,
+              "end": 4,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 4
+                },
+                "identifierName": "bang"
+              },
+              "name": "bang"
+            },
+            "arguments": [],
+            "extra": {
+              "bang": true
+            }
+          },
+          "arguments": [
+            {
+              "type": "NumericLiteral",
+              "start": 6,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                }
+              },
+              "extra": {
+                "rawValue": 1,
+                "raw": "1"
+              },
+              "value": 1
+            },
+            {
+              "type": "NumericLiteral",
+              "start": 9,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                }
+              },
+              "extra": {
+                "rawValue": 2,
+                "raw": "2"
+              },
+              "value": 2
+            },
+            {
+              "type": "NumericLiteral",
+              "start": 12,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 12
+                },
+                "end": {
+                  "line": 1,
+                  "column": 13
+                }
+              },
+              "extra": {
+                "rawValue": 3,
+                "raw": "3"
+              },
+              "value": 3
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/test/fixtures/bang-call/subscripts/no-space-dot/actual.js b/test/fixtures/bang-call/subscripts/no-space-dot/actual.js
@@ -0,0 +1 @@
+bang!.x