jcl-parser 2.2.1__tar.gz → 2.2.3__tar.gz

{jcl_parser-2.2.1 → jcl_parser-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jcl-parser
-Version: 2.2.1
+Version: 2.2.3
 Summary: Parse IBM JCL (Job Control Language) scripts into Python objects
 Author-email: Samuel Dion <sam94dion@gmail.com>
 License-Expression: AGPL-3.0-or-later

{jcl_parser-2.2.1 → jcl_parser-2.2.3}/jcl_parser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jcl-parser
-Version: 2.2.1
+Version: 2.2.3
 Summary: Parse IBM JCL (Job Control Language) scripts into Python objects
 Author-email: Samuel Dion <sam94dion@gmail.com>
 License-Expression: AGPL-3.0-or-later

{jcl_parser-2.2.1 → jcl_parser-2.2.3}/jclparser/__init__.py

@@ -20,7 +20,7 @@ application, for example::
 import logging as _logging
 
 # Package metadata
-__version__ = "2.2.1"  # x-release-please-version
+__version__ = "2.2.3"  # x-release-please-version
 __author__ = "JCL Parser Team"
 __description__ = "Parse IBM JCL scripts into Python objects"
 

{jcl_parser-2.2.1 → jcl_parser-2.2.3}/jclparser/dataset_lifecycle.py

@@ -63,6 +63,11 @@ class DatasetEvent:
         disp_abnormal: Abnormal termination disposition (same set as normal),
             or ``""`` if omitted.
         line_number: Source line number of the DD statement.
+        concatenation_member: ``0`` for a named DD; for an unnamed
+            concatenation member, its position in the concatenation (the
+            named DD is member 1, so the first unnamed card is member 2).
+            ``dd_name`` is then the name of the DD the concatenation
+            belongs to.
     """
 
     step_name: str
@@ -72,6 +77,14 @@ class DatasetEvent:
     disp_normal: str = ""
     disp_abnormal: str = ""
     line_number: int = 0
+    concatenation_member: int = 0
+
+    @property
+    def dd_label(self) -> str:
+        """The DD as messages name it: ``IN``, or ``IN, concatenation member 2``."""
+        if self.concatenation_member:
+            return f"{self.dd_name}, concatenation member {self.concatenation_member}"
+        return self.dd_name
 
 
 # ---------------------------------------------------------------------------
@@ -206,7 +219,14 @@ def _step_events(
     """Record *step*'s events into *lifecycle*; ``None`` when it has none."""
     step_name = step.name or ""
     step_events: list[_Event] = []
+    # An unnamed DD card continues the concatenation of the named DD before
+    # it, so it is reported under that DD's name (as ``Step.steplib`` does).
+    owner, member = "", 0
     for dd in _dataset_dds(step):
+        if dd.name:
+            owner, member = dd.name, 0
+        elif owner:
+            member = member + 1 if member else 2
         if not dd.dataset_name:
             continue
         # A backward reference names the dataset of the DD it points at;
@@ -222,12 +242,13 @@ def _step_events(
 
         event = DatasetEvent(
             step_name=step.name or "(unnamed)",
-            dd_name=dd.name or "",
+            dd_name=dd.name or owner,
             action=_action_from_disp(status),
             disp_status=status,
             disp_normal=normal,
             disp_abnormal=abnormal,
             line_number=dd.line_number,
+            concatenation_member=0 if dd.name else member,
         )
         events = lifecycle.setdefault(dsn_key, [])
         step_events.append((dsn_key, len(events), event))
@@ -460,7 +481,7 @@ class _LifecycleChecker:
                 dsn,
                 pos,
                 f"Dataset '{dsn}' allocated with DISP=NEW,CATLG in step "
-                f"'{evt.step_name}' (DD {evt.dd_name}) but was already "
+                f"'{evt.step_name}' (DD {evt.dd_label}) but was already "
                 f"cataloged in step '{cataloged_by.step_name}' without "
                 f"an intervening DELETE or UNCATLG",
                 evt,
@@ -492,7 +513,7 @@ class _LifecycleChecker:
                 dsn,
                 pos,
                 f"Dataset '{dsn}' opened in step '{evt.step_name}' "
-                f"(DD {evt.dd_name}) after being uncataloged in step "
+                f"(DD {evt.dd_label}) after being uncataloged in step "
                 f"'{uncataloged_by.step_name}'",
                 evt,
             )
@@ -506,7 +527,7 @@ class _LifecycleChecker:
                 dsn,
                 pos,
                 f"Dataset '{dsn}' opened {disp_label} in step "
-                f"'{evt.step_name}' (DD {evt.dd_name}) before it "
+                f"'{evt.step_name}' (DD {evt.dd_label}) before it "
                 f"is allocated in a later step — verify the dataset "
                 f"exists in the catalog",
                 evt,

{jcl_parser-2.2.1 → jcl_parser-2.2.3}/jclparser/lint/rules.py

@@ -12,7 +12,7 @@ from collections.abc import Iterable
 from typing import TYPE_CHECKING
 
 from ..errors import ErrorSeverity, ValidationError
-from ..model import ConditionalBlock, _dataset_dds, iter_execution_steps
+from ..model import ConditionalBlock, _dataset_dds, dd_label, iter_execution_steps
 from .base import LintRule
 
 if TYPE_CHECKING:
@@ -29,7 +29,8 @@ class HardcodedHLQRule(LintRule):
         defer = config.should_run(LiteralSetValueHlqRule.code)
         set_values = _qualifier_symbols(job)
         for step in iter_execution_steps(job.steps):
-            for dd in _dataset_dds(step):
+            dds = _dataset_dds(step)
+            for dd in dds:
                 dsn = dd.dataset_name
                 if not dsn or dsn.startswith("&&"):
                     continue
@@ -49,7 +50,7 @@ class HardcodedHLQRule(LintRule):
                 if defer and dsn.split(".", 1)[0].upper() in set_values:
                     continue
                 yield self._err(
-                    f"DD '{dd.name}' in step '{step.name}' uses literal HLQ "
+                    f"DD '{dd_label(dds, dd)}' in step '{step.name}' uses literal HLQ "
                     f"in dataset '{dsn}' — consider &HLQ",
                     line_number=dd.line_number,
                     config=config,
@@ -63,7 +64,8 @@ class LiteralSysdaUnitRule(LintRule):
 
     def check(self, job: Job, config: LintConfig) -> Iterable[ValidationError]:
         for step in iter_execution_steps(job.steps):
-            for dd in _dataset_dds(step):
+            dds = _dataset_dds(step)
+            for dd in dds:
                 unit = dd.parameters.get("UNIT")
                 if not unit:
                     continue
@@ -72,7 +74,7 @@ class LiteralSysdaUnitRule(LintRule):
                 unit_val = unit if isinstance(unit, str) else str(unit[0])
                 if unit_val.strip("()").split(",")[0].strip().upper() == "SYSDA":
                     yield self._err(
-                        f"DD '{dd.name}' in step '{step.name}' uses UNIT=SYSDA",
+                        f"DD '{dd_label(dds, dd)}' in step '{step.name}' uses UNIT=SYSDA",
                         line_number=dd.line_number,
                         config=config,
                     )
@@ -97,7 +99,8 @@ class CriticalDatasetDeleteRule(LintRule):
         if not patterns:
             return
         for step in iter_execution_steps(job.steps):
-            for dd in _dataset_dds(step):
+            dds = _dataset_dds(step)
+            for dd in dds:
                 if not dd.dataset_name:
                     continue
                 upper = dd.dataset_name.upper()
@@ -156,7 +159,8 @@ class NewDatasetWithoutRlseRule(LintRule):
 
     def check(self, job: Job, config: LintConfig) -> Iterable[ValidationError]:
         for step in iter_execution_steps(job.steps):
-            for dd in _dataset_dds(step):
+            dds = _dataset_dds(step)
+            for dd in dds:
                 dsn = dd.dataset_name
                 # A temporary dataset is deleted at the end of the job anyway.
                 if not dsn or dsn.startswith("&&"):
@@ -169,7 +173,7 @@ class NewDatasetWithoutRlseRule(LintRule):
                 if space is None or space.rlse:
                     continue
                 yield self._err(
-                    f"DD '{dd.name}' in step '{step.name}' allocates new dataset "
+                    f"DD '{dd_label(dds, dd)}' in step '{step.name}' allocates new dataset "
                     f"'{dsn}' with SPACE but no RLSE",
                     line_number=dd.line_number,
                     config=config,
@@ -259,7 +263,8 @@ class LiteralSetValueHlqRule(LintRule):
         if not symbols:
             return
         for step in iter_execution_steps(job.steps):
-            for dd in _dataset_dds(step):
+            dds = _dataset_dds(step)
+            for dd in dds:
                 dsn = dd.dataset_name
                 # coded_dataset_name is set only when the name used symbols.
                 if not dsn or dd.coded_dataset_name is not None or "&" in dsn:
@@ -270,7 +275,7 @@ class LiteralSetValueHlqRule(LintRule):
                 if symbol is None:
                     continue
                 yield self._err(
-                    f"DD '{dd.name}' in step '{step.name}' codes HLQ "
+                    f"DD '{dd_label(dds, dd)}' in step '{step.name}' codes HLQ "
                     f"'{dsn.split('.', 1)[0]}' in '{dsn}' literally; "
                     f"SET symbol &{symbol} has that value",
                     line_number=dd.line_number,

{jcl_parser-2.2.1 → jcl_parser-2.2.3}/jclparser/model.py

@@ -1082,6 +1082,29 @@ def iter_execution_steps(steps: list[Step | ConditionalBlock]) -> Iterator[Step]
             yield from iter_execution_steps(s.else_steps)
 
 
+def dd_label(dds: list[DDStatement], dd: DDStatement) -> str:
+    """*dd* as messages name it: ``IN``, or ``IN, concatenation member 2``
+    for an unnamed concatenation member coded after ``//IN DD`` in *dds*
+    (the named DD is member 1). The same label ``DatasetEvent.dd_label``
+    gives. An unnamed DD with no named DD before it is ``(unnamed)``.
+    """
+    if dd.name:
+        return dd.name
+    owner, member = "", 0
+    for other in dds:
+        if other.name:
+            owner, member = other.name, 0
+        elif owner:
+            member = member + 1 if member else 2
+        if other is dd:
+            break
+    else:
+        return "(unnamed)"
+    if not owner:
+        return "(unnamed)"
+    return f"{owner}, concatenation member {member}"
+
+
 def _dataset_dds(step: Step) -> list[DDStatement]:
     """The DDs of *step* that can name a dataset, in source order.
 

{jcl_parser-2.2.1 → jcl_parser-2.2.3}/jclparser/validators.py

@@ -15,6 +15,7 @@ from .model import (
     Job,
     Step,
     _dataset_dds,
+    dd_label,
     iter_execution_steps,
 )
 from .parameter_validators import DatasetNameValidator, DISPValidator
@@ -408,7 +409,7 @@ def validate_step_structure(step: Step) -> list[ValidationError]:
 
     # Validate each DD statement
     for dd in step.dd_statements:
-        errors.extend(validate_dd_statement(dd))
+        errors.extend(validate_dd_statement(dd, label=dd_label(step.dd_statements, dd)))
 
     return errors
 
@@ -430,17 +431,25 @@ _TEMP_ALLOCATION_KEYS = (
 )
 
 
-def validate_dd_statement(dd: DDStatement) -> list[ValidationError]:
+def validate_dd_statement(
+    dd: DDStatement, label: str | None = None
+) -> list[ValidationError]:
     """
     Validate DD statement structure and parameters.
 
     Args:
         dd: DDStatement object to validate
+        label: How messages name the DD (default ``dd.name``); the step
+            check passes ``model.dd_label`` so an unnamed concatenation
+            member reads ``IN, concatenation member 2``.
 
     Returns:
         List of validation errors
     """
     errors = []
+    # How messages name the DD: *label* when the caller knows the DD's place
+    # in its step (``IN, concatenation member 2``, see ``model.dd_label``).
+    name = label if label is not None else dd.name
 
     # DD name validation — empty names are valid for DD concatenation statements
     if dd.name and not validate_jcl_identifier(dd.name):
@@ -470,7 +479,7 @@ def validate_dd_statement(dd: DDStatement) -> list[ValidationError]:
     if dd.disposition and not validate_disposition(dd.disposition):
         errors.append(
             ValidationError(
-                f"Invalid DISP parameter '{dd.disposition}' on DD {dd.name}",
+                f"Invalid DISP parameter '{dd.disposition}' on DD {name}",
                 ErrorType.VALIDATION_ERROR,
                 line_number=dd.line_number,
             )
@@ -500,7 +509,7 @@ def validate_dd_statement(dd: DDStatement) -> list[ValidationError]:
     if conflict_count > 1:
         errors.append(
             ValidationError(
-                f"DD {dd.name} has conflicting data source specifications",
+                f"DD {name} has conflicting data source specifications",
                 ErrorType.VALIDATION_ERROR,
                 line_number=dd.line_number,
             )
@@ -508,7 +517,7 @@ def validate_dd_statement(dd: DDStatement) -> list[ValidationError]:
     elif source_count == 0:
         errors.append(
             ValidationError(
-                f"DD {dd.name} must specify a data source (DSN, SYSOUT, DUMMY, or inline data)",
+                f"DD {name} must specify a data source (DSN, SYSOUT, DUMMY, or inline data)",
                 ErrorType.VALIDATION_ERROR,
                 line_number=dd.line_number,
             )

{jcl_parser-2.2.1 → jcl_parser-2.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jcl-parser"
-version = "2.2.1"
+version = "2.2.3"
 description = "Parse IBM JCL (Job Control Language) scripts into Python objects"
 authors = [
     {name = "Samuel Dion", email = "sam94dion@gmail.com"}