From 8db70be1a70004d2e5a2a620da54845a7744dd26 Mon Sep 17 00:00:00 2001 From: jochen Date: Wed, 7 Jul 1999 11:22:15 +0000 Subject: [PATCH] fillInGenSet now takes Set, not VariableSet git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@1039 379699f6-c40d-0410-875b-85095c16579e --- jode/jode/expr/CheckNullOperator.java | 5 ++--- jode/jode/expr/Expression.java | 3 +-- jode/jode/expr/Operator.java | 7 +++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/jode/jode/expr/CheckNullOperator.java b/jode/jode/expr/CheckNullOperator.java index 58ff4be..bf6e9a8 100644 --- a/jode/jode/expr/CheckNullOperator.java +++ b/jode/jode/expr/CheckNullOperator.java @@ -21,7 +21,6 @@ package jode.expr; import jode.type.Type; import jode.decompiler.LocalInfo; import jode.decompiler.TabbedPrintWriter; -import jode.flow.VariableSet; ///#ifdef JDK12 ///import java.util.Set; @@ -75,9 +74,9 @@ public class CheckNullOperator extends Operator { local.remove(); } - public void fillInGenSet(VariableSet in, VariableSet gen) { + public void fillInGenSet(Set in, Set gen) { if (gen != null) - gen.addElement(local); + gen.add(local); super.fillInGenSet(in, gen); } diff --git a/jode/jode/expr/Expression.java b/jode/jode/expr/Expression.java index 52d14d9..afdbe00 100644 --- a/jode/jode/expr/Expression.java +++ b/jode/jode/expr/Expression.java @@ -21,7 +21,6 @@ package jode.expr; import jode.type.Type; import jode.GlobalOptions; import jode.decompiler.TabbedPrintWriter; -import jode.flow.VariableSet; ///#ifdef JDK12 ///import java.util.Set; @@ -229,7 +228,7 @@ public abstract class Expression { return true; } - public void fillInGenSet(VariableSet in, VariableSet gen) { + public void fillInGenSet(Set in, Set gen) { } public void fillDeclarables(Set used) { diff --git a/jode/jode/expr/Operator.java b/jode/jode/expr/Operator.java index 0f8fd33..950ebed 100644 --- a/jode/jode/expr/Operator.java +++ b/jode/jode/expr/Operator.java @@ -21,7 +21,6 @@ package jode.expr; import jode.type.Type; import jode.GlobalOptions; import jode.decompiler.TabbedPrintWriter; -import jode.flow.VariableSet; ///#ifdef JDK12 ///import java.util.Set; @@ -164,13 +163,13 @@ public abstract class Operator extends Expression { return this; } - public void fillInGenSet(VariableSet in, VariableSet gen) { + public void fillInGenSet(Set in, Set gen) { if (this instanceof LocalVarOperator) { LocalVarOperator varOp = (LocalVarOperator) this; if (varOp.isRead() && in != null) - in.addElement(varOp.getLocalInfo()); + in.add(varOp.getLocalInfo()); if (gen != null) - gen.addElement(varOp.getLocalInfo()); + gen.add(varOp.getLocalInfo()); } for (int i=0; i< subExpressions.length; i++) subExpressions[i].fillInGenSet(in,gen);