From fda1ba596e9cc245a623698a4eb6d9acc8b865d2 Mon Sep 17 00:00:00 2001 From: kevin Date: Sun, 22 Nov 2020 15:14:44 -0500 Subject: [PATCH] generated files with ANTLR 4.8 --- bacon/commentmacro/CommentMacroLexer.py | 5 ++-- bacon/commentmacro/CommentMacroListener.py | 4 ++- bacon/commentmacro/CommentMacroParser.py | 31 +++++++++++++++++++--- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/bacon/commentmacro/CommentMacroLexer.py b/bacon/commentmacro/CommentMacroLexer.py index e798534..97e8862 100644 --- a/bacon/commentmacro/CommentMacroLexer.py +++ b/bacon/commentmacro/CommentMacroLexer.py @@ -1,10 +1,11 @@ -# Generated from CommentMacro.g4 by ANTLR 4.7.1 +# Generated from CommentMacro.g4 by ANTLR 4.8 from antlr4 import * from io import StringIO from typing.io import TextIO import sys + def serializedATN(): with StringIO() as buf: buf.write("\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2-") @@ -187,7 +188,7 @@ class CommentMacroLexer(Lexer): def __init__(self, input=None, output:TextIO = sys.stdout): super().__init__(input, output) - self.checkVersion("4.7.1") + self.checkVersion("4.8") self._interp = LexerATNSimulator(self, self.atn, self.decisionsToDFA, PredictionContextCache()) self._actions = None self._predicates = None diff --git a/bacon/commentmacro/CommentMacroListener.py b/bacon/commentmacro/CommentMacroListener.py index 0aeaa5e..c91660d 100644 --- a/bacon/commentmacro/CommentMacroListener.py +++ b/bacon/commentmacro/CommentMacroListener.py @@ -1,4 +1,4 @@ -# Generated from CommentMacro.g4 by ANTLR 4.7.1 +# Generated from CommentMacro.g4 by ANTLR 4.8 from antlr4 import * if __name__ is not None and "." in __name__: from .CommentMacroParser import CommentMacroParser @@ -368,3 +368,5 @@ class CommentMacroListener(ParseTreeListener): pass + +del CommentMacroParser \ No newline at end of file diff --git a/bacon/commentmacro/CommentMacroParser.py b/bacon/commentmacro/CommentMacroParser.py index a3000a8..05246aa 100644 --- a/bacon/commentmacro/CommentMacroParser.py +++ b/bacon/commentmacro/CommentMacroParser.py @@ -1,9 +1,13 @@ -# Generated from CommentMacro.g4 by ANTLR 4.7.1 +# Generated from CommentMacro.g4 by ANTLR 4.8 # encoding: utf-8 from antlr4 import * from io import StringIO -from typing.io import TextIO import sys +if sys.version_info[1] > 5: + from typing import TextIO +else: + from typing.io import TextIO + def serializedATN(): with StringIO() as buf: @@ -221,12 +225,13 @@ class CommentMacroParser ( Parser ): def __init__(self, input:TokenStream, output:TextIO = sys.stdout): super().__init__(input, output) - self.checkVersion("4.7.1") + self.checkVersion("4.8") self._interp = ParserATNSimulator(self, self.atn, self.decisionsToDFA, self.sharedContextCache) self._predicates = None + class ProgContext(ParserRuleContext): def __init__(self, parser, parent:ParserRuleContext=None, invokingState:int=-1): @@ -284,6 +289,7 @@ class CommentMacroParser ( Parser ): self.exitRule() return localctx + class StatementContext(ParserRuleContext): def __init__(self, parser, parent:ParserRuleContext=None, invokingState:int=-1): @@ -364,6 +370,7 @@ class CommentMacroParser ( Parser ): self.exitRule() return localctx + class MacroContext(ParserRuleContext): def __init__(self, parser, parent:ParserRuleContext=None, invokingState:int=-1): @@ -411,6 +418,8 @@ class CommentMacroParser ( Parser ): def target(self): return self.getTypedRuleContext(CommentMacroParser.TargetContext,0) + def CURRENT(self): + return self.getToken(CommentMacroParser.CURRENT, 0) def device(self): return self.getTypedRuleContext(CommentMacroParser.DeviceContext,0) @@ -436,6 +445,8 @@ class CommentMacroParser ( Parser ): def target(self): return self.getTypedRuleContext(CommentMacroParser.TargetContext,0) + def CURRENT(self): + return self.getToken(CommentMacroParser.CURRENT, 0) def device(self): return self.getTypedRuleContext(CommentMacroParser.DeviceContext,0) @@ -527,6 +538,8 @@ class CommentMacroParser ( Parser ): def target(self): return self.getTypedRuleContext(CommentMacroParser.TargetContext,0) + def CURRENT(self): + return self.getToken(CommentMacroParser.CURRENT, 0) def device(self): return self.getTypedRuleContext(CommentMacroParser.DeviceContext,0) @@ -738,6 +751,8 @@ class CommentMacroParser ( Parser ): def target(self): return self.getTypedRuleContext(CommentMacroParser.TargetContext,0) + def CURRENT(self): + return self.getToken(CommentMacroParser.CURRENT, 0) def device(self): return self.getTypedRuleContext(CommentMacroParser.DeviceContext,0) @@ -763,6 +778,8 @@ class CommentMacroParser ( Parser ): def target(self): return self.getTypedRuleContext(CommentMacroParser.TargetContext,0) + def CURRENT(self): + return self.getToken(CommentMacroParser.CURRENT, 0) def time(self): return self.getTypedRuleContext(CommentMacroParser.TimeContext,0) @@ -810,6 +827,8 @@ class CommentMacroParser ( Parser ): def target(self): return self.getTypedRuleContext(CommentMacroParser.TargetContext,0) + def CURRENT(self): + return self.getToken(CommentMacroParser.CURRENT, 0) def device(self): return self.getTypedRuleContext(CommentMacroParser.DeviceContext,0) @@ -1724,6 +1743,7 @@ class CommentMacroParser ( Parser ): self.exitRule() return localctx + class TimeContext(ParserRuleContext): def __init__(self, parser, parent:ParserRuleContext=None, invokingState:int=-1): @@ -1769,6 +1789,7 @@ class CommentMacroParser ( Parser ): self.exitRule() return localctx + class DeviceContext(ParserRuleContext): def __init__(self, parser, parent:ParserRuleContext=None, invokingState:int=-1): @@ -1815,6 +1836,7 @@ class CommentMacroParser ( Parser ): self.exitRule() return localctx + class NodeTypeContext(ParserRuleContext): def __init__(self, parser, parent:ParserRuleContext=None, invokingState:int=-1): @@ -1866,6 +1888,7 @@ class CommentMacroParser ( Parser ): self.exitRule() return localctx + class TargetContext(ParserRuleContext): def __init__(self, parser, parent:ParserRuleContext=None, invokingState:int=-1): @@ -1942,6 +1965,7 @@ class CommentMacroParser ( Parser ): self.exitRule() return localctx + class SpanContext(ParserRuleContext): def __init__(self, parser, parent:ParserRuleContext=None, invokingState:int=-1): @@ -1994,6 +2018,7 @@ class CommentMacroParser ( Parser ): self.exitRule() return localctx + class NumberContext(ParserRuleContext): def __init__(self, parser, parent:ParserRuleContext=None, invokingState:int=-1):