inscript-lang 1.7.1__tar.gz → 1.7.4__tar.gz

{inscript_lang-1.7.1 → inscript_lang-1.7.4}/PKG-INFO

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

{inscript_lang-1.7.1 → inscript_lang-1.7.4}/environment.py

@@ -16,9 +16,16 @@ class Environment:
         self.name:    str                    = name
         self._store:   Dict[str, Any]         = {}
         self._consts: set                    = set()   # names that cannot be reassigned
+        # v1.7.4: when True, `let` re-declarations silently re-bind (REPL mode)
+        self._repl_mode: bool                = False
 
     # ── Define ────────────────────────────────────────────────────────────────
     def define(self, name: str, value: Any, is_const: bool = False) -> None:
+        # v1.7.4: in REPL mode, re-declaring an existing non-const `let` just
+        # re-binds it.  Attempting to re-declare a const is still an error.
+        if self._repl_mode and name in self._store and name in self._consts:
+            raise InScriptRuntimeError(
+                f"Cannot re-declare constant '{name}' in REPL", 0)
         self._store[name]   = value
         if is_const:
             self._consts.add(name)

{inscript_lang-1.7.1 → inscript_lang-1.7.4}/errors.py

@@ -53,6 +53,9 @@ ERROR_CODES = {
     "MatchError":              "E0047",
     "PropertyError":           "E0048",
     "NilAccess":               "E0049",
+
+    # Deprecated-keyword hard errors (v1.7.4)
+    "NullKeyword":             "E0055",
 }
 
 DOCS_BASE = "https://docs.inscript.dev/errors"
@@ -103,11 +106,15 @@ class InScriptError(Exception):
         if self.hint:
             parts.append(f"  Hint: {self.hint}")
 
-        # Call trace (runtime only)
+        # Call trace (runtime only) — v1.7.3: entries are (fn, file, line, src) 4-tuples
         if self.call_trace:
             parts.append("\nCall stack (most recent last):")
-            for fn, file, ln in self.call_trace:
+            for entry in self.call_trace:
+                fn, file, ln = entry[0], entry[1], entry[2]
+                src = entry[3] if len(entry) > 3 else ""
                 parts.append(f"  File \"{file}\", line {ln}, in {fn}")
+                if src:
+                    parts.append(f"    {src}")
 
         # Docs link
         parts.append(f"  See: {DOCS_BASE}/{code}")
@@ -222,11 +229,12 @@ class InScriptWarning:
 # ─────────────────────────────────────────────────────────────────────────────
 
 class CallFrame:
-    __slots__ = ("fn_name", "file", "line")
-    def __init__(self, fn_name: str, file: str, line: int):
-        self.fn_name = fn_name
-        self.file    = file
-        self.line    = line
+    __slots__ = ("fn_name", "file", "line", "source_line")
+    def __init__(self, fn_name: str, file: str, line: int, source_line: str = ""):
+        self.fn_name     = fn_name
+        self.file        = file
+        self.line        = line
+        self.source_line = source_line   # v1.7.3: source snippet at this frame
 
     def as_tuple(self) -> Tuple[str, str, int]:
         return (self.fn_name, self.file, self.line)
@@ -239,40 +247,54 @@ class InScriptCallStack:
     """
     MAX_FRAMES = 200
 
-    def __init__(self, filename: str = "<script>"):
+    def __init__(self, filename: str = "<script>", src_lines: list = None):
         self._frames: List[CallFrame] = []
         self._file   = filename
+        self._src    = src_lines or []   # v1.7.3: source lines for per-frame snippets
+
+    def _lookup_src(self, line: int) -> str:
+        """Return stripped source line, or '' if unavailable."""
+        if self._src and 0 < line <= len(self._src):
+            return self._src[line - 1].strip()
+        return ""
 
     def push(self, fn_name: str, line: int):
         if len(self._frames) < self.MAX_FRAMES:
-            self._frames.append(CallFrame(fn_name, self._file, line))
+            self._frames.append(
+                CallFrame(fn_name, self._file, line, self._lookup_src(line))
+            )
 
     def pop(self):
         if self._frames:
             self._frames.pop()
 
     def snapshot(self) -> List[Tuple[str, str, int]]:
-        """Return a copy of current frames as list of (fn, file, line) tuples."""
-        return [f.as_tuple() for f in self._frames]
+        """Return a copy of current frames as (fn, file, line, source_line) 4-tuples.
+        Backwards-compatible: consumers that only unpack 3 elements still work."""
+        return [(f.fn_name, f.file, f.line, f.source_line) for f in self._frames]
 
     def update_top_line(self, line: int):
-        """Keep top frame's line number current as execution proceeds."""
-        if self._frames:
-            self._frames[-1].line = line
+        """v1.7.3: Keep top frame's line number AND source snippet current during execution."""
+        if self._frames and line:
+            f             = self._frames[-1]
+            f.line        = line
+            f.source_line = self._lookup_src(line)
 
     def format(self) -> str:
         if not self._frames:
             return ""
-        lines = ["Call stack (most recent last):"]
-        shown = self._frames
+        lines     = ["Call stack (most recent last):"]
+        shown     = self._frames
         truncated = 0
         if len(shown) > 20:
             truncated = len(shown) - 20
-            shown = shown[-20:]
+            shown     = shown[-20:]
         if truncated:
             lines.append(f"  ... {truncated} earlier frame(s) ...")
         for f in shown:
             lines.append(f'  File "{f.file}", line {f.line}, in {f.fn_name}')
+            if f.source_line:                        # v1.7.3: source snippet per frame
+                lines.append(f"    {f.source_line}")
         return "\n".join(lines)
 
 

{inscript_lang-1.7.1 → inscript_lang-1.7.4}/inscript.py

@@ -24,7 +24,7 @@ from errors   import (InScriptError, LexerError, ParseError,
                        SemanticError, InScriptRuntimeError,
                        MultiError, InScriptWarning)
 
-VERSION = "1.7.1"
+VERSION = "1.7.4"
 LANG    = "InScript"
 PACKAGES_DIR = os.path.join(os.path.expanduser("~"), ".inscript", "packages")
 REGISTRY_URL = "https://raw.githubusercontent.com/authorss81/inscript-packages/main/registry.json"

{inscript_lang-1.7.1 → inscript_lang-1.7.4}/inscript_lang.egg-info/PKG-INFO

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

{inscript_lang-1.7.1 → inscript_lang-1.7.4}/interpreter.py

@@ -39,7 +39,7 @@ class Interpreter(Visitor):
         self._env     = self._globals
         self._call_depth = 0
         self._MAX_CALL_DEPTH = 500
-        self._call_stack = InScriptCallStack(filename)   # Phase 3.4
+        self._call_stack = InScriptCallStack(filename, src_lines=source_lines)   # v1.7.3
 
         # v1.3.0: dispatch cache — build once, avoids getattr on every node visit
         self._dispatch: dict = {}
@@ -75,6 +75,22 @@ class Interpreter(Visitor):
 
     # ── entry point ───────────────────────────────────────────────────────────
 
+    # v1.7.3: Override Visitor.visit() to track current execution line in the
+    # top call-stack frame.  This makes stack-trace line numbers point to the
+    # exact statement that was executing when an error occurred, rather than
+    # the call-site where the function was entered.
+    def visit(self, node) -> Any:
+        line = getattr(node, 'line', 0)
+        if line:
+            self._call_stack.update_top_line(line)
+        cls = type(node)
+        try:
+            return self._dispatch[cls](node)
+        except KeyError:
+            method = getattr(self, f"visit_{cls.__name__}", self.generic_visit)
+            self._dispatch[cls] = method
+            return method(node)
+
     def run(self, program: Program) -> Any:
         """Execute a full program."""
         return self.visit(program)
@@ -1288,16 +1304,18 @@ class Interpreter(Visitor):
 
     def visit_ThrowStmt(self, node) -> Any:
         val = self.visit(node.value)
-        # BUG-11 fix: tag error with the InScript type name of the thrown value
-        # so that `catch e: string` can match when `throw "hello"` is used
         if isinstance(val, str):     etype = 'string'
         elif isinstance(val, bool):  etype = 'bool'
         elif isinstance(val, int):   etype = 'int'
         elif isinstance(val, float): etype = 'float'
         else:                         etype = 'Error'
-        err = InScriptRuntimeError(str(val), node.line)
-        err.error_type = etype
-        err.thrown_value = val
+        # v1.7.3: capture full call stack at throw time
+        trace = self._call_stack.snapshot()
+        err = InScriptRuntimeError(str(val), node.line,
+                                   source_line=self._src_line(node.line),
+                                   call_trace=trace)
+        err.error_type    = etype
+        err.thrown_value  = val
         raise err
 
     def visit_TryExpr(self, node) -> Any:
@@ -1488,12 +1506,13 @@ class Interpreter(Visitor):
     def visit_StringLiteralExpr(self,n): return n.value
     def visit_BoolLiteralExpr(self,  n): return n.value
     def visit_NullLiteralExpr(self, n):
-        # v1.7.4: 'null' keyword is a hard error; 'nil' is fine
+        # v1.7.4: 'null' keyword is a hard error; 'nil' is correct
         if getattr(n, '_is_null_keyword', False):
-            self._error(
+            raise InScriptRuntimeError(
                 "'null' was removed in v1.7.4 — use 'nil' instead. "
                 "Run: inscript migrate <file> to auto-fix.",
-                getattr(n, 'line', 0)
+                getattr(n, 'line', 0),
+                code="E0055",
             )
         return None
 

{inscript_lang-1.7.1 → inscript_lang-1.7.4}/parser.py

@@ -444,6 +444,9 @@ class Parser:
                             TT.STRING_TYPE, TT.VOID_TYPE, TT.IDENT):
                 name = tok.value
                 self.advance()
+            elif tok.type == TT.NIL:   # v1.7.2: nil as type annotation
+                name = "nil"
+                self.advance()
             else:
                 self._error(f"Expected type name, got '{tok.value}'")
             ann = TypeAnnotation(name=name, line=line, col=col)
@@ -885,9 +888,11 @@ class Parser:
         # e.g.  items: []   or  count: 0   or  value: nil
         type_ann = None
         _type_starts = (TT.IDENT, TT.INT_TYPE, TT.FLOAT_TYPE, TT.BOOL_TYPE,
-                        TT.STRING_TYPE, TT.VOID_TYPE, TT.LBRACE, TT.LPAREN)
+                        TT.STRING_TYPE, TT.VOID_TYPE, TT.LBRACE, TT.LPAREN,
+                        TT.NIL)   # v1.7.2: nil is a valid type (nullable/any)
         # Tokens that unambiguously start a literal default (not a type name)
-        _default_starts = (TT.NIL, TT.NULL, TT.BOOL, TT.INT, TT.FLOAT, TT.STRING, TT.MINUS)
+        # Note: TT.NIL removed — could be type OR default; handled by _type_starts
+        _default_starts = (TT.NULL, TT.BOOL, TT.INT, TT.FLOAT, TT.STRING, TT.MINUS)
 
         if self.check(TT.LBRACKET):
             if self.peek.type != TT.RBRACKET:

{inscript_lang-1.7.1 → inscript_lang-1.7.4}/pyproject.toml

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

{inscript_lang-1.7.1 → inscript_lang-1.7.4}/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.7.1"
+VERSION = "1.7.4"
 
 # ── ANSI colours ──────────────────────────────────────────────────────────────
 def _c(code, text):
@@ -434,6 +434,9 @@ class EnhancedREPL:
         self._history: List[str] = []
         self._session: List[str] = []
         self._last_src: str = ""
+        # v1.7.4: mark the root env as REPL-mode so `let` re-declarations
+        # silently re-bind instead of erroring ("let x=1" then "let x=2" works)
+        self._interp._env._repl_mode = True
         self._setup_readline()
 
     def _setup_readline(self):
@@ -457,6 +460,13 @@ class EnhancedREPL:
         from parser import Parser
         from errors import InScriptError
         t0 = time.perf_counter()
+
+        # v1.7.4: snapshot the top-level env so a runtime error can't corrupt
+        # previously-defined globals.  On error we restore the snapshot, which
+        # means any partial defines from the failed block are rolled back —
+        # already-defined names from prior REPL lines are always preserved.
+        env_snapshot = dict(self._interp._env._store)
+
         try:
             tokens  = Lexer(source).tokenize()
             program = Parser(tokens).parse()
@@ -474,8 +484,11 @@ class EnhancedREPL:
                 result = self._interp.run(program)
             return result, None, (time.perf_counter() - t0) * 1000
         except InScriptError as e:
+            # v1.7.4: restore globals so surviving names are untouched
+            self._interp._env._store = env_snapshot
             return None, _format_error(str(e), source), (time.perf_counter() - t0) * 1000
         except Exception as e:
+            self._interp._env._store = env_snapshot
             import traceback as _tb
             return None, f"Internal error: {e}\n{_tb.format_exc()}", (time.perf_counter() - t0) * 1000
 

{inscript_lang-1.7.1 → inscript_lang-1.7.4}/setup.py

@@ -11,7 +11,7 @@ from setuptools import setup, find_packages
 
 setup(
     name             = "inscript-lang",
-    version          = "1.7.1",
+    version          = "1.7.2",
     author           = "Shreyasi Sarkar",
     description      = "InScript — a game-focused scripting language for 2D games",
     long_description = open("README.md", encoding="utf-8").read(),