inscript-lang 2.0.1__tar.gz → 2.0.3__tar.gz

{inscript_lang-2.0.1 → inscript_lang-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: inscript-lang
-Version: 2.0.1
+Version: 2.0.3
 Summary: InScript — a game-focused scripting language with 59 game modules and a bytecode VM
 Author: Shreyasi Sarkar
 License: MIT

{inscript_lang-2.0.1 → inscript_lang-2.0.3}/inscript.py

@@ -24,7 +24,7 @@ from errors   import (InScriptError, LexerError, ParseError,
                        SemanticError, InScriptRuntimeError,
                        MultiError, InScriptWarning)
 
-VERSION = "2.0.1"
+VERSION = "2.0.3"
 
 MANIFEST_FILENAME = "inscript.toml"
 LOCK_FILENAME     = "inscript.lock"

{inscript_lang-2.0.1 → inscript_lang-2.0.3}/inscript_lang.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: inscript-lang
-Version: 2.0.1
+Version: 2.0.3
 Summary: InScript — a game-focused scripting language with 59 game modules and a bytecode VM
 Author: Shreyasi Sarkar
 License: MIT

{inscript_lang-2.0.1 → inscript_lang-2.0.3}/interpreter.py

@@ -993,7 +993,17 @@ class Interpreter(Visitor):
         return self.visit(node.expr)
 
     def visit_PrintStmt(self, node: PrintStmt) -> Any:
-        parts = [_inscript_str(self.visit(a)) for a in node.args]
+        # v2.0.3: spread args in print(...arr)
+        parts = []
+        for a in node.args:
+            if isinstance(a, SpreadExpr):
+                val = self.visit(a.expr)
+                if isinstance(val, list):
+                    parts.extend(_inscript_str(v) for v in val)
+                else:
+                    parts.append(_inscript_str(val))
+            else:
+                parts.append(_inscript_str(self.visit(a)))
         print(" ".join(parts))
         return None
 
@@ -2425,10 +2435,22 @@ class Interpreter(Visitor):
             fields[field.name] = self.visit(field.default) if field.default else None
 
         # Then overrides from initializer
+        # v2.0.3: spread syntax — P{...defaults, x: 5}
         provided_names = set()
         for name, value_node in node.fields:
-            fields[name] = self.visit(value_node)
-            provided_names.add(name)
+            if name == "..." and isinstance(value_node, SpreadExpr):
+                # Spread a dict, struct instance, or dict-like object
+                spread_val = self.visit(value_node.expr)
+                if isinstance(spread_val, InScriptInstance):
+                    for k, v in spread_val.fields.items():
+                        fields[k] = v; provided_names.add(k)
+                elif isinstance(spread_val, dict):
+                    for k, v in spread_val.items():
+                        if not str(k).startswith("_"):
+                            fields[k] = v; provided_names.add(k)
+            else:
+                fields[name] = self.visit(value_node)
+                provided_names.add(name)
 
         # BUG-16 fix: warn about required fields (no default) that were not provided
         missing_required = [
@@ -2516,41 +2538,76 @@ class Interpreter(Visitor):
         cond = self.visit(node.condition)
         return self.visit(node.then_expr) if cond else self.visit(node.else_expr)
 
+    @staticmethod
+    def _fstring_segments(template: str):
+        """v2.0.2: brace-depth-aware f-string segment splitter.
+        Returns list of (kind, text) where kind is "lit" or "expr".
+        Handles nested braces (match, for, object literals) correctly.
+        {{ and }} in source are stored as sentinel \x00{ and }\x00.
+        """
+        segments = []
+        i = 0
+        n = len(template)
+        lit_buf = []
+        while i < n:
+            ch = template[i]
+            # Sentinel escaped braces: \x00{ = literal {, }\x00 = literal }
+            if ch == "\x00" and i + 1 < n and template[i + 1] == "{":
+                lit_buf.append("{"); i += 2
+            elif ch == "}" and i + 1 < n and template[i + 1] == "\x00":
+                lit_buf.append("}"); i += 2
+            elif ch == "{":
+                # Start of an expression — find matching } with depth tracking
+                if lit_buf:
+                    segments.append(("lit", "".join(lit_buf))); lit_buf = []
+                depth = 1; j = i + 1; in_str = None
+                while j < n and depth > 0:
+                    c2 = template[j]
+                    if in_str:
+                        if c2 == "\\" and j + 1 < n: j += 2; continue
+                        if c2 == in_str: in_str = None
+                    elif c2 in ('"', "\'"):
+                        in_str = c2
+                    elif c2 == "{":
+                        depth += 1
+                    elif c2 == "}":
+                        depth -= 1
+                        if depth == 0: break
+                    j += 1
+                segments.append(("expr", template[i + 1:j]))
+                i = j + 1
+            else:
+                lit_buf.append(ch); i += 1
+        if lit_buf:
+            segments.append(("lit", "".join(lit_buf)))
+        return segments
+
     def visit_FStringExpr(self, node: FStringExpr) -> Any:
         """f"Hello {name}, score={score:.1f}" — evaluate {expr} segments at runtime.
+        v2.0.2: brace-depth-aware splitter handles match/for/object literals inside {}.
         Supports Python-style format specs: {x:.2f}, {n:06d}, {s:>20} etc.
-        {{ and }} in source produce literal braces (stored as \x00{ and }\x00 sentinels)."""
-        import re
+        {{ and }} in source produce literal braces."""
         result = []
-        template = node.template
-        pos = 0
-        for m in re.finditer(r'(?<!\x00)\{([^}\x00][^}]*)\}', template):
-            result.append(template[pos:m.start()])
-            inner = m.group(1).strip()
-
-            # Split off format spec: {expr:spec}
-            # Key: only split on ':' that is NOT inside brackets AND NOT after '?'
-            # (ternary x ? a : b uses ':' but it's not a format spec)
+        for kind, text in self._fstring_segments(node.template):
+            if kind == "lit":
+                result.append(text)
+                continue
+            inner = text.strip()
+            # Split off format spec {expr:spec}, respecting brackets and ternary
             fmt_spec = None
-            depth = 0
-            ternary_depth = 0
-            split_at = -1
+            depth = 0; ternary_depth = 0; split_at = -1
             for i, ch in enumerate(inner):
-                if ch in '([{': depth += 1
-                elif ch in ')]}': depth -= 1
-                elif ch == '?' and depth == 0: ternary_depth += 1
-                elif ch == ':' and depth == 0:
-                    if ternary_depth > 0:
-                        ternary_depth -= 1  # this ':' closes the ternary
-                    else:
-                        split_at = i
-                        break
+                if ch in "([{": depth += 1
+                elif ch in ")]}": depth -= 1
+                elif ch == "?" and depth == 0: ternary_depth += 1
+                elif ch == ":" and depth == 0:
+                    if ternary_depth > 0: ternary_depth -= 1
+                    else: split_at = i; break
             if split_at > 0:
-                expr_src = inner[:split_at].strip()
-                fmt_spec = inner[split_at+1:].strip()
+                expr_src  = inner[:split_at].strip()
+                fmt_spec  = inner[split_at + 1:].strip()
             else:
                 expr_src = inner
-
             try:
                 from parser import parse
                 prog = parse(expr_src)
@@ -2558,19 +2615,13 @@ class Interpreter(Visitor):
                 for stmt in prog.body:
                     val = self.visit(stmt)
                 if fmt_spec:
-                    # Apply Python format spec directly — supports .2f, 06d, >10s etc.
-                    try:
-                        result.append(format(val, fmt_spec))
-                    except Exception:
-                        result.append(_inscript_str(val))
+                    try:    result.append(format(val, fmt_spec))
+                    except: result.append(_inscript_str(val))
                 else:
                     result.append(_inscript_str(val))
             except Exception:
-                result.append(f"{{{inner}}}")
-            pos = m.end()
-        result.append(template[pos:])
-        final = "".join(result).replace("\x00{", "{").replace("}\x00", "}")
-        return final
+                result.append("{" + inner + "}")
+        return "".join(result)
 
     def visit_DestructureDecl(self, node: DestructureDecl) -> Any:
         """let [a, b, c] = arr  |  let {x, y} = point  |  let [[a,b],[c,d]] = nested"""

{inscript_lang-2.0.1 → inscript_lang-2.0.3}/parser.py

@@ -1369,12 +1369,19 @@ class Parser:
 
         self.expect(TT.LPAREN, "Expected '(' after 'print'")
         args = []
+        def _parse_print_arg():
+            # v2.0.3: allow spread in print(...args)
+            if self.check(TT.ELLIPSIS):
+                sl2, sc2 = self._pos()
+                self.advance()
+                return SpreadExpr(expr=self.parse_expr(), line=sl2, col=sc2)
+            return self.parse_expr()
         if not self.check(TT.RPAREN):
-            args.append(self.parse_expr())
+            args.append(_parse_print_arg())
             while self.match(TT.COMMA):
                 if self.check(TT.RPAREN):
                     break
-                args.append(self.parse_expr())
+                args.append(_parse_print_arg())
         self.expect(TT.RPAREN, "Expected ')' after print arguments")
         self.match(TT.SEMICOLON)
         return PrintStmt(args=args, line=line, col=col)
@@ -2072,18 +2079,29 @@ class Parser:
         result = (
             self.check(TT.RBRACE)   # empty  Counter {}
             or (self.current.type == TT.IDENT and self.peek.type == TT.COLON)
+            or self.current.type == TT.ELLIPSIS  # v2.0.3: spread P{...d}
         )
         self.pos = saved
         return result
 
     def parse_struct_init(self, name: str, line: int, col: int) -> StructInitExpr:
-        """Player { pos: Vec2(0,0), health: 100 }"""
+        """Player { pos: Vec2(0,0), health: 100 }
+        v2.0.3: spread syntax: Player { ...defaults, health: 100 }
+        """
         self.advance()  # consume '{'
         fields = []
 
         while not self.check(TT.RBRACE) and not self.is_at_end():
             if self.match(TT.SEMICOLON) or self.match(TT.COMMA):
                 continue
+            # v2.0.3: spread field — P{...defaults, x: 5}
+            if self.check(TT.ELLIPSIS):
+                sl2, sc2 = self._pos()
+                self.advance()  # consume '...'
+                spread_expr = self.parse_expr()
+                fields.append(("...", SpreadExpr(expr=spread_expr, line=sl2, col=sc2)))
+                self.match(TT.COMMA)
+                continue
             field_name = self.expect_ident("Expected field name in struct initializer")
             self.expect(TT.COLON, f"Expected ':' after field name '{field_name}'")
             value = self.parse_expr()

{inscript_lang-2.0.1 → inscript_lang-2.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "inscript-lang"
-version = "2.0.1"
+version = "2.0.3"
 description = "InScript — a game-focused scripting language with 59 game modules and a bytecode VM"
 readme = "README.md"
 license = { text = "MIT" }

{inscript_lang-2.0.1 → inscript_lang-2.0.3}/repl.py

@@ -40,7 +40,7 @@ sys.path.insert(0, str(Path(__file__).parent))
 
 HISTORY_FILE = Path.home() / ".inscript" / "history"
 HISTORY_FILE.parent.mkdir(parents=True, exist_ok=True)
-VERSION = "2.0.1"
+VERSION = "2.0.3"
 
 # ── ANSI colours ──────────────────────────────────────────────────────────────
 def _c(code, text):