infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-11 19:08:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

8011677: EndPosTables should avoid hidden references to Parser

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Jonathan Gibbons 2013-04-08 11:57:37 -07:00
parent 876df30973
commit a45f8e0ef9
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
View File

@ -171,8 +171,8 @@ public class JavacParser implements Parser {
protected AbstractEndPosTable newEndPosTable(boolean keepEndPositions) {
return keepEndPositions
? new SimpleEndPosTable()
: new EmptyEndPosTable();
? new SimpleEndPosTable(this)
: new EmptyEndPosTable(this);
}
protected DocCommentTable newDocCommentTable(boolean keepDocComments, ParserFactory fac) {
@ -3088,6 +3088,7 @@ public class JavacParser implements Parser {
toplevel.docComments = docComments;
if (keepLineMap)
toplevel.lineMap = S.getLineMap();
this.endPosTable.setParser(null); // remove reference to parser
toplevel.endPositions = this.endPosTable;
return toplevel;
}
@ -4003,11 +4004,12 @@ public class JavacParser implements Parser {
/*
* a functional source tree and end position mappings
*/
protected class SimpleEndPosTable extends AbstractEndPosTable {
protected static class SimpleEndPosTable extends AbstractEndPosTable {
private final Map<JCTree, Integer> endPosMap;
SimpleEndPosTable() {
SimpleEndPosTable(JavacParser parser) {
super(parser);
endPosMap = new HashMap<JCTree, Integer>();
}
@ -4016,12 +4018,12 @@ public class JavacParser implements Parser {
}
protected <T extends JCTree> T to(T t) {
storeEnd(t, token.endPos);
storeEnd(t, parser.token.endPos);
return t;
}
protected <T extends JCTree> T toP(T t) {
storeEnd(t, S.prevToken().endPos);
storeEnd(t, parser.S.prevToken().endPos);
return t;
}
@ -4043,7 +4045,11 @@ public class JavacParser implements Parser {
/*
* a default skeletal implementation without any mapping overhead.
*/
protected class EmptyEndPosTable extends AbstractEndPosTable {
protected static class EmptyEndPosTable extends AbstractEndPosTable {
EmptyEndPosTable(JavacParser parser) {
super(parser);
}
protected void storeEnd(JCTree tree, int endpos) { /* empty */ }
@ -4065,13 +4071,21 @@ public class JavacParser implements Parser {
}
protected abstract class AbstractEndPosTable implements EndPosTable {
protected static abstract class AbstractEndPosTable implements EndPosTable {
/**
* The current parser.
*/
protected JavacParser parser;
/**
* Store the last error position.
*/
protected int errorEndPos;
public AbstractEndPosTable(JavacParser parser) {
this.parser = parser;
}
/**
* Store ending position for a tree, the value of which is the greater
* of last error position and the given ending position.
@ -4106,5 +4120,9 @@ public class JavacParser implements Parser {
errorEndPos = errPos;
}
}
protected void setParser(JavacParser parser) {
this.parser = parser;
}
}
}