Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_langtools
提交
553579f6
D
dragonwell8_langtools
项目概览
openanolis
/
dragonwell8_langtools
通知
0
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_langtools
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
553579f6
编写于
1月 10, 2013
作者:
J
jjg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8006033: bug in Pretty.toSimpleString
Reviewed-by: darcy
上级
ccde2496
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
78 addition
and
4 deletion
+78
-4
src/share/classes/com/sun/tools/javac/tree/Pretty.java
src/share/classes/com/sun/tools/javac/tree/Pretty.java
+5
-4
test/tools/javac/tree/PrettySimpleStringTest.java
test/tools/javac/tree/PrettySimpleStringTest.java
+73
-0
未找到文件。
src/share/classes/com/sun/tools/javac/tree/Pretty.java
浏览文件 @
553579f6
/*
/*
* Copyright (c) 1999, 201
2
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 201
3
, 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
...
@@ -154,12 +154,13 @@ public class Pretty extends JCTree.Visitor {
...
@@ -154,12 +154,13 @@ public class Pretty extends JCTree.Visitor {
}
}
//we need to (i) replace all line terminators with a space and (ii) remove
//we need to (i) replace all line terminators with a space and (ii) remove
//occurrences of 'missing' in the Pretty output (generated when types are missing)
//occurrences of 'missing' in the Pretty output (generated when types are missing)
String
res
=
s
.
toString
().
replaceAll
(
"\\s+"
,
" "
).
replaceAll
(
"/\\*missing\\*/"
,
""
);
String
res
=
s
.
toString
().
trim
().
replaceAll
(
"\\s+"
,
" "
).
replaceAll
(
"/\\*missing\\*/"
,
""
);
if
(
res
.
length
()
<
maxLength
)
{
if
(
res
.
length
()
<
maxLength
)
{
return
res
;
return
res
;
}
else
{
}
else
{
int
split
=
(
maxLength
-
trimSequence
.
length
())
*
2
/
3
;
int
head
=
(
maxLength
-
trimSequence
.
length
())
*
2
/
3
;
return
res
.
substring
(
0
,
split
)
+
trimSequence
+
res
.
substring
(
split
);
int
tail
=
maxLength
-
trimSequence
.
length
()
-
head
;
return
res
.
substring
(
0
,
head
)
+
trimSequence
+
res
.
substring
(
res
.
length
()
-
tail
);
}
}
}
}
...
...
test/tools/javac/tree/PrettySimpleStringTest.java
0 → 100644
浏览文件 @
553579f6
/*
* Copyright (c) 2013, 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 8006033
* @summary bug in Pretty.toSimpleString
*/
import
java.io.File
;
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
;
public
class
PrettySimpleStringTest
{
public
static
void
main
(
String
...
args
)
throws
Exception
{
new
PrettySimpleStringTest
().
run
();
}
void
run
()
throws
Exception
{
File
testSrc
=
new
File
(
System
.
getProperty
(
"test.src"
));
File
thisFile
=
new
File
(
testSrc
,
getClass
().
getName
()
+
".java"
);
JavacTool
tool
=
JavacTool
.
create
();
StandardJavaFileManager
fm
=
tool
.
getStandardFileManager
(
null
,
null
,
null
);
JavacTask
task
=
tool
.
getTask
(
null
,
fm
,
null
,
null
,
null
,
fm
.
getJavaFileObjects
(
thisFile
));
Iterable
<?
extends
CompilationUnitTree
>
trees
=
task
.
parse
();
CompilationUnitTree
thisTree
=
trees
.
iterator
().
next
();
{
// test default
String
thisSrc
=
Pretty
.
toSimpleString
((
JCTree
)
thisTree
);
System
.
err
.
println
(
thisSrc
);
String
expect
=
"import jav[...]} } }"
;
if
(!
thisSrc
.
equals
(
expect
))
{
throw
new
Exception
(
"unexpected result"
);
}
}
{
// test explicit length
String
thisSrc
=
Pretty
.
toSimpleString
((
JCTree
)
thisTree
,
32
);
System
.
err
.
println
(
thisSrc
);
String
expect
=
"import java.io.Fil[...]; } } } }"
;
if
(!
thisSrc
.
equals
(
expect
))
{
throw
new
Exception
(
"unexpected result"
);
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录