Bump version 0.4.1

examples/expr_access/case_op.py

@@ -45,6 +45,6 @@
 # the selector is a local variable, dump the name
 output('switch: %s\n' % ex.switch.path.name)
 # the parameters are local variables, dump the pairs
-output('cases: {%s}\n' % ','.join(['%s: %s' % (v, f.path.name) for v, f in ex.cases]))
+output('cases: {%s}\n' % ','.join(['%s: %s' % (v.value, f.path.name) for v, f in ex.cases]))
 # the default is a local variable, dump the name
 output('default: %s\n' % ex.default.path.name)

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name="ansys-scade-apitools"
-version="0.4.0"
+version="0.4.1"
 description ="An extension library for SCADE Python APIs."
 readme="README.rst"
 

src/ansys/scade/apitools/expr/__init__.py

@@ -22,7 +22,6 @@
 
 """Provides a collection of functions for the accessing the expressions."""
 
-
 # ignore F401: functions made available for modules, not used here
 from .access import (  # noqa: F401
     ActivateNoInitOp,

src/ansys/scade/apitools/expr/access.py

@@ -35,6 +35,7 @@
 from __future__ import annotations
 
 from collections import namedtuple
+from typing import Optional
 
 import scade.model.suite as suite
 
@@ -887,7 +888,7 @@ def __init__(self, expression: suite.ExprCall):
         super().__init__(expression)
         self._switch = accessor(expression.parameters[0])
         flows = [accessor(_) for _ in expression.parameters[1].parameters]
-        patterns = [_.value for _ in expression.parameters[2].parameters]
+        patterns = [accessor(_) for _ in expression.parameters[2].parameters]
         self._default = flows.pop() if len(flows) > len(patterns) else None
         self._cases: list = [(pattern, flow) for pattern, flow in zip(patterns, flows)]
 
@@ -897,12 +898,12 @@ def switch(self) -> Expression:
         return self._switch
 
     @property
-    def cases(self) -> list[tuple[str, Expression]]:
-        """Pairs (``str``, :class:`~Expression`) to build the structure."""
+    def cases(self) -> list[tuple[Expression, Expression]]:
+        """Pairs (:class:`~Expression`, :class:`~Expression`) to build the case."""
         return self._cases
 
     @property
-    def default(self) -> Expression:
+    def default(self) -> Optional[Expression]:
         """Value to use as default when not ``None``."""
         return self._default
 
@@ -1224,7 +1225,7 @@ def size(self) -> Expression:
 
     # TODO CREATE: mapfold with N accumulators...
     @property
-    def accumulator_count(self) -> Expression:
+    def accumulator_count(self) -> Optional[Expression]:
         """Number of accumulators when suitable, otherwise ``None``."""
         return self._accumulator_count
 
@@ -1264,7 +1265,7 @@ def if_(self) -> Expression:
         return self._if
 
     @property
-    def defaults(self) -> list[Expression]:
+    def defaults(self) -> Optional[list[Expression]]:
         """Default values when suitable, otherwise ``None``."""
         return self._defaults
 

tests/resources/ExprAccess/ExprAccess.xscade

@@ -57,6 +57,27 @@
 						<ed:Type oid="!ed/3d0/1885/35A4/643d1bde52bf"/>
 					</pragmas>
 				</Type>
+				<Type name="Enumeration">
+					<definition>
+						<Enum>
+							<values>
+								<Value name="VALUE1">
+									<pragmas>
+										<ed:Value oid="!ed/620/6F59/84B4/665431f83006"/>
+									</pragmas>
+								</Value>
+								<Value name="VALUE2">
+									<pragmas>
+										<ed:Value oid="!ed/627/6F59/84B4/6654320049ea"/>
+									</pragmas>
+								</Value>
+							</values>
+						</Enum>
+					</definition>
+					<pragmas>
+						<ed:Type oid="!ed/61f/6F59/84B4/665431ec6dd9"/>
+					</pragmas>
+				</Type>
 				<Operator kind="node" name="ExprId">
 					<inputs>
 						<Variable name="variable">
@@ -4879,13 +4900,13 @@
 								<ed:Equation oid="!ed/7a2/6922/880C/6439340b7765"/>
 							</pragmas>
 						</Equation>
-						<!-- caseOp = ( case flowSwitch of  | 1 :   flowCase1 | 2 :   flowCase2 | _ :   flowDe... -->
+						<!-- caseOp = ( case flowSwitch of  | 1 :   flowCase1 | VALUE1 :   flowCase2 | _ :   f... -->
 						<Equation>
 							<lefts>
 								<VariableRef name="caseOp"/>
 							</lefts>
 							<right>
-								<!-- ( case flowSwitch of  | 1 :   flowCase1 | 2 :   flowCase2 | _ :   flowDefault) -->
+								<!-- ( case flowSwitch of  | 1 :   flowCase1 | VALUE1 :   flowCase2 | _ :   flowDefaul... -->
 								<CaseOp name="1">
 									<switch>
 										<IdExpression>
@@ -4904,7 +4925,7 @@
 												</IdExpression>
 											</flow>
 										</Case>
-										<Case pattern="2">
+										<Case pattern="VALUE1">
 											<flow>
 												<IdExpression>
 													<path>

tests/test_access.py

@@ -222,8 +222,14 @@ def test_case_op(model):
     assert expression.expression == equation.right
     assert isinstance(expression, expr.CaseOp)
     assert expression.switch.path.name == 'flowSwitch'
-    cases = [(pattern, flow.path.name) for pattern, flow in expression.cases]
-    assert cases == [('1', 'flowCase1'), ('2', 'flowCase2')]
+    cases = [
+        (
+            (pattern.value if isinstance(pattern, expr.ConstValue) else pattern.path.name),
+            flow.path.name,
+        )
+        for pattern, flow in expression.cases
+    ]
+    assert cases == [('1', 'flowCase1'), ('VALUE1', 'flowCase2')]
     assert expression.default.path.name == 'flowDefault'
 
 

tests/test_metadata.py

@@ -24,4 +24,4 @@
 
 
 def test_pkg_version():
-    assert __version__ == "0.4.0"
+    assert __version__ == "0.4.1"