Mercurial > hg > release > icedtea7-forest-2.3 > langtools
changeset 416:26651c0cabb7
Merge
| author | andrew |
|---|---|
| date | Sat, 03 Oct 2009 00:16:09 +0100 |
| parents | 5a36337cc053 (current diff) 9596dff46093 (diff) |
| children | 7fbf76ee970b |
| files | |
| diffstat | 74 files changed, 861 insertions(+), 81 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Sep 21 17:11:48 2009 +0100 +++ b/.hgtags Sat Oct 03 00:16:09 2009 +0100 @@ -46,3 +46,4 @@ ce9bcdcb7859bb7ef10afd078ad59ba7847f208d jdk7-b69 97d06f3e87873e310aa2f3fbca58fc8872d86b9f jdk7-b70 33c8c38e1757006c17d80499fb3347102501fae5 jdk7-b71 +261c54b2312ed26d6ec45c675831375460250519 jdk7-b72
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Sat Oct 03 00:16:09 2009 +0100 @@ -1435,7 +1435,17 @@ // documented, this must be an inherited link. Redirect it. // The current class either overrides the referenced member or // inherits it automatically. - containing = ((ClassWriterImpl) this).getClassDoc(); + if (this instanceof ClassWriterImpl) { + containing = ((ClassWriterImpl) this).getClassDoc(); + } else if (!containing.isPublic()){ + configuration.getDocletSpecificMsg().warning( + see.position(), "doclet.see.class_or_package_not_accessible", + tagName, containing.qualifiedName()); + } else { + configuration.getDocletSpecificMsg().warning( + see.position(), "doclet.see.class_or_package_not_found", + tagName, seetext); + } } if (configuration.currentcd != containing) { refMemName = containing.name() + "." + refMemName;
--- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Sat Oct 03 00:16:09 2009 +0100 @@ -69,6 +69,7 @@ doclet.No_Package_Comment_File=For Package {0} Package.Comment file not found doclet.No_Source_For_Class=Source information for class {0} not available. doclet.see.class_or_package_not_found=Tag {0}: reference not found: {1} +doclet.see.class_or_package_not_accessible=Tag {0}: reference not accessible: {1} doclet.see.malformed_tag=Tag {0}: Malformed: {1} doclet.Inherited_API_Summary=Inherited API Summary doclet.Deprecated_API=Deprecated API
--- a/src/share/classes/com/sun/tools/javac/code/Source.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/Source.java Sat Oct 03 00:16:09 2009 +0100 @@ -159,6 +159,12 @@ public boolean allowTypeAnnotations() { return compareTo(JDK1_7) >= 0; } + public boolean allowBinaryLiterals() { + return compareTo(JDK1_7) >= 0; + } + public boolean allowUnderscoresInLiterals() { + return compareTo(JDK1_7) >= 0; + } public static SourceVersion toSourceVersion(Source source) { switch(source) { case JDK1_2:
--- a/src/share/classes/com/sun/tools/javac/code/Type.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/Type.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1999-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
--- a/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-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
--- a/src/share/classes/com/sun/tools/javac/file/CloseableURLClassLoader.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javac/file/CloseableURLClassLoader.java Sat Oct 03 00:16:09 2009 +0100 @@ -69,8 +69,10 @@ if (l.getClass().getName().equals("sun.misc.URLClassPath$JarLoader")) { Field jarField = l.getClass().getDeclaredField("jar"); JarFile jar = (JarFile) getField(l, jarField); - //System.err.println("CloseableURLClassLoader: closing " + jar); - jar.close(); + if (jar != null) { + //System.err.println("CloseableURLClassLoader: closing " + jar); + jar.close(); + } } } } catch (Throwable t) {
--- a/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-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
--- a/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-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
--- a/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-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
--- a/src/share/classes/com/sun/tools/javac/file/ZipArchive.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javac/file/ZipArchive.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-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
--- a/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-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
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1999-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
--- a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Sat Oct 03 00:16:09 2009 +0100 @@ -593,7 +593,7 @@ //where boolean isZero(String s) { char[] cs = s.toCharArray(); - int base = ((Character.toLowerCase(s.charAt(1)) == 'x') ? 16 : 10); + int base = ((cs.length > 1 && Character.toLowerCase(cs[1]) == 'x') ? 16 : 10); int i = ((base==16) ? 2 : 0); while (i < cs.length && (cs[i] == '0' || cs[i] == '.')) i++; return !(i < cs.length && (Character.digit(cs[i], base) > 0));
--- a/src/share/classes/com/sun/tools/javac/parser/Scanner.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javac/parser/Scanner.java Sat Oct 03 00:16:09 2009 +0100 @@ -100,6 +100,18 @@ */ private boolean allowHexFloats; + /** Allow binary literals. + */ + private boolean allowBinaryLiterals; + + /** Allow underscores in literals. + */ + private boolean allowUnderscoresInLiterals; + + /** The source language setting. + */ + private Source source; + /** The token's position, 0-based offset from beginning of text. */ private int pos; @@ -162,10 +174,13 @@ /** Common code for constructors. */ private Scanner(Factory fac) { - this.log = fac.log; - this.names = fac.names; - this.keywords = fac.keywords; - this.allowHexFloats = fac.source.allowHexFloats(); + log = fac.log; + names = fac.names; + keywords = fac.keywords; + source = fac.source; + allowBinaryLiterals = source.allowBinaryLiterals(); + allowHexFloats = source.allowHexFloats(); + allowUnderscoresInLiterals = source.allowBinaryLiterals(); } private static final boolean hexFloatsWork = hexFloatsWork(); @@ -396,23 +411,42 @@ scanLitChar(true); } + private void scanDigits(int digitRadix) { + char saveCh; + int savePos; + do { + if (ch != '_') { + putChar(ch); + } else { + if (!allowUnderscoresInLiterals) { + lexError("unsupported.underscore", source.name); + allowUnderscoresInLiterals = true; + } + } + saveCh = ch; + savePos = bp; + scanChar(); + } while (digit(digitRadix) >= 0 || ch == '_'); + if (saveCh == '_') + lexError(savePos, "illegal.underscore"); + } + /** Read fractional part of hexadecimal floating point number. */ private void scanHexExponentAndSuffix() { if (ch == 'p' || ch == 'P') { putChar(ch); scanChar(); + skipIllegalUnderscores(); if (ch == '+' || ch == '-') { putChar(ch); scanChar(); } + skipIllegalUnderscores(); if ('0' <= ch && ch <= '9') { - do { - putChar(ch); - scanChar(); - } while ('0' <= ch && ch <= '9'); + scanDigits(10); if (!allowHexFloats) { - lexError("unsupported.fp.lit"); + lexError("unsupported.fp.lit", source.name); allowHexFloats = true; } else if (!hexFloatsWork) @@ -438,23 +472,22 @@ /** Read fractional part of floating point number. */ private void scanFraction() { - while (digit(10) >= 0) { - putChar(ch); - scanChar(); + skipIllegalUnderscores(); + if ('0' <= ch && ch <= '9') { + scanDigits(10); } int sp1 = sp; if (ch == 'e' || ch == 'E') { putChar(ch); scanChar(); + skipIllegalUnderscores(); if (ch == '+' || ch == '-') { putChar(ch); scanChar(); } + skipIllegalUnderscores(); if ('0' <= ch && ch <= '9') { - do { - putChar(ch); - scanChar(); - } while ('0' <= ch && ch <= '9'); + scanDigits(10); return; } lexError("malformed.fp.lit"); @@ -487,10 +520,10 @@ assert ch == '.'; putChar(ch); scanChar(); - while (digit(16) >= 0) { + skipIllegalUnderscores(); + if (digit(16) >= 0) { seendigit = true; - putChar(ch); - scanChar(); + scanDigits(16); } if (!seendigit) lexError("invalid.hex.number"); @@ -498,28 +531,35 @@ scanHexExponentAndSuffix(); } + private void skipIllegalUnderscores() { + if (ch == '_') { + lexError(bp, "illegal.underscore"); + while (ch == '_') + scanChar(); + } + } + /** Read a number. - * @param radix The radix of the number; one of 8, 10, 16. + * @param radix The radix of the number; one of 2, j8, 10, 16. */ private void scanNumber(int radix) { this.radix = radix; // for octal, allow base-10 digit in case it's a float literal - int digitRadix = (radix <= 10) ? 10 : 16; + int digitRadix = (radix == 8 ? 10 : radix); boolean seendigit = false; - while (digit(digitRadix) >= 0) { + if (digit(digitRadix) >= 0) { seendigit = true; - putChar(ch); - scanChar(); + scanDigits(digitRadix); } if (radix == 16 && ch == '.') { scanHexFractionAndSuffix(seendigit); } else if (seendigit && radix == 16 && (ch == 'p' || ch == 'P')) { scanHexExponentAndSuffix(); - } else if (radix <= 10 && ch == '.') { + } else if (digitRadix == 10 && ch == '.') { putChar(ch); scanChar(); scanFractionAndSuffix(); - } else if (radix <= 10 && + } else if (digitRadix == 10 && (ch == 'e' || ch == 'E' || ch == 'f' || ch == 'F' || ch == 'd' || ch == 'D')) { @@ -821,6 +861,7 @@ scanChar(); if (ch == 'x' || ch == 'X') { scanChar(); + skipIllegalUnderscores(); if (ch == '.') { scanHexFractionAndSuffix(false); } else if (digit(16) < 0) { @@ -828,8 +869,25 @@ } else { scanNumber(16); } + } else if (ch == 'b' || ch == 'B') { + if (!allowBinaryLiterals) { + lexError("unsupported.binary.lit", source.name); + allowBinaryLiterals = true; + } + scanChar(); + skipIllegalUnderscores(); + scanNumber(2); } else { putChar('0'); + if (ch == '_') { + int savePos = bp; + do { + scanChar(); + } while (ch == '_'); + if (digit(10) < 0) { + lexError(savePos, "illegal.underscore"); + } + } scanNumber(8); } return;
--- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Sat Oct 03 00:16:09 2009 +0100 @@ -216,6 +216,8 @@ illegal line end in character literal compiler.err.illegal.nonascii.digit=\ illegal non-ASCII digit +compiler.err.illegal.underscore=\ + illegal underscore compiler.err.illegal.qual.not.icls=\ illegal qualifier; {0} is not an inner class compiler.err.illegal.start.of.expr=\ @@ -1163,7 +1165,16 @@ # Diagnostics for language feature changes ######################################## compiler.err.unsupported.fp.lit=\ - hexadecimal floating-point literals are not supported before -source 5 + hexadecimal floating point literals are not supported in -source {0}\n\ +(use -source 5 or higher to enable hexadecimal floating point literals) + +compiler.err.unsupported.binary.lit=\ + binary literals are not supported in -source {0}\n\ +(use -source 7 or higher to enable binary literals) + +compiler.err.unsupported.underscore.lit=\ + underscores in literals are not supported in -source {0}\n\ +(use -source 7 or higher to enable underscores in literals) compiler.warn.enum.as.identifier=\ as of release 5, ''enum'' is a keyword, and may not be used as an identifier\n\
--- a/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java Sat Oct 03 00:16:09 2009 +0100 @@ -60,7 +60,12 @@ */ public AnnotationTypeDoc annotationType() { ClassSymbol atsym = (ClassSymbol)annotation.type.tsym; - return (AnnotationTypeDoc)env.getClassDoc(atsym); + if (annotation.type.isErroneous()) { + env.warning(null, "javadoc.class_not_found", annotation.type.toString()); + return new AnnotationTypeDocImpl(env, atsym); + } else { + return (AnnotationTypeDoc)env.getClassDoc(atsym); + } } /**
--- a/src/share/classes/com/sun/tools/javap/JavapTask.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/com/sun/tools/javap/JavapTask.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2007-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
--- a/src/share/classes/javax/lang/model/element/TypeElement.java Mon Sep 21 17:11:48 2009 +0100 +++ b/src/share/classes/javax/lang/model/element/TypeElement.java Sat Oct 03 00:16:09 2009 +0100 @@ -60,6 +60,22 @@ * @since 1.6 */ public interface TypeElement extends Element, Parameterizable, QualifiedNameable { + /** + * {@inheritDoc} + * + * <p> Note that as a particular instance of the {@linkplain + * javax.lang.model.element general accuracy requirements} and the + * ordering behavior required of this interface, the list of + * enclosed elements will be returned in the natural order for the + * originating source of information about the type. For example, + * if the information about the type is originating from a source + * file, the elements will be returned in source code order. + * (However, in that case the the ordering of synthesized + * elements, such as a default constructor, is not specified.) + * + * @return the enclosed elements in proper order, or an empty list if none + */ + List<? extends Element> getEnclosedElements(); /** * Returns the <i>nesting kind</i> of this type element.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/5093723/DocumentedClass.java Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,34 @@ +/* + * Copyright 2009 Google, 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. + */ + +/** A documented class. */ +public class DocumentedClass extends UndocumentedClass { + /** {@link #method} */ + public void m1() {} + /** {@link #publicMethod} */ + public void m2() {} + /** {@link #protectedMethod} */ + public void m3() {} + /** {@link #privateMethod} */ + public void m4() {} +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/5093723/T5093723.java Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,57 @@ +/* + * Copyright 2009 Google, 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 5093723 + * @summary REGRESSION: ClassCastException in SingleIndexWriter + * @library ../lib/ + * @build JavadocTester + * @build T5093723 + * @run main T5093723 + */ + +public class T5093723 extends JavadocTester { + + private static final String BUG_ID = "5093723"; + + private static final String[] ARGS = new String[] { + "-d", BUG_ID + ".out", "-source", "5", + SRC_DIR + "/DocumentedClass.java", + SRC_DIR + "/UndocumentedClass.java" + }; + + public static void main(String... args) { + T5093723 tester = new T5093723(); + if (tester.runJavadoc(ARGS) != 0) + throw new AssertionError("non-zero return code from javadoc"); + } + + public String getBugId() { + return BUG_ID; + } + + public String getBugName() { + return getClass().getName(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/javadoc/5093723/UndocumentedClass.java Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,29 @@ +/* + * Copyright 2009 Google, 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. + */ + +class UndocumentedClass { + void method() {} + public void publicMethod() {} + protected void protectedMethod() {} + private void privateMethod() {} +}
--- a/test/com/sun/javadoc/lib/JavadocTester.java Mon Sep 21 17:11:48 2009 +0100 +++ b/test/com/sun/javadoc/lib/JavadocTester.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2002-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
--- a/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java Mon Sep 21 17:11:48 2009 +0100 +++ b/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2004-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
--- a/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java Mon Sep 21 17:11:48 2009 +0100 +++ b/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2004-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
--- a/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java Mon Sep 21 17:11:48 2009 +0100 +++ b/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-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
--- a/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java Mon Sep 21 17:11:48 2009 +0100 +++ b/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-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
--- a/test/com/sun/javadoc/testTaglets/TestTaglets.java Mon Sep 21 17:11:48 2009 +0100 +++ b/test/com/sun/javadoc/testTaglets/TestTaglets.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-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
--- a/test/tools/apt/Basics/apt.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/apt/Basics/apt.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2004-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2004-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
--- a/test/tools/apt/Basics/print.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/apt/Basics/print.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2004-2008 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2004-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
--- a/test/tools/apt/Compile/compile.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/apt/Compile/compile.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2004-2008 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2004-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
--- a/test/tools/javac/4846262/Test.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/4846262/Test.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh -f # -# Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2005-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
--- a/test/tools/javac/6302184/T6302184.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/6302184/T6302184.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #! /bin/sh -f # -# Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2005-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
--- a/test/tools/javac/6627362/T6627362.java Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/6627362/T6627362.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2007-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
--- a/test/tools/javac/ClassPathTest/ClassPathTest.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/ClassPathTest/ClassPathTest.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 1999-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
--- a/test/tools/javac/ExtDirs/ExtDirs.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/ExtDirs/ExtDirs.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 1999-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
--- a/test/tools/javac/MissingInclude.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/MissingInclude.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2001-2002 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2001-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
--- a/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ # -# Copyright 1998-2003 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 1998-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
--- a/test/tools/javac/T5090006/compiler.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/T5090006/compiler.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2004 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2004-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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T6882235.java Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,14 @@ +/* + * @test /nodynamiccopyright/ + * @bug 6882235 + * @summary invalid exponent causes silent javac crash + * + * @compile/fail T6882235.java + * @compile/fail/ref=T6882235.out -XDrawDiagnostics T6882235.java + */ + +class T6882235 { + int i = ; // invalid expression + float f = 0e*; // invalid exponent, should not crash compiler + int j = ; // invalid expression +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T6882235.out Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,5 @@ +T6882235.java:11:13: compiler.err.illegal.start.of.expr +T6882235.java:12:15: compiler.err.malformed.fp.lit +T6882235.java:12:18: compiler.err.illegal.start.of.expr +T6882235.java:13:13: compiler.err.illegal.start.of.expr +4 errors
--- a/test/tools/javac/api/6440333/T6440333.java Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/api/6440333/T6440333.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2006-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
--- a/test/tools/javac/api/Sibling.java Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/api/Sibling.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2006-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
--- a/test/tools/javac/code/ArrayClone.java Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/code/ArrayClone.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2002-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
--- a/test/tools/javac/constDebug/ConstDebug.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/constDebug/ConstDebug.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2002-2003 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2002-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
--- a/test/tools/javac/enum/6384542/T6384542.out Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/enum/6384542/T6384542.out Sat Oct 03 00:16:09 2009 +0100 @@ -1,6 +1,6 @@ T6384542.java:10:8: compiler.err.static.import.not.supported.in.source: 1.4 T6384542.java:12:8: compiler.err.enums.not.supported.in.source: 1.4 -T6384542.java:14:13: compiler.err.unsupported.fp.lit +T6384542.java:14:13: compiler.err.unsupported.fp.lit: 1.4 T6384542.java:15:9: compiler.err.generics.not.supported.in.source: 1.4 T6384542.java:16:35: compiler.err.varargs.not.supported.in.source: 1.4 T6384542.java:17:25: compiler.err.foreach.not.supported.in.source: 1.4
--- a/test/tools/javac/fatalErrors/NoJavaLang.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/fatalErrors/NoJavaLang.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 1999-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
--- a/test/tools/javac/generics/inference/6302954/T6476073.java Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/generics/inference/6302954/T6476073.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2006-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
--- a/test/tools/javac/innerClassFile/Driver.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/innerClassFile/Driver.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2002 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2002-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
--- a/test/tools/javac/javazip/Test.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/javazip/Test.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #! /bin/sh -f # -# Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2005-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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/literals/BadBinaryLiterals.6.out Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,8 @@ +BadBinaryLiterals.java:10:17: compiler.err.unsupported.binary.lit: 1.6 +BadBinaryLiterals.java:11:24: compiler.err.expected: ';' +BadBinaryLiterals.java:13:21: compiler.err.int.number.too.large: 111111111111111111111111111111111 +BadBinaryLiterals.java:15:21: compiler.err.int.number.too.large: 11111111111111111111111111111111111111111111111111111111111111111 +BadBinaryLiterals.java:16:27: compiler.err.expected: ';' +BadBinaryLiterals.java:17:27: compiler.err.expected: ';' +BadBinaryLiterals.java:17:30: compiler.err.expected: token.identifier +7 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/literals/BadBinaryLiterals.7.out Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,7 @@ +BadBinaryLiterals.java:11:24: compiler.err.expected: ';' +BadBinaryLiterals.java:13:21: compiler.err.int.number.too.large: 111111111111111111111111111111111 +BadBinaryLiterals.java:15:21: compiler.err.int.number.too.large: 11111111111111111111111111111111111111111111111111111111111111111 +BadBinaryLiterals.java:16:27: compiler.err.expected: ';' +BadBinaryLiterals.java:17:27: compiler.err.expected: ';' +BadBinaryLiterals.java:17:30: compiler.err.expected: token.identifier +6 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/literals/BadBinaryLiterals.java Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,18 @@ +/* + * @test /nodynamiccopyright/ + * @bug 6860965 + * @summary Project Coin: binary literals + * @compile/fail/ref=BadBinaryLiterals.6.out -XDrawDiagnostics -source 6 BadBinaryLiterals.java + * @compile/fail/ref=BadBinaryLiterals.7.out -XDrawDiagnostics BadBinaryLiterals.java + */ + +public class BadBinaryLiterals { + int valid = 0b0; // valid literal, illegal in source 6 + int baddigit = 0b012; // bad digit + //aaaabbbbccccddddeeeeffffgggghhhh + int overflow1 = 0b111111111111111111111111111111111; // too long for int + //aaaabbbbccccddddeeeeffffgggghhhhiiiijjjjkkkkllllmmmmnnnnoooopppp + int overflow2 = 0b11111111111111111111111111111111111111111111111111111111111111111L; // too long for long + float badfloat1 = 0b01.01; // no binary floats + float badfloat2 = 0b01e01; // no binary floats +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/literals/BadUnderscoreLiterals.6.out Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,21 @@ +BadUnderscoreLiterals.java:14:17: compiler.err.unsupported.underscore: 1.6 +BadUnderscoreLiterals.java:18:15: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:22:19: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:25:14: compiler.err.unsupported.binary.lit: 1.6 +BadUnderscoreLiterals.java:25:16: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:26:17: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:29:16: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:30:17: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:33:17: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:34:18: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:35:19: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:36:19: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:37:18: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:38:19: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:41:19: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:42:20: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:43:21: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:44:22: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:45:21: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:46:22: compiler.err.illegal.underscore +20 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/literals/BadUnderscoreLiterals.7.out Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,19 @@ +BadUnderscoreLiterals.java:18:15: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:22:19: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:25:16: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:26:17: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:29:16: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:30:17: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:33:17: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:34:18: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:35:19: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:36:19: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:37:18: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:38:19: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:41:19: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:42:20: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:43:21: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:44:22: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:45:21: compiler.err.illegal.underscore +BadUnderscoreLiterals.java:46:22: compiler.err.illegal.underscore +18 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/literals/BadUnderscoreLiterals.java Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,48 @@ +/* + * @test /nodynamiccopyright/ + * @bug 6860973 + * @summary Project Coin: underscores in literals + * + * @compile/fail BadUnderscoreLiterals.java + * @compile/fail/ref=BadUnderscoreLiterals.7.out -XDrawDiagnostics BadUnderscoreLiterals.java + * + * @compile/fail -source 6 BadUnderscoreLiterals.java + * @compile/fail/ref=BadUnderscoreLiterals.6.out -XDrawDiagnostics -source 6 BadUnderscoreLiterals.java + */ + +public class BadUnderscoreLiterals { + int valid = 1_1; // valid literal; illegal in -source 6 + + // test zero + int z1 = _0; // valid (but undefined) variable + int z2 = 0_; // trailing underscore + + // test simple (decimal) integers + int i1 = _1_2_3; // valid (but undefined) variable + int i2 = 1_2_3_; // trailing underscore + + // test binary integers + int b1 = 0b_0; // leading underscore after radix + int b2 = 0b0_; // trailing underscore + + // test hexadecimal integers + int x1 = 0x_0; // leading underscore after radix + int x2 = 0x0_; // trailing underscore + + // test floating point numbers + float f1 = 0_.1; // trailing underscore before decimal point + float f2 = 0._1; // leading underscore after decimal point + float f3 = 0.1_; // trailing underscore + float f4 = 0.1_e0; // trailing underscore before exponent + float f5 = 0e_1; // leading underscore in exponent + float f6 = 0e1_; // trailing underscore in exponent + + // hexadecimal floating point + float xf1 = 0x_0.1p0; // leading underscore after radix + float xf2 = 0x0_.1p0; // trailing underscore before decimal point + float xf3 = 0x0._1p0; // leading underscore after decimal point + float xf4 = 0x0.1_p0; // trailing underscore before exponent + float xf5 = 0x0p_1; // leading underscore after exponent + float xf6 = 0x0p1_; // trailing underscore +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/literals/BinaryLiterals.java Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,132 @@ +/* + * 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 6860965 + * @summary Project Coin: binary literals + */ + +public class BinaryLiterals { + public static void main(String... args) throws Exception { + new BinaryLiterals().run(); + } + + public void run() throws Exception { + test(0, 0B0); + test(1, 0B1); + test(2, 0B10); + test(3, 0B11); + + test(0, 0b0); + test(1, 0b1); + test(2, 0b10); + test(3, 0b11); + + test(-0, -0b0); + test(-1, -0b1); + test(-2, -0b10); + test(-3, -0b11); + + test(-1, 0b11111111111111111111111111111111); + test(-2, 0b11111111111111111111111111111110); + test(-3, 0b11111111111111111111111111111101); + + test( 1, -0b11111111111111111111111111111111); + test( 2, -0b11111111111111111111111111111110); + test( 3, -0b11111111111111111111111111111101); + + test(0, 0b00); + test(1, 0b001); + test(2, 0b00010); + test(3, 0b000011); + + // aaaabbbbccccddddeeeeffffgggghhhh + test( 0x10, 0b10000); + test( 0x100, 0b100000000); + test( 0x10000, 0b10000000000000000); + test(0x80000000, 0b10000000000000000000000000000000); + test(0xffffffff, 0b11111111111111111111111111111111); + + test(0L, 0b0L); + test(1L, 0b1L); + test(2L, 0b10L); + test(3L, 0b11L); + + test(0, 0b00L); + test(1, 0b001L); + test(2, 0b00010L); + test(3, 0b000011L); + + // aaaabbbbccccddddeeeeffffgggghhhhiiiijjjjkkkkllllmmmmnnnnoooopppp + test( 0x10L, 0b10000L); + test( 0x100L, 0b100000000L); + test( 0x10000L, 0b10000000000000000L); + test( 0x80000000L, 0b10000000000000000000000000000000L); + test( 0xffffffffL, 0b11111111111111111111111111111111L); + test(0x8000000000000000L, 0b1000000000000000000000000000000000000000000000000000000000000000L); + test(0xffffffffffffffffL, 0b1111111111111111111111111111111111111111111111111111111111111111L); + + test(0l, 0b0l); + test(1l, 0b1l); + test(2l, 0b10l); + test(3l, 0b11l); + + test(0, 0b00l); + test(1, 0b001l); + test(2, 0b00010l); + test(3, 0b000011l); + + // aaaabbbbccccddddeeeeffffgggghhhhiiiijjjjkkkkllllmmmmnnnnoooopppp + test( 0x10l, 0b10000l); + test( 0x100l, 0b100000000l); + test( 0x10000l, 0b10000000000000000l); + test( 0x80000000l, 0b10000000000000000000000000000000l); + test( 0xffffffffl, 0b11111111111111111111111111111111l); + test(0x8000000000000000l, 0b1000000000000000000000000000000000000000000000000000000000000000l); + test(0xffffffffffffffffl, 0b1111111111111111111111111111111111111111111111111111111111111111l); + + if (errors > 0) + throw new Exception(errors + " errors found"); + } + + void test(int expect, int found) { + count++; + if (found != expect) + error("test " + count + "\nexpected: 0x" + Integer.toHexString(expect) + "\n found: 0x" + Integer.toHexString(found)); + } + + void test(long expect, long found) { + count++; + if (found != expect) + error("test " + count + "\nexpected: 0x" + Long.toHexString(expect) + "\n found: 0x" + Long.toHexString(found)); + } + + void error(String message) { + System.out.println(message); + errors++; + } + + int count; + int errors; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/literals/UnderscoreLiterals.java Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,195 @@ +/* + * 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 6860973 + * @summary Project Coin: Underscores in literals + */ + + +public class UnderscoreLiterals { + public static void main(String... args) throws Exception { + new UnderscoreLiterals().run(); + } + + public void run() throws Exception { + // decimal + test(1, 1); + test(10, 10); + test(1_0, 10); + test(1__0, 10); + test(1_0_0, 100); + test(1__0__0, 100); + test(123_456_789, 123456789); + + // long + test(1l, 1l); + test(10l, 10l); + test(1_0l, 10l); + test(1__0l, 10l); + test(1_0_0l, 100l); + test(1__0__0l, 100l); + test(123_456_789l, 123456789l); + + // float + test(.1f, .1f); + test(.10f, .10f); + test(.1_0f, .10f); + test(.1__0f, .10f); + test(.1_0_0f, .100f); + test(.1__0__0f, .100f); + test(1e1, 1e1); + test(1e10, 1e10); + test(1e1_0, 1e10); + test(1e1__0, 1e10); + test(1e1_0_0, 1e100); + test(1e1__0__0, 1e100); + test(.123_456_789f, .123456789f); + test(0.1f, 0.1f); + test(0.10f, 0.10f); + test(0.1_0f, 0.10f); + test(0.1__0f, 0.10f); + test(0.1_0_0f, 0.100f); + test(0.1__0__0f, 0.100f); + test(0.123_456_789f, 0.123456789f); + test(1_1.1f, 1_1.1f); + test(1_1.10f, 1_1.10f); + test(1_1.1_0f, 1_1.10f); + test(1_1.1__0f, 1_1.10f); + test(1_1.1_0_0f, 1_1.100f); + test(1_1.1__0__0f, 1_1.100f); + test(1_1.123_456_789f, 1_1.123456789f); + + // double + test(.1d, .1d); + test(.10d, .10d); + test(.1_0d, .10d); + test(.1__0d, .10d); + test(.1_0_0d, .100d); + test(.1__0__0d, .100d); + test(1e1, 1e1); + test(1e10, 1e10); + test(1e1_0, 1e10); + test(1e1__0, 1e10); + test(1e1_0_0, 1e100); + test(1e1__0__0, 1e100); + test(.123_456_789d, .123456789d); + test(0.1d, 0.1d); + test(0.10d, 0.10d); + test(0.1_0d, 0.10d); + test(0.1__0d, 0.10d); + test(0.1_0_0d, 0.100d); + test(0.1__0__0d, 0.100d); + test(0.123_456_789d, 0.123456789d); + test(1_1.1d, 1_1.1d); + test(1_1.10d, 1_1.10d); + test(1_1.1_0d, 1_1.10d); + test(1_1.1__0d, 1_1.10d); + test(1_1.1_0_0d, 1_1.100d); + test(1_1.1__0__0d, 1_1.100d); + test(1_1.123_456_789d, 1_1.123456789d); + + // binary + test(0b1, 1); + test(0b10, 2); + test(0b1_0, 2); + test(0b1__0, 2); + test(0b1_0_0, 4); + test(0b1__0__0, 4); + test(0b0001_0010_0011, 0x123); + + // octal + test(01, 1); + test(010, 8); + test(01_0, 8); + test(01__0, 8); + test(01_0_0, 64); + test(01__0__0, 64); + test(0_1, 1); + test(0_10, 8); + test(0_1_0, 8); + test(0_1__0, 8); + test(0_1_0_0, 64); + test(0_1__0__0, 64); + test(0_001_002_003, 01002003); + + // hexadecimal + test(0x1, 1); + test(0x10, 16); + test(0x1_0, 16); + test(0x1__0, 16); + test(0x1_0_0, 256); + test(0x1__0__0, 256); + test(0x01_02_03_04, 0x1020304); + + // misc + long creditCardNumber = 1234_5678_9012_3456L; + test(creditCardNumber, 1234567890123456L); + long socialSecurityNumbers = 999_99_9999L; + test(socialSecurityNumbers, 999999999L); + double monetaryAmount = 12_345_132.12d; + test(monetaryAmount, 12345132.12d); + long hexBytes = 0xFF_EC_DE_5E; + test(hexBytes, 0xffecde5e); + long hexWords = 0xFFEC_DE5E; + test(hexWords, 0xffecde5e); + long maxLong = 0x7fff_ffff_ffff_ffffL; + test(maxLong, 0x7fffffffffffffffL); + long maxLongDecimal = 9223372036854775807L; + long alsoMaxLong = 9_223_372_036_854_775_807L; + test(alsoMaxLong, maxLongDecimal); + double whyWouldYouEverDoThis = 0x1.ffff_ffff_ffff_fp10_23; + double whyWouldYouEverDoEvenThis = 0x1.fffffffffffffp1023; + test(whyWouldYouEverDoThis, whyWouldYouEverDoEvenThis); + + if (errors > 0) + throw new Exception(errors + " errors found"); + } + + void test(int value, int expect) { + count++; + if (value != expect) + error("test " + count + "\nexpected: 0x" + Integer.toHexString(expect) + "\n found: 0x" + Integer.toHexString(value)); + } + + void test(double value, double expect) { + count++; + if (value != expect) + error("test " + count + "\nexpected: 0x" + expect + "\n found: 0x" + value); + } + + void test(long value, long expect) { + count++; + if (value != expect) + error("test " + count + "\nexpected: 0x" + Long.toHexString(expect) + "\n found: 0x" + Long.toHexString(value)); + } + + void error(String message) { + System.out.println(message); + errors++; + } + + int count; + int errors; +}
--- a/test/tools/javac/meth/MakeNegTests.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/meth/MakeNegTests.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2008-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
--- a/test/tools/javac/newlines/Newlines.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/newlines/Newlines.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ # -# Copyright 2002 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2002-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
--- a/test/tools/javac/quid/MakeNegTests.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/quid/MakeNegTests.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2008-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
--- a/test/tools/javac/quid/QuotedIdent.java Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/quid/QuotedIdent.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2008-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
--- a/test/tools/javac/quid/QuotedIdent2.java Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/quid/QuotedIdent2.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2008-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
--- a/test/tools/javac/stackmap/T4955930.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/stackmap/T4955930.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2005-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
--- a/test/tools/javac/unicode/SupplementaryJavaID6.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javac/unicode/SupplementaryJavaID6.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2004 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2004-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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javadoc/annotations/missing/Main.java Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,52 @@ +/* + * Copyright 2009 Google, 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 6709246 + * @summary Class-cast exception when annotation type is missing. + * @library ../../lib + */ + +import java.io.IOException; +import com.sun.javadoc.RootDoc; +import com.sun.javadoc.ClassDoc; +import com.sun.javadoc.AnnotationDesc; + +public class Main extends Tester.Doclet { + + private static final Tester tester = new Tester("Main", "somepackage"); + + public static void main(String... args) throws Exception { + tester.run(); + } + + public static boolean start(RootDoc root) { + for (ClassDoc d : root.classes()) { + for (AnnotationDesc a : d.annotations()) { + System.out.println(a.annotationType()); + } + } + return true; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javadoc/annotations/missing/somepackage/MissingAnnotationClass.java Sat Oct 03 00:16:09 2009 +0100 @@ -0,0 +1,31 @@ +/* + * Copyright 2009 Google, 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. + */ + +package somepackage; + +/** + * This class has an annotation which is not available. + */ +@NoSuchAnnotation +public class MissingAnnotationClass { +}
--- a/test/tools/javah/6257087/foo.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javah/6257087/foo.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #! /bin/sh -f # -# Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2006-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
--- a/test/tools/javah/ConstMacroTest.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javah/ConstMacroTest.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2003-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
--- a/test/tools/javah/MissingParamClassTest.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javah/MissingParamClassTest.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2003-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
--- a/test/tools/javah/ReadOldClass.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javah/ReadOldClass.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2005-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
--- a/test/tools/javap/T4975569.java Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javap/T4975569.java Sat Oct 03 00:16:09 2009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2008-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
--- a/test/tools/javap/pathsep.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javap/pathsep.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2003-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
--- a/test/tools/javap/stackmap/T6271292.sh Mon Sep 21 17:11:48 2009 +0100 +++ b/test/tools/javap/stackmap/T6271292.sh Sat Oct 03 00:16:09 2009 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2005-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