Move the antlr runtime outside of the parser directory, to avoid circ…

…ular dependencies
SciTools · Sep 29, 2024 · 47e3278 · 47e3278
1 parent 47f4c6b
commit 47e3278
Show file tree

Hide file tree

Showing 67 changed files with 273 additions and 370 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 .git_archival.txt  export-subst
 cf_units/_udunits2_parser/parser/**/*.py linguist-generated=true
+cf_units/_udunits2_parser/_antlr4_runtime/**/*.py linguist-generated=true
diff --git a/cf_units/_udunits2_parser/__init__.py b/cf_units/_udunits2_parser/__init__.py
@@ -5,15 +5,14 @@
 
 import unicodedata
 
-from cf_units._udunits2_parser.parser._antlr4_runtime import (
+from . import graph
+from ._antlr4_runtime import (
     CommonTokenStream,
     InputStream,
 )
-from cf_units._udunits2_parser.parser._antlr4_runtime.error import (
+from ._antlr4_runtime.error import (
     ErrorListener,
 )
-
-from . import graph
 from .parser.udunits2Lexer import udunits2Lexer
 from .parser.udunits2Parser import udunits2Parser
 from .parser.udunits2ParserVisitor import udunits2ParserVisitor

diff --git a/...er/_antlr4_runtime/BufferedTokenStream.py → ...er/_antlr4_runtime/BufferedTokenStream.py b/...er/_antlr4_runtime/BufferedTokenStream.py → ...er/_antlr4_runtime/BufferedTokenStream.py
diff --git a/...ser/_antlr4_runtime/CommonTokenFactory.py → ...ser/_antlr4_runtime/CommonTokenFactory.py b/...ser/_antlr4_runtime/CommonTokenFactory.py → ...ser/_antlr4_runtime/CommonTokenFactory.py
diff --git a/...rser/_antlr4_runtime/CommonTokenStream.py → ...rser/_antlr4_runtime/CommonTokenStream.py b/...rser/_antlr4_runtime/CommonTokenStream.py → ...rser/_antlr4_runtime/CommonTokenStream.py
diff --git a/...rser/parser/_antlr4_runtime/FileStream.py → ...its2_parser/_antlr4_runtime/FileStream.py b/...rser/parser/_antlr4_runtime/FileStream.py → ...its2_parser/_antlr4_runtime/FileStream.py
diff --git a/...ser/parser/_antlr4_runtime/InputStream.py → ...ts2_parser/_antlr4_runtime/InputStream.py b/...ser/parser/_antlr4_runtime/InputStream.py → ...ts2_parser/_antlr4_runtime/InputStream.py
diff --git a/...ser/parser/_antlr4_runtime/IntervalSet.py → ...ts2_parser/_antlr4_runtime/IntervalSet.py b/...ser/parser/_antlr4_runtime/IntervalSet.py → ...ts2_parser/_antlr4_runtime/IntervalSet.py
diff --git a/...ser/parser/_antlr4_runtime/LL1Analyzer.py → ...ts2_parser/_antlr4_runtime/LL1Analyzer.py b/...ser/parser/_antlr4_runtime/LL1Analyzer.py → ...ts2_parser/_antlr4_runtime/LL1Analyzer.py
diff --git a/...s2_parser/parser/_antlr4_runtime/Lexer.py → ..._udunits2_parser/_antlr4_runtime/Lexer.py b/...s2_parser/parser/_antlr4_runtime/Lexer.py → ..._udunits2_parser/_antlr4_runtime/Lexer.py
diff --git a/...parser/_antlr4_runtime/ListTokenSource.py → ...parser/_antlr4_runtime/ListTokenSource.py b/...parser/_antlr4_runtime/ListTokenSource.py → ...parser/_antlr4_runtime/ListTokenSource.py
diff --git a/...2_parser/parser/_antlr4_runtime/Parser.py → ...udunits2_parser/_antlr4_runtime/Parser.py b/...2_parser/parser/_antlr4_runtime/Parser.py → ...udunits2_parser/_antlr4_runtime/Parser.py
diff --git a/...rser/_antlr4_runtime/ParserInterpreter.py → ...rser/_antlr4_runtime/ParserInterpreter.py b/...rser/_antlr4_runtime/ParserInterpreter.py → ...rser/_antlr4_runtime/ParserInterpreter.py
diff --git a/...rser/_antlr4_runtime/ParserRuleContext.py → ...rser/_antlr4_runtime/ParserRuleContext.py b/...rser/_antlr4_runtime/ParserRuleContext.py → ...rser/_antlr4_runtime/ParserRuleContext.py
diff --git a/...rser/_antlr4_runtime/PredictionContext.py → ...rser/_antlr4_runtime/PredictionContext.py b/...rser/_antlr4_runtime/PredictionContext.py → ...rser/_antlr4_runtime/PredictionContext.py
diff --git a/...rser/parser/_antlr4_runtime/Recognizer.py → ...its2_parser/_antlr4_runtime/Recognizer.py b/...rser/parser/_antlr4_runtime/Recognizer.py → ...its2_parser/_antlr4_runtime/Recognizer.py
diff --git a/...ser/parser/_antlr4_runtime/RuleContext.py → ...ts2_parser/_antlr4_runtime/RuleContext.py b/...ser/parser/_antlr4_runtime/RuleContext.py → ...ts2_parser/_antlr4_runtime/RuleContext.py