Make invalid identifiers a fatal error

Ref. #892

rflx/cli.py

@@ -347,7 +347,7 @@ def validate(args: argparse.Namespace) -> None:
 
     try:
         identifier = ID(args.message_identifier)
-    except RecordFluxError as e:
+    except FatalError as e:
         fail(f"invalid identifier: {e}", Subsystem.CLI)
 
     try:

rflx/identifier.py

@@ -1,7 +1,7 @@
 import re
 from typing import Optional, Sequence, TypeVar, Union
 
-from rflx.error import Location, RecordFluxError, Severity, Subsystem
+from rflx.error import Location, RecordFluxError, Severity, Subsystem, fatal_fail
 
 Self = TypeVar("Self", bound="ID")
 
@@ -25,23 +25,17 @@ def __init__(
 
         error = RecordFluxError()
         if not self._parts:
-            error.extend([("empty identifier", Subsystem.ID, Severity.ERROR, location)])
+            fatal_fail("empty identifier", Subsystem.ID, Severity.ERROR, location)
         elif "" in self._parts:
-            error.extend(
-                [(f'empty part in identifier "{self}"', Subsystem.ID, Severity.ERROR, location)]
-            )
+            fatal_fail(f'empty part in identifier "{self}"', Subsystem.ID, Severity.ERROR, location)
         else:
             for c in [" ", ".", ":"]:
                 if any(c in part for part in self._parts):
-                    error.extend(
-                        [
-                            (
-                                f'"{c}" in identifier parts of "{self}"',
-                                Subsystem.ID,
-                                Severity.ERROR,
-                                location,
-                            )
-                        ],
+                    fatal_fail(
+                        f'"{c}" in identifier parts of "{self}"',
+                        Subsystem.ID,
+                        Severity.ERROR,
+                        location,
                     )
         error.propagate()
 

rflx/pyrflx/pyrflx.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from typing import Dict, Iterable, Iterator, Union
 
-from rflx.error import RecordFluxError
+from rflx.error import FatalError, RecordFluxError
 from rflx.identifier import ID, StrID
 from rflx.model import Model
 from rflx.pyrflx.typevalue import MessageValue, RefinementValue
@@ -61,7 +61,7 @@ def set_checksum_functions(self, functions: Dict[StrID, Dict[str, ChecksumFuncti
             identifier_str = str(identifier_str)
             try:
                 message_identifier = ID(identifier_str)
-            except RecordFluxError as e:
+            except FatalError as e:
                 raise PyRFLXError(f'"{identifier_str}" is not a valid identifier: {e}') from e
 
             if len(message_identifier.parts) < 2:

tests/unit/expression_test.py

@@ -6,7 +6,7 @@
 import z3
 
 from rflx import ada, typing_ as rty
-from rflx.error import Location, RecordFluxError
+from rflx.error import FatalError, Location, RecordFluxError
 from rflx.expression import (
     FALSE,
     TRUE,
@@ -719,7 +719,7 @@ def test_term_simplified() -> None:
 
 
 def test_variable_invalid_name() -> None:
-    with pytest.raises(RecordFluxError):
+    with pytest.raises(FatalError):
         Variable("Foo (Bar)")
 
 

tests/unit/generator_test.py

@@ -68,7 +68,7 @@ def generate(model: Model) -> Generator:
 
 
 def test_invalid_prefix() -> None:
-    with pytest.raises(RecordFluxError, match=r'^id: error: empty part in identifier "A..B"$'):
+    with pytest.raises(FatalError, match=r'^id: error: empty part in identifier "A..B"$'):
         Generator(Model(), Integration(), "A..B")
 
 

tests/unit/identifier_test.py

@@ -1,6 +1,6 @@
 import pytest
 
-from rflx.error import RecordFluxError
+from rflx.error import FatalError
 from rflx.identifier import ID
 
 
@@ -20,41 +20,37 @@ def test_id_invalid_type() -> None:
 
 
 def test_id_invalid_empty() -> None:
-    with pytest.raises(RecordFluxError, match=r"^id: error: empty identifier$"):
+    with pytest.raises(FatalError, match=r"^id: error: empty identifier$"):
         ID([])
 
 
 def test_id_invalid_empty_string() -> None:
-    with pytest.raises(RecordFluxError, match=r'^id: error: empty part in identifier ""$'):
+    with pytest.raises(FatalError, match=r'^id: error: empty part in identifier ""$'):
         ID("")
 
 
 def test_id_invalid_empty_part() -> None:
-    with pytest.raises(RecordFluxError, match=r'^id: error: empty part in identifier "A::::B"$'):
+    with pytest.raises(FatalError, match=r'^id: error: empty part in identifier "A::::B"$'):
         ID("A::::B")
 
 
 def test_id_invalid_empty_first_part() -> None:
-    with pytest.raises(RecordFluxError, match=r'^id: error: empty part in identifier "::A::B"$'):
+    with pytest.raises(FatalError, match=r'^id: error: empty part in identifier "::A::B"$'):
         ID("::A::B")
 
 
 def test_id_invalid_empty_last_part() -> None:
-    with pytest.raises(RecordFluxError, match=r'^id: error: empty part in identifier "A::B::"$'):
+    with pytest.raises(FatalError, match=r'^id: error: empty part in identifier "A::B::"$'):
         ID("A::B::")
 
 
 def test_id_invalid_whitespace() -> None:
-    with pytest.raises(
-        RecordFluxError, match=r'^id: error: " " in identifier parts of "A::B C::D"$'
-    ):
+    with pytest.raises(FatalError, match=r'^id: error: " " in identifier parts of "A::B C::D"$'):
         ID("A::B C::D")
 
 
 def test_id_invalid_colon() -> None:
-    with pytest.raises(
-        RecordFluxError, match=r'^id: error: ":" in identifier parts of "A::B:C::D"$'
-    ):
+    with pytest.raises(FatalError, match=r'^id: error: ":" in identifier parts of "A::B:C::D"$'):
         ID("A::B:C::D")
 
 
@@ -107,7 +103,7 @@ def test_id_parent() -> None:
 
 
 def test_id_parent_error() -> None:
-    with pytest.raises(RecordFluxError, match=r"^id: error: empty identifier$"):
+    with pytest.raises(FatalError, match=r"^id: error: empty identifier$"):
         ID("A").parent  # pylint: disable=expression-not-assigned