infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-05 03:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

8068460: Pretty printing for loops

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Vicente Romero 2016-06-14 11:13:14 -07:00
parent 4c8fc963f7
commit d4a743435b
2 changed files with 106 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2016, Oracle and/or its affiliates. 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
@ -723,8 +723,11 @@ public class Pretty extends JCTree.Visitor {
printExpr(tree.init.head);
for (List<JCStatement> l = tree.init.tail; l.nonEmpty(); l = l.tail) {
JCVariableDecl vdef = (JCVariableDecl)l.head;
print(", " + vdef.name + " = ");
printExpr(vdef.init);
print(", " + vdef.name);
if (vdef.init != null) {
print(" = ");
printExpr(vdef.init);
}
}
} else {
printExprs(tree.init);

100
langtools/test/tools/javac/T8068460/PrettyPrintingForLoopsTest.java Normal file
View File

@ -0,0 +1,100 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8068460
* @summary Pretty printing for loops
* @library /tools/javac/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.tree
* jdk.compiler/com.sun.tools.javac.util
* @build JavacTestingAbstractProcessor
* @run main PrettyPrintingForLoopsTest
*/
import java.io.IOException;
import java.io.StringWriter;
import java.net.URI;
import java.util.Arrays;
import java.util.List;
import javax.tools.JavaFileObject;
import javax.tools.SimpleJavaFileObject;
import javax.tools.StandardJavaFileManager;
import com.sun.source.tree.CompilationUnitTree;
import com.sun.source.util.JavacTask;
import com.sun.tools.javac.api.JavacTool;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.Pretty;
import com.sun.tools.javac.util.Assert;
public class PrettyPrintingForLoopsTest {
public static void main(String... args) throws IOException {
new PrettyPrintingForLoopsTest().testForLoop();
}
public void testForLoop() throws IOException {
List files = Arrays.asList(new JavaSource(""));
JavacTool tool = JavacTool.create();
try (StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null)) {
JavacTask task = tool.getTask(null, fm, null, null, null, files);
Iterable trees = task.parse();
CompilationUnitTree thisTree = (CompilationUnitTree)trees.iterator().next();
String thisSrc = prettyPrint((JCTree) thisTree);
Assert.check(thisSrc.equals(JavaSource.source));
}
}
private static String prettyPrint(JCTree tree) throws IOException {
StringWriter sw = new StringWriter();
new Pretty(sw, true).printExpr(tree);
return sw.toString().replaceAll(System.getProperty("line.separator"), "\n");
}
static class JavaSource extends SimpleJavaFileObject {
static String source = "\n" +
"class Test {\n" +
" \n" +
" void m() {\n" +
" for (int i; true; i++) {\n" +
" i = 0;\n" +
" }\n" +
" for (int i = 0, j, k = 23, l; i < 42; i++) {\n" +
" }\n" +
" }\n" +
"}";
public JavaSource(String stmt) {
super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
}
@Override
public CharSequence getCharContent(boolean ignoreEncodingErrors) {
return source;
}
}
}