openrs2
/
fernflower
1
0
Fork 0
Code Issues 9 Pull Requests Releases Activity

Fixed 'IDEA-128594: Variable type incorrectly set to boolean'

Browse Source
master
Stiver 10 years ago
parent 70bf7f3f69
commit de249340fc
2 changed files with 61 additions and 39 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 71
      src/de/fernflower/modules/decompiler/exps/FunctionExprent.java
  2. 29
      src/de/fernflower/struct/gen/VarType.java

71
src/de/fernflower/modules/decompiler/exps/FunctionExprent.java
Unescape View File

@ -368,43 +368,48 @@ public class FunctionExprent extends Exprent {
break; break;
case FUNCTION_AND: case FUNCTION_AND:
case FUNCTION_OR: case FUNCTION_OR:
case FUNCTION_XOR: case FUNCTION_XOR:
if(type1.type == CodeConstants.TYPE_BOOLEAN && {
((type1.convinfo & VarType.FALSEBOOLEAN) != 0 || type2.type != CodeConstants.TYPE_BOOLEAN)) { boolean param1_false_boolean = type1.isFalseBoolean() || (param1.type == Exprent.EXPRENT_CONST && !((ConstExprent)param1).hasBooleanValue());
result.addMinTypeExprent(param1, VarType.VARTYPE_BYTECHAR); boolean param2_false_boolean = type1.isFalseBoolean() || (param2.type == Exprent.EXPRENT_CONST && !((ConstExprent)param2).hasBooleanValue());
}
if(type2.type == CodeConstants.TYPE_BOOLEAN && if(param1_false_boolean || param2_false_boolean) {
((type2.convinfo & VarType.FALSEBOOLEAN) != 0 || type1.type != CodeConstants.TYPE_BOOLEAN)) { if(type1.type == CodeConstants.TYPE_BOOLEAN) {
result.addMinTypeExprent(param2, VarType.VARTYPE_BYTECHAR); result.addMinTypeExprent(param1, VarType.VARTYPE_BYTECHAR);
}
if(type2.type == CodeConstants.TYPE_BOOLEAN) {
result.addMinTypeExprent(param2, VarType.VARTYPE_BYTECHAR);
}
}
} }
break; break;
case FUNCTION_EQ: case FUNCTION_EQ:
case FUNCTION_NE: case FUNCTION_NE:
{
if(type1.type == CodeConstants.TYPE_BOOLEAN) { if(type1.type == CodeConstants.TYPE_BOOLEAN) {
if(type2.isStrictSuperset(type1)) { if(type2.isStrictSuperset(type1)) {
result.addMinTypeExprent(param1, VarType.VARTYPE_BYTECHAR);
} else { result.addMinTypeExprent(param1, VarType.VARTYPE_BYTECHAR);
if(param1.type == Exprent.EXPRENT_CONST && !((ConstExprent)param1).hasBooleanValue()) {
if(param2.type != Exprent.EXPRENT_CONST || !((ConstExprent)param2).hasBooleanValue()) { // variable or not boolean constant } else { // both are booleans
result.addMinTypeExprent(param1, VarType.VARTYPE_BYTECHAR);
} boolean param1_false_boolean = type1.isFalseBoolean() || (param1.type == Exprent.EXPRENT_CONST && !((ConstExprent)param1).hasBooleanValue());
} boolean param2_false_boolean = type1.isFalseBoolean() || (param2.type == Exprent.EXPRENT_CONST && !((ConstExprent)param2).hasBooleanValue());
}
} if(param1_false_boolean || param2_false_boolean) {
result.addMinTypeExprent(param1, VarType.VARTYPE_BYTECHAR);
if(type2.type == CodeConstants.TYPE_BOOLEAN) { result.addMinTypeExprent(param2, VarType.VARTYPE_BYTECHAR);
}
if(type1.isStrictSuperset(type2)) { }
result.addMinTypeExprent(param2, VarType.VARTYPE_BYTECHAR);
} else { } else if(type2.type == CodeConstants.TYPE_BOOLEAN) {
if(param2.type == Exprent.EXPRENT_CONST && !((ConstExprent)param2).hasBooleanValue()) {
if(param1.type != Exprent.EXPRENT_CONST || !((ConstExprent)param1).hasBooleanValue()) { // variable or not boolean constant if(type1.isStrictSuperset(type2)) {
result.addMinTypeExprent(param2, VarType.VARTYPE_BYTECHAR); result.addMinTypeExprent(param2, VarType.VARTYPE_BYTECHAR);
} }
} }
}
} }
} }

29
src/de/fernflower/struct/gen/VarType.java
Unescape View File

@ -114,7 +114,11 @@ public class VarType { // TODO: optimize switch
v.convinfo = convinfo; v.convinfo = convinfo;
return v; return v;
} }
public boolean isFalseBoolean() {
return (convinfo & VarType.FALSEBOOLEAN) != 0;
}
public boolean isSuperset(VarType val) { public boolean isSuperset(VarType val) {
return this.equals(val) || this.isStrictSuperset(val); return this.equals(val) || this.isStrictSuperset(val);
@ -165,6 +169,10 @@ public class VarType { // TODO: optimize switch
// type1 and type2 must not be null // type1 and type2 must not be null
public static VarType getCommonMinType(VarType type1, VarType type2) { public static VarType getCommonMinType(VarType type1, VarType type2) {
if(type1.type == CodeConstants.TYPE_BOOLEAN && type2.type == CodeConstants.TYPE_BOOLEAN) { // special case booleans
return type1.isFalseBoolean() ? type2 : type1;
}
if(type1.isSuperset(type2)) { if(type1.isSuperset(type2)) {
return type2; return type2;
} else if(type2.isSuperset(type1)) { } else if(type2.isSuperset(type1)) {
@ -189,6 +197,10 @@ public class VarType { // TODO: optimize switch
// type1 and type2 must not be null // type1 and type2 must not be null
public static VarType getCommonSupertype(VarType type1, VarType type2) { public static VarType getCommonSupertype(VarType type1, VarType type2) {
if(type1.type == CodeConstants.TYPE_BOOLEAN && type2.type == CodeConstants.TYPE_BOOLEAN) { // special case booleans
return type1.isFalseBoolean() ? type1 : type2;
}
if(type1.isSuperset(type2)) { if(type1.isSuperset(type2)) {
return type1; return type1;
} else if(type2.isSuperset(type1)) { } else if(type2.isSuperset(type1)) {
@ -232,12 +244,17 @@ public class VarType { // TODO: optimize switch
} }
public boolean equals(Object o) { public boolean equals(Object o) {
if(o == this) return true;
if(o == null || !(o instanceof VarType)) return false; if(o == this) {
return true;
}
if(o == null || !(o instanceof VarType)) {
return false;
}
VarType vt = (VarType)o; VarType vt = (VarType) o;
return type == vt.type && arraydim == vt.arraydim && return type == vt.type && arraydim == vt.arraydim && InterpreterUtil.equalObjects(value, vt.value);
InterpreterUtil.equalObjects(value, vt.value);
} }
private void parseTypeString(String strtype, boolean cltype) { private void parseTypeString(String strtype, boolean cltype) {

Write Preview
Loading…
Cancel
Save