You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2021/07/20 14:33:41 UTC
[groovy] branch master updated: Add reserved keywords of GINQ
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 2f8d9e0 Add reserved keywords of GINQ
2f8d9e0 is described below
commit 2f8d9e09b28c87c115bd9cb10f67b2c2989d6962
Author: Daniel Sun <su...@apache.org>
AuthorDate: Tue Jul 20 22:33:17 2021 +0800
Add reserved keywords of GINQ
---
.../src/main/groovy/org/apache/groovy/ginq/dsl/GinqAstBuilder.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/GinqAstBuilder.java b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/GinqAstBuilder.java
index 9c8b1b4..7e92e3b 100644
--- a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/GinqAstBuilder.java
+++ b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/GinqAstBuilder.java
@@ -475,12 +475,14 @@ public class GinqAstBuilder extends CodeVisitorSupport implements SyntaxErrorRep
private static final String KW_ORDERBY = "orderby";
private static final String KW_LIMIT = "limit";
private static final String KW_SELECT = "select";
- private static final String KW_SHUTDOWN = "shutdown";
private static final String KW_DISTINCT = "distinct";
private static final String KW_OVER = "over";
+ private static final String KW_WITHIN = "within"; // reserved keyword
+ private static final String KW_GROUP = "group"; // reserved keyword
+ private static final String KW_SHUTDOWN = "shutdown";
private static final Set<String> KEYWORD_SET = new HashSet<>();
static {
- KEYWORD_SET.addAll(Arrays.asList(KW_FROM, KW_WHERE, KW_ON, KW_HAVING, KW_EXISTS, KW_GROUPBY, KW_ORDERBY, KW_LIMIT, KW_SELECT, KW_DISTINCT, KW_OVER, KW_SHUTDOWN));
+ KEYWORD_SET.addAll(Arrays.asList(KW_FROM, KW_WHERE, KW_ON, KW_HAVING, KW_EXISTS, KW_GROUPBY, KW_ORDERBY, KW_LIMIT, KW_SELECT, KW_DISTINCT, KW_OVER, KW_WITHIN, KW_GROUP, KW_SHUTDOWN));
KEYWORD_SET.addAll(JoinExpression.JOIN_NAME_LIST);
}
}