stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6337964: should ignore last comma in annotation array

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Joe Darcy 2009-09-24 16:00:03 -07:00
parent e116c27b51
commit 06d5d6e0ea
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
View File

@ -2236,7 +2236,7 @@ public class JavacParser implements Parser {
/* AnnotationValue = ConditionalExpression
* | Annotation
* | "{" [ AnnotationValue { "," AnnotationValue } ] "}"
* | "{" [ AnnotationValue { "," AnnotationValue } ] [","] "}"
*/
JCExpression annotationValue() {
int pos;
@ -2253,7 +2253,7 @@ public class JavacParser implements Parser {
buf.append(annotationValue());
while (S.token() == COMMA) {
S.nextToken();
if (S.token() == RPAREN) break;
if (S.token() == RBRACE) break;
buf.append(annotationValue());
}
}

43
langtools/test/tools/javac/annotations/pos/TrailingComma.java Normal file
View File

@ -0,0 +1,43 @@
/*
* Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6337964
* @summary javac incorrectly disallows trailing comma in annotation arrays
* @author darcy
* @compile TrailingComma.java
*/
import java.lang.annotation.*;
@interface TestAnnotation {
SuppressWarnings[] value() default {@SuppressWarnings({"",})};
}
@TestAnnotation({@SuppressWarnings(),
@SuppressWarnings({"Beware the ides of March.",}),
@SuppressWarnings({"Look both ways", "Before Crossing",}), })
public class TrailingComma {
}