Commit 30f949ce authored by Fred Eisele's avatar Fred Eisele
Browse files

remove *Ex methods

parent 3e73d877
......@@ -397,12 +397,12 @@ public class AqlLoaderListener extends AqlParserBaseListener {
@Override
public void exitTypesideRef(AqlParser.TypesideRefContext ctx) {
this.exp_ty.put(ctx, new TyExp.TyExpVar<>(ctx.getText()));
this.exp_ty.put(ctx, new TyExp.TyExpVar<Ty,Sym>(ctx.getText()));
}
@Override
public void exitTypesideExp_Empty(AqlParser.TypesideExp_EmptyContext ctx) {
final TyExp<Ty,Sym> exp = new TyExp.TyExpEmptyEx<Ty,Sym>();
final TyExpI exp = new TyExp.TyExpEmpty();
this.exp_ty.put(ctx, exp);
}
......
......@@ -78,7 +78,7 @@ public abstract class TyExp<Ty, Sym> extends Exp<TypeSide<Ty, Sym>> {
////////////////////////////////////////////////////////////////////////////////////////////////////
public static final class TyExpEmpty extends TyExp<Void,Void> {
public static final class TyExpEmpty extends TyExp<Void,Void> implements TyExpI {
@Override
public Collection<Pair<String, Kind>> deps() {
......@@ -172,7 +172,7 @@ public abstract class TyExp<Ty, Sym> extends Exp<TypeSide<Ty, Sym>> {
////////////////////////////////////////////////////////////////////////////////////////////////////
public static final class TyExpVar<X,Y> extends TyExp<X, Y> {
public static final class TyExpVar<X,Y> extends TyExp<X, Y> implements TyExpI {
public final String var;
@Override
......
......@@ -5,11 +5,11 @@ import java.util.Collection;
import catdata.Pair;
import catdata.Program;
import catdata.aql.Kind;
import catdata.aql.TypeSide;
import catdata.aql.TypeSideI;
public interface TyExpI<Ty,Sym> extends ExpI<TypeSide<Ty,Sym>> {
public interface TyExpI extends ExpI<TypeSideI> {
public TyExpI<Ty,Sym> resolve(Program<Exp<?>> prog);
public TyExpI resolve(Program<ExpI> prog);
public Kind kind();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment