rename tool->dbg (a shitty name still) must refactor. add Tool as the main tool usage.

Author: parrt

src/org/antlr/codebuff/Corpus.java

@@ -19,11 +19,11 @@
 import java.util.Map;
 import java.util.Random;
 
-import static org.antlr.codebuff.Tool.getFilenames;
-import static org.antlr.codebuff.Tool.getLexer;
-import static org.antlr.codebuff.Tool.getParser;
-import static org.antlr.codebuff.Tool.load;
-import static org.antlr.codebuff.Tool.showFileNames;
+import static org.antlr.codebuff.Dbg.getFilenames;
+import static org.antlr.codebuff.Dbg.getLexer;
+import static org.antlr.codebuff.Dbg.getParser;
+import static org.antlr.codebuff.Dbg.load;
+import static org.antlr.codebuff.Dbg.showFileNames;
 
 public class Corpus {
 	public static final int FEATURE_VECTOR_RANDOM_SEED = 314159; // need randomness but use same seed to get reproducibility

src/org/antlr/codebuff/Dbg.java

@@ -18,9 +18,9 @@
 import java.util.Map;
 import java.util.Vector;
 
-import static org.antlr.codebuff.Tool.normalizedLevenshteinDistance;
-import static org.antlr.codebuff.Tool.tokenText;
-import static org.antlr.codebuff.Tool.tokenize;
+import static org.antlr.codebuff.Dbg.normalizedLevenshteinDistance;
+import static org.antlr.codebuff.Dbg.tokenText;
+import static org.antlr.codebuff.Dbg.tokenize;
 import static org.antlr.codebuff.Trainer.CAT_ALIGN;
 import static org.antlr.codebuff.Trainer.CAT_ALIGN_WITH_ANCESTOR_CHILD;
 import static org.antlr.codebuff.Trainer.CAT_INDENT;
@@ -147,7 +147,7 @@ public String format(InputDocument doc, boolean collectAnalysis) throws Exceptio
 
 		String prefix = originalTokens.getText(Interval.of(0, firstToken.getTokenIndex())); // gets any comments in front + first real token
 		charPosInLine = firstToken.getCharPositionInLine()+firstToken.getText().length()+1; // start where first token left off
-		line = Tool.count(prefix, '\n') + 1;
+		line = Dbg.count(prefix, '\n') + 1;
 		output.append(prefix);
 
 		// first identify oversize lists with separators
@@ -210,7 +210,7 @@ else if ( (injectNL_WS&0xFF)==CAT_INJECT_WS ) {
 		int alignOrIndent = CAT_ALIGN;
 
 		if ( newlines>0 ) {
-			output.append(Tool.newlines(newlines));
+			output.append(Dbg.newlines(newlines));
 			line+=newlines;
 			charPosInLine = 0;
 
@@ -231,7 +231,7 @@ else if ( (alignOrIndent&0xFF)==CAT_ALIGN ) {
 					Token firstTokenOnPrevLine = tokensOnPreviousLine.get(0);
 					int indentCol = firstTokenOnPrevLine.getCharPositionInLine();
 					charPosInLine = indentCol;
-					output.append(Tool.spaces(indentCol));
+					output.append(Dbg.spaces(indentCol));
 				}
 			}
 			else if ( (alignOrIndent&0xFF)==CAT_INDENT ) {
@@ -240,7 +240,7 @@ else if ( (alignOrIndent&0xFF)==CAT_INDENT ) {
 		}
 		else {
 			// inject whitespace instead of \n?
-			output.append(Tool.spaces(ws));
+			output.append(Dbg.spaces(ws));
 			charPosInLine += ws;
 		}
 
@@ -275,12 +275,12 @@ public void indent(int indentCat, TerminalNode node) {
 			if ( firstTokenOnPrevLine!=null ) { // if not on first line, we cannot indent
 				int indentedCol = firstTokenOnPrevLine.getCharPositionInLine()+indentSize;
 				charPosInLine = indentedCol;
-				output.append(Tool.spaces(indentedCol));
+				output.append(Dbg.spaces(indentedCol));
 			}
 			else {
 				// no prev token? ok, just indent from left edge
 				charPosInLine = indentSize;
-				output.append(Tool.spaces(indentSize));
+				output.append(Dbg.spaces(indentSize));
 			}
 			return;
 		}
@@ -309,7 +309,7 @@ else if ( child instanceof TerminalNode ) {
 		if ( start!=null ) {
 			int indentCol = start.getCharPositionInLine()+indentSize;
 			charPosInLine = indentCol;
-			output.append(Tool.spaces(indentCol));
+			output.append(Dbg.spaces(indentCol));
 		}
 	}
 
@@ -339,7 +339,7 @@ else if (child instanceof TerminalNode) {
 		if ( start!=null ) {
 			int indentCol = start.getCharPositionInLine();
 			charPosInLine = indentCol;
-			output.append(Tool.spaces(indentCol));
+			output.append(Dbg.spaces(indentCol));
 		}
 	}
 
@@ -402,7 +402,7 @@ public int emitCommentsToTheLeft(int tokenIndexInStream, int injectNL_WS) {
 					String hiddenText = hidden.getText();
 					output.append(hiddenText);
 					if ( hiddenText.matches("\\n+") ) {
-						line += Tool.count(hiddenText, '\n');
+						line += Dbg.count(hiddenText, '\n');
 						charPosInLine = 0;
 					}
 					else {

src/org/antlr/codebuff/Formatter.java

@@ -25,7 +25,7 @@ public class InputDocument {
 
 	public static InputDocument dup(InputDocument old) throws Exception {
 		// reparse to get new tokens, tree
-		return Tool.parse(old.fileName, old.language);
+		return Dbg.parse(old.fileName, old.language);
 	}
 
 	public InputDocument(String fileName, String content, LangDescriptor language) {