repairs resulting from AqlPivot (e10d96cf) · Commits · Fred Eisele / fql

build.gradle

+2 −2

Changes for build.gradle: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -51,8 +51,8 @@ task showDependencies {

		description = "Categorical Data IDE"

		sourceCompatibility = 1.8
		targetCompatibility = 1.8
		sourceCompatibility = 1.9
		targetCompatibility = 1.9

		tasks.withType(JavaCompile) {
		options.encoding = 'UTF-8'

src/main/java/catdata/aql/exp/AqlLoaderListener.java

+52 −1

Changes for src/main/java/catdata/aql/exp/AqlLoaderListener.java: 52 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		package catdata.aql.exp;


		import java.util.Collection;
		import java.util.Collections;
		import java.util.HashMap;
		import java.util.LinkedList;
		import java.util.List;
		@@ -23,6 +26,8 @@ import catdata.Triple;
		import catdata.aql.It.ID;
		import catdata.aql.RawTerm;
		import catdata.aql.Var;
		import catdata.aql.Kind;
		import catdata.aql.Mapping;
		import catdata.aql.exp.ColimSchExp.ColimSchExpVar;
		import catdata.aql.exp.EdsExpRaw.EdExpRaw;
		import catdata.aql.exp.GraphExp.GraphExpRaw;
		@@ -840,6 +845,46 @@ public class AqlLoaderListener extends AqlParserBaseListener {
		this.exps.put(ctx,exp);
		}

		public static final class MapExpVar2<Ty,En,Sym,Fk,Att> extends MapExp<Ty,En,Sym,Fk,Att,En,Fk,Att> {

		public final MapExp.MapExpVar var;

		@Override
		public Map<String, String> options() { return var.options(); }

		@Override
		public Collection<Pair<String, Kind>> deps() { return var.deps(); }

		public MapExpVar2(String var) { this.var = new MapExp.MapExpVar(var); }
		public MapExpVar2(MapExpVar that) { this.var = that; }

		@Override
		public Mapping<Ty, En, Sym, Fk, Att, En, Fk, Att> eval(AqlEnv env) {
		return (Mapping<Ty, En, Sym, Fk, Att, En, Fk, Att>) this.var.eval(env); }

		@Override
		public int hashCode() { return this.var.hashCode(); }

		@Override
		public boolean equals(Object obj) { return this.var.equals(obj); }

		@Override
		public String toString() { return this.var.toString(); }

		@Override
		public Pair<SchExp<Ty, En, Sym, Fk, Att>, SchExp<Ty, En, Sym, Fk, Att>> type(AqlTyping G) {
		final Pair<SchExp<Object, Object, Object, Object, Object>, SchExp<Object, Object, Object, Object, Object>>
		retype = this.var.type(G);

		final SchExp<Ty, En, Sym, Fk, Att>
		first = (SchExp<Ty, En, Sym, Fk, Att>) retype.first,
		second = (SchExp<Ty, En, Sym, Fk, Att>) retype.second;

		return new Pair(first, second);
		}

		}

		public static class MapComposer<lTy, lEn, lSym, lFk, lAtt> {
		private MapExp<lTy, lEn, lSym, lFk, lAtt, lEn, lFk, lAtt> comp;

		@@ -854,6 +899,12 @@ public class AqlLoaderListener extends AqlParserBaseListener {
		this.comp = new MapExp.MapExpComp<lTy,lEn,lSym,lFk,lAtt,lEn,lFk,lAtt,lEn,lFk,lAtt>(next, this.comp);
		}

		public void compose(final MapExp.MapExpVar next) {
		final MapExpVar2 next2 = new MapExpVar2<lTy,lEn,lSym,lFk,lAtt>(next);
		if (this.comp == null) { this.comp = next2; return; }
		this.comp = new MapExp.MapExpComp<lTy,lEn,lSym,lFk,lAtt,lEn,lFk,lAtt,lEn,lFk,lAtt>(next2, this.comp);
		}

		public void combine(final MapComposer<lTy, lEn, lSym, lFk, lAtt> other) {
		this.comp = new MapExp.MapExpComp<lTy, lEn, lSym,lFk,lAtt,lEn,lFk,lAtt,lEn,lFk,lAtt>(other.comp, this.comp);
		}
		@@ -866,7 +917,7 @@ public class AqlLoaderListener extends AqlParserBaseListener {
		comp = ctx.mappingRef().stream()
		.map(ref -> (MapExp.MapExpVar) this.exps.get(ref))
		.collect(() -> new MapComposer<Ty,En,Sym, Fk, Att>(),
		(acc, nxt) -> acc.compose(new MapExp.MapExpVar2<>(nxt)),
		(acc, nxt) -> acc.compose(nxt),
		(lhs, rhs) -> lhs.combine(rhs))
		.result();

src/main/java/catdata/aql/exp/MapExp.java

+0 −63

Changes for src/main/java/catdata/aql/exp/MapExp.java: 0 added lines, 63 removed lines.
Original line number	Diff line number	Diff line
		@@ -314,72 +314,9 @@ public abstract class MapExp<Ty,En1,Sym,Fk1,Att1,En2,Fk2,Att2> extends Exp<Mappi


		}
		/*
		public static final class MapExpVar2<Ty,En,Sym,Fk,Att> extends MapExp<Ty,En,Sym,Fk,Att,En,Fk,Att> {
		public final String var;
		@Override
		public Map<String, String> options() {
		return Collections.emptyMap();
		}
		@Override
		public Collection<Pair<String, Kind>> deps() {
		return Util.singList(new Pair<>(var, Kind.MAPPING));
		}

		public MapExpVar2(String var) {
		Util.assertNotNull(var);
		this.var = var;
		}
		public MapExpVar2(MapExpVar var) {
		this.var = var.var;
		}

		@SuppressWarnings("unchecked")
		@Override
		public Mapping<Ty, En, Sym, Fk, Att, En, Fk, Att> eval(AqlEnv env) {
		return env.defs.maps.get(var);
		}

		@Override
		public int hashCode() {
		int prime = 31;
		int result = 1;
		result = prime * result + ((var == null) ? 0 : var.hashCode());
		return result;
		}

		@Override
		public boolean equals(Object obj) {
		if (this == obj)
		return true;
		if (obj == null)
		return false;
		if (getClass() != obj.getClass())
		return false;
		MapExpVar2<?, ?, ?, ?, ?> other = (MapExpVar2<?, ?, ?, ?, ?>) obj;
		if (var == null) {
		if (other.var != null)
		return false;
		} else if (!var.equals(other.var))
		return false;
		return true;
		}

		@Override
		public String toString() {
		return var;
		}
		@SuppressWarnings("unchecked")
		@Override
		public Pair<SchExp<Ty, En, Sym, Fk, Att>, SchExp<Ty, En, Sym, Fk, Att>> type(AqlTyping G) {
		if (!G.defs.maps.containsKey(var)) {
		throw new RuntimeException("Not a mapping: " + var);
		}
		return (Pair<SchExp<Ty, En, Sym, Fk, Att>, SchExp<Ty, En, Sym, Fk, Att>>) ((Object)G.defs.maps.get(var));
		}

		}
		*/
		/////////////////////////////////////////////////////////////////////

		public static final class MapExpLit<Ty,En1,Sym1,Fk1,Att1,En2,Fk2,Att2> extends MapExp<Ty,En1,Sym1,Fk1,Att1,En2,Fk2,Att2> {

Admin message