rip-lang 1.3.0 → 1.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rip-lang",
-  "version": "1.3.0",
+  "version": "1.3.3",
   "description": "A lightweight scripting language that compiles to modern JavaScript",
   "type": "module",
   "main": "src/compiler.js",
@@ -34,7 +34,7 @@
     "test": "bun test/runner.js",
     "version": "./bin/rip -v",
     "pack": "npm pack --dry-run",
-    "prepublishOnly": "bun run test && bun run browser"
+    "prepublishOnly": "bun run test"
   },
   "keywords": [
     "compiler",

package/src/codegen.js

@@ -413,6 +413,7 @@ export class CodeGenerator {
       case '&&':
       case '||':
       case '??':
+      case '!?':
       case '&':
       case '|':
       case '^':
@@ -430,6 +431,14 @@ export class CodeGenerator {
         // Binary operation (all operators)
         const [left, right] = rest;
 
+        // Special case: Otherwise operator (!?) - undefined-only coalescing
+        // Pattern: a !? b → (a !== undefined ? a : b)
+        if (head === '!?') {
+          const leftCode = this.generate(left, 'value');
+          const rightCode = this.generate(right, 'value');
+          return `(${leftCode} !== undefined ? ${leftCode} : ${rightCode})`;
+        }
+
         // Always use strict equality (CoffeeScript compatibility)
         // == → ===, != → !==, === → ===, !== → !==
         let op = head;
@@ -3145,11 +3154,11 @@ export class CodeGenerator {
         if (generated && !generated.endsWith(';')) {
           // Check if this statement type needs a semicolon
           const head = Array.isArray(stmt) ? stmt[0] : null;
-          // Control flow statements (if, for, while, switch, try) ending with } don't need semicolons
-          const controlFlowStatements = ['if', 'unless', 'for-in', 'for-of', 'while', 'until', 'loop', 'switch', 'try'];
-          const isControlFlow = controlFlowStatements.includes(head);
+          // Block statements ending with } don't need semicolons
+          const blockStatements = ['def', 'class', 'if', 'unless', 'for-in', 'for-of', 'for-from', 'while', 'until', 'loop', 'switch', 'try'];
+          const isBlockStatement = blockStatements.includes(head);
 
-          if (!isControlFlow || !generated.endsWith('}')) {
+          if (!isBlockStatement || !generated.endsWith('}')) {
             return generated + ';';
           }
         }

package/src/grammar/grammar.rip

@@ -751,6 +751,7 @@ grammar =
     o 'Expression && Expression'      , '["&&", 1, 3]'
     o 'Expression || Expression'      , '["||", 1, 3]'
     o 'Expression ?? Expression'      , '["??", 1, 3]'  # Nullish coalescing
+    o 'Expression !? Expression'      , '["!?", 1, 3]'  # Otherwise operator (undefined-only coalescing)
     o 'Expression RELATION Expression', '[2, 1, 3]'     # in, of, instanceof
 
     # Ternary operator (uses SPACE? token = ? with space before it)

package/src/grammar/solar.rip

@@ -14,7 +14,7 @@ import fs from 'fs'
 import path from 'path'
 import { fileURLToPath, pathToFileURL } from 'url'
 
-VERSION = '1.3.0-rip'
+VERSION = '1.3.1'
 
 # Token: A terminal symbol that cannot be broken down further
 class Token
@@ -84,6 +84,7 @@ class Generator
     @rules     = []
     @operators = {}
     @conflicts = 0
+    @conflictDetails = []  # Track conflict details for debugging
 
     # Initialize symbol table with special symbols
     @symbolTable = new Map
@@ -561,7 +562,34 @@ class Generator
             solution = @_resolveConflict item.rule, op, [REDUCE, item.rule.id], which
 
             if solution.bydefault
-              @conflicts++
+              # Categorize conflict type
+              isEmpty = item.rule.symbols.length is 0 or (item.rule.symbols.length is 1 and item.rule.symbols[0] is '')
+              isPassthrough = item.rule.symbols.length is 1 and types[item.rule.symbols[0]]  # Single nonterminal
+              hasPrecedence = op and item.rule.precedence > 0
+              isReduceReduce = which[0] is REDUCE
+
+              # Determine category
+              category = 'empty-optional' if isEmpty
+              category = 'passthrough' if !isEmpty and isPassthrough
+              category = 'precedence' if !isEmpty and !isPassthrough and hasPrecedence
+              category = 'reduce-reduce' if !isEmpty and !isPassthrough and !hasPrecedence and isReduceReduce
+              category = 'ambiguous' if !isEmpty and !isPassthrough and !hasPrecedence and !isReduceReduce
+
+              # Only count and track problematic conflicts (exclude benign ones)
+              if category is 'reduce-reduce' or category is 'ambiguous'
+                @conflicts++
+                @conflictDetails.push {
+                  state: k,
+                  lookahead: stackSymbol,
+                  lookaheadName: @tokenNames[@symbolIds[stackSymbol]] or stackSymbol,
+                  rule: item.rule.id,
+                  ruleType: item.rule.type,
+                  ruleSymbols: item.rule.symbols.join(' '),
+                  shift: if which[0] is SHIFT then which[1] else null,
+                  reduce: item.rule.id,
+                  resolution: if which[0] is SHIFT then 'shift' else 'reduce',
+                  category: category
+                }
             else
               action = solution.action
           else
@@ -851,11 +879,13 @@ if isRunAsScript
         -v, --version           Show version
         -i, --info              Show grammar information
         -s, --sexpr             Show grammar as s-expression
+        -c, --conflicts         Show conflict details (use with --info)
         -o, --output <file>     Output file (default: parser.js)
 
       Examples:
         solar grammar.js
         solar --info grammar.js
+        solar --info --conflicts grammar.js
         solar --sexpr grammar.js
         solar -o parser.js grammar.js
       """
@@ -877,25 +907,35 @@ if isRunAsScript
       • Conflicts: #{conflicts}
       """
 
+      # Show conflict details if requested
+      if options.conflicts and generator.conflictDetails?.length
+        console.log "\n🔧 Conflict Details (first 30):"
+        for conflict, i in generator.conflictDetails.slice(0, 30)
+          console.log "\n  #{i + 1}. State #{conflict.state}, lookahead '#{conflict.lookaheadName}':"
+          console.log "     Rule #{conflict.rule}: #{conflict.ruleType} → #{conflict.ruleSymbols}"
+          console.log "     Resolution: #{conflict.resolution} (by default)"
+
     # Parse command line
-    options = {help: false, version: false, info: false, sexpr: false, output: 'parser.js'}
+    options = {help: false, version: false, info: false, sexpr: false, conflicts: false, output: 'parser.js'}
     grammarFile = null
     i = 0
 
     while i < process.argv.length - 2
       arg = process.argv[i + 2]
       switch arg
-        when '-h', '--help'    then options.help    = true
-        when '-v', '--version' then options.version = true
-        when '-i', '--info'    then options.info    = true
-        when '-s', '--sexpr'   then options.sexpr   = true
-        when '-o', '--output'  then options.output  = process.argv[++i + 2]
+        when '-h', '--help'      then options.help      = true
+        when '-v', '--version'   then options.version   = true
+        when '-i', '--info'      then options.info      = true
+        when '-s', '--sexpr'     then options.sexpr     = true
+        when '-c', '--conflicts' then options.conflicts = true
+        when '-o', '--output'    then options.output    = process.argv[++i + 2]
         else grammarFile = arg unless arg.startsWith('-')
       i++
 
-    if options.help    then showHelp()    ; process.exit 0
-    if options.version then showVersion() ; process.exit 0
-    if not grammarFile then showHelp()    ; process.exit 0
+    if options.help      then showHelp()    ; process.exit 0
+    if options.version   then showVersion() ; process.exit 0
+    if not grammarFile   then showHelp()    ; process.exit 0
+    if options.conflicts then options.info = true  # --conflicts implies --info
 
     try
       unless fs.existsSync grammarFile
@@ -926,7 +966,8 @@ if isRunAsScript
               action ?= 1  # Default to 1 if not provided
               actionStr = if typeof action is 'string' then action else JSON.stringify(action)
               optsStr = if opts then " #{JSON.stringify(opts)}" else ''
-              parts.push "      (#{pattern || ''} #{actionStr}#{optsStr})"
+              patternStr = if pattern is '' then '""' else pattern
+              parts.push "      (#{patternStr} #{actionStr}#{optsStr})"
             parts.push "    )"
           parts.push '  )'
 

package/src/lexer.js

@@ -1756,8 +1756,9 @@ NUMBER = /^0b[01](?:_?[01])*n?|^0o[0-7](?:_?[0-7])*n?|^0x[\da-f](?:_?[\da-f])*n?
 // decimal without support for numeric literal separators for reference:
 // \d*\.?\d+ (?:e[+-]?\d+)?
 
-OPERATOR = /^(?:[-=]>|===|!==|\?\?|=~|[-+*\/%<>&|^!?=]=|>>>=?|([-+:])\1|([&|<>*\/%])\2=?|\?(\.|::)|\.{2,3})/; // function
+OPERATOR = /^(?:[-=]>|===|!==|!\?|\?\?|=~|[-+*\/%<>&|^!?=]=|>>>=?|([-+:])\1|([&|<>*\/%])\2=?|\?(\.|::)|\.{2,3})/; // function
 // Added === and !== for explicit strict equality (compiles same as == and !=)
+// !? (otherwise operator) must come before ?? and before !=
 // ?? must come before single ? to match correctly
 // regex match operator
 // compound assign / compare / strict equality