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

includecpp/core/cssl/cssl_parser.py

@@ -101,6 +101,7 @@ class TokenType(Enum):
     SELF_REF = auto()    # s@<name> self-reference to global struct
     SHARED_REF = auto()  # $<name> shared object reference
     CAPTURED_REF = auto()  # %<name> captured reference (for infusion)
+    THIS_REF = auto()      # this-><name> class member reference
     PACKAGE = auto()
     PACKAGE_INCLUDES = auto()
     AS = auto()
@@ -111,7 +112,7 @@ class TokenType(Enum):
 
 KEYWORDS = {
     # Service structure
-    'service-init', 'service-run', 'service-include', 'struct', 'define', 'main',
+    'service-init', 'service-run', 'service-include', 'struct', 'define', 'main', 'class', 'new', 'this',
     # Control flow
     'if', 'else', 'elif', 'while', 'for', 'foreach', 'in', 'range',
     'switch', 'case', 'default', 'break', 'continue', 'return',
@@ -126,7 +127,7 @@ KEYWORDS = {
     'package', 'package-includes', 'exec', 'as', 'global',
     # CSSL Type Keywords
     'int', 'string', 'float', 'bool', 'void', 'json', 'array', 'vector', 'stack',
-    'list', 'dictionary', 'dict',  # Python-like types
+    'list', 'dictionary', 'dict', 'instance', 'map',  # Python-like types
     'dynamic',      # No type declaration (slow but flexible)
     'undefined',    # Function errors ignored
     'open',         # Accept any parameter type
@@ -154,7 +155,7 @@ TYPE_LITERALS = {'list', 'dict'}
 # Generic type keywords that use <T> syntax
 TYPE_GENERICS = {
     'datastruct', 'dataspace', 'shuffled', 'iterator', 'combo',
-    'vector', 'stack', 'array', 'openquote', 'list', 'dictionary'
+    'vector', 'stack', 'array', 'openquote', 'list', 'dictionary', 'map'
 }
 
 # Functions that accept type parameters: FuncName<type>(args)
@@ -679,7 +680,7 @@ class CSSLParser:
     def _is_type_keyword(self, value: str) -> bool:
         """Check if a keyword is a type declaration"""
         return value in ('int', 'string', 'float', 'bool', 'void', 'json', 'array', 'vector', 'stack',
-                        'list', 'dictionary', 'dict',
+                        'list', 'dictionary', 'dict', 'instance', 'map',
                         'dynamic', 'datastruct', 'dataspace', 'shuffled', 'iterator', 'combo', 'structure')
 
     def _looks_like_function_declaration(self) -> bool:
@@ -898,7 +899,7 @@ class CSSLParser:
         type_keywords = {'int', 'string', 'float', 'bool', 'dynamic', 'void',
                         'stack', 'vector', 'datastruct', 'dataspace', 'shuffled',
                         'iterator', 'combo', 'array', 'openquote', 'json',
-                        'list', 'dictionary', 'dict'}
+                        'list', 'dictionary', 'dict', 'instance', 'map'}
         if type_name not in type_keywords:
             return False
 
@@ -927,11 +928,13 @@ class CSSLParser:
         # Get type name
         type_name = self._advance().value  # Consume type keyword
 
-        # Check for generic type <T>
+        # Check for generic type <T> or instance<"name">
         element_type = None
         if self._match(TokenType.COMPARE_LT):
-            # Get element type
-            if self._check(TokenType.KEYWORD) or self._check(TokenType.IDENTIFIER):
+            # 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)
 
@@ -947,6 +950,14 @@ class CSSLParser:
 
         self._match(TokenType.SEMICOLON)
 
+        # For instance<"name">, create a special node type
+        if type_name == 'instance':
+            return ASTNode('instance_declaration', value={
+                'instance_name': element_type,
+                'name': var_name,
+                'value': value
+            })
+
         return ASTNode('typed_declaration', value={
             'type': type_name,
             'element_type': element_type,
@@ -961,6 +972,8 @@ class CSSLParser:
         while not self._is_at_end():
             if self._match_keyword('struct'):
                 root.children.append(self._parse_struct())
+            elif self._match_keyword('class'):
+                root.children.append(self._parse_class())
             elif self._match_keyword('define'):
                 root.children.append(self._parse_define())
             # Check for C-style typed function declarations
@@ -1233,6 +1246,58 @@ class CSSLParser:
         self._expect(TokenType.BLOCK_END)
         return node
 
+    def _parse_class(self) -> ASTNode:
+        """Parse class declaration with members and methods.
+
+        Syntax:
+            class ClassName {
+                string name;
+                int age;
+
+                void ClassName(string n) { this->name = n; }
+
+                void sayHello() {
+                    printl("Hello " + this->name);
+                }
+            }
+        """
+        class_name = self._advance().value
+
+        node = ASTNode('class', value={'name': class_name}, children=[])
+        self._expect(TokenType.BLOCK_START)
+
+        while not self._check(TokenType.BLOCK_END) and not self._is_at_end():
+            # Check for typed function (method) declaration
+            if self._looks_like_function_declaration():
+                method = self._parse_typed_function()
+                method_info = method.value
+                method_name = method_info.get('name')
+
+                # Mark constructor (same name as class or __init__)
+                if method_name == class_name or method_name == '__init__':
+                    method.value['is_constructor'] = True
+
+                node.children.append(method)
+
+            # Check for typed member variable declaration
+            elif self._looks_like_typed_variable():
+                member = self._parse_typed_variable()
+                if member:
+                    # Mark as class member
+                    member.value['is_member'] = True
+                    node.children.append(member)
+
+            # Check for define-style method
+            elif self._match_keyword('define'):
+                method = self._parse_define()
+                node.children.append(method)
+
+            else:
+                self._advance()
+
+        self._expect(TokenType.BLOCK_END)
+        return node
+
     def _parse_define(self) -> ASTNode:
         name = self._advance().value
         params = []
@@ -1314,7 +1379,8 @@ class CSSLParser:
             return self._parse_typed_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)):
+              self._check(TokenType.GLOBAL_REF) or self._check(TokenType.SELF_REF) or
+              (self._check(TokenType.KEYWORD) and self._current().value in ('this', 'new'))):
             return self._parse_expression_statement()
         else:
             self._advance()
@@ -1782,14 +1848,14 @@ class CSSLParser:
             if self._check(TokenType.BRACKET_START):
                 # Peek ahead to see if this is an index [n] or a filter [type::helper=...]
                 # Only consume if it's a simple number index
-                saved_pos = self._current
+                saved_pos = self.pos
                 self._advance()  # consume [
                 if self._check(TokenType.NUMBER):
                     remove_index = int(self._advance().value)
                     self._expect(TokenType.BRACKET_END)
                 else:
                     # Not a number - restore position for filter parsing
-                    self._current = saved_pos
+                    self.pos = saved_pos
 
             filter_info = self._parse_injection_filter()
             source = self._parse_expression()
@@ -1824,14 +1890,14 @@ class CSSLParser:
             remove_index = None
             if self._check(TokenType.BRACKET_START):
                 # Peek ahead to see if this is an index [n] or something else
-                saved_pos = self._current
+                saved_pos = self.pos
                 self._advance()  # consume [
                 if self._check(TokenType.NUMBER):
                     remove_index = int(self._advance().value)
                     self._expect(TokenType.BRACKET_END)
                 else:
                     # Not a number - restore position
-                    self._current = saved_pos
+                    self.pos = saved_pos
 
             if self._check(TokenType.BLOCK_START):
                 code_block = self._parse_action_block()
@@ -1987,19 +2053,75 @@ class CSSLParser:
         return self._parse_primary()
 
     def _parse_primary(self) -> ASTNode:
+        # Handle 'this->' member access
+        if self._check(TokenType.KEYWORD) and self._current().value == 'this':
+            self._advance()  # consume 'this'
+            if self._match(TokenType.FLOW_RIGHT):  # ->
+                member = self._advance().value
+                node = ASTNode('this_access', value={'member': member})
+                # Continue to check for calls, member access, indexing
+                while True:
+                    if self._match(TokenType.PAREN_START):
+                        # Method call: this->method()
+                        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):
+                        # Chained access: this->obj.method
+                        member = self._advance().value
+                        node = ASTNode('member_access', value={'object': node, 'member': member})
+                    elif self._match(TokenType.BRACKET_START):
+                        # Index access: this->arr[0]
+                        index = self._parse_expression()
+                        self._expect(TokenType.BRACKET_END)
+                        node = ASTNode('index_access', value={'object': node, 'index': index})
+                    elif self._match(TokenType.FLOW_RIGHT):
+                        # Chained this->a->b style access
+                        member = self._advance().value
+                        node = ASTNode('this_access', value={'member': member, 'object': node})
+                    else:
+                        break
+                return node
+            else:
+                # Just 'this' keyword alone - return as identifier for now
+                return ASTNode('identifier', value='this')
+
+        # Handle 'new ClassName(args)' instantiation
+        if self._check(TokenType.KEYWORD) and self._current().value == 'new':
+            self._advance()  # consume 'new'
+            class_name = self._advance().value  # get 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})
+            # Continue to check for member access, calls on the new object
+            while True:
+                if self._match(TokenType.DOT):
+                    member = self._advance().value
+                    node = ASTNode('member_access', value={'object': node, 'member': member})
+                    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.BRACKET_START):
+                    index = self._parse_expression()
+                    self._expect(TokenType.BRACKET_END)
+                    node = ASTNode('index_access', value={'object': node, 'index': index})
+                else:
+                    break
+            return node
+
         if self._match(TokenType.AT):
             node = self._parse_module_reference()
             # Continue to check for calls, indexing, member access on module refs
             while True:
                 if self._match(TokenType.PAREN_START):
-                    # Function call on module ref: @Module.method()
-                    args = []
-                    while not self._check(TokenType.PAREN_END) and not self._is_at_end():
-                        args.append(self._parse_expression())
-                        if not self._check(TokenType.PAREN_END):
-                            self._expect(TokenType.COMMA)
+                    # Function call on module ref: @Module.method() - with kwargs support
+                    args, kwargs = self._parse_call_arguments()
                     self._expect(TokenType.PAREN_END)
-                    node = ASTNode('call', value={'callee': node, 'args': args})
+                    node = ASTNode('call', value={'callee': node, 'args': args, 'kwargs': kwargs})
                 elif self._match(TokenType.DOT):
                     # Member access: @Module.property
                     member = self._advance().value
@@ -2017,31 +2139,23 @@ class CSSLParser:
             # s@<name> self-reference to global struct
             token = self._advance()
             node = ASTNode('self_ref', value=token.value, line=token.line, column=token.column)
-            # Check for function call: s@Backend.Loop.Start()
+            # Check for function call: s@Backend.Loop.Start() - with kwargs support
             if self._match(TokenType.PAREN_START):
-                args = []
-                while not self._check(TokenType.PAREN_END):
-                    args.append(self._parse_expression())
-                    if not self._check(TokenType.PAREN_END):
-                        self._expect(TokenType.COMMA)
+                args, kwargs = self._parse_call_arguments()
                 self._expect(TokenType.PAREN_END)
-                node = ASTNode('call', value={'callee': node, 'args': args})
+                node = ASTNode('call', value={'callee': node, 'args': args, 'kwargs': kwargs})
             return node
 
         if self._check(TokenType.GLOBAL_REF):
             # r@<name> global variable reference/declaration
             token = self._advance()
             node = ASTNode('global_ref', value=token.value, line=token.line, column=token.column)
-            # Check for member access, calls, indexing
+            # Check for member access, calls, indexing - with kwargs support
             while True:
                 if self._match(TokenType.PAREN_START):
-                    args = []
-                    while not self._check(TokenType.PAREN_END):
-                        args.append(self._parse_expression())
-                        if not self._check(TokenType.PAREN_END):
-                            self._expect(TokenType.COMMA)
+                    args, kwargs = self._parse_call_arguments()
                     self._expect(TokenType.PAREN_END)
-                    node = ASTNode('call', value={'callee': node, 'args': args})
+                    node = ASTNode('call', value={'callee': node, 'args': args, 'kwargs': kwargs})
                 elif self._match(TokenType.DOT):
                     member = self._advance().value
                     node = ASTNode('member_access', value={'object': node, 'member': member})
@@ -2057,16 +2171,12 @@ class CSSLParser:
             # $<name> shared object reference
             token = self._advance()
             node = ASTNode('shared_ref', value=token.value, line=token.line, column=token.column)
-            # Check for member access, calls, indexing
+            # Check for member access, calls, indexing - with kwargs support
             while True:
                 if self._match(TokenType.PAREN_START):
-                    args = []
-                    while not self._check(TokenType.PAREN_END):
-                        args.append(self._parse_expression())
-                        if not self._check(TokenType.PAREN_END):
-                            self._expect(TokenType.COMMA)
+                    args, kwargs = self._parse_call_arguments()
                     self._expect(TokenType.PAREN_END)
-                    node = ASTNode('call', value={'callee': node, 'args': args})
+                    node = ASTNode('call', value={'callee': node, 'args': args, 'kwargs': kwargs})
                 elif self._match(TokenType.DOT):
                     member = self._advance().value
                     node = ASTNode('member_access', value={'object': node, 'member': member})
@@ -2082,16 +2192,12 @@ class CSSLParser:
             # %<name> captured reference (captures value at infusion registration time)
             token = self._advance()
             node = ASTNode('captured_ref', value=token.value, line=token.line, column=token.column)
-            # Check for member access, calls, indexing
+            # Check for member access, calls, indexing - with kwargs support
             while True:
                 if self._match(TokenType.PAREN_START):
-                    args = []
-                    while not self._check(TokenType.PAREN_END):
-                        args.append(self._parse_expression())
-                        if not self._check(TokenType.PAREN_END):
-                            self._expect(TokenType.COMMA)
+                    args, kwargs = self._parse_call_arguments()
                     self._expect(TokenType.PAREN_END)
-                    node = ASTNode('call', value={'callee': node, 'args': args})
+                    node = ASTNode('call', value={'callee': node, 'args': args, 'kwargs': kwargs})
                 elif self._match(TokenType.DOT):
                     member = self._advance().value
                     node = ASTNode('member_access', value={'object': node, 'member': member})
@@ -2160,14 +2266,10 @@ class CSSLParser:
                 member = self._advance().value
                 node = ASTNode('member_access', value={'object': node, 'member': member})
             elif self._match(TokenType.PAREN_START):
-                # Function call
-                args = []
-                while not self._check(TokenType.PAREN_END):
-                    args.append(self._parse_expression())
-                    if not self._check(TokenType.PAREN_END):
-                        self._expect(TokenType.COMMA)
+                # Function call - use _parse_call_arguments for kwargs support
+                args, kwargs = self._parse_call_arguments()
                 self._expect(TokenType.PAREN_END)
-                node = ASTNode('call', value={'callee': node, 'args': args})
+                node = ASTNode('call', value={'callee': node, 'args': args, 'kwargs': kwargs})
             elif self._match(TokenType.BRACKET_START):
                 # Index access
                 index = self._parse_expression()
@@ -2191,7 +2293,7 @@ class CSSLParser:
         while not self._check(TokenType.PAREN_END) and not self._is_at_end():
             # Check for named argument: identifier = expression
             if self._check(TokenType.IDENTIFIER):
-                saved_pos = self._current
+                saved_pos = self.pos  # Save token position
                 name_token = self._advance()
 
                 if self._check(TokenType.EQUALS):
@@ -2201,7 +2303,7 @@ class CSSLParser:
                     kwargs[name_token.value] = value
                 else:
                     # Not named, restore and parse as expression
-                    self._current = saved_pos
+                    self.pos = saved_pos  # Restore token position
                     args.append(self._parse_expression())
             else:
                 args.append(self._parse_expression())
@@ -2220,6 +2322,19 @@ class CSSLParser:
                 namespace_member = self._advance().value
                 name = f"{name}::{namespace_member}"
 
+        # Check for instance<"name"> syntax - gets/creates shared instance
+        if name == 'instance' and self._check(TokenType.COMPARE_LT):
+            self._advance()  # consume <
+            # Expect string literal for instance name
+            if self._check(TokenType.STRING):
+                instance_name = self._advance().value
+            elif self._check(TokenType.IDENTIFIER):
+                instance_name = self._advance().value
+            else:
+                raise CSSLParserError("Expected instance name (string or identifier)", self._current_line())
+            self._expect(TokenType.COMPARE_GT)  # consume >
+            return ASTNode('instance_ref', value=instance_name)
+
         # Check for type generic instantiation: stack<string>, vector<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):
@@ -2288,7 +2403,7 @@ class CSSLParser:
             return False
 
         # Save position for lookahead
-        saved_pos = self._current
+        saved_pos = self.pos
 
         # Check if it looks like key = value pattern
         is_object = False
@@ -2299,7 +2414,7 @@ class CSSLParser:
                 is_object = True
 
         # Restore position
-        self._current = saved_pos
+        self.pos = saved_pos
         return is_object
 
     def _parse_action_block_expression(self) -> ASTNode: