1.1 --- a/src/share/classes/com/sun/tools/javac/parser/EndPosParser.java Fri Oct 21 14:14:29 2011 -0700 1.2 +++ b/src/share/classes/com/sun/tools/javac/parser/EndPosParser.java Mon Oct 24 13:00:20 2011 +0100 1.3 @@ -67,14 +67,14 @@ 1.4 /** {@inheritDoc} */ 1.5 @Override 1.6 protected <T extends JCTree> T to(T t) { 1.7 - storeEnd(t, S.endPos()); 1.8 + storeEnd(t, token.endPos); 1.9 return t; 1.10 } 1.11 1.12 /** {@inheritDoc} */ 1.13 @Override 1.14 protected <T extends JCTree> T toP(T t) { 1.15 - storeEnd(t, S.prevEndPos()); 1.16 + storeEnd(t, S.prevToken().endPos); 1.17 return t; 1.18 } 1.19 1.20 @@ -88,7 +88,7 @@ 1.21 /** {@inheritDoc} */ 1.22 @Override 1.23 JCExpression parExpression() { 1.24 - int pos = S.pos(); 1.25 + int pos = token.pos; 1.26 JCExpression t = super.parExpression(); 1.27 return toP(F.at(pos).Parens(t)); 1.28 }