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

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

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

{inscript_lang-1.9.14 → inscript_lang-2.0.1}/analyzer.py

@@ -1160,6 +1160,37 @@ class Analyzer(Visitor):
     def visit_BoolLiteralExpr(self, node: BoolLiteralExpr) -> InScriptType: return T_BOOL
     def visit_NullLiteralExpr(self, node: NullLiteralExpr) -> InScriptType: return T_NULL
 
+    def visit_FStringExpr(self, node) -> InScriptType:
+        """v1.9.15: $"..." and f"..." interpolated strings always produce T_STRING.
+        Type-check each {expr} segment by re-parsing and visiting it.
+        """
+        import re
+        template = node.template
+        for m in re.finditer(r'(?<!\x00)\{([^}\x00][^}]*)\}', template):
+            inner = m.group(1).strip()
+            # Strip optional format spec :spec
+            depth = 0; split_at = -1; ternary_depth = 0
+            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
+                    else: split_at = i; break
+            expr_src = inner[:split_at].strip() if split_at > 0 else inner
+            try:
+                from parser import parse
+                prog = parse(expr_src)
+                # visit each stmt in a suppressed-error sub-context
+                saved = self._errors; self._errors = []
+                try:
+                    for stmt in prog.body: self.visit(stmt)
+                finally:
+                    self._errors = saved
+            except Exception:
+                pass  # parse errors in sub-expr are caught at runtime
+        return T_STRING
+
     def visit_IdentExpr(self, node: IdentExpr) -> InScriptType:
         sym = self._lookup(node.name, node.line, node.col)
         return sym.type_
@@ -1741,6 +1772,12 @@ class Analyzer(Visitor):
         if s not in (T_INT, T_ANY) or e not in (T_INT, T_ANY):
             self._error(f"Range bounds must be int, got '{s}' and '{e}'",
                         node.line, node.col)
+        # v2.0.1: validate optional step expression
+        if node.step is not None:
+            st = self.visit(node.step)
+            if st not in (T_INT, T_ANY):
+                self._error(f"Range step must be int, got '{st}'",
+                            node.line, node.col)
         return InScriptType("Range", [T_INT])
 
     def visit_LambdaExpr(self, node: LambdaExpr) -> InScriptType:

{inscript_lang-1.9.14 → inscript_lang-2.0.1}/ast_nodes.py

@@ -195,10 +195,11 @@ class LambdaExpr(Node):
 
 @dataclass
 class RangeExpr(Node):
-    """0..10 (exclusive)  |  0..=10 (inclusive)"""
+    """0..10 (exclusive)  |  0..=10 (inclusive)  |  0..10 step 2  (v2.0.1)"""
     start:     Node
     end:       Node
-    inclusive: bool = False
+    inclusive: bool  = False
+    step:      object = None   # None = auto (1, or -1 if start > end)
 
 
 # ─────────────────────────────────────────────────────────────────────────────
@@ -560,10 +561,11 @@ class PropertyDecl(Node):
 
 @dataclass
 class RangeExpr(Node):
-    """0..10 (exclusive)  |  0..=10 (inclusive)"""
+    """0..10 (exclusive)  |  0..=10 (inclusive)  |  0..10 step 2  (v2.0.1)"""
     start:     Node
     end:       Node
-    inclusive: bool = False
+    inclusive: bool   = False
+    step:      object = None   # None = auto (1 ascending, -1 descending)
 
 @dataclass
 class LambdaExpr(Node):

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

@@ -24,7 +24,7 @@ from errors   import (InScriptError, LexerError, ParseError,
                        SemanticError, InScriptRuntimeError,
                        MultiError, InScriptWarning)
 
-VERSION = "1.9.14"
+VERSION = "2.0.1"
 
 MANIFEST_FILENAME = "inscript.toml"
 LOCK_FILENAME     = "inscript.lock"
@@ -703,9 +703,9 @@ def _check_v2_readiness(project_dir: str = ".") -> int:
     for fpath in ins_files:
         try:
             src = open(fpath, encoding="utf-8").read()
-            # Detect lines where // is used as a comment (standalone // line or // followed by a word)
+            # Only flag STANDALONE // lines — inline // is always floor division in v1.9.6+
             bad = [i+1 for i, l in enumerate(src.splitlines())
-                   if _re.match(r'^\s*//', l) or _re.search(r'\s//\s+[A-Za-z_]', l)]
+                   if _re.match(r'^\s*//', l)]
             if bad:
                 comment_hits.append((fpath, bad))
         except OSError:
@@ -785,9 +785,11 @@ def _migrate_files(path: str) -> int:
             # v1.9.6: // line comments → # line comments  (MUST run before div→// rewrite)
             # Rule 1: standalone comment lines — optional whitespace then //
             src = re.sub(r'^(\s*)//', r'\1#', src, flags=re.MULTILINE)
-            # Rule 2: inline word comment — ` // word` → ` # word`
-            # Fires only when identifier/word follows, not digit (digits are floor-div)
-            src = re.sub(r'(\s)//(\s+[A-Za-z_])', r'\1#\2', src)
+            # Rule 2: inline trailing comment — `; // word` or `} // word` → `; # word`
+            # v1.9.15: ONLY fires after statement terminators (;, {, }),
+            #          NOT after expression-ending chars like ), ], identifiers, digits.
+            #          This prevents floor-division like `(a*b) // gcd(a,b)` being mangled.
+            src = re.sub(r'([;{}])( *)//(\s+[A-Za-z_])', r'\1\2#\3', src)
             # Rule 3: warn about ambiguous ` // <digit>` patterns (may be comment or floor-div)
             ambiguous = re.findall(r'(\s)//(\s+\d)', src)
             if ambiguous:
@@ -2335,10 +2337,6 @@ Examples:
                       profile=profile)
 
 
-if __name__ == "__main__":
-    sys.exit(main())
-
-
 # ─────────────────────────────────────────────────────────────────────────────
 # v1.9.2 — Package Manifest Foundation
 # ─────────────────────────────────────────────────────────────────────────────
@@ -2690,3 +2688,7 @@ def _generate_lockfile(directory: str = ".") -> int:
     except OSError as e:
         print(f"[InScript lock] Cannot write lockfile: {e}", file=sys.stderr)
         return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())

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

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

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

@@ -2470,7 +2470,13 @@ class Interpreter(Visitor):
     def visit_RangeExpr(self, node: RangeExpr) -> Any:
         start = self.visit(node.start)
         end   = self.visit(node.end)
-        return InScriptRange(start, end, inclusive=node.inclusive)
+        # v2.0.1: optional `step` expression
+        if node.step is not None:
+            step = self.visit(node.step)
+        else:
+            # Auto-descend: if start > end, default step to -1
+            step = -1 if int(start) > int(end) else 1
+        return InScriptRange(start, end, step=step, inclusive=node.inclusive)
 
     def visit_AwaitExpr(self, node: AwaitExpr) -> Any:
         """

{inscript_lang-1.9.14 → inscript_lang-2.0.1}/lexer.py

@@ -365,7 +365,7 @@ class Lexer:
         self._error("Unterminated triple-quoted string", sl, sc)
 
     def _scan_fstring(self, quote: str, sl: int, sc: int):
-        """Scan f"...{expr}..." — store the raw template as FSTRING token.
+        """Scan f"...{expr}..." or $"...{expr}..." — store the raw template as FSTRING token. v1.9.15: $"..." is the new preferred syntax; both prefixes share this scanner.
         {{ and }} are literal brace escapes.
         Inside {}, quote characters are allowed (e.g. d["key"])."""
         chars = []
@@ -580,6 +580,12 @@ class Lexer:
         elif ch == "#":
             # v1.9.6: # is the line-comment character (was: HASH annotation token)
             self._skip_line_comment(); return
+        elif ch == "$":
+            # v1.9.15: $"..." interpolated string (preferred over f"...")
+            if self.current in ('"', "'"):
+                self._scan_fstring(self.advance(), sl, sc)
+                return
+            # bare $ not followed by quote — skip (not used otherwise)
         elif ch == "@":         emit(TT.AT,           "@")
         elif ch == "(":         emit(TT.LPAREN)
         elif ch == ")":         emit(TT.RPAREN)

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

@@ -1555,13 +1555,19 @@ class Parser:
         line, col = self._pos()
         left = self.parse_shift()
 
-        # Range: start..end  or  start..=end
+        # Range: start..end  or  start..=end  or  start..end step n  (v2.0.1)
         if self.check(TT.DOTDOT, TT.DOTDOT_EQ):
             inclusive = (self.current.type == TT.DOTDOT_EQ)
             self.advance()
             right = self.parse_shift()
+            # Optional `step` suffix: 0..20 step 2
+            step_expr = None
+            if (self.current and self.current.type == TT.IDENT
+                    and self.current.value == "step"):
+                self.advance()  # consume 'step'
+                step_expr = self.parse_shift()
             return RangeExpr(start=left, end=right, inclusive=inclusive,
-                             line=line, col=col)
+                             step=step_expr, line=line, col=col)
 
         # Membership: x in collection  /  x not in collection
         if self.check(TT.IN):

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

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

{inscript_lang-1.9.14 → inscript_lang-2.0.1}/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 = "1.9.14"
+VERSION = "2.0.1"
 
 # ── ANSI colours ──────────────────────────────────────────────────────────────
 def _c(code, text):

{inscript_lang-1.9.14 → inscript_lang-2.0.1}/stdlib_values.py

@@ -281,16 +281,25 @@ class InScriptRange:
         self.inclusive = inclusive
 
     def __iter__(self):
-        stop = self.end + 1 if self.inclusive else self.end
+        # v2.0.1: support negative step (descending ranges)
+        if self.step > 0:
+            stop = self.end + 1 if self.inclusive else self.end
+        else:
+            stop = self.end - 1 if self.inclusive else self.end
         return iter(range(self.start, stop, self.step))
 
     def __len__(self):
-        stop = self.end + 1 if self.inclusive else self.end
-        return max(0, (stop - self.start + self.step - 1) // self.step)
+        if self.step > 0:
+            stop = self.end + 1 if self.inclusive else self.end
+            return max(0, (stop - self.start + self.step - 1) // self.step)
+        else:
+            stop = self.end - 1 if self.inclusive else self.end
+            return max(0, (self.start - stop + (-self.step) - 1) // (-self.step))
 
     def __repr__(self):
         op = "..=" if self.inclusive else ".."
-        return f"{self.start}{op}{self.end}"
+        s = f" step {self.step}" if self.step not in (1, -1) else ("" if self.step == 1 else " step -1")
+        return f"{self.start}{op}{self.end}{s}"
 
 
 class InScriptGenerator: