Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_nashorn
提交
c340bbbc
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,发现更多精彩内容 >>
提交
c340bbbc
编写于
5月 22, 2013
作者:
S
sundar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8014735: Typed Array, BYTES_PER_ELEMENT should be a class property
Reviewed-by: lagergren, jlaskey
上级
48988aeb
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
100 addition
and
16 deletion
+100
-16
src/jdk/nashorn/internal/objects/ArrayBufferView.java
src/jdk/nashorn/internal/objects/ArrayBufferView.java
+1
-5
src/jdk/nashorn/internal/objects/NativeFloat32Array.java
src/jdk/nashorn/internal/objects/NativeFloat32Array.java
+5
-1
src/jdk/nashorn/internal/objects/NativeFloat64Array.java
src/jdk/nashorn/internal/objects/NativeFloat64Array.java
+5
-1
src/jdk/nashorn/internal/objects/NativeInt16Array.java
src/jdk/nashorn/internal/objects/NativeInt16Array.java
+5
-1
src/jdk/nashorn/internal/objects/NativeInt32Array.java
src/jdk/nashorn/internal/objects/NativeInt32Array.java
+5
-1
src/jdk/nashorn/internal/objects/NativeInt8Array.java
src/jdk/nashorn/internal/objects/NativeInt8Array.java
+5
-1
src/jdk/nashorn/internal/objects/NativeUint16Array.java
src/jdk/nashorn/internal/objects/NativeUint16Array.java
+5
-1
src/jdk/nashorn/internal/objects/NativeUint32Array.java
src/jdk/nashorn/internal/objects/NativeUint32Array.java
+5
-1
src/jdk/nashorn/internal/objects/NativeUint8Array.java
src/jdk/nashorn/internal/objects/NativeUint8Array.java
+5
-1
src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
...jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
+5
-1
test/script/basic/JDK-8014735.js
test/script/basic/JDK-8014735.js
+43
-0
test/script/basic/JDK-8014735.js.EXPECTED
test/script/basic/JDK-8014735.js.EXPECTED
+9
-0
test/script/basic/NASHORN-377.js
test/script/basic/NASHORN-377.js
+2
-2
未找到文件。
src/jdk/nashorn/internal/objects/ArrayBufferView.java
浏览文件 @
c340bbbc
...
...
@@ -28,6 +28,7 @@ package jdk.nashorn.internal.objects;
import
jdk.nashorn.internal.objects.annotations.Attribute
;
import
jdk.nashorn.internal.objects.annotations.Getter
;
import
jdk.nashorn.internal.objects.annotations.ScriptClass
;
import
jdk.nashorn.internal.objects.annotations.Where
;
import
jdk.nashorn.internal.runtime.JSType
;
import
jdk.nashorn.internal.runtime.ScriptObject
;
import
jdk.nashorn.internal.runtime.ScriptRuntime
;
...
...
@@ -58,11 +59,6 @@ abstract class ArrayBufferView extends ScriptObject {
return
factory
().
bytesPerElement
;
}
@Getter
(
attributes
=
Attribute
.
NOT_ENUMERABLE
|
Attribute
.
NOT_WRITABLE
|
Attribute
.
NOT_CONFIGURABLE
)
public
static
Object
BYTES_PER_ELEMENT
(
final
Object
self
)
{
return
((
ArrayBufferView
)
self
).
bytesPerElement
();
}
@Getter
(
attributes
=
Attribute
.
NOT_ENUMERABLE
|
Attribute
.
NOT_WRITABLE
|
Attribute
.
NOT_CONFIGURABLE
)
public
static
Object
buffer
(
final
Object
self
)
{
return
((
ArrayDataImpl
)((
ArrayBufferView
)
self
).
getArray
()).
buffer
;
...
...
src/jdk/nashorn/internal/objects/NativeFloat32Array.java
浏览文件 @
c340bbbc
...
...
@@ -28,7 +28,9 @@ package jdk.nashorn.internal.objects;
import
jdk.nashorn.internal.objects.annotations.Attribute
;
import
jdk.nashorn.internal.objects.annotations.Constructor
;
import
jdk.nashorn.internal.objects.annotations.Function
;
import
jdk.nashorn.internal.objects.annotations.Property
;
import
jdk.nashorn.internal.objects.annotations.ScriptClass
;
import
jdk.nashorn.internal.objects.annotations.Where
;
import
jdk.nashorn.internal.runtime.JSType
;
import
jdk.nashorn.internal.runtime.ScriptObject
;
import
jdk.nashorn.internal.runtime.arrays.ArrayData
;
...
...
@@ -38,7 +40,9 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
*/
@ScriptClass
(
"Float32Array"
)
public
final
class
NativeFloat32Array
extends
ArrayBufferView
{
private
static
final
int
BYTES_PER_ELEMENT
=
4
;
@Property
(
attributes
=
Attribute
.
NOT_ENUMERABLE
|
Attribute
.
NOT_WRITABLE
|
Attribute
.
NOT_CONFIGURABLE
,
where
=
Where
.
CONSTRUCTOR
)
public
static
final
int
BYTES_PER_ELEMENT
=
4
;
private
static
final
Factory
FACTORY
=
new
Factory
(
BYTES_PER_ELEMENT
)
{
@Override
public
ArrayBufferView
construct
(
final
NativeArrayBuffer
buffer
,
final
int
byteOffset
,
final
int
length
)
{
...
...
src/jdk/nashorn/internal/objects/NativeFloat64Array.java
浏览文件 @
c340bbbc
...
...
@@ -28,7 +28,9 @@ package jdk.nashorn.internal.objects;
import
jdk.nashorn.internal.objects.annotations.Attribute
;
import
jdk.nashorn.internal.objects.annotations.Constructor
;
import
jdk.nashorn.internal.objects.annotations.Function
;
import
jdk.nashorn.internal.objects.annotations.Property
;
import
jdk.nashorn.internal.objects.annotations.ScriptClass
;
import
jdk.nashorn.internal.objects.annotations.Where
;
import
jdk.nashorn.internal.runtime.JSType
;
import
jdk.nashorn.internal.runtime.ScriptObject
;
import
jdk.nashorn.internal.runtime.arrays.ArrayData
;
...
...
@@ -38,7 +40,9 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
*/
@ScriptClass
(
"Float64Array"
)
public
final
class
NativeFloat64Array
extends
ArrayBufferView
{
private
static
final
int
BYTES_PER_ELEMENT
=
8
;
@Property
(
attributes
=
Attribute
.
NOT_ENUMERABLE
|
Attribute
.
NOT_WRITABLE
|
Attribute
.
NOT_CONFIGURABLE
,
where
=
Where
.
CONSTRUCTOR
)
public
static
final
int
BYTES_PER_ELEMENT
=
8
;
private
static
final
Factory
FACTORY
=
new
Factory
(
BYTES_PER_ELEMENT
)
{
@Override
public
ArrayBufferView
construct
(
final
NativeArrayBuffer
buffer
,
final
int
byteOffset
,
final
int
length
)
{
...
...
src/jdk/nashorn/internal/objects/NativeInt16Array.java
浏览文件 @
c340bbbc
...
...
@@ -28,7 +28,9 @@ package jdk.nashorn.internal.objects;
import
jdk.nashorn.internal.objects.annotations.Attribute
;
import
jdk.nashorn.internal.objects.annotations.Constructor
;
import
jdk.nashorn.internal.objects.annotations.Function
;
import
jdk.nashorn.internal.objects.annotations.Property
;
import
jdk.nashorn.internal.objects.annotations.ScriptClass
;
import
jdk.nashorn.internal.objects.annotations.Where
;
import
jdk.nashorn.internal.runtime.ScriptObject
;
import
jdk.nashorn.internal.runtime.arrays.ArrayData
;
...
...
@@ -37,7 +39,9 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
*/
@ScriptClass
(
"Int16Array"
)
public
final
class
NativeInt16Array
extends
ArrayBufferView
{
private
static
final
int
BYTES_PER_ELEMENT
=
2
;
@Property
(
attributes
=
Attribute
.
NOT_ENUMERABLE
|
Attribute
.
NOT_WRITABLE
|
Attribute
.
NOT_CONFIGURABLE
,
where
=
Where
.
CONSTRUCTOR
)
public
static
final
int
BYTES_PER_ELEMENT
=
2
;
private
static
final
Factory
FACTORY
=
new
Factory
(
BYTES_PER_ELEMENT
)
{
@Override
public
ArrayBufferView
construct
(
final
NativeArrayBuffer
buffer
,
final
int
byteOffset
,
final
int
length
)
{
...
...
src/jdk/nashorn/internal/objects/NativeInt32Array.java
浏览文件 @
c340bbbc
...
...
@@ -28,7 +28,9 @@ package jdk.nashorn.internal.objects;
import
jdk.nashorn.internal.objects.annotations.Attribute
;
import
jdk.nashorn.internal.objects.annotations.Constructor
;
import
jdk.nashorn.internal.objects.annotations.Function
;
import
jdk.nashorn.internal.objects.annotations.Property
;
import
jdk.nashorn.internal.objects.annotations.ScriptClass
;
import
jdk.nashorn.internal.objects.annotations.Where
;
import
jdk.nashorn.internal.runtime.ScriptObject
;
import
jdk.nashorn.internal.runtime.arrays.ArrayData
;
...
...
@@ -37,7 +39,9 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
*/
@ScriptClass
(
"Int32Array"
)
public
final
class
NativeInt32Array
extends
ArrayBufferView
{
private
static
final
int
BYTES_PER_ELEMENT
=
4
;
@Property
(
attributes
=
Attribute
.
NOT_ENUMERABLE
|
Attribute
.
NOT_WRITABLE
|
Attribute
.
NOT_CONFIGURABLE
,
where
=
Where
.
CONSTRUCTOR
)
public
static
final
int
BYTES_PER_ELEMENT
=
4
;
private
static
final
Factory
FACTORY
=
new
Factory
(
BYTES_PER_ELEMENT
)
{
@Override
public
ArrayBufferView
construct
(
final
NativeArrayBuffer
buffer
,
final
int
byteOffset
,
final
int
length
)
{
...
...
src/jdk/nashorn/internal/objects/NativeInt8Array.java
浏览文件 @
c340bbbc
...
...
@@ -28,7 +28,9 @@ package jdk.nashorn.internal.objects;
import
jdk.nashorn.internal.objects.annotations.Attribute
;
import
jdk.nashorn.internal.objects.annotations.Constructor
;
import
jdk.nashorn.internal.objects.annotations.Function
;
import
jdk.nashorn.internal.objects.annotations.Property
;
import
jdk.nashorn.internal.objects.annotations.ScriptClass
;
import
jdk.nashorn.internal.objects.annotations.Where
;
import
jdk.nashorn.internal.runtime.ScriptObject
;
import
jdk.nashorn.internal.runtime.arrays.ArrayData
;
...
...
@@ -37,7 +39,9 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
*/
@ScriptClass
(
"Int8Array"
)
public
final
class
NativeInt8Array
extends
ArrayBufferView
{
private
static
final
int
BYTES_PER_ELEMENT
=
1
;
@Property
(
attributes
=
Attribute
.
NOT_ENUMERABLE
|
Attribute
.
NOT_WRITABLE
|
Attribute
.
NOT_CONFIGURABLE
,
where
=
Where
.
CONSTRUCTOR
)
public
static
final
int
BYTES_PER_ELEMENT
=
1
;
private
static
final
Factory
FACTORY
=
new
Factory
(
BYTES_PER_ELEMENT
)
{
@Override
public
ArrayBufferView
construct
(
final
NativeArrayBuffer
buffer
,
final
int
byteOffset
,
final
int
length
)
{
...
...
src/jdk/nashorn/internal/objects/NativeUint16Array.java
浏览文件 @
c340bbbc
...
...
@@ -28,7 +28,9 @@ package jdk.nashorn.internal.objects;
import
jdk.nashorn.internal.objects.annotations.Attribute
;
import
jdk.nashorn.internal.objects.annotations.Constructor
;
import
jdk.nashorn.internal.objects.annotations.Function
;
import
jdk.nashorn.internal.objects.annotations.Property
;
import
jdk.nashorn.internal.objects.annotations.ScriptClass
;
import
jdk.nashorn.internal.objects.annotations.Where
;
import
jdk.nashorn.internal.runtime.ScriptObject
;
import
jdk.nashorn.internal.runtime.arrays.ArrayData
;
...
...
@@ -37,7 +39,9 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
*/
@ScriptClass
(
"Uint16Array"
)
public
final
class
NativeUint16Array
extends
ArrayBufferView
{
private
static
final
int
BYTES_PER_ELEMENT
=
2
;
@Property
(
attributes
=
Attribute
.
NOT_ENUMERABLE
|
Attribute
.
NOT_WRITABLE
|
Attribute
.
NOT_CONFIGURABLE
,
where
=
Where
.
CONSTRUCTOR
)
public
static
final
int
BYTES_PER_ELEMENT
=
2
;
private
static
final
Factory
FACTORY
=
new
Factory
(
BYTES_PER_ELEMENT
)
{
@Override
public
ArrayBufferView
construct
(
final
NativeArrayBuffer
buffer
,
final
int
byteOffset
,
final
int
length
)
{
...
...
src/jdk/nashorn/internal/objects/NativeUint32Array.java
浏览文件 @
c340bbbc
...
...
@@ -28,7 +28,9 @@ package jdk.nashorn.internal.objects;
import
jdk.nashorn.internal.objects.annotations.Attribute
;
import
jdk.nashorn.internal.objects.annotations.Constructor
;
import
jdk.nashorn.internal.objects.annotations.Function
;
import
jdk.nashorn.internal.objects.annotations.Property
;
import
jdk.nashorn.internal.objects.annotations.ScriptClass
;
import
jdk.nashorn.internal.objects.annotations.Where
;
import
jdk.nashorn.internal.runtime.JSType
;
import
jdk.nashorn.internal.runtime.ScriptObject
;
import
jdk.nashorn.internal.runtime.arrays.ArrayData
;
...
...
@@ -38,7 +40,9 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
*/
@ScriptClass
(
"Uint32Array"
)
public
final
class
NativeUint32Array
extends
ArrayBufferView
{
private
static
final
int
BYTES_PER_ELEMENT
=
4
;
@Property
(
attributes
=
Attribute
.
NOT_ENUMERABLE
|
Attribute
.
NOT_WRITABLE
|
Attribute
.
NOT_CONFIGURABLE
,
where
=
Where
.
CONSTRUCTOR
)
public
static
final
int
BYTES_PER_ELEMENT
=
4
;
private
static
final
Factory
FACTORY
=
new
Factory
(
BYTES_PER_ELEMENT
)
{
@Override
public
ArrayBufferView
construct
(
final
NativeArrayBuffer
buffer
,
final
int
byteBegin
,
final
int
length
)
{
...
...
src/jdk/nashorn/internal/objects/NativeUint8Array.java
浏览文件 @
c340bbbc
...
...
@@ -28,7 +28,9 @@ package jdk.nashorn.internal.objects;
import
jdk.nashorn.internal.objects.annotations.Attribute
;
import
jdk.nashorn.internal.objects.annotations.Constructor
;
import
jdk.nashorn.internal.objects.annotations.Function
;
import
jdk.nashorn.internal.objects.annotations.Property
;
import
jdk.nashorn.internal.objects.annotations.ScriptClass
;
import
jdk.nashorn.internal.objects.annotations.Where
;
import
jdk.nashorn.internal.runtime.ScriptObject
;
import
jdk.nashorn.internal.runtime.arrays.ArrayData
;
...
...
@@ -37,7 +39,9 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
*/
@ScriptClass
(
"Uint8Array"
)
public
final
class
NativeUint8Array
extends
ArrayBufferView
{
private
static
final
int
BYTES_PER_ELEMENT
=
1
;
@Property
(
attributes
=
Attribute
.
NOT_ENUMERABLE
|
Attribute
.
NOT_WRITABLE
|
Attribute
.
NOT_CONFIGURABLE
,
where
=
Where
.
CONSTRUCTOR
)
public
static
final
int
BYTES_PER_ELEMENT
=
1
;
private
static
final
Factory
FACTORY
=
new
Factory
(
BYTES_PER_ELEMENT
)
{
@Override
public
ArrayBufferView
construct
(
final
NativeArrayBuffer
buffer
,
final
int
byteOffset
,
final
int
length
)
{
...
...
src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
浏览文件 @
c340bbbc
...
...
@@ -28,7 +28,9 @@ package jdk.nashorn.internal.objects;
import
jdk.nashorn.internal.objects.annotations.Attribute
;
import
jdk.nashorn.internal.objects.annotations.Constructor
;
import
jdk.nashorn.internal.objects.annotations.Function
;
import
jdk.nashorn.internal.objects.annotations.Property
;
import
jdk.nashorn.internal.objects.annotations.ScriptClass
;
import
jdk.nashorn.internal.objects.annotations.Where
;
import
jdk.nashorn.internal.runtime.JSType
;
import
jdk.nashorn.internal.runtime.ScriptObject
;
import
jdk.nashorn.internal.runtime.arrays.ArrayData
;
...
...
@@ -38,7 +40,9 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
*/
@ScriptClass
(
"Uint8ClampedArray"
)
public
final
class
NativeUint8ClampedArray
extends
ArrayBufferView
{
private
static
final
int
BYTES_PER_ELEMENT
=
1
;
@Property
(
attributes
=
Attribute
.
NOT_ENUMERABLE
|
Attribute
.
NOT_WRITABLE
|
Attribute
.
NOT_CONFIGURABLE
,
where
=
Where
.
CONSTRUCTOR
)
public
static
final
int
BYTES_PER_ELEMENT
=
1
;
private
static
final
Factory
FACTORY
=
new
Factory
(
BYTES_PER_ELEMENT
)
{
@Override
public
ArrayBufferView
construct
(
final
NativeArrayBuffer
buffer
,
final
int
byteOffset
,
final
int
length
)
{
...
...
test/script/basic/JDK-8014735.js
0 → 100644
浏览文件 @
c340bbbc
/*
* 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-8014735: Typed Array, BYTES_PER_ELEMENT should be a class property
*
* @test
* @run
*/
function
bytesPerElement
(
func
)
{
print
(
func
.
name
+
"
.BYTES_PER_ELEMENT =
"
+
func
.
BYTES_PER_ELEMENT
);
}
bytesPerElement
(
Int8Array
);
bytesPerElement
(
Int16Array
);
bytesPerElement
(
Int32Array
);
bytesPerElement
(
Uint8Array
);
bytesPerElement
(
Uint8ClampedArray
);
bytesPerElement
(
Uint16Array
);
bytesPerElement
(
Uint32Array
);
bytesPerElement
(
Float32Array
);
bytesPerElement
(
Float64Array
);
test/script/basic/JDK-8014735.js.EXPECTED
0 → 100644
浏览文件 @
c340bbbc
Int8Array.BYTES_PER_ELEMENT = 1
Int16Array.BYTES_PER_ELEMENT = 2
Int32Array.BYTES_PER_ELEMENT = 4
Uint8Array.BYTES_PER_ELEMENT = 1
Uint8ClampedArray.BYTES_PER_ELEMENT = 1
Uint16Array.BYTES_PER_ELEMENT = 2
Uint32Array.BYTES_PER_ELEMENT = 4
Float32Array.BYTES_PER_ELEMENT = 4
Float64Array.BYTES_PER_ELEMENT = 8
test/script/basic/NASHORN-377.js
浏览文件 @
c340bbbc
...
...
@@ -43,7 +43,7 @@ function tohex(d, w) {
function
arrstr
(
a
,
n
,
w
)
{
var
s
=
""
;
if
(
typeof
n
==
"
undefined
"
)
n
=
a
.
length
;
if
(
typeof
w
==
"
undefined
"
)
w
=
a
.
BYTES_PER_ELEMENT
*
2
;
if
(
typeof
w
==
"
undefined
"
)
w
=
a
.
constructor
.
BYTES_PER_ELEMENT
*
2
;
for
(
var
i
=
0
;
i
<
n
;
i
++
)
{
s
+=
tohex
(
a
[
i
],
w
);
}
...
...
@@ -96,7 +96,7 @@ function fillArray(a, start) {
var
b
=
new
ArrayBuffer
(
8
);
for
(
var
i
in
types
)
{
var
x
=
new
types
[
i
](
b
);
print
(
x
.
byteOffset
,
x
.
byteLength
,
x
.
length
,
x
.
BYTES_PER_ELEMENT
);
print
(
x
.
byteOffset
,
x
.
byteLength
,
x
.
length
,
x
.
constructor
.
BYTES_PER_ELEMENT
);
assertTrue
(
function
(){
return
x
.
constructor
===
types
[
i
]
});
}
})();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录