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

transforms working, begin handling optionals

parent e600a1f5
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/p48/-ru88jt/AqlLexerRules.g4 by ANTLR 4.7
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/np3/-ru88jt/AqlLexerRules.g4 by ANTLR 4.7
package catdata.aql.grammar;
import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.CharStream;
......
This diff is collapsed.
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/p48/-ru88jt/AqlParser.g4 by ANTLR 4.7
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/np3/-ru88jt/AqlParser.g4 by ANTLR 4.7
package catdata.aql.grammar;
import org.antlr.v4.runtime.ParserRuleContext;
......@@ -2776,49 +2776,49 @@ public class AqlParserBaseListener implements AqlParserListener {
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterTransformExp_Delta(AqlParser.TransformExp_DeltaContext ctx) { }
@Override public void enterTransformExp_Eval(AqlParser.TransformExp_EvalContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitTransformExp_Delta(AqlParser.TransformExp_DeltaContext ctx) { }
@Override public void exitTransformExp_Eval(AqlParser.TransformExp_EvalContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterTransformExp_Sigma(AqlParser.TransformExp_SigmaContext ctx) { }
@Override public void enterTransformExp_Coeval(AqlParser.TransformExp_CoevalContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitTransformExp_Sigma(AqlParser.TransformExp_SigmaContext ctx) { }
@Override public void exitTransformExp_Coeval(AqlParser.TransformExp_CoevalContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterTransformExp_Eval(AqlParser.TransformExp_EvalContext ctx) { }
@Override public void enterTransformExp_Sigma(AqlParser.TransformExp_SigmaContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitTransformExp_Eval(AqlParser.TransformExp_EvalContext ctx) { }
@Override public void exitTransformExp_Sigma(AqlParser.TransformExp_SigmaContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterTransformExp_Coeval(AqlParser.TransformExp_CoevalContext ctx) { }
@Override public void enterTransformExp_Delta(AqlParser.TransformExp_DeltaContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitTransformExp_Coeval(AqlParser.TransformExp_CoevalContext ctx) { }
@Override public void exitTransformExp_Delta(AqlParser.TransformExp_DeltaContext ctx) { }
/**
* {@inheritDoc}
*
......
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/p48/-ru88jt/AqlParser.g4 by ANTLR 4.7
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/np3/-ru88jt/AqlParser.g4 by ANTLR 4.7
package catdata.aql.grammar;
import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
......@@ -1627,28 +1627,28 @@ 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 visitTransformExp_Delta(AqlParser.TransformExp_DeltaContext ctx) { return visitChildren(ctx); }
@Override public T visitTransformExp_Eval(AqlParser.TransformExp_EvalContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitTransformExp_Sigma(AqlParser.TransformExp_SigmaContext ctx) { return visitChildren(ctx); }
@Override public T visitTransformExp_Coeval(AqlParser.TransformExp_CoevalContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitTransformExp_Eval(AqlParser.TransformExp_EvalContext ctx) { return visitChildren(ctx); }
@Override public T visitTransformExp_Sigma(AqlParser.TransformExp_SigmaContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitTransformExp_Coeval(AqlParser.TransformExp_CoevalContext ctx) { return visitChildren(ctx); }
@Override public T visitTransformExp_Delta(AqlParser.TransformExp_DeltaContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
......
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/p48/-ru88jt/AqlParser.g4 by ANTLR 4.7
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/np3/-ru88jt/AqlParser.g4 by ANTLR 4.7
package catdata.aql.grammar;
import org.antlr.v4.runtime.tree.ParseTreeListener;
......@@ -2498,53 +2498,53 @@ public interface AqlParserListener extends ParseTreeListener {
*/
void exitTransformExp_Distinct(AqlParser.TransformExp_DistinctContext ctx);
/**
* Enter a parse tree produced by the {@code TransformExp_Delta}
* Enter a parse tree produced by the {@code TransformExp_Eval}
* labeled alternative in {@link AqlParser#transformExp}.
* @param ctx the parse tree
*/
void enterTransformExp_Delta(AqlParser.TransformExp_DeltaContext ctx);
void enterTransformExp_Eval(AqlParser.TransformExp_EvalContext ctx);
/**
* Exit a parse tree produced by the {@code TransformExp_Delta}
* Exit a parse tree produced by the {@code TransformExp_Eval}
* labeled alternative in {@link AqlParser#transformExp}.
* @param ctx the parse tree
*/
void exitTransformExp_Delta(AqlParser.TransformExp_DeltaContext ctx);
void exitTransformExp_Eval(AqlParser.TransformExp_EvalContext ctx);
/**
* Enter a parse tree produced by the {@code TransformExp_Sigma}
* Enter a parse tree produced by the {@code TransformExp_Coeval}
* labeled alternative in {@link AqlParser#transformExp}.
* @param ctx the parse tree
*/
void enterTransformExp_Sigma(AqlParser.TransformExp_SigmaContext ctx);
void enterTransformExp_Coeval(AqlParser.TransformExp_CoevalContext ctx);
/**
* Exit a parse tree produced by the {@code TransformExp_Sigma}
* Exit a parse tree produced by the {@code TransformExp_Coeval}
* labeled alternative in {@link AqlParser#transformExp}.
* @param ctx the parse tree
*/
void exitTransformExp_Sigma(AqlParser.TransformExp_SigmaContext ctx);
void exitTransformExp_Coeval(AqlParser.TransformExp_CoevalContext ctx);
/**
* Enter a parse tree produced by the {@code TransformExp_Eval}
* Enter a parse tree produced by the {@code TransformExp_Sigma}
* labeled alternative in {@link AqlParser#transformExp}.
* @param ctx the parse tree
*/
void enterTransformExp_Eval(AqlParser.TransformExp_EvalContext ctx);
void enterTransformExp_Sigma(AqlParser.TransformExp_SigmaContext ctx);
/**
* Exit a parse tree produced by the {@code TransformExp_Eval}
* Exit a parse tree produced by the {@code TransformExp_Sigma}
* labeled alternative in {@link AqlParser#transformExp}.
* @param ctx the parse tree
*/
void exitTransformExp_Eval(AqlParser.TransformExp_EvalContext ctx);
void exitTransformExp_Sigma(AqlParser.TransformExp_SigmaContext ctx);
/**
* Enter a parse tree produced by the {@code TransformExp_Coeval}
* Enter a parse tree produced by the {@code TransformExp_Delta}
* labeled alternative in {@link AqlParser#transformExp}.
* @param ctx the parse tree
*/
void enterTransformExp_Coeval(AqlParser.TransformExp_CoevalContext ctx);
void enterTransformExp_Delta(AqlParser.TransformExp_DeltaContext ctx);
/**
* Exit a parse tree produced by the {@code TransformExp_Coeval}
* Exit a parse tree produced by the {@code TransformExp_Delta}
* labeled alternative in {@link AqlParser#transformExp}.
* @param ctx the parse tree
*/
void exitTransformExp_Coeval(AqlParser.TransformExp_CoevalContext ctx);
void exitTransformExp_Delta(AqlParser.TransformExp_DeltaContext ctx);
/**
* Enter a parse tree produced by the {@code TransformExp_Unit}
* labeled alternative in {@link AqlParser#transformExp}.
......
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/p48/-ru88jt/AqlParser.g4 by ANTLR 4.7
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/np3/-ru88jt/AqlParser.g4 by ANTLR 4.7
package catdata.aql.grammar;
import org.antlr.v4.runtime.tree.ParseTreeVisitor;
......@@ -1486,33 +1486,33 @@ public interface AqlParserVisitor<T> extends ParseTreeVisitor<T> {
*/
T visitTransformExp_Distinct(AqlParser.TransformExp_DistinctContext ctx);
/**
* Visit a parse tree produced by the {@code TransformExp_Delta}
* Visit a parse tree produced by the {@code TransformExp_Eval}
* labeled alternative in {@link AqlParser#transformExp}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitTransformExp_Delta(AqlParser.TransformExp_DeltaContext ctx);
T visitTransformExp_Eval(AqlParser.TransformExp_EvalContext ctx);
/**
* Visit a parse tree produced by the {@code TransformExp_Sigma}
* Visit a parse tree produced by the {@code TransformExp_Coeval}
* labeled alternative in {@link AqlParser#transformExp}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitTransformExp_Sigma(AqlParser.TransformExp_SigmaContext ctx);
T visitTransformExp_Coeval(AqlParser.TransformExp_CoevalContext ctx);
/**
* Visit a parse tree produced by the {@code TransformExp_Eval}
* Visit a parse tree produced by the {@code TransformExp_Sigma}
* labeled alternative in {@link AqlParser#transformExp}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitTransformExp_Eval(AqlParser.TransformExp_EvalContext ctx);
T visitTransformExp_Sigma(AqlParser.TransformExp_SigmaContext ctx);
/**
* Visit a parse tree produced by the {@code TransformExp_Coeval}
* Visit a parse tree produced by the {@code TransformExp_Delta}
* labeled alternative in {@link AqlParser#transformExp}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitTransformExp_Coeval(AqlParser.TransformExp_CoevalContext ctx);
T visitTransformExp_Delta(AqlParser.TransformExp_DeltaContext ctx);
/**
* Visit a parse tree produced by the {@code TransformExp_Unit}
* labeled alternative in {@link AqlParser#transformExp}.
......
......@@ -16,14 +16,6 @@ transformExp
| DISTINCT transformRef
# TransformExp_Distinct
| DELTA mappingKind transformRef
# TransformExp_Delta
| SIGMA mappingKind transformRef
(LBRACE transformSigmaSection RBRACE)?
(LBRACE transformSigmaSection RBRACE)?
# TransformExp_Sigma
| EVAL queryKind transformRef
# TransformExp_Eval
......@@ -32,6 +24,14 @@ transformExp
(LBRACE transformCoevalSection RBRACE)?
# TransformExp_Coeval
| SIGMA mappingKind transformRef
(LBRACE transformSigmaSection RBRACE)?
(LBRACE transformSigmaSection RBRACE)?
# TransformExp_Sigma
| DELTA mappingKind transformRef
# TransformExp_Delta
| UNIT mappingKind instanceRef
(LBRACE transformUnitSection RBRACE)?
# TransformExp_Unit
......@@ -86,8 +86,9 @@ transformSqlEntityExpr : schemaEntityId RARROW transformSqlExpr ;
transformFileExpr : schemaEntityId RARROW transformFile ;
transformLiteralSection
: (GENERATORS (transformGen RARROW schemaPath)*)?
: (IMPORTS schemaRef*)?
(GENERATORS transformGen*)?
allOptions
;
transformGen : symbol ;
transformGen : symbol RARROW schemaPath ;
This diff is collapsed.
Supports Markdown
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