Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
9791d2fc
D
dragonwell11
项目概览
openanolis
/
dragonwell11
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9791d2fc
编写于
6月 13, 2013
作者:
H
hannesw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8016542: String.prototype.replace called with function argument should not replace $ patterns
Reviewed-by: lagergren, jlaskey
上级
dd971fca
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
72 addition
and
30 deletion
+72
-30
nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
+29
-30
nashorn/test/script/basic/JDK-8016542.js
nashorn/test/script/basic/JDK-8016542.js
+37
-0
nashorn/test/script/basic/JDK-8016542.js.EXPECTED
nashorn/test/script/basic/JDK-8016542.js.EXPECTED
+6
-0
未找到文件。
nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
浏览文件 @
9791d2fc
...
@@ -641,26 +641,19 @@ public final class NativeRegExp extends ScriptObject {
...
@@ -641,26 +641,19 @@ public final class NativeRegExp extends ScriptObject {
return
string
;
return
string
;
}
}
/*
* $$ -> $
* $& -> the matched substring
* $` -> the portion of string that preceeds matched substring
* $' -> the portion of string that follows the matched substring
* $n -> the nth capture, where n is [1-9] and $n is NOT followed by a decimal digit
* $nn -> the nnth capture, where nn is a two digit decimal number [01-99].
*/
String
replace
=
replacement
;
if
(!
regexp
.
isGlobal
())
{
if
(!
regexp
.
isGlobal
())
{
if
(!
matcher
.
search
(
0
))
{
if
(!
matcher
.
search
(
0
))
{
return
string
;
return
string
;
}
}
final
StringBuilder
sb
=
new
StringBuilder
();
final
StringBuilder
sb
=
new
StringBuilder
();
sb
.
append
(
string
,
0
,
matcher
.
start
());
if
(
function
!=
null
)
{
if
(
function
!=
null
)
{
replace
=
callReplaceValue
(
function
,
matcher
,
string
);
sb
.
append
(
callReplaceValue
(
function
,
matcher
,
string
));
}
else
{
appendReplacement
(
matcher
,
string
,
replacement
,
sb
);
}
}
appendReplacement
(
matcher
,
string
,
replace
,
sb
,
0
);
sb
.
append
(
string
,
matcher
.
end
(),
string
.
length
());
sb
.
append
(
string
,
matcher
.
end
(),
string
.
length
());
return
sb
.
toString
();
return
sb
.
toString
();
}
}
...
@@ -676,12 +669,13 @@ public final class NativeRegExp extends ScriptObject {
...
@@ -676,12 +669,13 @@ public final class NativeRegExp extends ScriptObject {
final
StringBuilder
sb
=
new
StringBuilder
();
final
StringBuilder
sb
=
new
StringBuilder
();
do
{
do
{
sb
.
append
(
string
,
thisIndex
,
matcher
.
start
());
if
(
function
!=
null
)
{
if
(
function
!=
null
)
{
replace
=
callReplaceValue
(
function
,
matcher
,
string
);
sb
.
append
(
callReplaceValue
(
function
,
matcher
,
string
));
}
else
{
appendReplacement
(
matcher
,
string
,
replacement
,
sb
);
}
}
appendReplacement
(
matcher
,
string
,
replace
,
sb
,
thisIndex
);
// ECMA 15.5.4.10 String.prototype.match(regexp)
// ECMA 15.5.4.10 String.prototype.match(regexp)
thisIndex
=
matcher
.
end
();
thisIndex
=
matcher
.
end
();
if
(
thisIndex
==
previousLastIndex
)
{
if
(
thisIndex
==
previousLastIndex
)
{
...
@@ -697,10 +691,19 @@ public final class NativeRegExp extends ScriptObject {
...
@@ -697,10 +691,19 @@ public final class NativeRegExp extends ScriptObject {
return
sb
.
toString
();
return
sb
.
toString
();
}
}
private
void
appendReplacement
(
final
RegExpMatcher
matcher
,
final
String
text
,
final
String
replacement
,
final
StringBuilder
sb
,
final
int
lastAppendPosition
)
{
private
void
appendReplacement
(
final
RegExpMatcher
matcher
,
final
String
text
,
final
String
replacement
,
final
StringBuilder
sb
)
{
// Process substitution string to replace group references with groups
/*
* Process substitution patterns:
*
* $$ -> $
* $& -> the matched substring
* $` -> the portion of string that preceeds matched substring
* $' -> the portion of string that follows the matched substring
* $n -> the nth capture, where n is [1-9] and $n is NOT followed by a decimal digit
* $nn -> the nnth capture, where nn is a two digit decimal number [01-99].
*/
int
cursor
=
0
;
int
cursor
=
0
;
final
StringBuilder
result
=
new
StringBuilder
();
Object
[]
groups
=
null
;
Object
[]
groups
=
null
;
while
(
cursor
<
replacement
.
length
())
{
while
(
cursor
<
replacement
.
length
())
{
...
@@ -732,37 +735,33 @@ public final class NativeRegExp extends ScriptObject {
...
@@ -732,37 +735,33 @@ public final class NativeRegExp extends ScriptObject {
}
}
// Append group if matched.
// Append group if matched.
if
(
groups
[
refNum
]
!=
UNDEFINED
)
{
if
(
groups
[
refNum
]
!=
UNDEFINED
)
{
result
.
append
((
String
)
groups
[
refNum
]);
sb
.
append
((
String
)
groups
[
refNum
]);
}
}
}
else
{
// $0. ignore.
}
else
{
// $0. ignore.
assert
refNum
==
0
;
assert
refNum
==
0
;
result
.
append
(
"$0"
);
sb
.
append
(
"$0"
);
}
}
}
else
if
(
nextChar
==
'$'
)
{
}
else
if
(
nextChar
==
'$'
)
{
result
.
append
(
'$'
);
sb
.
append
(
'$'
);
cursor
++;
cursor
++;
}
else
if
(
nextChar
==
'&'
)
{
}
else
if
(
nextChar
==
'&'
)
{
result
.
append
(
matcher
.
group
());
sb
.
append
(
matcher
.
group
());
cursor
++;
cursor
++;
}
else
if
(
nextChar
==
'`'
)
{
}
else
if
(
nextChar
==
'`'
)
{
result
.
append
(
text
.
substring
(
0
,
matcher
.
start
()
));
sb
.
append
(
text
,
0
,
matcher
.
start
(
));
cursor
++;
cursor
++;
}
else
if
(
nextChar
==
'\''
)
{
}
else
if
(
nextChar
==
'\''
)
{
result
.
append
(
text
.
substring
(
matcher
.
end
()
));
sb
.
append
(
text
,
matcher
.
end
(),
text
.
length
(
));
cursor
++;
cursor
++;
}
else
{
}
else
{
// unknown substitution or $n with n>m. skip.
// unknown substitution or $n with n>m. skip.
result
.
append
(
'$'
);
sb
.
append
(
'$'
);
}
}
}
else
{
}
else
{
result
.
append
(
nextChar
);
sb
.
append
(
nextChar
);
cursor
++;
cursor
++;
}
}
}
}
// Append the intervening text
sb
.
append
(
text
,
lastAppendPosition
,
matcher
.
start
());
// Append the match substitution
sb
.
append
(
result
);
}
}
private
String
callReplaceValue
(
final
ScriptFunction
function
,
final
RegExpMatcher
matcher
,
final
String
string
)
{
private
String
callReplaceValue
(
final
ScriptFunction
function
,
final
RegExpMatcher
matcher
,
final
String
string
)
{
...
...
nashorn/test/script/basic/JDK-8016542.js
0 → 100644
浏览文件 @
9791d2fc
/*
* Copyright (c) 2010, 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.
*/
/**
* JDK-8016542: String.prototype.replace called with function argument should not replace $ patterns
*
* @test
* @run
*/
print
(
"
abc
"
.
replace
(
"
a
"
,
"
$&
"
));
print
(
"
abc
"
.
replace
(
"
b
"
,
"
$&
"
));
print
(
"
abc
"
.
replace
(
"
c
"
,
"
$&
"
));
print
(
"
abc
"
.
replace
(
"
a
"
,
function
(){
return
"
$&
"
}));
print
(
"
abc
"
.
replace
(
"
b
"
,
function
(){
return
"
$&
"
}));
print
(
"
abc
"
.
replace
(
"
c
"
,
function
(){
return
"
$&
"
}));
nashorn/test/script/basic/JDK-8016542.js.EXPECTED
0 → 100644
浏览文件 @
9791d2fc
abc
abc
abc
$&bc
a$&c
ab$&
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录