Skip to content

M
MariaDB
Commit 50d71c8b authored by Alexander Barkov's avatar Alexander Barkov
Browse files
Options

Cleanup: moving keyword comments such as SQL-2003-R from rules to %token commands 

Reasoning:
- Avoid duplicate comments, both in %token and in the "keyword*" rules.
- The space in the rules will be needed for %prec commands.
parent b2f56085
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
sql/sql_yacc.yy
View file @ 50d71c8b
...@@ -1254,7 +1254,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); ...@@ -1254,7 +1254,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> BIT_SYM /* MYSQL-FUNC */ %token <kwd> BIT_SYM /* MYSQL-FUNC */
%token <kwd> BLOCK_SYM %token <kwd> BLOCK_SYM
%token <kwd> BOOL_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> BTREE_SYM
%token <kwd> BYTE_SYM %token <kwd> BYTE_SYM
%token <kwd> CACHE_SYM %token <kwd> CACHE_SYM
...@@ -1305,7 +1305,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); ...@@ -1305,7 +1305,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> DATA_SYM /* SQL-2003-N */ %token <kwd> DATA_SYM /* SQL-2003-N */
%token <kwd> DATETIME %token <kwd> DATETIME
%token <kwd> DATE_FORMAT_SYM /* MYSQL-FUNC */ %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> DAY_SYM /* SQL-2003-R */
%token <kwd> DEALLOCATE_SYM /* SQL-2003-R */ %token <kwd> DEALLOCATE_SYM /* SQL-2003-R */
%token <kwd> DECODE_SYM /* Oracle function, non-reserved */ %token <kwd> DECODE_SYM /* Oracle function, non-reserved */
...@@ -1469,7 +1469,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); ...@@ -1469,7 +1469,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> NOMINVALUE_SYM %token <kwd> NOMINVALUE_SYM
%token <kwd> NO_WAIT_SYM %token <kwd> NO_WAIT_SYM
%token <kwd> NOWAIT_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> NVARCHAR_SYM
%token <kwd> OF_SYM /* SQL-1992-R, Oracle-R */ %token <kwd> OF_SYM /* SQL-1992-R, Oracle-R */
%token <kwd> OFFSET_SYM %token <kwd> OFFSET_SYM
...@@ -1511,7 +1511,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); ...@@ -1511,7 +1511,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> QUARTER_SYM %token <kwd> QUARTER_SYM
%token <kwd> QUERY_SYM %token <kwd> QUERY_SYM
%token <kwd> QUICK %token <kwd> QUICK
%token <kwd> RAW /* Oracle */ %token <kwd> RAW /* Oracle-R */
%token <kwd> READ_ONLY_SYM %token <kwd> READ_ONLY_SYM
%token <kwd> REBUILD_SYM %token <kwd> REBUILD_SYM
%token <kwd> RECOVER_SYM %token <kwd> RECOVER_SYM
...@@ -1608,7 +1608,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); ...@@ -1608,7 +1608,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> TIMESTAMP /* SQL-2003-R */ %token <kwd> TIMESTAMP /* SQL-2003-R */
%token <kwd> TIMESTAMP_ADD %token <kwd> TIMESTAMP_ADD
%token <kwd> TIMESTAMP_DIFF %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> TRANSACTION_SYM
%token <kwd> TRANSACTIONAL_SYM %token <kwd> TRANSACTIONAL_SYM
%token <kwd> TRIGGERS_SYM %token <kwd> TRIGGERS_SYM
...@@ -1630,7 +1630,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); ...@@ -1630,7 +1630,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> USER_SYM /* SQL-2003-R */ %token <kwd> USER_SYM /* SQL-2003-R */
%token <kwd> USE_FRM %token <kwd> USE_FRM
%token <kwd> VALUE_SYM /* SQL-2003-R */ %token <kwd> VALUE_SYM /* SQL-2003-R */
%token <kwd> VARCHAR2 /* Oracle */ %token <kwd> VARCHAR2 /* Oracle-R, PLSQL-R */
%token <kwd> VARIABLES %token <kwd> VARIABLES
%token <kwd> VERSIONING_SYM /* SQL-2011-R */ %token <kwd> VERSIONING_SYM /* SQL-2011-R */
%token <kwd> VIA_SYM %token <kwd> VIA_SYM
...@@ -15437,10 +15437,10 @@ keyword_sp_verb_clause: ...@@ -15437,10 +15437,10 @@ keyword_sp_verb_clause:
*/ */
keyword_sp_data_type: keyword_sp_data_type:
BIT_SYM BIT_SYM
| BOOLEAN_SYM /* PLSQL-R */ | BOOLEAN_SYM
| BOOL_SYM | BOOL_SYM
| CLOB | CLOB
| DATE_SYM /* Oracle-R, PLSQL-R */ | DATE_SYM
| DATETIME | DATETIME
| ENUM | ENUM
| FIXED_SYM | FIXED_SYM
...@@ -15454,17 +15454,17 @@ keyword_sp_data_type: ...@@ -15454,17 +15454,17 @@ keyword_sp_data_type:
| MULTIPOLYGON | MULTIPOLYGON
| NATIONAL_SYM | NATIONAL_SYM
| NCHAR_SYM | NCHAR_SYM
| NUMBER_SYM /* Oracle-R, PLSQL-R */ | NUMBER_SYM
| NVARCHAR_SYM | NVARCHAR_SYM
| POINT_SYM | POINT_SYM
| POLYGON | POLYGON
| RAW /* Oracle-R */ | RAW
| ROW_SYM | ROW_SYM
| SERIAL_SYM | SERIAL_SYM
| TEXT_SYM | TEXT_SYM
| TIMESTAMP | TIMESTAMP
| TIME_SYM /* Oracle-R */ | TIME_SYM
| VARCHAR2 /* Oracle-R, PLSQL-R */ | VARCHAR2
| YEAR_SYM | YEAR_SYM
; ;
...@@ -15578,7 +15578,7 @@ keyword_sp_not_data_type: ...@@ -15578,7 +15578,7 @@ keyword_sp_not_data_type:
| IDENTIFIED_SYM | IDENTIFIED_SYM
| IGNORE_SERVER_IDS_SYM | IGNORE_SERVER_IDS_SYM
| INCREMENT_SYM | INCREMENT_SYM
| IMMEDIATE_SYM /* SQL-2003-R */ | IMMEDIATE_SYM
| INVOKER_SYM | INVOKER_SYM
| IMPORT | IMPORT
| INDEXES | INDEXES
...@@ -15658,7 +15658,7 @@ keyword_sp_not_data_type: ...@@ -15658,7 +15658,7 @@ keyword_sp_not_data_type:
| NODEGROUP_SYM | NODEGROUP_SYM
| NONE_SYM | NONE_SYM
| NOTFOUND_SYM | NOTFOUND_SYM
| OF_SYM /* SQL-1999-R, Oracle-R */ | OF_SYM
| OFFSET_SYM | OFFSET_SYM
| OLD_PASSWORD_SYM | OLD_PASSWORD_SYM
| ONE_SYM | ONE_SYM
...@@ -15708,7 +15708,7 @@ keyword_sp_not_data_type: ...@@ -15708,7 +15708,7 @@ keyword_sp_not_data_type:
| RESUME_SYM | RESUME_SYM
| RETURNED_SQLSTATE_SYM | RETURNED_SQLSTATE_SYM
| RETURNS_SYM | RETURNS_SYM
| REUSE_SYM /* Oracle-R */ | REUSE_SYM
| REVERSE_SYM | REVERSE_SYM
| ROLE_SYM | ROLE_SYM
| ROLLUP_SYM | ROLLUP_SYM
......
sql/sql_yacc_ora.yy
View file @ 50d71c8b
...@@ -640,7 +640,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); ...@@ -640,7 +640,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> BIT_SYM /* MYSQL-FUNC */ %token <kwd> BIT_SYM /* MYSQL-FUNC */
%token <kwd> BLOCK_SYM %token <kwd> BLOCK_SYM
%token <kwd> BOOL_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> BTREE_SYM
%token <kwd> BYTE_SYM %token <kwd> BYTE_SYM
%token <kwd> CACHE_SYM %token <kwd> CACHE_SYM
...@@ -691,7 +691,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); ...@@ -691,7 +691,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> DATA_SYM /* SQL-2003-N */ %token <kwd> DATA_SYM /* SQL-2003-N */
%token <kwd> DATETIME %token <kwd> DATETIME
%token <kwd> DATE_FORMAT_SYM /* MYSQL-FUNC */ %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> DAY_SYM /* SQL-2003-R */
%token <kwd> DEALLOCATE_SYM /* SQL-2003-R */ %token <kwd> DEALLOCATE_SYM /* SQL-2003-R */
%token <kwd> DECODE_SYM /* Oracle function, non-reserved */ %token <kwd> DECODE_SYM /* Oracle function, non-reserved */
...@@ -855,7 +855,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); ...@@ -855,7 +855,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> NOMINVALUE_SYM %token <kwd> NOMINVALUE_SYM
%token <kwd> NO_WAIT_SYM %token <kwd> NO_WAIT_SYM
%token <kwd> NOWAIT_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> NVARCHAR_SYM
%token <kwd> OF_SYM /* SQL-1992-R, Oracle-R */ %token <kwd> OF_SYM /* SQL-1992-R, Oracle-R */
%token <kwd> OFFSET_SYM %token <kwd> OFFSET_SYM
...@@ -897,7 +897,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); ...@@ -897,7 +897,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> QUARTER_SYM %token <kwd> QUARTER_SYM
%token <kwd> QUERY_SYM %token <kwd> QUERY_SYM
%token <kwd> QUICK %token <kwd> QUICK
%token <kwd> RAW /* Oracle */ %token <kwd> RAW /* Oracle-R */
%token <kwd> READ_ONLY_SYM %token <kwd> READ_ONLY_SYM
%token <kwd> REBUILD_SYM %token <kwd> REBUILD_SYM
%token <kwd> RECOVER_SYM %token <kwd> RECOVER_SYM
...@@ -994,7 +994,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); ...@@ -994,7 +994,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> TIMESTAMP /* SQL-2003-R */ %token <kwd> TIMESTAMP /* SQL-2003-R */
%token <kwd> TIMESTAMP_ADD %token <kwd> TIMESTAMP_ADD
%token <kwd> TIMESTAMP_DIFF %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> TRANSACTION_SYM
%token <kwd> TRANSACTIONAL_SYM %token <kwd> TRANSACTIONAL_SYM
%token <kwd> TRIGGERS_SYM %token <kwd> TRIGGERS_SYM
...@@ -1016,7 +1016,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); ...@@ -1016,7 +1016,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
%token <kwd> USER_SYM /* SQL-2003-R */ %token <kwd> USER_SYM /* SQL-2003-R */
%token <kwd> USE_FRM %token <kwd> USE_FRM
%token <kwd> VALUE_SYM /* SQL-2003-R */ %token <kwd> VALUE_SYM /* SQL-2003-R */
%token <kwd> VARCHAR2 /* Oracle */ %token <kwd> VARCHAR2 /* Oracle-R, PLSQL-R */
%token <kwd> VARIABLES %token <kwd> VARIABLES
%token <kwd> VERSIONING_SYM /* SQL-2011-R */ %token <kwd> VERSIONING_SYM /* SQL-2011-R */
%token <kwd> VIA_SYM %token <kwd> VIA_SYM
...@@ -15250,10 +15250,10 @@ keyword_sp_verb_clause: ...@@ -15250,10 +15250,10 @@ keyword_sp_verb_clause:
*/ */
keyword_sp_data_type: keyword_sp_data_type:
BIT_SYM BIT_SYM
| BOOLEAN_SYM /* PLSQL-R */ | BOOLEAN_SYM
| BOOL_SYM | BOOL_SYM
| CLOB | CLOB
| DATE_SYM /* Oracle-R, PLSQL-R */ | DATE_SYM
| DATETIME | DATETIME
| ENUM | ENUM
| FIXED_SYM | FIXED_SYM
...@@ -15267,17 +15267,17 @@ keyword_sp_data_type: ...@@ -15267,17 +15267,17 @@ keyword_sp_data_type:
| MULTIPOLYGON | MULTIPOLYGON
| NATIONAL_SYM | NATIONAL_SYM
| NCHAR_SYM | NCHAR_SYM
| NUMBER_SYM /* Oracle-R, PLSQL-R */ | NUMBER_SYM
| NVARCHAR_SYM | NVARCHAR_SYM
| POINT_SYM | POINT_SYM
| POLYGON | POLYGON
| RAW /* Oracle-R */ | RAW
| ROW_SYM | ROW_SYM
| SERIAL_SYM | SERIAL_SYM
| TEXT_SYM | TEXT_SYM
| TIMESTAMP | TIMESTAMP
| TIME_SYM /* Oracle-R */ | TIME_SYM
| VARCHAR2 /* Oracle-R, PLSQL-R */ | VARCHAR2
| YEAR_SYM | YEAR_SYM
; ;
...@@ -15387,7 +15387,7 @@ keyword_sp_not_data_type: ...@@ -15387,7 +15387,7 @@ keyword_sp_not_data_type:
| IDENTIFIED_SYM | IDENTIFIED_SYM
| IGNORE_SERVER_IDS_SYM | IGNORE_SERVER_IDS_SYM
| INCREMENT_SYM | INCREMENT_SYM
| IMMEDIATE_SYM /* SQL-2003-R */ | IMMEDIATE_SYM
| INVOKER_SYM | INVOKER_SYM
| IMPORT | IMPORT
| INDEXES | INDEXES
...@@ -15467,7 +15467,7 @@ keyword_sp_not_data_type: ...@@ -15467,7 +15467,7 @@ keyword_sp_not_data_type:
| NODEGROUP_SYM | NODEGROUP_SYM
| NONE_SYM | NONE_SYM
| NOTFOUND_SYM | NOTFOUND_SYM
| OF_SYM /* SQL-1999-R, Oracle-R */ | OF_SYM
| OFFSET_SYM | OFFSET_SYM
| OLD_PASSWORD_SYM | OLD_PASSWORD_SYM
| ONE_SYM | ONE_SYM
...@@ -15517,7 +15517,7 @@ keyword_sp_not_data_type: ...@@ -15517,7 +15517,7 @@ keyword_sp_not_data_type:
| RESUME_SYM | RESUME_SYM
| RETURNED_SQLSTATE_SYM | RETURNED_SQLSTATE_SYM
| RETURNS_SYM | RETURNS_SYM
| REUSE_SYM /* Oracle-R */ | REUSE_SYM
| REVERSE_SYM | REVERSE_SYM
| ROLE_SYM | ROLE_SYM
| ROLLUP_SYM | ROLLUP_SYM
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7