small cleanup. getparent for terminals was getting parent's parent. guard against empty parent.

Author: parrt

java/grammars/org/antlr/codebuff/Clojure.g4

@@ -481,11 +481,15 @@ public static int[] getNodeFeatures(Map<Token, TerminalNode> tokenToNodeMap,
 		ParserRuleContext ancestorParent2 = null;
 		if ( earliestLeftAncestor==null ) { // just use regular parent then
 			ancestorParent = getParent(node);
-			ancestorParent2 = ancestorParent.getParent(); // get immediate parent for context
+			if ( ancestorParent!=null ) {
+				ancestorParent2 = ancestorParent.getParent(); // get immediate parent for context
+			}
 		}
 		else {
 			ancestorParent = getParent(earliestLeftAncestor);  // get parent but skip chain rules
-			ancestorParent2 = ancestorParent.getParent(); // get immediate parent for context
+			if ( ancestorParent!=null ) {
+				ancestorParent2 = ancestorParent.getParent(); // get immediate parent for context
+			}
 		}
 		ParserRuleContext ancestorParent3 = ancestorParent2!=null ? ancestorParent2.getParent() : null;
 		ParserRuleContext ancestorParent4 = ancestorParent3!=null ? ancestorParent3.getParent() : null;
@@ -787,7 +791,7 @@ public static List<Token> getRealTokens(CommonTokenStream tokens) {
 	}
 
 	public static ParserRuleContext getParent(TerminalNode p) {
-		return getParent((ParserRuleContext)p.getParent());
+		return parentClosure((ParserRuleContext)p.getParent());
 	}
 
 	/** Same as p.getParent() except we scan through chain rule nodes */

java/src/org/antlr/codebuff/CollectFeatures.java

@@ -30,7 +30,7 @@
  *
  * Testing:
  *
- * Tool  -antlr     ../grammars                    /Users/parrt/antlr/code/grammars-v4/clojure/Clojure.g4
+ * Tool  -antlr     grammars                       /Users/parrt/antlr/code/grammars-v4/clojure/Clojure.g4
  * Tool  -java      ../samples/stringtemplate4     src/org/antlr/codebuff/Tool.java
  */
 public class Tool {