diff options
| -rw-r--r-- | src/de/fernflower/modules/decompiler/exps/ConstExprent.java | 12 | ||||
| -rw-r--r-- | src/de/fernflower/util/InterpreterUtil.java | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/de/fernflower/modules/decompiler/exps/ConstExprent.java b/src/de/fernflower/modules/decompiler/exps/ConstExprent.java index 2d63fcb..b01bf69 100644 --- a/src/de/fernflower/modules/decompiler/exps/ConstExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/ConstExprent.java @@ -27,8 +27,7 @@ import de.fernflower.struct.gen.VarType; import de.fernflower.util.InterpreterUtil; public class ConstExprent extends Exprent { - - private static final HashMap<Integer, String> escapes = new HashMap<Integer, String>(); + private static final HashMap<Integer, String> escapes = new HashMap<Integer, String>(); static { escapes.put(new Integer(0x8), "\\b"); /* \u0008: backspace BS */ @@ -114,10 +113,11 @@ public class ConstExprent extends Exprent { Integer val = (Integer)value; String ret = escapes.get(val); if(ret == null) { - if(!ascii || val.intValue() >= 32 && val.intValue() < 127) { - ret = String.valueOf((char)val.intValue()); + char c = (char)val.intValue(); + if(c >= 32 && c < 127 || !ascii && InterpreterUtil.isPrintableUnicode(c)) { + ret = String.valueOf(c); } else { - ret = InterpreterUtil.charToUnicodeLiteral(val); + ret = InterpreterUtil.charToUnicodeLiteral(c); } } return "\'"+ret+"\'"; @@ -263,7 +263,7 @@ public class ConstExprent extends Exprent { buffer.append("\\\'"); break; default: - if(!ascii || (c >= 32 && c < 127)) { + if(c >= 32 && c < 127 || !ascii && InterpreterUtil.isPrintableUnicode(c)) { buffer.append(c); } else { buffer.append(InterpreterUtil.charToUnicodeLiteral(c)); diff --git a/src/de/fernflower/util/InterpreterUtil.java b/src/de/fernflower/util/InterpreterUtil.java index ffba76a..6f418a2 100644 --- a/src/de/fernflower/util/InterpreterUtil.java +++ b/src/de/fernflower/util/InterpreterUtil.java @@ -138,10 +138,15 @@ public class InterpreterUtil { return false; } + public static boolean isPrintableUnicode(char c) { + int t = Character.getType(c); + return t != Character.UNASSIGNED && t != Character.LINE_SEPARATOR && t != Character.PARAGRAPH_SEPARATOR && + t != Character.CONTROL && t != Character.FORMAT && t != Character.PRIVATE_USE && t != Character.SURROGATE; + } + public static String charToUnicodeLiteral(int value) { String sTemp = Integer.toHexString(value); sTemp = ("0000"+sTemp).substring(sTemp.length()); - return "\\u"+sTemp; } |