csvpath 0.0.461__tar.gz → 0.0.462__tar.gz

{csvpath-0.0.461 → csvpath-0.0.462}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: csvpath
-Version: 0.0.461
+Version: 0.0.462
 Summary: A declarative language for data extraction and validation of CSV files
 Author: David Kershaw
 Author-email: dk107dk@hotmail.com

{csvpath-0.0.461 → csvpath-0.0.462}/csvpath/matching/functions/lines/last.py

@@ -30,20 +30,17 @@ class Last(MatchDecider):
             )
         )
         if last or last_scan:
-            if not self.onmatch or self.line_matches():
-                self.match = True
-                if self.match:
-                    if len(self.children) == 1:
-                        self.matcher.csvpath.logger.debug(
-                            "Overriding frozen in last(): %s", self
-                        )
-                        self.matcher.csvpath.is_frozen = False
-                        self.children[0].matches(skip=[self])
-                        self.matcher.csvpath.is_frozen = True
-                        self.matcher.csvpath.logger.debug(
-                            "Resetting frozen after last(): %s", self
-                        )
-            else:
-                self.match = False
+            self.match = True
         else:
             self.match = False
+        if self.match:
+            if len(self.children) == 1:
+                self.matcher.csvpath.logger.debug(
+                    "Overriding frozen in last(): %s", self
+                )
+                self.matcher.csvpath.is_frozen = False
+                self.children[0].matches(skip=[self])
+                self.matcher.csvpath.is_frozen = True
+                self.matcher.csvpath.logger.debug(
+                    "Resetting frozen after last(): %s", self
+                )

{csvpath-0.0.461 → csvpath-0.0.462}/csvpath/matching/productions/equality.py

@@ -27,11 +27,16 @@ class Equality(Matchable):
         # and the right-hand side was executed. This is so that a VoteStack-like
         # component could provide debugging access.
         self.DO_WHEN = None
+        self.sentinel = False
 
     def reset(self) -> None:
         self.value = None
         self.match = None
         self.DO_WHEN = False
+        #
+        # sentinel makes sure that the right-hand side is only executed 1x
+        #
+        self.sentinel = False
         super().reset()
 
     @property
@@ -48,6 +53,7 @@ class Equality(Matchable):
         while len(self.children) < 2:
             self.children.append(None)
         self.children[0] = o
+        o.parent = self
 
     @property
     def right(self):  # pylint: disable=C0116
@@ -63,6 +69,7 @@ class Equality(Matchable):
         while len(self.children) < 2:
             self.children.append(None)
         self.children[1] = o
+        o.parent = self
 
     def other_child(self, o):  # pylint: disable=C0116
         if self.left == o:
@@ -363,7 +370,22 @@ class Equality(Matchable):
     def _do_when(self, *, skip=None) -> bool:
         b = None
         if self.op == "->":
+            #
+            # when we use the skip list to prevent loops we are
+            # returning the default_match -- the affirmative --
+            # resulting in the right-hand side being considered
+            # early, before the left-hand side is ready. the
+            # sentinel makes sure we don't descend the right-hand
+            # side.
+            #
+            if self.sentinel:
+                return self.default_match()
+            else:
+                self.sentinel = True
+
             lm = self.left.matches(skip=skip)
+            pln = self.matcher.csvpath.line_monitor.physical_line_number
+
             if lm is True:
                 b = True
                 if self.matcher._AND is False and self._left_nocontrib(self.left):

{csvpath-0.0.461 → csvpath-0.0.462}/csvpath/matching/productions/expression.py

@@ -2,6 +2,7 @@
 import traceback
 import warnings
 from csvpath.util.error import ErrorHandler
+from csvpath.matching.util.expression_utility import ExpressionUtility
 from . import Matchable
 
 
@@ -25,7 +26,7 @@ class Expression(Matchable):
 
     def matches(self, *, skip=None) -> bool:
         if skip and self in skip:
-            return True
+            return True  # should be default_match
         if self.match is None:
             try:
                 ret = True

{csvpath-0.0.461 → csvpath-0.0.462}/csvpath/matching/productions/qualified.py

@@ -259,7 +259,15 @@ class Qualified:
         by adding self to the skip list."""
         es = self.matcher.expressions  # pylint: disable=E1101
         for e in es:
-
+            #
+            # this fix for 1 test (test_function_last1) is blowing 11 other tests!
+            #
+            # me = ExpressionUtility.get_my_expression(self)
+            # print(f"my expression: me: {me}")
+            # if e[0] == me: # added experiment
+            # print(f"found my expression!")
+            #    continue
+            # print(f"not my expression: {e[0]}")
             m = e[1] is self.default_match() or e[0].matches(
                 skip=[self]
             )  # pylint: disable=E1101
@@ -287,7 +295,7 @@ class Qualified:
         _id = f"{self.get_id()}_onchange"  # pylint: disable=E1101
         v = self.matcher.get_variable(_id)  # pylint: disable=E1101
         me = hashlib.sha256(
-            f"{self.to_value()}".encode("utf-8")  # pylint: disable=E1101
+            f"{self.to_value(skip=[self])}".encode("utf-8")  # pylint: disable=E1101
         ).hexdigest()
         self.matcher.set_variable(_id, value=me)  # pylint: disable=E1101
         # this might be better as an is True/is False test

{csvpath-0.0.461 → csvpath-0.0.462}/csvpath/matching/util/expression_utility.py

@@ -200,3 +200,10 @@ class ExpressionUtility:
             if p:
                 ret = p
         return ret
+
+    @classmethod
+    def any_of_my_descendants(cls, expression, skips) -> bool:
+        for c in skips:
+            if cls.get_my_expression(c) == expression:
+                return True
+        return False

{csvpath-0.0.461 → csvpath-0.0.462}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "csvpath"
-version = "0.0.461"
+version = "0.0.462"
 description = "A declarative language for data extraction and validation of CSV files"
 authors = ["David Kershaw <dk107dk@hotmail.com>"]
 readme = "README.md"