Simplify FailedPredicateException constructors, encapsulate fields

runtime/Java/src/org/antlr/v4/runtime/DefaultErrorStrategy.java

@@ -229,7 +229,7 @@ public class DefaultErrorStrategy implements ANTLRErrorStrategy {
 		throws RecognitionException
 	{
 		String ruleName = recognizer.getRuleNames()[recognizer._ctx.getRuleIndex()];
-		String msg = "rule "+ruleName+" "+e.msg;
+		String msg = "rule "+ruleName+" "+e.getMessage();
 		recognizer.notifyErrorListeners((Token) e.offendingToken, msg, e);
 	}
 

runtime/Java/src/org/antlr/v4/runtime/FailedPredicateException.java

@@ -30,6 +30,7 @@ package org.antlr.v4.runtime;
 
 import org.antlr.v4.runtime.atn.ATNState;
 import org.antlr.v4.runtime.atn.PredicateTransition;
+import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.misc.Nullable;
 
 /** A semantic predicate failed during validation.  Validation of predicates
@@ -38,40 +39,50 @@ import org.antlr.v4.runtime.misc.Nullable;
  *  prediction.
  */
 public class FailedPredicateException extends RecognitionException {
-	public int ruleIndex;
+	private final int ruleIndex;
-	public int predIndex;
+	private final int predicateIndex;
-	public String predicate;
+	private final String predicate;
-	public String msg;
 
-	public FailedPredicateException(Parser recognizer) {
+	public FailedPredicateException(@NotNull Parser recognizer) {
 		this(recognizer, null);
 	}
 
-	public FailedPredicateException(Parser recognizer, @Nullable String predicate) {
+	public FailedPredicateException(@NotNull Parser recognizer, @Nullable String predicate) {
-		super(recognizer, recognizer.getInputStream(), recognizer._ctx);
+		this(recognizer, predicate, null);
-		ATNState s = recognizer.getInterpreter().atn.states.get(recognizer._ctx.s);
-		PredicateTransition trans = (PredicateTransition)s.transition(0);
-		ruleIndex = trans.ruleIndex;
-		predIndex = trans.predIndex;
-		this.predicate = predicate;
-		this.msg = String.format("failed predicate: {%s}?", predicate);
-		Token la = recognizer.getCurrentToken();
-		this.offendingToken = la;
 	}
 
-	public FailedPredicateException(Parser recognizer,
+	public FailedPredicateException(@NotNull Parser recognizer,
 									@Nullable String predicate,
-									@Nullable String msg)
+									@Nullable String message)
 	{
-		super(recognizer, recognizer.getInputStream(), recognizer._ctx);
+		super(formatMessage(predicate, message), recognizer, recognizer.getInputStream(), recognizer._ctx);
 		ATNState s = recognizer.getInterpreter().atn.states.get(recognizer._ctx.s);
 		PredicateTransition trans = (PredicateTransition)s.transition(0);
-		ruleIndex = trans.ruleIndex;
+		this.ruleIndex = trans.ruleIndex;
-		predIndex = trans.predIndex;
+		this.predicateIndex = trans.predIndex;
 		this.predicate = predicate;
-		this.msg = msg;
+		this.offendingToken = recognizer.getCurrentToken();
-		Token la = recognizer.getCurrentToken();
-		this.offendingToken = la;
 	}
 
+	public int getRuleIndex() {
+		return ruleIndex;
+	}
+
+	public int getPredIndex() {
+		return predicateIndex;
+	}
+
+	@Nullable
+	public String getPredicate() {
+		return predicate;
+	}
+
+	@NotNull
+	private static String formatMessage(@Nullable String predicate, @Nullable String message) {
+		if (message != null) {
+			return message;
+		}
+
+		return String.format("failed predicate: {%s}?", predicate);
+	}
 }

runtime/Java/src/org/antlr/v4/runtime/RecognitionException.java

@@ -66,6 +66,16 @@ public class RecognitionException extends RuntimeException {
 		if ( ctx!=null ) this.offendingState = ctx.s;
 	}
 
+	public RecognitionException(String message, @Nullable Recognizer<?, ?> recognizer, IntStream input,
+								@Nullable ParserRuleContext ctx)
+	{
+		super(message);
+		this.recognizer = recognizer;
+		this.input = input;
+		this.ctx = ctx;
+		if ( ctx!=null ) this.offendingState = ctx.s;
+	}
+
 	/** Where was the parser in the ATN when the error occurred?
 	 *  For No viable alternative exceptions, this is the decision state number.
 	 *  For others, it is the state whose emanating edge we couldn't match.