Thu, 10 Oct 2013 14:58:04 +0200
8001931: The new build system whitespace cleanup
Reviewed-by: tbell, simonis, erikj
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@0 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. |
aoqi@0 | 8 | * |
aoqi@0 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 13 | * accompanied this code). |
aoqi@0 | 14 | * |
aoqi@0 | 15 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@0 | 18 | * |
aoqi@0 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 20 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 21 | * questions. |
aoqi@0 | 22 | */ |
aoqi@0 | 23 | |
aoqi@0 | 24 | /* |
aoqi@0 | 25 | * @test |
aoqi@0 | 26 | * @bug 6921495 |
aoqi@0 | 27 | * @summary spurious semicolons in class def cause empty NOPOS blocks |
aoqi@0 | 28 | */ |
aoqi@0 | 29 | |
aoqi@0 | 30 | import java.io.*; |
aoqi@0 | 31 | import java.net.*; |
aoqi@0 | 32 | import java.util.*; |
aoqi@0 | 33 | import javax.tools.*; |
aoqi@0 | 34 | import com.sun.source.util.*; |
aoqi@0 | 35 | |
aoqi@0 | 36 | public class ExtraSemiTest { |
aoqi@0 | 37 | |
aoqi@0 | 38 | static class JavaSource extends SimpleJavaFileObject { |
aoqi@0 | 39 | |
aoqi@0 | 40 | final static String source = |
aoqi@0 | 41 | "class C {\n" + |
aoqi@0 | 42 | " int x;;\n" + |
aoqi@0 | 43 | " class X { int i;; };\n" + |
aoqi@0 | 44 | "}"; |
aoqi@0 | 45 | |
aoqi@0 | 46 | JavaSource() { |
aoqi@0 | 47 | super(URI.create("myfo:/C.java"), JavaFileObject.Kind.SOURCE); |
aoqi@0 | 48 | } |
aoqi@0 | 49 | |
aoqi@0 | 50 | @Override |
aoqi@0 | 51 | public CharSequence getCharContent(boolean ignoreEncodingErrors) { |
aoqi@0 | 52 | return source; |
aoqi@0 | 53 | } |
aoqi@0 | 54 | } |
aoqi@0 | 55 | |
aoqi@0 | 56 | public static void main(String... args) throws IOException { |
aoqi@0 | 57 | new ExtraSemiTest().run(); |
aoqi@0 | 58 | } |
aoqi@0 | 59 | |
aoqi@0 | 60 | void run() throws IOException { |
aoqi@0 | 61 | File destDir = new File("classes"); destDir.mkdir(); |
aoqi@0 | 62 | final JavaCompiler tool = ToolProvider.getSystemJavaCompiler(); |
aoqi@0 | 63 | JavaSource source = new JavaSource(); |
aoqi@0 | 64 | JavacTask ct = (JavacTask)tool.getTask(null, null, null, |
aoqi@0 | 65 | Arrays.asList("-d", destDir.getPath(), "-XD-printsource"), |
aoqi@0 | 66 | null, |
aoqi@0 | 67 | Arrays.asList(source)); |
aoqi@0 | 68 | Boolean ok = ct.call(); |
aoqi@0 | 69 | if (!ok) throw new AssertionError("compilation failed"); |
aoqi@0 | 70 | |
aoqi@0 | 71 | String text = readFile(new File(destDir, "C.java")); |
aoqi@0 | 72 | System.out.println(text); |
aoqi@0 | 73 | |
aoqi@0 | 74 | // compress/canonicalize all whitespace |
aoqi@0 | 75 | String canon = text.replaceAll("\\s+", " "); |
aoqi@0 | 76 | System.out.println("canon: " + canon); |
aoqi@0 | 77 | |
aoqi@0 | 78 | // There are no empty blocks in the original text. |
aoqi@0 | 79 | // C will be given a default constructor "C() { super(); }" which |
aoqi@0 | 80 | // does not have any empty blocks. |
aoqi@0 | 81 | // The bug is that spurious semicolons in the class defn are parsed |
aoqi@0 | 82 | // into redundant empty blocks in the tree, so verify there are |
aoqi@0 | 83 | // no empty blocks in the -printsource output |
aoqi@0 | 84 | |
aoqi@0 | 85 | if (canon.contains("{ }")) |
aoqi@0 | 86 | throw new AssertionError("unexpected empty block found"); |
aoqi@0 | 87 | } |
aoqi@0 | 88 | |
aoqi@0 | 89 | String readFile(File f) throws IOException { |
aoqi@0 | 90 | int len = (int) f.length(); |
aoqi@0 | 91 | byte[] data = new byte[len]; |
aoqi@0 | 92 | DataInputStream in = new DataInputStream(new FileInputStream(f)); |
aoqi@0 | 93 | try { |
aoqi@0 | 94 | in.readFully(data); |
aoqi@0 | 95 | return new String(data); |
aoqi@0 | 96 | } finally { |
aoqi@0 | 97 | in.close(); |
aoqi@0 | 98 | } |
aoqi@0 | 99 | } |
aoqi@0 | 100 | } |