IncludeCPP 4.0.3__py3-none-any.whl → 4.2.1__py3-none-any.whl

includecpp/core/cssl/cssl_parser.py

@@ -113,6 +113,8 @@ class TokenType(Enum):
     # Append operator for constructor/function extension
     PLUS_PLUS = auto()     # ++ for constructor/function append (keeps old + adds new)
     MINUS_MINUS = auto()   # -- for potential future use
+    # Multi-language support (v4.1.0)
+    LANG_INSTANCE_REF = auto()  # cpp$InstanceName, py$Object - cross-language instance access
 
 
 KEYWORDS = {
@@ -155,6 +157,8 @@ KEYWORDS = {
     'static',       # Static method/function
     # CSSL Include Keywords
     'include', 'get',
+    # Multi-language support (v4.1.0)
+    'supports', 'libinclude',
 }
 
 # Function modifiers that can appear in any order before function name
@@ -182,6 +186,12 @@ INJECTION_HELPERS = {
     'string', 'integer', 'json', 'array', 'vector', 'combo', 'dynamic', 'sql'
 }
 
+# Language identifiers for multi-language support (v4.1.0)
+# Used in lang$instance patterns like cpp$MyClass, py$Object
+LANGUAGE_IDS = {
+    'cpp', 'py', 'python', 'java', 'csharp', 'js', 'javascript'
+}
+
 
 @dataclass
 class Token:
@@ -457,6 +467,25 @@ class CSSLLexer:
             self._advance()
         value = self.source[start:self.pos]
 
+        # Check for language$instance pattern (v4.1.0)
+        # e.g., cpp$MyClass, py$Object, java$Service
+        if value.lower() in LANGUAGE_IDS and self.pos < len(self.source) and self.source[self.pos] == '$':
+            lang_id = value
+            self._advance()  # skip '$'
+            # Read instance name
+            instance_start = self.pos
+            while self.pos < len(self.source) and (self.source[self.pos].isalnum() or self.source[self.pos] == '_'):
+                self._advance()
+            instance_name = self.source[instance_start:self.pos]
+            if instance_name:
+                self._add_token(TokenType.LANG_INSTANCE_REF, {'lang': lang_id, 'instance': instance_name})
+                return
+            # If no instance name, revert and treat as normal identifier
+            self.pos = start
+            while self.pos < len(self.source) and (self.source[self.pos].isalnum() or self.source[self.pos] == '_'):
+                self._advance()
+            value = self.source[start:self.pos]
+
         if value in ('True', 'true'):
             self._add_token(TokenType.BOOLEAN, True)
         elif value in ('False', 'false'):
@@ -672,10 +701,11 @@ class ASTNode:
 class CSSLParser:
     """Parses CSSL tokens into an Abstract Syntax Tree."""
 
-    def __init__(self, tokens: List[Token], source_lines: List[str] = None):
+    def __init__(self, tokens: List[Token], source_lines: List[str] = None, source: str = None):
         self.tokens = [t for t in tokens if t.type != TokenType.NEWLINE]
         self.pos = 0
         self.source_lines = source_lines or []
+        self.source = source or '\n'.join(self.source_lines)  # v4.2.0: Full source for raw extraction
 
     def get_source_line(self, line_num: int) -> str:
         """Get a specific source line for error reporting"""
@@ -1350,13 +1380,7 @@ class CSSLParser:
                     # Wrap in global_assignment to mark as global variable (same as 'global' keyword)
                     global_stmt = ASTNode('global_assignment', value=stmt)
                     root.children.append(global_stmt)
-            # Handle statements - keywords like 'instance', 'list', 'map' can be variable names
-            elif (self._check(TokenType.IDENTIFIER) or self._check(TokenType.AT) or
-                  self._check(TokenType.SELF_REF) or self._check(TokenType.SHARED_REF) or
-                  self._check(TokenType.KEYWORD)):
-                stmt = self._parse_expression_statement()
-                if stmt:
-                    root.children.append(stmt)
+            # Control flow keywords must be checked BEFORE generic KEYWORD handling
             elif self._match_keyword('if'):
                 root.children.append(self._parse_if())
             elif self._match_keyword('while'):
@@ -1365,6 +1389,13 @@ class CSSLParser:
                 root.children.append(self._parse_for())
             elif self._match_keyword('foreach'):
                 root.children.append(self._parse_foreach())
+            # Handle statements - keywords like 'instance', 'list', 'map' can be variable names
+            elif (self._check(TokenType.IDENTIFIER) or self._check(TokenType.AT) or
+                  self._check(TokenType.SELF_REF) or self._check(TokenType.SHARED_REF) or
+                  self._check(TokenType.KEYWORD)):
+                stmt = self._parse_expression_statement()
+                if stmt:
+                    root.children.append(stmt)
             # Skip comments and newlines
             elif self._check(TokenType.COMMENT) or self._check(TokenType.NEWLINE):
                 self._advance()
@@ -1627,15 +1658,22 @@ class CSSLParser:
         # class Child : extends Parent (param1, param2) { ... }  <- constructor args for parent
         extends_class = None
         extends_is_python = False
+        extends_lang_ref = None  # v4.1.0: Cross-language inheritance (cpp$ClassName)
         extends_args = []
         overwrites_class = None
         overwrites_is_python = False
+        supports_language = None  # v4.1.0: Multi-language syntax support
 
         if self._match(TokenType.DOUBLE_COLON) or self._match(TokenType.COLON):
             # Parse extends and/or overwrites (can be chained with : or ::)
             while True:
                 if self._match_keyword('extends'):
-                    if self._check(TokenType.IDENTIFIER):
+                    # v4.1.0: Check for cross-language inheritance: extends cpp$ClassName
+                    if self._check(TokenType.LANG_INSTANCE_REF):
+                        ref = self._advance().value
+                        extends_lang_ref = ref  # {'lang': 'cpp', 'instance': 'ClassName'}
+                        extends_class = ref['instance']
+                    elif self._check(TokenType.IDENTIFIER):
                         extends_class = self._advance().value
                     elif self._check(TokenType.SHARED_REF):
                         extends_class = self._advance().value
@@ -1660,12 +1698,29 @@ class CSSLParser:
                     # Skip optional () after class name
                     if self._match(TokenType.PAREN_START):
                         self._expect(TokenType.PAREN_END)
+                # v4.1.0: Parse 'supports' keyword for multi-language syntax
+                elif self._match_keyword('supports'):
+                    if self._check(TokenType.AT):
+                        self._advance()  # consume @
+                        if self._check(TokenType.IDENTIFIER):
+                            supports_language = '@' + self._advance().value
+                        else:
+                            raise CSSLSyntaxError("Expected language identifier after '@' in 'supports'")
+                    elif self._check(TokenType.IDENTIFIER):
+                        supports_language = self._advance().value
+                    else:
+                        raise CSSLSyntaxError("Expected language identifier after 'supports'")
                 else:
-                    raise CSSLSyntaxError("Expected 'extends' or 'overwrites' after ':' or '::' in class declaration")
+                    raise CSSLSyntaxError("Expected 'extends', 'overwrites', or 'supports' after ':' or '::' in class declaration")
                 # Check for another : or :: for chaining
                 if not (self._match(TokenType.DOUBLE_COLON) or self._match(TokenType.COLON)):
                     break
 
+        # v4.2.0: If supports_language is set, capture raw body for runtime transformation
+        raw_body = None
+        if supports_language:
+            raw_body = self._extract_raw_block_body()
+
         node = ASTNode('class', value={
             'name': class_name,
             'is_global': is_global,
@@ -1673,10 +1728,29 @@ class CSSLParser:
             'class_params': class_params,
             'extends': extends_class,
             'extends_is_python': extends_is_python,
+            'extends_lang_ref': extends_lang_ref,  # v4.1.0
             'extends_args': extends_args,
             'overwrites': overwrites_class,
-            'overwrites_is_python': overwrites_is_python
+            'overwrites_is_python': overwrites_is_python,
+            'supports_language': supports_language,  # v4.1.0
+            'raw_body': raw_body  # v4.2.0: Raw body for language transformation
         }, children=[])
+
+        # v4.2.0: If we have raw_body for language transformation, skip regular parsing
+        if raw_body is not None:
+            # Skip the block entirely - runtime will transform and parse
+            self._expect(TokenType.BLOCK_START)
+            brace_count = 1
+            while brace_count > 0 and not self._is_at_end():
+                if self._check(TokenType.BLOCK_START):
+                    brace_count += 1
+                elif self._check(TokenType.BLOCK_END):
+                    brace_count -= 1
+                if brace_count > 0:
+                    self._advance()
+            self._expect(TokenType.BLOCK_END)
+            return node
+
         self._expect(TokenType.BLOCK_START)
 
         while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
@@ -1907,13 +1981,14 @@ class CSSLParser:
         """Parse define function declaration.
 
         Syntax:
-            define MyFunc(args) { }           // Local function
-            global define MyFunc(args) { }    // Global function
-            define @MyFunc(args) { }          // Global function (alternative)
-            define *MyFunc(args) { }          // Non-null: must never return None
-            define MyFunc : extends OtherFunc() { }  // Inherit local vars
-            define MyFunc : overwrites OtherFunc() { }  // Replace OtherFunc
-            define MyFunc :: extends Parent::Method :: overwrites Parent::Method() { }  // Method-level inheritance
+            define MyFunc(args) { }                    // Local function
+            global define MyFunc(args) { }             // Global function
+            define @MyFunc(args) { }                   // Global function (alternative)
+            define *MyFunc(args) { }                   // Non-null: must never return None
+            define MyFunc(args) : extends OtherFunc { }     // Inherit local vars
+            define MyFunc(args) : overwrites OtherFunc { }  // Replace OtherFunc
+            define MyFunc(args) : supports python { }       // Multi-language syntax
+            define MyFunc(args) :: extends Parent::Method { }  // Method-level inheritance
         """
         # Check for * prefix (non-null function - must return non-null)
         # Also *[type] for type exclusion (must NOT return that type)
@@ -1935,8 +2010,56 @@ class CSSLParser:
 
         name = self._advance().value
 
-        # Check for extends/overwrites: define func : extends/overwrites target() { }
-        # Also supports method-level :: syntax: define func :: extends Parent::method
+        # Parse parameters FIRST (before :extends/:overwrites/:supports)
+        # Syntax: define funcName(params) : extends/overwrites/supports { }
+        params = []
+
+        if self._match(TokenType.PAREN_START):
+            while not self._check(TokenType.PAREN_END):
+                param_info = {}
+                # Handle 'open' keyword for open parameters
+                if self._match_keyword('open'):
+                    param_info['open'] = True
+                # Handle type annotations (e.g., string, int, dynamic, etc.)
+                if self._check(TokenType.KEYWORD):
+                    param_info['type'] = self._advance().value
+                # Handle reference operator &
+                if self._match(TokenType.AMPERSAND):
+                    param_info['ref'] = True
+                # Handle * prefix for non-null parameters
+                if self._match(TokenType.MULTIPLY):
+                    param_info['non_null'] = True
+                # Get parameter name
+                if self._check(TokenType.IDENTIFIER):
+                    param_name = self._advance().value
+                    # v4.2.0: Handle default parameter values (param = value)
+                    if self._match(TokenType.EQUALS):
+                        default_value = self._parse_expression()
+                        param_info['default'] = default_value
+                    if param_info:
+                        params.append({'name': param_name, **param_info})
+                    else:
+                        params.append(param_name)
+                    self._match(TokenType.COMMA)
+                elif self._check(TokenType.KEYWORD):
+                    # Parameter name could be a keyword like 'Params'
+                    param_name = self._advance().value
+                    # v4.2.0: Handle default parameter values (param = value)
+                    if self._match(TokenType.EQUALS):
+                        default_value = self._parse_expression()
+                        param_info['default'] = default_value
+                    if param_info:
+                        params.append({'name': param_name, **param_info})
+                    else:
+                        params.append(param_name)
+                    self._match(TokenType.COMMA)
+                else:
+                    break
+            self._expect(TokenType.PAREN_END)
+
+        # Check for extends/overwrites/supports AFTER parameters
+        # Syntax: define func(params) : extends/overwrites target { }
+        # Also supports method-level :: syntax: define func() :: extends Parent::method
         extends_func = None
         overwrites_func = None
         extends_is_python = False
@@ -1945,6 +2068,7 @@ class CSSLParser:
         extends_method_ref = None
         overwrites_class_ref = None
         overwrites_method_ref = None
+        supports_language = None  # v4.1.0: Multi-language syntax support
 
         if self._match(TokenType.DOUBLE_COLON) or self._match(TokenType.COLON):
             # Parse extends and/or overwrites (supports :: method-level syntax)
@@ -2005,49 +2129,24 @@ class CSSLParser:
                     # Skip optional () after function/method name
                     if self._match(TokenType.PAREN_START):
                         self._expect(TokenType.PAREN_END)
+                # v4.1.0: Parse 'supports' keyword for multi-language syntax
+                elif self._match_keyword('supports'):
+                    if self._check(TokenType.AT):
+                        self._advance()  # consume @
+                        if self._check(TokenType.IDENTIFIER):
+                            supports_language = '@' + self._advance().value
+                        else:
+                            raise CSSLSyntaxError("Expected language identifier after '@' in 'supports'")
+                    elif self._check(TokenType.IDENTIFIER):
+                        supports_language = self._advance().value
+                    else:
+                        raise CSSLSyntaxError("Expected language identifier after 'supports'")
                 else:
                     break
                 # Check for another :: or : for chaining extends/overwrites
                 if not (self._match(TokenType.DOUBLE_COLON) or self._match(TokenType.COLON)):
                     break
 
-        params = []
-
-        if self._match(TokenType.PAREN_START):
-            while not self._check(TokenType.PAREN_END):
-                param_info = {}
-                # Handle 'open' keyword for open parameters
-                if self._match_keyword('open'):
-                    param_info['open'] = True
-                # Handle type annotations (e.g., string, int, dynamic, etc.)
-                if self._check(TokenType.KEYWORD):
-                    param_info['type'] = self._advance().value
-                # Handle reference operator &
-                if self._match(TokenType.AMPERSAND):
-                    param_info['ref'] = True
-                # Handle * prefix for non-null parameters
-                if self._match(TokenType.MULTIPLY):
-                    param_info['non_null'] = True
-                # Get parameter name
-                if self._check(TokenType.IDENTIFIER):
-                    param_name = self._advance().value
-                    if param_info:
-                        params.append({'name': param_name, **param_info})
-                    else:
-                        params.append(param_name)
-                    self._match(TokenType.COMMA)
-                elif self._check(TokenType.KEYWORD):
-                    # Parameter name could be a keyword like 'Params'
-                    param_name = self._advance().value
-                    if param_info:
-                        params.append({'name': param_name, **param_info})
-                    else:
-                        params.append(param_name)
-                    self._match(TokenType.COMMA)
-                else:
-                    break
-            self._expect(TokenType.PAREN_END)
-
         # New: Append mode and reference tracking for functions
         # Syntax: define XYZ(int zahl) &overwrittenclass::functionyouwanttokeep ++ { ... }
         append_mode = False
@@ -2074,6 +2173,37 @@ class CSSLParser:
         if self._match(TokenType.PLUS_PLUS):
             append_mode = True
 
+        # v4.2.0: Allow 'supports' AFTER &Class::member reference
+        # Syntax: define func() &$pyclass::method : supports python { }
+        if self._match(TokenType.COLON) or self._match(TokenType.DOUBLE_COLON):
+            if self._match_keyword('supports'):
+                if self._check(TokenType.AT):
+                    self._advance()
+                    if self._check(TokenType.IDENTIFIER):
+                        supports_language = '@' + self._advance().value
+                    else:
+                        raise CSSLSyntaxError("Expected language identifier after '@' in 'supports'")
+                elif self._check(TokenType.IDENTIFIER):
+                    supports_language = self._advance().value
+                else:
+                    raise CSSLSyntaxError("Expected language identifier after 'supports'")
+
+        self._expect(TokenType.BLOCK_START)
+
+        # v4.2.0: Extract raw body when supports_language is set for transformation
+        raw_body = None
+        children = []
+        if supports_language:
+            raw_body = self._extract_raw_block_body()
+            # _extract_raw_block_body positions cursor at BLOCK_END
+        else:
+            while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
+                stmt = self._parse_statement()
+                if stmt:
+                    children.append(stmt)
+
+        self._expect(TokenType.BLOCK_END)
+
         node = ASTNode('function', value={
             'name': name,
             'is_global': is_global,
@@ -2092,16 +2222,13 @@ class CSSLParser:
             # New append mode fields
             'append_mode': append_mode,
             'append_ref_class': append_ref_class,
-            'append_ref_member': append_ref_member
-        }, children=[])
-        self._expect(TokenType.BLOCK_START)
-
-        while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
-            stmt = self._parse_statement()
-            if stmt:
-                node.children.append(stmt)
+            'append_ref_member': append_ref_member,
+            # v4.1.0: Multi-language support
+            'supports_language': supports_language,
+            # v4.2.0: Raw body for language transformation
+            'raw_body': raw_body
+        }, children=children)
 
-        self._expect(TokenType.BLOCK_END)
         return node
 
     def _parse_statement(self) -> Optional[ASTNode]:
@@ -2127,6 +2254,9 @@ class CSSLParser:
             return self._parse_try()
         elif self._match_keyword('await'):
             return self._parse_await()
+        elif self._match_keyword('supports'):
+            # v4.2.0: Standalone supports block for multi-language syntax
+            return self._parse_supports_block()
         elif self._match_keyword('define'):
             # Nested define function
             return self._parse_define()
@@ -2352,42 +2482,40 @@ class CSSLParser:
 
         Supports: i = i + 1, i++, ++i, i += 1, i -= 1
         """
-        # Check for prefix increment/decrement: ++i or --i
-        if self._check(TokenType.PLUS) or self._check(TokenType.MINUS):
-            op_token = self._advance()
-            # Check for double operator (++ or --)
-            if self._check(op_token.type):
-                self._advance()
-                var_name = self._advance().value
-                op = 'increment' if op_token.type == TokenType.PLUS else 'decrement'
-                return ASTNode('c_for_update', value={'var': var_name, 'op': op})
+        # Check for prefix increment/decrement: ++i or --i (as single PLUS_PLUS/MINUS_MINUS token)
+        if self._check(TokenType.PLUS_PLUS):
+            self._advance()
+            var_name = self._advance().value
+            return ASTNode('c_for_update', value={'var': var_name, 'op': 'increment'})
+        elif self._check(TokenType.MINUS_MINUS):
+            self._advance()
+            var_name = self._advance().value
+            return ASTNode('c_for_update', value={'var': var_name, 'op': 'decrement'})
 
         # Regular variable assignment or postfix
         var_name = self._advance().value
 
-        # Check for postfix increment/decrement: i++ or i--
-        if self._check(TokenType.PLUS):
+        # Check for postfix increment/decrement: i++ or i-- (as single PLUS_PLUS/MINUS_MINUS token)
+        if self._check(TokenType.PLUS_PLUS):
+            self._advance()
+            return ASTNode('c_for_update', value={'var': var_name, 'op': 'increment'})
+        elif self._check(TokenType.MINUS_MINUS):
             self._advance()
-            if self._check(TokenType.PLUS):
+            return ASTNode('c_for_update', value={'var': var_name, 'op': 'decrement'})
+        # i += value
+        elif self._check(TokenType.PLUS):
+            self._advance()
+            if self._check(TokenType.EQUALS):
                 self._advance()
-                return ASTNode('c_for_update', value={'var': var_name, 'op': 'increment'})
-            else:
-                # i += value
-                if self._check(TokenType.EQUALS):
-                    self._advance()
-                    value = self._parse_expression()
-                    return ASTNode('c_for_update', value={'var': var_name, 'op': 'add', 'value': value})
+                value = self._parse_expression()
+                return ASTNode('c_for_update', value={'var': var_name, 'op': 'add', 'value': value})
+        # i -= value
         elif self._check(TokenType.MINUS):
             self._advance()
-            if self._check(TokenType.MINUS):
+            if self._check(TokenType.EQUALS):
                 self._advance()
-                return ASTNode('c_for_update', value={'var': var_name, 'op': 'decrement'})
-            else:
-                # i -= value
-                if self._check(TokenType.EQUALS):
-                    self._advance()
-                    value = self._parse_expression()
-                    return ASTNode('c_for_update', value={'var': var_name, 'op': 'subtract', 'value': value})
+                value = self._parse_expression()
+                return ASTNode('c_for_update', value={'var': var_name, 'op': 'subtract', 'value': value})
 
         # Regular assignment: i = expression
         if self._check(TokenType.EQUALS):
@@ -2632,6 +2760,163 @@ class CSSLParser:
         self._match(TokenType.SEMICOLON)
         return ASTNode('await', value=expr)
 
+    def _parse_supports_block(self) -> ASTNode:
+        """Parse standalone supports block for multi-language syntax.
+
+        v4.2.0: Allows 'supports' to be used anywhere, not just in class/function.
+
+        Syntax:
+            supports py { }               // Python syntax block
+            supports @py { }              // With @ prefix
+            supports python { }           // Full language name
+            supports cpp { }              // C++ syntax block
+            supports javascript { }       // JavaScript syntax block
+
+        Example:
+            supports py {
+                for i in range(10):
+                    print(i)
+            }
+
+            supports cpp {
+                std::cout << "Hello" << std::endl;
+                int x = 42;
+            }
+        """
+        # Parse language identifier
+        language = None
+        if self._check(TokenType.AT):
+            self._advance()
+            if self._check(TokenType.IDENTIFIER):
+                language = '@' + self._advance().value
+            else:
+                raise CSSLSyntaxError("Expected language identifier after '@' in 'supports'")
+        elif self._check(TokenType.IDENTIFIER):
+            language = self._advance().value
+        else:
+            raise CSSLSyntaxError("Expected language identifier after 'supports'")
+
+        # Extract raw block source for language transformation (preserves indentation)
+        raw_source = None
+        if self._check(TokenType.BLOCK_START):
+            raw_source = self._extract_raw_block_body()
+
+        # Skip parsing body if we have raw_source - runtime will transform and parse
+        body = []
+        self._expect(TokenType.BLOCK_START)
+        if raw_source is None:
+            # No raw source (e.g., already CSSL syntax), parse normally
+            while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
+                stmt = self._parse_statement()
+                if stmt:
+                    body.append(stmt)
+        else:
+            # Skip the block - runtime will transform and parse
+            brace_count = 1
+            while brace_count > 0 and not self._is_at_end():
+                if self._check(TokenType.BLOCK_START):
+                    brace_count += 1
+                elif self._check(TokenType.BLOCK_END):
+                    brace_count -= 1
+                if brace_count > 0:
+                    self._advance()
+        self._expect(TokenType.BLOCK_END)
+
+        return ASTNode('supports_block', value={
+            'language': language,
+            'raw_source': raw_source
+        }, children=body)
+
+    def _extract_raw_block_source(self) -> Optional[str]:
+        """Extract raw source code from a {} block before parsing.
+
+        Used for 'supports' blocks to allow language transformation.
+        """
+        if not self._check(TokenType.BLOCK_START):
+            return None
+
+        # Find the matching block end by counting braces
+        start_pos = self.pos
+        brace_count = 0
+        found_start = False
+
+        # Walk through tokens to find matching close brace
+        temp_pos = self.pos
+        while temp_pos < len(self.tokens):
+            token = self.tokens[temp_pos]
+            if token.type == TokenType.BLOCK_START:
+                if not found_start:
+                    found_start = True
+                brace_count += 1
+            elif token.type == TokenType.BLOCK_END:
+                brace_count -= 1
+                if brace_count == 0:
+                    break
+            temp_pos += 1
+
+        # Build source from tokens between braces (excluding braces)
+        source_parts = []
+        for i in range(start_pos + 1, temp_pos):
+            token = self.tokens[i]
+            if token.type == TokenType.STRING:
+                source_parts.append(f'"{token.value}"')
+            elif token.type == TokenType.NEWLINE:
+                source_parts.append('\n')
+            else:
+                source_parts.append(str(token.value))
+
+        return ' '.join(source_parts)
+
+    def _extract_raw_block_body(self) -> Optional[str]:
+        """Extract raw source code body from a {} block for language transformation.
+
+        v4.2.0: Used for 'supports' blocks to preserve original source (including indentation).
+        This extracts the raw text between { and } from the original source string.
+
+        Returns the raw body content without the surrounding braces.
+        """
+        if not self._check(TokenType.BLOCK_START):
+            return None
+
+        # Get the { token's position
+        start_token = self._current()
+        start_line = start_token.line
+        start_col = start_token.column
+
+        # Find the { character position in source
+        # Line numbers are 1-indexed, columns are 1-indexed
+        brace_start_pos = 0
+        current_line = 1
+        for i, char in enumerate(self.source):
+            if current_line == start_line:
+                # Found the right line, now find the column
+                col_in_line = i - brace_start_pos + 1
+                if col_in_line >= start_col:
+                    # Search for { from here
+                    for j in range(i, len(self.source)):
+                        if self.source[j] == '{':
+                            brace_start_pos = j
+                            break
+                    break
+            if char == '\n':
+                current_line += 1
+                brace_start_pos = i + 1
+
+        # Now find the matching closing brace
+        brace_count = 1
+        pos = brace_start_pos + 1
+        while pos < len(self.source) and brace_count > 0:
+            char = self.source[pos]
+            if char == '{':
+                brace_count += 1
+            elif char == '}':
+                brace_count -= 1
+            pos += 1
+
+        # Extract the body (everything between { and })
+        body = self.source[brace_start_pos + 1:pos - 1]
+        return body.strip()
+
     def _parse_action_block(self) -> ASTNode:
         """Parse an action block { ... } containing statements for createcmd"""
         node = ASTNode('action_block', children=[])
@@ -2948,6 +3233,14 @@ class CSSLParser:
         if self._match(TokenType.MINUS):
             operand = self._parse_unary()
             return ASTNode('unary', value={'op': '-', 'operand': operand})
+        # Prefix increment: ++i
+        if self._match(TokenType.PLUS_PLUS):
+            operand = self._parse_unary()
+            return ASTNode('increment', value={'op': 'prefix', 'operand': operand})
+        # Prefix decrement: --i
+        if self._match(TokenType.MINUS_MINUS):
+            operand = self._parse_unary()
+            return ASTNode('decrement', value={'op': 'prefix', 'operand': operand})
         if self._match(TokenType.AMPERSAND):
             # Reference operator: &variable or &@module
             operand = self._parse_unary()
@@ -3090,12 +3383,13 @@ class CSSLParser:
             token = self._advance()
             node = ASTNode('global_ref', value=token.value, line=token.line, column=token.column)
             # Check for member access, calls, indexing - with kwargs support
+            # Support both . and -> for member access
             while True:
                 if self._match(TokenType.PAREN_START):
                     args, kwargs = self._parse_call_arguments()
                     self._expect(TokenType.PAREN_END)
                     node = ASTNode('call', value={'callee': node, 'args': args, 'kwargs': kwargs})
-                elif self._match(TokenType.DOT):
+                elif self._match(TokenType.DOT) or self._match(TokenType.FLOW_RIGHT):
                     member = self._advance().value
                     node = ASTNode('member_access', value={'object': node, 'member': member})
                 elif self._match(TokenType.BRACKET_START):
@@ -3111,12 +3405,14 @@ class CSSLParser:
             token = self._advance()
             node = ASTNode('shared_ref', value=token.value, line=token.line, column=token.column)
             # Check for member access, calls, indexing - with kwargs support
+            # Support both . and -> for member access (like this->member)
             while True:
                 if self._match(TokenType.PAREN_START):
                     args, kwargs = self._parse_call_arguments()
                     self._expect(TokenType.PAREN_END)
                     node = ASTNode('call', value={'callee': node, 'args': args, 'kwargs': kwargs})
-                elif self._match(TokenType.DOT):
+                elif self._match(TokenType.DOT) or self._match(TokenType.FLOW_RIGHT):
+                    # Support both $obj.member and $obj->member syntax
                     member = self._advance().value
                     node = ASTNode('member_access', value={'object': node, 'member': member})
                 elif self._match(TokenType.BRACKET_START):
@@ -3132,12 +3428,36 @@ class CSSLParser:
             token = self._advance()
             node = ASTNode('captured_ref', value=token.value, line=token.line, column=token.column)
             # Check for member access, calls, indexing - with kwargs support
+            # Support both . and -> for member access
             while True:
                 if self._match(TokenType.PAREN_START):
                     args, kwargs = self._parse_call_arguments()
                     self._expect(TokenType.PAREN_END)
                     node = ASTNode('call', value={'callee': node, 'args': args, 'kwargs': kwargs})
-                elif self._match(TokenType.DOT):
+                elif self._match(TokenType.DOT) or self._match(TokenType.FLOW_RIGHT):
+                    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
+
+        # v4.1.0: Cross-language instance reference: cpp$ClassName, py$Object
+        if self._check(TokenType.LANG_INSTANCE_REF):
+            token = self._advance()
+            ref = token.value  # {'lang': 'cpp', 'instance': 'ClassName'}
+            node = ASTNode('lang_instance_ref', value=ref, line=token.line, column=token.column)
+            # Check for member access, calls, indexing
+            # Support both . and -> for member access
+            while True:
+                if self._match(TokenType.PAREN_START):
+                    args, kwargs = self._parse_call_arguments()
+                    self._expect(TokenType.PAREN_END)
+                    node = ASTNode('call', value={'callee': node, 'args': args, 'kwargs': kwargs})
+                elif self._match(TokenType.DOT) or self._match(TokenType.FLOW_RIGHT):
                     member = self._advance().value
                     node = ASTNode('member_access', value={'object': node, 'member': member})
                 elif self._match(TokenType.BRACKET_START):
@@ -3398,6 +3718,12 @@ class CSSLParser:
                 index = self._parse_expression()
                 self._expect(TokenType.BRACKET_END)
                 node = ASTNode('index_access', value={'object': node, 'index': index})
+            # Postfix increment: i++
+            elif self._match(TokenType.PLUS_PLUS):
+                node = ASTNode('increment', value={'op': 'postfix', 'operand': node})
+            # Postfix decrement: i--
+            elif self._match(TokenType.MINUS_MINUS):
+                node = ASTNode('decrement', value={'op': 'postfix', 'operand': node})
             else:
                 break
 
@@ -3508,7 +3834,7 @@ def parse_cssl(source: str) -> ASTNode:
     """Parse CSSL source code into an AST - auto-detects service vs program format"""
     lexer = CSSLLexer(source)
     tokens = lexer.tokenize()
-    parser = CSSLParser(tokens, lexer.source_lines)
+    parser = CSSLParser(tokens, lexer.source_lines, source)  # v4.2.0: Pass source for raw extraction
 
     # Auto-detect: if first token is '{', it's a service file
     # Otherwise treat as standalone program (whitespace is already filtered by lexer)
@@ -3522,7 +3848,7 @@ def parse_cssl_program(source: str) -> ASTNode:
     """Parse standalone CSSL program (no service wrapper) into an AST"""
     lexer = CSSLLexer(source)
     tokens = lexer.tokenize()
-    parser = CSSLParser(tokens, lexer.source_lines)
+    parser = CSSLParser(tokens, lexer.source_lines, source)  # v4.2.0: Pass source for raw extraction
     return parser.parse_program()