Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
ffbce7fe
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ffbce7fe
编写于
4月 02, 2012
作者:
A
Alex Tkachman
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
KT-1589: Array<T>(size) renamed to arrayOfNulls
上级
a1582e19
变更
21
隐藏空白更改
内联
并排
Showing
21 changed file
with
24 addition
and
24 deletion
+24
-24
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java
...rg/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java
+1
-1
compiler/frontend/src/jet/Arrays.jet
compiler/frontend/src/jet/Arrays.jet
+1
-1
compiler/testData/codegen/controlStructures/forIntRange.jet
compiler/testData/codegen/controlStructures/forIntRange.jet
+1
-1
compiler/testData/codegen/controlStructures/forNullableIntArray.jet
...estData/codegen/controlStructures/forNullableIntArray.jet
+1
-1
compiler/testData/codegen/controlStructures/forUserType.jet
compiler/testData/codegen/controlStructures/forUserType.jet
+1
-1
compiler/testData/codegen/regressions/kt1018.kt
compiler/testData/codegen/regressions/kt1018.kt
+1
-1
compiler/testData/codegen/regressions/kt238.jet
compiler/testData/codegen/regressions/kt238.jet
+2
-2
compiler/testData/codegen/regressions/kt560.jet
compiler/testData/codegen/regressions/kt560.jet
+1
-1
compiler/testData/codegen/regressions/kt594.jet
compiler/testData/codegen/regressions/kt594.jet
+2
-2
compiler/testData/codegen/regressions/kt602.jet
compiler/testData/codegen/regressions/kt602.jet
+1
-1
compiler/testData/diagnostics/tests/inference/kt1293.jet
compiler/testData/diagnostics/tests/inference/kt1293.jet
+1
-1
compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java
compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java
+1
-1
compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
...ler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+1
-1
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java
...rc/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java
+1
-1
js/js.translator/testFiles/expression/for/cases/forIteratesOverArray.kt
...or/testFiles/expression/for/cases/forIteratesOverArray.kt
+1
-1
js/js.translator/testFiles/expression/for/cases/forOnEmptyArray.kt
...nslator/testFiles/expression/for/cases/forOnEmptyArray.kt
+1
-1
js/js.translator/testFiles/standardClasses/cases/array.kt
js/js.translator/testFiles/standardClasses/cases/array.kt
+1
-1
js/js.translator/testFiles/standardClasses/cases/arrayAccess.kt
...translator/testFiles/standardClasses/cases/arrayAccess.kt
+1
-1
js/js.translator/testFiles/standardClasses/cases/arrayIsFilledWithNulls.kt
...testFiles/standardClasses/cases/arrayIsFilledWithNulls.kt
+1
-1
js/js.translator/testFiles/standardClasses/cases/arraySize.kt
...s.translator/testFiles/standardClasses/cases/arraySize.kt
+2
-2
libraries/stdlib/src/kotlin/JUtil.kt
libraries/stdlib/src/kotlin/JUtil.kt
+1
-1
未找到文件。
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java
浏览文件 @
ffbce7fe
...
...
@@ -132,7 +132,7 @@ public class IntrinsicMethods {
declareOverload
(
myStdLib
.
getLibraryScope
().
getFunctions
(
"equals"
),
1
,
EQUALS
);
declareOverload
(
myStdLib
.
getLibraryScope
().
getFunctions
(
"identityEquals"
),
1
,
IDENTITY_EQUALS
);
declareOverload
(
myStdLib
.
getLibraryScope
().
getFunctions
(
"plus"
),
1
,
STRING_PLUS
);
declareOverload
(
myStdLib
.
getLibraryScope
().
getFunctions
(
"
Array
"
),
1
,
new
NewArray
());
declareOverload
(
myStdLib
.
getLibraryScope
().
getFunctions
(
"
arrayOfNulls
"
),
1
,
new
NewArray
());
declareOverload
(
myStdLib
.
getLibraryScope
().
getFunctions
(
"sure"
),
0
,
new
Sure
());
declareOverload
(
myStdLib
.
getLibraryScope
().
getFunctions
(
"synchronized"
),
2
,
new
StupidSync
());
declareOverload
(
myStdLib
.
getLibraryScope
().
getFunctions
(
"iterator"
),
0
,
new
IteratorIterator
());
...
...
compiler/frontend/src/jet/Arrays.jet
浏览文件 @
ffbce7fe
package
jet
public
fun
Array
<
T
>(
public
val
size
:
Int
)
:
Array
<
T
?>
public
fun
arrayOfNulls
<
T
>(
public
val
size
:
Int
)
:
Array
<
T
?>
public
class
Array
<
T
>(
public
val
size
:
Int
,
init
:
(
Int
)
->
T
)
{
public
fun
get
(
index
:
Int
)
:
T
...
...
compiler/testData/codegen/controlStructures/forIntRange.jet
浏览文件 @
ffbce7fe
fun box() : String {
val a =
Array<String?
>(3)
val a =
arrayOfNulls<String
>(3)
a[0] = "a"
a[1] = "b"
a[2] = "c"
...
...
compiler/testData/codegen/controlStructures/forNullableIntArray.jet
浏览文件 @
ffbce7fe
fun box() : String {
val b : Array<Int?> =
Array<Int?
> (5)
val b : Array<Int?> =
arrayOfNulls<Int
> (5)
var i = 0
var sum = 0
while(i < 5) {
...
...
compiler/testData/codegen/controlStructures/forUserType.jet
浏览文件 @
ffbce7fe
...
...
@@ -54,7 +54,7 @@ fun box() : String {
}
if(sum != 10) return "a failed"
val b : Array<Int?> =
Array<Int?
> (5)
val b : Array<Int?> =
arrayOfNulls<Int
> (5)
i = 0
while(i < 5) {
b[i] = i++
...
...
compiler/testData/codegen/regressions/kt1018.kt
浏览文件 @
ffbce7fe
...
...
@@ -5,7 +5,7 @@ public class StockMarketTableModel() {
}
class
object {
private val
COLUMN_TITLES
:
Array
<
Int
?
>
=
Array
<
Int
?
>(
10
)
private val
COLUMN_TITLES
:
Array
<
Int
?
>
=
arrayOfNulls
<
Int
>(
10
)
}
}
...
...
compiler/testData/codegen/regressions/kt238.jet
浏览文件 @
ffbce7fe
fun t1 () {
val a1 =
Array<String?
>(1)
val a1 =
arrayOfNulls<String
>(1)
a1[0] = "0" //ok
val s = a1[0] //ok
}
...
...
@@ -11,7 +11,7 @@ fun t2 () {
}
fun t3 () {
val a3 =
Array<Int?
>(1)
val a3 =
arrayOfNulls<Int
>(1)
a3[0] = 0 //verify error
var j = a3[0] //ok
var k : Int = a3[0] ?: 5 //ok
...
...
compiler/testData/codegen/regressions/kt560.jet
浏览文件 @
ffbce7fe
...
...
@@ -23,6 +23,6 @@ open class AllEvenNum() {
}
fun
box
()
:
String
{
AllEvenNum
.
main
(
Array
<
String
?
>(
0
))
AllEvenNum
.
main
(
arrayOfNulls
<
String
>(
0
))
return
"OK"
}
compiler/testData/codegen/regressions/kt594.jet
浏览文件 @
ffbce7fe
...
...
@@ -5,8 +5,8 @@ fun box() : String {
array
?.
set
(
0
,
3
)
if
(
array
?.
get
(
0
)
!= 3) return "fail"
var
a
=
Array
<
Array
<
String
?>?
>(
5
)
var
b
=
Array
<
String
?
>(
1
)
var
a
=
arrayOfNulls
<
Array
<
String
?>
>(
5
)
var
b
=
arrayOfNulls
<
String
>(
1
)
b
.
set
(
0
,
"239"
)
a
?.
set
(
0
,
b
)
...
...
compiler/testData/codegen/regressions/kt602.jet
浏览文件 @
ffbce7fe
fun box() = if(
Array
<Int>(10) is Array<java.lang.Integer>) "OK" else "fail"
fun box() = if(
arrayOfNulls
<Int>(10) is Array<java.lang.Integer>) "OK" else "fail"
compiler/testData/diagnostics/tests/inference/kt1293.jet
浏览文件 @
ffbce7fe
...
...
@@ -3,7 +3,7 @@
package kt1293
fun main(args : Array<String>) {
val intArray =
Array
<Int>(10)
val intArray =
arrayOfNulls
<Int>(10)
val <!UNUSED_VARIABLE!>i<!> : Int = <!TYPE_MISMATCH!>intArray[0]<!>
requiresInt(<!TYPE_MISMATCH!>intArray[0]<!>)
}
...
...
compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java
浏览文件 @
ffbce7fe
...
...
@@ -43,7 +43,7 @@ public class ArrayGenTest extends CodegenTestCase {
}
public
void
testCreateMultiIntNullable
()
throws
Exception
{
loadText
(
"fun foo() = Array<Array<Int?>> (5, {
Array<Int?
>(it) })"
);
loadText
(
"fun foo() = Array<Array<Int?>> (5, {
arrayOfNulls<Int
>(it) })"
);
Method
foo
=
generateFunction
();
Integer
[][]
invoke
=
(
Integer
[][])
foo
.
invoke
(
null
);
assertEquals
(
invoke
[
2
].
length
,
2
);
...
...
compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
浏览文件 @
ffbce7fe
...
...
@@ -398,7 +398,7 @@ public class NamespaceGenTest extends CodegenTestCase {
}
public
void
testArrayNewNullable
()
throws
Exception
{
loadText
(
"fun foo() =
Array<Int?
>(4)"
);
loadText
(
"fun foo() =
arrayOfNulls<Int
>(4)"
);
// System.out.println(generateToText());
final
Method
main
=
generateFunction
();
Integer
[]
result
=
(
Integer
[])
main
.
invoke
(
null
);
...
...
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java
浏览文件 @
ffbce7fe
...
...
@@ -127,7 +127,7 @@ public final class Intrinsics {
}
private
void
declareNullConstructorIntrinsic
()
{
FunctionDescriptor
nullArrayConstructor
=
library
.
getLibraryScope
().
getFunctions
(
"
Array
"
).
iterator
().
next
();
FunctionDescriptor
nullArrayConstructor
=
library
.
getLibraryScope
().
getFunctions
(
"
arrayOfNulls
"
).
iterator
().
next
();
functionIntrinsics
.
put
(
nullArrayConstructor
,
new
CallStandardMethodIntrinsic
(
"Kotlin.nullArray"
,
false
,
1
));
}
...
...
js/js.translator/testFiles/expression/for/cases/forIteratesOverArray.kt
浏览文件 @
ffbce7fe
package
foo
val
a1
=
Array
<
Int
>(
10
)
val
a1
=
arrayOfNulls
<
Int
>(
10
)
fun
box
()
:
Boolean
{
var
c
=
0
...
...
js/js.translator/testFiles/expression/for/cases/forOnEmptyArray.kt
浏览文件 @
ffbce7fe
package
foo
val
a1
=
Array
<
Int
>(
0
)
val
a1
=
arrayOfNulls
<
Int
>(
0
)
fun
box
()
:
Boolean
{
for
(
a
in
a1
)
{
...
...
js/js.translator/testFiles/standardClasses/cases/array.kt
浏览文件 @
ffbce7fe
...
...
@@ -2,7 +2,7 @@ package foo
fun
box
()
:
Boolean
{
val
a
=
Array
<
Int
>(
2
)
val
a
=
arrayOfNulls
<
Int
>(
2
)
a
.
set
(
1
,
2
)
return
a
.
get
(
1
)
==
2
}
...
...
js/js.translator/testFiles/standardClasses/cases/arrayAccess.kt
浏览文件 @
ffbce7fe
package
foo
fun
box
()
:
Boolean
{
val
a
=
Array
<
Int
>(
4
)
val
a
=
arrayOfNulls
<
Int
>(
4
)
a
[
1
]
=
2
a
[
2
]
=
3
return
(
a
[
1
]
==
2
)
&&
(
a
[
2
]
==
3
)
...
...
js/js.translator/testFiles/standardClasses/cases/arrayIsFilledWithNulls.kt
浏览文件 @
ffbce7fe
package
foo
val
a
=
Array
<
Int
>(
3
)
val
a
=
arrayOfNulls
<
Int
>(
3
)
fun
box
()
=
(
a
[
0
]
==
null
&&
a
[
1
]
==
null
&&
a
[
2
]
==
null
)
\ No newline at end of file
js/js.translator/testFiles/standardClasses/cases/arraySize.kt
浏览文件 @
ffbce7fe
...
...
@@ -2,7 +2,7 @@ package foo
class
A
()
{}
val
a1
=
Array
<
Int
>(
3
)
val
a2
=
Array
<
A
>(
2
)
val
a1
=
arrayOfNulls
<
Int
>(
3
)
val
a2
=
arrayOfNulls
<
A
>(
2
)
fun
box
()
=
(
a1
.
size
==
3
&&
a2
.
size
==
2
)
\ No newline at end of file
libraries/stdlib/src/kotlin/JUtil.kt
浏览文件 @
ffbce7fe
...
...
@@ -32,7 +32,7 @@ val Collection<*>.indices : IntRange
get
()
=
0
..
size-1
public
inline
fun
<
T
>
java
.
util
.
Collection
<
T
>.
toArray
()
:
Array
<
T
>
{
val
answer
=
Array
<
T
>(
this
.
size
)
val
answer
=
arrayOfNulls
<
T
>(
this
.
size
)
var
idx
=
0
for
(
elem
in
this
)
answer
[
idx
++]
=
elem
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录