From 2c71663a97cf928282031f06f2eff9ef69d2efe9 Mon Sep 17 00:00:00 2001 From: Martin von Gagern Date: Mon, 7 Mar 2016 14:46:35 +0100 Subject: [PATCH 1/2] Fix Javadoc errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes all errors (but not the numerous warnings) reported by Oracle JDK 1.8.0_72 in a simple run of “mvn javadoc:javadoc”. --- .../antlr/v4/analysis/AnalysisPipeline.java | 2 +- .../analysis/LeftRecursiveRuleAnalyzer.java | 2 +- .../LeftRecursiveRuleTransformer.java | 6 ++--- .../src/org/antlr/v4/automata/ATNFactory.java | 26 +++++++++---------- .../antlr/v4/automata/LexerATNFactory.java | 2 +- .../antlr/v4/automata/ParserATNFactory.java | 24 ++++++++--------- .../antlr/v4/codegen/OutputModelWalker.java | 2 +- tool/src/org/antlr/v4/codegen/Target.java | 2 +- .../model/decl/AltLabelStructDecl.java | 2 +- .../v4/codegen/target/JavaScriptTarget.java | 4 +-- tool/src/org/antlr/v4/misc/Graph.java | 4 +-- tool/src/org/antlr/v4/misc/Utils.java | 15 ----------- tool/src/org/antlr/v4/parse/GrammarToken.java | 2 +- tool/src/org/antlr/v4/parse/ScopeParser.java | 6 ++++- tool/src/org/antlr/v4/tool/AttributeDict.java | 2 +- tool/src/org/antlr/v4/tool/ErrorType.java | 24 ++++++++--------- tool/src/org/antlr/v4/tool/Grammar.java | 13 ++-------- .../v4/tool/GrammarParserInterpreter.java | 2 +- .../v4/tool/GrammarTransformPipeline.java | 8 +++--- .../org/antlr/v4/tool/LeftRecursiveRule.java | 2 +- 20 files changed, 65 insertions(+), 85 deletions(-) diff --git a/tool/src/org/antlr/v4/analysis/AnalysisPipeline.java b/tool/src/org/antlr/v4/analysis/AnalysisPipeline.java index 5bd84be2e..a04ec319f 100644 --- a/tool/src/org/antlr/v4/analysis/AnalysisPipeline.java +++ b/tool/src/org/antlr/v4/analysis/AnalysisPipeline.java @@ -100,7 +100,7 @@ public class AnalysisPipeline { } } - /** Return whether lookahead sets are disjoint; no lookahead => not disjoint */ + /** Return whether lookahead sets are disjoint; no lookahead ⇒ not disjoint */ public static boolean disjoint(IntervalSet[] altLook) { boolean collision = false; IntervalSet combined = new IntervalSet(); diff --git a/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleAnalyzer.java b/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleAnalyzer.java index 5b6ba058f..3d8198d57 100644 --- a/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleAnalyzer.java +++ b/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleAnalyzer.java @@ -330,7 +330,7 @@ public class LeftRecursiveRuleAnalyzer extends LeftRecursiveRuleWalker { return lrlabel; } - /** Strip last 2 tokens if -> label; alter indexes in altAST */ + /** Strip last 2 tokens if → label; alter indexes in altAST */ public void stripAltLabel(GrammarAST altAST) { int start = altAST.getTokenStartIndex(); int stop = altAST.getTokenStopIndex(); diff --git a/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleTransformer.java b/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleTransformer.java index ea67493f9..8ad1021cb 100644 --- a/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleTransformer.java +++ b/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleTransformer.java @@ -244,9 +244,9 @@ public class LeftRecursiveRuleTransformer { * (ALT ID)) * (* (BLOCK * (OPTIONS ...) - * (ALT {7 >= $_p}? '*' (= b e) {$v = $a.v * $b.v;}) - * (ALT {6 >= $_p}? '+' (= b e) {$v = $a.v + $b.v;}) - * (ALT {3 >= $_p}? '++') (ALT {2 >= $_p}? '--')))))) + * (ALT {7 >= $_p}? '*' (= b e) {$v = $a.v * $b.v;}) + * (ALT {6 >= $_p}? '+' (= b e) {$v = $a.v + $b.v;}) + * (ALT {3 >= $_p}? '++') (ALT {2 >= $_p}? '--')))))) * */ public void setAltASTPointers(LeftRecursiveRule r, RuleAST t) { diff --git a/tool/src/org/antlr/v4/automata/ATNFactory.java b/tool/src/org/antlr/v4/automata/ATNFactory.java index aff2862a0..b1f61a8cf 100644 --- a/tool/src/org/antlr/v4/automata/ATNFactory.java +++ b/tool/src/org/antlr/v4/automata/ATNFactory.java @@ -93,7 +93,7 @@ public interface ATNFactory { /** For a non-lexer, just build a simple token reference atom. * For a lexer, a string is a sequence of char to match. That is, * "fog" is treated as 'f' 'o' 'g' not as a single transition in - * the DFA. Machine== o-'f'->o-'o'->o-'g'->o and has n+1 states + * the DFA. Machine== o-'f'->o-'o'->o-'g'->o and has n+1 states * for n characters. */ @@ -101,16 +101,16 @@ public interface ATNFactory { /** For reference to rule r, build * - * o-e->(r) o + * o-e->(r) o * * where (r) is the start of rule r and the trailing o is not linked * to from rule ref state directly (it's done thru the transition(0) * RuleClosureTransition. * * If the rule r is just a list of tokens, it's block will be just - * a set on an edge o->o->o-set->o->o->o, could inline it rather than doing + * a set on an edge o->o->o-set->o->o->o, could inline it rather than doing * the rule reference, but i'm not doing this yet as I'm not sure - * it would help much in the ATN->DFA construction. + * it would help much in the ATN->DFA construction. * * TODO add to codegen: collapse alt blks that are sets into single matchSet * @param node @@ -118,7 +118,7 @@ public interface ATNFactory { Handle ruleRef(GrammarAST node); - /** From an empty alternative build Grip o-e->o */ + /** From an empty alternative build Grip o-e->o */ Handle epsilon(GrammarAST node); @@ -143,13 +143,13 @@ public interface ATNFactory { /** From A|B|..|Z alternative block build * - * o->o-A->o->o (last ATNState is blockEndATNState pointed to by all alts) + * o->o-A->o->o (last ATNState is blockEndATNState pointed to by all alts) * | ^ - * o->o-B->o--| + * o->o-B->o--| * | | * ... | * | | - * o->o-Z->o--| + * o->o-Z->o--| * * So every alternative gets begin ATNState connected by epsilon * and every alt right side points at a block end ATNState. There is a @@ -160,7 +160,7 @@ public interface ATNFactory { * begin/end. * * Special case: if just a list of tokens/chars/sets, then collapse - * to a single edge'd o-set->o graph. + * to a single edge'd o-set->o graph. * * Set alt number (1..n) in the left-Transition ATNState. */ @@ -171,9 +171,9 @@ public interface ATNFactory { /** From (A)? build either: * - * o--A->o + * o--A->o * | ^ - * o---->| + * o---->| * * or, if A is a block, just add an empty alt to the end of the block */ @@ -184,7 +184,7 @@ public interface ATNFactory { * * |---| (Transition 2 from A.right points at alt 1) * v | (follow of loop is Transition 1) - * o->o-A-o->o + * o->o-A-o->o * * Meaning that the last ATNState in A points back to A's left Transition ATNState * and we add a new begin/end ATNState. A can be single alternative or @@ -200,7 +200,7 @@ public interface ATNFactory { * * |---| * v | - * o->o-A-o--o (Transition 2 from block end points at alt 1; follow is Transition 1) + * o->o-A-o--o (Transition 2 from block end points at alt 1; follow is Transition 1) * | ^ * o---------| (optional branch is 2nd alt of optional block containing A+) * diff --git a/tool/src/org/antlr/v4/automata/LexerATNFactory.java b/tool/src/org/antlr/v4/automata/LexerATNFactory.java index a5e80e47d..8d16bd1e5 100644 --- a/tool/src/org/antlr/v4/automata/LexerATNFactory.java +++ b/tool/src/org/antlr/v4/automata/LexerATNFactory.java @@ -324,7 +324,7 @@ public class LexerATNFactory extends ParserATNFactory { /** For a lexer, a string is a sequence of char to match. That is, * "fog" is treated as 'f' 'o' 'g' not as a single transition in - * the DFA. Machine== o-'f'->o-'o'->o-'g'->o and has n+1 states + * the DFA. Machine== o-'f'->o-'o'->o-'g'->o and has n+1 states * for n characters. */ @Override diff --git a/tool/src/org/antlr/v4/automata/ParserATNFactory.java b/tool/src/org/antlr/v4/automata/ParserATNFactory.java index 366411117..d2114b42c 100644 --- a/tool/src/org/antlr/v4/automata/ParserATNFactory.java +++ b/tool/src/org/antlr/v4/automata/ParserATNFactory.java @@ -286,7 +286,7 @@ public class ParserATNFactory implements ATNFactory { * For reference to rule {@code r}, build * * 
-	 *  o->(r)  o
+	 *  o->(r)  o
 	 *
* * where {@code (r)} is the start of rule {@code r} and the trailing @@ -391,24 +391,24 @@ public class ParserATNFactory implements ATNFactory { * From {@code A|B|..|Z} alternative block build * * 
-	 *  o->o-A->o->o (last ATNState is BlockEndState pointed to by all alts)
+	 *  o->o-A->o->o (last ATNState is BlockEndState pointed to by all alts)
 	 *  |          ^
-	 *  |->o-B->o--|
+	 *  |->o-B->o--|
 	 *  |          |
 	 *  ...        |
 	 *  |          |
-	 *  |->o-Z->o--|
+	 *  |->o-Z->o--|
 	 *
* * So start node points at every alternative with epsilon transition and * every alt right side points at a block end ATNState. - *

+ *

* Special case: only one alternative: don't make a block with alt * begin/end. - *

+ *

* Special case: if just a list of tokens/chars/sets, then collapse to a - * single edged o-set->o graph. - *

+ * single edged o-set->o graph. + *

* TODO: Set alt number (1..n) in the states? */ @@ -506,9 +506,9 @@ public class ParserATNFactory implements ATNFactory { * From {@code (A)?} build either: * * 

-	 *  o--A->o
+	 *  o--A->o
 	 *  |     ^
-	 *  o---->|
+	 *  o---->|
 	 *
* * or, if {@code A} is a block, just add an empty alt to the end of the @@ -535,7 +535,7 @@ public class ParserATNFactory implements ATNFactory { * 
 	 *   |---------|
 	 *   v         |
-	 *  [o-blk-o]->o->o
+	 *  [o-blk-o]->o->o
 	 *
* * We add a decision for loop back node to the existing one at {@code blk} @@ -583,7 +583,7 @@ public class ParserATNFactory implements ATNFactory { * 
 	 *   |-------------|
 	 *   v             |
-	 *   o--[o-blk-o]->o  o
+	 *   o--[o-blk-o]->o  o
 	 *   |                ^
 	 *   -----------------|
 	 *
diff --git a/tool/src/org/antlr/v4/codegen/OutputModelWalker.java b/tool/src/org/antlr/v4/codegen/OutputModelWalker.java index 8a0389596..486efd162 100644 --- a/tool/src/org/antlr/v4/codegen/OutputModelWalker.java +++ b/tool/src/org/antlr/v4/codegen/OutputModelWalker.java @@ -53,7 +53,7 @@ import java.util.Set; * We identify those nested objects by the list of arguments in the template * definition. For example, here is the definition of the parser template: * - * Parser(parser, scopes, funcs) ::= <<...>> + * Parser(parser, scopes, funcs) ::= <<...>> * * The first template argument is always the output model object from which * this walker will create the template. Any other arguments identify diff --git a/tool/src/org/antlr/v4/codegen/Target.java b/tool/src/org/antlr/v4/codegen/Target.java index 1f2d74864..3d4a93a63 100644 --- a/tool/src/org/antlr/v4/codegen/Target.java +++ b/tool/src/org/antlr/v4/codegen/Target.java @@ -56,7 +56,7 @@ public abstract class Target { * predicates and such that may refer to chars that need to be escaped * when represented as strings. Also, templates need to be escaped so * that the target language can hold them as a string. - *

+ *

* I have defined (via the constructor) the set of typical escapes, * but your {@link Target} subclass is free to alter the translated chars * or add more definitions. This is non-static so each target can have diff --git a/tool/src/org/antlr/v4/codegen/model/decl/AltLabelStructDecl.java b/tool/src/org/antlr/v4/codegen/model/decl/AltLabelStructDecl.java index 5d49625d3..f48f45d09 100644 --- a/tool/src/org/antlr/v4/codegen/model/decl/AltLabelStructDecl.java +++ b/tool/src/org/antlr/v4/codegen/model/decl/AltLabelStructDecl.java @@ -38,7 +38,7 @@ import org.antlr.v4.tool.Rule; import java.util.ArrayList; -/** A StructDecl to handle a -> label on alt */ +/** A StructDecl to handle a -> label on alt */ public class AltLabelStructDecl extends StructDecl { public int altNum; public AltLabelStructDecl(OutputModelFactory factory, Rule r, diff --git a/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java b/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java index 71926acfb..31220b3dc 100644 --- a/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java +++ b/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java @@ -93,11 +93,11 @@ public class JavaScriptTarget extends Target { /** * {@inheritDoc} - *

+ *

* For Java, this is the translation {@code 'a\n"'} → {@code "a\n\""}. * Expect single quotes around the incoming literal. Just flip the quotes * and replace double quotes with {@code \"}. - *

+ *

* Note that we have decided to allow people to use '\"' without penalty, so * we must build the target string in a loop as {@link String#replace} * cannot handle both {@code \"} and {@code "} without a lot of messing diff --git a/tool/src/org/antlr/v4/misc/Graph.java b/tool/src/org/antlr/v4/misc/Graph.java index 2509c81b9..a7c63d50a 100644 --- a/tool/src/org/antlr/v4/misc/Graph.java +++ b/tool/src/org/antlr/v4/misc/Graph.java @@ -81,7 +81,7 @@ public class Graph { * For sorting, I'm not following convention here since ANTLR * needs the opposite. Here's what I assume for sorting: * - * If there exists an edge u -> v then u depends on v and v + * If there exists an edge u -> v then u depends on v and v * must happen before u. * * So if this gives nonreversed postorder traversal, I get the order @@ -114,4 +114,4 @@ public class Graph { } sorted.add(n.payload); } -} \ No newline at end of file +} diff --git a/tool/src/org/antlr/v4/misc/Utils.java b/tool/src/org/antlr/v4/misc/Utils.java index c62003c60..6d63b7c6b 100644 --- a/tool/src/org/antlr/v4/misc/Utils.java +++ b/tool/src/org/antlr/v4/misc/Utils.java @@ -54,21 +54,6 @@ public class Utils { static Integer[] ints = new Integer[INTEGER_POOL_MAX_VALUE+1]; - /** Integer objects are immutable so share all Integers with the - * same value up to some max size. Use an array as a perfect hash. - * Return shared object for 0..INTEGER_POOL_MAX_VALUE or a new - * Integer object with x in it. Java's autoboxing only caches up to 127. - public static Integer integer(int x) { - if ( x<0 || x>INTEGER_POOL_MAX_VALUE ) { - return new Integer(x); - } - if ( ints[x]==null ) { - ints[x] = new Integer(x); - } - return ints[x]; - } - */ - public static String stripFileExtension(String name) { if ( name==null ) return null; int lastDot = name.lastIndexOf('.'); diff --git a/tool/src/org/antlr/v4/parse/GrammarToken.java b/tool/src/org/antlr/v4/parse/GrammarToken.java index 4d849bf2f..3e7e1908a 100644 --- a/tool/src/org/antlr/v4/parse/GrammarToken.java +++ b/tool/src/org/antlr/v4/parse/GrammarToken.java @@ -35,7 +35,7 @@ import org.antlr.runtime.Token; import org.antlr.v4.tool.Grammar; /** A CommonToken that can also track it's original location, - * derived from options on the element ref like BEGIN. + * derived from options on the element ref like BEGIN<line=34,...>. */ public class GrammarToken extends CommonToken { public Grammar g; diff --git a/tool/src/org/antlr/v4/parse/ScopeParser.java b/tool/src/org/antlr/v4/parse/ScopeParser.java index a0ce182a3..743fe980d 100644 --- a/tool/src/org/antlr/v4/parse/ScopeParser.java +++ b/tool/src/org/antlr/v4/parse/ScopeParser.java @@ -52,11 +52,15 @@ import java.util.List; public class ScopeParser { /** Given an arg or retval scope definition list like * - * Map, int[] j3, char *foo32[3] + * + * Map<String, String>, int[] j3, char *foo32[3] + * * * or * + * * int i=3, j=a[34]+20 + * * * convert to an attribute scope. */ diff --git a/tool/src/org/antlr/v4/tool/AttributeDict.java b/tool/src/org/antlr/v4/tool/AttributeDict.java index 911170dfd..e8d487f0d 100644 --- a/tool/src/org/antlr/v4/tool/AttributeDict.java +++ b/tool/src/org/antlr/v4/tool/AttributeDict.java @@ -39,7 +39,7 @@ import java.util.LinkedHashMap; import java.util.Set; /** Track the attributes within retval, arg lists etc... - *

+ *

* Each rule has potentially 3 scopes: return values, * parameters, and an implicitly-named scope (i.e., a scope defined in a rule). * Implicitly-defined scopes are named after the rule; rules and scopes then diff --git a/tool/src/org/antlr/v4/tool/ErrorType.java b/tool/src/org/antlr/v4/tool/ErrorType.java index 0fedfc4a9..32bb57475 100644 --- a/tool/src/org/antlr/v4/tool/ErrorType.java +++ b/tool/src/org/antlr/v4/tool/ErrorType.java @@ -34,12 +34,12 @@ import org.antlr.v4.runtime.Lexer; /** * A complex enumeration of all the error messages that the tool can issue. - *

+ *

* When adding error messages, also add a description of the message to the * Wiki with a location under the Wiki page * Errors Reported by the ANTLR Tool. * - * @author Jim Idle , Terence Parr + * @author Jim Idle <jimi@temporal-wave.com>, Terence Parr * @since 4.0 */ public enum ErrorType { @@ -702,8 +702,8 @@ public enum ErrorType { *

The following rule produces this error.

* * 
-	 * X : 'foo' -> type(Foo);  // ok
-	 * Y : 'foo' -> token(Foo); // error 149 (token is not a supported lexer command)
+	 * X : 'foo' -> type(Foo);  // ok
+	 * Y : 'foo' -> token(Foo); // error 149 (token is not a supported lexer command)
 	 *
* * @since 4.1 @@ -719,8 +719,8 @@ public enum ErrorType { *

The following rule produces this error.

* * 
-	 * X : 'foo' -> type(Foo); // ok
-	 * Y : 'foo' -> type;      // error 150 (the type command requires an argument)
+	 * X : 'foo' -> type(Foo); // ok
+	 * Y : 'foo' -> type;      // error 150 (the type command requires an argument)
 	 *
* * @since 4.1 @@ -737,8 +737,8 @@ public enum ErrorType { *

The following rule produces this error.

* * 
-	 * X : 'foo' -> popMode;    // ok
-	 * Y : 'foo' -> popMode(A); // error 151 (the popMode command does not take an argument)
+	 * X : 'foo' -> popMode;    // ok
+	 * Y : 'foo' -> popMode(A); // error 151 (the popMode command does not take an argument)
 	 *
* * @since 4.1 @@ -825,8 +825,8 @@ public enum ErrorType { * public static final int CUSTOM = HIDDEN + 1; * } * - * X : 'foo' -> channel(HIDDEN); // ok - * Y : 'bar' -> channel(CUSTOM); // warning 155 + * X : 'foo' -> channel(HIDDEN); // ok + * Y : 'bar' -> channel(CUSTOM); // warning 155 * * * @since 4.2 @@ -891,12 +891,12 @@ public enum ErrorType { *

The following rule produces this warning.

* * 
-	 * X1 : 'x' -> more    // ok
+	 * X1 : 'x' -> more    // ok
 	 *    ;
 	 * Y1 : 'x' {more();}  // ok
 	 *    ;
 	 * fragment
-	 * X2 : 'x' -> more    // warning 158
+	 * X2 : 'x' -> more    // warning 158
 	 *    ;
 	 * fragment
 	 * Y2 : 'x' {more();}  // warning 158
diff --git a/tool/src/org/antlr/v4/tool/Grammar.java b/tool/src/org/antlr/v4/tool/Grammar.java
index 5632ab451..7bc078a26 100644
--- a/tool/src/org/antlr/v4/tool/Grammar.java
+++ b/tool/src/org/antlr/v4/tool/Grammar.java
@@ -114,14 +114,14 @@ public class Grammar implements AttributeResolver {
 
 	public static final Set LexerBlockOptions = new HashSet();
 
-	/** Legal options for rule refs like id */
+	/** Legal options for rule refs like id<key=value> */
 	public static final Set ruleRefOptions = new HashSet();
 	static {
 		ruleRefOptions.add(LeftRecursiveRuleTransformer.PRECEDENCE_OPTION_NAME);
 		ruleRefOptions.add(LeftRecursiveRuleTransformer.TOKENINDEX_OPTION_NAME);
 	}
 
-	/** Legal options for terminal refs like ID */
+	/** Legal options for terminal refs like ID<assoc=right> */
 	public static final Set tokenOptions = new HashSet();
 	static {
 		tokenOptions.add("assoc");
@@ -553,15 +553,6 @@ public class Grammar implements AttributeResolver {
 
     public List getImportedGrammars() { return importedGrammars; }
 
-    /** Get delegates below direct delegates of g
-    public List getIndirectDelegates(Grammar g) {
-        List direct = getDirectDelegates(g);
-        List delegates = getDelegates(g);
-        delegates.removeAll(direct);
-        return delegates;
-    }
-*/
-
 	public LexerGrammar getImplicitLexer() {
 		return implicitLexer;
 	}
diff --git a/tool/src/org/antlr/v4/tool/GrammarParserInterpreter.java b/tool/src/org/antlr/v4/tool/GrammarParserInterpreter.java
index 9361b40de..1e77d57f8 100644
--- a/tool/src/org/antlr/v4/tool/GrammarParserInterpreter.java
+++ b/tool/src/org/antlr/v4/tool/GrammarParserInterpreter.java
@@ -151,7 +151,7 @@ public class GrammarParserInterpreter extends ParserInterpreter {
 	 *  it's simple. Set decisionStatesThatSetOuterAltNumInContext
 	 *  indicates which decision states should set the outer alternative number.
 	 *
-	 *  Left recursive rules are much more complicated to deal with:
+	 *  
Left recursive rules are much more complicated to deal with:
 	 *  there is typically a decision for the primary alternatives and a
 	 *  decision to choose between the recursive operator alternatives.
 	 *  For example, the following left recursive rule has two primary and 2
diff --git a/tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java b/tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java
index 6759e2015..9668838f0 100644
--- a/tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java
+++ b/tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java
@@ -166,11 +166,11 @@ public class GrammarTransformPipeline {
 	/** Merge all the rules, token definitions, and named actions from
 		imported grammars into the root grammar tree.  Perform:
 
-	 	(tokens { X (= Y 'y')) + (tokens { Z )	->	(tokens { X (= Y 'y') Z)
+	 	(tokens { X (= Y 'y')) + (tokens { Z )	->	(tokens { X (= Y 'y') Z)
 
-	 	(@ members {foo}) + (@ members {bar})	->	(@ members {foobar})
+	 	(@ members {foo}) + (@ members {bar})	->	(@ members {foobar})
 
-	 	(RULES (RULE x y)) + (RULES (RULE z))	->	(RULES (RULE x y z))
+	 	(RULES (RULE x y)) + (RULES (RULE z))	->	(RULES (RULE x y z))
 
 	 	Rules in root prevent same rule from being appended to RULES node.
 
@@ -322,7 +322,7 @@ public class GrammarTransformPipeline {
 	 *  We'll have this Grammar share token symbols later; don't generate
 	 *  tokenVocab or tokens{} section.  Copy over named actions.
 	 *
-	 *  Side-effects: it removes children from GRAMMAR & RULES nodes
+	 *  Side-effects: it removes children from GRAMMAR & RULES nodes
 	 *                in combined AST.  Anything cut out is dup'd before
 	 *                adding to lexer to avoid "who's ur daddy" issues
 	 */
diff --git a/tool/src/org/antlr/v4/tool/LeftRecursiveRule.java b/tool/src/org/antlr/v4/tool/LeftRecursiveRule.java
index 1d3b9902f..ad06e343d 100644
--- a/tool/src/org/antlr/v4/tool/LeftRecursiveRule.java
+++ b/tool/src/org/antlr/v4/tool/LeftRecursiveRule.java
@@ -136,7 +136,7 @@ public class LeftRecursiveRule extends Rule {
 		return alts;
 	}
 
-	/** Get -> labels from those alts we deleted for left-recursive rules. */
+	/** Get -> labels from those alts we deleted for left-recursive rules. */
 	@Override
 	public Map>> getAltLabels() {
 		Map>> labels = new HashMap>>();

From 10756477cee33ffd31fbf3d3b6c8a34f090ba480 Mon Sep 17 00:00:00 2001
From: Martin von Gagern 
Date: Mon, 28 Mar 2016 23:45:08 +0200
Subject: [PATCH 2/2] Signing contributors.txt

---
 contributors.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contributors.txt b/contributors.txt
index fb6040c78..07a894eda 100644
--- a/contributors.txt
+++ b/contributors.txt
@@ -89,3 +89,4 @@ YYYY/MM/DD, github id, Full name, email
 2015/12/23, pboyer, Peter Boyer, peter.b.boyer@gmail.com
 2015/12/24, dtymon, David Tymon, david.tymon@gmail.com
 2016/03/27, beardlybread, Bradley Steinbacher, bradley.j.steinbacher@gmail.com
+2016/03/28, gagern, Martin von Gagern, gagern@ma.tum.de