flamapy-fm 2.1.0.dev2__tar.gz → 2.5.0.dev0__tar.gz

{flamapy_fm-2.1.0.dev2 → flamapy_fm-2.5.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flamapy-fm
-Version: 2.1.0.dev2
+Version: 2.5.0.dev0
 Summary: flamapy-fm is a plugin to Flamapy module
 Author-email: Flamapy <flamapy@us.es>
 License-Expression: GPL-3.0-or-later
@@ -8,8 +8,8 @@ Project-URL: Homepage, https://github.com/flamapy/fm_metamodel
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flamapy-fw~=2.1.0.dev2
-Requires-Dist: uvlparser~=2.0.1.dev61
+Requires-Dist: flamapy-fw~=2.5.0.dev0
+Requires-Dist: uvlparser~=2.5.0.dev63
 Requires-Dist: afmparser~=1.0.3
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"

{flamapy_fm-2.1.0.dev2 → flamapy_fm-2.5.0.dev0}/flamapy/metamodels/fm_metamodel/transformations/uvl_reader.py

@@ -352,31 +352,42 @@ class UVLReader(TextToModel):
                             self.process_expression(ctx.expression(1)))
 
     def process_expression(self, ctx: Any) -> Node:
-        """Handle Additive, Multiplicative y Primary Expressions"""
-        # Binary expressions (arithmetics)
-        # 1. Handle Arithmetic Binary Expressions
-        arithmetic_ops = {
-            UVLPythonParser.AddExpressionContext: ASTOperation.ADD,
-            UVLPythonParser.SubExpressionContext: ASTOperation.SUB,
-            UVLPythonParser.MulExpressionContext: ASTOperation.MUL,
-            UVLPythonParser.DivExpressionContext: ASTOperation.DIV,
-        }
-
-        ctx_type = type(ctx)
-        if ctx_type in arithmetic_ops:
-            op = arithmetic_ops[ctx_type]
-            return Node(op, self.process_expression(ctx.expression(0)),
-                            self.process_expression(ctx.expression(1)))
-
-        # 2. Handle single-child expression (grammar fall-through)
-        if hasattr(ctx, 'expression') and callable(ctx.expression):
-            child = ctx.expression()
-            if child is not None:
-                return self.process_expression(child)
-
-        # 3. Delegate leaves to a specialized helper to reduce complexity
+        """Handle Additive, Multiplicative and Primary Expressions"""
+        # Top-level expression rule (expression: additiveExpression)
+        if isinstance(ctx, UVLPythonParser.ExpressionContext):
+            return self.process_expression(ctx.additiveExpression())
+        # Binary arithmetic operations (Add, Sub, Mul, Div)
+        if isinstance(ctx, (UVLPythonParser.AddExpressionContext,
+                            UVLPythonParser.SubExpressionContext,
+                            UVLPythonParser.MulExpressionContext,
+                            UVLPythonParser.DivExpressionContext)):
+            return self._process_binary_expression(ctx)
+        # Pass-through: additiveExpression -> multiplicativeExpression
+        if isinstance(ctx, UVLPythonParser.MultiplicativeExprContext):
+            return self.process_expression(ctx.multiplicativeExpression())
+        # Pass-through: multiplicativeExpression -> primaryExpression
+        if isinstance(ctx, UVLPythonParser.PrimaryExpressionExpressionContext):
+            return self.process_expression(ctx.primaryExpression())
         return self._process_expression_leaves(ctx)
 
+    def _process_binary_expression(self, ctx: Any) -> Node:
+        """Handle binary arithmetic operations: Add, Sub, Mul, Div."""
+        if isinstance(ctx, UVLPythonParser.AddExpressionContext):
+            return Node(ASTOperation.ADD,
+                        self.process_expression(ctx.additiveExpression()),
+                        self.process_expression(ctx.multiplicativeExpression()))
+        if isinstance(ctx, UVLPythonParser.SubExpressionContext):
+            return Node(ASTOperation.SUB,
+                        self.process_expression(ctx.additiveExpression()),
+                        self.process_expression(ctx.multiplicativeExpression()))
+        if isinstance(ctx, UVLPythonParser.MulExpressionContext):
+            return Node(ASTOperation.MUL,
+                        self.process_expression(ctx.multiplicativeExpression()),
+                        self.process_expression(ctx.primaryExpression()))
+        return Node(ASTOperation.DIV,
+                    self.process_expression(ctx.multiplicativeExpression()),
+                    self.process_expression(ctx.primaryExpression()))
+
     def _process_expression_leaves(self, ctx: Any) -> Node:
         """Helper to process literal leaves and primary expressions."""
         if isinstance(ctx, UVLPythonParser.FloatLiteralExpressionContext):

{flamapy_fm-2.1.0.dev2 → flamapy_fm-2.5.0.dev0}/flamapy_fm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flamapy-fm
-Version: 2.1.0.dev2
+Version: 2.5.0.dev0
 Summary: flamapy-fm is a plugin to Flamapy module
 Author-email: Flamapy <flamapy@us.es>
 License-Expression: GPL-3.0-or-later
@@ -8,8 +8,8 @@ Project-URL: Homepage, https://github.com/flamapy/fm_metamodel
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flamapy-fw~=2.1.0.dev2
-Requires-Dist: uvlparser~=2.0.1.dev61
+Requires-Dist: flamapy-fw~=2.5.0.dev0
+Requires-Dist: uvlparser~=2.5.0.dev63
 Requires-Dist: afmparser~=1.0.3
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"

{flamapy_fm-2.1.0.dev2 → flamapy_fm-2.5.0.dev0}/flamapy_fm.egg-info/requires.txt

@@ -1,5 +1,5 @@
-flamapy-fw~=2.1.0.dev2
-uvlparser~=2.0.1.dev61
+flamapy-fw~=2.5.0.dev0
+uvlparser~=2.5.0.dev63
 afmparser~=1.0.3
 
 [dev]

{flamapy_fm-2.1.0.dev2 → flamapy_fm-2.5.0.dev0}/pyproject.toml

@@ -4,15 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flamapy-fm"
-version = "2.1.0.dev2"
+version = "2.5.0.dev0"
 description = "flamapy-fm is a plugin to Flamapy module"
 readme = "README.md"
 license = "GPL-3.0-or-later"
 authors = [{ name = "Flamapy", email = "flamapy@us.es" }]
 requires-python = ">=3.9"
 dependencies = [
-    "flamapy-fw~=2.1.0.dev2",
-    "uvlparser~=2.0.1.dev61",
+    "flamapy-fw~=2.5.0.dev0",
+    "uvlparser~=2.5.0.dev63",
     "afmparser~=1.0.3",
 ]
 
@@ -84,4 +84,4 @@ show_error_codes = true
 ignore_missing_imports = true
 
 # Warn about unreachable or redundant code
-warn_unreachable = true
+warn_unreachable = true