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

equal deleted inserted replaced

-:3b3e23e67329
+:3651128c74eb
 }
 /** optimization: To save allocating a new operand/operator stack
 *  for every binary operation, we use supplys.
 */
-ArrayList<JCExpression[]> odStackSupply = new ArrayList<JCExpression[]>();
+ArrayList<JCExpression[]> odStackSupply = new ArrayList<>();
-ArrayList<Token[]> opStackSupply = new ArrayList<Token[]>();
+ArrayList<Token[]> opStackSupply = new ArrayList<>();
 private JCExpression[] newOdStack() {
 if (odStackSupply.isEmpty())
 return new JCExpression[infixPrecedenceLevels + 1];
 return odStackSupply.remove(odStackSupply.size() - 1);
 if ((mode & TYPE) == 0 && isUnboundMemberRef()) {
 //this is an unbound method reference whose qualifier
 //is a generic type i.e. A<S>::m
 int pos1 = token.pos;
 accept(LT);
-ListBuffer<JCExpression> args = new ListBuffer<JCExpression>();
+ListBuffer<JCExpression> args = new ListBuffer<>();
 args.append(typeArgument());
 while (token.kind == COMMA) {
 nextToken();
 args.append(typeArgument());
 }
 enum ParensResult {
 CAST,
 EXPLICIT_LAMBDA,
 IMPLICIT_LAMBDA,
-PARENS;
+PARENS
 }
 JCExpression lambdaExpressionOrStatement(boolean hasParens, boolean explicitParams, int pos) {
 List<JCVariableDecl> params = explicitParams ?
 formalParameters(true) :
 } else {
 JCExpression t = toP(F.at(newpos).NewArray(elemtype, List.<JCExpression>nil(), null));
 return syntaxError(token.pos, List.<JCTree>of(t), "array.dimension.missing");
 }
 } else {
-ListBuffer<JCExpression> dims = new ListBuffer<JCExpression>();
+ListBuffer<JCExpression> dims = new ListBuffer<>();
 // maintain array dimension type annotations
 ListBuffer<List<JCAnnotation>> dimAnnotations = new ListBuffer<>();
 dimAnnotations.append(annos);
 /** ArrayInitializer = "{" [VariableInitializer {"," VariableInitializer}] [","] "}"
 */
 JCExpression arrayInitializer(int newpos, JCExpression t) {
 accept(LBRACE);
-ListBuffer<JCExpression> elems = new ListBuffer<JCExpression>();
+ListBuffer<JCExpression> elems = new ListBuffer<>();
 if (token.kind == COMMA) {
 nextToken();
 } else if (token.kind != RBRACE) {
 elems.append(variableInitializer());
 while (token.kind == COMMA) {
 *                  = { FINAL | '@' Annotation } Type VariableDeclarators ";"
 */
 @SuppressWarnings("fallthrough")
 List<JCStatement> blockStatements() {
 //todo: skip to anchor on error(?)
-ListBuffer<JCStatement> stats = new ListBuffer<JCStatement>();
+ListBuffer<JCStatement> stats = new ListBuffer<>();
 while (true) {
 List<JCStatement> stat = blockStatement();
 if (stat.isEmpty()) {
 return stats.toList();
 } else {
 allowEnums && token.kind == ENUM) {
 return List.of(classOrInterfaceOrEnumDeclaration(mods, dc));
 } else {
 JCExpression t = parseType();
 ListBuffer<JCStatement> stats =
-variableDeclarators(mods, t, new ListBuffer<JCStatement>());
+variableDeclarators(mods, t, new ListBuffer<>());
 // A "LocalVariableDeclarationStatement" subsumes the terminating semicolon
 storeEnd(stats.last(), token.endPos);
 accept(SEMI);
 return stats.toList();
 }
 } else if ((lastmode & TYPE) != 0 && LAX_IDENTIFIER.accepts(token.kind)) {
 pos = token.pos;
 JCModifiers mods = F.at(Position.NOPOS).Modifiers(0);
 F.at(pos);
 ListBuffer<JCStatement> stats =
-variableDeclarators(mods, t, new ListBuffer<JCStatement>());
+variableDeclarators(mods, t, new ListBuffer<>());
 // A "LocalVariableDeclarationStatement" subsumes the terminating semicolon
 storeEnd(stats.last(), token.endPos);
 accept(SEMI);
 return stats.toList();
 } else {
 nextToken();
 resources = resources();
 accept(RPAREN);
 }
 JCBlock body = block();
-ListBuffer<JCCatch> catchers = new ListBuffer<JCCatch>();
+ListBuffer<JCCatch> catchers = new ListBuffer<>();
 JCBlock finalizer = null;
 if (token.kind == CATCH || token.kind == FINALLY) {
 while (token.kind == CATCH) catchers.append(catchClause());
 if (token.kind == FINALLY) {
 nextToken();
 /** SwitchBlockStatementGroups = { SwitchBlockStatementGroup }
 *  SwitchBlockStatementGroup = SwitchLabel BlockStatements
 *  SwitchLabel = CASE ConstantExpression ":" | DEFAULT ":"
 */
 List<JCCase> switchBlockStatementGroups() {
-ListBuffer<JCCase> cases = new ListBuffer<JCCase>();
+ListBuffer<JCCase> cases = new ListBuffer<>();
 while (true) {
 int pos = token.pos;
 switch (token.kind) {
 case CASE:
 case DEFAULT:
 /** ForUpdate = StatementExpression MoreStatementExpressions
 */
 List<JCExpressionStatement> forUpdate() {
 return moreStatementExpressions(token.pos,
 parseExpression(),
-new ListBuffer<JCExpressionStatement>()).toList();
+new ListBuffer<>()).toList();
 }
 /** AnnotationsOpt = { '@' Annotation }
 *
 * @param kind Whether to parse an ANNOTATION or TYPE_ANNOTATION
 */
 List<JCAnnotation> annotationsOpt(Tag kind) {
 if (token.kind != MONKEYS_AT) return List.nil(); // optimization
-ListBuffer<JCAnnotation> buf = new ListBuffer<JCAnnotation>();
+ListBuffer<JCAnnotation> buf = new ListBuffer<>();
 int prevmode = mode;
 while (token.kind == MONKEYS_AT) {
 int pos = token.pos;
 nextToken();
 buf.append(annotation(pos, kind));
 JCModifiers modifiersOpt() {
 return modifiersOpt(null);
 }
 protected JCModifiers modifiersOpt(JCModifiers partial) {
 long flags;
-ListBuffer<JCAnnotation> annotations = new ListBuffer<JCAnnotation>();
+ListBuffer<JCAnnotation> annotations = new ListBuffer<>();
 int pos;
 if (partial == null) {
 flags = 0;
 pos = token.pos;
 } else {
 }
 /** AnnotationFieldValues   = "(" [ AnnotationFieldValue { "," AnnotationFieldValue } ] ")" */
 List<JCExpression> annotationFieldValues() {
 accept(LPAREN);
-ListBuffer<JCExpression> buf = new ListBuffer<JCExpression>();
+ListBuffer<JCExpression> buf = new ListBuffer<>();
 if (token.kind != RPAREN) {
 buf.append(annotationFieldValue());
 while (token.kind == COMMA) {
 nextToken();
 buf.append(annotationFieldValue());
 nextToken();
 return annotation(pos, Tag.ANNOTATION);
 case LBRACE:
 pos = token.pos;
 accept(LBRACE);
-ListBuffer<JCExpression> buf = new ListBuffer<JCExpression>();
+ListBuffer<JCExpression> buf = new ListBuffer<>();
 if (token.kind == COMMA) {
 nextToken();
 } else if (token.kind != RBRACE) {
 buf.append(annotationValue());
 while (token.kind == COMMA) {
 }
 /** Resources = Resource { ";" Resources }
 */
 List<JCTree> resources() {
-ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
+ListBuffer<JCTree> defs = new ListBuffer<>();
 defs.append(resource());
 while (token.kind == SEMI) {
 // All but last of multiple declarators must subsume a semicolon
 storeEnd(defs.last(), token.endPos);
 int semiColonPos = token.pos;
 }
 nextToken();
 pid = qualident(false);
 accept(SEMI);
 }
-ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
+ListBuffer<JCTree> defs = new ListBuffer<>();
 boolean checkForImports = true;
 boolean firstTypeDecl = true;
 while (token.kind != EOF) {
 if (token.pos > 0 && token.pos <= endPosTable.errorEndPos) {
 // error recovery
 /** EnumBody = "{" { EnumeratorDeclarationList } [","]
 *                  [ ";" {ClassBodyDeclaration} ] "}"
 */
 List<JCTree> enumBody(Name enumName) {
 accept(LBRACE);
-ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
+ListBuffer<JCTree> defs = new ListBuffer<>();
 if (token.kind == COMMA) {
 nextToken();
 } else if (token.kind != RBRACE && token.kind != SEMI) {
 defs.append(enumeratorDeclaration(enumName));
 while (token.kind == COMMA) {
 }
 /** TypeList = Type {"," Type}
 */
 List<JCExpression> typeList() {
-ListBuffer<JCExpression> ts = new ListBuffer<JCExpression>();
+ListBuffer<JCExpression> ts = new ListBuffer<>();
 ts.append(parseType());
 while (token.kind == COMMA) {
 nextToken();
 ts.append(parseType());
 }
 // error recovery
 skip(false, true, false, false);
 if (token.kind == LBRACE)
 nextToken();
 }
-ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
+ListBuffer<JCTree> defs = new ListBuffer<>();
 while (token.kind != RBRACE && token.kind != EOF) {
 defs.appendList(classOrInterfaceBodyDeclaration(className, isInterface));
 if (token.pos <= endPosTable.errorEndPos) {
 // error recovery
 skip(false, true, true, false);
 }
 /** QualidentList = [Annotations] Qualident {"," [Annotations] Qualident}
 */
 List<JCExpression> qualidentList() {
-ListBuffer<JCExpression> ts = new ListBuffer<JCExpression>();
+ListBuffer<JCExpression> ts = new ListBuffer<>();
 List<JCAnnotation> typeAnnos = typeAnnotationsOpt();
 JCExpression qi = qualident(true);
 if (!typeAnnos.isEmpty()) {
 JCExpression at = insertAnnotationsToMostInner(qi, typeAnnos, false);
 *  }
 */
 List<JCTypeParameter> typeParametersOpt() {
 if (token.kind == LT) {
 checkGenerics();
-ListBuffer<JCTypeParameter> typarams = new ListBuffer<JCTypeParameter>();
+ListBuffer<JCTypeParameter> typarams = new ListBuffer<>();
 nextToken();
 typarams.append(typeParameter());
 while (token.kind == COMMA) {
 nextToken();
 typarams.append(typeParameter());
 */
 JCTypeParameter typeParameter() {
 int pos = token.pos;
 List<JCAnnotation> annos = typeAnnotationsOpt();
 Name name = ident();
-ListBuffer<JCExpression> bounds = new ListBuffer<JCExpression>();
+ListBuffer<JCExpression> bounds = new ListBuffer<>();
 if (token.kind == EXTENDS) {
 nextToken();
 bounds.append(parseType());
 while (token.kind == AMP) {
 nextToken();
 */
 List<JCVariableDecl> formalParameters() {
 return formalParameters(false);
 }
 List<JCVariableDecl> formalParameters(boolean lambdaParameters) {
-ListBuffer<JCVariableDecl> params = new ListBuffer<JCVariableDecl>();
+ListBuffer<JCVariableDecl> params = new ListBuffer<>();
 JCVariableDecl lastParam;
 accept(LPAREN);
 if (token.kind != RPAREN) {
 this.allowThisIdent = true;
 lastParam = formalParameter(lambdaParameters);
 List<JCVariableDecl> implicitParameters(boolean hasParens) {
 if (hasParens) {
 accept(LPAREN);
 }
-ListBuffer<JCVariableDecl> params = new ListBuffer<JCVariableDecl>();
+ListBuffer<JCVariableDecl> params = new ListBuffer<>();
 if (token.kind != RPAREN && token.kind != ARROW) {
 params.append(implicitParameter());
 while (token.kind == COMMA) {
 nextToken();
 params.append(implicitParameter());
 private final Map<JCTree, Integer> endPosMap;
 SimpleEndPosTable(JavacParser parser) {
 super(parser);
-endPosMap = new HashMap<JCTree, Integer>();
+endPosMap = new HashMap<>();
 }
 public void storeEnd(JCTree tree, int endpos) {
 endPosMap.put(tree, errorEndPos > endpos ? errorEndPos : endpos);
 }

changeset 22163	3651128c74eb
parent 22155	2f0a83a98593
child 22165	ec53c8946fc2