jdk-sandbox: comparison langtools/src/share/classes/com/sun/tools/javac/parser/Parser.java

equal deleted inserted replaced

-:13aae74ca013
+:38e24969c7e9
 }
 S.nextToken();
 }
 }
-private JCErroneous syntaxError(int pos, String key, Object... arg) {
+private JCErroneous syntaxError(int pos, String key, Token... args) {
-return syntaxError(pos, null, key, arg);
+return syntaxError(pos, null, key, args);
 }
-private JCErroneous syntaxError(int pos, List<JCTree> errs, String key, Object... arg) {
+private JCErroneous syntaxError(int pos, List<JCTree> errs, String key, Token... args) {
 setErrorEndPos(pos);
-reportSyntaxError(pos, key, arg);
+reportSyntaxError(pos, key, (Object[])args);
 return toP(F.at(pos).Erroneous(errs));
 }
 private int errorPos = Position.NOPOS;
 /**
 * Report a syntax error at given position using the given
 * argument unless one was already reported at the same position.
 */
-private void reportSyntaxError(int pos, String key, Object... arg) {
+private void reportSyntaxError(int pos, String key, Object... args) {
 if (pos > S.errPos() || pos == Position.NOPOS) {
 if (S.token() == EOF)
 log.error(pos, "premature.eof");
 else
-log.error(pos, key, arg);
+log.error(pos, key, args);
 }
 S.errPos(pos);
 if (S.pos() == errorPos)
 S.nextToken(); // guarantee progress
 errorPos = S.pos();
 }
 /** Generate a syntax error at current position unless one was
 *  already reported at the same position.
 */
-private JCErroneous syntaxError(String key, String arg) {
+private JCErroneous syntaxError(String key, Token arg) {
 return syntaxError(S.pos(), key, arg);
 }
 /** If next input token matches given token, skip it, otherwise report
 *  an error.
 public void accept(Token token) {
 if (S.token() == token) {
 S.nextToken();
 } else {
 setErrorEndPos(S.pos());
-reportSyntaxError(S.prevEndPos(), "expected", keywords.token2string(token));
+reportSyntaxError(S.prevEndPos(), "expected", token);
 }
 }
 /** Report an illegal start of expression/type error at given position.
 */
 /** Diagnose a modifier flag from the set, if any. */
 void checkNoMods(long mods) {
 if (mods != 0) {
 long lowestMod = mods & -mods;
 log.error(S.pos(), "mod.not.allowed.here",
-Flags.toString(lowestMod).trim());
+Flags.asFlagSet(lowestMod));
 }
 }
 /* ---------- doc comments --------- */
 args.append(expression());
 }
 }
 accept(RPAREN);
 } else {
-syntaxError(S.pos(), "expected", keywords.token2string(LPAREN));
+syntaxError(S.pos(), "expected", LPAREN);
 }
 return args.toList();
 }
 JCMethodInvocation arguments(List<JCExpression> typeArgs, JCExpression t) {
 default:
 accept(GT);
 break;
 }
 } else {
-syntaxError(S.pos(), "expected", keywords.token2string(LT));
+syntaxError(S.pos(), "expected", LT);
 }
 return args.toList();
 }
 /** TypeArgument = Type
 S.nextToken();
 return F.at(pos).Wildcard(t, type());
 } else if (S.token() == IDENTIFIER) {
 //error recovery
 reportSyntaxError(S.prevEndPos(), "expected3",
-keywords.token2string(GT),
+GT, EXTENDS, SUPER);
-keywords.token2string(EXTENDS),
-keywords.token2string(SUPER));
 TypeBoundKind t = F.at(Position.NOPOS).TypeBoundKind(BoundKind.UNBOUND);
 JCExpression wc = toP(F.at(pos).Wildcard(t, null));
 JCIdent id = toP(F.at(S.pos()).Ident(ident()));
 return F.at(pos).Erroneous(List.<JCTree>of(wc, id));
 } else {
 return e;
 } else if (S.token() == LPAREN) {
 return classCreatorRest(newpos, null, typeArgs, t);
 } else {
 reportSyntaxError(S.pos(), "expected2",
-keywords.token2string(LPAREN),
+LPAREN, LBRACKET);
-keywords.token2string(LBRACKET));
 t = toP(F.at(newpos).NewClass(null, typeArgs, t, List.<JCExpression>nil(), null));
 return toP(F.at(newpos).Erroneous(List.<JCTree>of(t)));
 }
 }
 JCBlock block(int pos, long flags) {
 accept(LBRACE);
 List<JCStatement> stats = blockStatements();
 JCBlock t = F.at(pos).Block(flags, stats);
 while (S.token() == CASE || S.token() == DEFAULT) {
-syntaxError("orphaned", keywords.token2string(S.token()));
+syntaxError("orphaned", S.token());
 switchBlockStatementGroups();
 }
 // the Block node has a field "endpos" for first char of last token, which is
 // usually but not necessarily the last char of the last token.
 t.endpos = S.pos();
 case RBRACE: case EOF:
 return cases.toList();
 default:
 S.nextToken(); // to ensure progress
 syntaxError(pos, "expected3",
-keywords.token2string(CASE),
+CASE, DEFAULT, RBRACE);
-keywords.token2string(DEFAULT),
-keywords.token2string(RBRACE));
 }
 }
 }
 /** MoreStatementExpressions = { COMMA StatementExpression }
 JCExpression init = null;
 if (S.token() == EQ) {
 S.nextToken();
 init = variableInitializer();
 }
-else if (reqInit) syntaxError(S.pos(), "expected", keywords.token2string(EQ));
+else if (reqInit) syntaxError(S.pos(), "expected", EQ);
 JCVariableDecl result =
 toP(F.at(pos).VarDef(mods, name, type, init));
 attach(result, dc);
 return result;
 }
 setErrorEndPos(S.pos());
 } else {
 errs = List.<JCTree>of(mods);
 }
 return toP(F.Exec(syntaxError(pos, errs, "expected3",
-keywords.token2string(CLASS),
+CLASS, INTERFACE, ENUM)));
-keywords.token2string(INTERFACE),
-keywords.token2string(ENUM))));
 }
 } else {
 if (S.token() == ENUM) {
 log.error(S.pos(), "enums.not.supported.in.source", source.name);
 allowEnums = true;
 setErrorEndPos(S.pos());
 } else {
 errs = List.<JCTree>of(mods);
 }
 return toP(F.Exec(syntaxError(pos, errs, "expected2",
-keywords.token2string(CLASS),
+CLASS, INTERFACE)));
-keywords.token2string(INTERFACE))));
 }
 }
 /** ClassDeclaration = CLASS Ident TypeParametersOpt [EXTENDS Type]
 *                     [IMPLEMENTS TypeList] ClassBody
 if (S.token() == RBRACE || S.token() == SEMI) break;
 defs.append(enumeratorDeclaration(enumName));
 }
 if (S.token() != SEMI && S.token() != RBRACE) {
 defs.append(syntaxError(S.pos(), "expected3",
-keywords.token2string(COMMA),
+COMMA, RBRACE, SEMI));
-keywords.token2string(RBRACE),
-keywords.token2string(SEMI)));
 S.nextToken();
 }
 }
 if (S.token() == SEMI) {
 S.nextToken();
 pos = S.pos();
 List<JCTree> err = isVoid
 ? List.<JCTree>of(toP(F.at(pos).MethodDef(mods, name, type, typarams,
 List.<JCVariableDecl>nil(), List.<JCExpression>nil(), null, null)))
 : null;
-return List.<JCTree>of(syntaxError(S.pos(), err, "expected", keywords.token2string(LPAREN)));
+return List.<JCTree>of(syntaxError(S.pos(), err, "expected", LPAREN));
 }
 }
 }
 }
 }

changeset 939	38e24969c7e9
parent 735	372aa565a221
child 1258	1cf37d8837d1