IncludeCPP 4.0.2__py3-none-any.whl → 4.3.0__py3-none-any.whl

includecpp/core/cssl_bridge.py

@@ -266,8 +266,8 @@ class CSSLFunctionModule:
 
         from .cssl import CSSLRuntime, parse_cssl_program, ASTNode
 
-        # Create a dedicated runtime for this module
-        self._runtime = CSSLRuntime()
+        # Create a dedicated runtime for this module, preserving output_callback
+        self._runtime = CSSLRuntime(output_callback=self._cssl._output_callback)
 
         # If we have a payload, load it first (defines functions/globals for main)
         if self._payload_code:
@@ -330,7 +330,12 @@ class CSSLFunctionModule:
                 self._runtime.global_scope.set('parameter', Parameter(list(args)))
                 self._runtime.global_scope.set('args', list(args))
                 self._runtime.global_scope.set('argc', len(args))
-                return self._runtime._call_function(func_node, list(args))
+                # Enable running flag for function execution
+                self._runtime._running = True
+                try:
+                    return self._runtime._call_function(func_node, list(args))
+                finally:
+                    self._runtime._running = False
 
             return wrapper
 
@@ -603,7 +608,8 @@ class CsslLang:
         self,
         main_script: Union[str, 'CSSLScript'],
         payload_script: Union[str, 'CSSLScript', None] = None,
-        name: str = None
+        name: str = None,
+        bind: str = None
     ) -> 'CSSLFunctionModule':
         """
         Create a CSSL module with accessible functions.
@@ -612,13 +618,22 @@ class CsslLang:
         Optionally registers the module for payload() access in other scripts.
 
         Args:
-            main_script: Main CSSL code (string or CSSLScript)
+            main_script: Main CSSL code, file path, or CSSLScript
             payload_script: Optional payload code (string or CSSLScript)
             name: Optional name to register for payload(name) access
+            bind: Optional payload name to auto-prepend (from makepayload)
 
         Returns:
             CSSLFunctionModule - module with callable function attributes
 
+        Usage (simplified - with file path and bind):
+            # First register the payload
+            cssl.makepayload("api", "lib/api/einkaufsmanager.cssl-pl")
+
+            # Then create module from file, binding to payload
+            mod = cssl.makemodule("writer", "lib/writer.cssl", bind="api")
+            mod.SaySomething("Hello!")  # Functions are now accessible
+
         Usage (v3.8.0 - with CSSLScript objects):
             main = cssl.script("cssl", '''
                 printl("Main");
@@ -644,6 +659,28 @@ class CsslLang:
             ''')
             module.greet("World")  # Returns "Hello, World!"
         """
+        # Handle simplified API: makemodule(name, path, bind=...)
+        # Check if main_script looks like a short identifier and payload_script looks like a path
+        if (isinstance(main_script, str) and isinstance(payload_script, str) and
+            not '\n' in main_script and not ';' in main_script and not '{' in main_script):
+            # main_script is likely a name, payload_script is likely a path
+            module_name = main_script
+            path = payload_script
+
+            # Check if it's actually a file path
+            path_obj = Path(path)
+            if path_obj.exists():
+                main_code = path_obj.read_text(encoding='utf-8')
+
+                # If bind is specified, prepend that payload's code
+                payload_code = None
+                if bind:
+                    runtime = self._get_runtime()
+                    if hasattr(runtime, '_inline_payloads') and bind in runtime._inline_payloads:
+                        payload_code = runtime._inline_payloads[bind]
+
+                return CSSLFunctionModule(self, main_code, payload_code, module_name)
+
         # Extract code from CSSLScript objects if provided
         if isinstance(main_script, CSSLScript):
             main_code = main_script.code
@@ -657,6 +694,12 @@ class CsslLang:
             else:
                 payload_code = payload_script
 
+        # If bind is specified and no payload_script, use the bound payload
+        if bind and payload_code is None:
+            runtime = self._get_runtime()
+            if hasattr(runtime, '_inline_payloads') and bind in runtime._inline_payloads:
+                payload_code = runtime._inline_payloads[bind]
+
         return CSSLFunctionModule(self, main_code, payload_code, name)
 
     def load(self, path: str, name: str) -> None:
@@ -781,6 +824,45 @@ class CsslLang:
             runtime._inline_payloads = {}
         runtime._inline_payloads[name] = code
 
+    def makepayload(self, name: str, path: str) -> str:
+        """
+        Register a payload from a file path.
+
+        Reads the file and registers it as a payload accessible via payload(name) in CSSL.
+        This is a convenience method that combines reading a file and calling code().
+
+        Usage:
+            from includecpp import CSSL
+            cssl = CSSL.CsslLang()
+
+            # Register a payload from file
+            cssl.makepayload("api", "lib/api/myapi.cssl-pl")
+
+            # Now use in CSSL code
+            cssl.run('''
+                payload("api");  // Load the payload
+                myApiFunction();  // Call functions from it
+            ''')
+
+            # Or use with makemodule for automatic binding
+            mod = cssl.makemodule("writer", "lib/writer.cssl", bind="api")
+            mod.SaySomething("Hello!")
+
+        Args:
+            name: Name to register the payload under (used in payload(name) and bind=name)
+            path: Path to the .cssl-pl or .cssl file
+
+        Returns:
+            The payload code that was registered
+        """
+        path_obj = Path(path)
+        if not path_obj.exists():
+            raise FileNotFoundError(f"Payload file not found: {path}")
+
+        code = path_obj.read_text(encoding='utf-8')
+        self.code(name, code)
+        return code
+
     def share(self, instance: Any, name: str = None) -> str:
         """
         Share a Python object instance with CSSL scripts (LIVE sharing).
@@ -979,6 +1061,73 @@ class CsslLang:
         """
         return self.get_shared(name)
 
+    def getInstance(self, name: str) -> Optional[Any]:
+        """
+        Get a universal instance by name (for Python-side access).
+
+        Universal instances are shared containers accessible from CSSL, Python, and C++.
+        They support dynamic member/method access and are mutable across all contexts.
+
+        Usage:
+            from includecpp import CSSL
+            cssl = CSSL.CsslLang()
+
+            # In CSSL: instance<"myContainer"> container;
+            # Then in Python:
+            container = cssl.getInstance("myContainer")
+            container.member = "value"
+            print(container.member)  # value
+
+        Args:
+            name: Name of the instance (without quotes)
+
+        Returns:
+            The UniversalInstance or None if not found
+        """
+        from .cssl.cssl_types import UniversalInstance
+        return UniversalInstance.get(name)
+
+    def createInstance(self, name: str) -> Any:
+        """
+        Create or get a universal instance by name (for Python-side creation).
+
+        Usage:
+            container = cssl.createInstance("myContainer")
+            container.data = {"key": "value"}
+            # Now accessible in CSSL via instance<"myContainer">
+
+        Args:
+            name: Name for the instance
+
+        Returns:
+            The UniversalInstance (new or existing)
+        """
+        from .cssl.cssl_types import UniversalInstance
+        return UniversalInstance.get_or_create(name)
+
+    def deleteInstance(self, name: str) -> bool:
+        """
+        Delete a universal instance by name.
+
+        Args:
+            name: Name of the instance to delete
+
+        Returns:
+            True if deleted, False if not found
+        """
+        from .cssl.cssl_types import UniversalInstance
+        return UniversalInstance.delete(name)
+
+    def listInstances(self) -> list:
+        """
+        List all universal instance names.
+
+        Returns:
+            List of instance names
+        """
+        from .cssl.cssl_types import UniversalInstance
+        return UniversalInstance.list_all()
+
 
 # Global shared objects registry (for cross-instance sharing)
 _global_shared_objects: Dict[str, str] = {}
@@ -1303,14 +1452,49 @@ def module(code: str) -> CSSLModule:
     return get_cssl().module(code)
 
 
+def makepayload(name: str, path: str) -> str:
+    """
+    Register a payload from a file path.
+
+    Reads the file and registers it as a payload accessible via payload(name) in CSSL.
+
+    Usage:
+        from includecpp import CSSL
+
+        # Register a payload from file
+        CSSL.makepayload("api", "lib/api/myapi.cssl-pl")
+
+        # Use with makemodule for automatic binding
+        mod = CSSL.makemodule("writer", "lib/writer.cssl", bind="api")
+        mod.SaySomething("Hello!")
+
+    Args:
+        name: Name to register the payload under (used in payload(name) and bind=name)
+        path: Path to the .cssl-pl or .cssl file
+
+    Returns:
+        The payload code that was registered
+    """
+    return get_cssl().makepayload(name, path)
+
+
 def makemodule(
     main_script: Union[str, CSSLScript],
     payload_script: Union[str, CSSLScript, None] = None,
-    name: str = None
+    name: str = None,
+    bind: str = None
 ) -> CSSLFunctionModule:
     """
     Create a CSSL module with accessible functions.
 
+    Usage (simplified - with file path and bind):
+        # First register the payload
+        CSSL.makepayload("api", "lib/api/einkaufsmanager.cssl-pl")
+
+        # Then create module from file, binding to payload
+        mod = CSSL.makemodule("writer", "lib/writer.cssl", bind="api")
+        mod.SaySomething("Hello!")
+
     Usage (v3.8.0 - with CSSLScript):
         main = CSSL.script("cssl", '''printl("Main");''')
         payload = CSSL.script("cssl-pl", '''void helper() {}''')
@@ -1323,14 +1507,15 @@ def makemodule(
         math_mod.add(2, 3)  # Returns 5
 
     Args:
-        main_script: Main CSSL code (string or CSSLScript)
+        main_script: Main CSSL code, file path, or CSSLScript
         payload_script: Optional payload code (string or CSSLScript)
         name: Optional name to register for payload(name) access
+        bind: Optional payload name to auto-prepend (from makepayload)
 
     Returns:
         CSSLFunctionModule - module with callable function attributes
     """
-    return get_cssl().makemodule(main_script, payload_script, name)
+    return get_cssl().makemodule(main_script, payload_script, name, bind)
 
 
 # Export all
@@ -1360,6 +1545,7 @@ __all__ = [
     'get_output',
     'clear_output',
     'module',
+    'makepayload',
     'makemodule',
     'share',
     'unshare',

includecpp/core/cssl_bridge.pyi

@@ -412,7 +412,37 @@ class CsslLang:
         """
         ...
 
-    def makemodule(self, code_or_script: Union[str, CSSLScript], *more: Any) -> CSSLFunctionModule:
+    def makepayload(self, name: str, path: str) -> str:
+        """
+        Register a payload from a file path.
+
+        Reads the file and registers it as a payload accessible via payload(name) in CSSL.
+        This is a convenience method for loading payload files.
+
+        Args:
+            name: Name to register the payload under (used in payload(name) and bind=name)
+            path: Path to the .cssl-pl or .cssl file
+
+        Returns:
+            The payload code that was registered
+
+        Usage:
+            # Register a payload from file
+            cssl.makepayload("api", "lib/api/myapi.cssl-pl")
+
+            # Use with makemodule for automatic binding
+            mod = cssl.makemodule("writer", "lib/writer.cssl", bind="api")
+            mod.SaySomething("Hello!")
+        """
+        ...
+
+    def makemodule(
+        self,
+        main_script: Union[str, CSSLScript],
+        payload_script: Union[str, CSSLScript, None] = ...,
+        name: str = ...,
+        bind: str = ...
+    ) -> CSSLFunctionModule:
         """
         Create a CSSL module with accessible functions as methods.
 
@@ -420,14 +450,23 @@ class CsslLang:
         Functions defined in the code become callable Python methods.
 
         Args:
-            code_or_script: CSSL code string or CSSLScript object
-            *more: Additional scripts or module name
+            main_script: CSSL code string, file path, or CSSLScript object
+            payload_script: Optional payload code (string or CSSLScript)
+            name: Optional name to register for payload(name) access
+            bind: Optional payload name to auto-prepend (from makepayload)
 
         Returns:
             CSSLFunctionModule with callable function attributes
 
-        Usage:
-            # From code string
+        Usage (simplified - with file path and bind):
+            # First register the payload
+            cssl.makepayload("api", "lib/api/einkaufsmanager.cssl-pl")
+
+            # Then create module from file, binding to payload
+            mod = cssl.makemodule("writer", "lib/writer.cssl", bind="api")
+            mod.SaySomething("Hello!")  # Functions are now accessible
+
+        Usage (from code string):
             math = cssl.makemodule('''
                 int add(int a, int b) { return a + b; }
                 int sub(int a, int b) { return a - b; }
@@ -435,7 +474,7 @@ class CsslLang:
             print(math.add(10, 5))  # 15
             print(math.sub(10, 5))  # 5
 
-            # From script objects (for .cssl-mod creation)
+        Usage (from script objects):
             main = cssl.script("cssl", "...")
             helpers = cssl.script("cssl-pl", "...")
             mod = cssl.makemodule(main, helpers, "mymodule")
@@ -541,6 +580,66 @@ class CsslLang:
         """
         ...
 
+    def getInstance(self, name: str) -> Optional[Any]:
+        """
+        Get a universal instance by name (for Python-side access).
+
+        Universal instances are shared containers accessible from CSSL, Python, and C++.
+        They support dynamic member/method access and are mutable across all contexts.
+
+        Args:
+            name: Name of the instance (without quotes)
+
+        Returns:
+            The UniversalInstance or None if not found
+
+        Usage:
+            # In CSSL: instance<"myContainer"> container;
+            # Then in Python:
+            container = cssl.getInstance("myContainer")
+            container.member = "value"
+            print(container.member)  # value
+        """
+        ...
+
+    def createInstance(self, name: str) -> Any:
+        """
+        Create or get a universal instance by name (for Python-side creation).
+
+        Args:
+            name: Name for the instance
+
+        Returns:
+            The UniversalInstance (new or existing)
+
+        Usage:
+            container = cssl.createInstance("myContainer")
+            container.data = {"key": "value"}
+            # Now accessible in CSSL via instance<"myContainer">
+        """
+        ...
+
+    def deleteInstance(self, name: str) -> bool:
+        """
+        Delete a universal instance by name.
+
+        Args:
+            name: Name of the instance to delete
+
+        Returns:
+            True if deleted, False if not found
+        """
+        ...
+
+    def listInstances(self) -> List[str]:
+        """
+        List all universal instance names.
+
+        Returns:
+            List of instance names
+        """
+        ...
+
     def set_global(self, name: str, value: Any) -> None:
         """
         Set a global variable in the CSSL runtime.
@@ -733,20 +832,59 @@ def module(code: str) -> CSSLModule:
     ...
 
 
-def makemodule(code_or_script: Union[str, CSSLScript], *more: Any) -> CSSLFunctionModule:
+def makepayload(name: str, path: str) -> str:
+    """
+    Register a payload from a file path.
+
+    Reads the file and registers it as a payload accessible via payload(name) in CSSL.
+
+    Args:
+        name: Name to register the payload under (used in payload(name) and bind=name)
+        path: Path to the .cssl-pl or .cssl file
+
+    Returns:
+        The payload code that was registered
+
+    Usage:
+        from includecpp import CSSL
+
+        # Register a payload from file
+        CSSL.makepayload("api", "lib/api/myapi.cssl-pl")
+
+        # Use with makemodule for automatic binding
+        mod = CSSL.makemodule("writer", "lib/writer.cssl", bind="api")
+        mod.SaySomething("Hello!")
+    """
+    ...
+
+
+def makemodule(
+    main_script: Union[str, CSSLScript],
+    payload_script: Union[str, CSSLScript, None] = ...,
+    name: str = ...,
+    bind: str = ...
+) -> CSSLFunctionModule:
     """
     Create a CSSL module with accessible functions.
 
     Args:
-        code_or_script: CSSL code string or CSSLScript object
-        *more: Additional scripts or module name
+        main_script: CSSL code string, file path, or CSSLScript object
+        payload_script: Optional payload code (string or CSSLScript)
+        name: Optional name to register for payload(name) access
+        bind: Optional payload name to auto-prepend (from makepayload)
 
     Returns:
         CSSLFunctionModule with callable function attributes
 
-    Usage:
+    Usage (simplified):
         from includecpp import CSSL
 
+        # Register payload and create module
+        CSSL.makepayload("api", "lib/api/myapi.cssl-pl")
+        mod = CSSL.makemodule("writer", "lib/writer.cssl", bind="api")
+        mod.SaySomething("Hello!")
+
+    Usage (code string):
         math = CSSL.makemodule('''
             int add(int a, int b) { return a + b; }
         ''')

includecpp/generator/parser.cpp

@@ -599,13 +599,81 @@ ModuleDescriptor API::parse_cp_file(const std::string& filepath) {
                             }
                         }
 
-                        // Parse FIELD(type, name) entries
+                        // v4.1.1: Parse CONSTRUCTOR, METHOD, and FIELD entries for STRUCT
                         auto field_lines = split(field_block, '\n');
                         for (const auto& fline : field_lines) {
                             std::string ftrim = trim(fline);
                             if (ftrim.empty()) continue;
 
-                            if (ftrim.find("FIELD(") != std::string::npos) {
+                            // v4.1.1: Parse CONSTRUCTOR(type1, type2, ...) for parametrized constructors
+                            if (ftrim.find("CONSTRUCTOR") != std::string::npos) {
+                                size_t c_start = ftrim.find('(');
+                                size_t c_end = ftrim.rfind(')');
+                                if (c_start != std::string::npos && c_end != std::string::npos) {
+                                    std::string params_str = ftrim.substr(c_start + 1, c_end - c_start - 1);
+                                    ConstructorInfo ctor;
+                                    if (!params_str.empty()) {
+                                        auto params = split(params_str, ',');
+                                        for (auto& p : params) {
+                                            std::string param_type = trim(p);
+                                            if (!param_type.empty()) {
+                                                ctor.param_types.push_back(param_type);
+                                            }
+                                        }
+                                    }
+                                    sb.constructors.push_back(ctor);
+                                }
+                            }
+                            // v4.1.1: Parse METHOD and METHOD_CONST for STRUCT
+                            else if (ftrim.find("METHOD") != std::string::npos) {
+                                MethodSignature sig;
+                                bool is_const_method = ftrim.find("METHOD_CONST") != std::string::npos;
+
+                                size_t m_start = ftrim.find('(');
+                                size_t m_end = ftrim.rfind(')');
+
+                                if (m_start != std::string::npos && m_end != std::string::npos) {
+                                    std::string content = ftrim.substr(m_start + 1, m_end - m_start - 1);
+
+                                    // Parse method name and optional parameter types
+                                    std::vector<std::string> parts;
+                                    int template_depth = 0;
+                                    std::string current_part;
+
+                                    for (char c : content) {
+                                        if (c == '<') {
+                                            template_depth++;
+                                            current_part += c;
+                                        } else if (c == '>') {
+                                            template_depth--;
+                                            current_part += c;
+                                        } else if (c == ',' && template_depth == 0) {
+                                            parts.push_back(trim(current_part));
+                                            current_part.clear();
+                                        } else {
+                                            current_part += c;
+                                        }
+                                    }
+                                    if (!current_part.empty()) {
+                                        parts.push_back(trim(current_part));
+                                    }
+
+                                    if (!parts.empty()) {
+                                        sig.name = parts[0];
+                                        sig.is_const = is_const_method;
+
+                                        // Remaining parts are parameter types
+                                        for (size_t k = 1; k < parts.size(); ++k) {
+                                            sig.param_types.push_back(parts[k]);
+                                        }
+
+                                        sb.method_signatures.push_back(sig);
+                                        sb.methods.push_back(sig.name);
+                                    }
+                                }
+                            }
+                            // Parse FIELD(name) or FIELD(type, name)
+                            else if (ftrim.find("FIELD(") != std::string::npos) {
                                 size_t f_start = ftrim.find('(');
                                 size_t f_end = ftrim.find(')');
                                 if (f_start != std::string::npos && f_end != std::string::npos) {
@@ -616,6 +684,10 @@ ModuleDescriptor API::parse_cp_file(const std::string& filepath) {
                                         std::string field_type = trim(field_parts[0]);
                                         std::string field_name = trim(field_parts[1]);
                                         sb.fields.push_back({field_type, field_name});
+                                    } else if (field_parts.size() == 1) {
+                                        // Simple FIELD(name) - type will be inferred
+                                        std::string field_name = trim(field_parts[0]);
+                                        sb.fields.push_back({"auto", field_name});
                                     }
                                 }
                             }
@@ -870,7 +942,24 @@ std::string generate_struct_bindings(const StructBinding& sb, const ModuleDescri
 
             code << "    py::class_<" << cpp_type << ">(";
             code << mod.module_name << "_module, \"" << struct_full_name << "\")\n";
-            code << "        .def(py::init<>())\n";
+
+            // v4.1.1: Generate all constructor overloads from CONSTRUCTOR() entries
+            if (sb.constructors.empty()) {
+                // Backward compatibility: default constructor if none specified
+                code << "        .def(py::init<>())\n";
+            } else {
+                for (const auto& ctor : sb.constructors) {
+                    code << "        .def(py::init<";
+                    for (size_t i = 0; i < ctor.param_types.size(); ++i) {
+                        if (i > 0) code << ", ";
+                        // Replace T with actual template type
+                        std::string ptype = ctor.param_types[i];
+                        if (ptype == "T") ptype = ttype;
+                        code << ptype;
+                    }
+                    code << ">())\n";
+                }
+            }
 
             // Fields - readwrite access
             for (const auto& [field_type, field_name] : sb.fields) {
@@ -884,6 +973,15 @@ std::string generate_struct_bindings(const StructBinding& sb, const ModuleDescri
                      << cpp_type << "::" << field_name << ")\n";
             }
 
+            // v4.1.1: Generate method bindings
+            for (const auto& sig : sb.method_signatures) {
+                if (sig.is_const) {
+                    code << "        .def(\"" << sig.name << "\", &" << cpp_type << "::" << sig.name << ")\n";
+                } else {
+                    code << "        .def(\"" << sig.name << "\", &" << cpp_type << "::" << sig.name << ")\n";
+                }
+            }
+
             // Auto-generate to_dict() method
             code << "        .def(\"to_dict\", [](" << cpp_type << "& self) {\n";
             code << "            py::dict d;\n";
@@ -917,7 +1015,21 @@ std::string generate_struct_bindings(const StructBinding& sb, const ModuleDescri
         // Non-template struct
         code << "    py::class_<" << sb.struct_name << ">(";
         code << mod.module_name << "_module, \"" << sb.struct_name << "\")\n";
-        code << "        .def(py::init<>())\n";
+
+        // v4.1.1: Generate all constructor overloads from CONSTRUCTOR() entries
+        if (sb.constructors.empty()) {
+            // Backward compatibility: default constructor if none specified
+            code << "        .def(py::init<>())\n";
+        } else {
+            for (const auto& ctor : sb.constructors) {
+                code << "        .def(py::init<";
+                for (size_t i = 0; i < ctor.param_types.size(); ++i) {
+                    if (i > 0) code << ", ";
+                    code << ctor.param_types[i];
+                }
+                code << ">())\n";
+            }
+        }
 
         // Fields
         for (const auto& [field_type, field_name] : sb.fields) {
@@ -925,6 +1037,11 @@ std::string generate_struct_bindings(const StructBinding& sb, const ModuleDescri
                  << sb.struct_name << "::" << field_name << ")\n";
         }
 
+        // v4.1.1: Generate method bindings
+        for (const auto& sig : sb.method_signatures) {
+            code << "        .def(\"" << sig.name << "\", &" << sb.struct_name << "::" << sig.name << ")\n";
+        }
+
         // Auto-generate to_dict() method
         code << "        .def(\"to_dict\", [](" << sb.struct_name << "& self) {\n";
         code << "            py::dict d;\n";