Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_nashorn
提交
740b7a14
D
dragonwell8_nashorn
项目概览
openanolis
/
dragonwell8_nashorn
通知
2
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_nashorn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
740b7a14
编写于
8月 03, 2017
作者:
R
robm
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
ddd93fe5
61a17019
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
129 addition
and
9 deletion
+129
-9
src/jdk/nashorn/internal/objects/NativeDataView.java
src/jdk/nashorn/internal/objects/NativeDataView.java
+7
-7
src/jdk/nashorn/internal/runtime/AccessorProperty.java
src/jdk/nashorn/internal/runtime/AccessorProperty.java
+0
-2
test/script/basic/JDK-8181191.js
test/script/basic/JDK-8181191.js
+52
-0
test/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java
.../src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java
+70
-0
未找到文件。
src/jdk/nashorn/internal/objects/NativeDataView.java
浏览文件 @
740b7a14
...
...
@@ -416,7 +416,7 @@ public class NativeDataView extends ScriptObject {
* @return 32-bit unsigned int value at the byteOffset
*/
@Function
(
attributes
=
Attribute
.
NOT_ENUMERABLE
,
arity
=
1
)
public
static
long
getUint32
(
final
Object
self
,
final
Object
byteOffset
,
final
Object
littleEndian
)
{
public
static
double
getUint32
(
final
Object
self
,
final
Object
byteOffset
,
final
Object
littleEndian
)
{
try
{
return
0xFFFFFFFF
L
&
getBuffer
(
self
,
littleEndian
).
getInt
(
JSType
.
toInt32
(
byteOffset
));
}
catch
(
final
IllegalArgumentException
iae
)
{
...
...
@@ -432,7 +432,7 @@ public class NativeDataView extends ScriptObject {
* @return 32-bit unsigned int value at the byteOffset
*/
@SpecializedFunction
public
static
long
getUint32
(
final
Object
self
,
final
int
byteOffset
)
{
public
static
double
getUint32
(
final
Object
self
,
final
int
byteOffset
)
{
try
{
return
JSType
.
toUint32
(
getBuffer
(
self
,
false
).
getInt
(
JSType
.
toInt32
(
byteOffset
)));
}
catch
(
final
IllegalArgumentException
iae
)
{
...
...
@@ -449,7 +449,7 @@ public class NativeDataView extends ScriptObject {
* @return 32-bit unsigned int value at the byteOffset
*/
@SpecializedFunction
public
static
long
getUint32
(
final
Object
self
,
final
int
byteOffset
,
final
boolean
littleEndian
)
{
public
static
double
getUint32
(
final
Object
self
,
final
int
byteOffset
,
final
boolean
littleEndian
)
{
try
{
return
JSType
.
toUint32
(
getBuffer
(
self
,
littleEndian
).
getInt
(
JSType
.
toInt32
(
byteOffset
)));
}
catch
(
final
IllegalArgumentException
iae
)
{
...
...
@@ -837,9 +837,9 @@ public class NativeDataView extends ScriptObject {
* @return undefined
*/
@SpecializedFunction
public
static
Object
setUint32
(
final
Object
self
,
final
int
byteOffset
,
final
long
value
)
{
public
static
Object
setUint32
(
final
Object
self
,
final
int
byteOffset
,
final
double
value
)
{
try
{
getBuffer
(
self
,
false
).
putInt
(
byteOffset
,
(
int
)
value
);
getBuffer
(
self
,
false
).
putInt
(
byteOffset
,
(
int
)
JSType
.
toUint32
(
value
)
);
return
UNDEFINED
;
}
catch
(
final
IllegalArgumentException
iae
)
{
throw
rangeError
(
iae
,
"dataview.offset"
);
...
...
@@ -856,9 +856,9 @@ public class NativeDataView extends ScriptObject {
* @return undefined
*/
@SpecializedFunction
public
static
Object
setUint32
(
final
Object
self
,
final
int
byteOffset
,
final
long
value
,
final
boolean
littleEndian
)
{
public
static
Object
setUint32
(
final
Object
self
,
final
int
byteOffset
,
final
double
value
,
final
boolean
littleEndian
)
{
try
{
getBuffer
(
self
,
littleEndian
).
putInt
(
byteOffset
,
(
int
)
value
);
getBuffer
(
self
,
littleEndian
).
putInt
(
byteOffset
,
(
int
)
JSType
.
toUint32
(
value
)
);
return
UNDEFINED
;
}
catch
(
final
IllegalArgumentException
iae
)
{
throw
rangeError
(
iae
,
"dataview.offset"
);
...
...
src/jdk/nashorn/internal/runtime/AccessorProperty.java
浏览文件 @
740b7a14
...
...
@@ -349,8 +349,6 @@ public class AccessorProperty extends Property {
setType
(
hasDualFields
()
?
JSType
.
unboxedFieldType
(
initialValue
)
:
Object
.
class
);
if
(
initialValue
instanceof
Integer
)
{
invokeSetter
(
owner
,
((
Integer
)
initialValue
).
intValue
());
}
else
if
(
initialValue
instanceof
Long
)
{
invokeSetter
(
owner
,
((
Long
)
initialValue
).
longValue
());
}
else
if
(
initialValue
instanceof
Double
)
{
invokeSetter
(
owner
,
((
Double
)
initialValue
).
doubleValue
());
}
else
{
...
...
test/script/basic/JDK-8181191.js
0 → 100644
浏览文件 @
740b7a14
/*
* Copyright (c) 2017, 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-8181191: getUint32 returning Long
*
* @test
* @run
*/
function
uint32
(
x
)
{
var
buffer
=
new
ArrayBuffer
(
16
);
var
dataview
=
new
DataView
(
buffer
);
dataview
.
setUint32
(
0
,
x
);
return
dataview
.
getUint32
(
0
);
}
Assert
.
assertTrue
(
typeof
uint32
(
0x7f
)
===
'
number
'
);
Assert
.
assertTrue
(
typeof
uint32
(
0x80
)
===
'
number
'
);
Assert
.
assertTrue
(
typeof
uint32
(
0xffffffff
)
===
'
number
'
);
Assert
.
assertTrue
(
typeof
uint32
(
0x100000000
)
===
'
number
'
);
Assert
.
assertTrue
(
uint32
(
0x7f
)
===
0x7f
);
Assert
.
assertTrue
(
uint32
(
0x80
)
===
0x80
);
Assert
.
assertTrue
(
uint32
(
0xffffffff
)
===
0xffffffff
);
Assert
.
assertTrue
(
uint32
(
0x100000000
)
===
0x0
);
Assert
.
assertTrue
(
uint32
(
0x7f
)
===
uint32
(
0x7f
));
Assert
.
assertTrue
(
uint32
(
0x80
)
===
uint32
(
0x80
));
Assert
.
assertTrue
(
uint32
(
0xffffffff
)
===
uint32
(
0xffffffff
));
Assert
.
assertTrue
(
uint32
(
0x100000000
)
===
uint32
(
0x100000000
));
test/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java
0 → 100644
浏览文件 @
740b7a14
/*
* Copyright (c) 2017, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package
jdk.nashorn.api.scripting.test
;
import
org.testng.annotations.BeforeClass
;
import
org.testng.annotations.Test
;
import
javax.script.*
;
import
static
org
.
testng
.
Assert
.
assertEquals
;
/**
* @bug 8182996
* @summary Incorrect mapping Long type to JavaScript equivalent
*/
@SuppressWarnings
(
"javadoc"
)
public
class
JDK_8182996_Test
{
private
ScriptEngine
engine
;
Bindings
bindings
;
@BeforeClass
public
void
setupTest
()
{
engine
=
new
ScriptEngineManager
().
getEngineByName
(
"js"
);
bindings
=
engine
.
getBindings
(
ScriptContext
.
ENGINE_SCOPE
);
bindings
.
put
(
"long1"
,
Long
.
valueOf
(
1L
));
bindings
.
put
(
"long2"
,
Long
.
valueOf
(
2L
));
bindings
.
put
(
"long2"
,
Long
.
valueOf
(
3L
));
}
@Test
public
void
testType
()
throws
ScriptException
{
assertEquals
(
engine
.
eval
(
"typeof long1"
),
"object"
);
assertEquals
(
engine
.
eval
(
"typeof long2"
),
"object"
);
}
@Test
public
void
testValue
()
throws
ScriptException
{
assertEquals
(
engine
.
eval
(
"long1"
),
Long
.
valueOf
(
1
));
assertEquals
(
engine
.
eval
(
"long2"
),
Long
.
valueOf
(
3
));
assertEquals
(
bindings
.
get
(
"long1"
),
Long
.
valueOf
(
1
));
assertEquals
(
bindings
.
get
(
"long2"
),
Long
.
valueOf
(
3
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录