Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of git://github.com/jgl87/kotlin
- Loading branch information
Showing
18 changed files
with
369 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DottedCallInfo.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * Copyright 2010-2014 JetBrains s.r.o. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.jetbrains.jet.lang.resolve.calls.model | ||
|
|
||
| import org.jetbrains.jet.lang.psi.Call | ||
| import org.jetbrains.jet.lang.descriptors.CallableDescriptor | ||
| import org.jetbrains.jet.lang.types.JetType | ||
| import org.jetbrains.jet.lang.descriptors.FunctionDescriptor | ||
|
|
||
| class DottedCallInfo(val call: Call, val resolvedCall: ResolvedCall<out FunctionDescriptor>) |
124 changes: 124 additions & 0 deletions
124
compiler/testData/cfg/basic/humbleSimplicityOfDots.instructions
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| == dot == | ||
| fun Int.dot(): Int { | ||
| return this + 1 | ||
| } | ||
| --------------------- | ||
| L0: | ||
| 1 <START> | ||
| 2 mark({ return this + 1 }) | ||
| mark(this + 1) | ||
| r(this) | ||
| r(1) | ||
| call(+, plus) | ||
| ret(*) L1 | ||
| L1: | ||
| 1 <END> NEXT:[<SINK>] | ||
| error: | ||
| <ERROR> PREV:[] | ||
| sink: | ||
| <SINK> PREV:[<ERROR>, <END>] | ||
| ===================== | ||
| == dot == | ||
| fun String?.dot(): String = this ?: "" | ||
| --------------------- | ||
| L0: | ||
| 1 <START> | ||
| r(this) | ||
| jt(L2) NEXT:[mark(""), <END>] | ||
| mark("") | ||
| r("") | ||
| L1: | ||
| L2: | ||
| <END> NEXT:[<SINK>] PREV:[jt(L2), r("")] | ||
| error: | ||
| <ERROR> PREV:[] | ||
| sink: | ||
| <SINK> PREV:[<ERROR>, <END>] | ||
| ===================== | ||
| == i == | ||
| fun i(): Int? = null | ||
| --------------------- | ||
| L0: | ||
| 1 <START> | ||
| r(null) | ||
| L1: | ||
| <END> NEXT:[<SINK>] | ||
| error: | ||
| <ERROR> PREV:[] | ||
| sink: | ||
| <SINK> PREV:[<ERROR>, <END>] | ||
| ===================== | ||
| == s == | ||
| fun s(): String? = null | ||
| --------------------- | ||
| L0: | ||
| 1 <START> | ||
| r(null) | ||
| L1: | ||
| <END> NEXT:[<SINK>] | ||
| error: | ||
| <ERROR> PREV:[] | ||
| sink: | ||
| <SINK> PREV:[<ERROR>, <END>] | ||
| ===================== | ||
| == f == | ||
| fun f() : Unit { | ||
| 2.toLong() | ||
| 3.equals(4) | ||
| i()?.toLong() | ||
|
|
||
| "test".length | ||
| s().length() | ||
| } | ||
| --------------------- | ||
| L0: | ||
| 1 <START> | ||
| 2 mark({ 2.toLong() 3.equals(4) i()?.toLong() "test".length s().length() }) | ||
| mark(2.toLong()) | ||
| mark(toLong()) | ||
| r(2) | ||
| call(toLong, toLong) | ||
| mark(dot()) | ||
| r(2) | ||
| call(dot, dot) | ||
| mark(3.equals(4)) | ||
| mark(equals(4)) | ||
| r(3) | ||
| r(4) | ||
| call(equals, equals) | ||
| mark(dot()) | ||
| r(3) | ||
| call(dot, dot) | ||
| mark(i()?.toLong()) | ||
| mark(toLong()) | ||
| mark(i()) | ||
| call(i, i) | ||
| call(toLong, toLong) | ||
| mark(dot()) | ||
| mark(i()) | ||
| call(i, i) | ||
| call(dot, dot) | ||
| mark("test".length) | ||
| mark("test") | ||
| r("test") | ||
| r(length) | ||
| mark(dot()) | ||
| mark("test") | ||
| r("test") | ||
| call(dot, dot) | ||
| mark(s().length()) | ||
| mark(length()) | ||
| mark(s()) | ||
| call(s, s) | ||
| r(length) | ||
| mark(dot()) | ||
| mark(s()) | ||
| call(s, s) | ||
| call(dot, dot) | ||
| L1: | ||
| 1 <END> NEXT:[<SINK>] | ||
| error: | ||
| <ERROR> PREV:[] | ||
| sink: | ||
| <SINK> PREV:[<ERROR>, <END>] | ||
| ===================== |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| fun Int.dot(): Int { | ||
| return this + 1 | ||
| } | ||
|
|
||
| fun String?.dot(): String = this ?: "" | ||
|
|
||
| fun i(): Int? = null | ||
|
|
||
| fun s(): String? = null | ||
|
|
||
| fun f() : Unit { | ||
| 2.toLong() | ||
| 3.equals(4) | ||
| i()?.toLong() | ||
|
|
||
| "test".length | ||
| s().length() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| class Foo { | ||
| fun foo(): String { | ||
| return "O" | ||
| } | ||
| } | ||
|
|
||
| class Bar { | ||
| fun bar(): String { | ||
| return "" | ||
| } | ||
| } | ||
|
|
||
| var t: String = "" | ||
|
|
||
| fun Foo.dot() { | ||
| t = "K" | ||
| } | ||
|
|
||
| fun box(): String { | ||
| val f: Foo = Foo() | ||
| return f.foo() + t | ||
| } |
23 changes: 23 additions & 0 deletions
23
compiler/testData/codegen/box/dot/onlyDotCanKeepYouFromFailure.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| class Foo { | ||
| fun foo(): String { | ||
| return "FAIL" | ||
| } | ||
| } | ||
|
|
||
| class Bar { | ||
| fun bar(): String { | ||
| return "O" | ||
| } | ||
| } | ||
|
|
||
| var t: String = "" | ||
|
|
||
| fun Foo.dot(): Bar { | ||
| t = "K" | ||
| return Bar() | ||
| } | ||
|
|
||
| fun box(): String { | ||
| val f: Foo = Foo() | ||
| return f.bar() + t | ||
| } |
8 changes: 8 additions & 0 deletions
8
compiler/testData/diagnostics/tests/dataFlow/nothingLikeDot.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| fun Any?.dot(): Nothing { | ||
| throw RuntimeException() | ||
| } | ||
|
|
||
| fun test(): String { | ||
| val s: String? = "" | ||
| <!UNREACHABLE_CODE!>return s.dot()<!> | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.