vex-ast 0.2.3__py3-none-any.whl → 0.2.4__py3-none-any.whl

vex_ast/ast/expressions.py

@@ -2,7 +2,7 @@
 
 from typing import Dict, List, Optional, Union, cast, Any
 
-from .interfaces import IAstNode, IExpression, IVisitor, T_VisitorResult, IIdentifier, IFunctionCall
+from .interfaces import IAstNode, IExpression, IVisitor, T_VisitorResult, IIdentifier, IFunctionCall, IConditionalExpression
 from .core import Expression
 from .operators import Operator
 from ..utils.source_location import SourceLocation
@@ -173,6 +173,49 @@ class KeywordArgument(Expression):
         """Get the keyword value."""
         return self.value
 
+class ConditionalExpression(Expression, IConditionalExpression):
+    """A conditional expression (ternary operator, e.g., a if condition else b)."""
+    
+    _fields = ('condition', 'true_expr', 'false_expr')
+    
+    def __init__(self, condition: IExpression, true_expr: IExpression, false_expr: IExpression,
+                 location: Optional[SourceLocation] = None):
+        super().__init__(location)
+        self.condition = condition
+        self.true_expr = true_expr
+        self.false_expr = false_expr
+        
+        # Set parent references
+        if isinstance(condition, Expression):
+            condition.set_parent(self)
+        if isinstance(true_expr, Expression):
+            true_expr.set_parent(self)
+        if isinstance(false_expr, Expression):
+            false_expr.set_parent(self)
+    
+    def get_children(self) -> List[IAstNode]:
+        """Get child nodes."""
+        return [
+            cast(IAstNode, self.condition),
+            cast(IAstNode, self.true_expr),
+            cast(IAstNode, self.false_expr)
+        ]
+    
+    def accept(self, visitor: IVisitor[T_VisitorResult]) -> T_VisitorResult:
+        return visitor.visit_conditionalexpression(self)
+    
+    def get_condition(self) -> IExpression:
+        """Get the condition expression."""
+        return self.condition
+    
+    def get_true_expression(self) -> IExpression:
+        """Get the expression to evaluate if condition is true."""
+        return self.true_expr
+    
+    def get_false_expression(self) -> IExpression:
+        """Get the expression to evaluate if condition is false."""
+        return self.false_expr
+
 class FunctionCall(Expression, IFunctionCall):
     """A function call."""
     

vex_ast/ast/interfaces.py

@@ -84,6 +84,22 @@ class IIdentifier(IExpression, Protocol):
         """Get the identifier name."""
         ...
 
+@runtime_checkable
+class IConditionalExpression(IExpression, Protocol):
+    """Protocol for conditional expression (ternary operator) nodes."""
+    
+    def get_condition(self) -> IExpression:
+        """Get the condition expression."""
+        ...
+    
+    def get_true_expression(self) -> IExpression:
+        """Get the expression to evaluate if condition is true."""
+        ...
+    
+    def get_false_expression(self) -> IExpression:
+        """Get the expression to evaluate if condition is false."""
+        ...
+
 @runtime_checkable
 class IFunctionCall(IExpression, Protocol):
     """Protocol for function call nodes."""

vex_ast/parser/factory.py

@@ -4,7 +4,7 @@ from typing import Any, Dict, Optional, Type, Union, cast, List
 
 from ..ast.core import Expression, Program, Statement
 from ..ast.expressions import (
-    AttributeAccess, BinaryOperation, FunctionCall, Identifier, KeywordArgument, 
+    AttributeAccess, BinaryOperation, ConditionalExpression, FunctionCall, Identifier, KeywordArgument, 
     UnaryOperation, VariableReference
 )
 from ..ast.literals import (
@@ -77,6 +77,11 @@ class NodeFactory:
         """Create a unary operation node."""
         return UnaryOperation(op, operand, location)
     
+    def create_conditional_expression(self, condition: Expression, true_expr: Expression, false_expr: Expression,
+                                     location: Optional[SourceLocation] = None) -> ConditionalExpression:
+        """Create a conditional expression (ternary operator) node."""
+        return ConditionalExpression(condition, true_expr, false_expr, location)
+    
     def create_function_call(self, function: Expression, args: List[Expression] = None,
                              keywords: List[KeywordArgument] = None,
                              location: Optional[SourceLocation] = None) -> FunctionCall:

vex_ast/parser/python_parser.py

@@ -294,21 +294,12 @@ class PythonParser(BaseParser):
             op_name = op_type.__name__
             
             op_map = {
-                'And': 'and',
-                'Or': 'or'
+                'And': Operator.LOGICAL_AND,
+                'Or': Operator.LOGICAL_OR
             }
             
             if op_name in op_map:
-                op_str = op_map[op_name]
-                vex_op = PYTHON_COMP_OP_MAP.get(op_str)
-                
-                if not vex_op:
-                    self.error_handler.add_error(
-                        ErrorType.PARSER_ERROR,
-                        f"Unsupported boolean operator: {op_name}",
-                        loc
-                    )
-                    vex_op = Operator.LOGICAL_AND  # Fallback
+                vex_op = op_map[op_name]
             else:
                 self.error_handler.add_error(
                     ErrorType.PARSER_ERROR,
@@ -329,6 +320,15 @@ class PythonParser(BaseParser):
             
             return result
         
+        # Conditional expressions (ternary operators)
+        elif isinstance(node, ast.IfExp):
+            loc = self._get_location(node)
+            test = self._convert_expression(node.test)
+            body = self._convert_expression(node.body)
+            orelse = self._convert_expression(node.orelse)
+            
+            return self.factory.create_conditional_expression(test, body, orelse, loc)
+        
         # List literals
         elif isinstance(node, ast.List) or isinstance(node, ast.Tuple):
             # We don't have a dedicated list/tuple node, so use function call
@@ -607,22 +607,77 @@ class PythonParser(BaseParser):
                 self._get_location(node)
             )
         
-        # Import statements - not fully supported yet
-        elif isinstance(node, (ast.Import, ast.ImportFrom)):
+        # Import statements
+        elif isinstance(node, ast.Import):
             loc = self._get_location(node)
-            self.error_handler.add_error(
-                ErrorType.PARSER_ERROR,
-                "Import statements are not fully supported",
-                loc
-            )
-            # Create a placeholder expression statement
-            return self.factory.create_expression_statement(
-                self.factory.create_identifier(
-                    f"<import:{getattr(node, 'names', [])}>",
+            # Create a list of assignments for each imported name
+            statements = []
+            
+            for name in node.names:
+                # Create an identifier for the module
+                module_name = name.name
+                as_name = name.asname or module_name
+                
+                # Create an assignment: as_name = module_name
+                target = self.factory.create_identifier(as_name, loc)
+                value = self.factory.create_identifier(f"<import:{module_name}>", loc)
+                
+                statements.append(self.factory.create_assignment(target, value, loc))
+            
+            # If there's only one statement, return it
+            if len(statements) == 1:
+                return statements[0]
+            
+            # Otherwise, return the first one and add a warning
+            if len(statements) > 1:
+                self.error_handler.add_error(
+                    ErrorType.PARSER_ERROR,
+                    "Multiple imports in a single statement are not fully supported",
                     loc
-                ),
-                loc
-            )
+                )
+            
+            return statements[0]
+        
+        # Import from statements
+        elif isinstance(node, ast.ImportFrom):
+            loc = self._get_location(node)
+            module_name = node.module or ""
+            
+            # Special case for "from vex import *"
+            if module_name == "vex" and any(name.name == "*" for name in node.names):
+                # Create a special identifier that represents "from vex import *"
+                return self.factory.create_expression_statement(
+                    self.factory.create_identifier("<import:vex:*>", loc),
+                    loc
+                )
+            
+            # For other import from statements, create assignments
+            statements = []
+            
+            for name in node.names:
+                # Create an identifier for the imported name
+                imported_name = name.name
+                as_name = name.asname or imported_name
+                
+                # Create an assignment: as_name = module_name.imported_name
+                target = self.factory.create_identifier(as_name, loc)
+                value = self.factory.create_identifier(f"<import:{module_name}.{imported_name}>", loc)
+                
+                statements.append(self.factory.create_assignment(target, value, loc))
+            
+            # If there's only one statement, return it
+            if len(statements) == 1:
+                return statements[0]
+            
+            # Otherwise, return the first one and add a warning
+            if len(statements) > 1:
+                self.error_handler.add_error(
+                    ErrorType.PARSER_ERROR,
+                    "Multiple imports in a single statement are not fully supported",
+                    loc
+                )
+            
+            return statements[0]
         
         # Class definitions - not supported yet
         elif isinstance(node, ast.ClassDef):

vex_ast/registry/signature.py

@@ -24,6 +24,11 @@ class VexFunctionParameter:
         self.description = description
         self.is_optional = default_value is not None
     
+    @property
+    def optional(self) -> bool:
+        """Alias for is_optional for compatibility."""
+        return self.is_optional
+    
     def __str__(self) -> str:
         mode_str = ""
         if self.mode == ParameterMode.REFERENCE:

vex_ast/visitors/base.py

@@ -47,6 +47,9 @@ class AstVisitor(Generic[T_VisitorResult], ABC):
     def visit_unaryoperation(self, node: Any) -> T_VisitorResult:
         return self.generic_visit(node)
     
+    def visit_conditionalexpression(self, node: Any) -> T_VisitorResult:
+        return self.generic_visit(node)
+    
     def visit_functioncall(self, node: Any) -> T_VisitorResult:
         return self.generic_visit(node)
     
@@ -127,4 +130,4 @@ class TypedVisitorMixin:
         method_name = self.node_type_to_method_name(type(node))
         if hasattr(self, method_name):
             return getattr(self, method_name)(node)
-        return self.generic_visit(node)
+        return self.generic_visit(node)

vex_ast/visitors/printer.py

@@ -126,6 +126,7 @@ class PrintVisitor(AstVisitor[str]):
     visit_variablereference = generic_visit
     visit_binaryoperation = generic_visit
     visit_unaryoperation = generic_visit
+    visit_conditionalexpression = generic_visit
     visit_functioncall = generic_visit
     visit_keywordargument = generic_visit
     visit_expressionstatement = generic_visit
@@ -142,4 +143,4 @@ class PrintVisitor(AstVisitor[str]):
     visit_motorcontrol = generic_visit
     visit_sensorreading = generic_visit
     visit_timingcontrol = generic_visit
-    visit_displayoutput = generic_visit
+    visit_displayoutput = generic_visit

{vex_ast-0.2.3.dist-info → vex_ast-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vex_ast
-Version: 0.2.3
+Version: 0.2.4
 Summary: A Python package for generating Abstract Syntax Trees for VEX V5 code.
 Home-page: https://github.com/heartx2/vex_ast
 Author: Chaze

{vex_ast-0.2.3.dist-info → vex_ast-0.2.4.dist-info}/RECORD

@@ -4,8 +4,8 @@ vex_ast/__init__.py,sha256=0xxA3UL3UMPB1Vlf1jL99bNUnvm41yJEoG5sMeylptY,1757
 vex_ast/ast/README.md,sha256=7IQDHEXmKyJ8zfJNwa3pMGTDZKVPMFD0YeHT06ATRyM,3205
 vex_ast/ast/__init__.py,sha256=_KT8R_WG9_DLvPlDhVCNWz-yw0OtdoKxxWZYbtloCzU,2434
 vex_ast/ast/core.py,sha256=q-15q5VfGIVPAmFsSiWeFAZ55MPsXfCRa21rrt2hmlM,2670
-vex_ast/ast/expressions.py,sha256=b0cDs239wvygCIL9s0W8uuyuPeMZz3DwxQ0wmBta_XM,7758
-vex_ast/ast/interfaces.py,sha256=DXKdAzts0EBWjCRgYkz_kVSMcYbNIyPdwYpTr7c6P2A,5928
+vex_ast/ast/expressions.py,sha256=FGGWyNpJynnXqw0W_M08pGwa8wplF0oucbqk4x2W7SI,9404
+vex_ast/ast/interfaces.py,sha256=KR_3jM5J97vQb6O5cgDzBi7IIQHjr2uXTobaVCT6RSg,6448
 vex_ast/ast/literals.py,sha256=PXbOH5Y2fxEngWk_FOiFsx3PC2SEqcx0bcfOGJ3SdbI,2618
 vex_ast/ast/navigator.py,sha256=9DaVXrknBbBr4omAAMHQnZL9Wpj5wjtoCS6_lni8MYM,7529
 vex_ast/ast/operators.py,sha256=I-yWvhsrz-OxmBZs5zIss_GTZF5S-nwcSmIzvAVtddM,3160
@@ -14,9 +14,9 @@ vex_ast/ast/validators.py,sha256=ySpi5H0XRdGXXMFAfmuVEyc3Q9mMXhubZAkP4N8NL3c,471
 vex_ast/ast/vex_nodes.py,sha256=8Wq9vl8Mp70E3fxEut9tB6WZE1z0Q_i5V0qh_5Zoeag,11981
 vex_ast/parser/README.md,sha256=P1qq_97skpgluLDpNu9V_pAdkuF9StjkzOEXJJYpEuM,2565
 vex_ast/parser/__init__.py,sha256=LGHnFm3UzR4Nw7royGH3c_2RqeY66y8O6DdXHbm9yL4,504
-vex_ast/parser/factory.py,sha256=ryTs8dQej8GbATyc7H4NUUISL1Bq65eIjyq84HaFTlo,9098
+vex_ast/parser/factory.py,sha256=tcEYSgMNrjqhFDx3tYX22a68Qsxv3fcQpefki_tB8lE,9498
 vex_ast/parser/interfaces.py,sha256=Ttc0bD_5X420ZCT9MLUf_wE1aZLWLkaJRQqCwBy9wIs,956
-vex_ast/parser/python_parser.py,sha256=EHcro2NqVLScOBBG0XuWUMiT7Dmqep4M9scGOxpJoYw,29947
+vex_ast/parser/python_parser.py,sha256=c36vfmzZvGGNDdi6g4kwQnESaKxVF8cSpaRoGVp_lBo,32428
 vex_ast/parser/strategies.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vex_ast/registry/README.md,sha256=J8xEXEscEZhWa6wmn05kjE395AjrV7p2h7nq4SXI5uE,1535
 vex_ast/registry/__init__.py,sha256=dXT8OS7uLyBSdQKZDWrtbANzgSWcg9HUQDA1EaLOvjQ,1188
@@ -24,7 +24,7 @@ vex_ast/registry/api.py,sha256=yyW-TsCIULTzePAoyMvEqD_RNlkFSb4PLpiSkw6ueQk,5460
 vex_ast/registry/categories.py,sha256=y5tnCzHQ9PPg9hOzOMgyE1ZAhcsjgeFSrgqdJrdqHEg,4885
 vex_ast/registry/language_map.py,sha256=eekN3k-K9g90GFi4--If3nfJCyarUJxDWDCDvLm7mdU,2656
 vex_ast/registry/registry.py,sha256=gvsQKyeXWp84T2uDB4O_WQgKCeq8W9udl8TD5MnPZzc,6661
-vex_ast/registry/signature.py,sha256=_Lde3bteVVdYG31fN4v62UViWSVyxi4U3mYT1-9b4A0,7881
+vex_ast/registry/signature.py,sha256=xMMay6zycjf4a0XMVJuyjqZxTuK6X2bLeyW4HAS0suQ,8019
 vex_ast/registry/simulation_behavior.py,sha256=WwkVKae0owtv3WTrfnVH93rpsh9lbqJ_RSAVmpIVA_k,313
 vex_ast/registry/validation.py,sha256=xq5UjSWYAcRxjxsCGg3WU5RtPN-DB-JAqKqDNGvnJGk,1973
 vex_ast/registry/functions/__init__.py,sha256=X9aw0-Y9Q6Gcx01zepP8G_20ybfwC-LDPQfkK2RDOrE,207
@@ -53,11 +53,11 @@ vex_ast/utils/type_definitions.py,sha256=2rB85B1vZL1GLWItBuJJpyr-vmp3W346EMMX2TP
 vex_ast/visitors/README.md,sha256=BKDj8LMuBlCrzgSSLmCkbET7WIqgxe-oCkqQbqXekrE,2725
 vex_ast/visitors/__init__.py,sha256=cndW3yp0Mu9w5vzwqqS2N5EqS0Ioh0V5UCDDrwCO0_Q,492
 vex_ast/visitors/analyzer.py,sha256=cBT5PRbtfQ_Dt1qiHN-wdO5KnC2yl-Ul5RasXg9geHY,3668
-vex_ast/visitors/base.py,sha256=Ph0taTIVMHV_QjXfDd0ipZnCXVJErkyRtPpfwfzo-kY,4859
-vex_ast/visitors/printer.py,sha256=CUY_73hxm7MoC-63JeIXaVYnZ8QqtfMqbek2R2HMEmE,5411
+vex_ast/visitors/base.py,sha256=fLeMuIXJEHsag17PDM33he79x7Mp4V0wgtnF_8LuFpc,4978
+vex_ast/visitors/printer.py,sha256=kofemEXvGBXEm1wy57R-Pgj2QBnSp_lNjFk3p2hNU2o,5460
 vex_ast/visitors/transformer.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vex_ast-0.2.3.dist-info/licenses/LICENSE,sha256=IOSlfCuxGv4OAg421BRDKVi16RZ7-5kCMJ4B16r4kuc,69
-vex_ast-0.2.3.dist-info/METADATA,sha256=2TsjEVVuPN94XQ8QOW5bHItBbFh3IAvn1uuCoEJe8nQ,5295
-vex_ast-0.2.3.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-vex_ast-0.2.3.dist-info/top_level.txt,sha256=MoZGrpKgNUDiqL9gWp4q3wMw3q93XPEEjmBNPJQcNAs,8
-vex_ast-0.2.3.dist-info/RECORD,,
+vex_ast-0.2.4.dist-info/licenses/LICENSE,sha256=IOSlfCuxGv4OAg421BRDKVi16RZ7-5kCMJ4B16r4kuc,69
+vex_ast-0.2.4.dist-info/METADATA,sha256=_cjCd-H6a70oJPJ8X-P_m7NiAwikUQiAX2aLRUDDfFo,5295
+vex_ast-0.2.4.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+vex_ast-0.2.4.dist-info/top_level.txt,sha256=MoZGrpKgNUDiqL9gWp4q3wMw3q93XPEEjmBNPJQcNAs,8
+vex_ast-0.2.4.dist-info/RECORD,,