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

added spaces after if and inside the ternary operator

Browse Source
This commit is contained in:
Egor.Ushakov
2017-04-04 17:03:49 +03:00
parent e09e303e71
commit d706718b1b
15 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2000-2015 JetBrains s.r.o. * Copyright 2000-2017 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -485,9 +485,9 @@ public class FunctionExprent extends Exprent {
return res.append(".length"); return res.append(".length");
case FUNCTION_IIF: case FUNCTION_IIF:
return wrapOperandString(lstOperands.get(0), true, indent, tracer) return wrapOperandString(lstOperands.get(0), true, indent, tracer)
.append("?") .append(" ? ")
.append(wrapOperandString(lstOperands.get(1), true, indent, tracer)) .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
.append(":") .append(" : ")
.append(wrapOperandString(lstOperands.get(2), true, indent, tracer)); .append(wrapOperandString(lstOperands.get(2), true, indent, tracer));
case FUNCTION_IPP: case FUNCTION_IPP:
return wrapOperandString(lstOperands.get(0), true, indent, tracer).append("++"); return wrapOperandString(lstOperands.get(0), true, indent, tracer).append("++");
@@ -501,27 +501,27 @@ public class FunctionExprent extends Exprent {
return wrapOperandString(lstOperands.get(0), true, indent, tracer).append(" instanceof ").append(wrapOperandString(lstOperands.get(1), true, indent, tracer)); return wrapOperandString(lstOperands.get(0), true, indent, tracer).append(" instanceof ").append(wrapOperandString(lstOperands.get(1), true, indent, tracer));
case FUNCTION_LCMP: // shouldn't appear in the final code case FUNCTION_LCMP: // shouldn't appear in the final code
return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__lcmp__(") return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__lcmp__(")
.append(",") .append(", ")
.append(wrapOperandString(lstOperands.get(1), true, indent, tracer)) .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
.append(")"); .append(")");
case FUNCTION_FCMPL: // shouldn't appear in the final code case FUNCTION_FCMPL: // shouldn't appear in the final code
return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__fcmpl__(") return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__fcmpl__(")
.append(",") .append(", ")
.append(wrapOperandString(lstOperands.get(1), true, indent, tracer)) .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
.append(")"); .append(")");
case FUNCTION_FCMPG: // shouldn't appear in the final code case FUNCTION_FCMPG: // shouldn't appear in the final code
return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__fcmpg__(") return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__fcmpg__(")
.append(",") .append(", ")
.append(wrapOperandString(lstOperands.get(1), true, indent, tracer)) .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
.append(")"); .append(")");
case FUNCTION_DCMPL: // shouldn't appear in the final code case FUNCTION_DCMPL: // shouldn't appear in the final code
return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__dcmpl__(") return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__dcmpl__(")
.append(",") .append(", ")
.append(wrapOperandString(lstOperands.get(1), true, indent, tracer)) .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
.append(")"); .append(")");
case FUNCTION_DCMPG: // shouldn't appear in the final code case FUNCTION_DCMPG: // shouldn't appear in the final code
return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__dcmpg__(") return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__dcmpg__(")
.append(",") .append(", ")
.append(wrapOperandString(lstOperands.get(1), true, indent, tracer)) .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
.append(")"); .append(")");
} }

4
src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2000-2015 JetBrains s.r.o. * Copyright 2000-2017 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -115,7 +115,7 @@ public class IfExprent extends Exprent {
@Override @Override
public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) { public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
tracer.addMapping(bytecode); tracer.addMapping(bytecode);
return condition.toJava(indent, tracer).enclose("if(", ")"); return condition.toJava(indent, tracer).enclose("if (", ")");
} }
@Override @Override

4
src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2000-2015 JetBrains s.r.o. * Copyright 2000-2017 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -144,7 +144,7 @@ public class CatchAllStatement extends Statement {
tracer.incrementCurrentSourceLine(); tracer.incrementCurrentSourceLine();
if (monitor != null) { if (monitor != null) {
buf.appendIndent(indent+1).append("if(").append(monitor.toJava(indent, tracer)).append(") {").appendLineSeparator(); buf.appendIndent(indent+1).append("if (").append(monitor.toJava(indent, tracer)).append(") {").appendLineSeparator();
tracer.incrementCurrentSourceLine(); tracer.incrementCurrentSourceLine();
} }

2
testData/bulk/pkg/res/Loader.java
View File

@@ -7,7 +7,7 @@ import java.net.URL;
public class Loader { public class Loader {
public String getResource() { public String getResource() {
URL resource = this.getClass().getClassLoader().getResource("pkg/res/resource.txt"); URL resource = this.getClass().getClassLoader().getResource("pkg/res/resource.txt");
if(resource == null) { if (resource == null) {
throw new RuntimeException("Resource missing"); throw new RuntimeException("Resource missing");
} else { } else {
try { try {

2
testData/results/TestAnonymousClass.dec
View File

@@ -45,7 +45,7 @@ public abstract class TestAnonymousClass {
}; };
void foo(int var1) throws Exception { void foo(int var1) throws Exception {
if(var1 > 0) {// 10 if (var1 > 0) {// 10
TestAnonymousClass.I var2 = new TestAnonymousClass.I() { TestAnonymousClass.I var2 = new TestAnonymousClass.I() {
public void foo() throws Exception { public void foo() throws Exception {
boolean var1 = true;// 13 boolean var1 = true;// 13

2
testData/results/TestClassCast.dec
View File

@@ -6,7 +6,7 @@ import java.util.List;
public class TestClassCast { public class TestClassCast {
public void test(List var1) { public void test(List var1) {
Object var2 = var1;// 22 Object var2 = var1;// 22
if(var1 != null) {// 23 if (var1 != null) {// 23
((List)(var2 = new ArrayList(var1))).add("23");// 24 ((List)(var2 = new ArrayList(var1))).add("23");// 24
} }

12
testData/results/TestClassLoop.dec
View File

@@ -12,7 +12,7 @@ public class TestClassLoop {
while(true) { while(true) {
try { try {
if(!var0) {// 33 if (!var0) {// 33
return;// 34 return;// 34
} }
} finally { } finally {
@@ -30,7 +30,7 @@ public class TestClassLoop {
System.out.println("1");// 49 System.out.println("1");// 49
break; break;
} finally { } finally {
if(var0) {// 52 if (var0) {// 52
System.out.println("3");// 53 System.out.println("3");// 53
continue;// 54 continue;// 54
} }
@@ -51,19 +51,19 @@ public class TestClassLoop {
for(boolean var8 = false; var2 < var1; ++var2) {// 70 73 90 for(boolean var8 = false; var2 < var1; ++var2) {// 70 73 90
char var6 = var0.charAt(var2);// 74 char var6 = var0.charAt(var2);// 74
if(var6 == 48) {// 75 if (var6 == 48) {// 75
++var7;// 76 ++var7;// 76
} else { } else {
if(var6 != 46) {// 77 if (var6 != 46) {// 77
break; break;
} }
if(var3) {// 78 if (var3) {// 78
throw new NumberFormatException("multiple points");// 80 throw new NumberFormatException("multiple points");// 80
} }
var5 = var2;// 82 var5 = var2;// 82
if(var4) {// 83 if (var4) {// 83
var5 = var2 - 1;// 84 var5 = var2 - 1;// 84
} }

2
testData/results/TestClassSimpleBytecodeMapping.dec
View File

@@ -9,7 +9,7 @@ public class TestClassSimpleBytecodeMapping {
}// 18 }// 18
}); });
this.test2("1");// 21 this.test2("1");// 21
if(Math.random() > 0.0D) {// 23 if (Math.random() > 0.0D) {// 23
System.out.println("0");// 24 System.out.println("0");// 24
return 0;// 25 return 0;// 25
} else { } else {

8
testData/results/TestClassTypes.dec
View File

@@ -7,13 +7,13 @@ public class TestClassTypes {
public void testBoolean() { public void testBoolean() {
byte var1 = 0;// 25 byte var1 = 0;// 25
long var2 = System.currentTimeMillis();// 26 long var2 = System.currentTimeMillis();// 26
if(var2 % 2L > 0L) {// 28 if (var2 % 2L > 0L) {// 28
var1 = 1;// 29 var1 = 1;// 29
} else if(var2 % 3L > 0L) {// 31 } else if (var2 % 3L > 0L) {// 31
var1 = 2;// 32 var1 = 2;// 32
} }
if(var1 == 1) {// 35 if (var1 == 1) {// 35
System.out.println();// 36 System.out.println();// 36
} }
@@ -40,7 +40,7 @@ public class TestClassTypes {
public void testAssignmentType(List var1) { public void testAssignmentType(List var1) {
Object var2 = var1;// 61 Object var2 = var1;// 61
if(var1 != null) {// 63 if (var1 != null) {// 63
((List)(var2 = new ArrayList(var1))).add("23");// 64 ((List)(var2 = new ArrayList(var1))).add("23");// 64
} }

4
testData/results/TestClassVar.dec
View File

@@ -9,7 +9,7 @@ public class TestClassVar {
try { try {
System.out.println();// 29 System.out.println();// 29
} finally { } finally {
if(this.field_boolean) {// 32 if (this.field_boolean) {// 32
System.out.println();// 33 System.out.println();// 33
} }
@@ -31,7 +31,7 @@ public class TestClassVar {
; ;
} }
if(var2 != var1) {// 54 if (var2 != var1) {// 54
System.out.println();// 55 System.out.println();// 55
} }
} }

22
testData/results/TestIffSimplification.dec
View File

@@ -2,30 +2,30 @@ package pkg;
public class TestIffSimplification { public class TestIffSimplification {
public int simpleIff(boolean status, int[] values) { public int simpleIff(boolean status, int[] values) {
return status?values[0]:values[1];// 7 return status ? values[0] : values[1];// 7
} }
public int simpleIf(boolean status, int[] values) { public int simpleIf(boolean status, int[] values) {
return status?values[0]:values[1];// 11 12 15 return status ? values[0] : values[1];// 11 12 15
} }
public int nestedIf(boolean status, boolean condition, int[] values) { public int nestedIf(boolean status, boolean condition, int[] values) {
if(status) {// 20 if (status) {// 20
return condition?values[2]:values[0];// 21 22 25 return condition ? values[2] : values[0];// 21 22 25
} else { } else {
return values[1];// 29 return values[1];// 29
} }
} }
public int compareTo(int mc1, int mc2, byte csg1, byte csg2, double score1, double score2, int doc1, int doc2) { public int compareTo(int mc1, int mc2, byte csg1, byte csg2, double score1, double score2, int doc1, int doc2) {
if(mc1 != mc2) {// 34 if (mc1 != mc2) {// 34
return mc1 < mc2?1:-1;// 35 return mc1 < mc2 ? 1 : -1;// 35
} else if(csg1 != csg2) {// 38 } else if (csg1 != csg2) {// 38
return csg1 < csg2?1:-1;// 39 return csg1 < csg2 ? 1 : -1;// 39
} else if(Math.abs(score1 - score2) < 1.0E-6D) {// 42 } else if (Math.abs(score1 - score2) < 1.0E-6D) {// 42
return doc1 < doc2?-1:1;// 43 return doc1 < doc2 ? -1 : 1;// 43
} else { } else {
return score1 < score2?1:-1;// 46 return score1 < score2 ? 1 : -1;// 46
} }
} }
} }

2
testData/results/TestKotlinConstructorKt.dec
View File

@@ -23,7 +23,7 @@ public final class TestKotlinConstructorKt {
Object item$iv$iv = var4.next(); Object item$iv$iv = var4.next();
String it = (String)item$iv$iv;// 12 String it = (String)item$iv$iv;// 12
Mapping var10000 = new Mapping; Mapping var10000 = new Mapping;
if(it == null) {// 3 if (it == null) {// 3
throw new TypeCastException("null cannot be cast to non-null type kotlin.String"); throw new TypeCastException("null cannot be cast to non-null type kotlin.String");
} }

2
testData/results/TestLocalsNames.dec
View File

@@ -4,7 +4,7 @@ import java.io.File;
public class TestLocalsNames { public class TestLocalsNames {
private static void rename(File file, boolean recursively) { private static void rename(File file, boolean recursively) {
if(file.isDirectory()) {// 22 if (file.isDirectory()) {// 22
long start = System.currentTimeMillis();// 23 long start = System.currentTimeMillis();// 23
File[] files = file.listFiles();// 25 File[] files = file.listFiles();// 25
File[] var5 = files; File[] var5 = files;

2
testData/results/TestThrowException.dec
View File

@@ -4,7 +4,7 @@ public class TestThrowException {
Runnable r; Runnable r;
public TestThrowException(int var1) { public TestThrowException(int var1) {
if(var1 > 0) {// 9 if (var1 > 0) {// 9
throw new IllegalArgumentException("xxx");// 10 throw new IllegalArgumentException("xxx");// 10
} else { } else {
this.r = new Runnable() {// 12 this.r = new Runnable() {// 12

4
testData/results/TestTryCatchFinally.dec
View File

@@ -17,9 +17,9 @@ public class TestTryCatchFinally {
}// 36 }// 36
int foo(int var1) throws Exception { int foo(int var1) throws Exception {
if(var1 < 1) {// 39 if (var1 < 1) {// 39
throw new RuntimeException();// 40 throw new RuntimeException();// 40
} else if(var1 < 5) {// 41 } else if (var1 < 5) {// 41
return var1;// 42 return var1;// 42
} else { } else {
throw new Exception();// 45 throw new Exception();// 45