IncludeCPP 4.2.2__py3-none-any.whl → 4.5.2__py3-none-any.whl

includecpp/core/cssl/cssl_parser.py

@@ -119,11 +119,12 @@ class TokenType(Enum):
 
 KEYWORDS = {
     # Service structure
-    'service-init', 'service-run', 'service-include', 'struct', 'define', 'main', 'class', 'constr', 'extends', 'overwrites', 'new', 'this', 'super',
+    'service-init', 'service-run', 'service-include', 'struct', 'define', 'main', 'class', 'constr', 'extends', 'overwrites', 'new', 'this', 'super', 'enum',
     # Control flow
     'if', 'else', 'elif', 'while', 'for', 'foreach', 'in', 'range',
     'switch', 'case', 'default', 'break', 'continue', 'return',
     'try', 'catch', 'finally', 'throw',
+    'except', 'always',  # v4.2.5: param switch keywords
     # Literals
     'True', 'False', 'null', 'None', 'true', 'false',
     # Logical operators
@@ -141,6 +142,7 @@ KEYWORDS = {
     'datastruct',   # Universal container (lazy declarator)
     'dataspace',    # SQL/data storage container
     'shuffled',     # Unorganized fast storage (multiple returns)
+    'bytearrayed',  # Function-to-byte mapping with pattern matching (v4.2.5)
     'iterator',     # Advanced iterator with tasks
     'combo',        # Filter/search spaces
     'structure',    # Advanced C++/Py Class
@@ -155,6 +157,8 @@ KEYWORDS = {
     'sqlbased',     # SQL-based function
     'public',       # Explicitly public (default)
     'static',       # Static method/function
+    'embedded',     # Immediate &target replacement at registration (v4.2.5)
+    'native',       # Force C++ execution (no Python fallback)
     # CSSL Include Keywords
     'include', 'get',
     # Multi-language support (v4.1.0)
@@ -164,7 +168,8 @@ KEYWORDS = {
 # Function modifiers that can appear in any order before function name
 FUNCTION_MODIFIERS = {
     'undefined', 'open', 'meta', 'super', 'closed', 'private', 'virtual',
-    'sqlbased', 'const', 'public', 'static', 'global', 'shuffled'
+    'sqlbased', 'const', 'public', 'static', 'global', 'shuffled', 'embedded',
+    'native'  # Force C++ execution
 }
 
 # Type literals that create empty instances
@@ -348,13 +353,16 @@ class CSSLLexer:
                 self._add_token(TokenType.MULTIPLY, '*')
                 self._advance()
             elif char == '/':
-                # Check if this is a // comment (handled above) or division
-                if self._peek(1) != '/':
+                # Check for // comment, /* block comment */, or division
+                if self._peek(1) == '/':
+                    # Single-line comment
+                    self._skip_comment()
+                elif self._peek(1) == '*':
+                    # Block comment /* ... */
+                    self._skip_block_comment()
+                else:
                     self._add_token(TokenType.DIVIDE, '/')
                     self._advance()
-                else:
-                    # Already handled by // comment check above, but just in case
-                    self._skip_comment()
             elif char == '<':
                 self._read_less_than()
             elif char == '>':
@@ -399,6 +407,26 @@ class CSSLLexer:
         while self.pos < len(self.source) and self.source[self.pos] != '\n':
             self._advance()
 
+    def _skip_block_comment(self):
+        """Skip block comment /* ... */ including nested comments"""
+        self._advance()  # skip /
+        self._advance()  # skip *
+        depth = 1
+        while self.pos < len(self.source) and depth > 0:
+            if self.source[self.pos] == '/' and self._peek(1) == '*':
+                depth += 1
+                self._advance()
+                self._advance()
+            elif self.source[self.pos] == '*' and self._peek(1) == '/':
+                depth -= 1
+                self._advance()
+                self._advance()
+            else:
+                if self.source[self.pos] == '\n':
+                    self.line += 1
+                    self.column = 0
+                self._advance()
+
     def _read_string(self, quote_char: str):
         self._advance()
         start = self.pos
@@ -453,6 +481,19 @@ class CSSLLexer:
         start = self.pos
         if self.source[self.pos] == '-':
             self._advance()
+
+        # Check for hex number: 0x... or 0X...
+        if (self.pos < len(self.source) and self.source[self.pos] == '0' and
+            self.pos + 1 < len(self.source) and self.source[self.pos + 1] in 'xX'):
+            self._advance()  # skip '0'
+            self._advance()  # skip 'x' or 'X'
+            # Read hex digits
+            while self.pos < len(self.source) and self.source[self.pos] in '0123456789abcdefABCDEF':
+                self._advance()
+            value = self.source[start:self.pos]
+            self._add_token(TokenType.NUMBER, int(value, 16))
+            return
+
         while self.pos < len(self.source) and (self.source[self.pos].isdigit() or self.source[self.pos] == '.'):
             self._advance()
         value = self.source[start:self.pos]
@@ -766,6 +807,41 @@ class CSSLParser:
                         'list', 'dictionary', 'dict', 'instance', 'map', 'openquote', 'parameter',
                         'dynamic', 'datastruct', 'dataspace', 'shuffled', 'iterator', 'combo', 'structure')
 
+    def _parse_generic_type_content(self) -> str:
+        """Parse generic type content including nested generics.
+
+        Handles: <int>, <string, dynamic>, <map<string, dynamic>>, etc.
+        Returns the full type string including nested generics.
+
+        Called AFTER consuming the opening '<'.
+        """
+        parts = []
+        depth = 1  # Already inside first <
+
+        while depth > 0 and not self._is_at_end():
+            if self._check(TokenType.COMPARE_LT):
+                parts.append('<')
+                depth += 1
+                self._advance()
+            elif self._check(TokenType.COMPARE_GT):
+                depth -= 1
+                if depth > 0:  # Only add > if not the final closing >
+                    parts.append('>')
+                self._advance()
+            elif self._check(TokenType.COMMA):
+                parts.append(', ')
+                self._advance()
+            elif self._check(TokenType.KEYWORD) or self._check(TokenType.IDENTIFIER):
+                parts.append(self._advance().value)
+            elif self._check(TokenType.STRING):
+                # For instance<"name">
+                parts.append(f'"{self._advance().value}"')
+            else:
+                # Skip whitespace/other tokens
+                self._advance()
+
+        return ''.join(parts)
+
     def _looks_like_function_declaration(self) -> bool:
         """Check if current position looks like a C-style function declaration.
 
@@ -900,7 +976,7 @@ class CSSLParser:
         self.pos = saved_pos
         return False
 
-    def _parse_typed_function(self, is_global: bool = False) -> ASTNode:
+    def _parse_typed_function(self, is_global: bool = False, is_embedded: bool = False) -> ASTNode:
         """Parse C-style typed function declaration with flexible modifier ordering.
 
         Supports any order of modifiers, types, non-null (*), and global (@):
@@ -930,6 +1006,8 @@ class CSSLParser:
         non_null = False
         exclude_type = None
         is_const = False
+        # v4.2.5: embedded = immediate &target replacement (can come from param or modifier)
+        _is_embedded = is_embedded
 
         # Phase 1: Collect all modifiers, type, non-null, and global indicators
         # These can appear in any order before the function name
@@ -944,6 +1022,9 @@ class CSSLParser:
                 elif mod == 'const':
                     is_const = True
                     modifiers.append(mod)
+                elif mod == 'embedded':
+                    _is_embedded = True
+                    modifiers.append(mod)
                 else:
                     modifiers.append(mod)
                 continue
@@ -1183,6 +1264,7 @@ class CSSLParser:
             'name': name,
             'is_global': is_global,
             'is_const': is_const,
+            'is_embedded': _is_embedded,  # v4.2.5: immediate &target replacement
             'params': params,
             'return_type': return_type,
             'generic_type': generic_type,
@@ -1200,7 +1282,8 @@ class CSSLParser:
             'append_mode': append_mode,
             'append_ref_class': append_ref_class,
             'append_ref_member': append_ref_member,
-            'enforce_return_type': return_type is not None and 'meta' not in modifiers
+            # v4.3.2: Also disable strict return type enforcement for 'shuffled' modifier (returns tuple)
+            'enforce_return_type': return_type is not None and 'meta' not in modifiers and 'shuffled' not in modifiers and return_type != 'shuffled'
         }, children=[])
 
         self._expect(TokenType.BLOCK_START)
@@ -1280,19 +1363,16 @@ class CSSLParser:
 
         The * prefix indicates a non-nullable variable (can never be None/null).
         Example: vector<dynamic> *MyVector - can never contain None values.
+        Supports nested generics: datastruct<map<string, dynamic>> zipped;
         """
         # Get type name
         type_name = self._advance().value  # Consume type keyword
 
-        # Check for generic type <T> or instance<"name">
+        # Check for generic type <T> or instance<"name"> or nested <map<K,V>>
         element_type = None
         if self._match(TokenType.COMPARE_LT):
-            # For instance<"name">, element_type can be a string literal
-            if type_name == 'instance' and self._check(TokenType.STRING):
-                element_type = self._advance().value
-            elif self._check(TokenType.KEYWORD) or self._check(TokenType.IDENTIFIER):
-                element_type = self._advance().value
-            self._expect(TokenType.COMPARE_GT)
+            # Use helper to parse nested generic content
+            element_type = self._parse_generic_type_content()
 
         # Check for * prefix (non-nullable indicator)
         non_null = False
@@ -1337,8 +1417,37 @@ class CSSLParser:
                 root.children.append(self._parse_struct())
             elif self._match_keyword('class'):
                 root.children.append(self._parse_class())
+            elif self._match_keyword('enum'):
+                root.children.append(self._parse_enum())
+            elif self._match_keyword('bytearrayed'):
+                root.children.append(self._parse_bytearrayed())
             elif self._match_keyword('define'):
                 root.children.append(self._parse_define())
+            # v4.5.1: Handle function modifiers (private, const, static, etc.) before define
+            elif self._check(TokenType.KEYWORD) and self._is_function_modifier(self._current().value):
+                modifiers = []
+                is_embedded = False
+                is_global = False
+                has_open_params = False
+                while self._check(TokenType.KEYWORD) and self._is_function_modifier(self._current().value):
+                    mod = self._advance().value
+                    modifiers.append(mod)
+                    if mod == 'embedded':
+                        is_embedded = True
+                    elif mod == 'global':
+                        is_global = True
+                    elif mod == 'open':
+                        has_open_params = True
+                # Now check what follows
+                if self._match_keyword('define'):
+                    root.children.append(self._parse_define(
+                        is_global=is_global, is_embedded=is_embedded,
+                        has_open_params=has_open_params, modifiers=modifiers
+                    ))
+                elif self._looks_like_function_declaration():
+                    root.children.append(self._parse_typed_function(modifiers=modifiers))
+                else:
+                    self.error(f"Expected 'define' or function declaration after modifiers: {modifiers}")
             # Check for C-style typed function declarations
             elif self._looks_like_function_declaration():
                 root.children.append(self._parse_typed_function())
@@ -1359,6 +1468,45 @@ class CSSLParser:
             elif self._match_keyword('package-includes'):
                 root.children.append(self._parse_package_includes())
             # Handle global declarations
+            # v4.2.5: Handle 'embedded' keyword for immediate &target replacement
+            # v4.3.2: Extended to support enums: embedded EnumName &TargetEnum { ... }
+            # v4.3.2: Support 'open embedded define' syntax
+            elif self._match_keyword('open'):
+                # open can be followed by embedded or define
+                if self._match_keyword('embedded'):
+                    if self._match_keyword('define'):
+                        root.children.append(self._parse_define(is_embedded=True, has_open_params=True))
+                    elif self._looks_like_function_declaration():
+                        root.children.append(self._parse_typed_function(is_embedded=True, has_open_params=True))
+                    else:
+                        self.error("Expected 'define' or function declaration after 'open embedded'")
+                elif self._match_keyword('define'):
+                    root.children.append(self._parse_define(has_open_params=True))
+                else:
+                    self.error("Expected 'embedded' or 'define' after 'open'")
+            elif self._match_keyword('embedded'):
+                # v4.3.2: Support both 'embedded open define' and 'embedded define'
+                if self._match_keyword('open'):
+                    # embedded open define ...
+                    if self._match_keyword('define'):
+                        root.children.append(self._parse_define(is_embedded=True, has_open_params=True))
+                    elif self._looks_like_function_declaration():
+                        root.children.append(self._parse_typed_function(is_embedded=True, has_open_params=True))
+                    else:
+                        self.error("Expected 'define' or function declaration after 'embedded open'")
+                elif self._match_keyword('class'):
+                    root.children.append(self._parse_class(is_embedded=True))
+                elif self._match_keyword('enum'):
+                    root.children.append(self._parse_enum(is_embedded=True))
+                elif self._match_keyword('define'):
+                    root.children.append(self._parse_define(is_embedded=True))
+                elif self._looks_like_function_declaration():
+                    root.children.append(self._parse_typed_function(is_embedded=True))
+                elif self._check(TokenType.IDENTIFIER):
+                    # embedded Name &Target { ... } - could be enum override
+                    root.children.append(self._parse_embedded_override())
+                else:
+                    self.error("Expected 'class', 'enum', 'open', 'define', function declaration, or identifier after 'embedded'")
             elif self._match_keyword('global'):
                 # Check if followed by class or define (global class/function)
                 if self._match_keyword('class'):
@@ -1389,6 +1537,11 @@ class CSSLParser:
                 root.children.append(self._parse_for())
             elif self._match_keyword('foreach'):
                 root.children.append(self._parse_foreach())
+            # v4.3.2: Add try/catch and switch at top-level
+            elif self._match_keyword('try'):
+                root.children.append(self._parse_try())
+            elif self._match_keyword('switch'):
+                root.children.append(self._parse_switch())
             # Handle statements - keywords like 'instance', 'list', 'map' can be variable names
             # v4.2.1: Added LANG_INSTANCE_REF for lang$instance statements (js$GameData.score = 1337)
             elif (self._check(TokenType.IDENTIFIER) or self._check(TokenType.AT) or
@@ -1622,7 +1775,368 @@ class CSSLParser:
         self._expect(TokenType.BLOCK_END)
         return node
 
-    def _parse_class(self, is_global: bool = False) -> ASTNode:
+    def _parse_enum(self, is_embedded: bool = False) -> ASTNode:
+        """Parse enum declaration.
+
+        Syntax:
+            enum EnumName {
+                VALUE1,         // Auto value 0
+                VALUE2,         // Auto value 1
+                VALUE3 = 10,    // Explicit value 10
+                VALUE4          // Auto value 11
+            }
+
+            embedded enum NewEnum &OldEnum { ... }  // Replace OldEnum with NewEnum values
+
+        Access values via EnumName::VALUE1
+        """
+        enum_name = self._advance().value
+
+        # v4.3.2: Check for &Target reference (enum replacement)
+        replace_target = None
+        if self._match(TokenType.AMPERSAND):
+            if self._check(TokenType.IDENTIFIER):
+                replace_target = self._advance().value
+            elif self._check(TokenType.AT):
+                self._advance()
+                if self._check(TokenType.IDENTIFIER):
+                    replace_target = '@' + self._advance().value
+
+        self._expect(TokenType.BLOCK_START)
+
+        members = []
+        current_value = 0
+
+        while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
+            # Skip newlines/whitespace between enum values
+            if self._check(TokenType.NEWLINE):
+                self._advance()
+                continue
+
+            # Get member name
+            if self._check(TokenType.IDENTIFIER):
+                member_name = self._advance().value
+
+                # Check for explicit value: VALUE = 10
+                if self._match(TokenType.EQUALS):
+                    value_node = self._parse_expression()
+                    if isinstance(value_node, ASTNode) and value_node.type == 'literal':
+                        val = value_node.value
+                        if isinstance(val, dict) and 'value' in val:
+                            current_value = val['value']
+                        else:
+                            current_value = val
+                    else:
+                        current_value = value_node
+
+                members.append({'name': member_name, 'value': current_value})
+                current_value = current_value + 1 if isinstance(current_value, int) else current_value
+
+                # Skip comma if present
+                self._match(TokenType.COMMA)
+            else:
+                self._advance()
+
+        self._expect(TokenType.BLOCK_END)
+
+        return ASTNode('enum', value={
+            'name': enum_name,
+            'members': members,
+            'is_embedded': is_embedded,
+            'replace_target': replace_target
+        })
+
+    def _parse_embedded_override(self) -> ASTNode:
+        """Parse embedded override for enums/structs without explicit type keyword.
+
+        Syntax:
+            embedded __NewName &OldEnum { ... }      // Replace OldEnum
+            embedded __NewName &OldEnum ++ { ... }   // Add to OldEnum
+            embedded __NewName &OldEnum -- { ... }   // Remove from OldEnum
+
+        This creates a new definition that modifies the target.
+        """
+        # Get the new name
+        new_name = self._advance().value
+
+        # Expect &Target
+        if not self._match(TokenType.AMPERSAND):
+            self.error("Expected '&' followed by target name after embedded identifier")
+
+        # Get target name
+        target_name = None
+        if self._check(TokenType.IDENTIFIER):
+            target_name = self._advance().value
+        elif self._check(TokenType.AT):
+            self._advance()
+            if self._check(TokenType.IDENTIFIER):
+                target_name = '@' + self._advance().value
+        else:
+            self.error("Expected target name after '&'")
+
+        # Check for mode modifier: ++ (add) or -- (remove)
+        mode = 'replace'
+        if self._match(TokenType.PLUS_PLUS):
+            mode = 'add'
+        elif self._match(TokenType.MINUS_MINUS):
+            mode = 'remove'
+
+        self._expect(TokenType.BLOCK_START)
+
+        # Parse members (enum-style: NAME = value, NAME, etc.)
+        members = []
+        current_value = 0
+
+        while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
+            if self._check(TokenType.NEWLINE):
+                self._advance()
+                continue
+
+            if self._check(TokenType.IDENTIFIER):
+                member_name = self._advance().value
+
+                # Check for explicit value
+                if self._match(TokenType.EQUALS):
+                    value_node = self._parse_expression()
+                    if isinstance(value_node, ASTNode) and value_node.type == 'literal':
+                        val = value_node.value
+                        if isinstance(val, dict) and 'value' in val:
+                            current_value = val['value']
+                        else:
+                            current_value = val
+                    else:
+                        current_value = value_node
+
+                members.append({'name': member_name, 'value': current_value})
+                if isinstance(current_value, int):
+                    current_value = current_value + 1
+
+                self._match(TokenType.COMMA)
+            else:
+                self._advance()
+
+        self._expect(TokenType.BLOCK_END)
+
+        return ASTNode('enum', value={
+            'name': new_name,
+            'members': members,
+            'is_embedded': True,
+            'replace_target': target_name,
+            'mode': mode  # 'replace', 'add', or 'remove'
+        })
+
+    def _parse_bytearrayed(self) -> ASTNode:
+        """Parse bytearrayed declaration - function-to-byte mapping with pattern matching.
+
+        Syntax:
+            bytearrayed MyBytes {
+                &func1;              // Position 0x0
+                &func2;              // Position 0x1
+                &func3;              // Position 0x2
+                case {0, 1, 0} {     // Pattern match on return values
+                    // Execute if func1=0, func2=1, func3=0
+                }
+                case {1, _, _} {     // Wildcards with _
+                    // Execute if func1=1, others any value
+                }
+                default {
+                    // Execute if no case matches
+                }
+            }
+
+        Access:
+            MyBytes()            // Execute pattern matching
+            MyBytes["0x0"]       // Get value at position 0
+            MyBytes[0]           // Get value at position 0
+        """
+        bytearrayed_name = self._advance().value
+        self._expect(TokenType.BLOCK_START)
+
+        func_refs = []       # List of function references at each byte position
+        cases = []           # List of case blocks with patterns
+        default_block = None # Default block if no case matches
+
+        while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
+            # Skip newlines
+            if self._check(TokenType.NEWLINE):
+                self._advance()
+                continue
+
+            # Parse case block
+            if self._match_keyword('case'):
+                pattern = []
+                self._expect(TokenType.BLOCK_START)
+
+                # Parse pattern: {value, value, value, ...}
+                while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
+                    if self._check(TokenType.COMMA):
+                        self._advance()
+                        continue
+                    if self._check(TokenType.NEWLINE):
+                        self._advance()
+                        continue
+
+                    # Parse pattern element
+                    if self._check(TokenType.IDENTIFIER) and self._current().value == '_':
+                        # Wildcard - matches any value
+                        pattern.append({'type': 'wildcard'})
+                        self._advance()
+                    elif self._check(TokenType.BRACKET_START):
+                        # v4.3.2: List pattern - matches a list value: ["read", "write"]
+                        self._advance()  # consume [
+                        list_elements = []
+                        while not self._check(TokenType.BRACKET_END) and not self._is_at_end():
+                            if self._check(TokenType.COMMA):
+                                self._advance()
+                                continue
+                            if self._check(TokenType.STRING):
+                                list_elements.append(self._advance().value)
+                            elif self._check(TokenType.NUMBER):
+                                list_elements.append(self._advance().value)
+                            elif self._check(TokenType.KEYWORD):
+                                kw = self._current().value
+                                if kw in ('true', 'True'):
+                                    list_elements.append(True)
+                                elif kw in ('false', 'False'):
+                                    list_elements.append(False)
+                                self._advance()
+                            else:
+                                self._advance()
+                        self._expect(TokenType.BRACKET_END)
+                        pattern.append({'type': 'list', 'values': list_elements})
+                    elif self._check(TokenType.NUMBER):
+                        # Check for hex format like 0x28
+                        token = self._current()
+                        value = token.value
+                        if isinstance(value, dict) and 'value' in value:
+                            value = value['value']
+                        # Check for position=value syntax: 0x28="Gut"
+                        self._advance()
+                        if self._match(TokenType.EQUALS):
+                            match_value = self._parse_expression()
+                            pattern.append({'type': 'indexed', 'index': value, 'value': match_value})
+                        else:
+                            pattern.append({'type': 'value', 'value': value})
+                    elif self._check(TokenType.STRING):
+                        value = self._advance().value
+                        pattern.append({'type': 'value', 'value': value})
+                    elif self._check(TokenType.BOOLEAN):
+                        # v4.3.2: Handle true/false which are tokenized as BOOLEAN
+                        value = self._advance().value
+                        pattern.append({'type': 'value', 'value': value})
+                    elif self._check(TokenType.KEYWORD):
+                        kw = self._current().value
+                        if kw in ('true', 'True'):
+                            pattern.append({'type': 'value', 'value': True})
+                            self._advance()
+                        elif kw in ('false', 'False'):
+                            pattern.append({'type': 'value', 'value': False})
+                            self._advance()
+                        elif kw in TYPE_GENERICS or kw in ('int', 'string', 'float', 'bool', 'dynamic'):
+                            # Type pattern: vector<string>, int, etc.
+                            type_name = self._advance().value
+                            if self._check(TokenType.COMPARE_LT):
+                                # Generic type
+                                self._advance()
+                                inner = self._parse_generic_type_content()
+                                type_name = f"{type_name}<{inner}>"
+                            pattern.append({'type': 'type_match', 'type_name': type_name})
+                        else:
+                            # Skip unknown keywords
+                            self._advance()
+                    elif self._check(TokenType.IDENTIFIER):
+                        # Could be a variable reference or type
+                        ident = self._advance().value
+                        # Check for indexed syntax: 2x35="value"
+                        if self._check(TokenType.IDENTIFIER) and ident.isdigit():
+                            # Pattern like 2x35 (position 2, repeat 35)
+                            second = self._advance().value
+                            if self._match(TokenType.EQUALS):
+                                match_value = self._parse_expression()
+                                pattern.append({'type': 'repeat', 'pos': int(ident), 'repeat': second, 'value': match_value})
+                            else:
+                                pattern.append({'type': 'repeat', 'pos': int(ident), 'repeat': second, 'value': None})
+                        else:
+                            pattern.append({'type': 'variable', 'name': ident})
+                    else:
+                        self._advance()
+
+                self._expect(TokenType.BLOCK_END)
+
+                # Parse case body - supports both:
+                # case {pattern}: statement;  (colon syntax)
+                # case {pattern} { statements }  (block syntax)
+                body_children = []
+                if self._match(TokenType.COLON):
+                    # Colon syntax: single statement or until next case/default/}
+                    stmt = self._parse_statement()
+                    if stmt:
+                        body_children.append(stmt)
+                elif self._check(TokenType.BLOCK_START):
+                    self._advance()  # consume {
+                    while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
+                        stmt = self._parse_statement()
+                        if stmt:
+                            body_children.append(stmt)
+                    self._expect(TokenType.BLOCK_END)
+
+                cases.append({'pattern': pattern, 'body': body_children})
+
+            # Parse default block - supports both:
+            # default: statement;  (colon syntax)
+            # default { statements }  (block syntax)
+            elif self._match_keyword('default'):
+                body_children = []
+                if self._match(TokenType.COLON):
+                    # Colon syntax: single statement
+                    stmt = self._parse_statement()
+                    if stmt:
+                        body_children.append(stmt)
+                elif self._check(TokenType.BLOCK_START):
+                    self._advance()  # consume {
+                    while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
+                        stmt = self._parse_statement()
+                        if stmt:
+                            body_children.append(stmt)
+                    self._expect(TokenType.BLOCK_END)
+                default_block = body_children
+
+            # Parse function reference: &funcName; or &funcName(arg1, arg2);
+            elif self._check(TokenType.AMPERSAND):
+                self._advance()  # consume &
+                if self._check(TokenType.IDENTIFIER):
+                    func_name = self._advance().value
+                    # v4.3.2: Support function references with parameters: &testfunc(1, 2)
+                    func_args = []
+                    if self._check(TokenType.PAREN_START):
+                        self._advance()  # consume (
+                        while not self._check(TokenType.PAREN_END) and not self._is_at_end():
+                            arg = self._parse_expression()
+                            func_args.append(arg)
+                            if not self._check(TokenType.PAREN_END):
+                                self._expect(TokenType.COMMA)
+                        self._expect(TokenType.PAREN_END)
+                    func_refs.append({
+                        'position': len(func_refs),
+                        'hex_pos': f"0x{len(func_refs):x}",
+                        'func_ref': func_name,
+                        'args': func_args  # v4.3.2: Store arguments for simulation
+                    })
+                self._match(TokenType.SEMICOLON)
+
+            else:
+                self._advance()
+
+        self._expect(TokenType.BLOCK_END)
+
+        return ASTNode('bytearrayed', value={
+            'name': bytearrayed_name,
+            'func_refs': func_refs,
+            'cases': cases,
+            'default': default_block
+        })
+
+    def _parse_class(self, is_global: bool = False, is_embedded: bool = False) -> ASTNode:
         """Parse class declaration with members and methods.
 
         Syntax:
@@ -1630,6 +2144,7 @@ class CSSLParser:
             global class ClassName { ... }    // Global class
             class @ClassName { ... }          // Global class (alternative)
             class *ClassName { ... }          // Non-null class
+            embedded class ClassName &$Target { ... }  // Immediate replacement (v4.2.5)
 
         Non-null class (all methods return non-null):
             class *MyClass { ... }
@@ -1652,6 +2167,28 @@ class CSSLParser:
             class_params = self._parse_parameter_list()
             self._expect(TokenType.PAREN_END)
 
+        # v4.2.5: Check for &target reference for class replacement
+        # Syntax: embedded class BetterGame() &$Game { ... }
+        #         class NewClass &OldClass { ... }
+        append_ref_class = None
+        append_ref_member = None
+        if self._match(TokenType.AMPERSAND):
+            if self._check(TokenType.IDENTIFIER):
+                append_ref_class = self._advance().value
+            elif self._check(TokenType.AT):
+                self._advance()
+                if self._check(TokenType.IDENTIFIER):
+                    append_ref_class = '@' + self._advance().value
+            elif self._check(TokenType.SHARED_REF):
+                append_ref_class = f'${self._advance().value}'
+            else:
+                raise CSSLSyntaxError("Expected class name after '&' in class reference")
+
+            # Check for ::member or .member (for targeting specific members)
+            if self._match(TokenType.DOUBLE_COLON) or self._match(TokenType.DOT):
+                if self._check(TokenType.IDENTIFIER) or self._check(TokenType.KEYWORD):
+                    append_ref_member = self._advance().value
+
         # Check for inheritance and overwrites:
         # class Child : extends Parent { ... }
         # class Child : extends $PythonObject { ... }
@@ -1725,6 +2262,7 @@ class CSSLParser:
         node = ASTNode('class', value={
             'name': class_name,
             'is_global': is_global,
+            'is_embedded': is_embedded,  # v4.2.5: immediate &target replacement
             'non_null': non_null,
             'class_params': class_params,
             'extends': extends_class,
@@ -1734,7 +2272,9 @@ class CSSLParser:
             'overwrites': overwrites_class,
             '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
+            'raw_body': raw_body,  # v4.2.0: Raw body for language transformation
+            'append_ref_class': append_ref_class,  # v4.2.5: &target class reference
+            'append_ref_member': append_ref_member  # v4.2.5: &target member reference
         }, children=[])
 
         # v4.2.0: If we have raw_body for language transformation, skip regular parsing
@@ -1978,18 +2518,21 @@ class CSSLParser:
 
         return params
 
-    def _parse_define(self, is_global: bool = False) -> ASTNode:
+    def _parse_define(self, is_global: bool = False, is_embedded: bool = False, has_open_params: bool = False, modifiers: list = None) -> ASTNode:
         """Parse define function declaration.
 
         Syntax:
             define MyFunc(args) { }                    // Local function
             global define MyFunc(args) { }             // Global function
+            private define MyFunc(args) { }            // Private function (v4.5.1)
             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
+            embedded define MyFunc(args) &target { }       // Immediate &target replacement
+            open embedded define MyFunc(open Input) &target { }  // Open params + embedded
         """
         # Check for * prefix (non-null function - must return non-null)
         # Also *[type] for type exclusion (must NOT return that type)
@@ -2208,6 +2751,8 @@ class CSSLParser:
         node = ASTNode('function', value={
             'name': name,
             'is_global': is_global,
+            'is_embedded': is_embedded,  # v4.2.5: immediate &target replacement (v4.3.2: use param)
+            'has_open_params': has_open_params,  # v4.3.2: open embedded define support
             'params': params,
             'non_null': non_null,
             'exclude_type': exclude_type,  # *[type] - must NOT return this type
@@ -2227,7 +2772,9 @@ class CSSLParser:
             # v4.1.0: Multi-language support
             'supports_language': supports_language,
             # v4.2.0: Raw body for language transformation
-            'raw_body': raw_body
+            'raw_body': raw_body,
+            # v4.5.1: Function modifiers (private, const, static, etc.)
+            'modifiers': modifiers or []
         }, children=children)
 
         return node
@@ -2251,6 +2798,9 @@ class CSSLParser:
         elif self._match_keyword('continue'):
             self._match(TokenType.SEMICOLON)
             return ASTNode('continue')
+        # v4.5.1: Add throw statement parsing
+        elif self._match_keyword('throw'):
+            return self._parse_throw()
         elif self._match_keyword('try'):
             return self._parse_try()
         elif self._match_keyword('await'):
@@ -2643,6 +3193,44 @@ class CSSLParser:
         value = self._parse_expression()
         self._expect(TokenType.PAREN_END)
 
+        # v4.2.5: Check if this is a param switch (switch on open params)
+        # Syntax: switch(Params): case name: ... except age: ... always: ... finally: ...
+        # v4.3.2: Detect param_switch by:
+        #   1. Explicit "Params" identifier, OR
+        #   2. Any identifier if case uses param-style conditions (& / not)
+        is_param_switch = (value.type == 'identifier' and value.value == 'Params')
+
+        # v4.3.2: Also check if case syntax uses param-style conditions
+        # Look ahead to see if first case uses & or 'not' operators
+        if not is_param_switch and value.type == 'identifier':
+            saved_pos = self.pos
+            # Skip optional : and {
+            if self._check(TokenType.COLON):
+                self._advance()
+            if self._check(TokenType.BLOCK_START):
+                self._advance()
+            # Check for 'case' keyword
+            if self._check_keyword('case'):
+                self._advance()  # skip 'case'
+                # Look for & or 'not' before : (indicates param switch)
+                depth = 0
+                while not self._is_at_end():
+                    if self._check(TokenType.COLON) and depth == 0:
+                        break
+                    if self._check(TokenType.PAREN_START):
+                        depth += 1
+                    if self._check(TokenType.PAREN_END):
+                        depth -= 1
+                    if self._check(TokenType.AMPERSAND) or self._check_keyword('not') or self._check(TokenType.NOT):
+                        is_param_switch = True
+                        break
+                    self._advance()
+            self.pos = saved_pos  # Restore position
+
+        if is_param_switch:
+            return self._parse_param_switch(value)
+
+        # Regular switch
         node = ASTNode('switch', value={'value': value}, children=[])
         self._expect(TokenType.BLOCK_START)
 
@@ -2676,6 +3264,157 @@ class CSSLParser:
         self._expect(TokenType.BLOCK_END)
         return node
 
+    def _parse_param_switch(self, params_identifier: ASTNode) -> ASTNode:
+        """Parse param switch for open parameters.
+
+        v4.2.5: Switch on which parameters were provided.
+
+        Syntax:
+            switch(Params): or switch(Params) {
+                case name:              // if 'name' param exists
+                    ...
+                    break;
+                case name & age:        // if both 'name' AND 'age' exist
+                    ...
+                    break;
+                case name & not age:    // if 'name' exists but 'age' doesn't
+                    ...
+                    break;
+                except name:            // if 'name' does NOT exist (alias for 'case not name')
+                    ...
+                    break;
+                default:                // fallback if no case matches
+                    ...
+                always:                 // always runs after a matching case
+                    ...
+                finally:                // cleanup, runs last regardless
+                    ...
+            }
+        """
+        # Allow both : and { as block start
+        if self._match(TokenType.COLON):
+            pass  # Python-style with :
+        self._expect(TokenType.BLOCK_START)
+
+        node = ASTNode('param_switch', value={
+            'params': params_identifier.value  # The open params variable name
+        }, children=[])
+
+        while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
+            if self._match_keyword('case'):
+                # Parse param condition: name, name & age, name & not age
+                condition = self._parse_param_condition()
+                self._expect(TokenType.COLON)
+
+                case_node = ASTNode('param_case', value={'condition': condition}, children=[])
+                self._parse_case_body(case_node)
+                node.children.append(case_node)
+
+            elif self._match_keyword('except'):
+                # except name: is alias for case not name:
+                param_name = self._advance().value
+                self._expect(TokenType.COLON)
+
+                condition = {'type': 'not', 'param': param_name}
+                case_node = ASTNode('param_case', value={'condition': condition}, children=[])
+                self._parse_case_body(case_node)
+                node.children.append(case_node)
+
+            elif self._match_keyword('default'):
+                self._expect(TokenType.COLON)
+                default_node = ASTNode('param_default', children=[])
+                self._parse_case_body(default_node)
+                node.children.append(default_node)
+
+            elif self._match_keyword('always'):
+                self._expect(TokenType.COLON)
+                always_node = ASTNode('param_always', children=[])
+                self._parse_case_body(always_node)
+                node.children.append(always_node)
+
+            elif self._match_keyword('finally'):
+                self._expect(TokenType.COLON)
+                finally_node = ASTNode('param_finally', children=[])
+                self._parse_case_body(finally_node)
+                node.children.append(finally_node)
+
+            else:
+                self._advance()
+
+        self._expect(TokenType.BLOCK_END)
+        return node
+
+    def _parse_param_condition(self) -> dict:
+        """Parse param switch condition.
+
+        v4.3.2: Enhanced to support multiple styles:
+            name            -> {'type': 'exists', 'param': 'name'}
+            not name        -> {'type': 'not', 'param': 'name'}
+            !name           -> {'type': 'not', 'param': 'name'}
+            name & age      -> {'type': 'and', 'left': {...}, 'right': {...}}
+            name & not age  -> {'type': 'and', 'left': {...}, 'right': {'type': 'not', ...}}
+            name & !age     -> {'type': 'and', 'left': {...}, 'right': {'type': 'not', ...}}
+            name || age     -> {'type': 'or', 'left': {...}, 'right': {...}}
+        """
+        # Check for 'not' or '!' prefix
+        negated = self._match_keyword('not') or self._match(TokenType.NOT)
+        param_name = self._advance().value
+
+        if negated:
+            condition = {'type': 'not', 'param': param_name}
+        else:
+            condition = {'type': 'exists', 'param': param_name}
+
+        # Check for & (AND) or || (OR) combinations
+        while True:
+            if self._match(TokenType.AMPERSAND):
+                # AND operator - check for 'not' or '!' prefix on right side
+                right_negated = self._match_keyword('not') or self._match(TokenType.NOT)
+                right_param = self._advance().value
+
+                if right_negated:
+                    right_condition = {'type': 'not', 'param': right_param}
+                else:
+                    right_condition = {'type': 'exists', 'param': right_param}
+
+                condition = {'type': 'and', 'left': condition, 'right': right_condition}
+
+            elif self._match(TokenType.OR):
+                # OR operator (||) - check for 'not' or '!' prefix on right side
+                right_negated = self._match_keyword('not') or self._match(TokenType.NOT)
+                right_param = self._advance().value
+
+                if right_negated:
+                    right_condition = {'type': 'not', 'param': right_param}
+                else:
+                    right_condition = {'type': 'exists', 'param': right_param}
+
+                condition = {'type': 'or', 'left': condition, 'right': right_condition}
+            else:
+                break
+
+        return condition
+
+    def _parse_case_body(self, case_node: ASTNode):
+        """Parse the body of a case/except/default/always/finally block."""
+        stop_keywords = ['case', 'except', 'default', 'always', 'finally']
+
+        while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
+            # Check if we hit another case keyword
+            if any(self._check_keyword(kw) for kw in stop_keywords):
+                break
+
+            stmt = self._parse_statement()
+            if stmt:
+                case_node.children.append(stmt)
+
+            # Check for break
+            if self._check_keyword('break'):
+                break_stmt = self._parse_statement()
+                if break_stmt:
+                    case_node.children.append(break_stmt)
+                break
+
     def _parse_return(self) -> ASTNode:
         """Parse return statement, supporting multiple values for shuffled functions.
 
@@ -2740,6 +3479,12 @@ class CSSLParser:
         self._expect(TokenType.BLOCK_END)
         node.children.append(try_block)
 
+        # v4.2.6: Skip optional semicolons between try block and catch
+        # v4.5.1: Also skip comments for better .cssl-pl file support
+        while self._match(TokenType.SEMICOLON) or self._check(TokenType.COMMENT):
+            if self._check(TokenType.COMMENT):
+                self._advance()
+
         if self._match_keyword('catch'):
             error_var = None
             if self._match(TokenType.PAREN_START):
@@ -2755,8 +3500,45 @@ class CSSLParser:
             self._expect(TokenType.BLOCK_END)
             node.children.append(catch_block)
 
+        # v4.2.6: Skip optional semicolons between catch and finally
+        # v4.5.1: Also skip comments for better .cssl-pl file support
+        while self._match(TokenType.SEMICOLON) or self._check(TokenType.COMMENT):
+            if self._check(TokenType.COMMENT):
+                self._advance()
+
+        # v4.2.6: Add finally support
+        if self._match_keyword('finally'):
+            finally_block = ASTNode('finally-block', 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:
+                    finally_block.children.append(stmt)
+            self._expect(TokenType.BLOCK_END)
+            node.children.append(finally_block)
+
         return node
 
+    def _parse_throw(self) -> ASTNode:
+        """Parse throw statement: throw expression;
+
+        v4.5.1: Added throw statement for exception handling.
+
+        Syntax:
+            throw "Error message";
+            throw error_variable;
+            throw MyException("details");
+        """
+        # Parse the expression to throw (can be string, variable, or function call)
+        if self._check(TokenType.SEMICOLON):
+            # throw; - re-throw current exception
+            self._advance()
+            return ASTNode('throw', value=None)
+
+        expr = self._parse_expression()
+        self._match(TokenType.SEMICOLON)
+        return ASTNode('throw', value=expr)
+
     def _parse_await(self) -> ASTNode:
         """Parse await statement: await expression;"""
         expr = self._parse_expression()
@@ -2955,7 +3737,8 @@ class CSSLParser:
             filter_info = {}
             # Parse type::helper=value patterns within this bracket
             while not self._check(TokenType.BRACKET_END) and not self._is_at_end():
-                if self._check(TokenType.IDENTIFIER) or self._check(TokenType.KEYWORD):
+                # Accept IDENTIFIER, KEYWORD, or TYPE_LITERAL (dict, list) as filter type
+                if self._check(TokenType.IDENTIFIER) or self._check(TokenType.KEYWORD) or self._check(TokenType.TYPE_LITERAL):
                     filter_type = self._advance().value
                     if self._match(TokenType.DOUBLE_COLON):
                         helper = self._advance().value
@@ -3305,7 +4088,7 @@ class CSSLParser:
                 # Just 'this' keyword alone - return as identifier for now
                 return ASTNode('identifier', value='this')
 
-        # Handle 'new ClassName(args)' or 'new @ClassName(args)' instantiation
+        # Handle 'new ClassName(args)' or 'new @ClassName(args)' or 'new Namespace::ClassName(args)' instantiation
         if self._check(TokenType.KEYWORD) and self._current().value == 'new':
             self._advance()  # consume 'new'
             # Check for @ prefix (global class reference)
@@ -3313,13 +4096,19 @@ class CSSLParser:
             if self._check(TokenType.AT):
                 self._advance()  # consume @
                 is_global_ref = True
-            class_name = self._advance().value  # get class name
+            class_name = self._advance().value  # get class name or namespace
+            # v4.2.6: Handle Namespace::ClassName syntax
+            namespace = None
+            if self._check(TokenType.DOUBLE_COLON):
+                self._advance()  # consume ::
+                namespace = class_name
+                class_name = self._advance().value  # get actual class name
             args = []
             kwargs = {}
             if self._match(TokenType.PAREN_START):
                 args, kwargs = self._parse_call_arguments()
                 self._expect(TokenType.PAREN_END)
-            node = ASTNode('new', value={'class': class_name, 'args': args, 'kwargs': kwargs, 'is_global_ref': is_global_ref})
+            node = ASTNode('new', value={'class': class_name, 'namespace': namespace, 'args': args, 'kwargs': kwargs, 'is_global_ref': is_global_ref})
             # Continue to check for member access, calls on the new object
             while True:
                 if self._match(TokenType.DOT):
@@ -3689,23 +4478,24 @@ class CSSLParser:
 
             self._expect(TokenType.COMPARE_GT)  # consume >
 
-            # Must be followed by ()
+            # Optional () - for named parameter search, () is not required
+            args = []
             if self._check(TokenType.PAREN_START):
                 self._advance()  # consume (
-                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)
 
-                # Return as typed function call
-                return ASTNode('typed_call', value={
-                    'name': name,
-                    'type_param': type_param,
-                    'param_name': param_name,  # Named parameter for OpenFind
-                    'args': args
-                })
+            # Return as typed function call (works with or without ())
+            # v4.2.5: OpenFind<type, "name"> now works without ()
+            return ASTNode('typed_call', value={
+                'name': name,
+                'type_param': type_param,
+                'param_name': param_name,  # Named parameter for OpenFind
+                'args': args
+            })
 
         node = ASTNode('identifier', value=name)
 
@@ -3735,7 +4525,7 @@ class CSSLParser:
     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; }
+        Object literal: { name = value } or { "key" = value } or { "key": value } (Python-style)
         Action block: { %version; } or { "1.0.0" } or { call(); }
         """
         # Empty block is action block
@@ -3745,12 +4535,12 @@ class CSSLParser:
         # Save position for lookahead
         saved_pos = self.pos
 
-        # Check if it looks like key = value pattern
+        # Check if it looks like key = value or 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 = ...
+            if self._check(TokenType.EQUALS) or self._check(TokenType.COLON):
+                # Looks like object literal: { key = ... } or { "key": ... }
                 is_object = True
 
         # Restore position
@@ -3790,12 +4580,22 @@ class CSSLParser:
         return ASTNode('action_block', children=children)
 
     def _parse_object(self) -> ASTNode:
+        """Parse object/dict literal.
+
+        Supports both CSSL-style and Python-style syntax:
+            { key = value }       // CSSL style
+            { "key" = value }     // CSSL style with string key
+            { "key": value }      // Python style
+            { key: value }        // Python style with identifier key
+        """
         properties = {}
 
         while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
             if self._check(TokenType.IDENTIFIER) or self._check(TokenType.STRING):
                 key = self._advance().value
-                self._expect(TokenType.EQUALS)
+                # Accept both = (CSSL) and : (Python) as key-value separator
+                if not self._match(TokenType.EQUALS) and not self._match(TokenType.COLON):
+                    self.error(f"Expected '=' or ':' after key '{key}' in object literal")
                 value = self._parse_expression()
                 properties[key] = value
                 self._match(TokenType.SEMICOLON)
@@ -3857,12 +4657,117 @@ def parse_cssl_program(source: str) -> ASTNode:
     return parser.parse_program()
 
 
-def tokenize_cssl(source: str) -> List[Token]:
-    """Tokenize CSSL source code (useful for syntax highlighting)"""
+def tokenize_cssl(source: str, use_cpp: bool = True) -> List[Token]:
+    """
+    Tokenize CSSL source code (useful for syntax highlighting).
+
+    Args:
+        source: CSSL source code
+        use_cpp: If True, use C++ acceleration when available (default True)
+
+    Returns:
+        List of Token objects
+    """
+    # Try C++ tokenization if available and requested
+    if use_cpp:
+        try:
+            from . import _CPP_AVAILABLE, _cpp_module
+            if _CPP_AVAILABLE and _cpp_module and hasattr(_cpp_module, 'Lexer'):
+                lexer = _cpp_module.Lexer(source)
+                cpp_tokens = lexer.tokenize()
+                # Convert C++ tokens to Python Token objects
+                return _convert_cpp_tokens(cpp_tokens)
+        except (ImportError, Exception):
+            pass
+
+    # Fall back to Python lexer
     lexer = CSSLLexer(source)
     return lexer.tokenize()
 
 
+def _convert_cpp_tokens(cpp_tokens: list) -> List[Token]:
+    """Convert C++ Token objects to Python Token objects."""
+    result = []
+    for ct in cpp_tokens:
+        # Map C++ token type to Python TokenType
+        token_type = _map_cpp_token_type(ct.type)
+
+        # Get value based on value_type
+        if ct.value_type == 'string':
+            value = ct.str_value
+        elif ct.value_type == 'number':
+            value = ct.num_value
+        elif ct.value_type == 'bool':
+            value = ct.bool_value
+        else:
+            value = ct.str_value
+
+        result.append(Token(token_type, value, ct.line, ct.column))
+
+    return result
+
+
+def _map_cpp_token_type(cpp_type: int) -> TokenType:
+    """Map C++ token type integer to Python TokenType enum."""
+    # This mapping must match the C++ TokenType enum in cssl_core.cpp
+    type_map = {
+        0: TokenType.KEYWORD,
+        1: TokenType.IDENTIFIER,
+        2: TokenType.STRING,
+        3: TokenType.NUMBER,
+        4: TokenType.BOOLEAN,
+        5: TokenType.NULL,
+        6: TokenType.OPERATOR,
+        7: TokenType.INJECT_LEFT,
+        8: TokenType.INJECT_RIGHT,
+        9: TokenType.INJECT_PLUS_LEFT,
+        10: TokenType.INJECT_PLUS_RIGHT,
+        11: TokenType.INJECT_MINUS_LEFT,
+        12: TokenType.INJECT_MINUS_RIGHT,
+        13: TokenType.INFUSE_LEFT,
+        14: TokenType.INFUSE_RIGHT,
+        15: TokenType.FLOW_RIGHT,
+        16: TokenType.FLOW_LEFT,
+        17: TokenType.EQUALS,
+        18: TokenType.COMPARE_EQ,
+        19: TokenType.COMPARE_NE,
+        20: TokenType.COMPARE_LT,
+        21: TokenType.COMPARE_GT,
+        22: TokenType.COMPARE_LE,
+        23: TokenType.COMPARE_GE,
+        24: TokenType.PLUS,
+        25: TokenType.MINUS,
+        26: TokenType.MULTIPLY,
+        27: TokenType.DIVIDE,
+        28: TokenType.MODULO,
+        29: TokenType.AND,
+        30: TokenType.OR,
+        31: TokenType.NOT,
+        32: TokenType.AMPERSAND,
+        33: TokenType.BLOCK_START,
+        34: TokenType.BLOCK_END,
+        35: TokenType.PAREN_START,
+        36: TokenType.PAREN_END,
+        37: TokenType.BRACKET_START,
+        38: TokenType.BRACKET_END,
+        39: TokenType.SEMICOLON,
+        40: TokenType.COLON,
+        41: TokenType.DOUBLE_COLON,
+        42: TokenType.COMMA,
+        43: TokenType.DOT,
+        44: TokenType.AT,
+        45: TokenType.GLOBAL_REF,
+        46: TokenType.SNAPSHOT_REF,
+        47: TokenType.ARROW,
+        48: TokenType.LAMBDA,
+        49: TokenType.TERNARY,
+        50: TokenType.INCREMENT,
+        51: TokenType.DECREMENT,
+        52: TokenType.EOF,
+    }
+    return type_map.get(cpp_type, TokenType.IDENTIFIER)
+
+
 # Export public API
 __all__ = [
     'TokenType', 'Token', 'ASTNode',