diff options
| author | Stiver <stiver.mail@gmail.com> | 2014-05-29 18:13:17 +0200 |
|---|---|---|
| committer | Stiver <stiver.mail@gmail.com> | 2014-05-29 18:13:17 +0200 |
| commit | c286d42c5b04d4036b144bff10dbafc183d45084 (patch) | |
| tree | 23fa7fe36b32cc45c6e15a361fbd11d013e2c58f /src/de/fernflower/main | |
| parent | 1119499562bd94e2601d301a0126dc02f3d5d472 (diff) | |
| download | fernflower-c286d42c5b04d4036b144bff10dbafc183d45084.tar fernflower-c286d42c5b04d4036b144bff10dbafc183d45084.tar.gz fernflower-c286d42c5b04d4036b144bff10dbafc183d45084.tar.lz fernflower-c286d42c5b04d4036b144bff10dbafc183d45084.tar.xz fernflower-c286d42c5b04d4036b144bff10dbafc183d45084.zip | |
- fixed the IndexOutOfBoundsException exception when decompiling
FastStringBuffer
- fixed typo in LITERALS_AS_IS definition
- some helper stuff
Diffstat (limited to 'src/de/fernflower/main')
| -rw-r--r-- | src/de/fernflower/main/extern/IFernflowerPreferences.java | 2 | ||||
| -rw-r--r-- | src/de/fernflower/main/rels/MethodProcessorThread.java | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/de/fernflower/main/extern/IFernflowerPreferences.java b/src/de/fernflower/main/extern/IFernflowerPreferences.java index 5037107..3b923e7 100644 --- a/src/de/fernflower/main/extern/IFernflowerPreferences.java +++ b/src/de/fernflower/main/extern/IFernflowerPreferences.java @@ -28,7 +28,7 @@ public interface IFernflowerPreferences { public static final String NO_EXCEPTIONS_RETURN = "ner"; public static final String DECOMPILE_ENUM = "den"; public static final String REMOVE_GETCLASS_NEW = "rgn"; - public static final String LITERALS_AS_IS = "bto"; + public static final String LITERALS_AS_IS = "lit"; public static final String BOOLEAN_TRUE_ONE = "bto"; public static final String SYNTHETIC_NOT_SET = "nns"; public static final String UNDEFINED_PARAM_TYPE_OBJECT = "uto"; diff --git a/src/de/fernflower/main/rels/MethodProcessorThread.java b/src/de/fernflower/main/rels/MethodProcessorThread.java index 3ec6db9..df5c925 100644 --- a/src/de/fernflower/main/rels/MethodProcessorThread.java +++ b/src/de/fernflower/main/rels/MethodProcessorThread.java @@ -186,7 +186,7 @@ public class MethodProcessorThread implements Runnable { StackVarsProcessor stackproc = new StackVarsProcessor(); stackproc.simplifyStackVars(root, mt, cl); -// System.out.println("~~~~~~~~~~~~~~~~~~~~~~ \r\n"+root.toJava()); + //System.out.println("~~~~~~~~~~~~~~~~~~~~~~ \r\n"+root.toJava()); varproc.setVarVersions(root); @@ -216,14 +216,15 @@ public class MethodProcessorThread implements Runnable { if(DecompilerContext.getOption(IFernflowerPreferences.IDEA_NOT_NULL_ANNOTATION)) { - IdeaNotNullHelper.removeHardcodedChecks(root, mt); - - SequenceHelper.condenseSequences(root); + if(IdeaNotNullHelper.removeHardcodedChecks(root, mt)) { - StackVarsProcessor stackproc = new StackVarsProcessor(); - stackproc.simplifyStackVars(root, mt, cl); - - varproc.setVarVersions(root); + SequenceHelper.condenseSequences(root); + + StackVarsProcessor stackproc = new StackVarsProcessor(); + stackproc.simplifyStackVars(root, mt, cl); + + varproc.setVarVersions(root); + } } LabelHelper.identifyLabels(root); |