From 36113a04a90e13fa4df32b54ca4ccd0e5a202afa Mon Sep 17 00:00:00 2001
From: gmantele <gmantele@ari.uni-heidelberg.de>
Date: Thu, 18 Jun 2020 18:37:46 +0200
Subject: [PATCH] [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>_
---
 src/adql/parser/grammar/adqlGrammar200.jj | 2 +-
 src/adql/parser/grammar/adqlGrammar201.jj | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/adql/parser/grammar/adqlGrammar200.jj b/src/adql/parser/grammar/adqlGrammar200.jj
index bdcf299..0f0ed3a 100644
--- a/src/adql/parser/grammar/adqlGrammar200.jj
+++ b/src/adql/parser/grammar/adqlGrammar200.jj
@@ -1234,7 +1234,7 @@ GeometryFunction GeometryFunction(): {Token fct=null, end; GeometryValue<Geometr
 }
 
 ADQLOperand CoordinateSystem(): { ADQLOperand coordSys=null;}{
-	coordSys=StringExpression()
+	coordSys=String()
 	{ return coordSys; }
 }
 
diff --git a/src/adql/parser/grammar/adqlGrammar201.jj b/src/adql/parser/grammar/adqlGrammar201.jj
index 99f0718..9626e42 100644
--- a/src/adql/parser/grammar/adqlGrammar201.jj
+++ b/src/adql/parser/grammar/adqlGrammar201.jj
@@ -31,7 +31,7 @@
 * ParseException is thrown.
 *
 * 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;
  * @see ADQLParser
  *
  * @author Gr&eacute;gory Mantelet (CDS)
- * @version 2.0 (04/2020)
+ * @version 2.0 (06/2020)
  * @since 2.0
  */
 public class ADQLGrammar201 extends ADQLGrammarBase {
@@ -1345,7 +1345,7 @@ DistanceFunction DistanceFunction2(): { Token fct=null, end=null; DistanceFuncti
 }
 
 ADQLOperand CoordinateSystem(): { ADQLOperand coordSys=null;}{
-	coordSys=StringExpression()
+	coordSys=String()
 	{ return coordSys; }
 }
 
-- 
GitLab