Merge pull request #101 from Bernardo-MG/release

Release
Bernardo-MG · Jul 21, 2020 · 34061e5 · 34061e5
2 parents c8adf81 + d324c6f
commit 34061e5
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK ${{ matrix.jdk }}
       uses: actions/setup-java@v1
       with:
         java-version: ${{ matrix.jdk }}

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
 
    <groupId>com.bernardomg.tabletop</groupId>
    <artifactId>dice</artifactId>
-   <version>2.0.3</version>
+   <version>2.1.0-SNAPSHOT</version>
    <packaging>jar</packaging>
 
    <name>Dice Notation Tools for Java</name>

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -127,5 +127,10 @@
             Added link to dice notation CLI.
          </action>
       </release>
+      <release version="2.1.0" date="2020-07-18" description="">
+         <action dev="bmg" type="add">
+            The parser's error listener is configurable.
+         </action>
+      </release>
    </body>
 </document>
diff --git a/src/main/java/com/bernardomg/tabletop/dice/parser/DefaultDiceParser.java b/src/main/java/com/bernardomg/tabletop/dice/parser/DefaultDiceParser.java
@@ -49,7 +49,7 @@ public final class DefaultDiceParser implements DiceParser {
     /**
      * Error listener for the parser and lexer.
      */
-    private final ANTLRErrorListener    errorListener = new DefaultErrorListener();
+    private final ANTLRErrorListener    errorListener;
 
     /**
      * Visitor used to build the returned object.
@@ -68,6 +68,21 @@ public final class DefaultDiceParser implements DiceParser {
     public DefaultDiceParser() {
         super();
 
+        errorListener = new DefaultErrorListener();
+        expressionBuilder = new DefaultDiceExpressionBuilder();
+    }
+
+    /**
+     * Constructs a parser with the error listener
+     * 
+     * @param listener
+     *            error listener
+     */
+    public DefaultDiceParser(final ANTLRErrorListener listener) {
+        super();
+
+        errorListener = checkNotNull(listener,
+                "Received a null pointer as listener");
         expressionBuilder = new DefaultDiceExpressionBuilder();
     }
 
@@ -80,8 +95,27 @@ public DefaultDiceParser() {
     public DefaultDiceParser(final DiceExpressionBuilder builder) {
         super();
 
+        errorListener = new DefaultErrorListener();
         expressionBuilder = checkNotNull(builder,
+                "Received a null pointer as expression builder");
+    }
+
+    /**
+     * Constructs a parser with the specified builder and error listener.
+     * 
+     * @param builder
+     *            builder to generate the returned tree
+     * @param listener
+     *            error listener
+     */
+    public DefaultDiceParser(final DiceExpressionBuilder builder,
+            final ANTLRErrorListener listener) {
+        super();
+
+        errorListener = checkNotNull(listener,
                 "Received a null pointer as listener");
+        expressionBuilder = checkNotNull(builder,
+                "Received a null pointer as expression builder");
     }
 
     @Override