dbrownell-parserlib 0.8.0__tar.gz → 0.8.1__tar.gz

{dbrownell_parserlib-0.8.0 → dbrownell_parserlib-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dbrownell-parserlib
-Version: 0.8.0
+Version: 0.8.1
 Summary: Functionality useful when creating parsers.
 Author: Dave Brownell
 Author-email: Dave Brownell <github@DavidBrownell.com>

{dbrownell_parserlib-0.8.0 → dbrownell_parserlib-0.8.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dbrownell-parserlib"
-version = "0.8.0"
+version = "0.8.1"
 #          ^^^^^
 # Wheel names will be generated according to this value. Do not manually modify this value; instead
 # update it according to committed changes by running this command from the root of the repository:

{dbrownell_parserlib-0.8.0 → dbrownell_parserlib-0.8.1}/src/dbrownell_ParserLib/antlr/antlr_parser.py

@@ -479,6 +479,11 @@ class _ErrorListener(antlr4.DiagnosticErrorListener):
         msg: str,
         e: antlr4.RecognitionException | None,
     ) -> None:
+        if msg.startswith("report"):
+            # I don't think that these should be errors
+            assert e is None, e
+            return
+
         location = Location(line, column + 1)
         error = Error(msg, Region(self._source, location, location))
         ex = AntlrParserException(error)

{dbrownell_parserlib-0.8.0 → dbrownell_parserlib-0.8.1}/src/dbrownell_ParserLib/antlr/antlr_visitor_mixins.py

@@ -73,21 +73,48 @@ class InsignificantWhitespaceAntlrVisitorMixin(AntlrVisitorMixinBase):
     @override
     def CreateRegion(
         self,
-        ctx: antlr4.ParserRuleContext,
+        ctx: antlr4.ParserRuleContext | antlr4.TerminalNode,
     ) -> Region:
         """Create a `Region` from the given context."""
 
-        start_token = ctx.start
-        stop_token = ctx.stop
+        if isinstance(ctx, antlr4.ParserRuleContext):
+            start_token = ctx.start
+            stop_token = ctx.stop
+
+            if start_token is None or stop_token is None:
+                msg = "Context does not have start or stop token"
+                raise ValueError(msg)
+
+            start_line = start_token.line
+            start_col = start_token.column + 1
+            end_line = stop_token.line
+            end_col = stop_token.column + 1
+
+            if start_line == end_line:
+                end_col += len(stop_token.text)
+            else:
+                end_col += 1
+
+        elif isinstance(ctx, antlr4.TerminalNode):
+            token = cast(antlr4.Token, ctx.symbol)  # ty: ignore[unresolved-attribute]
+
+            assert token.column is not None
+
+            start_line = token.line
+            start_col = token.column + 1
+            end_line = token.line
+            end_col = token.column + 1 + len(token.text)
+
+        else:
+            assert False, ctx  # noqa: B011, PT015  # pragma: no cover
 
-        if start_token is None or stop_token is None:
-            msg = "Context does not have start or stop token"
-            raise ValueError(msg)
+        assert start_line is not None
+        assert end_line is not None
 
         return Region(
             self.filename,
-            Location(start_token.line, start_token.column),
-            Location(stop_token.line, stop_token.column + len(stop_token.text)),
+            Location(start_line, start_col),
+            Location(end_line, end_col),
         )
 
 

{dbrownell_parserlib-0.8.0 → dbrownell_parserlib-0.8.1}/src/dbrownell_ParserLib/expression.py

@@ -202,7 +202,7 @@ class Expression:
     # |  Protected Types
     # |
     # ----------------------------------------------------------------------
-    _GenerateAcceptDetailsResultType = Generator[tuple[str, list[Self]]]
+    _GenerateAcceptDetailsResultType = Generator[tuple[str, Self]]
     _GetAcceptChildrenResultType = tuple[str, Iterable[Self]] | None
 
     # ----------------------------------------------------------------------