cleanup

Author: parrt

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

@@ -24,28 +24,29 @@
 import java.util.Map;
 
 public class CollectFeatures {
+	public static final double MAX_CONTEXT_DIFF_THRESHOLD = 0.6;
+
 	// Feature values for pair on diff lines feature
 	public static final int NOT_PAIR = -1;
 	public static final int PAIR_ON_SAME_LINE = 0;
 	public static final int PAIR_ON_DIFF_LINE = 1;
 
 	// Categories for alignment/indentation
 	public static final int CAT_NO_ALIGNMENT = 0;
-	public static final int CAT_INDENT = 1;
-	public static final int CAT_ALIGN_WITH_ANCESTOR_FIRST_TOKEN = 2;
-	public static final int CAT_ALIGN_WITH_ANCESTORS_PARENT_FIRST_TOKEN = 3;
-	public static final int CAT_ALIGN_WITH_LIST_FIRST_ELEMENT = 4;
-	public static final int CAT_ALIGN_WITH_PAIR = 5;
+	public static final int CAT_ALIGN_WITH_ANCESTOR_FIRST_TOKEN = 1;
+	public static final int CAT_ALIGN_WITH_ANCESTORS_PARENT_FIRST_TOKEN = 2;
+	public static final int CAT_ALIGN_WITH_LIST_FIRST_ELEMENT = 3;
+	public static final int CAT_ALIGN_WITH_PAIR = 4;
 
-	public static final double MAX_CONTEXT_DIFF_THRESHOLD = 0.6;
+	public static final int CAT_INDENT = 100;
 
 	public static final int INDEX_PREV2_TYPE        = 0;
 	public static final int INDEX_PREV_TYPE         = 1;
 	public static final int INDEX_PREV_RULE         = 2; // what rule is prev token in?
 	public static final int INDEX_PREV_END_COLUMN   = 3;
 	public static final int INDEX_PREV_EARLIEST_ANCESTOR = 4;
 	public static final int INDEX_TYPE              = 5;
-	public static final int INDEX_FIRST_EL_OF_LIST  = 6;
+	public static final int INDEX_FIRST_EL_OF_LIST  = 6; // TODO: I don't think we can detect first element of list
 	public static final int INDEX_MATCHING_TOKEN_DIFF_LINE = 7;
 	public static final int INDEX_FIRST_ON_LINE		= 8; // a \n right before this token?
 	public static final int INDEX_RULE              = 9; // what rule are we in?
@@ -475,6 +476,7 @@ public static int[] getNodeFeatures(Map<Token, TerminalNode> tokenToNodeMap,
 			sumEndColAndAncestorWidth = prevTokenEndCharPos+earliestAncestorWidth;
 		}
 
+		// TODO: I don't think we can detect first element of list
 		boolean startOfList = isFirstSiblingOfList(tokenToNodeMap, curToken);
 
 		boolean curTokenStartsNewLine = window.get(2).getLine()>window.get(1).getLine();
@@ -779,4 +781,18 @@ public static List<Token> getRealTokens(CommonTokenStream tokens) {
 		}
 		return real;
 	}
+
+	/** Same as p.getParent() except we scan through chain rule nodes */
+	public static ParserRuleContext getParent(ParserRuleContext p) {
+		if ( p==null ) return null;
+		ParserRuleContext lastValidParent = p.getParent();
+		// now try to walk chain rules starting with the parent of the usual parent
+		ParserRuleContext q = lastValidParent.getParent();
+		while ( q!=null && q.getChildCount()==1 ) { // while is a chain rule
+			lastValidParent = q;
+			q = q.getParent();
+		}
+		return lastValidParent;
+	}
+
 }

samples/small/LongStuffAligned.java

@@ -0,0 +1,25 @@
+public class T {
+    public TokenPositionAnalysis getTokenAnalysis(int[] features,
+												  int indexIntoRealTokens, 
+												  int tokenIndexInStream,
+												  int injectNewline,
+												  int alignWithPrevious,
+												  int indent,
+												  int ws)
+	{
+        CommonToken curToken = foo;
+        CommonToken prevToken = 1;
+        if ( ws==0 && cannotJoin(realTokens.get(indexIntoRealTokens-1), curToken) ) {
+            ws = 1;
+            failsafeTriggered = true;
+        }
+    }
+    public static boolean cannotJoin(Token prevToken, Token curToken) {
+        String prevTokenText = prevToken.getText();
+        char prevLastChar = prevTokenText.charAt(prevTokenText.length()-1);
+        String curTokenText = curToken.getText();
+        char curFirstChar = curTokenText.charAt(0);
+        return Character.isLetterOrDigit(prevLastChar) &&
+			   Character.isLetterOrDigit(curFirstChar);
+    }
+}