From 91c64c5a9467d17665881010bc0d86d138b124f6 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 29 Sep 2014 16:04:25 +0200 Subject: [PATCH] Cleanup (loop invariant optimization; formatting) --- .../modules/decompiler/LabelHelper.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java index 4821eab..26cc638 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java @@ -426,30 +426,28 @@ public class LabelHelper { HashSet setContinue = new HashSet(); if (stat.getExprents() == null) { - for(Statement st : stat.getStats()) { + for (Statement st : stat.getStats()) { HashSet[] arr = processStatementLabel(st); setBreak.addAll(arr[0]); setContinue.addAll(arr[1]); } - boolean shieldtype = (stat.type == Statement.TYPE_DO || stat.type == Statement.TYPE_SWITCH); - - for(StatEdge edge : stat.getLabelEdges()) { - if (edge.explicit) { - if (shieldtype - && ((edge.getType() == StatEdge.TYPE_BREAK && setBreak.contains(edge.getSource())) || (edge.getType() == StatEdge.TYPE_CONTINUE && setContinue.contains(edge - .getSource())))) { + boolean shieldType = (stat.type == Statement.TYPE_DO || stat.type == Statement.TYPE_SWITCH); + if (shieldType) { + for (StatEdge edge : stat.getLabelEdges()) { + if (edge.explicit && ((edge.getType() == StatEdge.TYPE_BREAK && setBreak.contains(edge.getSource())) || + (edge.getType() == StatEdge.TYPE_CONTINUE && setContinue.contains(edge.getSource())))) { edge.labeled = false; } } } switch (stat.type) { - case Statement.TYPE_DO: - setContinue.clear(); - case Statement.TYPE_SWITCH: - setBreak.clear(); + case Statement.TYPE_DO: + setContinue.clear(); + case Statement.TYPE_SWITCH: + setBreak.clear(); } }