Commit c1fa40f0 authored by Fred Eisele's avatar Fred Eisele
Browse files

part of merge

parent 776adc77
package catdata.aql.exp;
import java.io.IOException;
import java.io.Reader;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
......@@ -36,6 +39,7 @@ import catdata.aql.exp.EdsExp.EdsExpVar;
import catdata.aql.exp.EdsExpRaw.EdExpRaw;
import catdata.aql.exp.GraphExp.GraphExpRaw;
import catdata.aql.exp.GraphExp.GraphExpVar;
import catdata.aql.exp.InstExpQueryQuotient;
import catdata.aql.exp.InstExp.InstExpAnonymize;
import catdata.aql.exp.InstExp.InstExpChase;
import catdata.aql.exp.InstExp.InstExpCoEq;
......@@ -315,7 +319,7 @@ public class CombinatorParser implements IAqlParser {
options.between(token("{"), token("}")).optional())
.map(x -> new InstExpCoEval(x.b, x.c, x.d == null ? new LinkedList<>() : x.d));
Parser ret = Parsers.or(queryQuotientExpRaw(), sigma_chase, l2, pi, frozen, instExpCsvQuot(), instExpJdbcQuot(), instExpCoProd(), instExpRand(),
Parser ret = Parsers.or(queryQuotientExpRaw(), sigma_chase, l2, pi, frozen, instExpCsvQuot(), instExpJdbcQuot(), instExpCoProd(), instExpRand(),
instExpCoEq(), instExpJdbcAll(), chase, instExpJdbc(), empty, instExpRaw(), var, sigma, delta, distinct,
eval, colimInstExp(), dom, anon, cod, instExpCsv(), coeval, parens(inst_ref), instExpQuotient());
......
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