rip-lang 2.7.3 → 2.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rip-lang",
-  "version": "2.7.3",
+  "version": "2.8.1",
   "description": "A modern language that compiles to JavaScript",
   "type": "module",
   "main": "src/compiler.js",

package/src/lexer.js

@@ -1,4 +1,4 @@
-var BALANCED_PAIRS, BOM, BOOL, CALLABLE, CALL_CLOSERS, CODE, COMMENT, COMPARABLE_LEFT_SIDE, COMPARE, COMPOUND_ASSIGN, CONTROL_IN_IMPLICIT, DISCARDED, EXPRESSION_CLOSE, EXPRESSION_END, EXPRESSION_START, HERECOMMENT_ILLEGAL, HEREDOC_DOUBLE, HEREDOC_INDENT, HEREDOC_SINGLE, HEREGEX, HEREGEX_COMMENT, HERE_JSTOKEN, IDENTIFIER, IMPLICIT_CALL, IMPLICIT_END, IMPLICIT_FUNC, IMPLICIT_UNSPACED_CALL, INDENTABLE_CLOSERS, INDEXABLE, INVERSES, JSTOKEN, JS_KEYWORDS, LINEBREAKS, LINE_BREAK, LINE_CONTINUER, MATH, MULTI_DENT, NOT_REGEX, NUMBER, OPERATOR, POSSIBLY_DIVISION, REGEX, REGEX_FLAGS, REGEX_ILLEGAL, REGEX_INVALID_ESCAPE, RELATION, RESERVED, RIP_ALIASES, RIP_ALIAS_MAP, RIP_KEYWORDS, Rewriter, SHIFT, SINGLE_CLOSERS, SINGLE_LINERS, STRICT_PROSCRIBED, STRING_DOUBLE, STRING_INVALID_ESCAPE, STRING_SINGLE, STRING_START, TRAILING_SPACES, UNARY, UNARY_MATH, UNFINISHED, VALID_FLAGS, WHITESPACE, addTokenData, generate, isForFrom, k, key, left, len, moveComments, right, indexOf = [].indexOf, slice = [].slice, hasProp = {}.hasOwnProperty;
+var BALANCED_PAIRS, BOM, BOOL, CALLABLE, CALL_CLOSERS, CODE, COMMENT, COMPARABLE_LEFT_SIDE, COMPARE, COMPOUND_ASSIGN, CONTROL_IN_IMPLICIT, DISCARDED, EXPRESSION_CLOSE, EXPRESSION_END, EXPRESSION_START, HERECOMMENT_ILLEGAL, HEREDOC_DOUBLE, HEREDOC_INDENT, HEREDOC_SINGLE, HEREGEX, HEREGEX_COMMENT, HERE_JSTOKEN, IDENTIFIER, IMPLICIT_CALL, IMPLICIT_COMMA_BEFORE_ARROW, IMPLICIT_END, IMPLICIT_FUNC, IMPLICIT_UNSPACED_CALL, INDENTABLE_CLOSERS, INDEXABLE, INVERSES, JSTOKEN, JS_KEYWORDS, LINEBREAKS, LINE_BREAK, LINE_CONTINUER, MATH, MULTI_DENT, NOT_REGEX, NUMBER, OPERATOR, POSSIBLY_DIVISION, REGEX, REGEX_FLAGS, REGEX_ILLEGAL, REGEX_INVALID_ESCAPE, RELATION, RESERVED, RIP_ALIASES, RIP_ALIAS_MAP, RIP_KEYWORDS, Rewriter, SHIFT, SINGLE_CLOSERS, SINGLE_LINERS, STRICT_PROSCRIBED, STRING_DOUBLE, STRING_INVALID_ESCAPE, STRING_SINGLE, STRING_START, TRAILING_SPACES, UNARY, UNARY_MATH, UNFINISHED, VALID_FLAGS, WHITESPACE, addTokenData, generate, isForFrom, k, key, left, len, moveComments, right, indexOf = [].indexOf, slice = [].slice, hasProp = {}.hasOwnProperty;
 
 // The Rip Lexer. Uses a series of token-matching regexes to attempt
 // matches against the beginning of the source code. When a match is found,
@@ -2061,6 +2061,7 @@ Rewriter = (function() {
       this.convertPostfixSpreadRest();
       this.tagPostfixConditionals();
       this.addImplicitBracesAndParens();
+      this.addImplicitCallCommas();
       this.rescueStowawayComments();
       this.addLocationDataToGeneratedTokens();
       this.fixIndentationLocationData();
@@ -2428,7 +2429,8 @@ Rewriter = (function() {
         // Recognize standard implicit calls like
         // f a, f() b, f? c, h[0] d etc.
         // Added support for spread dots on the left side: f ...a
-        if ((indexOf.call(IMPLICIT_FUNC, tag) >= 0 && token.spaced || tag === '?' && i > 0 && !tokens[i - 1].spaced) && (indexOf.call(IMPLICIT_CALL, nextTag) >= 0 || (nextTag === '...' && (ref = this.tag(i + 2), indexOf.call(IMPLICIT_CALL, ref) >= 0) && !this.findTagsBackwards(i, ['INDEX_START', '['])) || indexOf.call(IMPLICIT_UNSPACED_CALL, nextTag) >= 0 && !nextToken.spaced && !nextToken.newLine) && !inControlFlow()) {
+        // Don't treat `] ->` or `} ->` as implicit calls (these become args with comma insertion)
+        if ((indexOf.call(IMPLICIT_FUNC, tag) >= 0 && token.spaced || tag === '?' && i > 0 && !tokens[i - 1].spaced) && (indexOf.call(IMPLICIT_CALL, nextTag) >= 0 || (nextTag === '...' && (ref = this.tag(i + 2), indexOf.call(IMPLICIT_CALL, ref) >= 0) && !this.findTagsBackwards(i, ['INDEX_START', '['])) || indexOf.call(IMPLICIT_UNSPACED_CALL, nextTag) >= 0 && !nextToken.spaced && !nextToken.newLine) && !inControlFlow() && !((tag === ']' || tag === '}') && (nextTag === '->' || nextTag === '=>'))) {
           if (tag === '?') {
             tag = token[0] = 'FUNC_EXIST';
           }
@@ -2589,6 +2591,33 @@ Rewriter = (function() {
       });
     }
 
+    // Insert commas before arrow functions in implicit calls.
+    // Allows: get '/users' -> ... instead of: get '/users', -> ...
+    // Works with literals that would otherwise be syntax errors before arrows.
+    addImplicitCallCommas() {
+      var callDepth, i, prevTag, ref, tag, tokens;
+      tokens = this.tokens;
+      callDepth = 0;
+      i = 0;
+      while (i < tokens.length) {
+        tag = tokens[i][0];
+        prevTag = i > 0 ? tokens[i - 1][0] : null;
+        // Track call depth
+        if (tag === 'CALL_START' || tag === '(') {
+          callDepth++;
+        } else if (tag === 'CALL_END' || tag === ')') {
+          callDepth--;
+        }
+        // Inside a call, if we see -> or => preceded by a literal value, insert comma
+        if (callDepth > 0 && (tag === '->' || tag === '=>') &&
+            (ref = prevTag, indexOf.call(IMPLICIT_COMMA_BEFORE_ARROW, ref) >= 0)) {
+          tokens.splice(i, 0, generate(',', ',', tokens[i], tokens[i - 1]));
+          i++;  // Skip past the inserted comma
+        }
+        i++;
+      }
+    }
+
     // Not all tokens survive processing by the parser. To avoid comments getting
     // lost into the ether, find comments attached to doomed tokens and move them
     // to a token that will make it to the other side.
@@ -3223,6 +3252,9 @@ IMPLICIT_UNSPACED_CALL = ['+', '-'];
 // Tokens that always mark the end of an implicit call for single-liners.
 IMPLICIT_END = ['POST_IF', 'FOR', 'WHILE', 'UNTIL', 'WHEN', 'BY', 'LOOP', 'TERMINATOR'];
 
+// Literals that trigger comma insertion before arrows: get '/path' -> ... becomes get('/path', -> ...)
+IMPLICIT_COMMA_BEFORE_ARROW = ['STRING', 'STRING_END', 'REGEX', 'REGEX_END', 'NUMBER', 'BOOL', 'NULL', 'UNDEFINED', 'INFINITY', 'NAN', ']', '}'];
+
 // Single-line flavors of block expressions that have unclosed endings.
 // The grammar can't disambiguate them, so we insert the implicit indentation.
 SINGLE_LINERS = ['ELSE', '->', '=>', 'TRY', 'FINALLY', 'THEN'];