csvpath 0.0.481__tar.gz → 0.0.483__tar.gz

{csvpath-0.0.481 → csvpath-0.0.483}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: csvpath
-Version: 0.0.481
+Version: 0.0.483
 Summary: A declarative language for data extraction and validation of CSV files
 Author: David Kershaw
 Author-email: dk107dk@hotmail.com
@@ -48,7 +48,6 @@ And do it all in an automation-friendly way.
 Though much simpler, it is inspired by:
 - XPath. CsvPath is to CSV files like XPath is to XML files.
 - Validation of XML using <a href='https://schematron.com/'>Schematron rules</a>
-- The way CSS selectors pick out HTML structures
 
 CsvPath is intended to fit with other DataOps and data quality tools. Files are streamed. The interface is simple. New functions are easy to create.
 
@@ -81,8 +80,8 @@ Read more about CsvPath and see realistic CSV validation examples at <a href='ht
 - [More Examples](#examples)
 - [Grammar](#grammar)
 
-# Motivation
 <a name="motivation"></a>
+# Motivation
 
 CSV files are everywhere!
 

{csvpath-0.0.481 → csvpath-0.0.483}/README.md

@@ -14,7 +14,6 @@ And do it all in an automation-friendly way.
 Though much simpler, it is inspired by:
 - XPath. CsvPath is to CSV files like XPath is to XML files.
 - Validation of XML using <a href='https://schematron.com/'>Schematron rules</a>
-- The way CSS selectors pick out HTML structures
 
 CsvPath is intended to fit with other DataOps and data quality tools. Files are streamed. The interface is simple. New functions are easy to create.
 
@@ -47,8 +46,8 @@ Read more about CsvPath and see realistic CSV validation examples at <a href='ht
 - [More Examples](#examples)
 - [Grammar](#grammar)
 
-# Motivation
 <a name="motivation"></a>
+# Motivation
 
 CSV files are everywhere!
 

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/csvpath.py

@@ -14,7 +14,7 @@ from csvpath.util.log_utility import LogUtility
 from .matching.matcher import Matcher
 from .scanning.scanner import Scanner
 from .util.metadata_parser import MetadataParser
-from .util.error import Error, ErrorCollector
+from .util.error import Error, ErrorCollector, ErrorCommsManager
 from .util.printer import StdOutPrinter
 from .util.line_counter import LineCounter
 from .util.exceptions import VariableException, InputException, ParsingException
@@ -262,6 +262,10 @@ class CsvPath(CsvPathPublic, ErrorCollector, Printer):  # pylint: disable=R0902,
         #
         self.logger = LogUtility.logger(self)
         self.logger.info("initialized CsvPath")
+        self._ecoms = ErrorCommsManager(csvpath=self)
+
+    def do_i_raise(self) -> bool:
+        return self._ecoms.do_i_raise()
 
     @property
     def advance_count(self) -> int:  # pragma: no cover
@@ -569,7 +573,7 @@ class CsvPath(CsvPathPublic, ErrorCollector, Printer):  # pylint: disable=R0902,
         #
         # settings:
         #   - logic-mode: AND | OR
-        #   - match-mode: matches | no-matches
+        #   - return-mode: matches | no-matches
         #   - print-mode: default | no-default
         #   - validation-mode: (no-)print | log | (no-)raise | quiet | (no-)match
         #
@@ -606,15 +610,15 @@ class CsvPath(CsvPathPublic, ErrorCollector, Printer):  # pylint: disable=R0902,
                 )
 
     def update_match_mode_if(self) -> None:
-        if "match-mode" in self.metadata:
-            if f"{self.metadata['match-mode']}".strip() == "matches":
+        if "return-mode" in self.metadata:
+            if f"{self.metadata['return-mode']}".strip() == "matches":
                 self.collect_when_not_matched = False
-            elif f"{self.metadata['match-mode']}".strip() == "no-matches":
+            elif f"{self.metadata['return-mode']}".strip() == "no-matches":
                 self.collect_when_not_matched = True
             else:
                 self.logger.warning(
-                    "Incorrect metadata field value 'match-mode': %s",
-                    self.metadata["match-mode"],
+                    "Incorrect metadata field value 'return-mode': %s",
+                    self.metadata["return-mode"],
                 )
 
     def update_print_mode_if(self) -> None:

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/managers/results_manager.py

@@ -89,7 +89,6 @@ class ResultsManager(CsvPathsResultsManager):  # pylint: disable=C0115
     def __init__(self, *, csvpaths=None):
         self.named_results = {}
         self._csvpaths = None
-        self._variables = None
 
         # use property
         self.csvpaths = csvpaths
@@ -137,13 +136,11 @@ class ResultsManager(CsvPathsResultsManager):  # pylint: disable=C0115
         return True
 
     def get_variables(self, name: str) -> bool:
-        if self._variables is None:
-            results = self.get_named_results(name)
-            vs = {}
-            for r in results:
-                vs = {**r.csvpath.variables, **vs}
-            self._variables = vs
-        return self._variables
+        results = self.get_named_results(name)
+        vs = {}
+        for r in results:
+            vs = {**r.csvpath.variables, **vs}
+        return vs
 
     def has_lines(self, name: str) -> bool:
         results = self.get_named_results(name)

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/args.py

@@ -16,9 +16,12 @@ from csvpath.util.config_exception import ConfigurationException
 
 
 class Arg:
-    def __init__(self, *, types: list[Type] = None, actuals: list[Type] = None):
+    def __init__(
+        self, *, name: str = None, types: list[Type] = None, actuals: list[Type] = None
+    ):
         self.is_noneable = False
         self._types = None
+        self._name = name
         self._x_actuals = None
         self.types: list[Type] = types or [None]
         self.actuals: list[Type] = actuals or []
@@ -100,8 +103,10 @@ class ArgSet:
     # setup time
     # ----------------------------
 
-    def arg(self, *, types: list[Type] = None, actuals: list[Type] = None) -> Arg:
-        arg = Arg(types=types, actuals=actuals)
+    def arg(
+        self, *, name: str = None, types: list[Type] = None, actuals: list[Type] = None
+    ) -> Arg:
+        arg = Arg(name=name, types=types, actuals=actuals)
         self._args.append(arg)
         if len(self._args) > self.max_length and self.max_length != -1:
             self.max_length = len(self._args)
@@ -194,16 +199,17 @@ class ArgSet:
             self._args = args
             self.max_length = len(self._args)
 
-    def validate_structure(self, siblings: List[Matchable]) -> None:
+    def validate_structure(self, siblings: List[Matchable]) -> None | str:
         b = self._validate_length(siblings)
         if b is False:
-            return False
+            return "incorrect number of args"
         self._pad_or_shrink(siblings)
         for i, s in enumerate(siblings):
             t = tuple(self._args[i].types)
             if not isinstance(s, t):
-                return False
-        return True
+                ii = i + 1
+                return f"type mismatch at arg {ii}"
+        return None
 
     # ----------------------------
     # match actuals line-by-line
@@ -390,11 +396,12 @@ class Args:
         #
         good = False
         for aset in self._argsets:
-            if aset.validate_structure(siblings):
+            _m = aset.validate_structure(siblings)
+            if _m is None:
                 good = True
         if not good:
             _ = f" at {self.matchable.my_chain}" if self.matchable else ""
-            msg = f"{self._csvpath_id()} Incorrectly written{_}. Wrong type or number of args."
+            msg = f"{self._csvpath_id()} Incorrectly written{_}. Wrong type or number of args: {_m}."
             raise ChildrenException(msg)
         self.validated = True
 

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/boolean/all.py

@@ -19,7 +19,9 @@ class All(MatchDecider):
         self.args = Args(matchable=self)
         self.args.argset(0)
         self.args.argset(1).arg(types=[None, Variables, Headers], actuals=[])
-        self.args.argset().arg(types=[None, Function, Variable, Header], actuals=[])
+        self.args.argset().arg(
+            types=[None, Function, Variable, Header], actuals=[None, Any]
+        )
         self.args.validate(self.siblings())
         super().check_valid()
 

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/boolean/andf.py

@@ -2,7 +2,7 @@
 
 from typing import Any
 from ..function_focus import MatchDecider
-from csvpath.matching.productions import Term, Variable, Header, Reference, Equality
+from csvpath.matching.productions import Matchable
 from ..function import Function
 from ..args import Args
 
@@ -15,12 +15,8 @@ class And(MatchDecider):
     def check_valid(self) -> None:  # pragma: no cover
         self.args = Args(matchable=self)
         a = self.args.argset()
-        a.arg(
-            types=[Term, Variable, Header, Function, Reference, Equality], actuals=[Any]
-        )
-        a.arg(
-            types=[Term, Variable, Header, Function, Reference, Equality], actuals=[Any]
-        )
+        a.arg(types=[Matchable], actuals=[None, Any])
+        a.arg(types=[Matchable], actuals=[None, Any])
         self.args.validate(self.siblings_or_equality())
         super().check_valid()
 

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/boolean/any.py

@@ -24,11 +24,11 @@ class Any(MatchDecider):
         a = self.args.argset(0)
 
         a = self.args.argset(2)
-        a.arg(types=[Variables, Headers], actuals=[Any])
-        a.arg(types=[typing.Any], actuals=[typing.Any])
+        a.arg(types=[Variables, Headers], actuals=[None, typing.Any])
+        a.arg(types=[typing.Any], actuals=[None, typing.Any])
 
         a = self.args.argset(1)
-        a.arg(types=[typing.Any, Variables, Headers], actuals=[typing.Any])
+        a.arg(types=[typing.Any, Variables, Headers], actuals=[None, typing.Any])
 
         self.args.validate(self.siblings())
         super().check_valid()

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/boolean/empty.py

@@ -33,7 +33,7 @@ class Empty(MatchDecider):
     def _validate(self):
         sibs = self.siblings()
         for s in sibs:
-            # both definitely structure / children exceptions
+            # both structure / children exceptions
             if isinstance(s, Headers) and len(sibs) > 1:
                 raise ChildrenException(
                     "If empty() has a headers() argument it can only have 1 argument"
@@ -73,12 +73,7 @@ class Empty(MatchDecider):
         self.match = ret
 
     def _do_many(self, skip=None):
-        siblings = None
-        if isinstance(self.children[0], Equality):
-            siblings = self.children[0].commas_to_list()
-        else:
-            siblings = self.children[0]
-
+        siblings = self.siblings()
         for s in siblings:
             self._do_one(s)
             if self.match is False:
@@ -87,22 +82,3 @@ class Empty(MatchDecider):
     def _do_one(self, child, skip=None):
         v = child.to_value(skip=skip)
         self.match = ExpressionUtility.is_empty(v)
-
-    """
-    def _is_empty(self, v):
-        ret = True
-        if v is None:
-            ret = True
-        elif f"{v}".strip() == "":
-            ret = True
-        elif isinstance(v, list) or isinstance(v, tuple):
-            for item in v:
-                ret = self._is_empty(item)
-                if not ret:
-                    break
-        elif isinstance(v, dict):
-            ret = len(v) > 0
-        else:
-            ret = False
-        return ret
-    """

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/boolean/inf.py

@@ -13,8 +13,8 @@ class In(MatchDecider):
     def check_valid(self) -> None:
         self.args = Args(matchable=self)
         a = self.args.argset()
-        a.arg(types=[Term, Variable, Header, Function, Reference], actuals=[Any])
-        a.arg(types=[Term, Variable, Header, Function, Reference], actuals=[Any])
+        a.arg(types=[Term, Variable, Header, Function, Reference], actuals=[None, Any])
+        a.arg(types=[Term, Variable, Header, Function, Reference], actuals=[None, Any])
         self.args.validate(self.siblings())
         super().check_valid()
 

csvpath-0.0.483/csvpath/matching/functions/boolean/orf.py

@@ -0,0 +1,57 @@
+# pylint: disable=C0114
+from typing import Any
+from ..function_focus import MatchDecider
+from csvpath.matching.productions import (
+    Term,
+    Variable,
+    Header,
+    Reference,
+    Equality,
+    Matchable,
+)
+from ..function import Function
+from ..args import Args
+
+
+class Or(MatchDecider):
+    """does a logical OR of match components"""
+
+    def __init__(self, matcher: Any, name: str, child: Matchable = None) -> None:
+        super().__init__(matcher, name=name, child=child)
+        self.hold = []
+
+    def reset(self) -> None:
+        self.hold = []
+        super().reset()
+
+    def check_valid(self) -> None:
+        self.args = Args(matchable=self)
+        a = self.args.argset()
+        a.arg(types=[Matchable], actuals=[None, Any])
+        a.arg(types=[Matchable], actuals=[None, Any])
+        self.args.validate(self.siblings_or_equality())
+        super().check_valid()
+
+    def raise_if(self, e, *, cause=None) -> None:
+        # not bubbling up until we know we don't have a
+        # match on all options
+        self.hold.append((e, cause))
+
+    def _produce_value(self, skip=None) -> None:
+        self.value = self.matches(skip=skip)
+
+    def _decide_match(self, skip=None) -> None:
+        child = self.children[0]
+        siblings = child.commas_to_list()
+        for sib in siblings:
+            b = sib.matches(skip=skip)
+            if b:
+                self.match = True
+                # if we find a True we succeed and dump any errors
+                self.hold = []
+                return
+        self.match = False
+        # if we fail we progress any errors up the stack
+        for err in self.hold:
+            super().raise_if(err[0], cause=err[1])
+        self.hold = []

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/counting/count.py

@@ -3,7 +3,7 @@ from typing import Any
 from ..function_focus import ValueProducer
 from ..function import Function
 from ..args import Args
-from csvpath.matching.productions import Equality, Variable, Header, Term
+from csvpath.matching.productions import Matchable
 
 
 class Count(ValueProducer):
@@ -16,10 +16,7 @@ class Count(ValueProducer):
         self.args = Args(matchable=self)
         a = self.args.argset(0)
         a = self.args.argset()
-        a.arg(
-            types=[None, Variable, Function, Header, Term, Equality],
-            actuals=[None, Any],
-        )
+        a.arg(types=[None, Matchable], actuals=[None, Any])
         self.args.validate(self.siblings())
         #
         super().check_valid()  # pylint: disable=W0246

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/counting/counter.py

@@ -16,6 +16,11 @@ class Counter(ValueProducer):
         self.args = Args(matchable=self)
         self.args.argset(1).arg(types=[None, Any], actuals=[int])
         self.args.validate(self.siblings())
+        name = self.first_non_term_qualifier(self.get_id())
+        # initializing the counter to 0. if we don't do this and the counter is
+        # never hit (e.g. it is behind a ->) a print returns the counter's name
+        # which is confusing.
+        self.matcher.get_variable(name, set_if_none=0)
         super().check_valid()  # pylint: disable=W0246
 
     def _produce_value(self, skip=None) -> None:

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/counting/every.py

@@ -3,7 +3,7 @@ from typing import Any
 from csvpath.matching.util.exceptions import ChildrenException
 from csvpath.matching.util.expression_utility import ExpressionUtility
 from ..function_focus import ValueProducer
-from csvpath.matching.productions import Term, Header, Variable, Equality
+from csvpath.matching.productions import Term, Matchable
 from ..function import Function
 from ..args import Args
 
@@ -19,7 +19,7 @@ class Every(ValueProducer):
     def check_valid(self) -> None:
         self.args = Args(matchable=self)
         a = self.args.argset(2)
-        a.arg(types=[Term, Variable, Header, Function, Equality], actuals=[Any])
+        a.arg(types=[Matchable], actuals=[None, Any])
         a.arg(types=[Term], actuals=[int])
         self.args.validate(self.siblings())
         super().check_valid()

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/counting/increment.py

@@ -2,18 +2,18 @@
 from typing import Any
 from csvpath.matching.util.exceptions import DataException
 from ..function_focus import ValueProducer
-from csvpath.matching.productions import Term, Header, Variable, Equality
+from csvpath.matching.productions import Term, Matchable
 from ..function import Function
 from ..args import Args
 
 
 class Increment(ValueProducer):
-    """increments a var every n-times a each different value is seen"""
+    """increments a var every n-times each different value is seen"""
 
     def check_valid(self) -> None:
         self.args = Args(matchable=self)
         a = self.args.argset(2)
-        a.arg(types=[Term, Variable, Header, Function, Equality], actuals=[str])
+        a.arg(types=[Matchable], actuals=[Any])
         a.arg(types=[Term], actuals=[int])
         self.args.validate(self.siblings())
         super().check_valid()

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/counting/tally.py

@@ -18,14 +18,8 @@ class Tally(ValueProducer):
         super().check_valid()
 
     def _produce_value(self, skip=None) -> None:
-        child = self.children[0]
-        siblings = None
-        if isinstance(child, Equality):
-            siblings = child.commas_to_list()
-        else:
-            siblings = [child]
+        siblings = self.siblings()
         tally = ""
-
         for _ in siblings:
             tally += f"{_.to_value(skip=skip)}|"
             value = f"{_.to_value(skip=skip)}"

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/dates/now.py

@@ -1,9 +1,7 @@
 # pylint: disable=C0114
 import datetime
 from ..function_focus import ValueProducer
-from csvpath.matching.productions.term import Term
-from csvpath.matching.productions.variable import Variable
-from csvpath.matching.productions.header import Header
+from csvpath.matching.productions import Term, Variable, Header
 from csvpath.matching.functions.function import Function
 from csvpath.matching.util.exceptions import ChildrenException
 from ..args import Args
@@ -19,7 +17,7 @@ class Now(ValueProducer):
             self.args.validate(self.siblings())
         else:
             self.args.argset(1).arg(
-                types=[None, Term, Function, Header, Variable], actuals=[str]
+                types=[None, Term, Function, Header, Variable], actuals=[None, str]
             )
             self.args.validate(self.siblings())
         super().check_valid()

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/function.py

@@ -138,7 +138,7 @@ class Function(Matchable):
                         if Matchable.FAILED_VALUE in sibs:
                             pln = self.matcher.csvpath.line_monitor.physical_line_number
                             raise ChildrenException(
-                                f"Cannot continue with {self.my_chain} on line {pln} due to an invalid child"
+                                f"Line {pln}: Cannot continue with {self.my_chain} due to an invalid child"
                             )
                         #
                         # ready to run the match!
@@ -162,12 +162,14 @@ class Function(Matchable):
                     ):
                         self.matcher.csvpath.stop()
                     if (
-                        self.args.args_match is False
+                        self.args
+                        and self.args.args_match is False
                         and self.matcher.csvpath.fail_on_validation_errors
                     ):
                         self.matcher.csvpath.is_valid = False
                     if (
-                        self.args.args_match is False
+                        self.args
+                        and self.args.args_match is False
                         and self.matcher.csvpath._match_validation_errors is not None
                     ):
                         self.match = self.matcher.csvpath._match_validation_errors

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/function_factory.py

@@ -3,11 +3,9 @@ from csvpath.matching.productions.expression import Matchable
 from .function import Function
 from .function_finder import FunctionFinder
 from .dates.now import Now
-from .dates.datef import Date
 from .strings.lower import Lower
 from .strings.upper import Upper
 from .strings.substring import Substring
-from .strings.string import String
 from .strings.starts_with import StartsWith
 from .strings.strip import Strip
 from .strings.length import Length, MinMaxLength
@@ -35,11 +33,11 @@ from .headers.empty_stack import EmptyStack
 from .headers.mismatch import Mismatch
 from .headers.end import End
 from .math.above import AboveBelow
-from .math.intf import Int, Num, Float
 from .math.add import Add
 from .math.subtract import Subtract
 from .math.multiply import Multiply
 from .math.divide import Divide
+from .math.intf import Int, Float  # , Num
 from .math.sum import Sum
 from .math.subtotal import Subtotal
 from .math.equals import Equals
@@ -47,7 +45,6 @@ from .math.round import Round
 from .math.mod import Mod
 from .boolean.notf import Not
 from .boolean.inf import In
-from .boolean.boolean import Boolean
 from .boolean.orf import Or
 from .boolean.empty import Empty
 from .boolean.no import No
@@ -61,8 +58,6 @@ from .stats.percent import Percent
 from .stats.minf import Min, Max, Average
 from .stats.percent_unique import PercentUnique
 from .stats.stdev import Stdev
-
-# from .stats.correlate import Correlate
 from .print.printf import Print
 from .print.table import HeaderTable, RowTable, VarTable, RunTable
 from .print.print_line import PrintLine
@@ -81,12 +76,16 @@ from .variables.get import Get
 from .variables.put import Put
 from .variables.track import Track
 from .misc.random import Random, Shuffle
-from .misc.nonef import Nonef, Blank
 from .misc.importf import Import
 from .testing.debug import Debug, BriefStackTrace, VoteStack, DoWhenStack, Log
 from .validity.line import Line
 from .validity.failed import Failed
 from .validity.fail import Fail, FailAll
+from .types.nonef import Nonef, Blank
+from .types.decimal import Decimal
+from .types.boolean import Boolean
+from .types.datef import Date
+from .types.string import String
 
 
 class UnknownFunctionException(Exception):
@@ -218,6 +217,8 @@ class FunctionFactory:
             f = Random(matcher, name, child)
         elif name == "shuffle":
             f = Shuffle(matcher, name, child)
+        elif name in ["decimal", "integer"]:
+            f = Decimal(matcher, name, child)
         elif name == "end":
             f = End(matcher, name, child)
         elif name == "length":
@@ -260,7 +261,7 @@ class FunctionFactory:
             f = Any(matcher, name, child)
         elif name == "none":
             f = Nonef(matcher, name, child)
-        elif name in ["blank", "unspecific"]:
+        elif name in ["blank", "nonspecific"]:
             f = Blank(matcher, name, child)
         elif name == "line":
             f = Line(matcher, name, child)
@@ -390,8 +391,8 @@ class FunctionFactory:
             f = RunTable(matcher, name, child)
         elif name == "empty_stack":
             f = EmptyStack(matcher, name, child)
-        elif name == "num":
-            f = Num(matcher, name, child)
+        # elif name == "num":
+        # f = Num(matcher, name, child)
         elif name == "counter":
             f = Counter(matcher, name, child)
         else:

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/headers/collect.py

@@ -12,7 +12,7 @@ class Collect(SideEffect):
     def check_valid(self) -> None:
         self.args = Args(matchable=self)
         a = self.args.argset()
-        a.arg(types=[Term], actuals=[Any])
+        a.arg(types=[Term], actuals=[int, str])
         self.args.validate(self.siblings())
         super().check_valid()
 

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/headers/end.py

@@ -24,11 +24,7 @@ class End(ValueProducer):
         else:
             if len(self.children) > 0:
                 v = self.children[0].to_value()
-                if isinstance(v, int) or v.isdigit():
-                    i = i - int(v)
-                else:
-                    # this is an Args-style / data exception
-                    raise DataException("end()'s term must be a positive int")
+                i = i - abs(int(v))
             if 0 <= i < len(self.matcher.line):
                 self.value = self.matcher.line[i]
 

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/headers/reset_headers.py

@@ -1,6 +1,7 @@
 # pylint: disable=C0114
 from ..function_focus import SideEffect
 from csvpath.matching.functions.function import Function
+from csvpath.util.line_counter import LineCounter
 from ..args import Args
 
 
@@ -9,7 +10,7 @@ class ResetHeaders(SideEffect):
 
     def check_valid(self) -> None:
         self.args = Args(matchable=self)
-        self.args.argset(1).arg(types=[None, Function], actuals=[None])
+        self.args.argset(1).arg(types=[None, Function], actuals=[])
         self.args.validate(self.siblings())
         super().check_valid()
 
@@ -17,7 +18,8 @@ class ResetHeaders(SideEffect):
         self._apply_default_value()
 
     def _decide_match(self, skip=None) -> None:
-        self.matcher.csvpath.headers = self.matcher.line[:]
+        hs = LineCounter.clean_headers(self.matcher.line[:])
+        self.matcher.csvpath.headers = hs
         self.matcher.header_dict = None
         for key in self.matcher.csvpath.variables.keys():
             #

{csvpath-0.0.481 → csvpath-0.0.483}/csvpath/matching/functions/lines/advance.py

@@ -1,7 +1,8 @@
 # pylint: disable=C0114
 from csvpath.matching.util.exceptions import ChildrenException
 from ..function_focus import SideEffect
-from csvpath.matching.productions.term import Term
+from csvpath.matching.productions import Term, Variable
+from csvpath.matching.functions.function import Function
 from ..args import Args
 
 
@@ -11,7 +12,7 @@ class Advance(SideEffect):
     def check_valid(self) -> None:
         self.args = Args(matchable=self)
         a = self.args.argset(1)
-        a.arg(types=[Term], actuals=[int])
+        a.arg(types=[Term, Variable, Function], actuals=[int])
         self.args.validate(self.siblings())
         super().check_valid()