firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 02:03:04 +01:00
Code Issues

Avoid conflict with Windows-specific macros.

Browse Source
This commit is contained in:
robocop 2009-11-01 10:55:05 +00:00
parent ac46c9bd84
commit f3d871ebad
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dsql/keywords.cpp
View File

@ -59,6 +59,7 @@ static const TOK tokens[] =
{GEQ, ">=", 1, false},
{BIND_PARAM, ":=", 2, false},
{ABS, "ABS", 2, false},
{KW_ABSOLUTE, "ABSOLUTE", 2, true},
{ACCENT, "ACCENT", 2, true},
{ACOS, "ACOS", 2, false},
{ACTION, "ACTION", 1, true},
@ -311,6 +312,7 @@ static const TOK tokens[] =
{RECREATE, "RECREATE", 2, false},
{RECURSIVE, "RECURSIVE", 2, false},
{REFERENCES, "REFERENCES", 1, false},
{KW_RELATIVE, "RELATIVE", 2, true},
{RELEASE, "RELEASE", 2, false},
{REPLACE, "REPLACE", 2, false},
{REQUESTS, "REQUESTS", 2, true},

22
src/dsql/parse.y
View File

@ -504,7 +504,7 @@ inline void check_copy_incr(char*& to, const char ch, const char* const string)
%token <legacyNode> FLOOR
%token <legacyNode> GEN_UUID
%token <legacyNode> GENERATED
%token <legacyNode> GLOBAL
%token <legacyNode> GLOBAL
%token <legacyNode> HASH
%token <legacyNode> INSENSITIVE
%token <legacyNode> LIST
@ -525,7 +525,7 @@ inline void check_copy_incr(char*& to, const char ch, const char* const string)
%token <legacyNode> POWER
%token <legacyNode> PRESERVE
%token <legacyNode> RAND
%token <legacyNode> RECURSIVE
%token <legacyNode> RECURSIVE
%token <legacyNode> REPLACE
%token <legacyNode> REVERSE
%token <legacyNode> ROUND
@ -539,7 +539,7 @@ inline void check_copy_incr(char*& to, const char ch, const char* const string)
%token <legacyNode> START
%token <legacyNode> TAN
%token <legacyNode> TANH
%token <legacyNode> TEMPORARY
%token <legacyNode> TEMPORARY
%token <legacyNode> TRUNC
%token <legacyNode> WEEK
@ -577,8 +577,8 @@ inline void check_copy_incr(char*& to, const char ch, const char* const string)
%token <legacyNode> RDB_SET_CONTEXT
%token <legacyNode> SCROLL
%token <legacyNode> PRIOR
%token <legacyNode> ABSOLUTE
%token <legacyNode> RELATIVE
%token <legacyNode> KW_ABSOLUTE
%token <legacyNode> KW_RELATIVE
/* precedence declarations for expression evaluation */
@ -1054,7 +1054,7 @@ udf_decl_clause
: symbol_UDF_name arg_desc_list1 RETURNS return_value1
ENTRY_POINT sql_string MODULE_NAME sql_string
{
$$ = make_node (nod_def_udf, (int) e_udf_count,
$$ = make_node (nod_def_udf, (int) e_udf_count,
$1, $6, $8, make_list ($2), $4);
}
;
@ -2495,10 +2495,10 @@ fetch_scroll_opt
| NEXT
{ $$ = make_node (nod_fetch_scroll, 2,
MAKE_const_slong (blr_scroll_forward), NULL); }
| ABSOLUTE value
| KW_ABSOLUTE value
{ $$ = make_node (nod_fetch_scroll, 2,
MAKE_const_slong (blr_scroll_absolute), $2); }
| RELATIVE value
| KW_RELATIVE value
{ $$ = make_node (nod_fetch_scroll, 2,
MAKE_const_slong (blr_scroll_relative), $2); }
;
@ -3984,7 +3984,7 @@ ddl_subname
: '.' symbol_ddl_name
{ $$ = $2; }
;
ddl_desc
: sql_string
| KW_NULL
@ -5825,8 +5825,8 @@ non_reserved_word :
| RDB_GET_CONTEXT
| RDB_SET_CONTEXT
| PRIOR
| ABSOLUTE
| RELATIVE
| KW_ABSOLUTE
| KW_RELATIVE
;
%%