Merge pull request #55 from danielsun1106:#53

.travis.yml

@@ -1,4 +1,5 @@
 sudo: true
+dist: trusty
 language: java
 branches:
   only:

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

@@ -34,8 +34,8 @@ public FailedPredicateException(@NotNull Parser recognizer, @Nullable String pre
 	}
 
 	public FailedPredicateException(@NotNull Parser recognizer,
-														   @Nullable String predicate,
-														   @Nullable String message)
+									@Nullable String predicate,
+									@Nullable String message)
 	{
 		super(formatMessage(predicate, message), recognizer, recognizer.getInputStream(), recognizer._ctx);
 		ATNState s = recognizer.getInterpreter().atn.states.get(recognizer.getState());

tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg

@@ -232,6 +232,21 @@ public <if(parser.abstractRecognizer)>abstract <endif>class <parser.name> extend
 	@Override
 	public String getSerializedATN() { return _serializedATN; }
 
+	@NotNull
+	private FailedPredicateException createFailedPredicateException() {
+		return createFailedPredicateException(null);
+	}
+
+	@NotNull
+	private FailedPredicateException createFailedPredicateException(@Nullable String predicate) {
+		return createFailedPredicateException(predicate, null);
+	}
+
+	@NotNull
+	protected FailedPredicateException createFailedPredicateException(@Nullable String predicate, @Nullable String message) {
+		return new FailedPredicateException(this, predicate, message);
+	}
+
 	<namedActions.members>
 	<parser:(ctor)()>
 	<funcs; separator="\n">
@@ -715,7 +730,7 @@ ArgAction(a, chunks) ::= "<chunks>"
 
 SemPred(p, chunks, failChunks) ::= <<
 setState(<p.stateNumber>);
-if (!(<chunks>)) throw new FailedPredicateException(this, <p.predicate><if(failChunks)>, <failChunks><elseif(p.msg)>, <p.msg><endif>);
+if (!(<chunks>)) throw createFailedPredicateException(<p.predicate><if(failChunks)>, <failChunks><elseif(p.msg)>, <p.msg><endif>);
 >>
 
 ExceptionClause(e, catchArg, catchAction) ::= <<