Commit 8335e3ef authored by Fred Eisele's avatar Fred Eisele
Browse files

Improve formating of QueryExpRaw

parent a321f442
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/eub/-ru88jt/AqlLexerRules.g4 by ANTLR 4.7
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/as8/-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/eub/-ru88jt/AqlParser.g4 by ANTLR 4.7
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/as8/-ru88jt/AqlParser.g4 by ANTLR 4.7
package catdata.aql.grammar;
import org.antlr.v4.runtime.ParserRuleContext;
......@@ -239,6 +239,54 @@ public class AqlParserBaseListener implements AqlParserListener {
* <p>The default implementation does nothing.</p>
*/
@Override public void exitValue(AqlParser.ValueContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterQuotedString(AqlParser.QuotedStringContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitQuotedString(AqlParser.QuotedStringContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterQuotedMultiString(AqlParser.QuotedMultiStringContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitQuotedMultiString(AqlParser.QuotedMultiStringContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterQuotedHtmlString(AqlParser.QuotedHtmlStringContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitQuotedHtmlString(AqlParser.QuotedHtmlStringContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterQuotedMarkdownString(AqlParser.QuotedMarkdownStringContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitQuotedMarkdownString(AqlParser.QuotedMarkdownStringContext ctx) { }
/**
* {@inheritDoc}
*
......@@ -2188,13 +2236,25 @@ public class AqlParserBaseListener implements AqlParserListener {
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterInstanceLiteralValue(AqlParser.InstanceLiteralValueContext ctx) { }
@Override public void enterInstanceLiteralValue_Straight(AqlParser.InstanceLiteralValue_StraightContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitInstanceLiteralValue_Straight(AqlParser.InstanceLiteralValue_StraightContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterInstanceLiteralValue_Quoted(AqlParser.InstanceLiteralValue_QuotedContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitInstanceLiteralValue(AqlParser.InstanceLiteralValueContext ctx) { }
@Override public void exitInstanceLiteralValue_Quoted(AqlParser.InstanceLiteralValue_QuotedContext ctx) { }
/**
* {@inheritDoc}
*
......
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/eub/-ru88jt/AqlParser.g4 by ANTLR 4.7
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/as8/-ru88jt/AqlParser.g4 by ANTLR 4.7
package catdata.aql.grammar;
import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
......@@ -144,6 +144,34 @@ public class AqlParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> impleme
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitValue(AqlParser.ValueContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitQuotedString(AqlParser.QuotedStringContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitQuotedMultiString(AqlParser.QuotedMultiStringContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitQuotedHtmlString(AqlParser.QuotedHtmlStringContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitQuotedMarkdownString(AqlParser.QuotedMarkdownStringContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
......@@ -1284,7 +1312,14 @@ 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 visitInstanceLiteralValue(AqlParser.InstanceLiteralValueContext ctx) { return visitChildren(ctx); }
@Override public T visitInstanceLiteralValue_Straight(AqlParser.InstanceLiteralValue_StraightContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitInstanceLiteralValue_Quoted(AqlParser.InstanceLiteralValue_QuotedContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
......
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/eub/-ru88jt/AqlParser.g4 by ANTLR 4.7
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/as8/-ru88jt/AqlParser.g4 by ANTLR 4.7
package catdata.aql.grammar;
import org.antlr.v4.runtime.tree.ParseTreeListener;
......@@ -221,6 +221,46 @@ public interface AqlParserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitValue(AqlParser.ValueContext ctx);
/**
* Enter a parse tree produced by {@link AqlParser#quotedString}.
* @param ctx the parse tree
*/
void enterQuotedString(AqlParser.QuotedStringContext ctx);
/**
* Exit a parse tree produced by {@link AqlParser#quotedString}.
* @param ctx the parse tree
*/
void exitQuotedString(AqlParser.QuotedStringContext ctx);
/**
* Enter a parse tree produced by {@link AqlParser#quotedMultiString}.
* @param ctx the parse tree
*/
void enterQuotedMultiString(AqlParser.QuotedMultiStringContext ctx);
/**
* Exit a parse tree produced by {@link AqlParser#quotedMultiString}.
* @param ctx the parse tree
*/
void exitQuotedMultiString(AqlParser.QuotedMultiStringContext ctx);
/**
* Enter a parse tree produced by {@link AqlParser#quotedHtmlString}.
* @param ctx the parse tree
*/
void enterQuotedHtmlString(AqlParser.QuotedHtmlStringContext ctx);
/**
* Exit a parse tree produced by {@link AqlParser#quotedHtmlString}.
* @param ctx the parse tree
*/
void exitQuotedHtmlString(AqlParser.QuotedHtmlStringContext ctx);
/**
* Enter a parse tree produced by {@link AqlParser#quotedMarkdownString}.
* @param ctx the parse tree
*/
void enterQuotedMarkdownString(AqlParser.QuotedMarkdownStringContext ctx);
/**
* Exit a parse tree produced by {@link AqlParser#quotedMarkdownString}.
* @param ctx the parse tree
*/
void exitQuotedMarkdownString(AqlParser.QuotedMarkdownStringContext ctx);
/**
* Enter a parse tree produced by {@link AqlParser#htmlCommentDeclaration}.
* @param ctx the parse tree
......@@ -1972,15 +2012,29 @@ public interface AqlParserListener extends ParseTreeListener {
*/
void exitInstanceSymbol(AqlParser.InstanceSymbolContext ctx);
/**
* Enter a parse tree produced by {@link AqlParser#instanceLiteralValue}.
* Enter a parse tree produced by the {@code InstanceLiteralValue_Straight}
* labeled alternative in {@link AqlParser#instanceLiteralValue}.
* @param ctx the parse tree
*/
void enterInstanceLiteralValue_Straight(AqlParser.InstanceLiteralValue_StraightContext ctx);
/**
* Exit a parse tree produced by the {@code InstanceLiteralValue_Straight}
* labeled alternative in {@link AqlParser#instanceLiteralValue}.
* @param ctx the parse tree
*/
void exitInstanceLiteralValue_Straight(AqlParser.InstanceLiteralValue_StraightContext ctx);
/**
* Enter a parse tree produced by the {@code InstanceLiteralValue_Quoted}
* labeled alternative in {@link AqlParser#instanceLiteralValue}.
* @param ctx the parse tree
*/
void enterInstanceLiteralValue(AqlParser.InstanceLiteralValueContext ctx);
void enterInstanceLiteralValue_Quoted(AqlParser.InstanceLiteralValue_QuotedContext ctx);
/**
* Exit a parse tree produced by {@link AqlParser#instanceLiteralValue}.
* Exit a parse tree produced by the {@code InstanceLiteralValue_Quoted}
* labeled alternative in {@link AqlParser#instanceLiteralValue}.
* @param ctx the parse tree
*/
void exitInstanceLiteralValue(AqlParser.InstanceLiteralValueContext ctx);
void exitInstanceLiteralValue_Quoted(AqlParser.InstanceLiteralValue_QuotedContext ctx);
/**
* Enter a parse tree produced by the {@code InstancePath_Literal}
* labeled alternative in {@link AqlParser#instancePath}.
......
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/eub/-ru88jt/AqlParser.g4 by ANTLR 4.7
// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/as8/-ru88jt/AqlParser.g4 by ANTLR 4.7
package catdata.aql.grammar;
import org.antlr.v4.runtime.tree.ParseTreeVisitor;
......@@ -136,6 +136,30 @@ public interface AqlParserVisitor<T> extends ParseTreeVisitor<T> {
* @return the visitor result
*/
T visitValue(AqlParser.ValueContext ctx);
/**
* Visit a parse tree produced by {@link AqlParser#quotedString}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitQuotedString(AqlParser.QuotedStringContext ctx);
/**
* Visit a parse tree produced by {@link AqlParser#quotedMultiString}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitQuotedMultiString(AqlParser.QuotedMultiStringContext ctx);
/**
* Visit a parse tree produced by {@link AqlParser#quotedHtmlString}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitQuotedHtmlString(AqlParser.QuotedHtmlStringContext ctx);
/**
* Visit a parse tree produced by {@link AqlParser#quotedMarkdownString}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitQuotedMarkdownString(AqlParser.QuotedMarkdownStringContext ctx);
/**
* Visit a parse tree produced by {@link AqlParser#htmlCommentDeclaration}.
* @param ctx the parse tree
......@@ -1174,11 +1198,19 @@ public interface AqlParserVisitor<T> extends ParseTreeVisitor<T> {
*/
T visitInstanceSymbol(AqlParser.InstanceSymbolContext ctx);
/**
* Visit a parse tree produced by {@link AqlParser#instanceLiteralValue}.
* Visit a parse tree produced by the {@code InstanceLiteralValue_Straight}
* labeled alternative in {@link AqlParser#instanceLiteralValue}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitInstanceLiteralValue_Straight(AqlParser.InstanceLiteralValue_StraightContext ctx);
/**
* Visit a parse tree produced by the {@code InstanceLiteralValue_Quoted}
* labeled alternative in {@link AqlParser#instanceLiteralValue}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitInstanceLiteralValue(AqlParser.InstanceLiteralValueContext ctx);
T visitInstanceLiteralValue_Quoted(AqlParser.InstanceLiteralValue_QuotedContext ctx);
/**
* Visit a parse tree produced by the {@code InstancePath_Literal}
* labeled alternative in {@link AqlParser#instancePath}.
......
......@@ -67,26 +67,26 @@ commandKind
| LPAREN commandExp RPAREN # CommandKind_Exp
;
commandAddClasspathSection : STRING+ ;
commandAddClasspathSection : quotedString+ ;
commandCmdLineSection : STRING* allOptions ;
commandCmdLineSection : quotedString* allOptions ;
commandExecJsSection : STRING* allOptions ;
commandExecJsSection : quotedString* allOptions ;
commandExecJdbcSection : (STRING | MULTI_STRING)+ allOptions ;
commandExecJdbcSection : quotedMultiString+ allOptions ;
commandLoadJarsSection : STRING* ;
commandLoadJarsSection : quotedString* ;
commandMatchSection : allOptions ;
commandExportCsvSection : STRING* allOptions ;
commandExportCsvSection : quotedString* allOptions ;
commandExportJdbcSection : STRING* allOptions ;
commandExportJdbcSection : quotedString* allOptions ;
commandFile : STRING ;
commandJdbcClass : STRING ;
commandJdbcUri : STRING ;
commandPrefix : STRING ;
commandPrefixSrc : STRING ;
commandPrefixDst : STRING ;
commandMatchWhich : STRING ;
commandFile : quotedString ;
commandJdbcClass : quotedString ;
commandJdbcUri : quotedString ;
commandPrefix : quotedString ;
commandPrefixSrc : quotedString ;
commandPrefixDst : quotedString ;
commandMatchWhich : quotedString ;
......@@ -174,10 +174,10 @@ instanceLiteral : instanceLiteralValue (AT instanceSymbol)? ;
instanceSymbol : symbol ;
instanceLiteralValue
: truthy
| INTEGER
| NUMBER
| STRING
: truthy # InstanceLiteralValue_Straight
| INTEGER # InstanceLiteralValue_Straight
| NUMBER # InstanceLiteralValue_Straight
| STRING # InstanceLiteralValue_Quoted
;
instancePath
......
......@@ -66,3 +66,11 @@ value
| LOWER_ID
| UPPER_ID
;
// the intent is to remove the quotes.
quotedString : STRING ;
quotedMultiString : MULTI_STRING | STRING ;
quotedHtmlString : HTML_MULTI_STRING ;
quotedMarkdownString : MD_MULTI_STRING ;
......@@ -1264,6 +1264,9 @@
[:commandExp
"exec_js"
"{"
[:commandExecJsSection "\"1+2;\"" "\"2+3;\"" "allOptions"]
[:commandExecJsSection
[:quotedString "\"1+2;\""]
[:quotedString "\"2+3;\""]
"allOptions"]
"}"]]]]
"<EOF>"]
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