Commit 964ffedb authored by Fred Eisele's avatar Fred Eisele
Browse files

corrected mishandling of *Ref 

There are still some questionable cases.
parent 6dcf8add

gen/catdata/aql/grammar/AqlLexerRules.java

+978 −977

File changed.

Preview size limit exceeded, changes collapsed.

gen/catdata/aql/grammar/AqlParser.java

+2970 −2910

File changed.

Preview size limit exceeded, changes collapsed.

gen/catdata/aql/grammar/AqlParserBaseListener.java

+37 −13
Changes for gen/catdata/aql/grammar/AqlParserBaseListener.java: 37 added lines, 13 removed lines.
Original line number Diff line number Diff line 
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/8jt/-ru88jt/AqlParser.g4 by ANTLR 4.7

// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/8mw/-ru88jt/AqlParser.g4 by ANTLR 4.7

package catdata.aql.grammar;



import org.antlr.v4.runtime.ParserRuleContext;
@@ -1684,13 +1684,13 @@ public class AqlParserBaseListener implements AqlParserListener { 
	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void enterInstanceExp_Coprod(AqlParser.InstanceExp_CoprodContext ctx) { }

	@Override public void enterInstanceExp_CoProd(AqlParser.InstanceExp_CoProdContext ctx) { }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void exitInstanceExp_Coprod(AqlParser.InstanceExp_CoprodContext ctx) { }

	@Override public void exitInstanceExp_CoProd(AqlParser.InstanceExp_CoProdContext ctx) { }

	/**

	 * {@inheritDoc}

	 *
@@ -1708,13 +1708,13 @@ public class AqlParserBaseListener implements AqlParserListener { 
	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void enterInstanceExp_CoprodUn(AqlParser.InstanceExp_CoprodUnContext ctx) { }

	@Override public void enterInstanceExp_CoProdUn(AqlParser.InstanceExp_CoProdUnContext ctx) { }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void exitInstanceExp_CoprodUn(AqlParser.InstanceExp_CoprodUnContext ctx) { }

	@Override public void exitInstanceExp_CoProdUn(AqlParser.InstanceExp_CoProdUnContext ctx) { }

	/**

	 * {@inheritDoc}

	 *
@@ -1943,6 +1943,18 @@ public class AqlParserBaseListener implements AqlParserListener { 
	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void exitInstanceColimitSection(AqlParser.InstanceColimitSectionContext ctx) { }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void enterInstanceCoProdPair(AqlParser.InstanceCoProdPairContext ctx) { }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void exitInstanceCoProdPair(AqlParser.InstanceCoProdPairContext ctx) { }

	/**

	 * {@inheritDoc}

	 *
@@ -2224,37 +2236,37 @@ public class AqlParserBaseListener implements AqlParserListener { 
	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void enterInstanceCoprodSection(AqlParser.InstanceCoprodSectionContext ctx) { }

	@Override public void enterInstanceCoProdSection(AqlParser.InstanceCoProdSectionContext ctx) { }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void exitInstanceCoprodSection(AqlParser.InstanceCoprodSectionContext ctx) { }

	@Override public void exitInstanceCoProdSection(AqlParser.InstanceCoProdSectionContext ctx) { }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void enterInstanceCoprodSigmaSection(AqlParser.InstanceCoprodSigmaSectionContext ctx) { }

	@Override public void enterInstanceCoProdSigmaSection(AqlParser.InstanceCoProdSigmaSectionContext ctx) { }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void exitInstanceCoprodSigmaSection(AqlParser.InstanceCoprodSigmaSectionContext ctx) { }

	@Override public void exitInstanceCoProdSigmaSection(AqlParser.InstanceCoProdSigmaSectionContext ctx) { }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void enterInstanceCoprodUnrestrictSection(AqlParser.InstanceCoprodUnrestrictSectionContext ctx) { }

	@Override public void enterInstanceCoProdUnrestrictSection(AqlParser.InstanceCoProdUnrestrictSectionContext ctx) { }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void exitInstanceCoprodUnrestrictSection(AqlParser.InstanceCoprodUnrestrictSectionContext ctx) { }

	@Override public void exitInstanceCoProdUnrestrictSection(AqlParser.InstanceCoProdUnrestrictSectionContext ctx) { }

	/**

	 * {@inheritDoc}

	 *
@@ -2771,6 +2783,18 @@ public class AqlParserBaseListener implements AqlParserListener { 
	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void exitTransformExp_Literal(AqlParser.TransformExp_LiteralContext ctx) { }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void enterTransformKind_Ref(AqlParser.TransformKind_RefContext ctx) { }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void exitTransformKind_Ref(AqlParser.TransformKind_RefContext ctx) { }

	/**

	 * {@inheritDoc}

	 *
@@ -3844,13 +3868,13 @@ public class AqlParserBaseListener implements AqlParserListener { 
	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void enterSchemaColimitExp_Coproduct(AqlParser.SchemaColimitExp_CoproductContext ctx) { }

	@Override public void enterSchemaColimitExp_CoProduct(AqlParser.SchemaColimitExp_CoProductContext ctx) { }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation does nothing.</p>

	 */

	@Override public void exitSchemaColimitExp_Coproduct(AqlParser.SchemaColimitExp_CoproductContext ctx) { }

	@Override public void exitSchemaColimitExp_CoProduct(AqlParser.SchemaColimitExp_CoProductContext ctx) { }

	/**

	 * {@inheritDoc}

	 *

gen/catdata/aql/grammar/AqlParserBaseVisitor.java

+21 −7
Changes for gen/catdata/aql/grammar/AqlParserBaseVisitor.java: 21 added lines, 7 removed lines.
Original line number Diff line number Diff line 
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/8jt/-ru88jt/AqlParser.g4 by ANTLR 4.7

// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/8mw/-ru88jt/AqlParser.g4 by ANTLR 4.7

package catdata.aql.grammar;

import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
@@ -990,7 +990,7 @@ public class AqlParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> impleme 
	 * <p>The default implementation returns the result of calling

	 * {@link #visitChildren} on {@code ctx}.</p>

	 */

	@Override public T visitInstanceExp_Coprod(AqlParser.InstanceExp_CoprodContext ctx) { return visitChildren(ctx); }

	@Override public T visitInstanceExp_CoProd(AqlParser.InstanceExp_CoProdContext ctx) { return visitChildren(ctx); }

	/**

	 * {@inheritDoc}

	 *
@@ -1004,7 +1004,7 @@ public class AqlParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> impleme 
	 * <p>The default implementation returns the result of calling

	 * {@link #visitChildren} on {@code ctx}.</p>

	 */

	@Override public T visitInstanceExp_CoprodUn(AqlParser.InstanceExp_CoprodUnContext ctx) { return visitChildren(ctx); }

	@Override public T visitInstanceExp_CoProdUn(AqlParser.InstanceExp_CoProdUnContext ctx) { return visitChildren(ctx); }

	/**

	 * {@inheritDoc}

	 *
@@ -1138,6 +1138,13 @@ public class AqlParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> impleme 
	 * {@link #visitChildren} on {@code ctx}.</p>

	 */

	@Override public T visitInstanceColimitSection(AqlParser.InstanceColimitSectionContext ctx) { return visitChildren(ctx); }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation returns the result of calling

	 * {@link #visitChildren} on {@code ctx}.</p>

	 */

	@Override public T visitInstanceCoProdPair(AqlParser.InstanceCoProdPairContext ctx) { return visitChildren(ctx); }

	/**

	 * {@inheritDoc}

	 *
@@ -1305,21 +1312,21 @@ public class AqlParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> impleme 
	 * <p>The default implementation returns the result of calling

	 * {@link #visitChildren} on {@code ctx}.</p>

	 */

	@Override public T visitInstanceCoprodSection(AqlParser.InstanceCoprodSectionContext ctx) { return visitChildren(ctx); }

	@Override public T visitInstanceCoProdSection(AqlParser.InstanceCoProdSectionContext ctx) { return visitChildren(ctx); }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation returns the result of calling

	 * {@link #visitChildren} on {@code ctx}.</p>

	 */

	@Override public T visitInstanceCoprodSigmaSection(AqlParser.InstanceCoprodSigmaSectionContext ctx) { return visitChildren(ctx); }

	@Override public T visitInstanceCoProdSigmaSection(AqlParser.InstanceCoProdSigmaSectionContext ctx) { return visitChildren(ctx); }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation returns the result of calling

	 * {@link #visitChildren} on {@code ctx}.</p>

	 */

	@Override public T visitInstanceCoprodUnrestrictSection(AqlParser.InstanceCoprodUnrestrictSectionContext ctx) { return visitChildren(ctx); }

	@Override public T visitInstanceCoProdUnrestrictSection(AqlParser.InstanceCoProdUnrestrictSectionContext ctx) { return visitChildren(ctx); }

	/**

	 * {@inheritDoc}

	 *
@@ -1621,6 +1628,13 @@ public class AqlParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> impleme 
	 * {@link #visitChildren} on {@code ctx}.</p>

	 */

	@Override public T visitTransformExp_Literal(AqlParser.TransformExp_LiteralContext ctx) { return visitChildren(ctx); }

	/**

	 * {@inheritDoc}

	 *

	 * <p>The default implementation returns the result of calling

	 * {@link #visitChildren} on {@code ctx}.</p>

	 */

	@Override public T visitTransformKind_Ref(AqlParser.TransformKind_RefContext ctx) { return visitChildren(ctx); }

	/**

	 * {@inheritDoc}

	 *
@@ -2250,7 +2264,7 @@ public class AqlParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> impleme 
	 * <p>The default implementation returns the result of calling

	 * {@link #visitChildren} on {@code ctx}.</p>

	 */

	@Override public T visitSchemaColimitExp_Coproduct(AqlParser.SchemaColimitExp_CoproductContext ctx) { return visitChildren(ctx); }

	@Override public T visitSchemaColimitExp_CoProduct(AqlParser.SchemaColimitExp_CoProductContext ctx) { return visitChildren(ctx); }

	/**

	 * {@inheritDoc}

	 *

gen/catdata/aql/grammar/AqlParserListener.java

+47 −25
Changes for gen/catdata/aql/grammar/AqlParserListener.java: 47 added lines, 25 removed lines.
Original line number Diff line number Diff line 
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/8jt/-ru88jt/AqlParser.g4 by ANTLR 4.7

// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/8mw/-ru88jt/AqlParser.g4 by ANTLR 4.7

package catdata.aql.grammar;

import org.antlr.v4.runtime.tree.ParseTreeListener;
@@ -1510,17 +1510,17 @@ public interface AqlParserListener extends ParseTreeListener { 
	 */

	void exitInstanceExp_CoSigma(AqlParser.InstanceExp_CoSigmaContext ctx);

	/**

	 * Enter a parse tree produced by the {@code InstanceExp_Coprod}

	 * Enter a parse tree produced by the {@code InstanceExp_CoProd}

	 * labeled alternative in {@link AqlParser#instanceExp}.

	 * @param ctx the parse tree

	 */

	void enterInstanceExp_Coprod(AqlParser.InstanceExp_CoprodContext ctx);

	void enterInstanceExp_CoProd(AqlParser.InstanceExp_CoProdContext ctx);

	/**

	 * Exit a parse tree produced by the {@code InstanceExp_Coprod}

	 * Exit a parse tree produced by the {@code InstanceExp_CoProd}

	 * labeled alternative in {@link AqlParser#instanceExp}.

	 * @param ctx the parse tree

	 */

	void exitInstanceExp_Coprod(AqlParser.InstanceExp_CoprodContext ctx);

	void exitInstanceExp_CoProd(AqlParser.InstanceExp_CoProdContext ctx);

	/**

	 * Enter a parse tree produced by the {@code InstanceExp_Union}

	 * labeled alternative in {@link AqlParser#instanceExp}.
@@ -1534,17 +1534,17 @@ public interface AqlParserListener extends ParseTreeListener { 
	 */

	void exitInstanceExp_Union(AqlParser.InstanceExp_UnionContext ctx);

	/**

	 * Enter a parse tree produced by the {@code InstanceExp_CoprodUn}

	 * Enter a parse tree produced by the {@code InstanceExp_CoProdUn}

	 * labeled alternative in {@link AqlParser#instanceExp}.

	 * @param ctx the parse tree

	 */

	void enterInstanceExp_CoprodUn(AqlParser.InstanceExp_CoprodUnContext ctx);

	void enterInstanceExp_CoProdUn(AqlParser.InstanceExp_CoProdUnContext ctx);

	/**

	 * Exit a parse tree produced by the {@code InstanceExp_CoprodUn}

	 * Exit a parse tree produced by the {@code InstanceExp_CoProdUn}

	 * labeled alternative in {@link AqlParser#instanceExp}.

	 * @param ctx the parse tree

	 */

	void exitInstanceExp_CoprodUn(AqlParser.InstanceExp_CoprodUnContext ctx);

	void exitInstanceExp_CoProdUn(AqlParser.InstanceExp_CoProdUnContext ctx);

	/**

	 * Enter a parse tree produced by the {@code InstanceExp_CoEqual}

	 * labeled alternative in {@link AqlParser#instanceExp}.
@@ -1767,6 +1767,16 @@ public interface AqlParserListener extends ParseTreeListener { 
	 * @param ctx the parse tree

	 */

	void exitInstanceColimitSection(AqlParser.InstanceColimitSectionContext ctx);

	/**

	 * Enter a parse tree produced by {@link AqlParser#instanceCoProdPair}.

	 * @param ctx the parse tree

	 */

	void enterInstanceCoProdPair(AqlParser.InstanceCoProdPairContext ctx);

	/**

	 * Exit a parse tree produced by {@link AqlParser#instanceCoProdPair}.

	 * @param ctx the parse tree

	 */

	void exitInstanceCoProdPair(AqlParser.InstanceCoProdPairContext ctx);

	/**

	 * Enter a parse tree produced by {@link AqlParser#instanceLiteralSection}.

	 * @param ctx the parse tree
@@ -1998,35 +2008,35 @@ public interface AqlParserListener extends ParseTreeListener { 
	 */

	void exitInstanceSigmaSection(AqlParser.InstanceSigmaSectionContext ctx);

	/**

	 * Enter a parse tree produced by {@link AqlParser#instanceCoprodSection}.

	 * Enter a parse tree produced by {@link AqlParser#instanceCoProdSection}.

	 * @param ctx the parse tree

	 */

	void enterInstanceCoprodSection(AqlParser.InstanceCoprodSectionContext ctx);

	void enterInstanceCoProdSection(AqlParser.InstanceCoProdSectionContext ctx);

	/**

	 * Exit a parse tree produced by {@link AqlParser#instanceCoprodSection}.

	 * Exit a parse tree produced by {@link AqlParser#instanceCoProdSection}.

	 * @param ctx the parse tree

	 */

	void exitInstanceCoprodSection(AqlParser.InstanceCoprodSectionContext ctx);

	void exitInstanceCoProdSection(AqlParser.InstanceCoProdSectionContext ctx);

	/**

	 * Enter a parse tree produced by {@link AqlParser#instanceCoprodSigmaSection}.

	 * Enter a parse tree produced by {@link AqlParser#instanceCoProdSigmaSection}.

	 * @param ctx the parse tree

	 */

	void enterInstanceCoprodSigmaSection(AqlParser.InstanceCoprodSigmaSectionContext ctx);

	void enterInstanceCoProdSigmaSection(AqlParser.InstanceCoProdSigmaSectionContext ctx);

	/**

	 * Exit a parse tree produced by {@link AqlParser#instanceCoprodSigmaSection}.

	 * Exit a parse tree produced by {@link AqlParser#instanceCoProdSigmaSection}.

	 * @param ctx the parse tree

	 */

	void exitInstanceCoprodSigmaSection(AqlParser.InstanceCoprodSigmaSectionContext ctx);

	void exitInstanceCoProdSigmaSection(AqlParser.InstanceCoProdSigmaSectionContext ctx);

	/**

	 * Enter a parse tree produced by {@link AqlParser#instanceCoprodUnrestrictSection}.

	 * Enter a parse tree produced by {@link AqlParser#instanceCoProdUnrestrictSection}.

	 * @param ctx the parse tree

	 */

	void enterInstanceCoprodUnrestrictSection(AqlParser.InstanceCoprodUnrestrictSectionContext ctx);

	void enterInstanceCoProdUnrestrictSection(AqlParser.InstanceCoProdUnrestrictSectionContext ctx);

	/**

	 * Exit a parse tree produced by {@link AqlParser#instanceCoprodUnrestrictSection}.

	 * Exit a parse tree produced by {@link AqlParser#instanceCoProdUnrestrictSection}.

	 * @param ctx the parse tree

	 */

	void exitInstanceCoprodUnrestrictSection(AqlParser.InstanceCoprodUnrestrictSectionContext ctx);

	void exitInstanceCoProdUnrestrictSection(AqlParser.InstanceCoProdUnrestrictSectionContext ctx);

	/**

	 * Enter a parse tree produced by {@link AqlParser#instanceCoequalizeSection}.

	 * @param ctx the parse tree
@@ -2507,6 +2517,18 @@ public interface AqlParserListener extends ParseTreeListener { 
	 * @param ctx the parse tree

	 */

	void exitTransformExp_Literal(AqlParser.TransformExp_LiteralContext ctx);

	/**

	 * Enter a parse tree produced by the {@code TransformKind_Ref}

	 * labeled alternative in {@link AqlParser#transformKind}.

	 * @param ctx the parse tree

	 */

	void enterTransformKind_Ref(AqlParser.TransformKind_RefContext ctx);

	/**

	 * Exit a parse tree produced by the {@code TransformKind_Ref}

	 * labeled alternative in {@link AqlParser#transformKind}.

	 * @param ctx the parse tree

	 */

	void exitTransformKind_Ref(AqlParser.TransformKind_RefContext ctx);

	/**

	 * Enter a parse tree produced by the {@code TransformKind_Exp}

	 * labeled alternative in {@link AqlParser#transformKind}.
@@ -3462,17 +3484,17 @@ public interface AqlParserListener extends ParseTreeListener { 
	 */

	void exitSchemaColimitExp_Quotient(AqlParser.SchemaColimitExp_QuotientContext ctx);

	/**

	 * Enter a parse tree produced by the {@code SchemaColimitExp_Coproduct}

	 * Enter a parse tree produced by the {@code SchemaColimitExp_CoProduct}

	 * labeled alternative in {@link AqlParser#schemaColimitExp}.

	 * @param ctx the parse tree

	 */

	void enterSchemaColimitExp_Coproduct(AqlParser.SchemaColimitExp_CoproductContext ctx);

	void enterSchemaColimitExp_CoProduct(AqlParser.SchemaColimitExp_CoProductContext ctx);

	/**

	 * Exit a parse tree produced by the {@code SchemaColimitExp_Coproduct}

	 * Exit a parse tree produced by the {@code SchemaColimitExp_CoProduct}

	 * labeled alternative in {@link AqlParser#schemaColimitExp}.

	 * @param ctx the parse tree

	 */

	void exitSchemaColimitExp_Coproduct(AqlParser.SchemaColimitExp_CoproductContext ctx);

	void exitSchemaColimitExp_CoProduct(AqlParser.SchemaColimitExp_CoProductContext ctx);

	/**

	 * Enter a parse tree produced by the {@code SchemaColimitExp_Modify}

	 * labeled alternative in {@link AqlParser#schemaColimitExp}.