rip-lang 3.13.18 → 3.13.21

package/package.json

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

package/src/components.js

@@ -397,7 +397,7 @@ export function installComponentSupport(CodeGenerator, Lexer) {
       // ─────────────────────────────────────────────────────────────────────
       // Implicit nesting (inject -> before INDENT)
       // ─────────────────────────────────────────────────────────────────────
-      if (nextToken && nextToken[0] === 'INDENT') {
+      if (nextToken && nextToken[0] === 'INDENT' && !nextToken.fromThen) {
         if (tag === '->' || tag === '=>' || tag === 'CALL_START' || tag === '(') {
           return 1;
         }
@@ -427,7 +427,7 @@ export function installComponentSupport(CodeGenerator, Lexer) {
           isTemplateElement = true;
         } else if (tag === 'IDENTIFIER' && isTemplateTag(token[1]) && !isAfterControlFlow) {
           isTemplateElement = true;
-        } else if (tag === 'PROPERTY' || tag === 'STRING' || tag === 'STRING_END' || tag === 'CALL_END' || tag === ')') {
+        } else if (tag === 'PROPERTY' || tag === 'STRING' || tag === 'STRING_END' || tag === 'IDENTIFIER' || tag === 'NUMBER' || tag === 'BOOL' || tag === 'CALL_END' || tag === ')') {
           isTemplateElement = startsWithTag(tokens, i);
         }
         else if (tag === 'IDENTIFIER' && i > 1 && tokens[i - 1][0] === '...') {

package/src/grammar/grammar.rip

@@ -565,6 +565,7 @@ grammar =
     o 'Statement POST_IF Expression'     , '["if", 3, [1]]'
     o 'Expression POST_IF Expression'    , '["if", 3, [1]]'
     o 'Expression POST_IF Expression ELSE INDENT Expression OUTDENT', '["?:", 3, 1, 6]'
+    o 'Expression POST_IF Expression ELSE Expression', '["?:", 3, 1, 5]'
     o 'Statement POST_UNLESS Expression' , '["if", ["!", 3], [1]]'
     o 'Expression POST_UNLESS Expression', '["if", ["!", 3], [1]]'
   ]

package/src/lexer.js

@@ -1393,7 +1393,8 @@ export class Lexer {
       }
 
       if (SINGLE_LINERS.has(tag) && this.tokens[i + 1]?.[0] !== 'INDENT' &&
-          !(tag === 'ELSE' && this.tokens[i + 1]?.[0] === 'IF')) {
+          !(tag === 'ELSE' && this.tokens[i + 1]?.[0] === 'IF') &&
+          !(tag === 'ELSE' && this.tokens[i - 1]?.[0] !== 'OUTDENT')) {
         starter = tag;
         [indent, outdent] = this.makeIndentation();
         if (tag === 'THEN') indent.fromThen = true;
@@ -1423,6 +1424,7 @@ export class Lexer {
 
     this.scanTokens((token, i) => {
       if (token[0] !== 'IF' && token[0] !== 'UNLESS') return 1;
+      if (this.tokens[i - 1]?.[0] === 'INTERPOLATION_START') return 1;
       original = token;
       this.detectEnd(i + 1, condition, action);
       return 1;