IncludeCPP 3.8.3__py3-none-any.whl → 3.8.5__py3-none-any.whl

includecpp/core/cssl/cssl_runtime.py

@@ -715,17 +715,60 @@ class CSSLRuntime:
 
         Parses class members and methods, creating a CSSLClass object
         that can be instantiated with 'new'.
+        Supports inheritance via 'extends' keyword and method overwriting via 'overwrites'.
         """
         class_info = node.value
         class_name = class_info.get('name')
+        extends_class_name = class_info.get('extends')
+        extends_is_python = class_info.get('extends_is_python', False)
+        overwrites_class_name = class_info.get('overwrites')
+        overwrites_is_python = class_info.get('overwrites_is_python', False)
+
+        # Resolve parent class if extends is specified
+        parent_class = None
+        if extends_class_name:
+            if extends_is_python:
+                # extends $PythonObject - look up in shared objects
+                from ..cssl_bridge import _live_objects, SharedObjectProxy
+                if extends_class_name in _live_objects:
+                    parent_class = _live_objects[extends_class_name]
+                    # Unwrap SharedObjectProxy if needed
+                    if isinstance(parent_class, SharedObjectProxy):
+                        parent_class = parent_class._obj
+                else:
+                    # Also check scope with $ prefix
+                    parent_class = self.global_scope.get(f'${extends_class_name}')
+            else:
+                # Try to resolve from scope (could be CSSL class or variable holding Python object)
+                parent_class = self.scope.get(extends_class_name)
+                if parent_class is None:
+                    parent_class = self.global_scope.get(extends_class_name)
+
+            if parent_class is None:
+                raise ValueError(f"Cannot extend unknown class '{extends_class_name}'")
+
+            # Auto-wrap Python objects for inheritance
+            from .cssl_builtins import CSSLizedPythonObject
+            if not isinstance(parent_class, (CSSLClass, CSSLizedPythonObject)):
+                # Wrap raw Python object
+                parent_class = CSSLizedPythonObject(parent_class, self)
 
         members = {}  # Member variable defaults/types
         methods = {}  # Method AST nodes
-        constructor = None
+        constructors = []  # List of constructors (multiple allowed with constr keyword)
+        constructor = None  # Primary constructor (backward compatibility)
+
+        # Get class parameters and extends args
+        class_params = class_info.get('class_params', [])
+        extends_args = class_info.get('extends_args', [])
 
         for child in node.children:
-            if child.type == 'function':
-                # This is a method
+            if child.type == 'constructor':
+                # New-style constructor from 'constr' keyword
+                constructors.append(child)
+
+            elif child.type == 'function':
+                # This is a method or old-style constructor
                 func_info = child.value
                 method_name = func_info.get('name')
 
@@ -752,22 +795,156 @@ class CSSLRuntime:
             name=class_name,
             members=members,
             methods=methods,
-            constructor=constructor
+            constructor=constructor,
+            parent=parent_class
         )
+        # Store additional constructor info
+        class_def.constructors = constructors  # Multiple constructors from 'constr' keyword
+        class_def.class_params = class_params  # Class-level constructor parameters
+        class_def.extends_args = extends_args  # Arguments to pass to parent constructor
 
         # Register class in scope
         self.scope.set(class_name, class_def)
         self.global_scope.set(class_name, class_def)
 
+        # Handle class overwrites - replace methods in target class
+        if overwrites_class_name:
+            self._apply_class_overwrites(
+                class_def, overwrites_class_name, overwrites_is_python
+            )
+
         return class_def
 
+    def _apply_class_overwrites(self, new_class: CSSLClass, target_name: str, is_python: bool):
+        """Apply method overwrites from new_class to target class/object.
+
+        When a class has 'overwrites' specified, all methods defined in new_class
+        will replace the corresponding methods in the target.
+        """
+        from .cssl_builtins import CSSLizedPythonObject
+
+        # Resolve target
+        target = None
+        if is_python:
+            from ..cssl_bridge import _live_objects
+            if target_name in _live_objects:
+                target = _live_objects[target_name]
+        else:
+            target = self.scope.get(target_name)
+            if target is None:
+                target = self.global_scope.get(target_name)
+
+        if target is None:
+            return  # Target not found, silently skip
+
+        # Get methods to overwrite
+        methods_to_overwrite = new_class.methods
+
+        if is_python and hasattr(target, '__class__'):
+            # Python object - overwrite methods on the object/class
+            for method_name, method_node in methods_to_overwrite.items():
+                # Create a Python-callable wrapper for the CSSL method
+                wrapper = self._create_method_wrapper(method_node, target)
+                # Set on the object
+                try:
+                    setattr(target, method_name, wrapper)
+                except AttributeError:
+                    # Try setting on class instead
+                    try:
+                        setattr(target.__class__, method_name, wrapper)
+                    except:
+                        pass
+        elif isinstance(target, CSSLClass):
+            # CSSL class - directly replace methods
+            for method_name, method_node in methods_to_overwrite.items():
+                target.methods[method_name] = method_node
+        elif isinstance(target, CSSLizedPythonObject):
+            # CSSLized Python object - get underlying object and overwrite
+            py_obj = target.get_python_obj()
+            for method_name, method_node in methods_to_overwrite.items():
+                wrapper = self._create_method_wrapper(method_node, py_obj)
+                try:
+                    setattr(py_obj, method_name, wrapper)
+                except AttributeError:
+                    try:
+                        setattr(py_obj.__class__, method_name, wrapper)
+                    except:
+                        pass
+
+    def _create_method_wrapper(self, method_node: ASTNode, instance: Any):
+        """Create a Python-callable wrapper for a CSSL method that works with an instance."""
+        def wrapper(*args, **kwargs):
+            # Set up instance context for this->
+            old_instance = self._current_instance
+            # Create a fake CSSLInstance-like wrapper if needed
+            self._current_instance = instance
+            try:
+                return self._call_function(method_node, list(args), kwargs)
+            finally:
+                self._current_instance = old_instance
+        return wrapper
+
     def _exec_function(self, node: ASTNode) -> Any:
-        """Execute function definition - just registers it"""
+        """Execute function definition - registers it and handles extends/overwrites.
+
+        Syntax:
+            define func() { ... }
+            define func : extends otherFunc() { ... }  - Inherit local vars
+            define func : overwrites otherFunc() { ... }  - Replace otherFunc
+        """
         func_info = node.value
         func_name = func_info.get('name')
+        extends_func = func_info.get('extends')
+        extends_is_python = func_info.get('extends_is_python', False)
+        overwrites_func = func_info.get('overwrites')
+        overwrites_is_python = func_info.get('overwrites_is_python', False)
+
+        # Store function extends info for runtime use
+        if extends_func:
+            node.value['_extends_resolved'] = self._resolve_function_target(
+                extends_func, extends_is_python
+            )
+
+        # Handle overwrites - replace the target function
+        if overwrites_func:
+            target = self._resolve_function_target(overwrites_func, overwrites_is_python)
+            if target is not None:
+                # Store original for reference
+                node.value['_overwrites_original'] = target
+                # Replace the target function with this one
+                if overwrites_is_python:
+                    from ..cssl_bridge import _live_objects
+                    if overwrites_func in _live_objects:
+                        # Create a wrapper that calls the CSSL function
+                        _live_objects[overwrites_func] = self._create_python_wrapper(node)
+                else:
+                    # Replace in CSSL scope
+                    self.scope.set(overwrites_func, node)
+                    self.global_scope.set(overwrites_func, node)
+
+        # Register the function
         self.scope.set(func_name, node)
         return None
 
+    def _resolve_function_target(self, name: str, is_python: bool) -> Any:
+        """Resolve a function target for extends/overwrites."""
+        if is_python:
+            from ..cssl_bridge import _live_objects
+            if name in _live_objects:
+                return _live_objects[name]
+            return self.global_scope.get(f'${name}')
+        else:
+            target = self.scope.get(name)
+            if target is None:
+                target = self.global_scope.get(name)
+            return target
+
+    def _create_python_wrapper(self, func_node: ASTNode):
+        """Create a Python-callable wrapper for a CSSL function."""
+        def wrapper(*args, **kwargs):
+            return self._call_function(func_node, list(args), kwargs)
+        return wrapper
+
     def _exec_typed_declaration(self, node: ASTNode) -> Any:
         """Execute typed variable declaration: type<T> varName = value;
 
@@ -1031,6 +1208,9 @@ class CSSLRuntime:
             func_node: The function AST node
             args: List of positional arguments
             kwargs: Dict of named arguments (param_name -> value)
+
+        Supports:
+            define func : extends otherFunc() { ... } - Inherit local vars from otherFunc
         """
         func_info = func_node.value
         params = func_info.get('params', [])
@@ -1043,6 +1223,34 @@ class CSSLRuntime:
         # Create new scope
         new_scope = Scope(parent=self.scope)
 
+        # Handle function extends - inherit local vars from extended function
+        extends_resolved = func_info.get('_extends_resolved')
+        if extends_resolved:
+            if callable(extends_resolved):
+                # Python function - call it first to populate any state
+                try:
+                    extends_resolved(*args, **kwargs)
+                except:
+                    pass
+            elif hasattr(extends_resolved, 'value'):
+                # CSSL function - execute it in a temporary scope to get local vars
+                old_scope = self.scope
+                temp_scope = Scope(parent=self.scope)
+                self.scope = temp_scope
+                try:
+                    # Execute extended function body to populate local vars
+                    for child in extends_resolved.children:
+                        if not self._running:
+                            break
+                        self._execute(child)
+                    # Copy all local vars to new scope
+                    for name, value in temp_scope._vars.items():
+                        new_scope.set(name, value)
+                except:
+                    pass
+                finally:
+                    self.scope = old_scope
+
         # Bind parameters - handle both positional and named arguments
         for i, param in enumerate(params):
             # Extract param name and type from dict format: {'name': 'a', 'type': 'int'}
@@ -1302,6 +1510,78 @@ class CSSLRuntime:
         """Execute continue statement"""
         raise CSSLContinue()
 
+    def _exec_constructor(self, node: ASTNode) -> Any:
+        """Execute constructor node - only called when encountered directly.
+
+        Normally constructors are executed through _call_constructor in _eval_new.
+        This handles cases where a constructor node is executed in other contexts.
+        """
+        # Constructor nodes should be handled during class instantiation
+        # If we reach here, it's in a context where the constructor is stored but not executed
+        return None
+
+    def _exec_super_call(self, node: ASTNode) -> Any:
+        """Execute super() call to invoke parent constructor or method.
+
+        Syntax:
+            super()              - Call parent constructor with no args
+            super(arg1, arg2)    - Call parent constructor with args
+            super::method()      - Call specific parent method
+            super::method(args)  - Call specific parent method with args
+        """
+        if self._current_instance is None:
+            raise CSSLRuntimeError(
+                "super() called outside of class context",
+                node.line if hasattr(node, 'line') else 0,
+                hint="super() can only be used inside class constructors and methods"
+            )
+
+        instance = self._current_instance
+        parent = getattr(instance, '_parent_class', None)
+
+        if parent is None:
+            raise CSSLRuntimeError(
+                "super() called but class has no parent",
+                node.line if hasattr(node, 'line') else 0,
+                hint="super() requires the class to extend another class"
+            )
+
+        method_name = node.value.get('method')
+        args = [self._evaluate(arg) for arg in node.value.get('args', [])]
+
+        from .cssl_builtins import CSSLizedPythonObject
+
+        if method_name:
+            # super::method() - call specific parent method
+            if isinstance(parent, CSSLClass):
+                method = parent.methods.get(method_name)
+                if method:
+                    return self._call_method(instance, method, args, {})
+                else:
+                    raise CSSLRuntimeError(
+                        f"Parent class has no method '{method_name}'",
+                        node.line if hasattr(node, 'line') else 0
+                    )
+            elif isinstance(parent, CSSLizedPythonObject):
+                py_obj = parent.get_python_obj()
+                if hasattr(py_obj, method_name):
+                    method = getattr(py_obj, method_name)
+                    return method(*args)
+                else:
+                    raise CSSLRuntimeError(
+                        f"Parent Python object has no method '{method_name}'",
+                        node.line if hasattr(node, 'line') else 0
+                    )
+            elif hasattr(parent, method_name):
+                method = getattr(parent, method_name)
+                return method(*args)
+        else:
+            # super() - call parent constructor
+            self._call_parent_constructor(instance, args)
+            instance._parent_constructor_called = True
+
+        return None
+
     def _exec_try(self, node: ASTNode) -> Any:
         """Execute try/catch block"""
         try:
@@ -2887,6 +3167,8 @@ class CSSLRuntime:
         """Evaluate 'new ClassName(args)' expression.
 
         Creates a new instance of a CSSL class and calls its constructor.
+        Supports multiple constructors (constr keyword), class parameters,
+        and automatic parent constructor calling.
         """
         class_name = node.value.get('class')
         args = [self._evaluate(arg) for arg in node.value.get('args', [])]
@@ -2914,12 +3196,130 @@ class CSSLRuntime:
         # Create new instance
         instance = CSSLInstance(class_def)
 
-        # Call constructor if defined
+        # Store parent class reference for super() calls
+        instance._parent_class = class_def.parent
+        instance._parent_constructor_called = False
+
+        # Get class params and extends args
+        class_params = getattr(class_def, 'class_params', [])
+        extends_args = getattr(class_def, 'extends_args', [])
+        constructors = getattr(class_def, 'constructors', [])
+
+        # Bind class_params to instance scope (they receive values from constructor args)
+        # These are the implicit constructor parameters defined in class declaration
+        param_values = {}
+        for i, param in enumerate(class_params):
+            param_name = param.get('name') if isinstance(param, dict) else param
+            if i < len(args):
+                param_values[param_name] = args[i]
+            else:
+                param_values[param_name] = None
+
+        # Call parent constructor with extends_args if parent exists and args specified
+        if class_def.parent and extends_args:
+            evaluated_extends_args = [self._evaluate(arg) for arg in extends_args]
+            self._call_parent_constructor(instance, evaluated_extends_args)
+            instance._parent_constructor_called = True
+
+        # Execute all constructors defined with 'constr' keyword (in order)
+        for constr in constructors:
+            self._call_constructor(instance, constr, args, kwargs, param_values)
+
+        # Call primary constructor (old-style) if defined
         if class_def.constructor:
             self._call_method(instance, class_def.constructor, args, kwargs)
 
         return instance
 
+    def _call_parent_constructor(self, instance: CSSLInstance, args: list, kwargs: dict = None):
+        """Call the parent class constructor on an instance.
+
+        Used for automatic parent constructor calling and super() calls.
+        """
+        kwargs = kwargs or {}
+        parent = instance._parent_class
+
+        if parent is None:
+            return
+
+        from .cssl_builtins import CSSLizedPythonObject
+
+        if isinstance(parent, CSSLClass):
+            # CSSL parent class
+            if parent.constructor:
+                self._call_method(instance, parent.constructor, args, kwargs)
+            # Also call parent's constr constructors
+            for constr in getattr(parent, 'constructors', []):
+                self._call_constructor(instance, constr, args, kwargs, {})
+        elif isinstance(parent, CSSLizedPythonObject):
+            # Python parent - call __init__ if it's a class
+            py_obj = parent.get_python_obj()
+            if isinstance(py_obj, type):
+                # It's a class - we need to initialize it
+                try:
+                    py_obj.__init__(instance, *args, **kwargs)
+                except TypeError:
+                    pass  # Initialization might not be needed
+        elif isinstance(parent, type):
+            # Raw Python class
+            try:
+                parent.__init__(instance, *args, **kwargs)
+            except TypeError:
+                pass
+
+    def _call_constructor(self, instance: CSSLInstance, constr_node: ASTNode,
+                          args: list, kwargs: dict, param_values: dict):
+        """Call a constructor defined with 'constr' keyword.
+
+        Handles constructor extends/overwrites and sets up the instance scope.
+        """
+        constr_info = constr_node.value
+        constr_params = constr_info.get('params', [])
+        extends_class = constr_info.get('extends_class')
+        extends_method = constr_info.get('extends_method')
+
+        # Save previous instance context
+        prev_instance = self._current_instance
+        self._current_instance = instance
+
+        # Create new scope for constructor
+        new_scope = Scope(parent=self.scope)
+
+        # Bind param_values (from class params) to constructor scope
+        for name, value in param_values.items():
+            new_scope.set(name, value)
+
+        # Bind constructor parameters
+        for i, param in enumerate(constr_params):
+            param_name = param.get('name') if isinstance(param, dict) else param
+            if i < len(args):
+                new_scope.set(param_name, args[i])
+            elif param_name in kwargs:
+                new_scope.set(param_name, kwargs[param_name])
+            else:
+                new_scope.set(param_name, None)
+
+        # If constructor extends another constructor, inherit its local vars
+        if extends_class and extends_method:
+            parent_class = self.scope.get(extends_class) or self.global_scope.get(extends_class)
+            if parent_class and isinstance(parent_class, CSSLClass):
+                for constr in getattr(parent_class, 'constructors', []):
+                    if constr.value.get('name') == extends_method:
+                        # Execute parent constructor first to get local vars
+                        self._call_constructor(instance, constr, args, kwargs, param_values)
+                        break
+
+        # Execute constructor body
+        prev_scope = self.scope
+        self.scope = new_scope
+
+        try:
+            for stmt in constr_node.children:
+                self._execute(stmt)
+        finally:
+            self.scope = prev_scope
+            self._current_instance = prev_instance
+
     def _eval_this_access(self, node: ASTNode) -> Any:
         """Evaluate 'this->member' access.
 
@@ -2957,6 +3357,10 @@ class CSSLRuntime:
         if instance.has_method(member):
             # Return a callable that will invoke the method with instance context
             method_node = instance.get_method(member)
+            # Check if this is an inherited Python method
+            if isinstance(method_node, tuple) and method_node[0] == 'python_method':
+                python_method = method_node[1]
+                return lambda *args, **kwargs: python_method(*args, **kwargs)
             return lambda *args, **kwargs: self._call_method(instance, method_node, list(args), kwargs)
 
         raise CSSLRuntimeError(
@@ -3038,6 +3442,10 @@ class CSSLRuntime:
             # Check for method
             if obj.has_method(member):
                 method_node = obj.get_method(member)
+                # Check if this is an inherited Python method
+                if isinstance(method_node, tuple) and method_node[0] == 'python_method':
+                    python_method = method_node[1]
+                    return lambda *args, **kwargs: python_method(*args, **kwargs)
                 return lambda *args, **kwargs: self._call_method(obj, method_node, list(args), kwargs)
             raise CSSLRuntimeError(f"'{obj._class.name}' has no member or method '{member}'")
 

includecpp/core/cssl/cssl_types.py

@@ -1448,17 +1448,62 @@ class CSSLClass:
 
     Stores class name, member variables, methods, and constructor.
     Used by the runtime to instantiate CSSLInstance objects.
+    Supports inheritance via the 'parent' attribute.
     """
 
     def __init__(self, name: str, members: Dict[str, Any] = None,
-                 methods: Dict[str, Any] = None, constructor: Any = None):
+                 methods: Dict[str, Any] = None, constructor: Any = None,
+                 parent: Any = None):
         self.name = name
         self.members = members or {}  # Default member values/types
         self.methods = methods or {}  # Method AST nodes
         self.constructor = constructor  # Constructor AST node
+        self.parent = parent  # Parent class (CSSLClass or CSSLizedPythonObject)
+
+    def get_all_members(self) -> Dict[str, Any]:
+        """Get all members including inherited ones."""
+        all_members = {}
+        # First add parent members (can be overridden)
+        if self.parent:
+            if hasattr(self.parent, 'get_all_members'):
+                all_members.update(self.parent.get_all_members())
+            elif hasattr(self.parent, 'members'):
+                all_members.update(self.parent.members)
+            elif hasattr(self.parent, '_python_obj'):
+                # CSSLizedPythonObject - get attributes from Python object
+                py_obj = self.parent._python_obj
+                if hasattr(py_obj, '__dict__'):
+                    for key, val in py_obj.__dict__.items():
+                        if not key.startswith('_'):
+                            all_members[key] = {'type': 'dynamic', 'default': val}
+        # Then add own members (override parent)
+        all_members.update(self.members)
+        return all_members
+
+    def get_all_methods(self) -> Dict[str, Any]:
+        """Get all methods including inherited ones."""
+        all_methods = {}
+        # First add parent methods (can be overridden)
+        if self.parent:
+            if hasattr(self.parent, 'get_all_methods'):
+                all_methods.update(self.parent.get_all_methods())
+            elif hasattr(self.parent, 'methods'):
+                all_methods.update(self.parent.methods)
+            elif hasattr(self.parent, '_python_obj'):
+                # CSSLizedPythonObject - get methods from Python object
+                py_obj = self.parent._python_obj
+                for name in dir(py_obj):
+                    if not name.startswith('_'):
+                        attr = getattr(py_obj, name, None)
+                        if callable(attr):
+                            all_methods[name] = ('python_method', attr)
+        # Then add own methods (override parent)
+        all_methods.update(self.methods)
+        return all_methods
 
     def __repr__(self):
-        return f"<CSSLClass '{self.name}' with {len(self.methods)} methods>"
+        parent_info = f" extends {self.parent.name}" if self.parent and hasattr(self.parent, 'name') else ""
+        return f"<CSSLClass '{self.name}'{parent_info} with {len(self.methods)} methods>"
 
 
 class CSSLInstance:
@@ -1471,8 +1516,9 @@ class CSSLInstance:
     def __init__(self, class_def: CSSLClass):
         self._class = class_def
         self._members: Dict[str, Any] = {}
-        # Initialize members with defaults from class definition
-        for name, default in class_def.members.items():
+        # Initialize members with defaults from class definition (including inherited)
+        all_members = class_def.get_all_members() if hasattr(class_def, 'get_all_members') else class_def.members
+        for name, default in all_members.items():
             if isinstance(default, dict):
                 # Type declaration with optional default
                 member_type = default.get('type')
@@ -1541,14 +1587,17 @@ class CSSLInstance:
         return name in self._members
 
     def get_method(self, name: str) -> Any:
-        """Get method AST node by name"""
-        if name in self._class.methods:
-            return self._class.methods[name]
+        """Get method AST node by name (including inherited methods)"""
+        # Use get_all_methods to include inherited methods
+        all_methods = self._class.get_all_methods() if hasattr(self._class, 'get_all_methods') else self._class.methods
+        if name in all_methods:
+            return all_methods[name]
         raise AttributeError(f"'{self._class.name}' has no method '{name}'")
 
     def has_method(self, name: str) -> bool:
-        """Check if method exists"""
-        return name in self._class.methods
+        """Check if method exists (including inherited methods)"""
+        all_methods = self._class.get_all_methods() if hasattr(self._class, 'get_all_methods') else self._class.methods
+        return name in all_methods
 
     def __getattr__(self, name: str) -> Any:
         """Allow direct attribute access for members"""

includecpp/vscode/cssl/package.json

@@ -2,7 +2,7 @@
     "name": "cssl",
     "displayName": "CSSL Language",
     "description": "Professional syntax highlighting, snippets, and language support for CSSL scripts (.cssl, .cssl-pl, .cssl-mod)",
-    "version": "1.4.0",
+    "version": "1.6.0",
     "publisher": "IncludeCPP",
     "icon": "images/cssl.png",
     "engines": {