File tree Expand file tree Collapse file tree 2 files changed +8
-32
lines changed
antlr/org/hibernate/grammars/hql
java/org/hibernate/query/hql/internal Expand file tree Collapse file tree 2 files changed +8
-32
lines changed Original file line number Diff line number Diff line change @@ -14,12 +14,6 @@ options {
14
14
package org.hibernate.grammars.hql;
15
15
}
16
16
17
- @members {
18
- protected void logUseOfReservedWordAsIdentifier(Token token) {
19
- }
20
- }
21
-
22
-
23
17
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
24
18
// Statements
25
19
@@ -1851,7 +1845,7 @@ xmltableDefaultClause
1851
1845
nakedIdentifier
1852
1846
: IDENTIFIER
1853
1847
| QUOTED_IDENTIFIER
1854
- | ( ABSENT
1848
+ | ABSENT
1855
1849
| ALL
1856
1850
| AND
1857
1851
| ANY
@@ -2057,17 +2051,14 @@ xmltableDefaultClause
2057
2051
| XMLQUERY
2058
2052
| XMLTABLE
2059
2053
| YEAR
2060
- | ZONED ) {
2061
- logUseOfReservedWordAsIdentifier( getCurrentToken() );
2062
- }
2054
+ | ZONED
2063
2055
;
2056
+
2064
2057
identifier
2065
2058
: nakedIdentifier
2066
- | ( FULL
2059
+ | FULL
2067
2060
| INNER
2068
2061
| LEFT
2069
2062
| OUTER
2070
- | RIGHT ) {
2071
- logUseOfReservedWordAsIdentifier( getCurrentToken() );
2072
- }
2063
+ | RIGHT
2073
2064
;
Original file line number Diff line number Diff line change 4
4
*/
5
5
package org .hibernate .query .hql .internal ;
6
6
7
- import org .hibernate .grammars .hql .HqlLexer ;
8
- import org .hibernate .grammars .hql .HqlParser ;
9
- import org .hibernate .query .hql .HqlLogging ;
10
-
11
- import org .jboss .logging .Logger ;
12
-
13
7
import org .antlr .v4 .runtime .CharStreams ;
14
8
import org .antlr .v4 .runtime .CommonTokenStream ;
15
- import org .antlr .v4 .runtime .Token ;
9
+ import org .hibernate .grammars .hql .HqlLexer ;
10
+ import org .hibernate .grammars .hql .HqlParser ;
16
11
17
12
/**
18
13
* Leverages ANTLR to build a parse tree from an HQL query.
19
14
*
20
15
* @author Steve Ebersole
21
16
*/
22
17
public class HqlParseTreeBuilder {
23
- private static final Logger LOGGER = HqlLogging .subLogger ( "reservedWordAsIdentifier" );
24
- private static final boolean DEBUG_ENABLED = LOGGER .isDebugEnabled ();
25
-
26
18
/**
27
19
* Singleton access
28
20
*/
@@ -34,13 +26,6 @@ public HqlLexer buildHqlLexer(String hql) {
34
26
35
27
public HqlParser buildHqlParser (String hql , HqlLexer hqlLexer ) {
36
28
// Build the parser
37
- return new HqlParser ( new CommonTokenStream ( hqlLexer ) ) {
38
- @ Override
39
- protected void logUseOfReservedWordAsIdentifier (Token token ) {
40
- if ( DEBUG_ENABLED ) {
41
- LOGGER .debugf ( "Encountered use of reserved word as identifier : %s" , token .getText () );
42
- }
43
- }
44
- };
29
+ return new HqlParser ( new CommonTokenStream ( hqlLexer ) );
45
30
}
46
31
}
You can’t perform that action at this time.
0 commit comments