Commit b20793a9 authored by Grégory Mantelet's avatar Grégory Mantelet
Browse files

[ADQL] Do not support anymore the function REGION in the ADQL-2.1 parser. 

This function has indeed be completely removed from the ADQL standard (v2.1).
parent bcfc3b8d

src/adql/parser/ADQLParser201.java

+349 −377

File changed.

Preview size limit exceeded, changes collapsed.

src/adql/parser/adqlGrammar201.jj

+5 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
* printed else it will be the message "Correct syntax".

*

*  Author:  Grégory Mantelet (CDS)

*  Version: 2.0 (04/2019)

*  Version: 2.0 (07/2019)

*/



							/* ########### */
@@ -142,7 +142,7 @@ import adql.translator.TranslationException; 
* @see ADQLQueryFactory

*

* @author Grégory Mantelet (CDS)

* @version 2.0 (04/2019)

* @version 2.0 (07/2019)

* @since 2.0

*/

public class ADQLParser201 implements ADQLParser {
@@ -2032,8 +2032,9 @@ GeometryFunction GeometryValueFunction(): {Token fct=null, end=null; ADQLOperand 
				end=<RIGHT_PAR>)

		  { gf = queryFactory.createPolygon(coordSys, vCoords); }

		  

		// REGION:

		| (fct=<REGION> <LEFT_PAR> op=StringExpression() end=<RIGHT_PAR>) {gf = queryFactory.createRegion(op);})

		/* // REGION (REMOVED SINCE 2.1):

		| (fct=<REGION> <LEFT_PAR> op=StringExpression() end=<RIGHT_PAR>) {gf = queryFactory.createRegion(op);}*/

		)

	}catch(Exception ex){

		throw generateParseException(ex);

	}