summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/hastabel/Variables.java | 12 | ||||
-rw-r--r-- | src/hastabel/lang/Formula.java | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/hastabel/Variables.java b/src/hastabel/Variables.java index de22b46..4d7e9c3 100644 --- a/src/hastabel/Variables.java +++ b/src/hastabel/Variables.java @@ -4,20 +4,22 @@ import hastabel.lang.Type; import hastabel.lang.Variable; import hastabel.lang.Expression; +import java.util.ArrayList; import java.util.Collection; +import java.util.List; import java.util.HashMap; import java.util.Map; public class Variables { private final Map<String, Variable> from_string; - private final Map<String, Variable> seeked; + private final List<Variable> seeked; private int next_id; public Variables () { from_string = new HashMap<String, Variable>(); - seeked = new HashMap<String, Variable>(); + seeked = new ArrayList<Variable>(); } private String new_anonymous_variable_name () @@ -36,14 +38,14 @@ public class Variables final Variable var; var = add_variable(type, var_name); - seeked.put(var_name, var); + seeked.add(var); return var; } - public Collection<Variable> get_all_seeked () + public List<Variable> get_all_seeked () { - return seeked.values(); + return seeked; } public Variable add_variable (final Type type, final String var_name) diff --git a/src/hastabel/lang/Formula.java b/src/hastabel/lang/Formula.java index 5c76924..787ecec 100644 --- a/src/hastabel/lang/Formula.java +++ b/src/hastabel/lang/Formula.java @@ -33,7 +33,7 @@ public abstract class Formula public static Formula exists (final Variable v, final Formula f) { - return new Quantifier(v, f, true); + return new Quantifier(v, f, false); } public static Formula equals (final Expression a, final Expression b) |