firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 04:43:03 +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},

12
src/dsql/parse.y
View File

@ -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 */
@ -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); }
;
@ -5825,8 +5825,8 @@ non_reserved_word :
| RDB_GET_CONTEXT
| RDB_SET_CONTEXT
| PRIOR
| ABSOLUTE
| RELATIVE
| KW_ABSOLUTE
| KW_RELATIVE
;
%%