IncludeCPP 3.7.1__py3-none-any.whl → 3.7.25__py3-none-any.whl

includecpp/core/cssl/cssl_parser.py

@@ -1,5 +1,5 @@
 """
-CSSL Parser - Lexer and Parser for CSO Service Script Language
+CSSL Parser - Lexer and Parser for CSSL Language
 
 Features:
 - Complete tokenization of CSSL syntax
@@ -108,6 +108,8 @@ class TokenType(Enum):
     COMMENT = auto()
     NEWLINE = auto()
     EOF = auto()
+    # Super-functions for .cssl-pl payload files (v3.8.0)
+    SUPER_FUNC = auto()    # #$run(), #$exec(), #$printl() - pre-execution hooks
 
 
 KEYWORDS = {
@@ -212,9 +214,14 @@ class CSSLLexer:
 
             char = self.source[self.pos]
 
-            # Comments: both # and // style
+            # Super-functions (#$) or Comments (# and // style)
             if char == '#':
-                self._skip_comment()
+                if self._peek(1) == '$':
+                    # Super-function: #$run(), #$exec(), #$printl()
+                    self._read_super_function()
+                else:
+                    # Regular comment
+                    self._skip_comment()
             elif char == '/' and self._peek(1) == '/':
                 # C-style // comment - NEW
                 self._skip_comment()
@@ -245,8 +252,15 @@ class CSSLLexer:
                 # $<name> shared object reference
                 self._read_shared_ref()
             elif char == '%':
-                # %<name> captured reference (for infusion)
-                self._read_captured_ref()
+                # Check if this is %<name> captured reference or % modulo operator
+                next_char = self._peek(1)
+                if next_char and (next_char.isalpha() or next_char == '_'):
+                    # %<name> captured reference (for infusion)
+                    self._read_captured_ref()
+                else:
+                    # % modulo operator
+                    self._add_token(TokenType.MODULO, '%')
+                    self._advance()
             elif char == '&':
                 # & for references
                 if self._peek(1) == '&':
@@ -314,9 +328,6 @@ class CSSLLexer:
                 else:
                     # Already handled by // comment check above, but just in case
                     self._skip_comment()
-            elif char == '%':
-                self._add_token(TokenType.MODULO, '%')
-                self._advance()
             elif char == '<':
                 self._read_less_than()
             elif char == '>':
@@ -446,6 +457,31 @@ class CSSLLexer:
         else:
             self._add_token(TokenType.IDENTIFIER, value)
 
+    def _read_super_function(self):
+        """Read #$<name>(...) super-function call for .cssl-pl payloads.
+
+        Super-functions are pre-execution hooks that run when a payload is loaded.
+        Valid super-functions: #$run(), #$exec(), #$printl()
+
+        Syntax:
+            #$run(initFunction);        // Call a function at load time
+            #$exec(setup());            // Execute expression at load time
+            #$printl("Payload loaded"); // Print at load time
+        """
+        start = self.pos
+        self._advance()  # skip '#'
+        self._advance()  # skip '$'
+
+        # Read the super-function name (run, exec, printl, etc.)
+        name_start = self.pos
+        while self.pos < len(self.source) and (self.source[self.pos].isalnum() or self.source[self.pos] == '_'):
+            self._advance()
+        func_name = self.source[name_start:self.pos]
+
+        # Store as #$<name> token value
+        value = f'#${func_name}'
+        self._add_token(TokenType.SUPER_FUNC, value)
+
     def _read_self_ref(self):
         """Read s@<name> or s@<name>.<member>... self-reference"""
         start = self.pos
@@ -816,7 +852,7 @@ class CSSLParser:
             if self._match_keyword('open'):
                 param_info['open'] = True
 
-            # Handle type annotations
+            # Handle type annotations (builtin types like int, string, etc.)
             if self._check(TokenType.KEYWORD) and self._is_type_keyword(self._current().value):
                 param_info['type'] = self._advance().value
 
@@ -840,6 +876,39 @@ class CSSLParser:
                         self._advance()
                     param_info['generic'] = ''.join(generic_parts)
 
+            # Handle custom class types (identifier followed by another identifier = type + name)
+            elif self._check(TokenType.IDENTIFIER):
+                # Look ahead: if next token is also an identifier, current is the type
+                saved_pos = self.pos
+                potential_type = self._advance().value
+
+                # Check for generic type parameter <T> on custom type
+                if self._check(TokenType.COMPARE_LT):
+                    self._advance()
+                    generic_parts = []
+                    depth = 1
+                    while depth > 0 and not self._is_at_end():
+                        if self._check(TokenType.COMPARE_LT):
+                            depth += 1
+                            generic_parts.append('<')
+                        elif self._check(TokenType.COMPARE_GT):
+                            depth -= 1
+                            if depth > 0:
+                                generic_parts.append('>')
+                        elif self._check(TokenType.COMMA):
+                            generic_parts.append(',')
+                        else:
+                            generic_parts.append(self._current().value)
+                        self._advance()
+                    param_info['generic'] = ''.join(generic_parts)
+
+                # If followed by identifier, this is "Type name" pattern
+                if self._check(TokenType.IDENTIFIER):
+                    param_info['type'] = potential_type
+                else:
+                    # Not a type, restore position - this is just a param name
+                    self.pos = saved_pos
+
             # Handle reference operator &
             if self._match(TokenType.AMPERSAND):
                 param_info['ref'] = True
@@ -882,6 +951,27 @@ class CSSLParser:
         self._expect(TokenType.BLOCK_END)
         return node
 
+    def _looks_like_namespace_call(self) -> bool:
+        """Check if current position looks like a namespace function call.
+
+        Pattern: keyword::identifier(...) like json::write(), string::cut()
+        This allows type keywords to be used as namespace prefixes for function calls.
+        """
+        if not self._check(TokenType.KEYWORD):
+            return False
+
+        # Save position
+        saved_pos = self.pos
+
+        self._advance()  # Skip keyword
+
+        # Must be followed by ::
+        result = self._check(TokenType.DOUBLE_COLON)
+
+        # Restore position
+        self.pos = saved_pos
+        return result
+
     def _looks_like_typed_variable(self) -> bool:
         """Check if current position looks like a typed variable declaration:
         type_name varName; or type_name<T> varName; or type_name varName = value;
@@ -1377,10 +1467,14 @@ class CSSLParser:
         elif self._looks_like_function_declaration():
             # Nested typed function (e.g., void Level2() { ... })
             return self._parse_typed_function()
+        elif self._check(TokenType.SUPER_FUNC):
+            # Super-function for .cssl-pl payload files
+            return self._parse_super_function()
         elif (self._check(TokenType.IDENTIFIER) or self._check(TokenType.AT) or
               self._check(TokenType.CAPTURED_REF) or self._check(TokenType.SHARED_REF) or
               self._check(TokenType.GLOBAL_REF) or self._check(TokenType.SELF_REF) or
-              (self._check(TokenType.KEYWORD) and self._current().value in ('this', 'new'))):
+              (self._check(TokenType.KEYWORD) and self._current().value in ('this', 'new')) or
+              self._looks_like_namespace_call()):
             return self._parse_expression_statement()
         else:
             self._advance()
@@ -1594,23 +1688,42 @@ class CSSLParser:
         return ASTNode('c_for_update', value={'var': var_name, 'op': 'none'})
 
     def _parse_python_style_for(self) -> ASTNode:
-        """Parse Python-style for loop: for (i in range(...)) { }
+        """Parse Python-style for loop: for (i in range(...)) { } or for (item in collection) { }
 
         Supports:
             for (i in range(n)) { }           - 0 to n-1
             for (i in range(start, end)) { }  - start to end-1
             for (i in range(start, end, step)) { }
+            for (item in collection) { }      - iterate over list/vector
+            for (item in @global_collection) { } - iterate over global
         """
         var_name = self._advance().value
         self._expect(TokenType.KEYWORD)  # 'in'
 
-        # 'range' can be keyword or identifier
+        # Check if this is range() or collection iteration
+        is_range = False
         if self._check(TokenType.KEYWORD) and self._peek().value == 'range':
             self._advance()  # consume 'range' keyword
+            is_range = True
         elif self._check(TokenType.IDENTIFIER) and self._peek().value == 'range':
             self._advance()  # consume 'range' identifier
-        else:
-            self.error(f"Expected 'range', got {self._peek().value}")
+            is_range = True
+
+        # If not range, parse as collection iteration
+        if not is_range:
+            iterable = self._parse_expression()
+            self._expect(TokenType.PAREN_END)
+
+            node = ASTNode('foreach', value={'var': var_name, 'iterable': iterable}, 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)
+
+            self._expect(TokenType.BLOCK_END)
+            return node
 
         self._expect(TokenType.PAREN_START)
         first_arg = self._parse_expression()
@@ -1722,11 +1835,56 @@ class CSSLParser:
         return node
 
     def _parse_return(self) -> ASTNode:
-        value = None
+        """Parse return statement, supporting multiple values for shuffled functions.
+
+        Syntax:
+            return;                    // Return None
+            return value;              // Return single value
+            return a, b, c;            // Return multiple values (for shuffled)
+        """
+        values = []
         if not self._check(TokenType.SEMICOLON) and not self._check(TokenType.BLOCK_END):
-            value = self._parse_expression()
+            values.append(self._parse_expression())
+
+            # Check for comma-separated return values (shuffled return)
+            while self._check(TokenType.COMMA):
+                self._advance()  # consume comma
+                values.append(self._parse_expression())
+
         self._match(TokenType.SEMICOLON)
-        return ASTNode('return', value=value)
+
+        if len(values) == 0:
+            return ASTNode('return', value=None)
+        elif len(values) == 1:
+            return ASTNode('return', value=values[0])
+        else:
+            # Multiple return values - create tuple return
+            return ASTNode('return', value={'multiple': True, 'values': values})
+
+    def _parse_super_function(self) -> ASTNode:
+        """Parse super-function for .cssl-pl payload files.
+
+        Syntax:
+            #$run(initFunction);           // Call function at load time
+            #$exec(setup());               // Execute expression at load time
+            #$printl("Payload loaded");    // Print at load time
+
+        These are pre-execution hooks that run when payload() loads the file.
+        """
+        token = self._advance()  # Get the SUPER_FUNC token
+        super_name = token.value  # e.g., "#$run", "#$exec", "#$printl"
+
+        # Parse the arguments
+        self._expect(TokenType.PAREN_START)
+        args = []
+        if not self._check(TokenType.PAREN_END):
+            args.append(self._parse_expression())
+            while self._match(TokenType.COMMA):
+                args.append(self._parse_expression())
+        self._expect(TokenType.PAREN_END)
+        self._match(TokenType.SEMICOLON)
+
+        return ASTNode('super_func', value={'name': super_name, 'args': args})
 
     def _parse_try(self) -> ASTNode:
         node = ASTNode('try', children=[])
@@ -1783,36 +1941,65 @@ class CSSLParser:
         self._expect(TokenType.BLOCK_END)
         return node
 
-    def _parse_injection_filter(self) -> Optional[dict]:
-        """Parse injection filter: [type::helper=value]"""
-        if not self._match(TokenType.BRACKET_START):
+    def _parse_injection_filter(self) -> Optional[list]:
+        """Parse injection filter(s): [type::helper=value] or [f1][f2][f3]...
+
+        Returns a list of filter dictionaries to support chained filters.
+        """
+        if not self._check(TokenType.BRACKET_START):
             return None
 
-        filter_info = {}
-        # Parse type::helper=value patterns
-        while not self._check(TokenType.BRACKET_END) and not self._is_at_end():
-            if self._check(TokenType.IDENTIFIER) or self._check(TokenType.KEYWORD):
-                filter_type = self._advance().value
-                if self._match(TokenType.DOUBLE_COLON):
-                    helper = self._advance().value
-                    if self._match(TokenType.EQUALS):
-                        value = self._parse_expression()
-                        filter_info[f'{filter_type}::{helper}'] = value
+        filters = []
+
+        # Parse multiple consecutive filter brackets
+        while self._match(TokenType.BRACKET_START):
+            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):
+                    filter_type = self._advance().value
+                    if self._match(TokenType.DOUBLE_COLON):
+                        helper = self._advance().value
+                        if self._match(TokenType.EQUALS):
+                            value = self._parse_expression()
+                            filter_info[f'{filter_type}::{helper}'] = value
+                        else:
+                            filter_info[f'{filter_type}::{helper}'] = True
                     else:
-                        filter_info[f'{filter_type}::{helper}'] = True
+                        filter_info['type'] = filter_type
+                elif self._check(TokenType.COMMA):
+                    self._advance()
                 else:
-                    filter_info['type'] = filter_type
-            elif self._check(TokenType.COMMA):
-                self._advance()
-            else:
-                break
+                    break
 
-        self._expect(TokenType.BRACKET_END)
-        return filter_info if filter_info else None
+            self._expect(TokenType.BRACKET_END)
+            if filter_info:
+                filters.append(filter_info)
+
+        return filters if filters else None
 
     def _parse_expression_statement(self) -> Optional[ASTNode]:
         expr = self._parse_expression()
 
+        # === TUPLE UNPACKING: a, b, c = shuffled_func() ===
+        # Check if we have comma-separated identifiers before =
+        if expr.type == 'identifier' and self._check(TokenType.COMMA):
+            targets = [expr]
+            while self._match(TokenType.COMMA):
+                next_expr = self._parse_expression()
+                if next_expr.type == 'identifier':
+                    targets.append(next_expr)
+                else:
+                    # Not a simple identifier list, this is something else
+                    # Restore and fall through to normal parsing
+                    break
+
+            # Check if followed by =
+            if self._match(TokenType.EQUALS):
+                value = self._parse_expression()
+                self._match(TokenType.SEMICOLON)
+                return ASTNode('tuple_assignment', value={'targets': targets, 'value': value})
+
         # === BASIC INJECTION: <== (replace target with source) ===
         if self._match(TokenType.INJECT_LEFT):
             # Check if this is a createcmd injection with a code block
@@ -2000,6 +2187,11 @@ class CSSLParser:
             elif self._match(TokenType.COMPARE_GE):
                 right = self._parse_term()
                 left = ASTNode('binary', value={'op': '>=', 'left': left, 'right': right})
+            elif self._check(TokenType.KEYWORD) and self._peek().value == 'in':
+                # 'in' operator for containment: item in list
+                self._advance()  # consume 'in'
+                right = self._parse_term()
+                left = ASTNode('binary', value={'op': 'in', 'left': left, 'right': right})
             else:
                 break
 
@@ -2335,17 +2527,76 @@ class CSSLParser:
             self._expect(TokenType.COMPARE_GT)  # consume >
             return ASTNode('instance_ref', value=instance_name)
 
-        # Check for type generic instantiation: stack<string>, vector<int>, etc.
+        # Check for type generic instantiation: stack<string>, vector<int>, map<string, int>, etc.
         # This creates a new instance of the type with the specified element type
         if name in TYPE_GENERICS and self._check(TokenType.COMPARE_LT):
             self._advance()  # consume <
             element_type = 'dynamic'
+            value_type = None  # For map<K, V>
+
             if self._check(TokenType.KEYWORD) or self._check(TokenType.IDENTIFIER):
                 element_type = self._advance().value
+
+            # Check for second type parameter (map<K, V>)
+            if name == 'map' and self._check(TokenType.COMMA):
+                self._advance()  # consume ,
+                if self._check(TokenType.KEYWORD) or self._check(TokenType.IDENTIFIER):
+                    value_type = self._advance().value
+                else:
+                    value_type = 'dynamic'
+
             self._expect(TokenType.COMPARE_GT)  # consume >
+
+            # Check for inline initialization: map<K,V>{"key": "value", ...}
+            init_values = None
+            if self._check(TokenType.BLOCK_START):
+                self._advance()  # consume {
+                init_values = {}
+
+                while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
+                    # Parse key
+                    if self._check(TokenType.STRING):
+                        key = self._advance().value
+                    elif self._check(TokenType.IDENTIFIER):
+                        key = self._advance().value
+                    else:
+                        key = str(self._parse_expression().value) if hasattr(self._parse_expression(), 'value') else 'key'
+
+                    # Expect : or =
+                    if self._check(TokenType.COLON):
+                        self._advance()
+                    elif self._check(TokenType.EQUALS):
+                        self._advance()
+
+                    # Parse value
+                    value = self._parse_expression()
+                    init_values[key] = value
+
+                    # Optional comma
+                    if self._check(TokenType.COMMA):
+                        self._advance()
+
+                self._expect(TokenType.BLOCK_END)  # consume }
+
+            # Check for array-style initialization: vector<int>[1, 2, 3], array<string>["a", "b"]
+            elif self._check(TokenType.BRACKET_START):
+                self._advance()  # consume [
+                init_values = []
+
+                while not self._check(TokenType.BRACKET_END) and not self._is_at_end():
+                    init_values.append(self._parse_expression())
+
+                    # Optional comma
+                    if self._check(TokenType.COMMA):
+                        self._advance()
+
+                self._expect(TokenType.BRACKET_END)  # consume ]
+
             return ASTNode('type_instantiation', value={
                 'type': name,
-                'element_type': element_type
+                'element_type': element_type,
+                'value_type': value_type,
+                'init_values': init_values
             })
 
         # Check for type-parameterized function call: OpenFind<string>(0)