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

8166472: javac/javadoc expands @files incorrectly

Browse Source 
Reviewed-by: henryjen, ksrini
This commit is contained in:
Jonathan Gibbons 2016-10-04 16:47:09 -07:00
parent 07476b2f7d
commit 5bce3820cc
2 changed files with 229 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/CommandLine.java
View File

@ -27,7 +27,6 @@ package com.sun.tools.javac.main;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.Reader;
import java.io.StreamTokenizer;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
@ -51,10 +50,11 @@ public class CommandLine {
* '@file' argument replaced with the resulting tokens. Recursive command * '@file' argument replaced with the resulting tokens. Recursive command
* files are not supported. The '@' character itself can be quoted with * files are not supported. The '@' character itself can be quoted with
* the sequence '@@'. * the sequence '@@'.
* @param args the arguments that may contain @files
* @return the arguments, with @files expanded
* @throws IOException if there is a problem reading any of the @files
*/ */
public static String[] parse(String[] args) public static String[] parse(String[] args) throws IOException {
throws IOException
{
ListBuffer<String> newArgs = new ListBuffer<>(); ListBuffer<String> newArgs = new ListBuffer<>();
for (String arg : args) { for (String arg : args) {
if (arg.length() > 1 && arg.charAt(0) == '@') { if (arg.length() > 1 && arg.charAt(0) == '@') {
@ -71,19 +71,120 @@ public class CommandLine {
return newArgs.toList().toArray(new String[newArgs.length()]); return newArgs.toList().toArray(new String[newArgs.length()]);
} }
private static void loadCmdFile(String name, ListBuffer<String> args) private static void loadCmdFile(String name, ListBuffer<String> args) throws IOException {
throws IOException
{
try (Reader r = Files.newBufferedReader(Paths.get(name))) { try (Reader r = Files.newBufferedReader(Paths.get(name))) {
StreamTokenizer st = new StreamTokenizer(r); Tokenizer t = new Tokenizer(r);
st.resetSyntax(); String s;
st.wordChars(' ', 255); while ((s = t.nextToken()) != null) {
st.whitespaceChars(0, ' '); args.append(s);
st.commentChar('#'); }
st.quoteChar('"'); }
st.quoteChar('\''); }
while (st.nextToken() != StreamTokenizer.TT_EOF) {
args.append(st.sval); public static class Tokenizer {
private final Reader in;
private int ch;
public Tokenizer(Reader in) throws IOException {
this.in = in;
ch = in.read();
}
public String nextToken() throws IOException {
skipWhite();
if (ch == -1) {
return null;
}
StringBuilder sb = new StringBuilder();
char quoteChar = 0;
while (ch != -1) {
switch (ch) {
case ' ':
case '\t':
case '\f':
if (quoteChar == 0) {
return sb.toString();
}
sb.append((char) ch);
break;
case '\n':
case '\r':
return sb.toString();
case '\'':
case '"':
if (quoteChar == 0) {
quoteChar = (char) ch;
} else if (quoteChar == ch) {
quoteChar = 0;
} else {
sb.append((char) ch);
}
break;
case '\\':
if (quoteChar != 0) {
ch = in.read();
switch (ch) {
case '\n':
case '\r':
while (ch == ' ' || ch == '\n' || ch == '\r' || ch == '\t' || ch == '\f') {
ch = in.read();
}
continue;
case 'n':
ch = '\n';
break;
case 'r':
ch = '\r';
break;
case 't':
ch = '\t';
break;
case 'f':
ch = '\f';
break;
}
}
sb.append((char) ch);
break;
default:
sb.append((char) ch);
}
ch = in.read();
}
return sb.toString();
}
void skipWhite() throws IOException {
while (ch != -1) {
switch (ch) {
case ' ':
case '\t':
case '\n':
case '\r':
case '\f':
break;
case '#':
ch = in.read();
while (ch != '\n' && ch != '\r' && ch != -1) {
ch = in.read();
}
break;
default:
return;
}
ch = in.read();
} }
} }
} }

112
langtools/test/tools/javac/main/AtFileTest.java Normal file
View File

@ -0,0 +1,112 @@
/*
* 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 8166472 8162810
* @summary Align javac support for at-files with launcher support
* @modules jdk.compiler/com.sun.tools.javac.main
*/
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.sun.tools.javac.main.CommandLine.Tokenizer;
public class AtFileTest {
public static void main(String... args) throws IOException {
AtFileTest t = new AtFileTest();
if (args.length > 0) {
System.out.println(String.join(" ", args));
} else {
t.run();
}
}
void run() throws IOException {
test("-version -cp \"c:\\\\java libs\\\\one.jar\" \n",
"-version", "-cp", "c:\\java libs\\one.jar");
// note the open quote at the end
test("com.foo.Panda \"Furious 5\"\fand\t'Shi Fu' \"escape\tprison",
"com.foo.Panda", "Furious 5", "and", "Shi Fu", "escape\tprison");
test("escaped chars testing \"\\a\\b\\c\\f\\n\\r\\t\\v\\9\\6\\23\\82\\28\\377\\477\\278\\287\"",
"escaped", "chars", "testing", "abc\f\n\r\tv96238228377477278287");
test("\"mix 'single quote' in double\" 'mix \"double quote\" in single' partial\"quote me\"this",
"mix 'single quote' in double", "mix \"double quote\" in single", "partialquote methis");
test("line one #comment\n'line #2' #rest are comment\r\n#comment on line 3\nline 4 #comment to eof",
"line", "one", "line #2", "line", "4");
test("This is an \"open quote \n across line\n\t, note for WS.",
"This", "is", "an", "open quote ", "across", "line", ",", "note", "for", "WS.");
test("Try \"this \\\\\\\\ escape\\n double quote \\\" in open quote",
"Try", "this \\\\ escape\n double quote \" in open quote");
test("'-Dmy.quote.single'='Property in single quote. Here a double quote\" Add some slashes \\\\/'",
"-Dmy.quote.single=Property in single quote. Here a double quote\" Add some slashes \\/");
test("\"Open quote to \n new \"line \\\n\r third\\\n\r\\\tand\ffourth\"",
"Open quote to ", "new", "line third\tand\ffourth");
test("c:\\\"partial quote\"\\lib",
"c:\\partial quote\\lib");
}
void test(String full, String... expect) throws IOException {
System.out.println("test: >>>" + full + "<<<");
List<String> found = expand(full);
if (found.equals(Arrays.asList(expect))) {
System.out.println("OK");
} else {
for (int i = 0; i < Math.max(found.size(), expect.length); i++) {
if (i < found.size()) {
System.out.println("found[" + i + "]: >>>" + found.get(i) + "<<<");
}
if (i < expect.length) {
System.out.println("expect[" + i + "]: >>>" + expect[i] + "<<<");
}
}
}
System.out.println();
}
List<String> expand(String full) throws IOException {
Tokenizer t = new Tokenizer(new StringReader(full));
List<String> result = new ArrayList<>();
String s;
while ((s = t.nextToken()) != null) {
// System.err.println("token: " + s);
result.add(s);
}
return result;
}
}