1.1 --- a/test/tools/javac/api/TestJavacTaskScanner.java Fri Oct 21 14:14:29 2011 -0700
1.2 +++ b/test/tools/javac/api/TestJavacTaskScanner.java Mon Oct 24 13:00:20 2011 +0100
1.3 @@ -32,6 +32,7 @@
1.4
1.5 import com.sun.tools.javac.api.JavacTaskImpl;
1.6 import com.sun.tools.javac.parser.*;
1.7 +import com.sun.tools.javac.parser.Tokens.Token;
1.8 import com.sun.tools.javac.util.*;
1.9 import java.io.*;
1.10 import java.net.*;
1.11 @@ -93,7 +94,7 @@
1.12
1.13 check(numTokens, "#Tokens", 1222);
1.14 check(numParseTypeElements, "#parseTypeElements", 136);
1.15 - check(numAllMembers, "#allMembers", 67);
1.16 + check(numAllMembers, "#allMembers", 52);
1.17 }
1.18
1.19 void check(int value, String name, int expected) {
1.20 @@ -206,7 +207,8 @@
1.21
1.22 public void nextToken() {
1.23 super.nextToken();
1.24 - System.err.format("Saw token %s (%s)%n", token(), name());
1.25 + Token tk = token();
1.26 + System.err.format("Saw token %s %n", tk.kind);
1.27 test.numTokens++;
1.28 }
1.29
