ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflicts after recent changes in master

Browse Source
This commit is contained in:
Dmitry Cherniachenko
2017-05-01 12:28:01 +02:00
committed by Egor.Ushakov
parent 5f292c415c
commit 9e788b09cb
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
testData/classes/pkg/TestPrimitives.class
View File

Binary file not shown.

2
testData/results/TestClassLambda.dec
View File

@@ -15,7 +15,7 @@ public class TestClassLambda {
public int field = 0; public int field = 0;
public void testLambda() { public void testLambda() {
List var1 = Arrays.asList(new Integer[]{1, 2, 3, 4, 5, 6, 7});// 29 List var1 = Arrays.asList(1, 2, 3, 4, 5, 6, 7);// 29
int var2 = (int)Math.random();// 30 int var2 = (int)Math.random();// 30
var1.forEach((var2x) -> {// 32 var1.forEach((var2x) -> {// 32
int var3 = 2 * var2x.intValue();// 33 int var3 = 2 * var2x.intValue();// 33

14
testData/results/TestPrimitives.dec
View File

@@ -10,7 +10,7 @@ public class TestPrimitives {
this.printFloat(1.23F);// 11 this.printFloat(1.23F);// 11
this.printDouble(1.23D);// 12 this.printDouble(1.23D);// 12
this.printChar('Z');// 13 this.printChar('Z');// 13
String.format("%b, %d, %d, %d, %c", new Object[]{true, 1, 213, 40000, 'c', 42L});// 15 String.format("%b, %d, %d, %d, %c", true, 1, 213, 40000, 'c', 42L);// 15
System.out.println(String.format("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt()));// 16 System.out.println(String.format("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt()));// 16
}// 17 }// 17
@@ -63,9 +63,9 @@ public class TestPrimitives {
} }
public void printNarrowed() { public void printNarrowed() {
this.printByte((byte)this.getInt());// 68 this.printByte((byte)this.getInt());// 69
this.printShort((short)this.getInt());// 69 this.printShort((short)this.getInt());// 70
}// 70 }// 71
public void constructor() { public void constructor() {
new Byte((byte)1);// 73 new Byte((byte)1);// 73
@@ -239,8 +239,8 @@ class 'pkg/TestPrimitives' {
} }
method 'constructor ()V' { method 'constructor ()V' {
4 69 4 70
9 70 9 71
} }
method 'compare (C)Z' { method 'compare (C)Z' {
@@ -320,7 +320,7 @@ Lines mapping:
65 <-> 62 65 <-> 62
69 <-> 66 69 <-> 66
70 <-> 67 70 <-> 67
73 <-> 70 71 <-> 68
74 <-> 71 74 <-> 71
77 <-> 74 77 <-> 74
78 <-> 75 78 <-> 75

4
testData/results/TestVarArgCalls.dec
View File

@@ -9,8 +9,8 @@ public class TestVarArgCalls {
this.printComplex("Test: %[0]s", new String[]{"abc"});// 10 this.printComplex("Test: %[0]s", new String[]{"abc"});// 10
this.printComplex("Test: %[0]s - %[0]s", new String[]{"abc"}, new String[]{"DEF"});// 11 this.printComplex("Test: %[0]s - %[0]s", new String[]{"abc"}, new String[]{"DEF"});// 11
String.format("Test");// 13 String.format("Test");// 13
String.format("Test: %d", Integer.valueOf(123));// 14 String.format("Test: %d", 123);// 14
String.format("Test: %d - %s", Integer.valueOf(123), "DEF");// 15 String.format("Test: %d - %s", 123, "DEF");// 15
Object[] data = new Object[]{"Hello"};// 17 Object[] data = new Object[]{"Hello"};// 17
String.format("Test: %s", (Object)data);// 18 String.format("Test: %s", (Object)data);// 18
String.format("Test: %s", (Object[])data);// 19 String.format("Test: %s", (Object[])data);// 19