aoqi@0: /* aoqi@0: * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. aoqi@0: * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. aoqi@0: * aoqi@0: * This code is free software; you can redistribute it and/or modify it aoqi@0: * under the terms of the GNU General Public License version 2 only, as aoqi@0: * published by the Free Software Foundation. aoqi@0: * aoqi@0: * This code is distributed in the hope that it will be useful, but WITHOUT aoqi@0: * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or aoqi@0: * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License aoqi@0: * version 2 for more details (a copy is included in the LICENSE file that aoqi@0: * accompanied this code). aoqi@0: * aoqi@0: * You should have received a copy of the GNU General Public License version aoqi@0: * 2 along with this work; if not, write to the Free Software Foundation, aoqi@0: * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. aoqi@0: * aoqi@0: * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA aoqi@0: * or visit www.oracle.com if you need additional information or have any aoqi@0: * questions. aoqi@0: */ aoqi@0: aoqi@0: /* aoqi@0: * @test aoqi@0: * @bug 6921495 aoqi@0: * @summary spurious semicolons in class def cause empty NOPOS blocks aoqi@0: */ aoqi@0: aoqi@0: import java.io.*; aoqi@0: import java.net.*; aoqi@0: import java.util.*; aoqi@0: import javax.tools.*; aoqi@0: import com.sun.source.util.*; aoqi@0: aoqi@0: public class ExtraSemiTest { aoqi@0: aoqi@0: static class JavaSource extends SimpleJavaFileObject { aoqi@0: aoqi@0: final static String source = aoqi@0: "class C {\n" + aoqi@0: " int x;;\n" + aoqi@0: " class X { int i;; };\n" + aoqi@0: "}"; aoqi@0: aoqi@0: JavaSource() { aoqi@0: super(URI.create("myfo:/C.java"), JavaFileObject.Kind.SOURCE); aoqi@0: } aoqi@0: aoqi@0: @Override aoqi@0: public CharSequence getCharContent(boolean ignoreEncodingErrors) { aoqi@0: return source; aoqi@0: } aoqi@0: } aoqi@0: aoqi@0: public static void main(String... args) throws IOException { aoqi@0: new ExtraSemiTest().run(); aoqi@0: } aoqi@0: aoqi@0: void run() throws IOException { aoqi@0: File destDir = new File("classes"); destDir.mkdir(); aoqi@0: final JavaCompiler tool = ToolProvider.getSystemJavaCompiler(); aoqi@0: JavaSource source = new JavaSource(); aoqi@0: JavacTask ct = (JavacTask)tool.getTask(null, null, null, aoqi@0: Arrays.asList("-d", destDir.getPath(), "-XD-printsource"), aoqi@0: null, aoqi@0: Arrays.asList(source)); aoqi@0: Boolean ok = ct.call(); aoqi@0: if (!ok) throw new AssertionError("compilation failed"); aoqi@0: aoqi@0: String text = readFile(new File(destDir, "C.java")); aoqi@0: System.out.println(text); aoqi@0: aoqi@0: // compress/canonicalize all whitespace aoqi@0: String canon = text.replaceAll("\\s+", " "); aoqi@0: System.out.println("canon: " + canon); aoqi@0: aoqi@0: // There are no empty blocks in the original text. aoqi@0: // C will be given a default constructor "C() { super(); }" which aoqi@0: // does not have any empty blocks. aoqi@0: // The bug is that spurious semicolons in the class defn are parsed aoqi@0: // into redundant empty blocks in the tree, so verify there are aoqi@0: // no empty blocks in the -printsource output aoqi@0: aoqi@0: if (canon.contains("{ }")) aoqi@0: throw new AssertionError("unexpected empty block found"); aoqi@0: } aoqi@0: aoqi@0: String readFile(File f) throws IOException { aoqi@0: int len = (int) f.length(); aoqi@0: byte[] data = new byte[len]; aoqi@0: DataInputStream in = new DataInputStream(new FileInputStream(f)); aoqi@0: try { aoqi@0: in.readFully(data); aoqi@0: return new String(data); aoqi@0: } finally { aoqi@0: in.close(); aoqi@0: } aoqi@0: } aoqi@0: }