--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java Fri Dec 16 15:27:34 2016 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java Fri Dec 16 15:27:47 2016 +0000
@@ -418,7 +418,7 @@
}
protected JCErroneous syntaxError(int pos, String key, TokenKind... args) {
- return syntaxError(pos, List.<JCTree>nil(), key, args);
+ return syntaxError(pos, List.nil(), key, args);
}
protected JCErroneous syntaxError(int pos, List<JCTree> errs, String key, TokenKind... args) {
@@ -1882,7 +1882,7 @@
return args.toList();
}
} else {
- return List.<JCExpression>of(syntaxError(token.pos, "expected", LT));
+ return List.of(syntaxError(token.pos, "expected", LT));
}
}
@@ -1967,7 +1967,7 @@
/** BracketsOpt = [ "[" "]" { [Annotations] "[" "]"} ]
*/
private JCExpression bracketsOpt(JCExpression t) {
- return bracketsOpt(t, List.<JCAnnotation>nil());
+ return bracketsOpt(t, List.nil());
}
private JCExpression bracketsOptCont(JCExpression t, int pos,
@@ -2147,7 +2147,7 @@
} else {
setErrorEndPos(token.pos);
reportSyntaxError(token.pos, "expected2", LPAREN, LBRACKET);
- t = toP(F.at(newpos).NewClass(null, typeArgs, t, List.<JCExpression>nil(), null));
+ t = toP(F.at(newpos).NewClass(null, typeArgs, t, List.nil(), null));
return toP(F.at(newpos).Erroneous(List.<JCTree>of(t)));
}
}
@@ -2197,8 +2197,8 @@
}
return na;
} else {
- JCExpression t = toP(F.at(newpos).NewArray(elemtype, List.<JCExpression>nil(), null));
- return syntaxError(token.pos, List.<JCTree>of(t), "array.dimension.missing");
+ JCExpression t = toP(F.at(newpos).NewArray(elemtype, List.nil(), null));
+ return syntaxError(token.pos, List.of(t), "array.dimension.missing");
}
} else {
ListBuffer<JCExpression> dims = new ListBuffer<>();
@@ -2267,7 +2267,7 @@
}
}
accept(RBRACE);
- return toP(F.at(newpos).NewArray(t, List.<JCExpression>nil(), elems.toList()));
+ return toP(F.at(newpos).NewArray(t, List.nil(), elems.toList()));
}
/** VariableInitializer = ArrayInitializer | Expression
@@ -2420,7 +2420,7 @@
if (token.kind == COLON && t.hasTag(IDENT)) {
nextToken();
JCStatement stat = parseStatementAsBlock();
- return List.<JCStatement>of(F.at(pos).Labelled(prevToken.name(), stat));
+ return List.of(F.at(pos).Labelled(prevToken.name(), stat));
} else if ((lastmode & TYPE) != 0 && LAX_IDENTIFIER.accepts(token.kind)) {
pos = token.pos;
JCModifiers mods = F.at(Position.NOPOS).Modifiers(0);
@@ -2436,7 +2436,7 @@
t = checkExprStat(t);
accept(SEMI);
JCExpressionStatement expr = toP(F.at(pos).Exec(t));
- return List.<JCStatement>of(expr);
+ return List.of(expr);
}
}
}
@@ -2478,7 +2478,7 @@
case FOR: {
nextToken();
accept(LPAREN);
- List<JCStatement> inits = token.kind == SEMI ? List.<JCStatement>nil() : forInit();
+ List<JCStatement> inits = token.kind == SEMI ? List.nil() : forInit();
if (inits.length() == 1 &&
inits.head.hasTag(VARDEF) &&
((JCVariableDecl) inits.head).init == null &&
@@ -2493,7 +2493,7 @@
accept(SEMI);
JCExpression cond = token.kind == SEMI ? null : parseExpression();
accept(SEMI);
- List<JCExpressionStatement> steps = token.kind == RPAREN ? List.<JCExpressionStatement>nil() : forUpdate();
+ List<JCExpressionStatement> steps = token.kind == RPAREN ? List.nil() : forUpdate();
accept(RPAREN);
JCStatement body = parseStatementAsBlock();
return F.at(pos).ForLoop(inits, cond, steps, body);
@@ -2516,7 +2516,7 @@
}
case TRY: {
nextToken();
- List<JCTree> resources = List.<JCTree>nil();
+ List<JCTree> resources = List.nil();
if (token.kind == LPAREN) {
checkTryWithResources();
nextToken();
@@ -2626,7 +2626,7 @@
int errPos = S.errPos();
JCTree stm = action.doRecover(this);
S.errPos(errPos);
- return toP(F.Exec(syntaxError(startPos, List.<JCTree>of(stm), key)));
+ return toP(F.Exec(syntaxError(startPos, List.of(stm), key)));
}
/** CatchClause = CATCH "(" FormalParameter ")" Block
@@ -2882,7 +2882,7 @@
}
List<JCExpression> annotationFieldValuesOpt() {
- return (token.kind == LPAREN) ? annotationFieldValues() : List.<JCExpression>nil();
+ return (token.kind == LPAREN) ? annotationFieldValues() : List.nil();
}
/** AnnotationFieldValues = "(" [ AnnotationFieldValue { "," AnnotationFieldValue } ] ")" */
@@ -2945,7 +2945,7 @@
}
}
accept(RBRACE);
- return toP(F.at(pos).NewArray(null, List.<JCExpression>nil(), buf.toList()));
+ return toP(F.at(pos).NewArray(null, List.nil(), buf.toList()));
default:
mode = EXPR;
return term1();
@@ -3342,10 +3342,10 @@
int pos = token.pos;
List<JCTree> errs;
if (LAX_IDENTIFIER.accepts(token.kind)) {
- errs = List.<JCTree>of(mods, toP(F.at(pos).Ident(ident())));
+ errs = List.of(mods, toP(F.at(pos).Ident(ident())));
setErrorEndPos(token.pos);
} else {
- errs = List.<JCTree>of(mods);
+ errs = List.of(mods);
}
return toP(F.Exec(syntaxError(pos, errs, "expected3",
CLASS, INTERFACE, ENUM)));
@@ -3423,7 +3423,7 @@
List<JCTree> defs = enumBody(name);
mods.flags |= Flags.ENUM;
JCClassDecl result = toP(F.at(pos).
- ClassDef(mods, name, List.<JCTypeParameter>nil(),
+ ClassDef(mods, name, List.nil(),
null, implementing, defs));
attach(result, dc);
return result;
@@ -3481,7 +3481,7 @@
Name name = ident();
int createPos = token.pos;
List<JCExpression> args = (token.kind == LPAREN)
- ? arguments() : List.<JCExpression>nil();
+ ? arguments() : List.nil();
JCClassDecl body = null;
if (token.kind == LBRACE) {
JCModifiers mods1 = F.at(Position.NOPOS).Modifiers(Flags.ENUM);
@@ -3567,7 +3567,7 @@
protected List<JCTree> classOrInterfaceBodyDeclaration(Name className, boolean isInterface) {
if (token.kind == SEMI) {
nextToken();
- return List.<JCTree>nil();
+ return List.nil();
} else {
Comment dc = token.comment(CommentStyle.JAVADOC);
int pos = token.pos;
@@ -3575,14 +3575,14 @@
if (token.kind == CLASS ||
token.kind == INTERFACE ||
token.kind == ENUM) {
- return List.<JCTree>of(classOrInterfaceOrEnumDeclaration(mods, dc));
+ return List.of(classOrInterfaceOrEnumDeclaration(mods, dc));
} else if (token.kind == LBRACE &&
(mods.flags & Flags.StandardFlags & ~Flags.STATIC) == 0 &&
mods.annotations.isEmpty()) {
if (isInterface) {
error(token.pos, "initializer.not.allowed");
}
- return List.<JCTree>of(block(pos, mods.flags));
+ return List.of(block(pos, mods.flags));
} else {
pos = token.pos;
List<JCTypeParameter> typarams = typeParametersOpt();
@@ -3637,10 +3637,10 @@
} else {
pos = token.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)))
+ ? List.of(toP(F.at(pos).MethodDef(mods, name, type, typarams,
+ List.nil(), List.nil(), null, null)))
: null;
- return List.<JCTree>of(syntaxError(token.pos, err, "expected", LPAREN));
+ return List.of(syntaxError(token.pos, err, "expected", LPAREN));
}
}
}