diff --git a/buildADQL.xml b/buildADQL.xml
index 0038f7b7365e247c5b8261bba7b9f5c4617cac42..0bc4dafa4c1088f784cf362cbe4050309f2980c1 100644
--- a/buildADQL.xml
+++ b/buildADQL.xml
@@ -2,7 +2,7 @@
<!DOCTYPE project>
<project name="adql" basedir="." default="buildLib">
- <property name="version" value="1.5" />
+ <property name="version" value="1.5-1" />
<property name="srcDir" value="src" />
<property name="testDir" value="test" />
diff --git a/src/adql/parser/ADQLParser.java b/src/adql/parser/ADQLParser.java
index 0adf1177a9bfd55840e63c09735240b833d92b68..2838533cbd2255e5af330a0d01244b303c4bd767 100644
--- a/src/adql/parser/ADQLParser.java
+++ b/src/adql/parser/ADQLParser.java
@@ -1,3 +1,4 @@
+/* ADQLParser.java */
/* Generated By:JavaCC: Do not edit this line. ADQLParser.java */
package adql.parser;
@@ -90,7 +91,7 @@ import adql.translator.TranslationException;
* @see ADQLQueryFactory
*
* @author Grégory Mantelet (CDS;ARI)
-* @version 1.5 (03/2019)
+* @version 1.5-1 (07/2019)
*/
public class ADQLParser implements ADQLParserConstants {
@@ -115,7 +116,7 @@ public class ADQLParser implements ADQLParserConstants {
/**
* Builds an ADQL parser without a query to parse.
*/
- public ADQLParser(){
+ public ADQLParser() {
this(new java.io.ByteArrayInputStream("".getBytes()));
setDebug(false);
}
@@ -128,7 +129,7 @@ public class ADQLParser implements ADQLParserConstants {
* @param factory The object to use to build an object representation of
* the given ADQL query.
*/
- public ADQLParser(QueryChecker checker, ADQLQueryFactory factory){
+ public ADQLParser(QueryChecker checker, ADQLQueryFactory factory) {
this();
queryChecker = checker;
@@ -143,7 +144,7 @@ public class ADQLParser implements ADQLParserConstants {
*
* @param checker The object to use to check each {@link ADQLQuery}.
*/
- public ADQLParser(QueryChecker checker){
+ public ADQLParser(QueryChecker checker) {
this(checker, null);
}
@@ -154,7 +155,7 @@ public class ADQLParser implements ADQLParserConstants {
* @param factory The object to use to build an object representation of
* the given ADQL query.
*/
- public ADQLParser(ADQLQueryFactory factory){
+ public ADQLParser(ADQLQueryFactory factory) {
this((QueryChecker)null, factory);
}
@@ -166,7 +167,7 @@ public class ADQLParser implements ADQLParserConstants {
* @param factory The object to use to build an object representation of
* the given ADQL query.
*/
- public ADQLParser(java.io.InputStream stream, QueryChecker checker, ADQLQueryFactory factory){
+ public ADQLParser(java.io.InputStream stream, QueryChecker checker, ADQLQueryFactory factory) {
this(stream);
setDebug(false);
@@ -184,7 +185,7 @@ public class ADQLParser implements ADQLParserConstants {
* @param stream The stream in which the ADQL query to parse is given.
* @param checker The object to use to check each {@link ADQLQuery}.
*/
- public ADQLParser(java.io.InputStream stream, QueryChecker checker){
+ public ADQLParser(java.io.InputStream stream, QueryChecker checker) {
this(stream, checker, null);
}
@@ -195,7 +196,7 @@ public class ADQLParser implements ADQLParserConstants {
* @param factory The object to use to build an object representation of
* the given ADQL query.
*/
- public ADQLParser(java.io.InputStream stream, ADQLQueryFactory factory){
+ public ADQLParser(java.io.InputStream stream, ADQLQueryFactory factory) {
this(stream, (QueryChecker)null, factory);
}
@@ -208,7 +209,7 @@ public class ADQLParser implements ADQLParserConstants {
* @param factory The object to use to build an object representation
* of the given ADQL query.
*/
- public ADQLParser(java.io.InputStream stream, String encoding, QueryChecker checker, ADQLQueryFactory factory){
+ public ADQLParser(java.io.InputStream stream, String encoding, QueryChecker checker, ADQLQueryFactory factory) {
this(stream, encoding);
setDebug(false);
@@ -225,7 +226,7 @@ public class ADQLParser implements ADQLParserConstants {
* @param encoding The supplied encoding.
* @param checker The object to use to check each {@link ADQLQuery}.
*/
- public ADQLParser(java.io.InputStream stream, String encoding, QueryChecker checker){
+ public ADQLParser(java.io.InputStream stream, String encoding, QueryChecker checker) {
this(stream, encoding, checker, null);
}
@@ -237,7 +238,7 @@ public class ADQLParser implements ADQLParserConstants {
* @param factory The object to use to build an object representation
* of the given ADQL query.
*/
- public ADQLParser(java.io.InputStream stream, String encoding, ADQLQueryFactory factory){
+ public ADQLParser(java.io.InputStream stream, String encoding, ADQLQueryFactory factory) {
this(stream, encoding, null, factory);
}
@@ -249,7 +250,7 @@ public class ADQLParser implements ADQLParserConstants {
* @param factory The object to use to build an object representation
* of the given ADQL query.
*/
- public ADQLParser(java.io.Reader reader, QueryChecker checker, ADQLQueryFactory factory){
+ public ADQLParser(java.io.Reader reader, QueryChecker checker, ADQLQueryFactory factory) {
this(reader);
setDebug(false);
@@ -267,7 +268,7 @@ public class ADQLParser implements ADQLParserConstants {
* @param reader The reader in which the ADQL query to parse is given.
* @param checker The object to use to check each {@link ADQLQuery}.
*/
- public ADQLParser(java.io.Reader reader, QueryChecker checker){
+ public ADQLParser(java.io.Reader reader, QueryChecker checker) {
this(reader, checker, null);
}
@@ -278,7 +279,7 @@ public class ADQLParser implements ADQLParserConstants {
* @param factory The object to use to build an object representation
* of the given ADQL query.
*/
- public ADQLParser(java.io.Reader reader, ADQLQueryFactory factory){
+ public ADQLParser(java.io.Reader reader, ADQLQueryFactory factory) {
this(reader, null, factory);
}
@@ -290,7 +291,7 @@ public class ADQLParser implements ADQLParserConstants {
* @param factory The object to use to build an object representation
* of the given ADQL query.
*/
- public ADQLParser(ADQLParserTokenManager tm, QueryChecker checker, ADQLQueryFactory factory){
+ public ADQLParser(ADQLParserTokenManager tm, QueryChecker checker, ADQLQueryFactory factory) {
this(tm);
setDebug(false);
@@ -308,7 +309,7 @@ public class ADQLParser implements ADQLParserConstants {
* @param tm The manager which associates a token to a numeric code.
* @param checker The object to use to check each {@link ADQLQuery}.
*/
- public ADQLParser(ADQLParserTokenManager tm, QueryChecker checker){
+ public ADQLParser(ADQLParserTokenManager tm, QueryChecker checker) {
this(tm, checker, null);
}
@@ -319,43 +320,43 @@ public class ADQLParser implements ADQLParserConstants {
* @param factory The object to use to build an object representation of
* the given ADQL query.
*/
- public ADQLParser(ADQLParserTokenManager tm, ADQLQueryFactory factory){
+ public ADQLParser(ADQLParserTokenManager tm, ADQLQueryFactory factory) {
this(tm, null, factory);
}
/* ADDITIONAL GETTERS & SETTERS */
- public final void setDebug(boolean debug){
+ public final void setDebug(boolean debug) {
if (debug)
enable_tracing();
else
disable_tracing();
}
- public final QueryChecker getQueryChecker(){
+ public final QueryChecker getQueryChecker() {
return queryChecker;
}
- public final void setQueryChecker(QueryChecker checker){
+ public final void setQueryChecker(QueryChecker checker) {
queryChecker = checker;
}
- public final ADQLQueryFactory getQueryFactory(){
+ public final ADQLQueryFactory getQueryFactory() {
return queryFactory;
}
- public final void setQueryFactory(ADQLQueryFactory factory){
+ public final void setQueryFactory(ADQLQueryFactory factory) {
queryFactory = (factory != null) ? factory : (new ADQLQueryFactory());
}
/* EXCEPTION HELPER FUNCTION */
- private final ParseException generateParseException(Exception ex){
- if (!(ex instanceof ParseException)){
+ private final ParseException generateParseException(Exception ex) {
+ if (!(ex instanceof ParseException)) {
ParseException pex = new ParseException("[" + ex.getClass().getName() + "] " + ex.getMessage());
pex.setStackTrace(ex.getStackTrace());
return pex;
- }else
+ } else
return (ParseException)ex;
}
@@ -383,7 +384,7 @@ public class ADQLParser implements ADQLParserConstants {
*
* @since 1.5
*/
- public final boolean isRegularIdentifier(final String idCandidate){
+ public final boolean isRegularIdentifier(final String idCandidate) {
return idCandidate.matches("[a-zA-Z]+[a-zA-Z0-9_]*");
}
@@ -405,7 +406,7 @@ public class ADQLParser implements ADQLParserConstants {
*
* @since 1.5
*/
- public final void testRegularIdentifier(final Token token) throws ParseException{
+ public final void testRegularIdentifier(final Token token) throws ParseException {
if (!isRegularIdentifier(token.image))
throw new ParseException("Invalid ADQL regular identifier: \u005c"" + token.image + "\u005c"! If it aims to be a column/table name/alias, you should write it between double quotes.", new TextPosition(token));
}
@@ -420,12 +421,12 @@ public class ADQLParser implements ADQLParserConstants {
*
* @see ADQLParser#Query()
*/
- public final ADQLQuery parseQuery() throws ParseException{
+ public final ADQLQuery parseQuery() throws ParseException {
stackQuery.clear();
query = null;
- try{
+ try {
return Query();
- }catch(TokenMgrError tme){
+ } catch(TokenMgrError tme) {
throw new ParseException(tme);
}
}
@@ -443,13 +444,13 @@ public class ADQLParser implements ADQLParserConstants {
* @see ADQLParser#setDebug(boolean)
* @see ADQLParser#Query()
*/
- public final ADQLQuery parseQuery(String q) throws ParseException{
+ public final ADQLQuery parseQuery(String q) throws ParseException {
stackQuery.clear();
query = null;
ReInit(new java.io.ByteArrayInputStream(q.getBytes()));
- try{
+ try {
return Query();
- }catch(TokenMgrError tme){
+ } catch(TokenMgrError tme) {
throw new ParseException(tme);
}
}
@@ -467,13 +468,13 @@ public class ADQLParser implements ADQLParserConstants {
* @see ADQLParser#setDebug(boolean)
* @see ADQLParser#Query()
*/
- public final ADQLQuery parseQuery(java.io.InputStream stream) throws ParseException{
+ public final ADQLQuery parseQuery(java.io.InputStream stream) throws ParseException {
stackQuery.clear();
query = null;
ReInit(stream);
- try{
+ try {
return Query();
- }catch(TokenMgrError tme){
+ } catch(TokenMgrError tme) {
throw new ParseException(tme);
}
}
@@ -528,12 +529,12 @@ public class ADQLParser implements ADQLParserConstants {
*
* @since 1.5
*/
- public final String tryQuickFix(final java.io.InputStream input) throws java.io.IOException, ParseException{
+ public final String tryQuickFix(final java.io.InputStream input) throws java.io.IOException, ParseException {
// Fetch everything into a single string:
StringBuffer buf = new StringBuffer();
byte[] cBuf = new byte[1024];
int nbChar;
- while((nbChar = input.read(cBuf)) > -1){
+ while((nbChar = input.read(cBuf)) > -1) {
buf.append(new String(cBuf, 0, nbChar));
}
@@ -580,7 +581,7 @@ public class ADQLParser implements ADQLParserConstants {
*
* @since 1.5
*/
- public String tryQuickFix(String adqlQuery) throws ParseException{
+ public String tryQuickFix(String adqlQuery) throws ParseException {
StringBuffer suggestedQuery = new StringBuffer();
// 1. Replace all Unicode confusable characters:
@@ -595,40 +596,43 @@ public class ADQLParser implements ADQLParserConstants {
final String[] lines = adqlQuery.split(System.getProperty("line.separator"));
- try{
+ try {
String suggestedToken;
int lastLine = 1, lastCol = 1;
Token token = null, nextToken = parser.getNextToken();
// for all tokens until the EOF or EOQ:
- do{
+ do {
// get the next token:
token = nextToken;
nextToken = (isEnd(token) ? null : parser.getNextToken());
// 3. Double quote any suspect token:
- if (mustEscape(token, nextToken)){
+ if (mustEscape(token, nextToken)) {
suggestedToken = "\u005c"" + token.image + "\u005c"";
- }else
+ } else
suggestedToken = token.image;
/* 4. Append all space characters (and comments) before the
* token: */
/* same line, just get the space characters between the last
* token and the one to append: */
- if (lastLine == token.beginLine){
- suggestedQuery.append(lines[lastLine - 1].substring(lastCol - 1, token.beginColumn - (isEnd(token) ? 0 : 1)));
+ if (lastLine == token.beginLine) {
+ if (token.kind == ADQLParserConstants.EOF)
+ suggestedQuery.append(lines[lastLine - 1].substring(lastCol - 1));
+ else
+ suggestedQuery.append(lines[lastLine - 1].substring(lastCol - 1, token.beginColumn - (isEnd(token) ? 0 : 1)));
lastCol = token.endColumn + 1;
}
// not the same line...
- else{
+ else {
/* append all remaining space characters until the position
* of the token to append: */
- do{
+ do {
suggestedQuery.append(lines[lastLine - 1].substring(lastCol - 1)).append('\u005cn');
lastLine++;
lastCol = 1;
- }while(lastLine < token.beginLine);
+ } while(lastLine < token.beginLine);
/* if there are still space characters before the token,
* append them as well: */
if (lastCol < token.beginColumn)
@@ -640,9 +644,9 @@ public class ADQLParser implements ADQLParserConstants {
// 5. Append the suggested token:
suggestedQuery.append(suggestedToken);
- }while(!isEnd(token));
+ } while(!isEnd(token));
- }catch(TokenMgrError err){
+ } catch(TokenMgrError err) {
// wrap such errors and propagate them:
throw new ParseException(err);
}
@@ -697,7 +701,7 @@ public class ADQLParser implements ADQLParserConstants {
/** Regular expression matching all Unicode alternatives for <code>=</code>.
* @since 1.5 */
protected final static String REGEX_EQUAL = "[=\u1400\u2e40\u30a0\ua4ff]";
- static{
+ static {
REGEX_UNICODE_CONFUSABLES.put("-", REGEX_DASH);
REGEX_UNICODE_CONFUSABLES.put("_", REGEX_UNDERSCORE);
REGEX_UNICODE_CONFUSABLES.put("'", REGEX_QUOTE);
@@ -722,7 +726,7 @@ public class ADQLParser implements ADQLParserConstants {
*
* @since 1.5
*/
- protected String replaceUnicodeConfusables(final String adqlQuery){
+ protected String replaceUnicodeConfusables(final String adqlQuery) {
String newAdqlQuery = adqlQuery;
for(java.util.Map.Entry<String, String> confusable : REGEX_UNICODE_CONFUSABLES.entrySet())
newAdqlQuery = newAdqlQuery.replaceAll(confusable.getValue(), confusable.getKey());
@@ -739,7 +743,7 @@ public class ADQLParser implements ADQLParserConstants {
*
* @since 1.5
*/
- protected boolean isEnd(final Token token){
+ protected boolean isEnd(final Token token) {
return token.kind == ADQLParserConstants.EOF || token.kind == ADQLParserConstants.EOQ;
}
@@ -765,8 +769,8 @@ public class ADQLParser implements ADQLParserConstants {
*
* @since 1.5
*/
- protected boolean mustEscape(final Token token, final Token nextToken){
- switch(token.kind){
+ protected boolean mustEscape(final Token token, final Token nextToken) {
+ switch(token.kind) {
case ADQLParserConstants.SQL_RESERVED_WORD:
return true;
case ADQLParserConstants.REGULAR_IDENTIFIER_CANDIDATE:
@@ -786,8 +790,8 @@ public class ADQLParser implements ADQLParserConstants {
*
* @since 1.5
*/
- protected boolean isFunctionName(final Token token){
- switch(token.kind){
+ protected boolean isFunctionName(final Token token) {
+ switch(token.kind) {
case ADQLParserConstants.COUNT:
case ADQLParserConstants.EXISTS:
case ADQLParserConstants.AVG:
@@ -851,7 +855,7 @@ public class ADQLParser implements ADQLParserConstants {
* @throws Exception
*/
- public static final void main(String[] args) throws Exception{
+ public static final void main(String[] args) throws Exception {
final String USAGE = "Usage:\u005cn adqlParser.jar [-d] [-v] [-e] [-a|-s] [-f] [<FILE>|<URL>]\u005cn\u005cnNOTE: If no file or URL is given, the ADQL query is expected in the standard\u005cn input. This query must end with a ';' or <Ctrl+D>!\u005cn\u005cnParameters:\u005cn -v or --verbose : Print the main steps of the parsing\u005cn -d or --debug : Print stack traces when a grave error occurs\u005cn -e or --explain : Explain the ADQL parsing (or Expand the parsing tree)\u005cn -a or --adql : Display the understood ADQL query\u005cn -s or --sql : Ask the SQL translation of the given ADQL query\u005cn (SQL compatible with PostgreSQL)\u005cn -f or --try-fix : Try fixing the most common ADQL query issues before\u005cn attempting to parse the query.\u005cn\u005cnReturn:\u005cn By default: nothing if the query is correct. Otherwise a message explaining\u005cn why the query is not correct is displayed.\u005cn With the -s option, the SQL translation of the given ADQL query will be\u005cn returned.\u005cn With the -a option, the ADQL query is returned as it has been understood.\u005cn\u005cnExit status:\u005cn 0 OK !\u005cn 1 Parameter error (missing or incorrect parameter)\u005cn 2 File error (incorrect file/url, reading error, ...)\u005cn 3 Parsing error (syntactic or semantic error)\u005cn 4 Translation error (a problem has occurred during the translation of the\u005cn given ADQL query in SQL).";
ADQLParser parser;
@@ -863,47 +867,47 @@ public class ADQLParser implements ADQLParserConstants {
boolean verbose = false, debug = false, explain = false, tryFix = false;
// Parameters reading:
- for(int i = 0; i < args.length; i++){
+ for(int i = 0; i < args.length; i++) {
if (args[i].equalsIgnoreCase("-d") || args[i].equalsIgnoreCase("--debug"))
debug = true;
else if (args[i].equalsIgnoreCase("-v") || args[i].equalsIgnoreCase("--verbose"))
verbose = true;
else if (args[i].equalsIgnoreCase("-e") || args[i].equalsIgnoreCase("--explain"))
explain = true;
- else if (args[i].equalsIgnoreCase("-a") || args[i].equalsIgnoreCase("--adql")){
- if (mode != -1){
+ else if (args[i].equalsIgnoreCase("-a") || args[i].equalsIgnoreCase("--adql")) {
+ if (mode != -1) {
System.err.println("((!)) Too much parameter: you must choose between -s, -c, -a or nothing ((!))\u005cn" + USAGE);
System.exit(1);
- }else
+ } else
mode = 1;
- }else if (args[i].equalsIgnoreCase("-s") || args[i].equalsIgnoreCase("--sql")){
- if (mode != -1){
+ } else if (args[i].equalsIgnoreCase("-s") || args[i].equalsIgnoreCase("--sql")) {
+ if (mode != -1) {
System.err.println("((!)) Too much parameter: you must choose between -s, -c, -a or nothing ((!))\u005cn" + USAGE);
System.exit(1);
- }else
+ } else
mode = 2;
- }else if (args[i].equalsIgnoreCase("-f") || args[i].equalsIgnoreCase("--try-fix"))
+ } else if (args[i].equalsIgnoreCase("-f") || args[i].equalsIgnoreCase("--try-fix"))
tryFix = true;
- else if (args[i].equalsIgnoreCase("-h") || args[i].equalsIgnoreCase("--help")){
+ else if (args[i].equalsIgnoreCase("-h") || args[i].equalsIgnoreCase("--help")) {
System.out.println(USAGE);
System.exit(0);
- }else if (args[i].startsWith("-")){
+ } else if (args[i].startsWith("-")) {
System.err.println("((!)) Unknown parameter: \u005c"" + args[i] + "\u005c" ((!))\u005cn" + USAGE);
System.exit(1);
- }else
+ } else
file = args[i].trim();
}
- try{
+ try {
// Try fixing the query, if asked:
- if (tryFix){
+ if (tryFix) {
if (verbose)
System.out.println("((i)) Trying to automatically fix the query...");
String query;
java.io.InputStream in = null;
- try{
+ try {
// get the input stream...
if (file == null || file.length() == 0)
in = System.in;
@@ -914,7 +918,7 @@ public class ADQLParser implements ADQLParserConstants {
// ...and try fixing the query:
query = (new ADQLParser()).tryQuickFix(in);
- }finally{
+ } finally {
// close the stream (if opened):
if (in != null)
in.close();
@@ -928,7 +932,7 @@ public class ADQLParser implements ADQLParserConstants {
parser = new ADQLParser(new java.io.ByteArrayInputStream(query.getBytes()));
}
// Otherwise, take the query as provided:
- else{
+ else {
// Initialise the parser with the specified input:
if (file == null || file.length() == 0)
parser = new ADQLParser(System.in);
@@ -942,13 +946,13 @@ public class ADQLParser implements ADQLParserConstants {
parser.setDebug(explain);
// Query parsing:
- try{
+ try {
if (verbose)
System.out.print("((i)) Parsing ADQL query...");
ADQLQuery q = parser.parseQuery();
if (verbose)
System.out.println("((i)) CORRECT ADQL QUERY ((i))");
- if (mode == 2){
+ if (mode == 2) {
PostgreSQLTranslator translator = new PostgreSQLTranslator();
if (verbose)
System.out.print("((i)) Translating in SQL...");
@@ -956,22 +960,22 @@ public class ADQLParser implements ADQLParserConstants {
if (verbose)
System.out.println("ok");
System.out.println(sql);
- }else if (mode == 1){
+ } else if (mode == 1) {
System.out.println(q.toADQL());
}
- }catch(UnresolvedIdentifiersException uie){
+ } catch(UnresolvedIdentifiersException uie) {
System.err.println("((X)) " + uie.getNbErrors() + " unresolved identifiers:");
for(ParseException pe : uie)
System.err.println("\u005ct - at " + pe.getPosition() + ": " + uie.getMessage());
if (debug)
uie.printStackTrace(System.err);
System.exit(3);
- }catch(ParseException pe){
+ } catch(ParseException pe) {
System.err.println("((X)) Syntax error: " + pe.getMessage() + " ((X))");
if (debug)
pe.printStackTrace(System.err);
System.exit(3);
- }catch(TranslationException te){
+ } catch(TranslationException te) {
if (verbose)
System.out.println("error");
System.err.println("((X)) Translation error: " + te.getMessage() + " ((X))");
@@ -980,7 +984,7 @@ public class ADQLParser implements ADQLParserConstants {
System.exit(4);
}
- }catch(IOException ioe){
+ } catch(IOException ioe) {
System.err.println("\u005cn((X)) Error while reading the file \u005c"" + file + "\u005c": " + ioe.getMessage() + " ((X))");
if (debug)
ioe.printStackTrace(System.err);
@@ -1003,18 +1007,20 @@ public class ADQLParser implements ADQLParserConstants {
* @return The object representation of the query.
* @throws ParseException If the query syntax is incorrect.
*/
- final public ADQLQuery Query() throws ParseException{
+ final public ADQLQuery Query() throws ParseException {
trace_call("Query");
- try{
+ try {
ADQLQuery q = null;
q = QueryExpression();
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case 0:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case 0: {
jj_consume_token(0);
break;
- case EOQ:
+ }
+ case EOQ: {
jj_consume_token(EOQ);
break;
+ }
default:
jj_la1[0] = jj_gen;
jj_consume_token(-1);
@@ -1025,24 +1031,24 @@ public class ADQLParser implements ADQLParserConstants {
queryChecker.check(q);
{
- if (true)
+ if ("" != null)
return q;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("Query");
}
}
- final public ADQLQuery QueryExpression() throws ParseException{
+ final public ADQLQuery QueryExpression() throws ParseException {
trace_call("QueryExpression");
- try{
+ try {
TextPosition endPos = null;
- try{
+ try {
// create the query:
query = queryFactory.createQuery();
stackQuery.push(query);
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
@@ -1051,38 +1057,42 @@ public class ADQLParser implements ADQLParserConstants {
Select();
From();
endPos = query.getFrom().getPosition();
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case WHERE:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case WHERE: {
Where();
endPos = query.getWhere().getPosition();
break;
+ }
default:
jj_la1[1] = jj_gen;
;
}
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case GROUP:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case GROUP: {
GroupBy();
endPos = query.getGroupBy().getPosition();
break;
+ }
default:
jj_la1[2] = jj_gen;
;
}
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case HAVING:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case HAVING: {
Having();
endPos = query.getHaving().getPosition();
break;
+ }
default:
jj_la1[3] = jj_gen;
;
}
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case ORDER:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case ORDER: {
OrderBy();
endPos = query.getOrderBy().getPosition();
break;
+ }
default:
jj_la1[4] = jj_gen;
;
@@ -1098,18 +1108,18 @@ public class ADQLParser implements ADQLParserConstants {
query = stackQuery.peek();
{
- if (true)
+ if ("" != null)
return previousQuery;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("QueryExpression");
}
}
- final public ADQLQuery SubQueryExpression() throws ParseException{
+ final public ADQLQuery SubQueryExpression() throws ParseException {
trace_call("SubQueryExpression");
- try{
+ try {
ADQLQuery q = null;
Token start, end;
start = jj_consume_token(LEFT_PAR);
@@ -1117,55 +1127,58 @@ public class ADQLParser implements ADQLParserConstants {
end = jj_consume_token(RIGHT_PAR);
q.setPosition(new TextPosition(start, end));
{
- if (true)
+ if ("" != null)
return q;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("SubQueryExpression");
}
}
- final public void Select() throws ParseException{
+ final public void Select() throws ParseException {
trace_call("Select");
- try{
+ try {
ClauseSelect select = query.getSelect();
SelectItem item = null;
Token start, t = null;
start = jj_consume_token(SELECT);
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case QUANTIFIER:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case QUANTIFIER: {
t = jj_consume_token(QUANTIFIER);
select.setDistinctColumns(t.image.equalsIgnoreCase("DISTINCT"));
break;
+ }
default:
jj_la1[5] = jj_gen;
;
}
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case TOP:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case TOP: {
jj_consume_token(TOP);
t = jj_consume_token(UNSIGNED_INTEGER);
- try{
+ try {
select.setLimit(Integer.parseInt(t.image));
- }catch(NumberFormatException nfe){
+ } catch(NumberFormatException nfe) {
{
if (true)
throw new ParseException("[l." + t.beginLine + ";c." + t.beginColumn + "] The TOP limit (\u005c"" + t.image + "\u005c") isn't a regular unsigned integer !");
}
}
break;
+ }
default:
jj_la1[6] = jj_gen;
;
}
item = SelectItem();
select.add(item);
- label_1: while(true){
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case COMMA:
+ label_1: while(true) {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case COMMA: {
;
break;
+ }
default:
jj_la1[7] = jj_gen;
break label_1;
@@ -1176,73 +1189,77 @@ public class ADQLParser implements ADQLParserConstants {
}
TextPosition lastItemPos = query.getSelect().get(query.getSelect().size() - 1).getPosition();
select.setPosition(new TextPosition(start.beginLine, start.beginColumn, lastItemPos.endLine, lastItemPos.endColumn));
- }finally{
+ } finally {
trace_return("Select");
}
}
- final public SelectItem SelectItem() throws ParseException{
+ final public SelectItem SelectItem() throws ParseException {
trace_call("SelectItem");
- try{
+ try {
IdentifierItems identifiers = new IdentifierItems(true);
IdentifierItem id = null, label = null;
ADQLOperand op = null;
SelectItem item;
Token starToken;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case ASTERISK:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case ASTERISK: {
starToken = jj_consume_token(ASTERISK);
item = new SelectAllColumns(query);
- item.setPosition(new TextPosition(starToken));{
- if (true)
- return item;
- }
+ item.setPosition(new TextPosition(starToken));
+ {
+ if ("" != null)
+ return item;
+ }
break;
+ }
default:
jj_la1[12] = jj_gen;
- if (jj_2_1(7)){
+ if (jj_2_1(7)) {
id = Identifier();
jj_consume_token(DOT);
identifiers.append(id);
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
id = Identifier();
jj_consume_token(DOT);
identifiers.append(id);
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
id = Identifier();
jj_consume_token(DOT);
identifiers.append(id);
break;
+ }
default:
jj_la1[8] = jj_gen;
;
}
break;
+ }
default:
jj_la1[9] = jj_gen;
;
}
starToken = jj_consume_token(ASTERISK);
- try{
+ try {
item = new SelectAllColumns(queryFactory.createTable(identifiers, null));
TextPosition firstPos = identifiers.get(0).position;
item.setPosition(new TextPosition(firstPos.beginLine, firstPos.beginColumn, starToken.endLine, (starToken.endColumn < 0) ? -1 : (starToken.endColumn + 1)));
{
- if (true)
+ if ("" != null)
return item;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
- }else{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ } else {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case LEFT_PAR:
case PLUS:
case MINUS:
@@ -1292,27 +1309,30 @@ public class ADQLParser implements ADQLParserConstants {
case UNSIGNED_FLOAT:
case UNSIGNED_INTEGER:
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
op = ValueExpression();
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case AS:
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case AS:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case AS: {
jj_consume_token(AS);
break;
+ }
default:
jj_la1[10] = jj_gen;
;
}
label = Identifier();
break;
+ }
default:
jj_la1[11] = jj_gen;
;
}
break;
+ }
default:
jj_la1[13] = jj_gen;
jj_consume_token(-1);
@@ -1320,67 +1340,67 @@ public class ADQLParser implements ADQLParserConstants {
}
}
}
- try{
+ try {
item = queryFactory.createSelectItem(op, (label == null) ? null : label.identifier);
- if (label != null){
+ if (label != null) {
item.setCaseSensitive(label.caseSensitivity);
item.setPosition(new TextPosition(op.getPosition(), label.position));
- }else
+ } else
item.setPosition(new TextPosition(op.getPosition()));
{
- if (true)
+ if ("" != null)
return item;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("SelectItem");
}
}
- final public void From() throws ParseException{
+ final public void From() throws ParseException {
trace_call("From");
- try{
+ try {
FromContent content = null, content2 = null;
- try{
+ try {
jj_consume_token(FROM);
content = TableRef();
- label_2: while(true){
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case COMMA:
+ label_2: while(true) {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case COMMA: {
;
break;
+ }
default:
jj_la1[14] = jj_gen;
break label_2;
}
jj_consume_token(COMMA);
content2 = TableRef();
- TextPosition startPos = content.getPosition(),
- endPos = content2.getPosition();
+ TextPosition startPos = content.getPosition(), endPos = content2.getPosition();
content = queryFactory.createJoin(JoinType.CROSS, content, content2);
content.setPosition(new TextPosition(startPos, endPos));
}
query.setFrom(content);
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
- }finally{
+ } finally {
trace_return("From");
}
}
- final public void Where() throws ParseException{
+ final public void Where() throws ParseException {
trace_call("Where");
- try{
+ try {
ClauseConstraints where = query.getWhere();
ADQLConstraint condition;
Token start;
@@ -1388,14 +1408,14 @@ public class ADQLParser implements ADQLParserConstants {
ConditionsList(where);
TextPosition endPosition = where.getPosition();
where.setPosition(new TextPosition(start.beginLine, start.beginColumn, endPosition.endLine, endPosition.endColumn));
- }finally{
+ } finally {
trace_return("Where");
}
}
- final public void GroupBy() throws ParseException{
+ final public void GroupBy() throws ParseException {
trace_call("GroupBy");
- try{
+ try {
ClauseADQL<ADQLColumn> groupBy = query.getGroupBy();
ADQLColumn colRef = null;
Token start;
@@ -1403,11 +1423,12 @@ public class ADQLParser implements ADQLParserConstants {
jj_consume_token(BY);
colRef = Column();
groupBy.add(colRef);
- label_3: while(true){
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case COMMA:
+ label_3: while(true) {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case COMMA: {
;
break;
+ }
default:
jj_la1[15] = jj_gen;
break label_3;
@@ -1417,28 +1438,28 @@ public class ADQLParser implements ADQLParserConstants {
groupBy.add(colRef);
}
groupBy.setPosition(new TextPosition(start.beginLine, start.beginColumn, colRef.getPosition().endLine, colRef.getPosition().endColumn));
- }finally{
+ } finally {
trace_return("GroupBy");
}
}
- final public void Having() throws ParseException{
+ final public void Having() throws ParseException {
trace_call("Having");
- try{
+ try {
ClauseConstraints having = query.getHaving();
Token start;
start = jj_consume_token(HAVING);
ConditionsList(having);
TextPosition endPosition = having.getPosition();
having.setPosition(new TextPosition(start.beginLine, start.beginColumn, endPosition.endLine, endPosition.endColumn));
- }finally{
+ } finally {
trace_return("Having");
}
}
- final public void OrderBy() throws ParseException{
+ final public void OrderBy() throws ParseException {
trace_call("OrderBy");
- try{
+ try {
ClauseADQL<ADQLOrder> orderBy = query.getOrderBy();
ADQLOrder order = null;
Token start;
@@ -1446,11 +1467,12 @@ public class ADQLParser implements ADQLParserConstants {
jj_consume_token(BY);
order = OrderItem();
orderBy.add(order);
- label_4: while(true){
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case COMMA:
+ label_4: while(true) {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case COMMA: {
;
break;
+ }
default:
jj_la1[16] = jj_gen;
break label_4;
@@ -1460,7 +1482,7 @@ public class ADQLParser implements ADQLParserConstants {
orderBy.add(order);
}
orderBy.setPosition(new TextPosition(start, token));
- }finally{
+ } finally {
trace_return("OrderBy");
}
}
@@ -1468,31 +1490,35 @@ public class ADQLParser implements ADQLParserConstants {
/* *************************** */
/* COLUMN AND TABLE REFERENCES */
/* *************************** */
- final public IdentifierItem Identifier() throws ParseException{
+ final public IdentifierItem Identifier() throws ParseException {
trace_call("Identifier");
- try{
+ try {
Token t;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case REGULAR_IDENTIFIER_CANDIDATE:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case REGULAR_IDENTIFIER_CANDIDATE: {
t = jj_consume_token(REGULAR_IDENTIFIER_CANDIDATE);
- testRegularIdentifier(t);{
- if (true)
- return new IdentifierItem(t, false);
- }
+ testRegularIdentifier(t);
+ {
+ if ("" != null)
+ return new IdentifierItem(t, false);
+ }
break;
- case DELIMITED_IDENTIFIER:
- t = jj_consume_token(DELIMITED_IDENTIFIER);{
- if (true)
- return new IdentifierItem(t, true);
}
+ case DELIMITED_IDENTIFIER: {
+ t = jj_consume_token(DELIMITED_IDENTIFIER);
+ {
+ if ("" != null)
+ return new IdentifierItem(t, true);
+ }
break;
+ }
default:
jj_la1[17] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("Identifier");
}
}
@@ -1502,39 +1528,41 @@ public class ADQLParser implements ADQLParserConstants {
*
* @return A {@link IdentifierItems} which contains at most three items: catalogName, schemaName and tableName.
*/
- final public IdentifierItems TableName() throws ParseException{
+ final public IdentifierItems TableName() throws ParseException {
trace_call("TableName");
- try{
+ try {
IdentifierItems identifiers = new IdentifierItems(true);
IdentifierItem id = null;
id = Identifier();
identifiers.append(id);
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case DOT:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case DOT: {
jj_consume_token(DOT);
id = Identifier();
identifiers.append(id);
break;
+ }
default:
jj_la1[18] = jj_gen;
;
}
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case DOT:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case DOT: {
jj_consume_token(DOT);
id = Identifier();
identifiers.append(id);
break;
+ }
default:
jj_la1[19] = jj_gen;
;
}
{
- if (true)
+ if ("" != null)
return identifiers;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("TableName");
}
}
@@ -1544,149 +1572,156 @@ public class ADQLParser implements ADQLParserConstants {
*
* @return A {@link IdentifierItems} which contains at most four items: catalogName, schemaName, tableName and columnName.
*/
- final public IdentifierItems ColumnName() throws ParseException{
+ final public IdentifierItems ColumnName() throws ParseException {
trace_call("ColumnName");
- try{
+ try {
IdentifierItem id;
- IdentifierItems table = null,
- identifiers = new IdentifierItems(false);
+ IdentifierItems table = null, identifiers = new IdentifierItems(false);
id = Identifier();
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case DOT:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case DOT: {
jj_consume_token(DOT);
table = TableName();
break;
+ }
default:
jj_la1[20] = jj_gen;
;
}
identifiers.append(id);
- if (table != null){
+ if (table != null) {
for(int i = 0; i < table.size(); i++)
identifiers.append(table.get(i));
}
{
- if (true)
+ if ("" != null)
return identifiers;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("ColumnName");
}
}
- final public ADQLColumn Column() throws ParseException{
+ final public ADQLColumn Column() throws ParseException {
trace_call("Column");
- try{
+ try {
IdentifierItems identifiers;
identifiers = ColumnName();
- try{
+ try {
{
- if (true)
+ if ("" != null)
return queryFactory.createColumn(identifiers);
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("Column");
}
}
- final public ADQLOrder OrderItem() throws ParseException{
+ final public ADQLOrder OrderItem() throws ParseException {
trace_call("OrderItem");
- try{
+ try {
IdentifierItem identifier = null;
Token ind = null, desc = null;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
identifier = Identifier();
break;
- case UNSIGNED_INTEGER:
+ }
+ case UNSIGNED_INTEGER: {
ind = jj_consume_token(UNSIGNED_INTEGER);
break;
+ }
default:
jj_la1[21] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case ASC:
- case DESC:
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case ASC:
+ case DESC: {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case ASC: {
jj_consume_token(ASC);
break;
- case DESC:
+ }
+ case DESC: {
desc = jj_consume_token(DESC);
break;
+ }
default:
jj_la1[22] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
+ }
default:
jj_la1[23] = jj_gen;
;
}
- try{
+ try {
ADQLOrder order = null;
- if (identifier != null){
+ if (identifier != null) {
order = queryFactory.createOrder(identifier, desc != null);
order.setPosition(identifier.position);
- }else{
+ } else {
order = queryFactory.createOrder(Integer.parseInt(ind.image), desc != null);
order.setPosition(new TextPosition(ind));
}
{
- if (true)
+ if ("" != null)
return order;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("OrderItem");
}
}
- final public FromContent SimpleTableRef() throws ParseException{
+ final public FromContent SimpleTableRef() throws ParseException {
trace_call("SimpleTableRef");
- try{
+ try {
IdentifierItem alias = null;
IdentifierItems identifiers = null;
ADQLQuery subQuery = null;
FromContent content = null;
Token start, end;
- try{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ try {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
identifiers = TableName();
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case AS:
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case AS:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case AS: {
jj_consume_token(AS);
break;
+ }
default:
jj_la1[24] = jj_gen;
;
}
alias = Identifier();
break;
+ }
default:
jj_la1[25] = jj_gen;
;
@@ -1695,19 +1730,22 @@ public class ADQLParser implements ADQLParserConstants {
if (alias == null)
content.setPosition(new TextPosition(identifiers.get(0).position, identifiers.get(identifiers.size() - 1).position));
else
- content.setPosition(new TextPosition(identifiers.get(0).position, alias.position));{
- if (true)
- return content;
- }
+ content.setPosition(new TextPosition(identifiers.get(0).position, alias.position));
+ {
+ if ("" != null)
+ return content;
+ }
break;
+ }
default:
jj_la1[27] = jj_gen;
- if (jj_2_2(2)){
+ if (jj_2_2(2)) {
subQuery = SubQueryExpression();
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case AS:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case AS: {
jj_consume_token(AS);
break;
+ }
default:
jj_la1[26] = jj_gen;
;
@@ -1719,20 +1757,22 @@ public class ADQLParser implements ADQLParserConstants {
else
content.setPosition(new TextPosition(subQuery.getPosition(), alias.position));
{
- if (true)
+ if ("" != null)
return content;
}
- }else{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case LEFT_PAR:
+ } else {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case LEFT_PAR: {
start = jj_consume_token(LEFT_PAR);
content = JoinedTable();
end = jj_consume_token(RIGHT_PAR);
- content.setPosition(new TextPosition(start, end));{
- if (true)
- return content;
- }
+ content.setPosition(new TextPosition(start, end));
+ {
+ if ("" != null)
+ return content;
+ }
break;
+ }
default:
jj_la1[28] = jj_gen;
jj_consume_token(-1);
@@ -1740,75 +1780,76 @@ public class ADQLParser implements ADQLParserConstants {
}
}
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("SimpleTableRef");
}
}
- final public FromContent TableRef() throws ParseException{
+ final public FromContent TableRef() throws ParseException {
trace_call("TableRef");
- try{
+ try {
FromContent content;
content = SimpleTableRef();
- label_5: while(true){
- if (jj_2_3(2)){
+ label_5: while(true) {
+ if (jj_2_3(2)) {
;
- }else{
+ } else {
break label_5;
}
content = JoinSpecification(content);
}
{
- if (true)
+ if ("" != null)
return content;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("TableRef");
}
}
- final public FromContent JoinedTable() throws ParseException{
+ final public FromContent JoinedTable() throws ParseException {
trace_call("JoinedTable");
- try{
+ try {
FromContent content;
content = SimpleTableRef();
- label_6: while(true){
+ label_6: while(true) {
content = JoinSpecification(content);
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case NATURAL:
case INNER:
case RIGHT:
case LEFT:
case FULL:
- case JOIN:
+ case JOIN: {
;
break;
+ }
default:
jj_la1[29] = jj_gen;
break label_6;
}
}
{
- if (true)
+ if ("" != null)
return content;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("JoinedTable");
}
}
- final public ADQLJoin JoinSpecification(FromContent leftTable) throws ParseException{
+ final public ADQLJoin JoinSpecification(FromContent leftTable) throws ParseException {
trace_call("JoinSpecification");
- try{
+ try {
boolean natural = false;
JoinType type = JoinType.INNER;
ClauseConstraints condition = new ClauseConstraints("ON");
@@ -1817,56 +1858,63 @@ public class ADQLParser implements ADQLParserConstants {
FromContent rightTable;
ADQLJoin join;
Token lastPar;
- try{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case NATURAL:
+ try {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case NATURAL: {
jj_consume_token(NATURAL);
natural = true;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case INNER:
case RIGHT:
case LEFT:
- case FULL:
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case INNER:
+ case FULL: {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case INNER: {
jj_consume_token(INNER);
break;
+ }
case RIGHT:
case LEFT:
- case FULL:
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case LEFT:
+ case FULL: {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case LEFT: {
jj_consume_token(LEFT);
type = JoinType.OUTER_LEFT;
break;
- case RIGHT:
+ }
+ case RIGHT: {
jj_consume_token(RIGHT);
type = JoinType.OUTER_RIGHT;
break;
- case FULL:
+ }
+ case FULL: {
jj_consume_token(FULL);
type = JoinType.OUTER_FULL;
break;
+ }
default:
jj_la1[30] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case OUTER:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case OUTER: {
jj_consume_token(OUTER);
break;
+ }
default:
jj_la1[31] = jj_gen;
;
}
break;
+ }
default:
jj_la1[32] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
+ }
default:
jj_la1[33] = jj_gen;
;
@@ -1874,87 +1922,99 @@ public class ADQLParser implements ADQLParserConstants {
jj_consume_token(JOIN);
rightTable = SimpleTableRef();
join = queryFactory.createJoin(type, leftTable, rightTable);
- join.setPosition(new TextPosition(leftTable.getPosition(), rightTable.getPosition()));{
- if (true)
- return join;
- }
+ join.setPosition(new TextPosition(leftTable.getPosition(), rightTable.getPosition()));
+ {
+ if ("" != null)
+ return join;
+ }
break;
+ }
case INNER:
case RIGHT:
case LEFT:
case FULL:
- case JOIN:
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ case JOIN: {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case INNER:
case RIGHT:
case LEFT:
- case FULL:
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case INNER:
+ case FULL: {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case INNER: {
jj_consume_token(INNER);
break;
+ }
case RIGHT:
case LEFT:
- case FULL:
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case LEFT:
+ case FULL: {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case LEFT: {
jj_consume_token(LEFT);
type = JoinType.OUTER_LEFT;
break;
- case RIGHT:
+ }
+ case RIGHT: {
jj_consume_token(RIGHT);
type = JoinType.OUTER_RIGHT;
break;
- case FULL:
+ }
+ case FULL: {
jj_consume_token(FULL);
type = JoinType.OUTER_FULL;
break;
+ }
default:
jj_la1[34] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case OUTER:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case OUTER: {
jj_consume_token(OUTER);
break;
+ }
default:
jj_la1[35] = jj_gen;
;
}
break;
+ }
default:
jj_la1[36] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
+ }
default:
jj_la1[37] = jj_gen;
;
}
jj_consume_token(JOIN);
rightTable = SimpleTableRef();
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case ON:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case ON: {
jj_consume_token(ON);
ConditionsList(condition);
join = queryFactory.createJoin(type, leftTable, rightTable, condition);
- join.setPosition(new TextPosition(leftTable.getPosition(), condition.getPosition()));{
- if (true)
- return join;
- }
+ join.setPosition(new TextPosition(leftTable.getPosition(), condition.getPosition()));
+ {
+ if ("" != null)
+ return join;
+ }
break;
- case USING:
+ }
+ case USING: {
jj_consume_token(USING);
jj_consume_token(LEFT_PAR);
id = Identifier();
lstColumns.add(queryFactory.createColumn(id));
- label_7: while(true){
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case COMMA:
+ label_7: while(true) {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case COMMA: {
;
break;
+ }
default:
jj_la1[38] = jj_gen;
break label_7;
@@ -1965,30 +2025,33 @@ public class ADQLParser implements ADQLParserConstants {
}
lastPar = jj_consume_token(RIGHT_PAR);
join = queryFactory.createJoin(type, leftTable, rightTable, lstColumns);
- join.setPosition(new TextPosition(leftTable.getPosition().beginLine, leftTable.getPosition().beginColumn, lastPar.endLine, (lastPar.endColumn < 0) ? -1 : (lastPar.endColumn + 1)));{
- if (true)
- return join;
- }
+ join.setPosition(new TextPosition(leftTable.getPosition().beginLine, leftTable.getPosition().beginColumn, lastPar.endLine, (lastPar.endColumn < 0) ? -1 : (lastPar.endColumn + 1)));
+ {
+ if ("" != null)
+ return join;
+ }
break;
+ }
default:
jj_la1[39] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
+ }
default:
jj_la1[40] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("JoinSpecification");
}
}
@@ -1996,41 +2059,42 @@ public class ADQLParser implements ADQLParserConstants {
/* ****** */
/* STRING */
/* ****** */
- final public StringConstant String() throws ParseException{
+ final public StringConstant String() throws ParseException {
trace_call("String");
- try{
+ try {
Token t, start = null;
String str = "";
StringConstant cst;
- label_8: while(true){
+ label_8: while(true) {
t = jj_consume_token(STRING_LITERAL);
str += t.image.substring(1, t.image.length() - 1).replaceAll("''", "'");
if (start == null)
start = t;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case STRING_LITERAL:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case STRING_LITERAL: {
;
break;
+ }
default:
jj_la1[41] = jj_gen;
break label_8;
}
}
- try{
+ try {
cst = queryFactory.createStringConstant(str);
cst.setPosition(new TextPosition(start, t));
{
- if (true)
+ if ("" != null)
return cst;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("String");
}
}
@@ -2038,127 +2102,135 @@ public class ADQLParser implements ADQLParserConstants {
/* ************* */
/* NUMERIC TYPES */
/* ************* */
- final public NumericConstant UnsignedNumeric() throws ParseException{
+ final public NumericConstant UnsignedNumeric() throws ParseException {
trace_call("UnsignedNumeric");
- try{
+ try {
Token t;
NumericConstant cst;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case SCIENTIFIC_NUMBER:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case SCIENTIFIC_NUMBER: {
t = jj_consume_token(SCIENTIFIC_NUMBER);
break;
- case UNSIGNED_FLOAT:
+ }
+ case UNSIGNED_FLOAT: {
t = jj_consume_token(UNSIGNED_FLOAT);
break;
- case UNSIGNED_INTEGER:
+ }
+ case UNSIGNED_INTEGER: {
t = jj_consume_token(UNSIGNED_INTEGER);
break;
+ }
default:
jj_la1[42] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- try{
+ try {
cst = queryFactory.createNumericConstant(t.image);
cst.setPosition(new TextPosition(t));
{
- if (true)
+ if ("" != null)
return cst;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("UnsignedNumeric");
}
}
- final public NumericConstant UnsignedFloat() throws ParseException{
+ final public NumericConstant UnsignedFloat() throws ParseException {
trace_call("UnsignedFloat");
- try{
+ try {
Token t;
NumericConstant cst;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case UNSIGNED_INTEGER:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case UNSIGNED_INTEGER: {
t = jj_consume_token(UNSIGNED_INTEGER);
break;
- case UNSIGNED_FLOAT:
+ }
+ case UNSIGNED_FLOAT: {
t = jj_consume_token(UNSIGNED_FLOAT);
break;
+ }
default:
jj_la1[43] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- try{
+ try {
cst = queryFactory.createNumericConstant(t.image);
cst.setPosition(new TextPosition(t));
{
- if (true)
+ if ("" != null)
return cst;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("UnsignedFloat");
}
}
- final public NumericConstant SignedInteger() throws ParseException{
+ final public NumericConstant SignedInteger() throws ParseException {
trace_call("SignedInteger");
- try{
+ try {
Token sign = null, number;
NumericConstant cst;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case PLUS:
- case MINUS:
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case PLUS:
+ case MINUS: {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case PLUS: {
sign = jj_consume_token(PLUS);
break;
- case MINUS:
+ }
+ case MINUS: {
sign = jj_consume_token(MINUS);
break;
+ }
default:
jj_la1[44] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
+ }
default:
jj_la1[45] = jj_gen;
;
}
number = jj_consume_token(UNSIGNED_INTEGER);
- try{
- if (sign == null){
+ try {
+ if (sign == null) {
cst = queryFactory.createNumericConstant(number.image);
cst.setPosition(new TextPosition(number));
- }else{
+ } else {
cst = queryFactory.createNumericConstant(sign.image + number.image);
cst.setPosition(new TextPosition(sign, number));
}
{
- if (true)
+ if ("" != null)
return cst;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("SignedInteger");
}
}
@@ -2166,169 +2238,188 @@ public class ADQLParser implements ADQLParserConstants {
/* *********** */
/* EXPRESSIONS */
/* *********** */
- final public ADQLOperand NumericValueExpressionPrimary() throws ParseException{
+ final public ADQLOperand NumericValueExpressionPrimary() throws ParseException {
trace_call("NumericValueExpressionPrimary");
- try{
+ try {
ADQLColumn column;
ADQLOperand op;
Token left, right;
- try{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ try {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case SCIENTIFIC_NUMBER:
case UNSIGNED_FLOAT:
- case UNSIGNED_INTEGER:
+ case UNSIGNED_INTEGER: {
// unsigned_value_specification
- op = UnsignedNumeric();{
- if (true)
- return op;
- }
+ op = UnsignedNumeric();
+ {
+ if ("" != null)
+ return op;
+ }
break;
+ }
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
column = Column();
- column.setExpectedType('N');{
- if (true)
- return column;
- }
+ column.setExpectedType('N');
+ {
+ if ("" != null)
+ return column;
+ }
break;
+ }
case AVG:
case MAX:
case MIN:
case SUM:
- case COUNT:
- op = SqlFunction();{
- if (true)
- return op;
- }
+ case COUNT: {
+ op = SqlFunction();
+ {
+ if ("" != null)
+ return op;
+ }
break;
- case LEFT_PAR:
+ }
+ case LEFT_PAR: {
left = jj_consume_token(LEFT_PAR);
op = NumericExpression();
right = jj_consume_token(RIGHT_PAR);
WrappedOperand wop = queryFactory.createWrappedOperand(op);
- wop.setPosition(new TextPosition(left, right));{
- if (true)
- return wop;
- }
+ wop.setPosition(new TextPosition(left, right));
+ {
+ if ("" != null)
+ return wop;
+ }
break;
+ }
default:
jj_la1[46] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("NumericValueExpressionPrimary");
}
}
- final public ADQLOperand StringValueExpressionPrimary() throws ParseException{
+ final public ADQLOperand StringValueExpressionPrimary() throws ParseException {
trace_call("StringValueExpressionPrimary");
- try{
+ try {
StringConstant expr;
ADQLColumn column;
ADQLOperand op;
Token left, right;
- try{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case STRING_LITERAL:
+ try {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case STRING_LITERAL: {
// string
- expr = String();{
- if (true)
- return expr;
- }
+ expr = String();
+ {
+ if ("" != null)
+ return expr;
+ }
break;
+ }
case SCIENTIFIC_NUMBER:
case UNSIGNED_FLOAT:
- case UNSIGNED_INTEGER:
- op = UnsignedNumeric();{
- if (true)
- return op;
- }
+ case UNSIGNED_INTEGER: {
+ op = UnsignedNumeric();
+ {
+ if ("" != null)
+ return op;
+ }
break;
+ }
case AVG:
case MAX:
case MIN:
case SUM:
- case COUNT:
- op = SqlFunction();{
- if (true)
- return op;
- }
+ case COUNT: {
+ op = SqlFunction();
+ {
+ if ("" != null)
+ return op;
+ }
break;
+ }
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
column = Column();
- column.setExpectedType('*');{
- if (true)
- return column;
- }
+ column.setExpectedType('*');
+ {
+ if ("" != null)
+ return column;
+ }
break;
- case LEFT_PAR:
+ }
+ case LEFT_PAR: {
left = jj_consume_token(LEFT_PAR);
op = ValueExpression();
right = jj_consume_token(RIGHT_PAR);
WrappedOperand wop = queryFactory.createWrappedOperand(op);
- wop.setPosition(new TextPosition(left, right));{
- if (true)
- return wop;
- }
+ wop.setPosition(new TextPosition(left, right));
+ {
+ if ("" != null)
+ return wop;
+ }
break;
+ }
default:
jj_la1[47] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("StringValueExpressionPrimary");
}
}
- final public ADQLOperand ValueExpression() throws ParseException{
+ final public ADQLOperand ValueExpression() throws ParseException {
trace_call("ValueExpression");
- try{
+ try {
ADQLOperand valueExpr = null;
Token left, right;
- try{
- if (jj_2_4(2147483647)){
+ try {
+ if (jj_2_4(2147483647)) {
valueExpr = NumericExpression();
- }else if (jj_2_5(2147483647)){
+ } else if (jj_2_5(2147483647)) {
valueExpr = StringExpression();
- }else if (jj_2_6(2147483647)){
+ } else if (jj_2_6(2147483647)) {
left = jj_consume_token(LEFT_PAR);
valueExpr = ValueExpression();
right = jj_consume_token(RIGHT_PAR);
valueExpr = queryFactory.createWrappedOperand(valueExpr);
((WrappedOperand)valueExpr).setPosition(new TextPosition(left, right));
- }else if (jj_2_7(2147483647)){
+ } else if (jj_2_7(2147483647)) {
valueExpr = UserDefinedFunction();
- }else if (jj_2_8(2)){
+ } else if (jj_2_8(2)) {
valueExpr = GeometryValueFunction();
- }else if (jj_2_9(2147483647)){
+ } else if (jj_2_9(2147483647)) {
valueExpr = Column();
- }else if (jj_2_10(2147483647)){
+ } else if (jj_2_10(2147483647)) {
valueExpr = StringFactor();
- }else if (jj_2_11(3)){
+ } else if (jj_2_11(3)) {
valueExpr = Factor();
- }else{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ } else {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
valueExpr = Column();
break;
+ }
default:
jj_la1[48] = jj_gen;
jj_consume_token(-1);
@@ -2336,37 +2427,39 @@ public class ADQLParser implements ADQLParserConstants {
}
}
{
- if (true)
+ if ("" != null)
return valueExpr;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("ValueExpression");
}
}
- final public ADQLOperand NumericExpression() throws ParseException{
+ final public ADQLOperand NumericExpression() throws ParseException {
trace_call("NumericExpression");
- try{
+ try {
Token sign = null;
ADQLOperand leftOp, rightOp = null;
leftOp = NumericTerm();
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case PLUS:
- case MINUS:
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case PLUS:
+ case MINUS: {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case PLUS: {
sign = jj_consume_token(PLUS);
break;
- case MINUS:
+ }
+ case MINUS: {
sign = jj_consume_token(MINUS);
break;
+ }
default:
jj_la1[49] = jj_gen;
jj_consume_token(-1);
@@ -2374,22 +2467,23 @@ public class ADQLParser implements ADQLParserConstants {
}
rightOp = NumericExpression();
break;
+ }
default:
jj_la1[50] = jj_gen;
;
}
- if (sign == null){
- if (true)
+ if (sign == null) {
+ if ("" != null)
return leftOp;
- }else{
- try{
+ } else {
+ try {
Operation operation = queryFactory.createOperation(leftOp, OperationType.getOperator(sign.image), rightOp);
operation.setPosition(new TextPosition(leftOp.getPosition(), rightOp.getPosition()));
{
- if (true)
+ if ("" != null)
return operation;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
@@ -2397,27 +2491,29 @@ public class ADQLParser implements ADQLParserConstants {
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("NumericExpression");
}
}
- final public ADQLOperand NumericTerm() throws ParseException{
+ final public ADQLOperand NumericTerm() throws ParseException {
trace_call("NumericTerm");
- try{
+ try {
Token sign = null;
ADQLOperand leftOp, rightOp = null;
leftOp = Factor();
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case ASTERISK:
- case DIVIDE:
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case ASTERISK:
+ case DIVIDE: {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case ASTERISK: {
sign = jj_consume_token(ASTERISK);
break;
- case DIVIDE:
+ }
+ case DIVIDE: {
sign = jj_consume_token(DIVIDE);
break;
+ }
default:
jj_la1[51] = jj_gen;
jj_consume_token(-1);
@@ -2425,22 +2521,23 @@ public class ADQLParser implements ADQLParserConstants {
}
rightOp = NumericTerm();
break;
+ }
default:
jj_la1[52] = jj_gen;
;
}
- if (sign == null){
- if (true)
+ if (sign == null) {
+ if ("" != null)
return leftOp;
- }else{
- try{
+ } else {
+ try {
Operation operation = queryFactory.createOperation(leftOp, OperationType.getOperator(sign.image), rightOp);
operation.setPosition(new TextPosition(leftOp.getPosition(), rightOp.getPosition()));
{
- if (true)
+ if ("" != null)
return operation;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
@@ -2448,42 +2545,45 @@ public class ADQLParser implements ADQLParserConstants {
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("NumericTerm");
}
}
- final public ADQLOperand Factor() throws ParseException{
+ final public ADQLOperand Factor() throws ParseException {
trace_call("Factor");
- try{
+ try {
boolean negative = false;
Token minusSign = null;
ADQLOperand op;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case PLUS:
- case MINUS:
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case PLUS:
+ case MINUS: {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case PLUS: {
jj_consume_token(PLUS);
break;
- case MINUS:
+ }
+ case MINUS: {
minusSign = jj_consume_token(MINUS);
negative = true;
break;
+ }
default:
jj_la1[53] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
+ }
default:
jj_la1[54] = jj_gen;
;
}
- if (jj_2_12(2)){
+ if (jj_2_12(2)) {
op = NumericFunction();
- }else{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ } else {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case LEFT_PAR:
case AVG:
case MAX:
@@ -2494,17 +2594,18 @@ public class ADQLParser implements ADQLParserConstants {
case UNSIGNED_FLOAT:
case UNSIGNED_INTEGER:
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
op = NumericValueExpressionPrimary();
break;
+ }
default:
jj_la1[55] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
}
- if (negative){
- try{
+ if (negative) {
+ try {
TextPosition position = op.getPosition();
op = queryFactory.createNegativeOperand(op);
NegativeOperand negativeOp = (NegativeOperand)op;
@@ -2512,7 +2613,7 @@ public class ADQLParser implements ADQLParserConstants {
negativeOp.setPosition(new TextPosition(minusSign.beginLine, minusSign.beginColumn, position.endLine, position.endColumn));
else
negativeOp.setPosition(position);
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
@@ -2521,38 +2622,39 @@ public class ADQLParser implements ADQLParserConstants {
}
{
- if (true)
+ if ("" != null)
return op;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("Factor");
}
}
- final public ADQLOperand StringExpression() throws ParseException{
+ final public ADQLOperand StringExpression() throws ParseException {
trace_call("StringExpression");
- try{
+ try {
ADQLOperand leftOp;
ADQLOperand rightOp = null;
leftOp = StringFactor();
- label_9: while(true){
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case CONCAT:
+ label_9: while(true) {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case CONCAT: {
;
break;
+ }
default:
jj_la1[56] = jj_gen;
break label_9;
}
jj_consume_token(CONCAT);
rightOp = StringFactor();
- if (!(leftOp instanceof Concatenation)){
- try{
+ if (!(leftOp instanceof Concatenation)) {
+ try {
ADQLOperand temp = leftOp;
leftOp = queryFactory.createConcatenation();
((Concatenation)leftOp).add(temp);
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
@@ -2561,35 +2663,36 @@ public class ADQLParser implements ADQLParserConstants {
}
((Concatenation)leftOp).add(rightOp);
}
- if (leftOp instanceof Concatenation){
+ if (leftOp instanceof Concatenation) {
Concatenation concat = (Concatenation)leftOp;
concat.setPosition(new TextPosition(concat.get(0).getPosition(), concat.get(concat.size() - 1).getPosition()));
}
{
- if (true)
+ if ("" != null)
return leftOp;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("StringExpression");
}
}
- final public ADQLOperand StringFactor() throws ParseException{
+ final public ADQLOperand StringFactor() throws ParseException {
trace_call("StringFactor");
- try{
+ try {
ADQLOperand op;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case COORDSYS:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case COORDSYS: {
op = ExtractCoordSys();
break;
+ }
default:
jj_la1[57] = jj_gen;
- if (jj_2_13(2)){
+ if (jj_2_13(2)) {
op = UserDefinedFunction();
((UserDefinedFunction)op).setExpectedType('S');
- }else{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ } else {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case LEFT_PAR:
case AVG:
case MAX:
@@ -2601,9 +2704,10 @@ public class ADQLParser implements ADQLParserConstants {
case UNSIGNED_FLOAT:
case UNSIGNED_INTEGER:
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
op = StringValueExpressionPrimary();
break;
+ }
default:
jj_la1[58] = jj_gen;
jj_consume_token(-1);
@@ -2612,50 +2716,52 @@ public class ADQLParser implements ADQLParserConstants {
}
}
{
- if (true)
+ if ("" != null)
return op;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("StringFactor");
}
}
- final public GeometryValue<GeometryFunction> GeometryExpression() throws ParseException{
+ final public GeometryValue<GeometryFunction> GeometryExpression() throws ParseException {
trace_call("GeometryExpression");
- try{
+ try {
ADQLColumn col = null;
GeometryFunction gf = null;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
col = Column();
break;
+ }
case BOX:
case CENTROID:
case CIRCLE:
case POINT:
case POLYGON:
- case REGION:
+ case REGION: {
gf = GeometryValueFunction();
break;
+ }
default:
jj_la1[59] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- if (col != null){
+ if (col != null) {
col.setExpectedType('G');
{
- if (true)
+ if ("" != null)
return new GeometryValue<GeometryFunction>(col);
}
- }else{
- if (true)
+ } else {
+ if ("" != null)
return new GeometryValue<GeometryFunction>(gf);
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("GeometryExpression");
}
}
@@ -2663,24 +2769,25 @@ public class ADQLParser implements ADQLParserConstants {
/* ********************************** */
/* BOOLEAN EXPRESSIONS (WHERE clause) */
/* ********************************** */
- final public ClauseConstraints ConditionsList(ClauseConstraints clause) throws ParseException{
+ final public ClauseConstraints ConditionsList(ClauseConstraints clause) throws ParseException {
trace_call("ConditionsList");
- try{
+ try {
ADQLConstraint constraint = null;
Token op = null;
boolean notOp = false;
- try{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case NOT:
+ try {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case NOT: {
op = jj_consume_token(NOT);
notOp = true;
break;
+ }
default:
jj_la1[60] = jj_gen;
;
}
constraint = Constraint();
- if (notOp){
+ if (notOp) {
TextPosition oldPos = constraint.getPosition();
constraint = queryFactory.createNot(constraint);
((NotConstraint)constraint).setPosition(new TextPosition(op.beginLine, op.beginColumn, oldPos.endLine, oldPos.endColumn));
@@ -2691,39 +2798,43 @@ public class ADQLParser implements ADQLParserConstants {
clause.add(constraint);
else
clause.add(constraint);
- label_10: while(true){
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ label_10: while(true) {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case AND:
- case OR:
+ case OR: {
;
break;
+ }
default:
jj_la1[61] = jj_gen;
break label_10;
}
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case AND:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case AND: {
op = jj_consume_token(AND);
break;
- case OR:
+ }
+ case OR: {
op = jj_consume_token(OR);
break;
+ }
default:
jj_la1[62] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case NOT:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case NOT: {
jj_consume_token(NOT);
notOp = true;
break;
+ }
default:
jj_la1[63] = jj_gen;
;
}
constraint = Constraint();
- if (notOp){
+ if (notOp) {
TextPosition oldPos = constraint.getPosition();
constraint = queryFactory.createNot(constraint);
((NotConstraint)constraint).setPosition(new TextPosition(op.beginLine, op.beginColumn, oldPos.endLine, oldPos.endColumn));
@@ -2735,41 +2846,41 @@ public class ADQLParser implements ADQLParserConstants {
else
clause.add(op.image, constraint);
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
- if (!clause.isEmpty()){
+ if (!clause.isEmpty()) {
TextPosition start = clause.get(0).getPosition();
TextPosition end = clause.get(clause.size() - 1).getPosition();
clause.setPosition(new TextPosition(start, end));
}
{
- if (true)
+ if ("" != null)
return clause;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("ConditionsList");
}
}
- final public ADQLConstraint Constraint() throws ParseException{
+ final public ADQLConstraint Constraint() throws ParseException {
trace_call("Constraint");
- try{
+ try {
ADQLConstraint constraint = null;
Token start, end;
- if (jj_2_14(2147483647)){
+ if (jj_2_14(2147483647)) {
constraint = Predicate();
- }else{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case LEFT_PAR:
+ } else {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case LEFT_PAR: {
start = jj_consume_token(LEFT_PAR);
- try{
+ try {
constraint = queryFactory.createGroupOfConstraints();
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
@@ -2779,6 +2890,7 @@ public class ADQLParser implements ADQLParserConstants {
end = jj_consume_token(RIGHT_PAR);
((ConstraintsGroup)constraint).setPosition(new TextPosition(start, end));
break;
+ }
default:
jj_la1[64] = jj_gen;
jj_consume_token(-1);
@@ -2786,44 +2898,47 @@ public class ADQLParser implements ADQLParserConstants {
}
}
{
- if (true)
+ if ("" != null)
return constraint;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("Constraint");
}
}
- final public ADQLConstraint Predicate() throws ParseException{
+ final public ADQLConstraint Predicate() throws ParseException {
trace_call("Predicate");
- try{
+ try {
ADQLQuery q = null;
ADQLColumn column = null;
ADQLOperand strExpr1 = null, strExpr2 = null;
ADQLOperand op;
Token start, notToken = null, end;
ADQLConstraint constraint = null;
- try{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case EXISTS:
+ try {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case EXISTS: {
start = jj_consume_token(EXISTS);
q = SubQueryExpression();
Exists e = queryFactory.createExists(q);
- e.setPosition(new TextPosition(start.beginLine, start.beginColumn, q.getPosition().endLine, q.getPosition().endColumn));{
- if (true)
- return e;
- }
+ e.setPosition(new TextPosition(start.beginLine, start.beginColumn, q.getPosition().endLine, q.getPosition().endColumn));
+ {
+ if ("" != null)
+ return e;
+ }
break;
+ }
default:
jj_la1[69] = jj_gen;
- if (jj_2_16(2147483647)){
+ if (jj_2_16(2147483647)) {
column = Column();
jj_consume_token(IS);
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case NOT:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case NOT: {
notToken = jj_consume_token(NOT);
break;
+ }
default:
jj_la1[65] = jj_gen;
;
@@ -2832,15 +2947,16 @@ public class ADQLParser implements ADQLParserConstants {
IsNull in = queryFactory.createIsNull((notToken != null), column);
in.setPosition(new TextPosition(column.getPosition().beginLine, column.getPosition().beginColumn, end.endLine, (end.endColumn < 0) ? -1 : (end.endColumn + 1)));
{
- if (true)
+ if ("" != null)
return in;
}
- }else if (jj_2_17(2147483647)){
+ } else if (jj_2_17(2147483647)) {
strExpr1 = StringExpression();
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case NOT:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case NOT: {
notToken = jj_consume_token(NOT);
break;
+ }
default:
jj_la1[66] = jj_gen;
;
@@ -2850,11 +2966,11 @@ public class ADQLParser implements ADQLParserConstants {
Comparison comp = queryFactory.createComparison(strExpr1, (notToken == null) ? ComparisonOperator.LIKE : ComparisonOperator.NOTLIKE, strExpr2);
comp.setPosition(new TextPosition(strExpr1.getPosition(), strExpr2.getPosition()));
{
- if (true)
+ if ("" != null)
return comp;
}
- }else{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ } else {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case LEFT_PAR:
case PLUS:
case MINUS:
@@ -2904,27 +3020,29 @@ public class ADQLParser implements ADQLParserConstants {
case UNSIGNED_FLOAT:
case UNSIGNED_INTEGER:
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
op = ValueExpression();
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case EQUAL:
case NOT_EQUAL:
case LESS_THAN:
case LESS_EQUAL_THAN:
case GREATER_THAN:
- case GREATER_EQUAL_THAN:
+ case GREATER_EQUAL_THAN: {
constraint = ComparisonEnd(op);
break;
+ }
default:
jj_la1[67] = jj_gen;
- if (jj_2_15(2)){
+ if (jj_2_15(2)) {
constraint = BetweenEnd(op);
- }else{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ } else {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case NOT:
- case IN:
+ case IN: {
constraint = InEnd(op);
break;
+ }
default:
jj_la1[68] = jj_gen;
jj_consume_token(-1);
@@ -2933,6 +3051,7 @@ public class ADQLParser implements ADQLParserConstants {
}
}
break;
+ }
default:
jj_la1[70] = jj_gen;
jj_consume_token(-1);
@@ -2940,80 +3059,87 @@ public class ADQLParser implements ADQLParserConstants {
}
}
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
{
- if (true)
+ if ("" != null)
return constraint;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("Predicate");
}
}
- final public Comparison ComparisonEnd(ADQLOperand leftOp) throws ParseException{
+ final public Comparison ComparisonEnd(ADQLOperand leftOp) throws ParseException {
trace_call("ComparisonEnd");
- try{
+ try {
Token comp;
ADQLOperand rightOp;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case EQUAL:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case EQUAL: {
comp = jj_consume_token(EQUAL);
break;
- case NOT_EQUAL:
+ }
+ case NOT_EQUAL: {
comp = jj_consume_token(NOT_EQUAL);
break;
- case LESS_THAN:
+ }
+ case LESS_THAN: {
comp = jj_consume_token(LESS_THAN);
break;
- case LESS_EQUAL_THAN:
+ }
+ case LESS_EQUAL_THAN: {
comp = jj_consume_token(LESS_EQUAL_THAN);
break;
- case GREATER_THAN:
+ }
+ case GREATER_THAN: {
comp = jj_consume_token(GREATER_THAN);
break;
- case GREATER_EQUAL_THAN:
+ }
+ case GREATER_EQUAL_THAN: {
comp = jj_consume_token(GREATER_EQUAL_THAN);
break;
+ }
default:
jj_la1[71] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
rightOp = ValueExpression();
- try{
+ try {
Comparison comparison = queryFactory.createComparison(leftOp, ComparisonOperator.getOperator(comp.image), rightOp);
comparison.setPosition(new TextPosition(leftOp.getPosition(), rightOp.getPosition()));
{
- if (true)
+ if ("" != null)
return comparison;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("ComparisonEnd");
}
}
- final public Between BetweenEnd(ADQLOperand leftOp) throws ParseException{
+ final public Between BetweenEnd(ADQLOperand leftOp) throws ParseException {
trace_call("BetweenEnd");
- try{
+ try {
Token start, notToken = null;
ADQLOperand min, max;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case NOT:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case NOT: {
notToken = jj_consume_token(NOT);
break;
+ }
default:
jj_la1[72] = jj_gen;
;
@@ -3022,56 +3148,58 @@ public class ADQLParser implements ADQLParserConstants {
min = ValueExpression();
jj_consume_token(AND);
max = ValueExpression();
- try{
+ try {
Between bet = queryFactory.createBetween((notToken != null), leftOp, min, max);
if (notToken != null)
start = notToken;
bet.setPosition(new TextPosition(start.beginLine, start.beginColumn, max.getPosition().endLine, max.getPosition().endColumn));
{
- if (true)
+ if ("" != null)
return bet;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("BetweenEnd");
}
}
- final public In InEnd(ADQLOperand leftOp) throws ParseException{
+ final public In InEnd(ADQLOperand leftOp) throws ParseException {
trace_call("InEnd");
- try{
+ try {
Token not = null, start;
ADQLQuery q = null;
ADQLOperand item;
Vector<ADQLOperand> items = new Vector<ADQLOperand>();
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case NOT:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case NOT: {
not = jj_consume_token(NOT);
break;
+ }
default:
jj_la1[73] = jj_gen;
;
}
start = jj_consume_token(IN);
- if (jj_2_18(2)){
+ if (jj_2_18(2)) {
q = SubQueryExpression();
- }else{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case LEFT_PAR:
+ } else {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case LEFT_PAR: {
jj_consume_token(LEFT_PAR);
item = ValueExpression();
items.add(item);
- label_11: while(true){
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case COMMA:
+ label_11: while(true) {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case COMMA: {
;
break;
+ }
default:
jj_la1[74] = jj_gen;
break label_11;
@@ -3082,19 +3210,20 @@ public class ADQLParser implements ADQLParserConstants {
}
jj_consume_token(RIGHT_PAR);
break;
+ }
default:
jj_la1[75] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
}
- try{
+ try {
In in;
start = (not != null) ? not : start;
- if (q != null){
+ if (q != null) {
in = queryFactory.createIn(leftOp, q, not != null);
in.setPosition(new TextPosition(start.beginLine, start.beginColumn, q.getPosition().endLine, q.getPosition().endColumn));
- }else{
+ } else {
ADQLOperand[] list = new ADQLOperand[items.size()];
int i = 0;
for(ADQLOperand op : items)
@@ -3103,17 +3232,17 @@ public class ADQLParser implements ADQLParserConstants {
in.setPosition(new TextPosition(start.beginLine, start.beginColumn, list[list.length - 1].getPosition().endLine, list[list.length - 1].getPosition().endColumn));
}
{
- if (true)
+ if ("" != null)
return in;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("InEnd");
}
}
@@ -3121,29 +3250,31 @@ public class ADQLParser implements ADQLParserConstants {
/* ************* */
/* SQL FUNCTIONS */
/* ************* */
- final public SQLFunction SqlFunction() throws ParseException{
+ final public SQLFunction SqlFunction() throws ParseException {
trace_call("SqlFunction");
- try{
+ try {
Token fct, all = null, distinct = null, end;
ADQLOperand op = null;
SQLFunction funct = null;
- try{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case COUNT:
+ try {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case COUNT: {
fct = jj_consume_token(COUNT);
jj_consume_token(LEFT_PAR);
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case QUANTIFIER:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case QUANTIFIER: {
distinct = jj_consume_token(QUANTIFIER);
break;
+ }
default:
jj_la1[76] = jj_gen;
;
}
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case ASTERISK:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case ASTERISK: {
all = jj_consume_token(ASTERISK);
break;
+ }
case LEFT_PAR:
case PLUS:
case MINUS:
@@ -3193,9 +3324,10 @@ public class ADQLParser implements ADQLParserConstants {
case UNSIGNED_FLOAT:
case UNSIGNED_INTEGER:
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
op = ValueExpression();
break;
+ }
default:
jj_la1[77] = jj_gen;
jj_consume_token(-1);
@@ -3205,33 +3337,39 @@ public class ADQLParser implements ADQLParserConstants {
funct = queryFactory.createSQLFunction((all != null) ? SQLFunctionType.COUNT_ALL : SQLFunctionType.COUNT, op, distinct != null && distinct.image.equalsIgnoreCase("distinct"));
funct.setPosition(new TextPosition(fct, end));
break;
+ }
case AVG:
case MAX:
case MIN:
- case SUM:
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case AVG:
+ case SUM: {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case AVG: {
fct = jj_consume_token(AVG);
break;
- case MAX:
+ }
+ case MAX: {
fct = jj_consume_token(MAX);
break;
- case MIN:
+ }
+ case MIN: {
fct = jj_consume_token(MIN);
break;
- case SUM:
+ }
+ case SUM: {
fct = jj_consume_token(SUM);
break;
+ }
default:
jj_la1[78] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
jj_consume_token(LEFT_PAR);
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case QUANTIFIER:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case QUANTIFIER: {
distinct = jj_consume_token(QUANTIFIER);
break;
+ }
default:
jj_la1[79] = jj_gen;
;
@@ -3241,23 +3379,24 @@ public class ADQLParser implements ADQLParserConstants {
funct = queryFactory.createSQLFunction(SQLFunctionType.valueOf(fct.image.toUpperCase()), op, distinct != null && distinct.image.equalsIgnoreCase("distinct"));
funct.setPosition(new TextPosition(fct, end));
break;
+ }
default:
jj_la1[80] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
{
- if (true)
+ if ("" != null)
return funct;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("SqlFunction");
}
}
@@ -3265,43 +3404,45 @@ public class ADQLParser implements ADQLParserConstants {
/* ************** */
/* ADQL FUNCTIONS */
/* ************** */
- final public ADQLOperand[] Coordinates() throws ParseException{
+ final public ADQLOperand[] Coordinates() throws ParseException {
trace_call("Coordinates");
- try{
+ try {
ADQLOperand[] ops = new ADQLOperand[2];
ops[0] = NumericExpression();
jj_consume_token(COMMA);
ops[1] = NumericExpression();
{
- if (true)
+ if ("" != null)
return ops;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("Coordinates");
}
}
- final public GeometryFunction GeometryFunction() throws ParseException{
+ final public GeometryFunction GeometryFunction() throws ParseException {
trace_call("GeometryFunction");
- try{
+ try {
Token fct = null, end;
GeometryValue<GeometryFunction> gvf1, gvf2;
GeometryValue<PointFunction> gvp1, gvp2;
GeometryFunction gf = null;
PointFunction p1 = null, p2 = null;
ADQLColumn col1 = null, col2 = null;
- try{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ try {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case CONTAINS:
- case INTERSECTS:
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case CONTAINS:
+ case INTERSECTS: {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case CONTAINS: {
fct = jj_consume_token(CONTAINS);
break;
- case INTERSECTS:
+ }
+ case INTERSECTS: {
fct = jj_consume_token(INTERSECTS);
break;
+ }
default:
jj_la1[81] = jj_gen;
jj_consume_token(-1);
@@ -3317,27 +3458,31 @@ public class ADQLParser implements ADQLParserConstants {
else
gf = queryFactory.createIntersects(gvf1, gvf2);
break;
- case AREA:
+ }
+ case AREA: {
fct = jj_consume_token(AREA);
jj_consume_token(LEFT_PAR);
gvf1 = GeometryExpression();
end = jj_consume_token(RIGHT_PAR);
gf = queryFactory.createArea(gvf1);
break;
- case COORD1:
+ }
+ case COORD1: {
fct = jj_consume_token(COORD1);
jj_consume_token(LEFT_PAR);
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case POINT:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case POINT: {
p1 = Point();
gf = queryFactory.createCoord1(p1);
break;
+ }
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
col1 = Column();
col1.setExpectedType('G');
gf = queryFactory.createCoord1(col1);
break;
+ }
default:
jj_la1[82] = jj_gen;
jj_consume_token(-1);
@@ -3345,20 +3490,23 @@ public class ADQLParser implements ADQLParserConstants {
}
end = jj_consume_token(RIGHT_PAR);
break;
- case COORD2:
+ }
+ case COORD2: {
fct = jj_consume_token(COORD2);
jj_consume_token(LEFT_PAR);
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case POINT:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case POINT: {
p1 = Point();
gf = queryFactory.createCoord2(p1);
break;
+ }
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
col1 = Column();
col1.setExpectedType('G');
gf = queryFactory.createCoord2(col1);
break;
+ }
default:
jj_la1[83] = jj_gen;
jj_consume_token(-1);
@@ -3366,17 +3514,20 @@ public class ADQLParser implements ADQLParserConstants {
}
end = jj_consume_token(RIGHT_PAR);
break;
- case DISTANCE:
+ }
+ case DISTANCE: {
fct = jj_consume_token(DISTANCE);
jj_consume_token(LEFT_PAR);
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case POINT:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case POINT: {
p1 = Point();
break;
+ }
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
col1 = Column();
break;
+ }
default:
jj_la1[84] = jj_gen;
jj_consume_token(-1);
@@ -3384,19 +3535,21 @@ public class ADQLParser implements ADQLParserConstants {
}
if (p1 != null)
gvp1 = new GeometryValue<PointFunction>(p1);
- else{
+ else {
col1.setExpectedType('G');
gvp1 = new GeometryValue<PointFunction>(col1);
}
jj_consume_token(COMMA);
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case POINT:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case POINT: {
p2 = Point();
break;
+ }
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
col2 = Column();
break;
+ }
default:
jj_la1[85] = jj_gen;
jj_consume_token(-1);
@@ -3404,19 +3557,20 @@ public class ADQLParser implements ADQLParserConstants {
}
if (p2 != null)
gvp2 = new GeometryValue<PointFunction>(p2);
- else{
+ else {
col2.setExpectedType('G');
gvp2 = new GeometryValue<PointFunction>(col2);
}
end = jj_consume_token(RIGHT_PAR);
gf = queryFactory.createDistance(gvp1, gvp2);
break;
+ }
default:
jj_la1[86] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
@@ -3424,33 +3578,33 @@ public class ADQLParser implements ADQLParserConstants {
}
gf.setPosition(new TextPosition(fct, end));
{
- if (true)
+ if ("" != null)
return gf;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("GeometryFunction");
}
}
- final public ADQLOperand CoordinateSystem() throws ParseException{
+ final public ADQLOperand CoordinateSystem() throws ParseException {
trace_call("CoordinateSystem");
- try{
+ try {
ADQLOperand coordSys = null;
coordSys = StringExpression();
{
- if (true)
+ if ("" != null)
return coordSys;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("CoordinateSystem");
}
}
- final public GeometryFunction GeometryValueFunction() throws ParseException{
+ final public GeometryFunction GeometryValueFunction() throws ParseException {
trace_call("GeometryValueFunction");
- try{
+ try {
Token fct = null, end = null;
ADQLOperand coordSys;
ADQLOperand width, height;
@@ -3459,9 +3613,9 @@ public class ADQLParser implements ADQLParserConstants {
ADQLOperand op = null;
GeometryValue<GeometryFunction> gvf = null;
GeometryFunction gf = null;
- try{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case BOX:
+ try {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case BOX: {
fct = jj_consume_token(BOX);
jj_consume_token(LEFT_PAR);
coordSys = CoordinateSystem();
@@ -3474,14 +3628,16 @@ public class ADQLParser implements ADQLParserConstants {
end = jj_consume_token(RIGHT_PAR);
gf = queryFactory.createBox(coordSys, coords[0], coords[1], width, height);
break;
- case CENTROID:
+ }
+ case CENTROID: {
fct = jj_consume_token(CENTROID);
jj_consume_token(LEFT_PAR);
gvf = GeometryExpression();
end = jj_consume_token(RIGHT_PAR);
gf = queryFactory.createCentroid(gvf);
break;
- case CIRCLE:
+ }
+ case CIRCLE: {
fct = jj_consume_token(CIRCLE);
jj_consume_token(LEFT_PAR);
coordSys = CoordinateSystem();
@@ -3492,10 +3648,12 @@ public class ADQLParser implements ADQLParserConstants {
end = jj_consume_token(RIGHT_PAR);
gf = queryFactory.createCircle(coordSys, coords[0], coords[1], width);
break;
- case POINT:
+ }
+ case POINT: {
gf = Point();
break;
- case POLYGON:
+ }
+ case POLYGON: {
fct = jj_consume_token(POLYGON);
jj_consume_token(LEFT_PAR);
coordSys = CoordinateSystem();
@@ -3512,11 +3670,12 @@ public class ADQLParser implements ADQLParserConstants {
tmp = Coordinates();
vCoords.add(tmp[0]);
vCoords.add(tmp[1]);
- label_12: while(true){
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case COMMA:
+ label_12: while(true) {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case COMMA: {
;
break;
+ }
default:
jj_la1[87] = jj_gen;
break label_12;
@@ -3529,19 +3688,21 @@ public class ADQLParser implements ADQLParserConstants {
end = jj_consume_token(RIGHT_PAR);
gf = queryFactory.createPolygon(coordSys, vCoords);
break;
- case REGION:
+ }
+ case REGION: {
fct = jj_consume_token(REGION);
jj_consume_token(LEFT_PAR);
op = StringExpression();
end = jj_consume_token(RIGHT_PAR);
gf = queryFactory.createRegion(op);
break;
+ }
default:
jj_la1[88] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
@@ -3550,18 +3711,18 @@ public class ADQLParser implements ADQLParserConstants {
if (fct != null && end != null) // = !(gf instanceof Point)
gf.setPosition(new TextPosition(fct, end));
{
- if (true)
+ if ("" != null)
return gf;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("GeometryValueFunction");
}
}
- final public PointFunction Point() throws ParseException{
+ final public PointFunction Point() throws ParseException {
trace_call("Point");
- try{
+ try {
Token start, end;
ADQLOperand coordSys;
ADQLOperand[] coords;
@@ -3571,49 +3732,49 @@ public class ADQLParser implements ADQLParserConstants {
jj_consume_token(COMMA);
coords = Coordinates();
end = jj_consume_token(RIGHT_PAR);
- try{
+ try {
PointFunction pf = queryFactory.createPoint(coordSys, coords[0], coords[1]);
pf.setPosition(new TextPosition(start, end));
{
- if (true)
+ if ("" != null)
return pf;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("Point");
}
}
- final public GeometryFunction ExtractCoordSys() throws ParseException{
+ final public GeometryFunction ExtractCoordSys() throws ParseException {
trace_call("ExtractCoordSys");
- try{
+ try {
Token start, end;
GeometryValue<GeometryFunction> gvf;
start = jj_consume_token(COORDSYS);
jj_consume_token(LEFT_PAR);
gvf = GeometryExpression();
end = jj_consume_token(RIGHT_PAR);
- try{
+ try {
GeometryFunction gf = queryFactory.createExtractCoordSys(gvf);
gf.setPosition(new TextPosition(start, end));
{
- if (true)
+ if ("" != null)
return gf;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("ExtractCoordSys");
}
}
@@ -3621,11 +3782,11 @@ public class ADQLParser implements ADQLParserConstants {
/* ***************** */
/* NUMERIC FUNCTIONS */
/* ***************** */
- final public ADQLFunction NumericFunction() throws ParseException{
+ final public ADQLFunction NumericFunction() throws ParseException {
trace_call("NumericFunction");
- try{
+ try {
ADQLFunction fct;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case ABS:
case CEILING:
case DEGREES:
@@ -3640,9 +3801,10 @@ public class ADQLParser implements ADQLParserConstants {
case RAND:
case ROUND:
case SQRT:
- case TRUNCATE:
+ case TRUNCATE: {
fct = MathFunction();
break;
+ }
case ACOS:
case ASIN:
case ATAN:
@@ -3650,87 +3812,97 @@ public class ADQLParser implements ADQLParserConstants {
case COS:
case COT:
case SIN:
- case TAN:
+ case TAN: {
fct = TrigFunction();
break;
+ }
case CONTAINS:
case INTERSECTS:
case AREA:
case COORD1:
case COORD2:
- case DISTANCE:
+ case DISTANCE: {
fct = GeometryFunction();
break;
- case REGULAR_IDENTIFIER_CANDIDATE:
+ }
+ case REGULAR_IDENTIFIER_CANDIDATE: {
fct = UserDefinedFunction();
((UserDefinedFunction)fct).setExpectedType('N');
break;
+ }
default:
jj_la1[89] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
{
- if (true)
+ if ("" != null)
return fct;
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("NumericFunction");
}
}
- final public MathFunction MathFunction() throws ParseException{
+ final public MathFunction MathFunction() throws ParseException {
trace_call("MathFunction");
- try{
+ try {
Token fct = null, end;
ADQLOperand param1 = null, param2 = null;
NumericConstant integerValue = null;
- try{
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case ABS:
+ try {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case ABS: {
fct = jj_consume_token(ABS);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case CEILING:
+ }
+ case CEILING: {
fct = jj_consume_token(CEILING);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case DEGREES:
+ }
+ case DEGREES: {
fct = jj_consume_token(DEGREES);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case EXP:
+ }
+ case EXP: {
fct = jj_consume_token(EXP);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case FLOOR:
+ }
+ case FLOOR: {
fct = jj_consume_token(FLOOR);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case LOG:
+ }
+ case LOG: {
fct = jj_consume_token(LOG);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case LOG10:
+ }
+ case LOG10: {
fct = jj_consume_token(LOG10);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case MOD:
+ }
+ case MOD: {
fct = jj_consume_token(MOD);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
@@ -3738,12 +3910,14 @@ public class ADQLParser implements ADQLParserConstants {
param2 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case PI:
+ }
+ case PI: {
fct = jj_consume_token(PI);
jj_consume_token(LEFT_PAR);
end = jj_consume_token(RIGHT_PAR);
break;
- case POWER:
+ }
+ case POWER: {
fct = jj_consume_token(POWER);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
@@ -3751,16 +3925,18 @@ public class ADQLParser implements ADQLParserConstants {
param2 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case RADIANS:
+ }
+ case RADIANS: {
fct = jj_consume_token(RADIANS);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case RAND:
+ }
+ case RAND: {
fct = jj_consume_token(RAND);
jj_consume_token(LEFT_PAR);
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case LEFT_PAR:
case PLUS:
case MINUS:
@@ -3802,51 +3978,58 @@ public class ADQLParser implements ADQLParserConstants {
case UNSIGNED_FLOAT:
case UNSIGNED_INTEGER:
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
param1 = NumericExpression();
break;
+ }
default:
jj_la1[90] = jj_gen;
;
}
end = jj_consume_token(RIGHT_PAR);
break;
- case ROUND:
+ }
+ case ROUND: {
fct = jj_consume_token(ROUND);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case COMMA:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case COMMA: {
jj_consume_token(COMMA);
param2 = SignedInteger();
break;
+ }
default:
jj_la1[91] = jj_gen;
;
}
end = jj_consume_token(RIGHT_PAR);
break;
- case SQRT:
+ }
+ case SQRT: {
fct = jj_consume_token(SQRT);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case TRUNCATE:
+ }
+ case TRUNCATE: {
fct = jj_consume_token(TRUNCATE);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case COMMA:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case COMMA: {
jj_consume_token(COMMA);
param2 = SignedInteger();
break;
+ }
default:
jj_la1[92] = jj_gen;
;
}
end = jj_consume_token(RIGHT_PAR);
break;
+ }
default:
jj_la1[93] = jj_gen;
jj_consume_token(-1);
@@ -3855,46 +4038,49 @@ public class ADQLParser implements ADQLParserConstants {
MathFunction mf = queryFactory.createMathFunction(MathFunctionType.valueOf(fct.image.toUpperCase()), param1, param2);
mf.setPosition(new TextPosition(fct, end));
{
- if (true)
+ if ("" != null)
return mf;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("MathFunction");
}
}
- final public MathFunction TrigFunction() throws ParseException{
+ final public MathFunction TrigFunction() throws ParseException {
trace_call("TrigFunction");
- try{
+ try {
Token fct = null, end;
ADQLOperand param1 = null, param2 = null;
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case ACOS:
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case ACOS: {
fct = jj_consume_token(ACOS);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case ASIN:
+ }
+ case ASIN: {
fct = jj_consume_token(ASIN);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case ATAN:
+ }
+ case ATAN: {
fct = jj_consume_token(ATAN);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case ATAN2:
+ }
+ case ATAN2: {
fct = jj_consume_token(ATAN2);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
@@ -3902,63 +4088,68 @@ public class ADQLParser implements ADQLParserConstants {
param2 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case COS:
+ }
+ case COS: {
fct = jj_consume_token(COS);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case COT:
+ }
+ case COT: {
fct = jj_consume_token(COT);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case SIN:
+ }
+ case SIN: {
fct = jj_consume_token(SIN);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
- case TAN:
+ }
+ case TAN: {
fct = jj_consume_token(TAN);
jj_consume_token(LEFT_PAR);
param1 = NumericExpression();
end = jj_consume_token(RIGHT_PAR);
break;
+ }
default:
jj_la1[94] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- try{
+ try {
MathFunction mf = queryFactory.createMathFunction(MathFunctionType.valueOf(fct.image.toUpperCase()), param1, param2);
mf.setPosition(new TextPosition(fct, end));
{
- if (true)
+ if ("" != null)
return mf;
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("TrigFunction");
}
}
- final public UserDefinedFunction UserDefinedFunction() throws ParseException{
+ final public UserDefinedFunction UserDefinedFunction() throws ParseException {
trace_call("UserDefinedFunction");
- try{
+ try {
Token fct, end;
Vector<ADQLOperand> params = new Vector<ADQLOperand>();
ADQLOperand op;
fct = jj_consume_token(REGULAR_IDENTIFIER_CANDIDATE);
jj_consume_token(LEFT_PAR);
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case LEFT_PAR:
case PLUS:
case MINUS:
@@ -4008,14 +4199,15 @@ public class ADQLParser implements ADQLParserConstants {
case UNSIGNED_FLOAT:
case UNSIGNED_INTEGER:
case DELIMITED_IDENTIFIER:
- case REGULAR_IDENTIFIER_CANDIDATE:
+ case REGULAR_IDENTIFIER_CANDIDATE: {
op = ValueExpression();
params.add(op);
- label_13: while(true){
- switch((jj_ntk == -1) ? jj_ntk() : jj_ntk){
- case COMMA:
+ label_13: while(true) {
+ switch((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case COMMA: {
;
break;
+ }
default:
jj_la1[95] = jj_gen;
break label_13;
@@ -4025,20 +4217,21 @@ public class ADQLParser implements ADQLParserConstants {
params.add(op);
}
break;
+ }
default:
jj_la1[96] = jj_gen;
;
}
end = jj_consume_token(RIGHT_PAR);
// Ensure the given function name is valid:
- if (!isRegularIdentifier(fct.image)){
+ if (!isRegularIdentifier(fct.image)) {
if (true)
throw new ParseException("Invalid (User Defined) Function name: \u005c"" + fct.image + "\u005c"!", new TextPosition(fct));
}
//System.out.println("INFO [ADQLParser]: \""+fct.image+"\" (from line "+fct.beginLine+" and column "+fct.beginColumn+" to line "+token.endLine+" and column "+(token.endColumn+1)+") is considered as an user defined function !");
- try{
+ try {
// Build the parameters list:
ADQLOperand[] parameters = new ADQLOperand[params.size()];
for(int i = 0; i < params.size(); i++)
@@ -4048,11 +4241,11 @@ public class ADQLParser implements ADQLParserConstants {
UserDefinedFunction udf = queryFactory.createUserDefinedFunction(fct.image, parameters);
udf.setPosition(new TextPosition(fct, end));
{
- if (true)
+ if ("" != null)
return udf;
}
- }catch(UnsupportedOperationException uoe){
+ } catch(UnsupportedOperationException uoe) {
/* This catch clause is just for backward compatibility:
* if the createUserDefinedFunction(...) is overridden and
* the function can not be identified a such exception may be thrown). */
@@ -4060,247 +4253,247 @@ public class ADQLParser implements ADQLParserConstants {
if (true)
throw new ParseException(uoe.getMessage(), new TextPosition(fct, token));
}
- }catch(Exception ex){
+ } catch(Exception ex) {
{
if (true)
throw generateParseException(ex);
}
}
throw new Error("Missing return statement in function");
- }finally{
+ } finally {
trace_return("UserDefinedFunction");
}
}
- private boolean jj_2_1(int xla){
+ private boolean jj_2_1(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_1();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(0, xla);
}
}
- private boolean jj_2_2(int xla){
+ private boolean jj_2_2(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_2();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(1, xla);
}
}
- private boolean jj_2_3(int xla){
+ private boolean jj_2_3(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_3();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(2, xla);
}
}
- private boolean jj_2_4(int xla){
+ private boolean jj_2_4(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_4();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(3, xla);
}
}
- private boolean jj_2_5(int xla){
+ private boolean jj_2_5(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_5();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(4, xla);
}
}
- private boolean jj_2_6(int xla){
+ private boolean jj_2_6(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_6();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(5, xla);
}
}
- private boolean jj_2_7(int xla){
+ private boolean jj_2_7(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_7();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(6, xla);
}
}
- private boolean jj_2_8(int xla){
+ private boolean jj_2_8(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_8();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(7, xla);
}
}
- private boolean jj_2_9(int xla){
+ private boolean jj_2_9(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_9();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(8, xla);
}
}
- private boolean jj_2_10(int xla){
+ private boolean jj_2_10(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_10();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(9, xla);
}
}
- private boolean jj_2_11(int xla){
+ private boolean jj_2_11(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_11();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(10, xla);
}
}
- private boolean jj_2_12(int xla){
+ private boolean jj_2_12(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_12();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(11, xla);
}
}
- private boolean jj_2_13(int xla){
+ private boolean jj_2_13(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_13();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(12, xla);
}
}
- private boolean jj_2_14(int xla){
+ private boolean jj_2_14(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_14();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(13, xla);
}
}
- private boolean jj_2_15(int xla){
+ private boolean jj_2_15(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_15();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(14, xla);
}
}
- private boolean jj_2_16(int xla){
+ private boolean jj_2_16(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_16();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(15, xla);
}
}
- private boolean jj_2_17(int xla){
+ private boolean jj_2_17(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_17();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(16, xla);
}
}
- private boolean jj_2_18(int xla){
+ private boolean jj_2_18(int xla) {
jj_la = xla;
jj_lastpos = jj_scanpos = token;
- try{
+ try {
return !jj_3_18();
- }catch(LookaheadSuccess ls){
+ } catch(LookaheadSuccess ls) {
return true;
- }finally{
+ } finally {
jj_save(17, xla);
}
}
- private boolean jj_3R_76(){
+ private boolean jj_3R_76() {
if (jj_scan_token(LEFT_PAR))
return true;
return false;
}
- private boolean jj_3_3(){
+ private boolean jj_3_3() {
if (jj_3R_17())
return true;
return false;
}
- private boolean jj_3_16(){
+ private boolean jj_3_16() {
if (jj_3R_22())
return true;
if (jj_scan_token(IS))
@@ -4308,7 +4501,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_134(){
+ private boolean jj_3R_134() {
if (jj_scan_token(COMMA))
return true;
if (jj_3R_51())
@@ -4316,30 +4509,30 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3_2(){
+ private boolean jj_3_2() {
if (jj_3R_16())
return true;
return false;
}
- private boolean jj_3R_75(){
+ private boolean jj_3R_75() {
if (jj_3R_79())
return true;
return false;
}
- private boolean jj_3R_27(){
+ private boolean jj_3R_27() {
if (jj_3R_51())
return true;
return false;
}
- private boolean jj_3R_56(){
+ private boolean jj_3R_56() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_75()){
+ if (jj_3R_75()) {
jj_scanpos = xsp;
- if (jj_3_2()){
+ if (jj_3_2()) {
jj_scanpos = xsp;
if (jj_3R_76())
return true;
@@ -4348,10 +4541,10 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3_14(){
+ private boolean jj_3_14() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(42)){
+ if (jj_scan_token(42)) {
jj_scanpos = xsp;
if (jj_3R_27())
return true;
@@ -4359,13 +4552,13 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_120(){
+ private boolean jj_3R_120() {
if (jj_3R_51())
return true;
Token xsp;
- while(true){
+ while(true) {
xsp = jj_scanpos;
- if (jj_3R_134()){
+ if (jj_3R_134()) {
jj_scanpos = xsp;
break;
}
@@ -4373,7 +4566,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_60(){
+ private boolean jj_3R_60() {
if (jj_scan_token(DOT))
return true;
if (jj_3R_79())
@@ -4381,13 +4574,13 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_22(){
+ private boolean jj_3R_22() {
if (jj_3R_43())
return true;
return false;
}
- private boolean jj_3R_150(){
+ private boolean jj_3R_150() {
if (jj_scan_token(COMMA))
return true;
if (jj_3R_153())
@@ -4395,7 +4588,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_149(){
+ private boolean jj_3R_149() {
if (jj_scan_token(COMMA))
return true;
if (jj_3R_153())
@@ -4403,7 +4596,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_43(){
+ private boolean jj_3R_43() {
if (jj_3R_14())
return true;
Token xsp;
@@ -4413,7 +4606,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_127(){
+ private boolean jj_3R_127() {
if (jj_scan_token(DOT))
return true;
if (jj_3R_14())
@@ -4421,7 +4614,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_126(){
+ private boolean jj_3R_126() {
if (jj_scan_token(DOT))
return true;
if (jj_3R_14())
@@ -4429,7 +4622,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_79(){
+ private boolean jj_3R_79() {
if (jj_3R_14())
return true;
Token xsp;
@@ -4442,25 +4635,25 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_31(){
+ private boolean jj_3R_31() {
if (jj_scan_token(DELIMITED_IDENTIFIER))
return true;
return false;
}
- private boolean jj_3R_133(){
+ private boolean jj_3R_133() {
if (jj_3R_21())
return true;
return false;
}
- private boolean jj_3R_30(){
+ private boolean jj_3R_30() {
if (jj_scan_token(REGULAR_IDENTIFIER_CANDIDATE))
return true;
return false;
}
- private boolean jj_3R_26(){
+ private boolean jj_3R_26() {
if (jj_scan_token(REGULAR_IDENTIFIER_CANDIDATE))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4474,16 +4667,16 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_141(){
+ private boolean jj_3R_141() {
if (jj_3R_112())
return true;
return false;
}
- private boolean jj_3R_14(){
+ private boolean jj_3R_14() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_30()){
+ if (jj_3R_30()) {
jj_scanpos = xsp;
if (jj_3R_31())
return true;
@@ -4491,16 +4684,16 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_132(){
+ private boolean jj_3R_132() {
if (jj_3R_22())
return true;
return false;
}
- private boolean jj_3R_119(){
+ private boolean jj_3R_119() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_132()){
+ if (jj_3R_132()) {
jj_scanpos = xsp;
if (jj_3R_133())
return true;
@@ -4508,7 +4701,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_106(){
+ private boolean jj_3R_106() {
if (jj_scan_token(TAN))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4520,7 +4713,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_105(){
+ private boolean jj_3R_105() {
if (jj_scan_token(SIN))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4532,13 +4725,13 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_58(){
+ private boolean jj_3R_58() {
if (jj_3R_78())
return true;
return false;
}
- private boolean jj_3R_104(){
+ private boolean jj_3R_104() {
if (jj_scan_token(COT))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4550,13 +4743,13 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3_13(){
+ private boolean jj_3_13() {
if (jj_3R_26())
return true;
return false;
}
- private boolean jj_3R_103(){
+ private boolean jj_3R_103() {
if (jj_scan_token(COS))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4568,7 +4761,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_102(){
+ private boolean jj_3R_102() {
if (jj_scan_token(ATAN2))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4584,13 +4777,13 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_57(){
+ private boolean jj_3R_57() {
if (jj_3R_77())
return true;
return false;
}
- private boolean jj_3R_101(){
+ private boolean jj_3R_101() {
if (jj_scan_token(ATAN))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4602,12 +4795,12 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_36(){
+ private boolean jj_3R_36() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_57()){
+ if (jj_3R_57()) {
jj_scanpos = xsp;
- if (jj_3_13()){
+ if (jj_3_13()) {
jj_scanpos = xsp;
if (jj_3R_58())
return true;
@@ -4616,7 +4809,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_100(){
+ private boolean jj_3R_100() {
if (jj_scan_token(ASIN))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4628,7 +4821,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_99(){
+ private boolean jj_3R_99() {
if (jj_scan_token(ACOS))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4640,22 +4833,22 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_64(){
+ private boolean jj_3R_64() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_99()){
+ if (jj_3R_99()) {
jj_scanpos = xsp;
- if (jj_3R_100()){
+ if (jj_3R_100()) {
jj_scanpos = xsp;
- if (jj_3R_101()){
+ if (jj_3R_101()) {
jj_scanpos = xsp;
- if (jj_3R_102()){
+ if (jj_3R_102()) {
jj_scanpos = xsp;
- if (jj_3R_103()){
+ if (jj_3R_103()) {
jj_scanpos = xsp;
- if (jj_3R_104()){
+ if (jj_3R_104()) {
jj_scanpos = xsp;
- if (jj_3R_105()){
+ if (jj_3R_105()) {
jj_scanpos = xsp;
if (jj_3R_106())
return true;
@@ -4669,13 +4862,13 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_46(){
+ private boolean jj_3R_46() {
if (jj_3R_62())
return true;
return false;
}
- private boolean jj_3R_98(){
+ private boolean jj_3R_98() {
if (jj_scan_token(TRUNCATE))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4691,7 +4884,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_97(){
+ private boolean jj_3R_97() {
if (jj_scan_token(SQRT))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4703,7 +4896,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_96(){
+ private boolean jj_3R_96() {
if (jj_scan_token(ROUND))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4719,7 +4912,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_95(){
+ private boolean jj_3R_95() {
if (jj_scan_token(RAND))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4733,7 +4926,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_94(){
+ private boolean jj_3R_94() {
if (jj_scan_token(RADIANS))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4745,7 +4938,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_93(){
+ private boolean jj_3R_93() {
if (jj_scan_token(POWER))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4761,7 +4954,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_92(){
+ private boolean jj_3R_92() {
if (jj_scan_token(PI))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4771,7 +4964,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_91(){
+ private boolean jj_3R_91() {
if (jj_scan_token(MOD))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4787,7 +4980,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_90(){
+ private boolean jj_3R_90() {
if (jj_scan_token(LOG10))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4799,7 +4992,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_89(){
+ private boolean jj_3R_89() {
if (jj_scan_token(LOG))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4811,7 +5004,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_88(){
+ private boolean jj_3R_88() {
if (jj_scan_token(FLOOR))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4823,7 +5016,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_87(){
+ private boolean jj_3R_87() {
if (jj_scan_token(EXP))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4835,7 +5028,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_52(){
+ private boolean jj_3R_52() {
if (jj_scan_token(CONCAT))
return true;
if (jj_3R_36())
@@ -4843,7 +5036,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_86(){
+ private boolean jj_3R_86() {
if (jj_scan_token(DEGREES))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4855,7 +5048,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_85(){
+ private boolean jj_3R_85() {
if (jj_scan_token(CEILING))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4867,7 +5060,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_84(){
+ private boolean jj_3R_84() {
if (jj_scan_token(ABS))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -4879,13 +5072,13 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_29(){
+ private boolean jj_3R_29() {
if (jj_3R_36())
return true;
Token xsp;
- while(true){
+ while(true) {
xsp = jj_scanpos;
- if (jj_3R_52()){
+ if (jj_3R_52()) {
jj_scanpos = xsp;
break;
}
@@ -4893,36 +5086,36 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_63(){
+ private boolean jj_3R_63() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_84()){
+ if (jj_3R_84()) {
jj_scanpos = xsp;
- if (jj_3R_85()){
+ if (jj_3R_85()) {
jj_scanpos = xsp;
- if (jj_3R_86()){
+ if (jj_3R_86()) {
jj_scanpos = xsp;
- if (jj_3R_87()){
+ if (jj_3R_87()) {
jj_scanpos = xsp;
- if (jj_3R_88()){
+ if (jj_3R_88()) {
jj_scanpos = xsp;
- if (jj_3R_89()){
+ if (jj_3R_89()) {
jj_scanpos = xsp;
- if (jj_3R_90()){
+ if (jj_3R_90()) {
jj_scanpos = xsp;
- if (jj_3R_91()){
+ if (jj_3R_91()) {
jj_scanpos = xsp;
- if (jj_3R_92()){
+ if (jj_3R_92()) {
jj_scanpos = xsp;
- if (jj_3R_93()){
+ if (jj_3R_93()) {
jj_scanpos = xsp;
- if (jj_3R_94()){
+ if (jj_3R_94()) {
jj_scanpos = xsp;
- if (jj_3R_95()){
+ if (jj_3R_95()) {
jj_scanpos = xsp;
- if (jj_3R_96()){
+ if (jj_3R_96()) {
jj_scanpos = xsp;
- if (jj_3R_97()){
+ if (jj_3R_97()) {
jj_scanpos = xsp;
if (jj_3R_98())
return true;
@@ -4943,44 +5136,44 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_61(){
+ private boolean jj_3R_61() {
if (jj_scan_token(MINUS))
return true;
return false;
}
- private boolean jj_3R_50(){
+ private boolean jj_3R_50() {
if (jj_3R_26())
return true;
return false;
}
- private boolean jj_3R_49(){
+ private boolean jj_3R_49() {
if (jj_3R_65())
return true;
return false;
}
- private boolean jj_3R_48(){
+ private boolean jj_3R_48() {
if (jj_3R_64())
return true;
return false;
}
- private boolean jj_3R_47(){
+ private boolean jj_3R_47() {
if (jj_3R_63())
return true;
return false;
}
- private boolean jj_3R_25(){
+ private boolean jj_3R_25() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_47()){
+ if (jj_3R_47()) {
jj_scanpos = xsp;
- if (jj_3R_48()){
+ if (jj_3R_48()) {
jj_scanpos = xsp;
- if (jj_3R_49()){
+ if (jj_3R_49()) {
jj_scanpos = xsp;
if (jj_3R_50())
return true;
@@ -4990,16 +5183,16 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3_12(){
+ private boolean jj_3_12() {
if (jj_3R_25())
return true;
return false;
}
- private boolean jj_3R_45(){
+ private boolean jj_3R_45() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(9)){
+ if (jj_scan_token(9)) {
jj_scanpos = xsp;
if (jj_3R_61())
return true;
@@ -5007,7 +5200,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_32(){
+ private boolean jj_3R_32() {
if (jj_3R_14())
return true;
if (jj_scan_token(DOT))
@@ -5015,10 +5208,10 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_137(){
+ private boolean jj_3R_137() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(11)){
+ if (jj_scan_token(11)) {
jj_scanpos = xsp;
if (jj_scan_token(12))
return true;
@@ -5028,13 +5221,13 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_24(){
+ private boolean jj_3R_24() {
Token xsp;
xsp = jj_scanpos;
if (jj_3R_45())
jj_scanpos = xsp;
xsp = jj_scanpos;
- if (jj_3_12()){
+ if (jj_3_12()) {
jj_scanpos = xsp;
if (jj_3R_46())
return true;
@@ -5042,7 +5235,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_15(){
+ private boolean jj_3R_15() {
if (jj_3R_14())
return true;
if (jj_scan_token(DOT))
@@ -5054,7 +5247,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_77(){
+ private boolean jj_3R_77() {
if (jj_scan_token(COORDSYS))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -5066,19 +5259,19 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_145(){
+ private boolean jj_3R_145() {
if (jj_3R_22())
return true;
return false;
}
- private boolean jj_3R_143(){
+ private boolean jj_3R_143() {
if (jj_3R_22())
return true;
return false;
}
- private boolean jj_3R_140(){
+ private boolean jj_3R_140() {
if (jj_scan_token(COMMA))
return true;
if (jj_3R_139())
@@ -5086,10 +5279,10 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_131(){
+ private boolean jj_3R_131() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(9)){
+ if (jj_scan_token(9)) {
jj_scanpos = xsp;
if (jj_scan_token(10))
return true;
@@ -5099,7 +5292,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_59(){
+ private boolean jj_3R_59() {
if (jj_scan_token(POINT))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -5115,7 +5308,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_130(){
+ private boolean jj_3R_130() {
if (jj_3R_24())
return true;
Token xsp;
@@ -5125,7 +5318,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_42(){
+ private boolean jj_3R_42() {
if (jj_scan_token(REGION))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -5137,16 +5330,16 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_19(){
+ private boolean jj_3R_19() {
if (jj_3R_24())
return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(9)){
+ if (jj_scan_token(9)) {
jj_scanpos = xsp;
- if (jj_scan_token(10)){
+ if (jj_scan_token(10)) {
jj_scanpos = xsp;
- if (jj_scan_token(11)){
+ if (jj_scan_token(11)) {
jj_scanpos = xsp;
if (jj_scan_token(12))
return true;
@@ -5156,7 +5349,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_20(){
+ private boolean jj_3R_20() {
if (jj_3R_36())
return true;
if (jj_scan_token(CONCAT))
@@ -5164,7 +5357,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3_1(){
+ private boolean jj_3_1() {
if (jj_3R_14())
return true;
if (jj_scan_token(DOT))
@@ -5178,7 +5371,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_41(){
+ private boolean jj_3R_41() {
if (jj_scan_token(POLYGON))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -5198,9 +5391,9 @@ public class ADQLParser implements ADQLParserConstants {
if (jj_3R_139())
return true;
Token xsp;
- while(true){
+ while(true) {
xsp = jj_scanpos;
- if (jj_3R_140()){
+ if (jj_3R_140()) {
jj_scanpos = xsp;
break;
}
@@ -5210,25 +5403,25 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_72(){
+ private boolean jj_3R_72() {
if (jj_3R_22())
return true;
return false;
}
- private boolean jj_3R_40(){
+ private boolean jj_3R_40() {
if (jj_3R_59())
return true;
return false;
}
- private boolean jj_3_10(){
+ private boolean jj_3_10() {
if (jj_3R_23())
return true;
return false;
}
- private boolean jj_3R_112(){
+ private boolean jj_3R_112() {
if (jj_3R_130())
return true;
Token xsp;
@@ -5238,13 +5431,13 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3_9(){
+ private boolean jj_3_9() {
if (jj_3R_22())
return true;
return false;
}
- private boolean jj_3_7(){
+ private boolean jj_3_7() {
if (jj_scan_token(REGULAR_IDENTIFIER_CANDIDATE))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -5252,13 +5445,13 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3_6(){
+ private boolean jj_3_6() {
if (jj_scan_token(LEFT_PAR))
return true;
return false;
}
- private boolean jj_3R_39(){
+ private boolean jj_3R_39() {
if (jj_scan_token(CIRCLE))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -5278,10 +5471,10 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3_5(){
+ private boolean jj_3_5() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(65)){
+ if (jj_scan_token(65)) {
jj_scanpos = xsp;
if (jj_3R_20())
return true;
@@ -5289,10 +5482,10 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3_4(){
+ private boolean jj_3_4() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_18()){
+ if (jj_3R_18()) {
jj_scanpos = xsp;
if (jj_3R_19())
return true;
@@ -5300,10 +5493,10 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_18(){
+ private boolean jj_3R_18() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(9)){
+ if (jj_scan_token(9)) {
jj_scanpos = xsp;
if (jj_scan_token(10))
return true;
@@ -5311,7 +5504,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_38(){
+ private boolean jj_3R_38() {
if (jj_scan_token(CENTROID))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -5323,37 +5516,37 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3_11(){
+ private boolean jj_3_11() {
if (jj_3R_24())
return true;
return false;
}
- private boolean jj_3R_71(){
+ private boolean jj_3R_71() {
if (jj_3R_36())
return true;
return false;
}
- private boolean jj_3R_70(){
+ private boolean jj_3R_70() {
if (jj_3R_22())
return true;
return false;
}
- private boolean jj_3_8(){
+ private boolean jj_3_8() {
if (jj_3R_21())
return true;
return false;
}
- private boolean jj_3R_69(){
+ private boolean jj_3R_69() {
if (jj_3R_26())
return true;
return false;
}
- private boolean jj_3R_68(){
+ private boolean jj_3R_68() {
if (jj_scan_token(LEFT_PAR))
return true;
if (jj_3R_51())
@@ -5363,7 +5556,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_37(){
+ private boolean jj_3R_37() {
if (jj_scan_token(BOX))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -5387,31 +5580,31 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_67(){
+ private boolean jj_3R_67() {
if (jj_3R_29())
return true;
return false;
}
- private boolean jj_3R_66(){
+ private boolean jj_3R_66() {
if (jj_3R_112())
return true;
return false;
}
- private boolean jj_3R_152(){
+ private boolean jj_3R_152() {
if (jj_3R_22())
return true;
return false;
}
- private boolean jj_3R_53(){
+ private boolean jj_3R_53() {
if (jj_scan_token(SELECT))
return true;
return false;
}
- private boolean jj_3R_125(){
+ private boolean jj_3R_125() {
if (jj_scan_token(LEFT_PAR))
return true;
if (jj_3R_51())
@@ -5421,24 +5614,24 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_144(){
+ private boolean jj_3R_144() {
if (jj_3R_59())
return true;
return false;
}
- private boolean jj_3R_21(){
+ private boolean jj_3R_21() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_37()){
+ if (jj_3R_37()) {
jj_scanpos = xsp;
- if (jj_3R_38()){
+ if (jj_3R_38()) {
jj_scanpos = xsp;
- if (jj_3R_39()){
+ if (jj_3R_39()) {
jj_scanpos = xsp;
- if (jj_3R_40()){
+ if (jj_3R_40()) {
jj_scanpos = xsp;
- if (jj_3R_41()){
+ if (jj_3R_41()) {
jj_scanpos = xsp;
if (jj_3R_42())
return true;
@@ -5450,42 +5643,42 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_148(){
+ private boolean jj_3R_148() {
if (jj_3R_51())
return true;
return false;
}
- private boolean jj_3R_142(){
+ private boolean jj_3R_142() {
if (jj_3R_59())
return true;
return false;
}
- private boolean jj_3R_124(){
+ private boolean jj_3R_124() {
if (jj_3R_22())
return true;
return false;
}
- private boolean jj_3R_51(){
+ private boolean jj_3R_51() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_66()){
+ if (jj_3R_66()) {
jj_scanpos = xsp;
- if (jj_3R_67()){
+ if (jj_3R_67()) {
jj_scanpos = xsp;
- if (jj_3R_68()){
+ if (jj_3R_68()) {
jj_scanpos = xsp;
- if (jj_3R_69()){
+ if (jj_3R_69()) {
jj_scanpos = xsp;
- if (jj_3_8()){
+ if (jj_3_8()) {
jj_scanpos = xsp;
- if (jj_3R_70()){
+ if (jj_3R_70()) {
jj_scanpos = xsp;
- if (jj_3R_71()){
+ if (jj_3R_71()) {
jj_scanpos = xsp;
- if (jj_3_11()){
+ if (jj_3_11()) {
jj_scanpos = xsp;
if (jj_3R_72())
return true;
@@ -5500,37 +5693,37 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_147(){
+ private boolean jj_3R_147() {
if (jj_3R_22())
return true;
return false;
}
- private boolean jj_3R_123(){
+ private boolean jj_3R_123() {
if (jj_3R_129())
return true;
return false;
}
- private boolean jj_3R_151(){
+ private boolean jj_3R_151() {
if (jj_3R_59())
return true;
return false;
}
- private boolean jj_3R_138(){
+ private boolean jj_3R_138() {
if (jj_3R_29())
return true;
return false;
}
- private boolean jj_3R_122(){
+ private boolean jj_3R_122() {
if (jj_3R_128())
return true;
return false;
}
- private boolean jj_3R_16(){
+ private boolean jj_3R_16() {
if (jj_scan_token(LEFT_PAR))
return true;
if (jj_3R_33())
@@ -5538,25 +5731,25 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_121(){
+ private boolean jj_3R_121() {
if (jj_3R_23())
return true;
return false;
}
- private boolean jj_3R_115(){
+ private boolean jj_3R_115() {
if (jj_scan_token(FULL))
return true;
return false;
}
- private boolean jj_3R_146(){
+ private boolean jj_3R_146() {
if (jj_3R_59())
return true;
return false;
}
- private boolean jj_3R_83(){
+ private boolean jj_3R_83() {
if (jj_scan_token(LEFT_PAR))
return true;
if (jj_3R_112())
@@ -5566,22 +5759,22 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_82(){
+ private boolean jj_3R_82() {
if (jj_3R_129())
return true;
return false;
}
- private boolean jj_3R_78(){
+ private boolean jj_3R_78() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_121()){
+ if (jj_3R_121()) {
jj_scanpos = xsp;
- if (jj_3R_122()){
+ if (jj_3R_122()) {
jj_scanpos = xsp;
- if (jj_3R_123()){
+ if (jj_3R_123()) {
jj_scanpos = xsp;
- if (jj_3R_124()){
+ if (jj_3R_124()) {
jj_scanpos = xsp;
if (jj_3R_125())
return true;
@@ -5592,26 +5785,26 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_81(){
+ private boolean jj_3R_81() {
if (jj_3R_22())
return true;
return false;
}
- private boolean jj_3R_80(){
+ private boolean jj_3R_80() {
if (jj_3R_128())
return true;
return false;
}
- private boolean jj_3R_111(){
+ private boolean jj_3R_111() {
if (jj_scan_token(DISTANCE))
return true;
if (jj_scan_token(LEFT_PAR))
return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_146()){
+ if (jj_3R_146()) {
jj_scanpos = xsp;
if (jj_3R_147())
return true;
@@ -5619,7 +5812,7 @@ public class ADQLParser implements ADQLParserConstants {
if (jj_scan_token(COMMA))
return true;
xsp = jj_scanpos;
- if (jj_3R_151()){
+ if (jj_3R_151()) {
jj_scanpos = xsp;
if (jj_3R_152())
return true;
@@ -5629,14 +5822,14 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_110(){
+ private boolean jj_3R_110() {
if (jj_scan_token(COORD2))
return true;
if (jj_scan_token(LEFT_PAR))
return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_144()){
+ if (jj_3R_144()) {
jj_scanpos = xsp;
if (jj_3R_145())
return true;
@@ -5646,14 +5839,14 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_109(){
+ private boolean jj_3R_109() {
if (jj_scan_token(COORD1))
return true;
if (jj_scan_token(LEFT_PAR))
return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_142()){
+ if (jj_3R_142()) {
jj_scanpos = xsp;
if (jj_3R_143())
return true;
@@ -5663,7 +5856,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_108(){
+ private boolean jj_3R_108() {
if (jj_scan_token(AREA))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -5675,20 +5868,20 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_118(){
+ private boolean jj_3R_118() {
if (jj_scan_token(FULL))
return true;
return false;
}
- private boolean jj_3R_62(){
+ private boolean jj_3R_62() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_80()){
+ if (jj_3R_80()) {
jj_scanpos = xsp;
- if (jj_3R_81()){
+ if (jj_3R_81()) {
jj_scanpos = xsp;
- if (jj_3R_82()){
+ if (jj_3R_82()) {
jj_scanpos = xsp;
if (jj_3R_83())
return true;
@@ -5698,10 +5891,10 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_107(){
+ private boolean jj_3R_107() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(60)){
+ if (jj_scan_token(60)) {
jj_scanpos = xsp;
if (jj_scan_token(61))
return true;
@@ -5719,22 +5912,22 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_33(){
+ private boolean jj_3R_33() {
if (jj_3R_53())
return true;
return false;
}
- private boolean jj_3R_114(){
+ private boolean jj_3R_114() {
if (jj_scan_token(RIGHT))
return true;
return false;
}
- private boolean jj_3R_154(){
+ private boolean jj_3R_154() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(9)){
+ if (jj_scan_token(9)) {
jj_scanpos = xsp;
if (jj_scan_token(10))
return true;
@@ -5742,7 +5935,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_153(){
+ private boolean jj_3R_153() {
Token xsp;
xsp = jj_scanpos;
if (jj_3R_154())
@@ -5752,16 +5945,16 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_65(){
+ private boolean jj_3R_65() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_107()){
+ if (jj_3R_107()) {
jj_scanpos = xsp;
- if (jj_3R_108()){
+ if (jj_3R_108()) {
jj_scanpos = xsp;
- if (jj_3R_109()){
+ if (jj_3R_109()) {
jj_scanpos = xsp;
- if (jj_3R_110()){
+ if (jj_3R_110()) {
jj_scanpos = xsp;
if (jj_3R_111())
return true;
@@ -5772,7 +5965,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_139(){
+ private boolean jj_3R_139() {
if (jj_3R_112())
return true;
if (jj_scan_token(COMMA))
@@ -5782,14 +5975,14 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_136(){
+ private boolean jj_3R_136() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(49)){
+ if (jj_scan_token(49)) {
jj_scanpos = xsp;
- if (jj_scan_token(50)){
+ if (jj_scan_token(50)) {
jj_scanpos = xsp;
- if (jj_scan_token(51)){
+ if (jj_scan_token(51)) {
jj_scanpos = xsp;
if (jj_scan_token(52))
return true;
@@ -5808,7 +6001,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_135(){
+ private boolean jj_3R_135() {
if (jj_scan_token(COUNT))
return true;
if (jj_scan_token(LEFT_PAR))
@@ -5818,7 +6011,7 @@ public class ADQLParser implements ADQLParserConstants {
if (jj_scan_token(20))
jj_scanpos = xsp;
xsp = jj_scanpos;
- if (jj_scan_token(11)){
+ if (jj_scan_token(11)) {
jj_scanpos = xsp;
if (jj_3R_148())
return true;
@@ -5828,18 +6021,18 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_117(){
+ private boolean jj_3R_117() {
if (jj_scan_token(RIGHT))
return true;
return false;
}
- private boolean jj_3R_128(){
+ private boolean jj_3R_128() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(94)){
+ if (jj_scan_token(94)) {
jj_scanpos = xsp;
- if (jj_scan_token(95)){
+ if (jj_scan_token(95)) {
jj_scanpos = xsp;
if (jj_scan_token(96))
return true;
@@ -5848,10 +6041,10 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_129(){
+ private boolean jj_3R_129() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_135()){
+ if (jj_3R_135()) {
jj_scanpos = xsp;
if (jj_3R_136())
return true;
@@ -5859,18 +6052,18 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_113(){
+ private boolean jj_3R_113() {
if (jj_scan_token(LEFT))
return true;
return false;
}
- private boolean jj_3R_73(){
+ private boolean jj_3R_73() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_113()){
+ if (jj_3R_113()) {
jj_scanpos = xsp;
- if (jj_3R_114()){
+ if (jj_3R_114()) {
jj_scanpos = xsp;
if (jj_3R_115())
return true;
@@ -5879,10 +6072,10 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_54(){
+ private boolean jj_3R_54() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(25)){
+ if (jj_scan_token(25)) {
jj_scanpos = xsp;
if (jj_3R_73())
return true;
@@ -5890,19 +6083,19 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_44(){
+ private boolean jj_3R_44() {
if (jj_scan_token(STRING_LITERAL))
return true;
return false;
}
- private boolean jj_3R_23(){
+ private boolean jj_3R_23() {
Token xsp;
if (jj_3R_44())
return true;
- while(true){
+ while(true) {
xsp = jj_scanpos;
- if (jj_3R_44()){
+ if (jj_3R_44()) {
jj_scanpos = xsp;
break;
}
@@ -5910,18 +6103,18 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_116(){
+ private boolean jj_3R_116() {
if (jj_scan_token(LEFT))
return true;
return false;
}
- private boolean jj_3R_74(){
+ private boolean jj_3R_74() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_116()){
+ if (jj_3R_116()) {
jj_scanpos = xsp;
- if (jj_3R_117()){
+ if (jj_3R_117()) {
jj_scanpos = xsp;
if (jj_3R_118())
return true;
@@ -5933,16 +6126,16 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3_18(){
+ private boolean jj_3_18() {
if (jj_3R_16())
return true;
return false;
}
- private boolean jj_3R_55(){
+ private boolean jj_3R_55() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(25)){
+ if (jj_scan_token(25)) {
jj_scanpos = xsp;
if (jj_3R_74())
return true;
@@ -5950,7 +6143,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_35(){
+ private boolean jj_3R_35() {
Token xsp;
xsp = jj_scanpos;
if (jj_3R_55())
@@ -5962,7 +6155,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_34(){
+ private boolean jj_3R_34() {
if (jj_scan_token(NATURAL))
return true;
Token xsp;
@@ -5974,7 +6167,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3R_28(){
+ private boolean jj_3R_28() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(36))
@@ -5986,16 +6179,16 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3_15(){
+ private boolean jj_3_15() {
if (jj_3R_28())
return true;
return false;
}
- private boolean jj_3R_17(){
+ private boolean jj_3R_17() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_34()){
+ if (jj_3R_34()) {
jj_scanpos = xsp;
if (jj_3R_35())
return true;
@@ -6003,7 +6196,7 @@ public class ADQLParser implements ADQLParserConstants {
return false;
}
- private boolean jj_3_17(){
+ private boolean jj_3_17() {
if (jj_3R_29())
return true;
Token xsp;
@@ -6031,26 +6224,26 @@ public class ADQLParser implements ADQLParserConstants {
static private int[] jj_la1_1;
static private int[] jj_la1_2;
static private int[] jj_la1_3;
- static{
+ static {
jj_la1_init_0();
jj_la1_init_1();
jj_la1_init_2();
jj_la1_init_3();
}
- private static void jj_la1_init_0(){
+ private static void jj_la1_init_0() {
jj_la1_0 = new int[]{ 0x81, 0x0, 0x0, 0x0, 0x0, 0x100000, 0x200000, 0x40, 0x0, 0x0, 0x800000, 0x800000, 0x800, 0x608, 0x40, 0x40, 0x40, 0x0, 0x20, 0x20, 0x20, 0x0, 0x0, 0x0, 0x800000, 0x800000, 0x800000, 0x0, 0x8, 0x7b000000, 0x38000000, 0x4000000, 0x3a000000, 0x3a000000, 0x38000000, 0x4000000, 0x3a000000, 0x3a000000, 0x40, 0x80000000, 0x7b000000, 0x0, 0x0, 0x0, 0x600, 0x600, 0x8, 0x8, 0x0, 0x600, 0x600, 0x1800, 0x1800, 0x600, 0x600, 0x8, 0x100, 0x0, 0x8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8, 0x0, 0x0, 0x7e000, 0x0, 0x0, 0x608, 0x7e000, 0x0, 0x0, 0x40, 0x8, 0x100000, 0xe08, 0x0, 0x100000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0, 0x608, 0x40, 0x40, 0x0, 0x0, 0x40, 0x608, };
}
- private static void jj_la1_init_1(){
+ private static void jj_la1_init_1() {
jj_la1_1 = new int[]{ 0x0, 0x2, 0x1000, 0x2000, 0x4000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfffe0000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x18000, 0x18000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3e0000, 0x3e0000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3e0000, 0x0, 0x0, 0x3e0000, 0xfc00000, 0x10, 0xc, 0xc, 0x10, 0x0, 0x10, 0x10, 0x0, 0x210, 0x400, 0xfffe0000, 0x0, 0x10, 0x10, 0x0, 0x0, 0x0, 0xfffe0000, 0x1e0000, 0x0, 0x3e0000, 0x30000000, 0x2000000, 0x2000000, 0x2000000, 0x2000000, 0xf0000000, 0x0, 0xfc00000, 0xf0000000, 0xf03e0000, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfffe0000, };
}
- private static void jj_la1_init_2(){
+ private static void jj_la1_init_2() {
jj_la1_2 = new int[]{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe3ffffff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x20000000, 0xc0000000, 0x80000000, 0x0, 0x0, 0xc0000000, 0xe0000000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc0000000, 0x0, 0x2, 0xe0000000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe3ffffff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe3ffffff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5, 0x0, 0x0, 0x3fffffd, 0xc3fffffd, 0x0, 0x0, 0x3fff8, 0x3fc0000, 0x0, 0xe3ffffff, };
}
- private static void jj_la1_init_3(){
+ private static void jj_la1_init_3() {
jj_la1_3 = new int[]{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x30, 0x30, 0x0, 0x30, 0x0, 0x31, 0x0, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x31, 0x0, 0x0, 0x0, 0x30, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x31, 0x31, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x31, 0x0, 0x0, 0x31, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x31, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x31, 0x0, 0x0, 0x0, 0x0, 0x30, 0x30, 0x30, 0x30, 0x0, 0x0, 0x0, 0x20, 0x31, 0x0, 0x0, 0x0, 0x0, 0x0, 0x31, };
}
@@ -6059,15 +6252,15 @@ public class ADQLParser implements ADQLParserConstants {
private int jj_gc = 0;
/** Constructor with InputStream. */
- public ADQLParser(java.io.InputStream stream){
+ public ADQLParser(java.io.InputStream stream) {
this(stream, (String)null);
}
/** Constructor with InputStream and supplied encoding */
- public ADQLParser(java.io.InputStream stream, String encoding){
- try{
+ public ADQLParser(java.io.InputStream stream, String encoding) {
+ try {
jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1);
- }catch(java.io.UnsupportedEncodingException e){
+ } catch(java.io.UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
token_source = new ADQLParserTokenManager(jj_input_stream);
@@ -6081,15 +6274,15 @@ public class ADQLParser implements ADQLParserConstants {
}
/** Reinitialise. */
- public void ReInit(java.io.InputStream stream){
+ public void ReInit(java.io.InputStream stream) {
ReInit(stream, null);
}
/** Reinitialise. */
- public void ReInit(java.io.InputStream stream, String encoding){
- try{
+ public void ReInit(java.io.InputStream stream, String encoding) {
+ try {
jj_input_stream.ReInit(stream, encoding, 1, 1);
- }catch(java.io.UnsupportedEncodingException e){
+ } catch(java.io.UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
token_source.ReInit(jj_input_stream);
@@ -6103,7 +6296,7 @@ public class ADQLParser implements ADQLParserConstants {
}
/** Constructor. */
- public ADQLParser(java.io.Reader stream){
+ public ADQLParser(java.io.Reader stream) {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
token_source = new ADQLParserTokenManager(jj_input_stream);
token = new Token();
@@ -6116,7 +6309,7 @@ public class ADQLParser implements ADQLParserConstants {
}
/** Reinitialise. */
- public void ReInit(java.io.Reader stream){
+ public void ReInit(java.io.Reader stream) {
jj_input_stream.ReInit(stream, 1, 1);
token_source.ReInit(jj_input_stream);
token = new Token();
@@ -6129,7 +6322,7 @@ public class ADQLParser implements ADQLParserConstants {
}
/** Constructor with generated Token Manager. */
- public ADQLParser(ADQLParserTokenManager tm){
+ public ADQLParser(ADQLParserTokenManager tm) {
token_source = tm;
token = new Token();
jj_ntk = -1;
@@ -6141,7 +6334,7 @@ public class ADQLParser implements ADQLParserConstants {
}
/** Reinitialise. */
- public void ReInit(ADQLParserTokenManager tm){
+ public void ReInit(ADQLParserTokenManager tm) {
token_source = tm;
token = new Token();
jj_ntk = -1;
@@ -6152,20 +6345,20 @@ public class ADQLParser implements ADQLParserConstants {
jj_2_rtns[i] = new JJCalls();
}
- private Token jj_consume_token(int kind) throws ParseException{
+ private Token jj_consume_token(int kind) throws ParseException {
Token oldToken;
if ((oldToken = token).next != null)
token = token.next;
else
token = token.next = token_source.getNextToken();
jj_ntk = -1;
- if (token.kind == kind){
+ if (token.kind == kind) {
jj_gen++;
- if (++jj_gc > 100){
+ if (++jj_gc > 100) {
jj_gc = 0;
- for(int i = 0; i < jj_2_rtns.length; i++){
+ for(int i = 0; i < jj_2_rtns.length; i++) {
JJCalls c = jj_2_rtns[i];
- while(c != null){
+ while(c != null) {
if (c.gen < jj_gen)
c.first = null;
c = c.next;
@@ -6180,26 +6373,27 @@ public class ADQLParser implements ADQLParserConstants {
throw generateParseException();
}
+ @SuppressWarnings("serial")
static private final class LookaheadSuccess extends java.lang.Error {
}
final private LookaheadSuccess jj_ls = new LookaheadSuccess();
- private boolean jj_scan_token(int kind){
- if (jj_scanpos == jj_lastpos){
+ private boolean jj_scan_token(int kind) {
+ if (jj_scanpos == jj_lastpos) {
jj_la--;
- if (jj_scanpos.next == null){
+ if (jj_scanpos.next == null) {
jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
- }else{
+ } else {
jj_lastpos = jj_scanpos = jj_scanpos.next;
}
- }else{
+ } else {
jj_scanpos = jj_scanpos.next;
}
- if (jj_rescan){
+ if (jj_rescan) {
int i = 0;
Token tok = token;
- while(tok != null && tok != jj_scanpos){
+ while(tok != null && tok != jj_scanpos) {
i++;
tok = tok.next;
}
@@ -6214,7 +6408,7 @@ public class ADQLParser implements ADQLParserConstants {
}
/** Get the next Token. */
- final public Token getNextToken(){
+ final public Token getNextToken() {
if (token.next != null)
token = token.next;
else
@@ -6226,9 +6420,9 @@ public class ADQLParser implements ADQLParserConstants {
}
/** Get the specific Token. */
- final public Token getToken(int index){
+ final public Token getToken(int index) {
Token t = token;
- for(int i = 0; i < index; i++){
+ for(int i = 0; i < index; i++) {
if (t.next != null)
t = t.next;
else
@@ -6237,7 +6431,7 @@ public class ADQLParser implements ADQLParserConstants {
return t;
}
- private int jj_ntk(){
+ private int jj_ntk_f() {
if ((jj_nt = token.next) == null)
return (jj_ntk = (token.next = token_source.getNextToken()).kind);
else
@@ -6250,21 +6444,21 @@ public class ADQLParser implements ADQLParserConstants {
private int[] jj_lasttokens = new int[100];
private int jj_endpos;
- private void jj_add_error_token(int kind, int pos){
+ private void jj_add_error_token(int kind, int pos) {
if (pos >= 100)
return;
- if (pos == jj_endpos + 1){
+ if (pos == jj_endpos + 1) {
jj_lasttokens[jj_endpos++] = kind;
- }else if (jj_endpos != 0){
+ } else if (jj_endpos != 0) {
jj_expentry = new int[jj_endpos];
- for(int i = 0; i < jj_endpos; i++){
+ for(int i = 0; i < jj_endpos; i++) {
jj_expentry[i] = jj_lasttokens[i];
}
- jj_entries_loop: for(java.util.Iterator<?> it = jj_expentries.iterator(); it.hasNext();){
+ jj_entries_loop: for(java.util.Iterator<?> it = jj_expentries.iterator(); it.hasNext();) {
int[] oldentry = (int[])(it.next());
- if (oldentry.length == jj_expentry.length){
- for(int i = 0; i < jj_expentry.length; i++){
- if (oldentry[i] != jj_expentry[i]){
+ if (oldentry.length == jj_expentry.length) {
+ for(int i = 0; i < jj_expentry.length; i++) {
+ if (oldentry[i] != jj_expentry[i]) {
continue jj_entries_loop;
}
}
@@ -6278,33 +6472,33 @@ public class ADQLParser implements ADQLParserConstants {
}
/** Generate ParseException. */
- public ParseException generateParseException(){
+ public ParseException generateParseException() {
jj_expentries.clear();
boolean[] la1tokens = new boolean[103];
- if (jj_kind >= 0){
+ if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for(int i = 0; i < 97; i++){
- if (jj_la1[i] == jj_gen){
- for(int j = 0; j < 32; j++){
- if ((jj_la1_0[i] & (1 << j)) != 0){
+ for(int i = 0; i < 97; i++) {
+ if (jj_la1[i] == jj_gen) {
+ for(int j = 0; j < 32; j++) {
+ if ((jj_la1_0[i] & (1 << j)) != 0) {
la1tokens[j] = true;
}
- if ((jj_la1_1[i] & (1 << j)) != 0){
+ if ((jj_la1_1[i] & (1 << j)) != 0) {
la1tokens[32 + j] = true;
}
- if ((jj_la1_2[i] & (1 << j)) != 0){
+ if ((jj_la1_2[i] & (1 << j)) != 0) {
la1tokens[64 + j] = true;
}
- if ((jj_la1_3[i] & (1 << j)) != 0){
+ if ((jj_la1_3[i] & (1 << j)) != 0) {
la1tokens[96 + j] = true;
}
}
}
}
- for(int i = 0; i < 103; i++){
- if (la1tokens[i]){
+ for(int i = 0; i < 103; i++) {
+ if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
jj_expentries.add(jj_expentry);
@@ -6314,7 +6508,7 @@ public class ADQLParser implements ADQLParserConstants {
jj_rescan_token();
jj_add_error_token(0, 0);
int[][] exptokseq = new int[jj_expentries.size()][];
- for(int i = 0; i < jj_expentries.size(); i++){
+ for(int i = 0; i < jj_expentries.size(); i++) {
exptokseq[i] = jj_expentries.get(i);
}
return new ParseException(token, exptokseq, tokenImage);
@@ -6324,18 +6518,18 @@ public class ADQLParser implements ADQLParserConstants {
private boolean trace_enabled = true;
/** Enable tracing. */
- final public void enable_tracing(){
+ final public void enable_tracing() {
trace_enabled = true;
}
/** Disable tracing. */
- final public void disable_tracing(){
+ final public void disable_tracing() {
trace_enabled = false;
}
- private void trace_call(String s){
- if (trace_enabled){
- for(int i = 0; i < trace_indent; i++){
+ private void trace_call(String s) {
+ if (trace_enabled) {
+ for(int i = 0; i < trace_indent; i++) {
System.out.print(" ");
}
System.out.println("Call: " + s);
@@ -6343,52 +6537,52 @@ public class ADQLParser implements ADQLParserConstants {
trace_indent = trace_indent + 2;
}
- private void trace_return(String s){
+ private void trace_return(String s) {
trace_indent = trace_indent - 2;
- if (trace_enabled){
- for(int i = 0; i < trace_indent; i++){
+ if (trace_enabled) {
+ for(int i = 0; i < trace_indent; i++) {
System.out.print(" ");
}
System.out.println("Return: " + s);
}
}
- private void trace_token(Token t, String where){
- if (trace_enabled){
- for(int i = 0; i < trace_indent; i++){
+ private void trace_token(Token t, String where) {
+ if (trace_enabled) {
+ for(int i = 0; i < trace_indent; i++) {
System.out.print(" ");
}
System.out.print("Consumed token: <" + tokenImage[t.kind]);
- if (t.kind != 0 && !tokenImage[t.kind].equals("\"" + t.image + "\"")){
+ if (t.kind != 0 && !tokenImage[t.kind].equals("\"" + t.image + "\"")) {
System.out.print(": \"" + t.image + "\"");
}
System.out.println(" at line " + t.beginLine + " column " + t.beginColumn + ">" + where);
}
}
- private void trace_scan(Token t1, int t2){
- if (trace_enabled){
- for(int i = 0; i < trace_indent; i++){
+ private void trace_scan(Token t1, int t2) {
+ if (trace_enabled) {
+ for(int i = 0; i < trace_indent; i++) {
System.out.print(" ");
}
System.out.print("Visited token: <" + tokenImage[t1.kind]);
- if (t1.kind != 0 && !tokenImage[t1.kind].equals("\"" + t1.image + "\"")){
+ if (t1.kind != 0 && !tokenImage[t1.kind].equals("\"" + t1.image + "\"")) {
System.out.print(": \"" + t1.image + "\"");
}
System.out.println(" at line " + t1.beginLine + " column " + t1.beginColumn + ">; Expected token: <" + tokenImage[t2] + ">");
}
}
- private void jj_rescan_token(){
+ private void jj_rescan_token() {
jj_rescan = true;
- for(int i = 0; i < 18; i++){
- try{
+ for(int i = 0; i < 18; i++) {
+ try {
JJCalls p = jj_2_rtns[i];
- do{
- if (p.gen > jj_gen){
+ do {
+ if (p.gen > jj_gen) {
jj_la = p.arg;
jj_lastpos = jj_scanpos = p.first;
- switch(i){
+ switch(i) {
case 0:
jj_3_1();
break;
@@ -6446,17 +6640,17 @@ public class ADQLParser implements ADQLParserConstants {
}
}
p = p.next;
- }while(p != null);
- }catch(LookaheadSuccess ls){
+ } while(p != null);
+ } catch(LookaheadSuccess ls) {
}
}
jj_rescan = false;
}
- private void jj_save(int index, int xla){
+ private void jj_save(int index, int xla) {
JJCalls p = jj_2_rtns[index];
- while(p.gen > jj_gen){
- if (p.next == null){
+ while(p.gen > jj_gen) {
+ if (p.next == null) {
p = p.next = new JJCalls();
break;
}
diff --git a/src/adql/parser/ADQLParserTokenManager.java b/src/adql/parser/ADQLParserTokenManager.java
index 7f47aa7d68da959f0f403295cee287f9a7a84c9e..d2ded11336ddb20340ea1be48f428da043c54be6 100644
--- a/src/adql/parser/ADQLParserTokenManager.java
+++ b/src/adql/parser/ADQLParserTokenManager.java
@@ -1,3 +1,4 @@
+/* ADQLParserTokenManager.java */
/* Generated By:JavaCC: Do not edit this line. ADQLParserTokenManager.java */
package adql.parser;
import java.util.Stack;
@@ -20,23 +21,20 @@ import adql.translator.PostgreSQLTranslator;
import adql.translator.TranslationException;
/** Token Manager. */
-public class ADQLParserTokenManager implements ADQLParserConstants
-{
+@SuppressWarnings("unused")public class ADQLParserTokenManager implements ADQLParserConstants {
/** Debug output. */
public java.io.PrintStream debugStream = System.out;
/** Set debug output. */
public void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
-private final int jjStopStringLiteralDfa_2(int pos, long active0, long active1)
-{
+private final int jjStopStringLiteralDfa_2(int pos, long active0, long active1){
switch (pos)
{
default :
return -1;
}
}
-private final int jjStartNfa_2(int pos, long active0, long active1)
-{
+private final int jjStartNfa_2(int pos, long active0, long active1){
return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0, active1), pos + 1);
}
private int jjStopAtPos(int pos, int kind)
@@ -45,8 +43,7 @@ private int jjStopAtPos(int pos, int kind)
jjmatchedPos = pos;
return pos + 1;
}
-private int jjMoveStringLiteralDfa0_2()
-{
+private int jjMoveStringLiteralDfa0_2(){
switch(curChar)
{
case 34:
@@ -148,8 +145,7 @@ private int jjMoveNfa_2(int startState, int curPos)
catch(java.io.IOException e) { return curPos; }
}
}
-private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
-{
+private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1){
switch (pos)
{
case 0:
@@ -814,12 +810,10 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
return -1;
}
}
-private final int jjStartNfa_0(int pos, long active0, long active1)
-{
+private final int jjStartNfa_0(int pos, long active0, long active1){
return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1), pos + 1);
}
-private int jjMoveStringLiteralDfa0_0()
-{
+private int jjMoveStringLiteralDfa0_0(){
switch(curChar)
{
case 34:
@@ -918,8 +912,7 @@ private int jjMoveStringLiteralDfa0_0()
return jjMoveNfa_0(0, 0);
}
}
-private int jjMoveStringLiteralDfa1_0(long active0, long active1)
-{
+private int jjMoveStringLiteralDfa1_0(long active0, long active1){
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(0, active0, active1);
@@ -1016,8 +1009,7 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1)
}
return jjStartNfa_0(0, active0, active1);
}
-private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1)
-{
+private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1){
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(0, old0, old1);
try { curChar = input_stream.readChar(); }
@@ -1129,8 +1121,7 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
}
return jjStartNfa_0(1, active0, active1);
}
-private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1)
-{
+private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1){
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(1, old0, old1);
try { curChar = input_stream.readChar(); }
@@ -1224,8 +1215,7 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
}
return jjStartNfa_0(2, active0, active1);
}
-private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long active1)
-{
+private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long active1){
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(2, old0, old1);
try { curChar = input_stream.readChar(); }
@@ -1308,8 +1298,7 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
}
return jjStartNfa_0(3, active0, active1);
}
-private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long active1)
-{
+private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long active1){
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(3, old0, old1);
try { curChar = input_stream.readChar(); }
@@ -1366,8 +1355,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
}
return jjStartNfa_0(4, active0, active1);
}
-private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long active1)
-{
+private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long active1){
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(4, old0, old1);
try { curChar = input_stream.readChar(); }
@@ -1421,8 +1409,7 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
}
return jjStartNfa_0(5, active0, active1);
}
-private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long active1)
-{
+private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long active1){
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(5, old0, old1);
try { curChar = input_stream.readChar(); }
@@ -1459,8 +1446,7 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
}
return jjStartNfa_0(6, active0, active1);
}
-private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long active1)
-{
+private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long active1){
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(6, old0, old1);
try { curChar = input_stream.readChar(); }
@@ -1478,8 +1464,7 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
}
return jjStartNfa_0(7, active0, 0L);
}
-private int jjMoveStringLiteralDfa9_0(long old0, long active0)
-{
+private int jjMoveStringLiteralDfa9_0(long old0, long active0){
if (((active0 &= old0)) == 0L)
return jjStartNfa_0(7, old0, 0L);
try { curChar = input_stream.readChar(); }
@@ -1530,13 +1515,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 620:
@@ -1544,13 +1529,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 656:
@@ -1558,13 +1543,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 373:
@@ -1572,13 +1557,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 376:
@@ -1586,13 +1571,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 966:
@@ -1600,23 +1585,23 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 95)
kind = 95;
- jjCheckNAdd(952);
+ { jjCheckNAdd(952); }
}
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(948, 949);
+ { jjCheckNAddTwoStates(948, 949); }
break;
case 303:
if ((0x83ff001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 431:
@@ -1624,13 +1609,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 5:
@@ -1638,13 +1623,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 168:
@@ -1652,13 +1637,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 669:
@@ -1666,13 +1651,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 137:
@@ -1680,13 +1665,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 324:
@@ -1694,13 +1679,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 910:
@@ -1708,13 +1693,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 295:
@@ -1722,13 +1707,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 33:
@@ -1736,13 +1721,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 877:
@@ -1750,13 +1735,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 423:
@@ -1764,13 +1749,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 908:
@@ -1778,13 +1763,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 932:
@@ -1792,13 +1777,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 249:
@@ -1806,13 +1791,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 821:
@@ -1820,13 +1805,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 491:
@@ -1834,13 +1819,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 637:
@@ -1848,13 +1833,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 967:
@@ -1862,13 +1847,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 813:
@@ -1876,13 +1861,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 501:
@@ -1890,13 +1875,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 481:
@@ -1904,13 +1889,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 452:
@@ -1918,13 +1903,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 410:
@@ -1932,13 +1917,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 372:
@@ -1946,13 +1931,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 752:
@@ -1960,13 +1945,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 969:
@@ -1974,13 +1959,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 859:
@@ -1988,13 +1973,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 315:
@@ -2002,13 +1987,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 32:
@@ -2016,13 +2001,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 52:
@@ -2030,13 +2015,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 426:
@@ -2044,13 +2029,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 0:
@@ -2058,7 +2043,7 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 96)
kind = 96;
- jjCheckNAddStates(0, 8);
+ { jjCheckNAddStates(0, 8); }
}
else if ((0x100002600L & l) != 0L)
{
@@ -2069,10 +2054,10 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
else if (curChar == 46)
- jjCheckNAddTwoStates(948, 952);
+ { jjCheckNAddTwoStates(948, 952); }
else if (curChar == 45)
jjstateSet[jjnewStateCnt++] = 22;
else if (curChar == 60)
@@ -2087,13 +2072,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 377:
@@ -2101,13 +2086,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 404:
@@ -2115,13 +2100,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 45:
@@ -2129,13 +2114,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 717:
@@ -2143,13 +2128,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 345:
@@ -2157,13 +2142,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 909:
@@ -2171,13 +2156,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 378:
@@ -2185,13 +2170,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 302:
@@ -2199,13 +2184,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 454:
@@ -2213,13 +2198,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 416:
@@ -2227,13 +2212,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 670:
@@ -2241,13 +2226,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 797:
@@ -2255,13 +2240,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 482:
@@ -2269,13 +2254,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 453:
@@ -2283,13 +2268,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 439:
@@ -2297,13 +2282,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 396:
@@ -2311,13 +2296,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 550:
@@ -2325,13 +2310,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 597:
@@ -2339,13 +2324,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 471:
@@ -2353,13 +2338,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 770:
@@ -2367,13 +2352,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 549:
@@ -2381,13 +2366,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 430:
@@ -2395,13 +2380,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 965:
@@ -2409,13 +2394,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 438:
@@ -2423,13 +2408,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 801:
@@ -2437,13 +2422,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 581:
@@ -2451,13 +2436,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 858:
@@ -2465,13 +2450,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 472:
@@ -2479,13 +2464,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 913:
@@ -2493,13 +2478,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 796:
@@ -2507,13 +2492,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 427:
@@ -2521,13 +2506,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 443:
@@ -2535,13 +2520,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 424:
@@ -2549,13 +2534,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 900:
@@ -2563,13 +2548,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 264:
@@ -2577,13 +2562,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 968:
@@ -2591,13 +2576,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 113:
@@ -2605,13 +2590,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 884:
@@ -2619,13 +2604,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x8000001a00000000L & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 1:
@@ -2661,14 +2646,14 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
if (kind > 90)
kind = 90;
- jjCheckNAddStates(9, 11);
+ { jjCheckNAddStates(9, 11); }
break;
case 23:
if ((0xffffffffffffdbffL & l) == 0L)
break;
if (kind > 90)
kind = 90;
- jjCheckNAddStates(9, 11);
+ { jjCheckNAddStates(9, 11); }
break;
case 24:
if ((0x2400L & l) != 0L && kind > 90)
@@ -2687,14 +2672,14 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
break;
case 28:
if ((0x83ff001a00000000L & l) == 0L)
break;
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
break;
case 255:
if (curChar == 45)
@@ -2702,95 +2687,95 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 947:
if (curChar == 46)
- jjCheckNAddTwoStates(948, 952);
+ { jjCheckNAddTwoStates(948, 952); }
break;
case 948:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(948, 949);
+ { jjCheckNAddTwoStates(948, 949); }
break;
case 950:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(951);
+ { jjCheckNAdd(951); }
break;
case 951:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 94)
kind = 94;
- jjCheckNAdd(951);
+ { jjCheckNAdd(951); }
break;
case 952:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 95)
kind = 95;
- jjCheckNAdd(952);
+ { jjCheckNAdd(952); }
break;
case 953:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 96)
kind = 96;
- jjCheckNAddStates(0, 8);
+ { jjCheckNAddStates(0, 8); }
break;
case 954:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(954, 949);
+ { jjCheckNAddTwoStates(954, 949); }
break;
case 955:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(955, 956);
+ { jjCheckNAddTwoStates(955, 956); }
break;
case 956:
if (curChar == 46)
- jjCheckNAddTwoStates(957, 949);
+ { jjCheckNAddTwoStates(957, 949); }
break;
case 957:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(957, 949);
+ { jjCheckNAddTwoStates(957, 949); }
break;
case 958:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(958, 959);
+ { jjCheckNAddTwoStates(958, 959); }
break;
case 959:
if (curChar != 46)
break;
if (kind > 95)
kind = 95;
- jjCheckNAdd(960);
+ { jjCheckNAdd(960); }
break;
case 960:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 95)
kind = 95;
- jjCheckNAdd(960);
+ { jjCheckNAdd(960); }
break;
case 961:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 96)
kind = 96;
- jjCheckNAdd(961);
+ { jjCheckNAdd(961); }
break;
case 962:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(962, 963);
+ { jjCheckNAddTwoStates(962, 963); }
break;
case 963:
if ((0x8000001a00000000L & l) == 0L)
break;
if (kind > 101)
kind = 101;
- jjCheckNAdd(964);
+ { jjCheckNAdd(964); }
break;
case 964:
if ((0x83ff001a00000000L & l) == 0L)
break;
if (kind > 101)
kind = 101;
- jjCheckNAdd(964);
+ { jjCheckNAdd(964); }
break;
default : break;
}
@@ -2808,13 +2793,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x200000002000000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 665;
@@ -2831,7 +2816,7 @@ private int jjMoveNfa_0(int startState, int curPos)
else if ((0x20000000200L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 620;
else if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
else if ((0x800000008L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 593;
if ((0x2000000020000L & l) != 0L)
@@ -2845,7 +2830,7 @@ private int jjMoveNfa_0(int startState, int curPos)
else if ((0x2000000020L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 607;
if ((0x2000000020000L & l) != 0L)
- jjCheckNAdd(280);
+ { jjCheckNAdd(280); }
else if ((0x2000000020L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 602;
if ((0x2000000020L & l) != 0L)
@@ -2856,29 +2841,29 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x400000004000000L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 656:
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x400000004L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 655;
@@ -2888,13 +2873,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x800000008000L & l) != 0L)
{
@@ -2913,29 +2898,29 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x800000008L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
break;
case 303:
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x800000008000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 302;
@@ -2945,13 +2930,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x400000004000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 433;
@@ -2963,13 +2948,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x800000008000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 4;
@@ -2979,13 +2964,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x20000000200L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 167;
@@ -2995,13 +2980,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x400000004L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 668;
@@ -3011,13 +2996,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x40000000400000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 173;
@@ -3037,13 +3022,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x200000002L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 323;
@@ -3053,13 +3038,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x100000001000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 945;
@@ -3073,11 +3058,11 @@ private int jjMoveNfa_0(int startState, int curPos)
else if ((0x8000000080000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 932;
else if ((0x4000000040000L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
else if ((0x400000004000L & l) != 0L)
- jjCheckNAdd(7);
+ { jjCheckNAdd(7); }
else if ((0x1000000010L & l) != 0L)
- jjCheckNAdd(53);
+ { jjCheckNAdd(53); }
else if ((0x800000008L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 913;
else if ((0x400000004L & l) != 0L)
@@ -3092,13 +3077,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x800000008000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 312;
@@ -3113,20 +3098,20 @@ private int jjMoveNfa_0(int startState, int curPos)
if ((0x800000008000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 309;
if ((0x800000008000L & l) != 0L)
- jjCheckNAdd(3);
+ { jjCheckNAdd(3); }
break;
case 33:
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x800000008000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 45;
@@ -3135,20 +3120,20 @@ private int jjMoveNfa_0(int startState, int curPos)
else if ((0x2000000020L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 32;
if ((0x20000000200L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
break;
case 877:
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x8000000080000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 901;
@@ -3162,13 +3147,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x10000000100000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 422;
@@ -3178,13 +3163,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x800000008000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 907;
@@ -3194,13 +3179,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x8000000080000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 931;
@@ -3210,13 +3195,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x100000001000000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 290;
@@ -3229,7 +3214,7 @@ private int jjMoveNfa_0(int startState, int curPos)
if ((0x100000001000000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 285;
else if ((0x400000004000L & l) != 0L)
- jjCheckNAdd(53);
+ { jjCheckNAdd(53); }
if ((0x100000001000000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 278;
if ((0x100000001000000L & l) != 0L)
@@ -3244,13 +3229,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x8000000080000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 867;
@@ -3276,13 +3261,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x20000000200000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 546;
@@ -3295,7 +3280,7 @@ private int jjMoveNfa_0(int startState, int curPos)
if ((0x4000000040000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 535;
else if ((0x200000002L & l) != 0L)
- jjCheckNAdd(53);
+ { jjCheckNAdd(53); }
if ((0x4000000040000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 527;
if ((0x4000000040000L & l) != 0L)
@@ -3312,13 +3297,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x100000001000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 648;
@@ -3337,13 +3322,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x2000000020L & l) != 0L)
{
@@ -3356,13 +3341,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x20000000200L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 902;
@@ -3373,7 +3358,7 @@ private int jjMoveNfa_0(int startState, int curPos)
else if ((0x2000000020L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 868;
else if ((0x200000002L & l) != 0L)
- jjCheckNAdd(7);
+ { jjCheckNAdd(7); }
if ((0x800000008000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 889;
else if ((0x20000000200L & l) != 0L)
@@ -3404,13 +3389,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x8000000080000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 500;
@@ -3420,13 +3405,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x1000000010000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 480;
@@ -3436,29 +3421,29 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x20000000200L & l) != 0L)
- jjCheckNAdd(451);
+ { jjCheckNAdd(451); }
break;
case 410:
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x40000000400000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 412;
@@ -3470,13 +3455,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x4000000040000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 384;
@@ -3490,13 +3475,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x8000000080000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 772;
@@ -3518,13 +3503,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x10000000100000L & l) != 0L)
{
@@ -3537,13 +3522,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x800000008L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 866;
@@ -3555,13 +3540,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x4000000040000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 324;
@@ -3570,7 +3555,7 @@ private int jjMoveNfa_0(int startState, int curPos)
else if ((0x100000001000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 318;
else if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
if ((0x800000008000L & l) != 0L)
{
if (kind > 2)
@@ -3582,13 +3567,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x8000000080L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 31;
@@ -3598,13 +3583,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x20000000200000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 245;
@@ -3672,13 +3657,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x20000000200000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 425;
@@ -3688,46 +3673,46 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x200000002L & l) != 0L)
- jjCheckNAddStates(12, 22);
+ { jjCheckNAddStates(12, 22); }
else if ((0x1000000010L & l) != 0L)
- jjAddStates(23, 39);
+ { jjAddStates(23, 39); }
else if ((0x80000000800000L & l) != 0L)
- jjAddStates(40, 44);
+ { jjAddStates(40, 44); }
else if ((0x40000000400000L & l) != 0L)
- jjAddStates(45, 49);
+ { jjAddStates(45, 49); }
else if ((0x20000000200000L & l) != 0L)
- jjAddStates(50, 56);
+ { jjAddStates(50, 56); }
else if ((0x10000000100000L & l) != 0L)
- jjCheckNAddStates(57, 70);
+ { jjCheckNAddStates(57, 70); }
else if ((0x8000000080000L & l) != 0L)
- jjAddStates(71, 87);
+ { jjAddStates(71, 87); }
else if ((0x4000000040000L & l) != 0L)
- jjAddStates(88, 95);
+ { jjAddStates(88, 95); }
else if ((0x1000000010000L & l) != 0L)
- jjAddStates(96, 106);
+ { jjAddStates(96, 106); }
else if ((0x800000008000L & l) != 0L)
- jjCheckNAddStates(107, 113);
+ { jjCheckNAddStates(107, 113); }
else if ((0x400000004000L & l) != 0L)
- jjCheckNAddStates(114, 120);
+ { jjCheckNAddStates(114, 120); }
else if ((0x200000002000L & l) != 0L)
- jjAddStates(121, 124);
+ { jjAddStates(121, 124); }
else if ((0x100000001000L & l) != 0L)
- jjAddStates(125, 130);
+ { jjAddStates(125, 130); }
else if ((0x20000000200L & l) != 0L)
- jjAddStates(131, 143);
+ { jjAddStates(131, 143); }
else if ((0x8000000080L & l) != 0L)
- jjCheckNAddStates(144, 148);
+ { jjCheckNAddStates(144, 148); }
else if ((0x4000000040L & l) != 0L)
- jjAddStates(149, 155);
+ { jjAddStates(149, 155); }
else if ((0x2000000020L & l) != 0L)
- jjAddStates(156, 165);
+ { jjAddStates(156, 165); }
else if ((0x800000008L & l) != 0L)
- jjAddStates(166, 195);
+ { jjAddStates(166, 195); }
else if ((0x400000004L & l) != 0L)
- jjAddStates(196, 199);
+ { jjAddStates(196, 199); }
else if ((0x400000004000000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 15;
else if ((0x200000002000000L & l) != 0L)
@@ -3742,13 +3727,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x8000000080000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 396;
@@ -3765,7 +3750,7 @@ private int jjMoveNfa_0(int startState, int curPos)
if ((0x400000004000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 374;
if ((0x400000004000L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
if ((0x400000004000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 368;
if ((0x400000004000L & l) != 0L)
@@ -3782,13 +3767,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x2000000020L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 376;
@@ -3798,13 +3783,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x800000008000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 419;
@@ -3824,32 +3809,32 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x10000000100000L & l) != 0L)
- jjCheckNAdd(36);
+ { jjCheckNAdd(36); }
break;
case 717:
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x20000000200000L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
else if ((0x20000000200L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 744;
else if ((0x200000002L & l) != 0L)
@@ -3866,16 +3851,16 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x10000000100000L & l) != 0L)
- jjCheckNAdd(320);
+ { jjCheckNAdd(320); }
else if ((0x8000000080000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 367;
else if ((0x1000000010000L & l) != 0L)
@@ -3903,13 +3888,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x8000000080000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 908;
@@ -3919,13 +3904,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x40000000400000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 383;
@@ -3937,29 +3922,29 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x200000002L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
break;
case 454:
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x200000002000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 458;
@@ -3971,13 +3956,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x80000000800000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 418;
@@ -3989,13 +3974,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x4000000040000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 747;
@@ -4034,13 +4019,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x4000000040000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 809;
@@ -4058,13 +4043,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x10000000100000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 481;
@@ -4074,13 +4059,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x100000001000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 452;
@@ -4090,13 +4075,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x20000000200000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 459;
@@ -4121,13 +4106,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x800000008000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 395;
@@ -4137,13 +4122,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x800000008000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 583;
@@ -4167,13 +4152,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x10000000100000L & l) != 0L)
{
@@ -4194,13 +4179,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x40000000400000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 488;
@@ -4225,16 +4210,16 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(3);
+ { jjCheckNAdd(3); }
else if ((0x200000002L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 769;
break;
@@ -4243,13 +4228,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x40000000400000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 574;
@@ -4260,22 +4245,22 @@ private int jjMoveNfa_0(int startState, int curPos)
else if ((0x4000000040L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 558;
else if ((0x200000002L & l) != 0L)
- jjCheckNAdd(280);
+ { jjCheckNAdd(280); }
if ((0x200000002L & l) != 0L)
- jjCheckNAdd(53);
+ { jjCheckNAdd(53); }
break;
case 430:
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x20000000200000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 429;
@@ -4285,13 +4270,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
break;
case 438:
@@ -4299,13 +4284,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x10000000100000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 443;
@@ -4317,13 +4302,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x400000004000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 800;
@@ -4338,16 +4323,16 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x80000000800000L & l) != 0L)
- jjCheckNAdd(156);
+ { jjCheckNAdd(156); }
else if ((0x100000001000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 580;
break;
@@ -4356,13 +4341,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x4000000040000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 865;
@@ -4374,29 +4359,29 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x100000001000L & l) != 0L)
- jjCheckNAdd(7);
+ { jjCheckNAdd(7); }
break;
case 913:
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x10000000100000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 912;
@@ -4406,31 +4391,31 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x2000000020L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 801;
if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(30);
+ { jjCheckNAdd(30); }
break;
case 427:
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x400000004000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 426;
@@ -4440,13 +4425,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x20000000200L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 442;
@@ -4456,13 +4441,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x800000008000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 434;
@@ -4478,13 +4463,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x20000000200L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 899;
@@ -4494,13 +4479,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x10000000100000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 289;
@@ -4511,7 +4496,7 @@ private int jjMoveNfa_0(int startState, int curPos)
if ((0x10000000100000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 284;
else if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(251);
+ { jjCheckNAdd(251); }
else if ((0x800000008L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 263;
break;
@@ -4520,13 +4505,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x200000002000000L & l) != 0L)
{
@@ -4539,13 +4524,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x4000000040000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 185;
@@ -4577,13 +4562,13 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
}
if ((0x6fffffffefffffffL & l) != 0L)
{
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
}
if ((0x10000000100000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 900;
@@ -4597,7 +4582,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 4:
case 689:
if ((0x20000000200000L & l) != 0L)
- jjCheckNAdd(3);
+ { jjCheckNAdd(3); }
break;
case 6:
if ((0x10000000100L & l) != 0L)
@@ -4609,7 +4594,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 8:
if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(7);
+ { jjCheckNAdd(7); }
break;
case 9:
if ((0x80000000800L & l) != 0L)
@@ -4620,7 +4605,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 446:
case 782:
if ((0x200000002L & l) != 0L)
- jjCheckNAdd(3);
+ { jjCheckNAdd(3); }
break;
case 11:
if ((0x2000000020L & l) != 0L)
@@ -4636,7 +4621,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 14:
if ((0x400000004000L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 15:
if ((0x800000008000L & l) != 0L)
@@ -4649,25 +4634,25 @@ private int jjMoveNfa_0(int startState, int curPos)
case 23:
if (kind > 90)
kind = 90;
- jjAddStates(9, 11);
+ { jjAddStates(9, 11); }
break;
case 27:
if ((0x6fffffffefffffffL & l) == 0L)
break;
if (kind > 101)
kind = 101;
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
break;
case 28:
if ((0x6fffffffefffffffL & l) == 0L)
break;
if (kind > 101)
kind = 101;
- jjCheckNAdd(28);
+ { jjCheckNAdd(28); }
break;
case 29:
if ((0x400000004L & l) != 0L)
- jjAddStates(196, 199);
+ { jjAddStates(196, 199); }
break;
case 30:
if ((0x400000004000L & l) != 0L && kind > 2)
@@ -4676,7 +4661,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 31:
case 887:
if ((0x20000000200L & l) != 0L)
- jjCheckNAdd(30);
+ { jjCheckNAdd(30); }
break;
case 34:
if ((0x10000000100000L & l) != 0L && kind > 2)
@@ -4685,7 +4670,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 35:
case 131:
if ((0x20000000200L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
break;
case 36:
if ((0x10000000100L & l) != 0L && kind > 2)
@@ -4698,7 +4683,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 462:
case 804:
if ((0x10000000100000L & l) != 0L)
- jjCheckNAdd(36);
+ { jjCheckNAdd(36); }
break;
case 38:
if ((0x8000000080L & l) != 0L)
@@ -4734,12 +4719,12 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 47:
if ((0x800000008L & l) != 0L)
- jjAddStates(166, 195);
+ { jjAddStates(166, 195); }
break;
case 48:
case 634:
if ((0x1000000010L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 49:
if ((0x200000002L & l) != 0L)
@@ -4760,7 +4745,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 54:
case 846:
if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(53);
+ { jjCheckNAdd(53); }
break;
case 55:
if ((0x1000000010L & l) != 0L)
@@ -4787,7 +4772,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 248:
case 293:
if ((0x8000000080000L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 61:
if ((0x200000002L & l) != 0L)
@@ -4797,7 +4782,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 299:
case 405:
if ((0x8000000080000L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
break;
case 63:
if ((0x200000002L & l) != 0L)
@@ -4809,7 +4794,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 65:
if ((0x800000008000L & l) != 0L)
- jjCheckNAdd(64);
+ { jjCheckNAdd(64); }
break;
case 66:
if ((0x100000001000L & l) != 0L)
@@ -4841,7 +4826,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 798:
case 922:
if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(3);
+ { jjCheckNAdd(3); }
break;
case 73:
if ((0x10000000100000L & l) != 0L)
@@ -4958,7 +4943,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 103:
case 577:
if ((0x800000008L & l) != 0L)
- jjCheckNAdd(102);
+ { jjCheckNAdd(102); }
break;
case 104:
if ((0x2000000020L & l) != 0L)
@@ -4979,7 +4964,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 109:
case 630:
if ((0x800000008L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 110:
if ((0x8000000080000L & l) != 0L)
@@ -5014,7 +4999,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 905:
case 916:
if ((0x10000000100000L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 116:
if ((0x200000002L & l) != 0L)
@@ -5048,7 +5033,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 927:
case 934:
if ((0x800000008000L & l) != 0L)
- jjCheckNAdd(30);
+ { jjCheckNAdd(30); }
break;
case 121:
if ((0x20000000200L & l) != 0L)
@@ -5076,7 +5061,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 127:
if ((0x200000002000L & l) != 0L)
- jjCheckNAdd(30);
+ { jjCheckNAdd(30); }
break;
case 128:
if ((0x20000000200000L & l) != 0L)
@@ -5107,7 +5092,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 567:
case 879:
if ((0x800000008L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
break;
case 136:
if ((0x2000000020L & l) != 0L)
@@ -5154,7 +5139,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 323:
case 622:
if ((0x400000004000L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
break;
case 149:
if ((0x20000000200L & l) != 0L)
@@ -5190,7 +5175,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 157:
if ((0x10000000100000L & l) != 0L)
- jjCheckNAdd(156);
+ { jjCheckNAdd(156); }
break;
case 158:
if ((0x400000004000L & l) != 0L)
@@ -5228,7 +5213,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 753:
case 775:
if ((0x20000000200000L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 167:
if ((0x400000004000L & l) != 0L)
@@ -5249,7 +5234,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 172:
case 366:
if ((0x4000000040000L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
break;
case 173:
if ((0x2000000020L & l) != 0L)
@@ -5273,7 +5258,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 713:
case 787:
if ((0x400000004000L & l) != 0L)
- jjCheckNAdd(64);
+ { jjCheckNAdd(64); }
break;
case 178:
if ((0x20000000200L & l) != 0L)
@@ -5383,7 +5368,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 628:
case 680:
if ((0x200000002000L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 208:
if ((0x20000000200L & l) != 0L)
@@ -5428,7 +5413,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 218:
case 682:
if ((0x200000002000L & l) != 0L)
- jjCheckNAdd(217);
+ { jjCheckNAdd(217); }
break;
case 219:
if ((0x200000002L & l) != 0L)
@@ -5528,7 +5513,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 639:
case 862:
if ((0x800000008000L & l) != 0L)
- jjCheckNAdd(3);
+ { jjCheckNAdd(3); }
break;
case 244:
if ((0x8000000080000L & l) != 0L)
@@ -5544,13 +5529,13 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 247:
if ((0x2000000020L & l) != 0L)
- jjAddStates(156, 165);
+ { jjAddStates(156, 165); }
break;
case 250:
case 311:
case 595:
if ((0x400000004000L & l) != 0L)
- jjCheckNAdd(53);
+ { jjCheckNAdd(53); }
break;
case 251:
if ((0x800000008L & l) != 0L && kind > 2)
@@ -5558,7 +5543,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 252:
if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(251);
+ { jjCheckNAdd(251); }
break;
case 253:
if ((0x100000001000000L & l) != 0L)
@@ -5578,7 +5563,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 258:
if ((0x1000000010000L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 259:
if ((0x200000002L & l) != 0L)
@@ -5594,7 +5579,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 262:
if ((0x1000000010000L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
break;
case 263:
if ((0x2000000020L & l) != 0L)
@@ -5630,7 +5615,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 273:
if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(251);
+ { jjCheckNAdd(251); }
break;
case 274:
if ((0x100000001000000L & l) != 0L)
@@ -5664,7 +5649,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 492:
case 823:
if ((0x200000002L & l) != 0L)
- jjCheckNAdd(280);
+ { jjCheckNAdd(280); }
break;
case 282:
if ((0x400000004000L & l) != 0L)
@@ -5704,7 +5689,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 292:
if ((0x4000000040L & l) != 0L)
- jjAddStates(149, 155);
+ { jjAddStates(149, 155); }
break;
case 294:
if ((0x100000001000L & l) != 0L)
@@ -5713,7 +5698,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 296:
case 422:
if ((0x800000008L & l) != 0L)
- jjCheckNAdd(36);
+ { jjCheckNAdd(36); }
break;
case 297:
if ((0x10000000100000L & l) != 0L)
@@ -5737,11 +5722,11 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 305:
if ((0x800000008000L & l) != 0L)
- jjCheckNAdd(3);
+ { jjCheckNAdd(3); }
break;
case 306:
if ((0x8000000080L & l) != 0L)
- jjCheckNAdd(30);
+ { jjCheckNAdd(30); }
break;
case 307:
if ((0x20000000200L & l) != 0L)
@@ -5769,7 +5754,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 314:
if ((0x8000000080L & l) != 0L)
- jjCheckNAddStates(144, 148);
+ { jjCheckNAddStates(144, 148); }
break;
case 317:
if ((0x400000004L & l) != 0L)
@@ -5789,7 +5774,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 321:
if ((0x10000000100000L & l) != 0L)
- jjCheckNAdd(320);
+ { jjCheckNAdd(320); }
break;
case 322:
if ((0x800000008000L & l) != 0L)
@@ -5801,11 +5786,11 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 326:
if ((0x20000000200L & l) != 0L)
- jjAddStates(131, 143);
+ { jjAddStates(131, 143); }
break;
case 327:
if ((0x10000000100000L & l) != 0L)
- jjCheckNAdd(7);
+ { jjCheckNAdd(7); }
break;
case 328:
if ((0x20000000200L & l) != 0L)
@@ -5869,7 +5854,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 347:
if ((0x100000001000L & l) != 0L)
- jjCheckNAdd(7);
+ { jjCheckNAdd(7); }
break;
case 348:
if ((0x100000001000L & l) != 0L)
@@ -5898,7 +5883,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 354:
case 480:
if ((0x20000000200000L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
break;
case 355:
if ((0x1000000010000L & l) != 0L)
@@ -5912,7 +5897,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 515:
case 561:
if ((0x40000000400000L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 358:
if ((0x20000000200L & l) != 0L)
@@ -5960,7 +5945,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 370:
if ((0x400000004000L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
break;
case 374:
if ((0x10000000100000L & l) != 0L)
@@ -6008,7 +5993,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 389:
if ((0x10000000100000L & l) != 0L)
- jjCheckNAdd(320);
+ { jjCheckNAdd(320); }
break;
case 390:
if ((0x400000004000L & l) != 0L)
@@ -6036,12 +6021,12 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 398:
if ((0x100000001000L & l) != 0L)
- jjAddStates(125, 130);
+ { jjAddStates(125, 130); }
break;
case 399:
case 769:
if ((0x8000000080L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 400:
if ((0x200000002L & l) != 0L)
@@ -6077,7 +6062,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 412:
if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(280);
+ { jjCheckNAdd(280); }
break;
case 413:
if ((0x40000000400000L & l) != 0L)
@@ -6101,7 +6086,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 421:
if ((0x200000002000L & l) != 0L)
- jjAddStates(121, 124);
+ { jjAddStates(121, 124); }
break;
case 428:
if ((0x20000000200L & l) != 0L)
@@ -6112,7 +6097,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 838:
case 891:
if ((0x100000001000L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 432:
if ((0x800000008000L & l) != 0L)
@@ -6128,14 +6113,14 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 436:
if ((0x400000004000L & l) != 0L)
- jjCheckNAddStates(114, 120);
+ { jjCheckNAddStates(114, 120); }
break;
case 437:
case 529:
case 553:
case 778:
if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(156);
+ { jjCheckNAdd(156); }
break;
case 441:
if ((0x400000004000L & l) != 0L)
@@ -6163,7 +6148,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 449:
if ((0x100000001000000L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
break;
case 450:
if ((0x2000000020L & l) != 0L)
@@ -6180,7 +6165,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 456:
case 544:
if ((0x20000000200L & l) != 0L)
- jjCheckNAdd(251);
+ { jjCheckNAdd(251); }
break;
case 457:
if ((0x4000000040000L & l) != 0L)
@@ -6200,7 +6185,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 461:
if ((0x800000008000L & l) != 0L)
- jjCheckNAddStates(107, 113);
+ { jjCheckNAddStates(107, 113); }
break;
case 463:
if ((0x8000000080L & l) != 0L)
@@ -6241,7 +6226,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 474:
case 678:
if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(30);
+ { jjCheckNAdd(30); }
break;
case 475:
if ((0x1000000010000L & l) != 0L)
@@ -6265,7 +6250,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 484:
if ((0x1000000010000L & l) != 0L)
- jjCheckNAdd(156);
+ { jjCheckNAdd(156); }
break;
case 485:
if ((0x200000002L & l) != 0L)
@@ -6289,7 +6274,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 490:
if ((0x1000000010000L & l) != 0L)
- jjAddStates(96, 106);
+ { jjAddStates(96, 106); }
break;
case 493:
if ((0x20000000200L & l) != 0L)
@@ -6351,7 +6336,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 537:
case 828:
if ((0x4000000040000L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 511:
if ((0x200000002L & l) != 0L)
@@ -6392,7 +6377,7 @@ private int jjMoveNfa_0(int startState, int curPos)
case 521:
case 671:
if ((0x4000000040000L & l) != 0L)
- jjCheckNAdd(7);
+ { jjCheckNAdd(7); }
break;
case 522:
if ((0x200000002L & l) != 0L)
@@ -6484,11 +6469,11 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 548:
if ((0x4000000040000L & l) != 0L)
- jjAddStates(88, 95);
+ { jjAddStates(88, 95); }
break;
case 551:
if ((0x200000002L & l) != 0L)
- jjCheckNAdd(280);
+ { jjCheckNAdd(280); }
break;
case 552:
if ((0x2000000020L & l) != 0L)
@@ -6564,7 +6549,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 573:
if ((0x80000000800L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 574:
if ((0x800000008000L & l) != 0L)
@@ -6596,7 +6581,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 583:
if ((0x80000000800000L & l) != 0L)
- jjCheckNAdd(156);
+ { jjCheckNAdd(156); }
break;
case 584:
if ((0x800000008000L & l) != 0L)
@@ -6604,7 +6589,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 585:
if ((0x8000000080000L & l) != 0L)
- jjAddStates(71, 87);
+ { jjAddStates(71, 87); }
break;
case 586:
if ((0x200000002L & l) != 0L && kind > 2)
@@ -6624,7 +6609,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 591:
if ((0x100000001000L & l) != 0L)
- jjCheckNAdd(280);
+ { jjCheckNAdd(280); }
break;
case 592:
if ((0x800000008000L & l) != 0L)
@@ -6716,7 +6701,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 619:
if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
break;
case 621:
if ((0x20000000200L & l) != 0L)
@@ -6756,7 +6741,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 633:
if ((0x2000000020000L & l) != 0L)
- jjCheckNAdd(280);
+ { jjCheckNAdd(280); }
break;
case 635:
if ((0x800000008000L & l) != 0L)
@@ -6864,7 +6849,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 667:
if ((0x10000000100000L & l) != 0L)
- jjCheckNAddStates(57, 70);
+ { jjCheckNAddStates(57, 70); }
break;
case 672:
if ((0x200000002L & l) != 0L)
@@ -7128,7 +7113,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 747:
if ((0x20000000200000L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 748:
if ((0x4000000040000L & l) != 0L)
@@ -7136,7 +7121,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 749:
if ((0x20000000200000L & l) != 0L)
- jjAddStates(50, 56);
+ { jjAddStates(50, 56); }
break;
case 751:
if ((0x20000000200L & l) != 0L)
@@ -7156,7 +7141,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 757:
if ((0x80000000800000L & l) != 0L)
- jjCheckNAdd(30);
+ { jjCheckNAdd(30); }
break;
case 758:
if ((0x800000008000L & l) != 0L)
@@ -7200,7 +7185,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 772:
if ((0x2000000020L & l) != 0L)
- jjCheckNAdd(3);
+ { jjCheckNAdd(3); }
break;
case 773:
if ((0x8000000080000L & l) != 0L)
@@ -7208,7 +7193,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 774:
if ((0x40000000400000L & l) != 0L)
- jjAddStates(45, 49);
+ { jjAddStates(45, 49); }
break;
case 776:
if ((0x100000001000L & l) != 0L)
@@ -7276,7 +7261,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 795:
if ((0x80000000800000L & l) != 0L)
- jjAddStates(40, 44);
+ { jjAddStates(40, 44); }
break;
case 799:
if ((0x40000000400000L & l) != 0L)
@@ -7300,7 +7285,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 806:
if ((0x4000000040000L & l) != 0L)
- jjCheckNAdd(102);
+ { jjCheckNAdd(102); }
break;
case 807:
if ((0x800000008000L & l) != 0L)
@@ -7316,11 +7301,11 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 811:
if ((0x1000000010L & l) != 0L)
- jjAddStates(23, 39);
+ { jjAddStates(23, 39); }
break;
case 814:
if ((0x200000002L & l) != 0L)
- jjCheckNAdd(7);
+ { jjCheckNAdd(7); }
break;
case 816:
if ((0x200000002L & l) != 0L)
@@ -7380,7 +7365,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 833:
if ((0x100000001000L & l) != 0L)
- jjCheckNAdd(34);
+ { jjCheckNAdd(34); }
break;
case 834:
if ((0x20000000200000L & l) != 0L)
@@ -7460,7 +7445,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 856:
if ((0x400000004L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 857:
if ((0x20000000200L & l) != 0L)
@@ -7504,7 +7489,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 870:
if ((0x800000008L & l) != 0L)
- jjCheckNAdd(156);
+ { jjCheckNAdd(156); }
break;
case 871:
if ((0x20000000200L & l) != 0L)
@@ -7584,7 +7569,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 895:
if ((0x800000008000L & l) != 0L)
- jjCheckNAdd(217);
+ { jjCheckNAdd(217); }
break;
case 896:
if ((0x4000000040000L & l) != 0L)
@@ -7616,7 +7601,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 904:
if ((0x200000002L & l) != 0L)
- jjCheckNAddStates(12, 22);
+ { jjCheckNAddStates(12, 22); }
break;
case 906:
if ((0x20000000200000L & l) != 0L)
@@ -7636,7 +7621,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 915:
if ((0x1000000010L & l) != 0L)
- jjCheckNAdd(53);
+ { jjCheckNAdd(53); }
break;
case 917:
if ((0x200000002L & l) != 0L)
@@ -7668,11 +7653,11 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 925:
if ((0x400000004000L & l) != 0L)
- jjCheckNAdd(7);
+ { jjCheckNAdd(7); }
break;
case 926:
if ((0x4000000040000L & l) != 0L)
- jjCheckNAdd(13);
+ { jjCheckNAdd(13); }
break;
case 928:
if ((0x20000000200L & l) != 0L)
@@ -7744,7 +7729,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 949:
if ((0x2000000020L & l) != 0L)
- jjAddStates(200, 201);
+ { jjAddStates(200, 201); }
break;
case 963:
case 964:
@@ -7752,7 +7737,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
if (kind > 101)
kind = 101;
- jjCheckNAdd(964);
+ { jjCheckNAdd(964); }
break;
default : break;
}
@@ -7771,7 +7756,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
if (kind > 90)
kind = 90;
- jjAddStates(9, 11);
+ { jjAddStates(9, 11); }
break;
default : break;
}
@@ -7790,20 +7775,17 @@ private int jjMoveNfa_0(int startState, int curPos)
catch(java.io.IOException e) { return curPos; }
}
}
-private final int jjStopStringLiteralDfa_1(int pos, long active0, long active1)
-{
+private final int jjStopStringLiteralDfa_1(int pos, long active0, long active1){
switch (pos)
{
default :
return -1;
}
}
-private final int jjStartNfa_1(int pos, long active0, long active1)
-{
+private final int jjStartNfa_1(int pos, long active0, long active1){
return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0, active1), pos + 1);
}
-private int jjMoveStringLiteralDfa0_1()
-{
+private int jjMoveStringLiteralDfa0_1(){
switch(curChar)
{
case 39:
@@ -7928,80 +7910,6 @@ null, null, null, null, null, null, null, null, null, null, null, null, null, nu
null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, };
-
-/** Lexer state names. */
-public static final String[] lexStateNames = {
- "DEFAULT",
- "WithinString",
- "WithinDelimitedId",
-};
-
-/** Lex State array. */
-public static final int[] jjnewLexState = {
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, 0, -1, -1, -1, -1, 2, -1,
- 0, -1, -1,
-};
-static final long[] jjtoToken = {
- 0xfffffffffffffffdL, 0x31e3ffffffL,
-};
-static final long[] jjtoSkip = {
- 0x2L, 0x4000000L,
-};
-static final long[] jjtoMore = {
- 0x0L, 0xc18000000L,
-};
-protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[965];
-private final int[] jjstateSet = new int[1930];
-protected char curChar;
-/** Constructor. */
-public ADQLParserTokenManager(SimpleCharStream stream){
- if (SimpleCharStream.staticFlag)
- throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
- input_stream = stream;
-}
-
-/** Constructor. */
-public ADQLParserTokenManager(SimpleCharStream stream, int lexState){
- this(stream);
- SwitchTo(lexState);
-}
-
-/** Reinitialise parser. */
-public void ReInit(SimpleCharStream stream)
-{
- jjmatchedPos = jjnewStateCnt = 0;
- curLexState = defaultLexState;
- input_stream = stream;
- ReInitRounds();
-}
-private void ReInitRounds()
-{
- int i;
- jjround = 0x80000001;
- for (i = 965; i-- > 0;)
- jjrounds[i] = 0x80000000;
-}
-
-/** Reinitialise parser. */
-public void ReInit(SimpleCharStream stream, int lexState)
-{
- ReInit(stream);
- SwitchTo(lexState);
-}
-
-/** Switch to specified lex state. */
-public void SwitchTo(int lexState)
-{
- if (lexState >= 3 || lexState < 0)
- throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
- else
- curLexState = lexState;
-}
-
protected Token jjFillToken()
{
final Token t;
@@ -8049,6 +7957,7 @@ public Token getNextToken()
catch(java.io.IOException e)
{
jjmatchedKind = 0;
+ jjmatchedPos = -1;
matchedToken = jjFillToken();
return matchedToken;
}
@@ -8151,4 +8060,83 @@ private void jjCheckNAddStates(int start, int end)
} while (start++ != end);
}
+ /** Constructor. */
+ public ADQLParserTokenManager(SimpleCharStream stream){
+
+ if (SimpleCharStream.staticFlag)
+ throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
+
+ input_stream = stream;
+ }
+
+ /** Constructor. */
+ public ADQLParserTokenManager (SimpleCharStream stream, int lexState){
+ ReInit(stream);
+ SwitchTo(lexState);
+ }
+
+ /** Reinitialise parser. */
+ public void ReInit(SimpleCharStream stream)
+ {
+ jjmatchedPos = jjnewStateCnt = 0;
+ curLexState = defaultLexState;
+ input_stream = stream;
+ ReInitRounds();
+ }
+
+ private void ReInitRounds()
+ {
+ int i;
+ jjround = 0x80000001;
+ for (i = 965; i-- > 0;)
+ jjrounds[i] = 0x80000000;
+ }
+
+ /** Reinitialise parser. */
+ public void ReInit(SimpleCharStream stream, int lexState)
+ {
+ ReInit(stream);
+ SwitchTo(lexState);
+ }
+
+ /** Switch to specified lex state. */
+ public void SwitchTo(int lexState)
+ {
+ if (lexState >= 3 || lexState < 0)
+ throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+ else
+ curLexState = lexState;
+ }
+
+/** Lexer state names. */
+public static final String[] lexStateNames = {
+ "DEFAULT",
+ "WithinString",
+ "WithinDelimitedId",
+};
+
+/** Lex State array. */
+public static final int[] jjnewLexState = {
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, 0, -1, -1, -1, -1, 2, -1,
+ 0, -1, -1,
+};
+static final long[] jjtoToken = {
+ 0xfffffffffffffffdL, 0x31e3ffffffL,
+};
+static final long[] jjtoSkip = {
+ 0x2L, 0x4000000L,
+};
+static final long[] jjtoMore = {
+ 0x0L, 0xc18000000L,
+};
+ protected SimpleCharStream input_stream;
+
+ private final int[] jjrounds = new int[965];
+ private final int[] jjstateSet = new int[2 * 965];
+
+
+ protected char curChar;
}
diff --git a/src/adql/parser/adqlGrammar.jj b/src/adql/parser/adqlGrammar.jj
index e9ea32d07cf145b5e66e2fbf4d365dfe3fd42870..210a6fb15362738f23fef3244d85903327368d4e 100644
--- a/src/adql/parser/adqlGrammar.jj
+++ b/src/adql/parser/adqlGrammar.jj
@@ -31,7 +31,7 @@
* printed else it will be the message "Correct syntax".
*
* Author: Grégory Mantelet (CDS;ARI)
-* Version: 1.5 (03/2019)
+* Version: 1.5-1 (07/2019)
*/
/* ########### */
@@ -119,7 +119,7 @@ import adql.translator.TranslationException;
* @see ADQLQueryFactory
*
* @author Grégory Mantelet (CDS;ARI)
-* @version 1.5 (03/2019)
+* @version 1.5-1 (07/2019)
*/
public class ADQLParser {
@@ -644,7 +644,10 @@ public class ADQLParser {
/* same line, just get the space characters between the last
* token and the one to append: */
if (lastLine == token.beginLine){
- suggestedQuery.append(lines[lastLine - 1].substring(lastCol - 1, token.beginColumn - (isEnd(token) ? 0 : 1)));
+ if (token.kind == ADQLParserConstants.EOF)
+ suggestedQuery.append(lines[lastLine - 1].substring(lastCol - 1));
+ else
+ suggestedQuery.append(lines[lastLine - 1].substring(lastCol - 1, token.beginColumn - (isEnd(token) ? 0 : 1)));
lastCol = token.endColumn + 1;
}
// not the same line...