Skip to content
Snippets Groups Projects
Commit 36113a04 authored by gmantele's avatar gmantele Committed by Grégory Mantelet
Browse files

[ADQL] Apply "ADQL-2.0 Erratum-3" :

The now optional coordinate system argument of `POINT`, `BOX`, `CIRCLE` and
`POLYGON` MUST be a _string literal_.

_See <https://wiki.ivoa.net/twiki/bin/view/IVOA/ADQL-2_0-Err-3>_
parent ca2ab096
No related branches found
No related tags found
No related merge requests found
...@@ -1234,7 +1234,7 @@ GeometryFunction GeometryFunction(): {Token fct=null, end; GeometryValue<Geometr ...@@ -1234,7 +1234,7 @@ GeometryFunction GeometryFunction(): {Token fct=null, end; GeometryValue<Geometr
} }
ADQLOperand CoordinateSystem(): { ADQLOperand coordSys=null;}{ ADQLOperand CoordinateSystem(): { ADQLOperand coordSys=null;}{
coordSys=StringExpression() coordSys=String()
{ return coordSys; } { return coordSys; }
} }
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
* ParseException is thrown. * ParseException is thrown.
* *
* Author: Gr&eacute;gory Mantelet (CDS) * Author: Gr&eacute;gory Mantelet (CDS)
* Version: 2.0 (04/2020) * Version: 2.0 (06/2020)
*/ */
/* ########### */ /* ########### */
...@@ -107,7 +107,7 @@ import adql.query.operand.function.geometry.GeometryFunction.GeometryValue; ...@@ -107,7 +107,7 @@ import adql.query.operand.function.geometry.GeometryFunction.GeometryValue;
* @see ADQLParser * @see ADQLParser
* *
* @author Gr&eacute;gory Mantelet (CDS) * @author Gr&eacute;gory Mantelet (CDS)
* @version 2.0 (04/2020) * @version 2.0 (06/2020)
* @since 2.0 * @since 2.0
*/ */
public class ADQLGrammar201 extends ADQLGrammarBase { public class ADQLGrammar201 extends ADQLGrammarBase {
...@@ -1345,7 +1345,7 @@ DistanceFunction DistanceFunction2(): { Token fct=null, end=null; DistanceFuncti ...@@ -1345,7 +1345,7 @@ DistanceFunction DistanceFunction2(): { Token fct=null, end=null; DistanceFuncti
} }
ADQLOperand CoordinateSystem(): { ADQLOperand coordSys=null;}{ ADQLOperand CoordinateSystem(): { ADQLOperand coordSys=null;}{
coordSys=StringExpression() coordSys=String()
{ return coordSys; } { return coordSys; }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment