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

Simplify code paths a bit.

Browse Source
This commit is contained in:
dimitr 2005-02-21 12:48:39 +00:00
parent 3b2ea011b2
commit 37f3266bb0
4 changed files with 8872 additions and 7314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dsql/dsql.tab.h
View File

@ -1,10 +1,3 @@
#ifndef BISON_DSQL_TAB_H
# define BISON_DSQL_TAB_H
# ifndef YYSTYPE
# define YYSTYPE int
# define YYSTYPE_IS_TRIVIAL 1
# endif
#define ACTIVE 257
#define ADD 258
#define AFTER 259
@ -269,8 +262,3 @@
#define NEXT 518
#define SEQUENCE 519
#define RESTART 520
extern YYSTYPE yylval;
#endif /* not BISON_DSQL_TAB_H */

12187
src/dsql/parse.cpp
View File

File diff suppressed because it is too large Load Diff

1
src/dsql/parse.y
View File

@ -2907,7 +2907,6 @@ column_singleton : select_expr_body order_clause rows_clause
;
select_expr_body : query_term
{ $$ = make_node (nod_list, 1, $1); }
| select_expr_body UNION distinct_noise query_term
{ $$ = make_node (nod_list, 2, $1, $4); }
| select_expr_body UNION ALL query_term

10
src/dsql/pass1.cpp
View File

@ -5648,13 +5648,8 @@ static dsql_nod* pass1_rse( dsql_req* request, dsql_nod* input, dsql_nod* order,
}
else if (input->nod_type == nod_list)
{
if (input->nod_count == 1)
{
return pass1_rse(request, input->nod_arg[0], order, rows,
update_lock, flags);
}
else
{
fb_assert(input->nod_count > 1);
if (update_lock)
ERRD_post(isc_sqlerr, isc_arg_number, (SLONG) - 104, isc_arg_gds,
isc_token_err, // Token unknown
@ -5662,7 +5657,6 @@ static dsql_nod* pass1_rse( dsql_req* request, dsql_nod* input, dsql_nod* order,
return pass1_union(request, input, order, rows, flags);
}
}
else
{
fb_assert(input->nod_type == nod_query_spec);