From 1a1f19619035472095daa3fc1ab3cfcd4a0b61a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Lalev=C3=A9e?= Date: Wed, 20 Apr 2016 15:04:10 +0200 Subject: [PATCH] redirect error messages to a proper logger --- .../joestelmach/natty/generated/DateLexer.g | 5 +++++ .../joestelmach/natty/generated/DateParser.g | 12 ++++++++++++ .../joestelmach/natty/generated/DateWalker.g | 8 ++++++++ .../joestelmach/natty/generated/TreeRewrite.g | 8 ++++++++ .../natty/generated/imports/NumericRules.g | 18 +++++++++++++++++- 5 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/main/antlr3/com/joestelmach/natty/generated/DateLexer.g b/src/main/antlr3/com/joestelmach/natty/generated/DateLexer.g index ae3c389f..3939733d 100644 --- a/src/main/antlr3/com/joestelmach/natty/generated/DateLexer.g +++ b/src/main/antlr3/com/joestelmach/natty/generated/DateLexer.g @@ -14,6 +14,11 @@ lexer grammar DateLexer; _logger.debug(message); } } + + @Override + public void emitErrorMessage(String msg) { + _logger.error(msg); + } } // ********** date rules ********** diff --git a/src/main/antlr3/com/joestelmach/natty/generated/DateParser.g b/src/main/antlr3/com/joestelmach/natty/generated/DateParser.g index 30b35810..54d1b5d3 100644 --- a/src/main/antlr3/com/joestelmach/natty/generated/DateParser.g +++ b/src/main/antlr3/com/joestelmach/natty/generated/DateParser.g @@ -38,6 +38,8 @@ tokens { @header { package com.joestelmach.natty.generated; + + import java.io.IOException; } @members { @@ -52,6 +54,16 @@ tokens { _logger.debug(message); } } + + @Override + public void reportError(IOException e) { + _logger.error("Unexpected IO error", e); + } + + @Override + public void emitErrorMessage(String msg) { + _logger.error(msg); + } } parse diff --git a/src/main/antlr3/com/joestelmach/natty/generated/DateWalker.g b/src/main/antlr3/com/joestelmach/natty/generated/DateWalker.g index 8d87db3b..6f8eacdf 100644 --- a/src/main/antlr3/com/joestelmach/natty/generated/DateWalker.g +++ b/src/main/antlr3/com/joestelmach/natty/generated/DateWalker.g @@ -8,6 +8,9 @@ options { @header { package com.joestelmach.natty.generated; } @members { + private static org.slf4j.Logger _logger = + org.slf4j.LoggerFactory.getLogger(com.joestelmach.natty.generated.DateWalker.class); + private com.joestelmach.natty.WalkerState _walkerState; private java.util.Date referenceDate; @@ -23,6 +26,11 @@ options { throw e; } + @Override + public void emitErrorMessage(String msg) { + _logger.error(msg); + } + public void setReferenceDate(java.util.Date referenceDate) { this.referenceDate = referenceDate; } diff --git a/src/main/antlr3/com/joestelmach/natty/generated/TreeRewrite.g b/src/main/antlr3/com/joestelmach/natty/generated/TreeRewrite.g index 4ca30869..4a9d89a5 100644 --- a/src/main/antlr3/com/joestelmach/natty/generated/TreeRewrite.g +++ b/src/main/antlr3/com/joestelmach/natty/generated/TreeRewrite.g @@ -10,6 +10,9 @@ options { @header { package com.joestelmach.natty.generated; } @members { + private static org.slf4j.Logger _logger = + org.slf4j.LoggerFactory.getLogger(com.joestelmach.natty.generated.TreeRewrite.class); + @Override protected Object recoverFromMismatchedToken(IntStream input, int ttype, BitSet follow) throws RecognitionException { @@ -21,6 +24,11 @@ options { throws RecognitionException { throw e; } + + @Override + public void emitErrorMessage(String msg) { + _logger.error(msg); + } } @rulecatch { diff --git a/src/main/antlr3/com/joestelmach/natty/generated/imports/NumericRules.g b/src/main/antlr3/com/joestelmach/natty/generated/imports/NumericRules.g index b23d78c7..3e0cf882 100644 --- a/src/main/antlr3/com/joestelmach/natty/generated/imports/NumericRules.g +++ b/src/main/antlr3/com/joestelmach/natty/generated/imports/NumericRules.g @@ -7,7 +7,23 @@ options { tokens { INT; } - + +@members { + private static org.slf4j.Logger _logger = + org.slf4j.LoggerFactory.getLogger(com.joestelmach.natty.generated.DateParser_NumericRules.class); + + @Override + public void reportError(IOException e) { + _logger.error("Unexpected IO error", e); + } + + @Override + public void emitErrorMessage(String msg) { + _logger.error(msg); + } +} + + // ********** numeric rules ********** // a number between 00 and 59 inclusive, with a mandatory 0 prefix before numbers 0-9