IncludeCPP 3.4.22__tar.gz → 3.5.7__tar.gz

{includecpp-3.4.22 → includecpp-3.5.7}/IncludeCPP.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IncludeCPP
-Version: 3.4.22
+Version: 3.5.7
 Summary: Professional C++ Python bindings with type-generic templates, pystubs and native threading
 Home-page: https://github.com/liliassg/IncludeCPP
 Author: Lilias Hatterscheidt

{includecpp-3.4.22 → includecpp-3.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IncludeCPP
-Version: 3.4.22
+Version: 3.5.7
 Summary: Professional C++ Python bindings with type-generic templates, pystubs and native threading
 Home-page: https://github.com/liliassg/IncludeCPP
 Author: Lilias Hatterscheidt

{includecpp-3.4.22 → includecpp-3.5.7}/includecpp/__init__.py

@@ -2,7 +2,7 @@ from .core.cpp_api import CppApi
 from .core import cssl_bridge as CSSL
 import warnings
 
-__version__ = "3.4.22"
+__version__ = "3.5.7"
 __all__ = ["CppApi", "CSSL"]
 
 # Module-level cache for C++ modules

{includecpp-3.4.22 → includecpp-3.5.7}/includecpp/cli/commands.py

@@ -7139,20 +7139,21 @@ def cppy_types():
 # EXEC - Interactive Code Execution
 # ============================================================================
 
-@cli.command()
-@click.argument('lang', type=click.Choice(['py', 'cpp', 'python', 'c++']))
+@cli.command(name='exec')
+@click.argument('lang', type=click.Choice(['py', 'cpp', 'python', 'c++', 'cssl']))
 @click.argument('path', required=False, type=click.Path())
 @click.option('--all', 'import_all', is_flag=True, help='Import all available modules')
-def exec(lang, path, import_all):
+def exec_repl(lang, path, import_all):
     """Execute code interactively for quick testing.
 
-    Run Python or C++ code snippets without creating files.
+    Run Python, C++ or CSSL code snippets without creating files.
     Perfect for testing your IncludeCPP modules quickly.
 
     \b
     Usage:
       includecpp exec py              # Interactive Python
       includecpp exec cpp             # Interactive C++
+      includecpp exec cssl            # Interactive CSSL
       includecpp exec py mymodule     # Auto-import mymodule
       includecpp exec py plugins/x.cp # Auto-import from plugin
       includecpp exec py --all        # Import all modules
@@ -7178,7 +7179,8 @@ def exec(lang, path, import_all):
 
     # Normalize language
     is_python = lang in ('py', 'python')
-    lang_name = 'Python' if is_python else 'C++'
+    is_cssl = lang == 'cssl'
+    lang_name = 'Python' if is_python else ('CSSL' if is_cssl else 'C++')
 
     # Build imports/includes
     imports = []
@@ -7286,6 +7288,7 @@ def exec(lang, path, import_all):
 
     if is_python:
         # Execute Python code
+        import builtins
         full_code = '\n'.join(code_lines)
         try:
             # Use exec with captured output
@@ -7299,7 +7302,7 @@ def exec(lang, path, import_all):
             exec_globals = {'__name__': '__main__'}
 
             with redirect_stdout(stdout_capture), redirect_stderr(stderr_capture):
-                exec(full_code, exec_globals)
+                builtins.exec(full_code, exec_globals)
 
             stdout_val = stdout_capture.getvalue()
             stderr_val = stderr_capture.getvalue()
@@ -7315,6 +7318,29 @@ def exec(lang, path, import_all):
         except Exception as e:
             click.secho(f"Error: {e}", fg='red')
 
+    elif is_cssl:
+        # Execute CSSL code
+        full_code = '\n'.join(lines)
+        try:
+            from ..core.cssl_bridge import CsslLang
+            cssl_lang = CsslLang()
+            result = cssl_lang.exec(full_code)
+
+            # Print any output from the execution
+            output = cssl_lang.get_output()
+            if output:
+                for line in output:
+                    click.echo(line)
+
+            if result is not None:
+                click.echo(result)
+
+            if not output and result is None:
+                click.secho("(no output)", fg='bright_black')
+
+        except Exception as e:
+            click.secho(f"Error: {e}", fg='red')
+
     else:
         # Execute C++ code
         # Build a complete C++ program

{includecpp-3.4.22 → includecpp-3.5.7}/includecpp/core/cssl/cssl_builtins.py

@@ -913,6 +913,29 @@ class CSSLBuiltins:
         else:
             raise SystemExit(code)
 
+    def builtin_original(self, func_name: str, *args) -> Any:
+        """Call the original version of a replaced function.
+
+        Usage:
+            exit <<== { printl("custom exit"); }
+            original("exit");  // Calls the ORIGINAL exit, not the replacement
+
+            // In an injection that was defined BEFORE replacement:
+            old_exit <<== { original("exit"); }  // Calls original exit
+        """
+        if self.runtime and hasattr(self.runtime, '_original_functions'):
+            original_func = self.runtime._original_functions.get(func_name)
+            if original_func is not None:
+                if callable(original_func):
+                    return original_func(*args)
+                elif isinstance(original_func, type(lambda: None).__class__.__bases__[0]):  # Check if bound method
+                    return original_func(*args)
+        # Fallback: try to call builtin directly
+        builtin_method = getattr(self, f'builtin_{func_name}', None)
+        if builtin_method:
+            return builtin_method(*args)
+        raise CSSLBuiltinError(f"No original function '{func_name}' found")
+
     def builtin_env(self, name: str, default: str = None) -> Optional[str]:
         return os.environ.get(name, default)
 
@@ -1902,15 +1925,54 @@ class CSSLBuiltins:
         from .cssl_types import OpenQuote
         return OpenQuote(db_ref)
 
-    def builtin_openfind(self, combo_or_type: Any, index: int = 0) -> Any:
+    def builtin_openfind(self, combo_or_type: Any, index: int = 0, params: list = None) -> Any:
         """Find open parameter by type or combo space.
 
-        Usage: OpenFind<string>(0) or OpenFind(&@comboSpace)
+        Usage:
+            OpenFind<string>(0)  # Find first string at position 0
+            OpenFind(&@comboSpace)  # Find using combo filter
+
+        When using with open parameters:
+            open define myFunc(open Params) {
+                string name = OpenFind<string>(0);  // Find nearest string at index 0
+                int age = OpenFind<int>(1);  // Find nearest int at index 1
+            }
         """
         from .cssl_types import Combo
 
         if isinstance(combo_or_type, Combo):
+            # Find by combo space
+            if params:
+                return combo_or_type.find_match(params)
             return combo_or_type.find_match([])
+
+        # Type-based search
+        target_type = combo_or_type
+        if params is None:
+            params = []
+
+        # Map type names to Python types
+        type_map = {
+            'string': str, 'str': str,
+            'int': int, 'integer': int,
+            'float': float, 'double': float,
+            'bool': bool, 'boolean': bool,
+            'list': list, 'array': list,
+            'dict': dict, 'dictionary': dict
+        }
+
+        python_type = type_map.get(str(target_type).lower(), None)
+        if python_type is None:
+            return None
+
+        # Find the nearest matching type from index position
+        matches_found = 0
+        for i, param in enumerate(params):
+            if isinstance(param, python_type):
+                if matches_found == index:
+                    return param
+                matches_found += 1
+
         return None
 
 

{includecpp-3.4.22 → includecpp-3.5.7}/includecpp/core/cssl/cssl_parser.py

@@ -100,6 +100,7 @@ class TokenType(Enum):
     GLOBAL_REF = auto()  # r@<name> global variable declaration
     SELF_REF = auto()    # s@<name> self-reference to global struct
     SHARED_REF = auto()  # $<name> shared object reference
+    CAPTURED_REF = auto()  # %<name> captured reference (for infusion)
     PACKAGE = auto()
     PACKAGE_INCLUDES = auto()
     AS = auto()
@@ -125,6 +126,7 @@ KEYWORDS = {
     'package', 'package-includes', 'exec', 'as', 'global',
     # CSSL Type Keywords
     'int', 'string', 'float', 'bool', 'void', 'json', 'array', 'vector', 'stack',
+    'list', 'dictionary', 'dict',  # Python-like types
     'dynamic',      # No type declaration (slow but flexible)
     'undefined',    # Function errors ignored
     'open',         # Accept any parameter type
@@ -152,7 +154,7 @@ TYPE_LITERALS = {'list', 'dict'}
 # Generic type keywords that use <T> syntax
 TYPE_GENERICS = {
     'datastruct', 'dataspace', 'shuffled', 'iterator', 'combo',
-    'vector', 'stack', 'array', 'openquote'
+    'vector', 'stack', 'array', 'openquote', 'list', 'dictionary'
 }
 
 # Functions that accept type parameters: FuncName<type>(args)
@@ -241,6 +243,9 @@ class CSSLLexer:
             elif char == '$':
                 # $<name> shared object reference
                 self._read_shared_ref()
+            elif char == '%':
+                # %<name> captured reference (for infusion)
+                self._read_captured_ref()
             elif char == '&':
                 # & for references
                 if self._peek(1) == '&':
@@ -493,6 +498,20 @@ class CSSLLexer:
             self.error("Expected identifier after '$'")
         self._add_token(TokenType.SHARED_REF, value)
 
+    def _read_captured_ref(self):
+        """Read %<name> captured reference (captures value at definition time for infusions)"""
+        self._advance()  # skip '%'
+
+        # Read the identifier (captured reference name)
+        name_start = self.pos
+        while self.pos < len(self.source) and (self.source[self.pos].isalnum() or self.source[self.pos] == '_'):
+            self._advance()
+
+        value = self.source[name_start:self.pos]
+        if not value:
+            self.error("Expected identifier after '%'")
+        self._add_token(TokenType.CAPTURED_REF, value)
+
     def _read_less_than(self):
         # Check for <<== (code infusion left)
         if self._peek(1) == '<' and self._peek(2) == '=' and self._peek(3) == '=':
@@ -660,6 +679,7 @@ class CSSLParser:
     def _is_type_keyword(self, value: str) -> bool:
         """Check if a keyword is a type declaration"""
         return value in ('int', 'string', 'float', 'bool', 'void', 'json', 'array', 'vector', 'stack',
+                        'list', 'dictionary', 'dict',
                         'dynamic', 'datastruct', 'dataspace', 'shuffled', 'iterator', 'combo', 'structure')
 
     def _looks_like_function_declaration(self) -> bool:
@@ -877,7 +897,8 @@ class CSSLParser:
         # Skip known type keywords
         type_keywords = {'int', 'string', 'float', 'bool', 'dynamic', 'void',
                         'stack', 'vector', 'datastruct', 'dataspace', 'shuffled',
-                        'iterator', 'combo', 'array', 'openquote', 'json'}
+                        'iterator', 'combo', 'array', 'openquote', 'json',
+                        'list', 'dictionary', 'dict'}
         if type_name not in type_keywords:
             return False
 
@@ -1291,7 +1312,9 @@ class CSSLParser:
         elif self._looks_like_function_declaration():
             # Nested typed function (e.g., void Level2() { ... })
             return self._parse_typed_function()
-        elif self._check(TokenType.IDENTIFIER) or self._check(TokenType.AT):
+        elif (self._check(TokenType.IDENTIFIER) or self._check(TokenType.AT) or
+              self._check(TokenType.CAPTURED_REF) or self._check(TokenType.SHARED_REF) or
+              self._check(TokenType.GLOBAL_REF) or self._check(TokenType.SELF_REF)):
             return self._parse_expression_statement()
         else:
             self._advance()
@@ -1505,7 +1528,13 @@ class CSSLParser:
         return ASTNode('c_for_update', value={'var': var_name, 'op': 'none'})
 
     def _parse_python_style_for(self) -> ASTNode:
-        """Parse Python-style for loop: for (i in range(start, end)) { }"""
+        """Parse Python-style for loop: for (i in range(...)) { }
+
+        Supports:
+            for (i in range(n)) { }           - 0 to n-1
+            for (i in range(start, end)) { }  - start to end-1
+            for (i in range(start, end, step)) { }
+        """
         var_name = self._advance().value
         self._expect(TokenType.KEYWORD)  # 'in'
 
@@ -1518,15 +1547,27 @@ class CSSLParser:
             self.error(f"Expected 'range', got {self._peek().value}")
 
         self._expect(TokenType.PAREN_START)
-        start = self._parse_expression()
-        self._expect(TokenType.COMMA)
-        end = self._parse_expression()
+        first_arg = self._parse_expression()
 
-        # Optional step parameter: range(start, end, step)
+        # Check if there are more arguments
+        start = None
+        end = None
         step = None
+
         if self._check(TokenType.COMMA):
+            # range(start, end) or range(start, end, step)
             self._advance()  # consume comma
-            step = self._parse_expression()
+            start = first_arg
+            end = self._parse_expression()
+
+            # Optional step parameter
+            if self._check(TokenType.COMMA):
+                self._advance()  # consume comma
+                step = self._parse_expression()
+        else:
+            # range(n) - single argument means 0 to n-1
+            start = ASTNode('literal', value={'type': 'int', 'value': 0})
+            end = first_arg
 
         self._expect(TokenType.PAREN_END)
         self._expect(TokenType.PAREN_END)
@@ -1734,12 +1775,26 @@ class CSSLParser:
             self._match(TokenType.SEMICOLON)
             return ASTNode('inject', value={'target': expr, 'source': source, 'mode': 'add', 'filter': filter_info})
 
-        # === MINUS INJECTION: -<== (move & remove from source) ===
+        # === MINUS INJECTION: -<== or -<==[n] (move & remove from source) ===
         if self._match(TokenType.INJECT_MINUS_LEFT):
+            # Check for indexed deletion: -<==[n] (only numbers, not filters)
+            remove_index = None
+            if self._check(TokenType.BRACKET_START):
+                # Peek ahead to see if this is an index [n] or a filter [type::helper=...]
+                # Only consume if it's a simple number index
+                saved_pos = self._current
+                self._advance()  # consume [
+                if self._check(TokenType.NUMBER):
+                    remove_index = int(self._advance().value)
+                    self._expect(TokenType.BRACKET_END)
+                else:
+                    # Not a number - restore position for filter parsing
+                    self._current = saved_pos
+
             filter_info = self._parse_injection_filter()
             source = self._parse_expression()
             self._match(TokenType.SEMICOLON)
-            return ASTNode('inject', value={'target': expr, 'source': source, 'mode': 'move', 'filter': filter_info})
+            return ASTNode('inject', value={'target': expr, 'source': source, 'mode': 'move', 'filter': filter_info, 'index': remove_index})
 
         # === CODE INFUSION: <<== (inject code into function) ===
         if self._match(TokenType.INFUSE_LEFT):
@@ -1763,16 +1818,29 @@ class CSSLParser:
                 self._match(TokenType.SEMICOLON)
                 return ASTNode('infuse', value={'target': expr, 'source': source, 'mode': 'add'})
 
-        # === CODE INFUSION MINUS: -<<== (remove code from function) ===
+        # === CODE INFUSION MINUS: -<<== or -<<==[n] (remove code from function) ===
         if self._match(TokenType.INFUSE_MINUS_LEFT):
+            # Check for indexed deletion: -<<==[n] (only numbers)
+            remove_index = None
+            if self._check(TokenType.BRACKET_START):
+                # Peek ahead to see if this is an index [n] or something else
+                saved_pos = self._current
+                self._advance()  # consume [
+                if self._check(TokenType.NUMBER):
+                    remove_index = int(self._advance().value)
+                    self._expect(TokenType.BRACKET_END)
+                else:
+                    # Not a number - restore position
+                    self._current = saved_pos
+
             if self._check(TokenType.BLOCK_START):
                 code_block = self._parse_action_block()
                 self._match(TokenType.SEMICOLON)
-                return ASTNode('infuse', value={'target': expr, 'code': code_block, 'mode': 'remove'})
+                return ASTNode('infuse', value={'target': expr, 'code': code_block, 'mode': 'remove', 'index': remove_index})
             else:
                 source = self._parse_expression()
                 self._match(TokenType.SEMICOLON)
-                return ASTNode('infuse', value={'target': expr, 'source': source, 'mode': 'remove'})
+                return ASTNode('infuse', value={'target': expr, 'source': source, 'mode': 'remove', 'index': remove_index})
 
         # === RIGHT-SIDE OPERATORS ===
 
@@ -2010,6 +2078,31 @@ class CSSLParser:
                     break
             return node
 
+        if self._check(TokenType.CAPTURED_REF):
+            # %<name> captured reference (captures value at infusion registration time)
+            token = self._advance()
+            node = ASTNode('captured_ref', value=token.value, line=token.line, column=token.column)
+            # Check for member access, calls, indexing
+            while True:
+                if self._match(TokenType.PAREN_START):
+                    args = []
+                    while not self._check(TokenType.PAREN_END):
+                        args.append(self._parse_expression())
+                        if not self._check(TokenType.PAREN_END):
+                            self._expect(TokenType.COMMA)
+                    self._expect(TokenType.PAREN_END)
+                    node = ASTNode('call', value={'callee': node, 'args': args})
+                elif self._match(TokenType.DOT):
+                    member = self._advance().value
+                    node = ASTNode('member_access', value={'object': node, 'member': member})
+                elif self._match(TokenType.BRACKET_START):
+                    index = self._parse_expression()
+                    self._expect(TokenType.BRACKET_END)
+                    node = ASTNode('index_access', value={'object': node, 'index': index})
+                else:
+                    break
+            return node
+
         if self._check(TokenType.NUMBER):
             return ASTNode('literal', value=self._advance().value)
 
@@ -2034,7 +2127,13 @@ class CSSLParser:
             return expr
 
         if self._match(TokenType.BLOCK_START):
-            return self._parse_object()
+            # Distinguish between object literal { key = value } and action block { expr; }
+            # Object literal: starts with IDENTIFIER = or STRING =
+            # Action block: starts with expression (captured_ref, call, literal, etc.)
+            if self._is_object_literal():
+                return self._parse_object()
+            else:
+                return self._parse_action_block_expression()
 
         if self._match(TokenType.BRACKET_START):
             return self._parse_array()
@@ -2143,6 +2242,61 @@ class CSSLParser:
 
         return node
 
+    def _is_object_literal(self) -> bool:
+        """Check if current position is an object literal { key = value } vs action block { expr; }
+
+        Object literal: { name = value; } or { "key" = value; }
+        Action block: { %version; } or { "1.0.0" } or { call(); }
+        """
+        # Empty block is action block
+        if self._check(TokenType.BLOCK_END):
+            return False
+
+        # Save position for lookahead
+        saved_pos = self._current
+
+        # Check if it looks like key = value pattern
+        is_object = False
+        if self._check(TokenType.IDENTIFIER) or self._check(TokenType.STRING):
+            self._advance()  # skip key
+            if self._check(TokenType.EQUALS):
+                # Looks like object literal: { key = ...
+                is_object = True
+
+        # Restore position
+        self._current = saved_pos
+        return is_object
+
+    def _parse_action_block_expression(self) -> ASTNode:
+        """Parse an action block expression: { expr; expr2; } returns last value
+
+        Used for: v <== { %version; } or v <== { "1.0.0" }
+        """
+        children = []
+
+        while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
+            # Parse statement or expression
+            if (self._check(TokenType.IDENTIFIER) or self._check(TokenType.AT) or
+                self._check(TokenType.CAPTURED_REF) or self._check(TokenType.SHARED_REF) or
+                self._check(TokenType.GLOBAL_REF) or self._check(TokenType.SELF_REF) or
+                self._check(TokenType.STRING) or self._check(TokenType.NUMBER) or
+                self._check(TokenType.BOOLEAN) or self._check(TokenType.NULL) or
+                self._check(TokenType.PAREN_START)):
+                # Parse as expression and wrap in expression node for _execute_node
+                expr = self._parse_expression()
+                self._match(TokenType.SEMICOLON)
+                children.append(ASTNode('expression', value=expr))
+            elif self._check(TokenType.KEYWORD):
+                # Parse as statement
+                stmt = self._parse_statement()
+                if stmt:
+                    children.append(stmt)
+            else:
+                self._advance()
+
+        self._expect(TokenType.BLOCK_END)
+        return ASTNode('action_block', children=children)
+
     def _parse_object(self) -> ASTNode:
         properties = {}