openrs2
/
jode
0
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

fillInGenSet now takes Set, not VariableSet

Browse Source 
git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@1039 379699f6-c40d-0410-875b-85095c16579e
branch_1_1
jochen 26 years ago
parent ec1e63532c
commit 8db70be1a7
3 changed files with 6 additions and 9 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. 5
      jode/jode/expr/CheckNullOperator.java
  2. 3
      jode/jode/expr/Expression.java
  3. 7
      jode/jode/expr/Operator.java

5
jode/jode/expr/CheckNullOperator.java
Unescape View File

@ -21,7 +21,6 @@ package jode.expr;
import jode.type.Type; import jode.type.Type;
import jode.decompiler.LocalInfo; import jode.decompiler.LocalInfo;
import jode.decompiler.TabbedPrintWriter; import jode.decompiler.TabbedPrintWriter;
import jode.flow.VariableSet;
///#ifdef JDK12 ///#ifdef JDK12
///import java.util.Set; ///import java.util.Set;
@ -75,9 +74,9 @@ public class CheckNullOperator extends Operator {
local.remove(); local.remove();
} }
public void fillInGenSet(VariableSet in, VariableSet gen) { public void fillInGenSet(Set in, Set gen) {
if (gen != null) if (gen != null)
gen.addElement(local); gen.add(local);
super.fillInGenSet(in, gen); super.fillInGenSet(in, gen);
} }

3
jode/jode/expr/Expression.java
Unescape View File

@ -21,7 +21,6 @@ package jode.expr;
import jode.type.Type; import jode.type.Type;
import jode.GlobalOptions; import jode.GlobalOptions;
import jode.decompiler.TabbedPrintWriter; import jode.decompiler.TabbedPrintWriter;
import jode.flow.VariableSet;
///#ifdef JDK12 ///#ifdef JDK12
///import java.util.Set; ///import java.util.Set;
@ -229,7 +228,7 @@ public abstract class Expression {
return true; return true;
} }
public void fillInGenSet(VariableSet in, VariableSet gen) { public void fillInGenSet(Set in, Set gen) {
} }
public void fillDeclarables(Set used) { public void fillDeclarables(Set used) {

7
jode/jode/expr/Operator.java
Unescape View File

@ -21,7 +21,6 @@ package jode.expr;
import jode.type.Type; import jode.type.Type;
import jode.GlobalOptions; import jode.GlobalOptions;
import jode.decompiler.TabbedPrintWriter; import jode.decompiler.TabbedPrintWriter;
import jode.flow.VariableSet;
///#ifdef JDK12 ///#ifdef JDK12
///import java.util.Set; ///import java.util.Set;
@ -164,13 +163,13 @@ public abstract class Operator extends Expression {
return this; return this;
} }
public void fillInGenSet(VariableSet in, VariableSet gen) { public void fillInGenSet(Set in, Set gen) {
if (this instanceof LocalVarOperator) { if (this instanceof LocalVarOperator) {
LocalVarOperator varOp = (LocalVarOperator) this; LocalVarOperator varOp = (LocalVarOperator) this;
if (varOp.isRead() && in != null) if (varOp.isRead() && in != null)
in.addElement(varOp.getLocalInfo()); in.add(varOp.getLocalInfo());
if (gen != null) if (gen != null)
gen.addElement(varOp.getLocalInfo()); gen.add(varOp.getLocalInfo());
} }
for (int i=0; i< subExpressions.length; i++) for (int i=0; i< subExpressions.length; i++)
subExpressions[i].fillInGenSet(in,gen); subExpressions[i].fillInGenSet(in,gen);

Write Preview
Loading…
Cancel
Save