Skip to content

Commit

Permalink
Cleanup: moving keyword comments such as SQL-2003-R from rules to %to…
Browse files Browse the repository at this point in the history 
…ken commands

Reasoning:
- Avoid duplicate comments, both in %token and in the "keyword*" rules.
- The space in the rules will be needed for %prec commands.
  • Loading branch information
@abarkov
abarkov committed May 17, 2018
1 parent b2f5608 commit 50d71c8
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
30 changes: 15 additions & 15 deletions sql/sql_yacc.yy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> BIT_SYM /* MYSQL-FUNC */
%token <kwd> BLOCK_SYM
%token <kwd> BOOL_SYM
%token <kwd> BOOLEAN_SYM /* SQL-2003-R */
%token <kwd> BOOLEAN_SYM /* SQL-2003-R, PLSQL-R */
%token <kwd> BTREE_SYM
%token <kwd> BYTE_SYM
%token <kwd> CACHE_SYM
Expand Down Expand Up @@ -1305,7 +1305,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> DATA_SYM /* SQL-2003-N */
%token <kwd> DATETIME
%token <kwd> DATE_FORMAT_SYM /* MYSQL-FUNC */
%token <kwd> DATE_SYM /* SQL-2003-R */
%token <kwd> DATE_SYM /* SQL-2003-R, Oracle-R, PLSQL-R */
%token <kwd> DAY_SYM /* SQL-2003-R */
%token <kwd> DEALLOCATE_SYM /* SQL-2003-R */
%token <kwd> DECODE_SYM /* Oracle function, non-reserved */
Expand Down Expand Up @@ -1469,7 +1469,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> NOMINVALUE_SYM
%token <kwd> NO_WAIT_SYM
%token <kwd> NOWAIT_SYM
%token <kwd> NUMBER_SYM /* SQL-2003-N */
%token <kwd> NUMBER_SYM /* SQL-2003-N, Oracle-R, PLSQL-R */
%token <kwd> NVARCHAR_SYM
%token <kwd> OF_SYM /* SQL-1992-R, Oracle-R */
%token <kwd> OFFSET_SYM
Expand Down Expand Up @@ -1511,7 +1511,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> QUARTER_SYM
%token <kwd> QUERY_SYM
%token <kwd> QUICK
%token <kwd> RAW /* Oracle */
%token <kwd> RAW /* Oracle-R */
%token <kwd> READ_ONLY_SYM
%token <kwd> REBUILD_SYM
%token <kwd> RECOVER_SYM
Expand Down Expand Up @@ -1608,7 +1608,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> TIMESTAMP /* SQL-2003-R */
%token <kwd> TIMESTAMP_ADD
%token <kwd> TIMESTAMP_DIFF
%token <kwd> TIME_SYM /* SQL-2003-R */
%token <kwd> TIME_SYM /* SQL-2003-R, Oracle-R */
%token <kwd> TRANSACTION_SYM
%token <kwd> TRANSACTIONAL_SYM
%token <kwd> TRIGGERS_SYM
Expand All @@ -1630,7 +1630,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> USER_SYM /* SQL-2003-R */
%token <kwd> USE_FRM
%token <kwd> VALUE_SYM /* SQL-2003-R */
%token <kwd> VARCHAR2 /* Oracle */
%token <kwd> VARCHAR2 /* Oracle-R, PLSQL-R */
%token <kwd> VARIABLES
%token <kwd> VERSIONING_SYM /* SQL-2011-R */
%token <kwd> VIA_SYM
Expand Down Expand Up @@ -15437,10 +15437,10 @@ keyword_sp_verb_clause:
*/
keyword_sp_data_type:
BIT_SYM
| BOOLEAN_SYM /* PLSQL-R */
| BOOLEAN_SYM
| BOOL_SYM
| CLOB
| DATE_SYM /* Oracle-R, PLSQL-R */
| DATE_SYM
| DATETIME
| ENUM
| FIXED_SYM
Expand All @@ -15454,17 +15454,17 @@ keyword_sp_data_type:
| MULTIPOLYGON
| NATIONAL_SYM
| NCHAR_SYM
| NUMBER_SYM /* Oracle-R, PLSQL-R */
| NUMBER_SYM
| NVARCHAR_SYM
| POINT_SYM
| POLYGON
| RAW /* Oracle-R */
| RAW
| ROW_SYM
| SERIAL_SYM
| TEXT_SYM
| TIMESTAMP
| TIME_SYM /* Oracle-R */
| VARCHAR2 /* Oracle-R, PLSQL-R */
| TIME_SYM
| VARCHAR2
| YEAR_SYM
;

Expand Down Expand Up @@ -15578,7 +15578,7 @@ keyword_sp_not_data_type:
| IDENTIFIED_SYM
| IGNORE_SERVER_IDS_SYM
| INCREMENT_SYM
| IMMEDIATE_SYM /* SQL-2003-R */
| IMMEDIATE_SYM
| INVOKER_SYM
| IMPORT
| INDEXES
Expand Down Expand Up @@ -15658,7 +15658,7 @@ keyword_sp_not_data_type:
| NODEGROUP_SYM
| NONE_SYM
| NOTFOUND_SYM
| OF_SYM /* SQL-1999-R, Oracle-R */
| OF_SYM
| OFFSET_SYM
| OLD_PASSWORD_SYM
| ONE_SYM
Expand Down Expand Up @@ -15708,7 +15708,7 @@ keyword_sp_not_data_type:
| RESUME_SYM
| RETURNED_SQLSTATE_SYM
| RETURNS_SYM
| REUSE_SYM /* Oracle-R */
| REUSE_SYM
| REVERSE_SYM
| ROLE_SYM
| ROLLUP_SYM
Expand Down
30 changes: 15 additions & 15 deletions sql/sql_yacc_ora.yy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> BIT_SYM /* MYSQL-FUNC */
%token <kwd> BLOCK_SYM
%token <kwd> BOOL_SYM
%token <kwd> BOOLEAN_SYM /* SQL-2003-R */
%token <kwd> BOOLEAN_SYM /* SQL-2003-R, PLSQL-R */
%token <kwd> BTREE_SYM
%token <kwd> BYTE_SYM
%token <kwd> CACHE_SYM
Expand Down Expand Up @@ -691,7 +691,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> DATA_SYM /* SQL-2003-N */
%token <kwd> DATETIME
%token <kwd> DATE_FORMAT_SYM /* MYSQL-FUNC */
%token <kwd> DATE_SYM /* SQL-2003-R */
%token <kwd> DATE_SYM /* SQL-2003-R, Oracle-R, PLSQL-R */
%token <kwd> DAY_SYM /* SQL-2003-R */
%token <kwd> DEALLOCATE_SYM /* SQL-2003-R */
%token <kwd> DECODE_SYM /* Oracle function, non-reserved */
Expand Down Expand Up @@ -855,7 +855,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> NOMINVALUE_SYM
%token <kwd> NO_WAIT_SYM
%token <kwd> NOWAIT_SYM
%token <kwd> NUMBER_SYM /* SQL-2003-N */
%token <kwd> NUMBER_SYM /* SQL-2003-N, Oracle-R, PLSQL-R */
%token <kwd> NVARCHAR_SYM
%token <kwd> OF_SYM /* SQL-1992-R, Oracle-R */
%token <kwd> OFFSET_SYM
Expand Down Expand Up @@ -897,7 +897,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> QUARTER_SYM
%token <kwd> QUERY_SYM
%token <kwd> QUICK
%token <kwd> RAW /* Oracle */
%token <kwd> RAW /* Oracle-R */
%token <kwd> READ_ONLY_SYM
%token <kwd> REBUILD_SYM
%token <kwd> RECOVER_SYM
Expand Down Expand Up @@ -994,7 +994,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> TIMESTAMP /* SQL-2003-R */
%token <kwd> TIMESTAMP_ADD
%token <kwd> TIMESTAMP_DIFF
%token <kwd> TIME_SYM /* SQL-2003-R */
%token <kwd> TIME_SYM /* SQL-2003-R, Oracle-R */
%token <kwd> TRANSACTION_SYM
%token <kwd> TRANSACTIONAL_SYM
%token <kwd> TRIGGERS_SYM
Expand All @@ -1016,7 +1016,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> USER_SYM /* SQL-2003-R */
%token <kwd> USE_FRM
%token <kwd> VALUE_SYM /* SQL-2003-R */
%token <kwd> VARCHAR2 /* Oracle */
%token <kwd> VARCHAR2 /* Oracle-R, PLSQL-R */
%token <kwd> VARIABLES
%token <kwd> VERSIONING_SYM /* SQL-2011-R */
%token <kwd> VIA_SYM
Expand Down Expand Up @@ -15250,10 +15250,10 @@ keyword_sp_verb_clause:
*/
keyword_sp_data_type:
BIT_SYM
| BOOLEAN_SYM /* PLSQL-R */
| BOOLEAN_SYM
| BOOL_SYM
| CLOB
| DATE_SYM /* Oracle-R, PLSQL-R */
| DATE_SYM
| DATETIME
| ENUM
| FIXED_SYM
Expand All @@ -15267,17 +15267,17 @@ keyword_sp_data_type:
| MULTIPOLYGON
| NATIONAL_SYM
| NCHAR_SYM
| NUMBER_SYM /* Oracle-R, PLSQL-R */
| NUMBER_SYM
| NVARCHAR_SYM
| POINT_SYM
| POLYGON
| RAW /* Oracle-R */
| RAW
| ROW_SYM
| SERIAL_SYM
| TEXT_SYM
| TIMESTAMP
| TIME_SYM /* Oracle-R */
| VARCHAR2 /* Oracle-R, PLSQL-R */
| TIME_SYM
| VARCHAR2
| YEAR_SYM
;

Expand Down Expand Up @@ -15387,7 +15387,7 @@ keyword_sp_not_data_type:
| IDENTIFIED_SYM
| IGNORE_SERVER_IDS_SYM
| INCREMENT_SYM
| IMMEDIATE_SYM /* SQL-2003-R */
| IMMEDIATE_SYM
| INVOKER_SYM
| IMPORT
| INDEXES
Expand Down Expand Up @@ -15467,7 +15467,7 @@ keyword_sp_not_data_type:
| NODEGROUP_SYM
| NONE_SYM
| NOTFOUND_SYM
| OF_SYM /* SQL-1999-R, Oracle-R */
| OF_SYM
| OFFSET_SYM
| OLD_PASSWORD_SYM
| ONE_SYM
Expand Down Expand Up @@ -15517,7 +15517,7 @@ keyword_sp_not_data_type:
| RESUME_SYM
| RETURNED_SQLSTATE_SYM
| RETURNS_SYM
| REUSE_SYM /* Oracle-R */
| REUSE_SYM
| REVERSE_SYM
| ROLE_SYM
| ROLLUP_SYM
Expand Down

0 comments on commit 50d71c8

Please sign in to comment.