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

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

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

{inscript_lang-1.7.4 → inscript_lang-1.8.2}/analyzer.py

@@ -87,6 +87,45 @@ def array_type(elem: InScriptType) -> InScriptType:
 def dict_type(key: InScriptType, val: InScriptType) -> InScriptType:
     return InScriptType("Dict", [key, val])
 
+def union_type(*members: InScriptType) -> InScriptType:
+    """v1.8.1: Create a Union type from two or more member types.
+    Flattens nested unions; deduplicates; single-member unions collapse."""
+    flat = []
+    seen = set()
+    for m in members:
+        if m.name == "Union":
+            for p in m.params:
+                if p not in seen:
+                    flat.append(p); seen.add(p)
+        else:
+            if m not in seen:
+                flat.append(m); seen.add(m)
+    if len(flat) == 1:
+        return flat[0]
+    return InScriptType("Union", flat)
+
+def optional_type(inner: InScriptType) -> InScriptType:
+    """v1.8.1: `T?` is sugar for `T | nil`."""
+    return union_type(inner, T_NULL)
+
+def union_members(t: InScriptType) -> list:
+    """v1.8.1: Return list of member types (works on non-unions too)."""
+    return t.params if t.name == "Union" else [t]
+
+def literal_type(value: str) -> InScriptType:
+    """v1.8.2: A string-literal type like `"left"` or `"right"`."""
+    return InScriptType("__literal__", [value])   # params[0] is the string value
+
+def fn_type(param_types: list, return_type: InScriptType) -> InScriptType:
+    """v1.8.2: A function type `fn(int,string)->bool`."""
+    return InScriptType("__fn__", param_types + [return_type])
+
+def is_literal_type(t: InScriptType) -> bool:
+    return t.name == "__literal__"
+
+def literal_value(t: InScriptType) -> str:
+    return t.params[0] if t.params else ""
+
 def is_numeric(t: InScriptType) -> bool:
     return t in (T_INT, T_FLOAT)
 
@@ -104,8 +143,36 @@ def types_compatible(expected: InScriptType, got: InScriptType) -> bool:
     if expected == got: return True
     # int can widen to float
     if expected == T_FLOAT and got == T_INT: return True
-    # null can be assigned to any type
-    if got == T_NULL: return True
+    # null/nil can be assigned to any nullable or union containing nil
+    if got == T_NULL:
+        if expected == T_NULL: return True
+        if expected.name == "Union" and T_NULL in expected.params: return True
+        return False
+    # v1.8.1: if expected is a Union, got must be a member (or compatible with one)
+    if expected.name == "Union":
+        return any(types_compatible(m, got) for m in expected.params)
+    # v1.8.1: if got is a Union, every member must be compatible with expected
+    if got.name == "Union":
+        return all(types_compatible(expected, m) for m in got.params)
+    # v1.8.2: string literal type — `"left"` is compatible with string
+    if is_literal_type(expected):
+        # Expected a specific literal: got must be the same literal
+        if is_literal_type(got):
+            return literal_value(expected) == literal_value(got)
+        # A plain string variable can fill a literal slot (runtime check)
+        return got == T_STRING
+    if is_literal_type(got):
+        # A literal can always fill a plain string slot
+        if expected == T_STRING: return True
+        # A literal can fill a Union<string, ...> slot
+        if expected.name == "Union":
+            return any(types_compatible(m, got) for m in expected.params)
+        return False
+    # v1.8.2: fn types — compatible if same signature, or got is T_ANY/Function (lambda)
+    if expected.name == "__fn__":
+        if got == T_ANY: return True
+        if got.name in ("Function", "__fn__"): return True
+        return False
     # Array<X> compatible with Array<any> and vice versa
     if expected.name == "Array" and got.name == "Array": return True
     # Dict<K,V> compatible with Dict<any,any>
@@ -199,6 +266,7 @@ class Analyzer(Visitor):
         self._in_scene:    bool = False
         self._in_match_arm: bool = False
         self._struct_defs: Dict[str, StructDecl] = {}
+        self._type_aliases: Dict[str, "InScriptType"] = {}  # v1.8.2: registered aliases
 
         # Pre-register built-in global functions
         self._register_builtins()
@@ -291,9 +359,33 @@ class Analyzer(Visitor):
             v = self._resolve_type_ann(ann.generics[0]) if ann.generics else T_ANY
             return dict_type(k, v)
 
+        # v1.8.1: `T?` — nullable shorthand
+        if ann.is_nullable or ann.name == "Optional":
+            inner = self._resolve_type_ann(ann.generics[0]) if ann.generics else T_ANY
+            return optional_type(inner)
+
+        # v1.8.1: `A | B | C` — union type
+        if ann.name == "Union":
+            members = [self._resolve_type_ann(g) for g in ann.generics]
+            return union_type(*members)
+
+        # v1.8.2: string literal type — `"left"`
+        if ann.name == "__literal__":
+            return literal_type(ann.literal_value or "")
+
+        # v1.8.2: fn type — `fn(int) -> bool`
+        if ann.name == "__fn__":
+            params = [self._resolve_type_ann(p) for p in (ann.fn_params or [])]
+            ret    = self._resolve_type_ann(ann.fn_return) if ann.fn_return else T_ANY
+            return fn_type(params, ret)
+
         if ann.name in BUILTIN_TYPES:
             return BUILTIN_TYPES[ann.name]
 
+        # v1.8.2: registered type aliases
+        if ann.name in self._type_aliases:
+            return self._type_aliases[ann.name]
+
         # Check user-defined structs
         if ann.name in self._struct_defs:
             return InScriptType(ann.name)
@@ -428,7 +520,9 @@ class Analyzer(Visitor):
         return self._scope.symbols
 
     def _hoist_top_level(self, program: Program):
-        """Register structs, scenes, and top-level functions before checking bodies."""
+        """Register structs, scenes, top-level functions, and type aliases before checking bodies."""
+        from ast_nodes import TypeAliasDecl
+        # First sub-pass: register type aliases and structs (order-independent)
         for node in program.body:
             if isinstance(node, StructDecl):
                 self._struct_defs[node.name] = node
@@ -437,7 +531,21 @@ class Analyzer(Visitor):
                     kind="struct", struct_node=node,
                     line=node.line, col=node.col
                 )
-            elif isinstance(node, FunctionDecl):
+            elif isinstance(node, TypeAliasDecl):
+                # v1.8.2: register alias immediately so functions can use it
+                type_ann = getattr(node, 'type_ann', None)
+                if type_ann is not None:
+                    resolved = self._resolve_type_ann(type_ann)
+                else:
+                    resolved = BUILTIN_TYPES.get(node.target, InScriptType(node.target))
+                self._type_aliases[node.name] = resolved
+                self._scope.symbols[node.name] = Symbol(
+                    node.name, resolved, kind="type",
+                    line=node.line, col=node.col
+                )
+        # Second sub-pass: hoist functions, scenes, enums (can now reference aliases)
+        for node in program.body:
+            if isinstance(node, FunctionDecl):
                 ret  = self._resolve_type_ann(node.return_type)
                 self._scope.symbols[node.name] = Symbol(
                     node.name, ret, kind="fn", fn_node=node,
@@ -451,7 +559,7 @@ class Analyzer(Visitor):
             elif isinstance(node, EnumDecl):
                 self._scope.symbols[node.name] = Symbol(
                     node.name, InScriptType(node.name), kind="enum",
-                    fn_node=node,  # store EnumDecl for exhaustiveness checks
+                    fn_node=node,
                     line=node.line, col=node.col
                 )
 
@@ -649,6 +757,19 @@ class Analyzer(Visitor):
             )
         return enum_type
 
+    def visit_TypeAliasDecl(self, node) -> InScriptType:
+        """v1.8.2: Register a type alias so annotations can reference it by name."""
+        if hasattr(node, 'type_ann') and node.type_ann is not None:
+            resolved = self._resolve_type_ann(node.type_ann)
+        else:
+            # Legacy alias with only a target string
+            resolved = BUILTIN_TYPES.get(node.target, InScriptType(node.target))
+        self._type_aliases[node.name] = resolved
+        # Also register in scope so the name is "used" and not flagged undefined
+        self._scope.symbols[node.name] = Symbol(node.name, resolved, kind="type",
+                                                 line=node.line, col=node.col)
+        return T_VOID
+
     def visit_ImportDecl(self, node: ImportDecl) -> InScriptType:
         """Register imported symbols so the type checker knows about them."""
         try:
@@ -727,6 +848,36 @@ class Analyzer(Visitor):
             self._error("'continue' outside of loop", node.line, node.col)
         return T_VOID
 
+    def _extract_typeof_narrowing(self, condition) -> tuple:
+        """v1.8.1: If condition is `typeof(x) == "T"` return (var_name, narrowed_type).
+        Returns (None, None) if the condition is not that pattern."""
+        if not (hasattr(condition, 'op') and condition.op == "=="):
+            return (None, None)
+        left, right = condition.left, condition.right
+        # Support both sides for the string literal
+        if (hasattr(right, 'args') and isinstance(getattr(right, 'callee', None), object)
+                and hasattr(left, 'value') and isinstance(left.value, str)):
+            left, right = right, left
+        # left must be a CallExpr(callee=IdentExpr("typeof"|"type"), args=[IdentExpr])
+        if not hasattr(left, 'callee') or not hasattr(left, 'args'):
+            return (None, None)
+        callee_name = getattr(left.callee, 'name', None)
+        if callee_name not in ("typeof", "type"):
+            return (None, None)
+        if not left.args:
+            return (None, None)
+        arg0 = left.args[0]
+        arg_val = getattr(arg0, 'value', arg0)  # Argument node wraps value
+        var_name = getattr(arg_val, 'name', None)
+        if var_name is None:
+            return (None, None)
+        # right must be a StringLiteralExpr
+        if not hasattr(right, 'value') or not isinstance(right.value, str):
+            return (None, None)
+        type_name = right.value
+        narrow_to = BUILTIN_TYPES.get(type_name, InScriptType(type_name))
+        return (var_name, narrow_to)
+
     def visit_IfStmt(self, node: IfStmt) -> InScriptType:
         cond_type = self.visit(node.condition)
         if cond_type not in (T_BOOL, T_ANY):
@@ -735,7 +886,29 @@ class Analyzer(Visitor):
                 f"non-bool conditions will be truthy/falsy at runtime",
                 node.line
             )
-        self.visit(node.then_branch)
+
+        # v1.8.1: union narrowing — `if typeof(x) == "int" { }` narrows x to int
+        var_name, narrow_to = self._extract_typeof_narrowing(node.condition)
+        if var_name and narrow_to:
+            # Push a scope, inject narrowed binding, then visit the BODY STATEMENTS
+            # directly so the narrowed type is visible for the entire then-branch.
+            self._push_scope("block")
+            sym = self._scope.parent.lookup(var_name) if self._scope.parent else None
+            if sym:
+                narrowed_sym = Symbol(var_name, narrow_to, sym.kind,
+                                      line=sym.line, col=sym.col)
+                narrowed_sym.used = True
+                self._define(narrowed_sym)
+            # Visit body stmts without letting visit_BlockStmt push another scope
+            from ast_nodes import BlockStmt
+            body = node.then_branch
+            stmts = body.body if isinstance(body, BlockStmt) else [body]
+            for stmt in stmts:
+                self.visit(stmt)
+            self._pop_scope()
+        else:
+            self.visit(node.then_branch)
+
         if node.else_branch:
             self.visit(node.else_branch)
         return T_VOID
@@ -854,7 +1027,9 @@ class Analyzer(Visitor):
 
     def visit_IntLiteralExpr(self, node: IntLiteralExpr)   -> InScriptType: return T_INT
     def visit_FloatLiteralExpr(self, node: FloatLiteralExpr) -> InScriptType: return T_FLOAT
-    def visit_StringLiteralExpr(self, node: StringLiteralExpr) -> InScriptType: return T_STRING
+    def visit_StringLiteralExpr(self, node: StringLiteralExpr) -> InScriptType:
+        # v1.8.2: return a specific literal type so union-of-literals is enforced
+        return literal_type(node.value)
     def visit_BoolLiteralExpr(self, node: BoolLiteralExpr) -> InScriptType: return T_BOOL
     def visit_NullLiteralExpr(self, node: NullLiteralExpr) -> InScriptType: return T_NULL
 
@@ -1024,6 +1199,20 @@ class Analyzer(Visitor):
                             f"{n_total} arg(s), got {n_args}",
                             node.line
                         )
+                # v1.8.1: check argument types against declared param types
+                for i, arg in enumerate(node.args):
+                    if i >= len(params):
+                        break
+                    p_type = self._resolve_type_ann(params[i].type_ann)
+                    if p_type == T_ANY:
+                        continue
+                    arg_type = self.visit(arg.value)
+                    if not types_compatible(p_type, arg_type):
+                        self._error(
+                            f"Argument {i+1} to '{node.callee.name}': "
+                            f"expected '{p_type}', got '{arg_type}'",
+                            getattr(arg.value, 'line', node.line)
+                        )
                 return self._resolve_type_ann(fn.return_type)
             if sym:
                 if sym.kind == "struct":

{inscript_lang-1.7.4 → inscript_lang-1.8.2}/ast_nodes.py

@@ -49,6 +49,11 @@ class TypeAnnotation(Node):
     is_nullable: bool = False
     key_type:  Optional["TypeAnnotation"] = None
     nullable:  bool = False
+    # v1.8.2: for string literal types `"left"` in unions / params
+    literal_value: Optional[str] = None   # set when name == "__literal__"
+    # v1.8.2: for fn type aliases `fn(int) -> bool`
+    fn_params:     Optional[list] = None  # list of TypeAnnotation
+    fn_return:     Optional["TypeAnnotation"] = None
 
 
 # ─────────────────────────────────────────────────────────────────────────────
@@ -717,9 +722,10 @@ class DecoratedDecl(Node):
 
 @dataclass
 class TypeAliasDecl(Node):
-    """type ID = ExistingType — type alias (annotation only at runtime)."""
-    name:   str
-    target: str
+    """type ID = ExistingType | fn(...)->T | "lit1"|"lit2" — type alias."""
+    name:        str
+    target:      str          # kept for backwards compat with interpreter
+    type_ann:    object = None  # TypeAnnotation (None for legacy string-only aliases)
 
 @dataclass
 class SelectStmt(Node):

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

@@ -24,7 +24,7 @@ from errors   import (InScriptError, LexerError, ParseError,
                        SemanticError, InScriptRuntimeError,
                        MultiError, InScriptWarning)
 
-VERSION = "1.7.4"
+VERSION = "1.8.2"
 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.4 → inscript_lang-1.8.2}/inscript_lang.egg-info/PKG-INFO

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

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

@@ -937,9 +937,13 @@ class Interpreter(Visitor):
         return iface
 
     def visit_TypeAliasDecl(self, node) -> Any:
-        """type ID = ExistingType — store alias so type annotations can reference it."""
-        # Runtime effect: register the alias name so it can be used in is/as checks
-        self._env.define(node.name, {"__type_alias__": True, "__target__": node.target})
+        """v1.8.2: Register alias so it can be used in typeof/is checks at runtime."""
+        type_ann = getattr(node, 'type_ann', None)
+        self._env.define(node.name, {
+            "__type_alias__": True,
+            "__target__":     node.target,
+            "__type_ann__":   type_ann,
+        })
         return None
 
     def visit_ImplDecl(self, node) -> Any:

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

@@ -216,23 +216,17 @@ class Parser:
     # ─────────────────────────────────────────────
 
     def parse_type_alias(self):
-        """type ID = ExistingType — type alias declaration (annotation only)."""
+        """type ID = TypeAnnotation — supports simple, union, literal union, fn types."""
         line, col = self.current.line, self.current.col
         self.advance()  # consume 'type'
         name = self.expect(TT.IDENT, "Expected alias name after 'type'").value
         self.expect(TT.ASSIGN, "Expected '=' in type alias")
-        # Consume the type expression (could be int, string, ident, etc.)
-        target_tok = self.current
-        target_name = target_tok.value or target_tok.type.name
-        self.advance()
-        # Handle qualified names like MyModule.MyType
-        while self.check(TT.DOT):
-            self.advance()
-            target_name += "." + (self.current.value or "")
-            self.advance()
-        # Return a simple VarDecl so the interpreter stores name in env as a type tag
+        # v1.8.2: parse a full type annotation (including string literal unions, fn types)
+        type_ann = self.parse_type_annotation()
+        # target: for backwards compat with interpreter, derive a string name
+        target = type_ann.name if type_ann.name not in ("__literal__", "__fn__", "Union") else name
         from ast_nodes import TypeAliasDecl
-        return TypeAliasDecl(name=name, target=target_name, line=line, col=col)
+        return TypeAliasDecl(name=name, target=target, type_ann=type_ann, line=line, col=col)
 
     def parse_import(self) -> ImportDecl:
         """
@@ -447,6 +441,40 @@ class Parser:
             elif tok.type == TT.NIL:   # v1.7.2: nil as type annotation
                 name = "nil"
                 self.advance()
+            # v1.8.2: string literal type — `"left"` in union / param
+            elif tok.type == TT.STRING:
+                lit = tok.value
+                self.advance()
+                ann = TypeAnnotation(name="__literal__", literal_value=lit,
+                                     line=line, col=col)
+                # Union suffix handled below — return early for nullable/union
+                if self.current.type == TT.QUESTION:
+                    self.advance()
+                    ann = TypeAnnotation(name="Optional", is_nullable=True,
+                                        generics=[ann], line=line, col=col)
+                if self.current.type == TT.BIT_OR:
+                    union_types = [ann]
+                    while self.current.type == TT.BIT_OR:
+                        self.advance()
+                        union_types.append(self.parse_type_annotation())
+                    ann = TypeAnnotation(name="Union", generics=union_types, line=line, col=col)
+                return ann
+            # v1.8.2: fn type alias — `fn(int, string) -> bool`
+            elif tok.type == TT.FN:
+                self.advance()   # consume 'fn'
+                self.expect(TT.LPAREN, "Expected '(' in fn type")
+                fn_params = []
+                if not self.check(TT.RPAREN):
+                    fn_params.append(self.parse_type_annotation())
+                    while self.match(TT.COMMA):
+                        fn_params.append(self.parse_type_annotation())
+                self.expect(TT.RPAREN, "Expected ')' in fn type")
+                fn_return = None
+                if self.match(TT.ARROW):
+                    fn_return = self.parse_type_annotation()
+                ann = TypeAnnotation(name="__fn__", fn_params=fn_params,
+                                     fn_return=fn_return, line=line, col=col)
+                return ann
             else:
                 self._error(f"Expected type name, got '{tok.value}'")
             ann = TypeAnnotation(name=name, line=line, col=col)

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "inscript-lang"
-version = "1.7.4"
+version = "1.8.2"
 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.4 → inscript_lang-1.8.2}/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.4"
+VERSION = "1.8.2"
 
 # ── ANSI colours ──────────────────────────────────────────────────────────────
 def _c(code, text):