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

8183964: Bad lexing of javadoc comments (change in parsing/rendering of backslashes in javadoc)

Browse Source 
Reviewed-by: vromero, cushon
This commit is contained in:
Jonathan Gibbons 2018-01-02 16:07:47 -08:00
parent 7c5dbce44b
commit 8f93cb3651
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -394,6 +394,7 @@ public class JavadocTokenizer extends JavaTokenizer {
comment_reader.putChar('\\', false); comment_reader.putChar('\\', false);
} }
comment_reader.scanCommentChar(); comment_reader.scanCommentChar();
break;
case ' ': case ' ':
case '\t': case '\t':
comment_reader.putChar(comment_reader.ch, false); comment_reader.putChar(comment_reader.ch, false);

13
test/langtools/tools/javac/parser/T4910483.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 4910483 * @bug 4910483 8183961
* @summary Javadoc renders the string ".*\\.pdf" as ".\*\.pdf" * @summary Javadoc renders the string ".*\\.pdf" as ".\*\.pdf"
* @modules jdk.compiler/com.sun.tools.javac.file * @modules jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main * jdk.compiler/com.sun.tools.javac.main
@ -41,7 +41,12 @@ import com.sun.tools.javac.util.Context;
import javax.tools.JavaFileObject; import javax.tools.JavaFileObject;
/**Test comment abc*\\def*/ // Test the original issue ("\\") as well as other appearances of '\',
// including a vanilla Unicode escape (U+0021, '!'), and a sequence
// which is not a Unicode escape
/**Test comment abc*\\def\
*xyz\u0021\\u0021*/
public class T4910483 { public class T4910483 {
public static void main(String... args) { public static void main(String... args) {
JavaCompiler compiler = JavaCompiler.instance(new Context()); JavaCompiler compiler = JavaCompiler.instance(new Context());
@ -55,7 +60,7 @@ public class T4910483 {
JCTree classDef = cu.getTypeDecls().head; JCTree classDef = cu.getTypeDecls().head;
String commentText = cu.docComments.getCommentText(classDef); String commentText = cu.docComments.getCommentText(classDef);
String expected = "Test comment abc*\\\\def"; // 4 '\' escapes to 2 in a string literal String expected = "Test comment abc*\\\\def\\\nxyz!\\\\u0021"; // 4 '\' escapes to 2 in a string literal
if (!expected.equals(commentText)) { if (!expected.equals(commentText)) {
throw new AssertionError("Incorrect comment text: [" + commentText + "], expected [" + expected + "]"); throw new AssertionError("Incorrect comment text: [" + commentText + "], expected [" + expected + "]");
} }