azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Java to Kotlin converter: supported try-with-resource construct, fixed anonymous class generation + fixed a bug with method return type

Browse Source 
#KT-4488 Fixed
This commit is contained in:
Valentin Kipyatkov
2014-06-11 13:07:13 +04:00
parent 1b948ef8f1
commit 149ea16f5c
46 changed files with 724 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/tests/testData/ast/tryWithResource/Multiline.java
+12
View File
@@ -0,0 +1,12 @@
//file
import java.io.*;
public class C {
void foo() throws IOException {
try(InputStream stream = new FileInputStream("foo")) {
// reading something
int c = stream.read();
System.out.println(c);
}
}
}
j2k/tests/testData/ast/tryWithResource/Multiline.kt
+11
View File
@@ -0,0 +1,11 @@
import java.io.*
public class C() {
fun foo() {
FileInputStream("foo").use { stream ->
// reading something
val c = stream.read()
System.out.println(c)
}
}
}
j2k/tests/testData/ast/tryWithResource/MultipleResources.java
+12
View File
@@ -0,0 +1,12 @@
//file
import java.io.*;
public class C {
void foo() throws IOException {
try(InputStream input = new FileInputStream("foo");
OutputStream output = new FileOutputStream("bar")) {
output.write(input.read());
output.write(0);
}
}
}
j2k/tests/testData/ast/tryWithResource/MultipleResources.kt
+12
View File
@@ -0,0 +1,12 @@
import java.io.*
public class C() {
fun foo() {
FileInputStream("foo").use { input ->
FileOutputStream("bar").use { output ->
output.write(input.read())
output.write(0)
}
}
}
}
j2k/tests/testData/ast/tryWithResource/Simple.java
+10
View File
@@ -0,0 +1,10 @@
//file
import java.io.*;
public class C {
void foo() throws IOException {
try(InputStream stream = new FileInputStream("foo")) {
System.out.println(stream.read());
}
}
}
j2k/tests/testData/ast/tryWithResource/Simple.kt
+7
View File
@@ -0,0 +1,7 @@
import java.io.*
public class C() {
fun foo() {
FileInputStream("foo").use { stream -> System.out.println(stream.read()) }
}
}
j2k/tests/testData/ast/tryWithResource/WithCatch.java
+15
View File
@@ -0,0 +1,15 @@
//file
import java.io.*;
public class C {
void foo() {
try(InputStream stream = new FileInputStream("foo")) {
// reading something
int c = stream.read();
System.out.println(c);
}
catch (IOException e) {
System.out.println(e);
}
}
}
j2k/tests/testData/ast/tryWithResource/WithCatch.kt
+16
View File
@@ -0,0 +1,16 @@
import java.io.*
public class C() {
fun foo() {
try {
FileInputStream("foo").use { stream ->
// reading something
val c = stream.read()
System.out.println(c)
}
} catch (e: IOException) {
System.out.println(e)
}
}
}
j2k/tests/testData/ast/tryWithResource/WithCatchAndFinally.java
+18
View File
@@ -0,0 +1,18 @@
//file
import java.io.*;
public class C {
void foo() {
try(InputStream stream = new FileInputStream("foo")) {
// reading something
int c = stream.read();
System.out.println(c);
}
catch (IOException e) {
System.out.println(e);
}
finally {
System.out.println("Finally!");
}
}
}
j2k/tests/testData/ast/tryWithResource/WithCatchAndFinally.kt
+17
View File
@@ -0,0 +1,17 @@
import java.io.*
public class C() {
fun foo() {
try {
FileInputStream("foo").use { stream ->
// reading something
val c = stream.read()
System.out.println(c)
}
} catch (e: IOException) {
System.out.println(e)
} finally {
System.out.println("Finally!")
}
}
}
j2k/tests/testData/ast/tryWithResource/WithCatches.java
+18
View File
@@ -0,0 +1,18 @@
//file
import java.io.*;
public class C {
void foo() {
try(InputStream stream = new FileInputStream("foo")) {
// reading something
int c = stream.read();
System.out.println(c);
}
catch (IOException e) {
System.out.println(e);
}
catch (Exception e) {
System.err.println(e);
}
}
}
j2k/tests/testData/ast/tryWithResource/WithCatches.kt
+18
View File
@@ -0,0 +1,18 @@
import java.io.*
public class C() {
fun foo() {
try {
FileInputStream("foo").use { stream ->
// reading something
val c = stream.read()
System.out.println(c)
}
} catch (e: IOException) {
System.out.println(e)
} catch (e: Exception) {
System.err.println(e)
}
}
}
j2k/tests/testData/ast/tryWithResource/WithFinally.java
+15
View File
@@ -0,0 +1,15 @@
//file
import java.io.*;
public class C {
void foo() throws IOException {
try(InputStream stream = new FileInputStream("foo")) {
// reading something
int c = stream.read();
System.out.println(c);
}
finally {
// dispose something else
}
}
}
j2k/tests/testData/ast/tryWithResource/WithFinally.kt
+15
View File
@@ -0,0 +1,15 @@
import java.io.*
public class C() {
fun foo() {
try {
FileInputStream("foo").use { stream ->
// reading something
val c = stream.read()
System.out.println(c)
}
} finally {
// dispose something else
}
}
}
j2k/tests/testData/ast/tryWithResource/WithReturn.java.todo
+17
View File
@@ -0,0 +1,17 @@
//file
import java.io.*;
public class C {
int foo() {
try(InputStream stream = new FileInputStream("foo")) {
while(true) {
int c = stream.read();
if (c < 0 || c > 127) return c;
}
}
catch (IOException e) {
System.out.println(e);
return -1;
}
}
}
j2k/tests/testData/ast/tryWithResource/WithReturnAtEnd.java
+16
View File
@@ -0,0 +1,16 @@
//file
import java.io.*;
public class C {
int foo() {
try(InputStream stream = new FileInputStream("foo")) {
// reading something
int c = stream.read();
return c;
}
catch (IOException e) {
System.out.println(e);
return -1;
}
}
}
j2k/tests/testData/ast/tryWithResource/WithReturnAtEnd.kt
+17
View File
@@ -0,0 +1,17 @@
import java.io.*
public class C() {
fun foo(): Int {
try {
return FileInputStream("foo").use { stream ->
// reading something
val c = stream.read()
c
}
} catch (e: IOException) {
System.out.println(e)
return -1
}
}
}
j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass.java
+23
View File
@@ -0,0 +1,23 @@
//file
import java.io.*;
interface I {
int doIt(InputStream stream) throws IOException;
}
public class C {
void foo() throws IOException {
try(InputStream stream = new FileInputStream("foo")) {
bar(new I() {
@Override
public int doIt(InputStream stream) throws IOException {
return stream.available();
}
}, stream);
}
}
int bar(I i, InputStream stream) throws IOException {
return i.doIt(stream);
}
}
j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass.kt
+21
View File
@@ -0,0 +1,21 @@
import java.io.*
trait I {
public fun doIt(stream: InputStream): Int
}
public class C() {
fun foo() {
FileInputStream("foo").use { stream ->
bar(object : I {
override fun doIt(stream: InputStream): Int {
return stream.available()
}
}, stream)
}
}
fun bar(i: I, stream: InputStream): Int {
return i.doIt(stream)
}
}
j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass2.java
+23
View File
@@ -0,0 +1,23 @@
//file
import java.io.*;
interface I {
int doIt(InputStream stream) throws IOException;
}
public class C {
int foo() throws IOException {
try(InputStream stream = new FileInputStream("foo")) {
return bar(new I() {
@Override
public int doIt(InputStream stream) throws IOException {
return stream.available();
}
}, stream);
}
}
int bar(I i, InputStream stream) throws IOException {
return i.doIt(stream);
}
}
j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass2.kt
+21
View File
@@ -0,0 +1,21 @@
import java.io.*
trait I {
public fun doIt(stream: InputStream): Int
}
public class C() {
fun foo(): Int {
return FileInputStream("foo").use { stream ->
bar(object : I {
override fun doIt(stream: InputStream): Int {
return stream.available()
}
}, stream)
}
}
fun bar(i: I, stream: InputStream): Int {
return i.doIt(stream)
}
}
j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass3.java.todo
+26
View File
@@ -0,0 +1,26 @@
//file
import java.io.*;
interface I {
int doIt(InputStream stream) throws IOException;
}
public class C {
int foo() throws IOException {
try(InputStream stream = new FileInputStream("foo")) {
if (stream.read() >= 0) {
return bar(new I() {
@Override
public int doIt(InputStream stream) throws IOException {
return stream.available();
}
}, stream);
}
}
return -1;
}
int bar(I i, InputStream stream) throws IOException {
return i.doIt(stream);
}
}