Corrected grammar

Author: Bernardo-MG

dice_notation/parser/DiceNotationListener.py

@@ -4,12 +4,12 @@
 # This class defines a complete listener for a parse tree produced by DiceNotationParser.
 class DiceNotationListener(ParseTreeListener):
 
-    # Enter a parse tree produced by DiceNotationParser#notation.
-    def enterNotation(self, ctx):
+    # Enter a parse tree produced by DiceNotationParser#startRule.
+    def enterStartRule(self, ctx):
         pass
 
-    # Exit a parse tree produced by DiceNotationParser#notation.
-    def exitNotation(self, ctx):
+    # Exit a parse tree produced by DiceNotationParser#startRule.
+    def exitStartRule(self, ctx):
         pass
 
 

dice_notation/parser/DiceNotationParser.py

@@ -48,14 +48,14 @@ class DiceNotationParser ( Parser ):
     symbolicNames = [ u"<INVALID>", u"DSEPARATOR", u"DIGIT", u"ADDOPERATOR", 
                       u"MULTOPERATOR", u"LPAREN", u"RPAREN", u"WS" ]
 
-    RULE_notation = 0
+    RULE_startRule = 0
     RULE_addOp = 1
     RULE_multOp = 2
     RULE_operand = 3
     RULE_dice = 4
     RULE_number = 5
 
-    ruleNames =  [ u"notation", u"addOp", u"multOp", u"operand", u"dice", 
+    ruleNames =  [ u"startRule", u"addOp", u"multOp", u"operand", u"dice", 
                    u"number" ]
 
     EOF = Token.EOF
@@ -76,10 +76,10 @@ def __init__(self, input, output=sys.stdout):
 
 
 
-    class NotationContext(ParserRuleContext):
+    class StartRuleContext(ParserRuleContext):
 
         def __init__(self, parser, parent=None, invokingState=-1):
-            super(DiceNotationParser.NotationContext, self).__init__(parent, invokingState)
+            super(DiceNotationParser.StartRuleContext, self).__init__(parent, invokingState)
             self.parser = parser
 
         def dice(self):
@@ -95,23 +95,23 @@ def addOp(self):
 
 
         def getRuleIndex(self):
-            return DiceNotationParser.RULE_notation
+            return DiceNotationParser.RULE_startRule
 
         def enterRule(self, listener):
-            if hasattr(listener, "enterNotation"):
-                listener.enterNotation(self)
+            if hasattr(listener, "enterStartRule"):
+                listener.enterStartRule(self)
 
         def exitRule(self, listener):
-            if hasattr(listener, "exitNotation"):
-                listener.exitNotation(self)
+            if hasattr(listener, "exitStartRule"):
+                listener.exitStartRule(self)
 
 
 
 
-    def notation(self):
+    def startRule(self):
 
-        localctx = DiceNotationParser.NotationContext(self, self._ctx, self.state)
-        self.enterRule(localctx, 0, self.RULE_notation)
+        localctx = DiceNotationParser.StartRuleContext(self, self._ctx, self.state)
+        self.enterRule(localctx, 0, self.RULE_startRule)
         try:
             self.state = 15
             self._errHandler.sync(self)
@@ -287,8 +287,8 @@ def number(self):
         def LPAREN(self):
             return self.getToken(DiceNotationParser.LPAREN, 0)
 
-        def notation(self):
-            return self.getTypedRuleContext(DiceNotationParser.NotationContext,0)
+        def startRule(self):
+            return self.getTypedRuleContext(DiceNotationParser.StartRuleContext,0)
 
 
         def RPAREN(self):
@@ -333,7 +333,7 @@ def operand(self):
                 self.state = 35
                 self.match(DiceNotationParser.LPAREN)
                 self.state = 36
-                self.notation()
+                self.startRule()
                 self.state = 37
                 self.match(DiceNotationParser.RPAREN)
                 pass

dice_notation/parser/__init__.py

@@ -2,4 +2,4 @@
 
 from dice_notation.parser.dice import DiceParser
 
-__all__ = ['DiceParser']
+__all__ = ['dice.py']

dice_notation/parser/dice.py

@@ -0,0 +1,9 @@
+import sys
+import logging
+
+
+class DiceParser():
+
+    def __init__(self):
+        super(DiceParser, self).__init__()
+        self._logger = logging.getLogger("DiceParser")

grammar/DiceNotation.g4

@@ -27,7 +27,7 @@ options { tokenVocab=DiceNotationLexer; }
  * Rules.
  */
 
-notation
+startRule
 :
    dice
    | number
@@ -48,7 +48,7 @@ operand
 :
    dice
    | number
-   | LPAREN notation RPAREN
+   | LPAREN startRule RPAREN
 ;
 
 dice

requirements.txt

@@ -13,4 +13,4 @@ sphinx-docs-theme==1.0.1
 Pygments==2.2.0
 
 # Parsing
-antlr4-python3-runtime==4.8
+antlr4-python3-runtime==4.7.2