7106166: (javac) re-factor EndPos parser

Reviewed-by: jjg
This commit is contained in:
Kumar Srinivasan 2011-11-14 15:11:10 -08:00
parent ca1deee4d3
commit b7094ba03c
16 changed files with 274 additions and 225 deletions

View file

@ -55,12 +55,8 @@ import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.tools.Diagnostic;
import javax.tools.DiagnosticListener;
import javax.tools.JavaFileObject;
@ -72,8 +68,8 @@ import com.sun.source.util.TaskListener;
import com.sun.tools.javac.api.JavacTool;
import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Type;
import com.sun.tools.javac.parser.EndPosTable;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.JCTree.JCClassDecl;
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
import com.sun.tools.javac.tree.JCTree.JCImport;
import com.sun.tools.javac.tree.TreeInfo;
@ -421,7 +417,7 @@ public class CheckAttributedTree {
}
JavaFileObject sourcefile;
Map<JCTree, Integer> endPosTable;
EndPosTable endPosTable;
Info encl;
}
@ -437,7 +433,7 @@ public class CheckAttributedTree {
end = Integer.MAX_VALUE;
}
Info(JCTree tree, Map<JCTree, Integer> endPosTable) {
Info(JCTree tree, EndPosTable endPosTable) {
this.tree = tree;
tag = tree.getTag();
start = TreeInfo.getStartPos(tree);