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

Global changes for new Makefile and firebird2 compile on linux

Browse Source
This commit is contained in:
skywalker 2001-07-29 23:43:24 +00:00
parent 365a7fe19c
commit 4c4bc9a95c
296 changed files with 17736 additions and 8301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/alice/alice.cpp
View File

@ -24,13 +24,14 @@
//
//____________________________________________________________
//
// $Id: alice.cpp,v 1.3 2001-07-12 05:46:03 bellardo Exp $
// $Id: alice.cpp,v 1.4 2001-07-29 23:43:20 skywalker Exp $
//
// 2001.07.06 Sean Leyne - Code Cleanup, removed "#ifdef READONLY_DATABASE"
// conditionals, as the engine now fully supports
// readonly databases.
//
#include "firebird.h"
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
@ -38,7 +39,7 @@
#define FB_FROM_ALICE_CPP
#include "../jrd/ib_stdio.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/common.h"
#include "../jrd/license.h"
#include "../jrd/ibsetjmp.h"
@ -71,9 +72,6 @@
#endif
extern "C" {
#ifndef MAXPATHLEN
#define MAXPATHLEN 1024
#endif
@ -745,5 +743,3 @@ static void expand_filename(TEXT * filename, TEXT * expanded_name)
strcpy(expanded_name, filename);
}
} // extern "C"

4
src/alice/alice.h
View File

@ -34,7 +34,7 @@
#ifdef __cplusplus
extern "C" {
//extern "C" {
#endif
#ifndef MAXPATHLEN
@ -222,7 +222,7 @@ extern struct tgbl *gdgbl;
#define NOOUTPUT 2
#ifdef __cplusplus
} /* extern "C" */
//} /* extern "C" */
#endif
#endif /* _ALICE_ALICE_H_ */

5
src/alice/alice_meta.epp
View File

@ -27,13 +27,14 @@
*
*____________________________________________________________
*
* $Id: alice_meta.epp,v 1.1 2001-07-12 06:32:01 bellardo Exp $
* $Id: alice_meta.epp,v 1.2 2001-07-29 23:43:20 skywalker Exp $
*/
#include "firebird.h"
#include <stdio.h>
#include "../jrd/common.h"
#include "../jrd/ibsetjmp.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/license.h"
#include "../alice/alice.h"
#include "../alice/all.h"

170
src/alice/aliceswi.h
View File

@ -116,77 +116,77 @@
/* Switch table */
static struct in_sw_tab_t alice_in_sw_table[] =
{
IN_SW_ALICE_ACTIVATE, isc_spb_prp_activate, "activate", sw_activate,
0, ~sw_activate, FALSE, 25, 0, NULL,
{IN_SW_ALICE_ACTIVATE, isc_spb_prp_activate, "activate", sw_activate,
0, ~sw_activate, FALSE, 25, 0, NULL},
/* msg 25: \t-activate shadow file for database usage */
IN_SW_ALICE_ATTACH, 0, "attach", sw_attach,
sw_shut, 0, FALSE, 26, 0, NULL,
{IN_SW_ALICE_ATTACH, 0, "attach", sw_attach,
sw_shut, 0, FALSE, 26, 0, NULL},
/* msg 26: \t-attach\tshutdown new database attachments */
#ifdef DEV_BUILD
IN_SW_ALICE_BEGIN_LOG, 0, "begin_log", sw_begin_log,
0, ~sw_begin_log, FALSE, 27, 0, NULL,
{IN_SW_ALICE_BEGIN_LOG, 0, "begin_log", sw_begin_log,
0, ~sw_begin_log, FALSE, 27, 0, NULL},
/* msg 27: \t-begin_log\tbegin logging for replay utility */
#endif
IN_SW_ALICE_BUFFERS, isc_spb_prp_page_buffers, "buffers", sw_buffers,
0, 0, FALSE, 28, 0, NULL,
{IN_SW_ALICE_BUFFERS, isc_spb_prp_page_buffers, "buffers", sw_buffers,
0, 0, FALSE, 28, 0, NULL},
/* msg 28: \t-buffers\tset page buffers <n> */
IN_SW_ALICE_COMMIT, isc_spb_rpr_commit_trans, "commit", sw_commit,
0, ~sw_commit, FALSE, 29, 0, NULL,
{IN_SW_ALICE_COMMIT, isc_spb_rpr_commit_trans, "commit", sw_commit,
0, ~sw_commit, FALSE, 29, 0, NULL},
/* msg 29: \t-commit\t\tcommit transaction <tr / all> */
IN_SW_ALICE_CACHE, 0, "cache", sw_cache,
sw_shut, 0, FALSE, 30, 0, NULL,
{IN_SW_ALICE_CACHE, 0, "cache", sw_cache,
sw_shut, 0, FALSE, 30, 0, NULL},
/* msg 30: \t-cache\t\tshutdown cache manager */
#ifdef DEV_BUILD
IN_SW_ALICE_DISABLE, 0, "disable", sw_disable,
0, 0, FALSE, 31, 0, NULL,
{IN_SW_ALICE_DISABLE, 0, "disable", sw_disable,
0, 0, FALSE, 31, 0, NULL},
/* msg 31: \t-disable\tdisable WAL */
#endif
IN_SW_ALICE_FULL, isc_spb_rpr_full, "full", sw_full,
sw_validate, 0, FALSE, 32, 0, NULL,
{IN_SW_ALICE_FULL, isc_spb_rpr_full, "full", sw_full,
sw_validate, 0, FALSE, 32, 0, NULL},
/* msg 32: \t-full\t\tvalidate record fragments (-v) */
IN_SW_ALICE_FORCE, 0, "force", sw_force,
sw_shut, 0, FALSE, 33, 0, NULL,
{IN_SW_ALICE_FORCE, 0, "force", sw_force,
sw_shut, 0, FALSE, 33, 0, NULL},
/* msg 33: \t-force\t\tforce database shutdown */
IN_SW_ALICE_HOUSEKEEPING, isc_spb_prp_sweep_interval, "housekeeping",
{IN_SW_ALICE_HOUSEKEEPING, isc_spb_prp_sweep_interval, "housekeeping",
sw_housekeeping,
0, 0, FALSE, 34, 0, NULL,
0, 0, FALSE, 34, 0, NULL},
/* msg 34: \t-housekeeping\tset sweep interval <n> */
IN_SW_ALICE_IGNORE, isc_spb_rpr_ignore_checksum, "ignore", sw_ignore,
0, 0, FALSE, 35, 0, NULL,
{IN_SW_ALICE_IGNORE, isc_spb_rpr_ignore_checksum, "ignore", sw_ignore,
0, 0, FALSE, 35, 0, NULL},
/* msg 35: \t-ignore\t\tignore checksum errors */
IN_SW_ALICE_KILL, isc_spb_rpr_kill_shadows, "kill", sw_kill,
0, 0, FALSE, 36, 0, NULL,
{IN_SW_ALICE_KILL, isc_spb_rpr_kill_shadows, "kill", sw_kill,
0, 0, FALSE, 36, 0, NULL},
/* msg 36: \t-kill\t\tkill all unavailable shadow files */
IN_SW_ALICE_LIST, isc_spb_rpr_list_limbo_trans, "list", sw_list,
0, ~sw_list, FALSE, 37, 0, NULL,
{IN_SW_ALICE_LIST, isc_spb_rpr_list_limbo_trans, "list", sw_list,
0, ~sw_list, FALSE, 37, 0, NULL},
/* msg 37: \t-list\t\tshow limbo transactions */
IN_SW_ALICE_MEND, isc_spb_rpr_mend_db, "mend", SW_MEND,
0, ~sw_no_update, FALSE, 38, 0, NULL,
{IN_SW_ALICE_MEND, isc_spb_rpr_mend_db, "mend", SW_MEND,
0, ~sw_no_update, FALSE, 38, 0, NULL},
/* msg 38: \t-mend\t\tprepare corrupt database for backup */
IN_SW_ALICE_MODE, 0, "mode", sw_mode,
0, ~sw_mode, FALSE, 109, 0, NULL,
{IN_SW_ALICE_MODE, 0, "mode", sw_mode,
0, ~sw_mode, FALSE, 109, 0, NULL},
/* msg 109: \t-mode\t\tread_only or read_write */
IN_SW_ALICE_NO_UPDATE, isc_spb_rpr_check_db, "no_update", sw_no_update,
sw_validate, 0, FALSE, 39, 0, NULL,
{IN_SW_ALICE_NO_UPDATE, isc_spb_rpr_check_db, "no_update", sw_no_update,
sw_validate, 0, FALSE, 39, 0, NULL},
/* msg 39: \t-no_update\tread-only validation (-v) */
IN_SW_ALICE_ONLINE, isc_spb_prp_db_online, "online", sw_online,
0, 0, FALSE, 40, 0, NULL,
{IN_SW_ALICE_ONLINE, isc_spb_prp_db_online, "online", sw_online,
0, 0, FALSE, 40, 0, NULL},
/* msg 40: \t-online\t\tdatabase online */
IN_SW_ALICE_PROMPT, 0, "prompt", sw_prompt,
sw_list, 0, FALSE, 41, 0, NULL,
{IN_SW_ALICE_PROMPT, 0, "prompt", sw_prompt,
sw_list, 0, FALSE, 41, 0, NULL},
/* msg 41: \t-prompt\t\tprompt for commit/rollback (-l) */
IN_SW_ALICE_PASSWORD, 0, "password", sw_password,
0, 0, FALSE, 42, 0, NULL,
{IN_SW_ALICE_PASSWORD, 0, "password", sw_password,
0, 0, FALSE, 42, 0, NULL},
/* msg 42: \t-password\tdefault password */
#ifdef DEV_BUILD
IN_SW_ALICE_QUIT_LOG, 0, "quit_log", sw_quit_log,
0, ~sw_quit_log, FALSE, 43, 0, NULL,
{IN_SW_ALICE_QUIT_LOG, 0, "quit_log", sw_quit_log,
0, ~sw_quit_log, FALSE, 43, 0, NULL},
/* msg 43: \t-quit_log\tquit logging for replay utility */
#endif
IN_SW_ALICE_ROLLBACK, isc_spb_rpr_rollback_trans, "rollback", sw_rollback,
0, ~sw_rollback, FALSE, 44, 0, NULL,
{IN_SW_ALICE_ROLLBACK, isc_spb_rpr_rollback_trans, "rollback", sw_rollback,
0, ~sw_rollback, FALSE, 44, 0, NULL},
/* msg 44: \t-rollback\trollback transaction <tr / all> */
IN_SW_ALICE_SET_DB_SQL_DIALECT,
{IN_SW_ALICE_SET_DB_SQL_DIALECT,
isc_spb_prp_set_sql_dialect,
"sql_dialect",
sw_set_db_dialect,
@ -195,41 +195,41 @@ static struct in_sw_tab_t alice_in_sw_table[] =
FALSE,
111,
0,
NULL,
NULL},
/* msg 111: \t-SQL_dialect\t\set dataabse dialect n */
IN_SW_ALICE_SWEEP, isc_spb_rpr_sweep_db, "sweep", sw_sweep,
0, ~sw_sweep, FALSE, 45, 0, NULL,
{IN_SW_ALICE_SWEEP, isc_spb_rpr_sweep_db, "sweep", sw_sweep,
0, ~sw_sweep, FALSE, 45, 0, NULL},
/* msg 45: \t-sweep\t\tforce garbage collection */
IN_SW_ALICE_SHUT, 0, "shut", sw_shut,
{IN_SW_ALICE_SHUT, 0, "shut", sw_shut,
0, ~(sw_shut |
sw_attach | sw_cache | sw_force | sw_tran), FALSE, 46, 0, NULL,
sw_attach | sw_cache | sw_force | sw_tran), FALSE, 46, 0, NULL},
/* msg 46: \t-shut\t\tshutdown */
IN_SW_ALICE_TWO_PHASE, isc_spb_rpr_recover_two_phase, "two_phase",
{IN_SW_ALICE_TWO_PHASE, isc_spb_rpr_recover_two_phase, "two_phase",
sw_two_phase,
0, ~sw_two_phase, FALSE, 47, 0, NULL,
0, ~sw_two_phase, FALSE, 47, 0, NULL},
/* msg 47: \t-two_phase\tperform automated two-phase recovery */
IN_SW_ALICE_TRAN, 0, "tran", sw_tran,
sw_shut, 0, FALSE, 48, 0, NULL,
{IN_SW_ALICE_TRAN, 0, "tran", sw_tran,
sw_shut, 0, FALSE, 48, 0, NULL},
/* msg 48: \t-tran\t\tshutdown transaction startup */
IN_SW_ALICE_USE, 0, "use", sw_use,
0, ~sw_use, FALSE, 49, 0, NULL,
{IN_SW_ALICE_USE, 0, "use", sw_use,
0, ~sw_use, FALSE, 49, 0, NULL},
/* msg 49: \t-use\t\tuse full or reserve space for versions */
IN_SW_ALICE_USER, 0, "user", sw_user,
0, 0, FALSE, 50, 0, NULL,
{IN_SW_ALICE_USER, 0, "user", sw_user,
0, 0, FALSE, 50, 0, NULL},
/* msg 50: \t-user\t\tdefault user name */
IN_SW_ALICE_VALIDATE, isc_spb_rpr_validate_db, "validate", sw_validate,
0, ~sw_validate, FALSE, 51, 0, NULL,
{IN_SW_ALICE_VALIDATE, isc_spb_rpr_validate_db, "validate", sw_validate,
0, ~sw_validate, FALSE, 51, 0, NULL},
/* msg 51: \t-validate\tvalidate database structure */
IN_SW_ALICE_WRITE, 0, "write", sw_write,
0, ~sw_write, FALSE, 52, 0, NULL,
{IN_SW_ALICE_WRITE, 0, "write", sw_write,
0, ~sw_write, FALSE, 52, 0, NULL},
/* msg 52: \t-write\t\twrite synchronously or asynchronously */
#ifdef DEV_BUILD
IN_SW_ALICE_X, 0, "x", 0,
0, 0, FALSE, 53, 0, NULL,
{IN_SW_ALICE_X, 0, "x", 0,
0, 0, FALSE, 53, 0, NULL},
/* msg 53: \t-x\t\tset debug on */
#endif
IN_SW_ALICE_Z, 0, "z", sw_z,
0, 0, FALSE, 54, 0, NULL,
{IN_SW_ALICE_Z, 0, "z", sw_z,
0, 0, FALSE, 54, 0, NULL},
/* msg 54: \t-z\t\tprint software version number */
/************************************************************************/
/* WARNING: All new switches should be added right before this comments */
@ -237,27 +237,27 @@ static struct in_sw_tab_t alice_in_sw_table[] =
/* The next nine 'virtual' switches are hidden from user and are needed
for services API
************************************************************************/
IN_SW_ALICE_HIDDEN_ASYNC, isc_spb_prp_wm_async, "write async", 0, 0, 0,
FALSE, 0, 0, NULL,
IN_SW_ALICE_HIDDEN_SYNC, isc_spb_prp_wm_sync, "write sync", 0, 0, 0,
FALSE, 0, 0, NULL,
IN_SW_ALICE_HIDDEN_USEALL, isc_spb_prp_res_use_full, "use full", 0, 0, 0,
FALSE, 0, 0, NULL,
IN_SW_ALICE_HIDDEN_RESERVE, isc_spb_prp_res, "use reserve", 0, 0, 0,
FALSE, 0, 0, NULL,
IN_SW_ALICE_HIDDEN_FORCE, isc_spb_prp_shutdown_db, "shut -force", 0, 0, 0,
FALSE, 0, 0, NULL,
IN_SW_ALICE_HIDDEN_TRAN, isc_spb_prp_deny_new_transactions, "shut -tran",
0, 0, 0, FALSE, 0, 0, NULL,
IN_SW_ALICE_HIDDEN_ATTACH, isc_spb_prp_deny_new_attachments,
"shut -attach", 0, 0, 0, FALSE, 0, 0, NULL,
IN_SW_ALICE_HIDDEN_RDONLY, isc_spb_prp_am_readonly, "mode read_only", 0,
0, 0, FALSE, 0, 0, NULL,
IN_SW_ALICE_HIDDEN_RDWRITE, isc_spb_prp_am_readwrite, "mode read_write",
0, 0, 0, FALSE, 0, 0, NULL,
{IN_SW_ALICE_HIDDEN_ASYNC, isc_spb_prp_wm_async, "write async", 0, 0, 0,
FALSE, 0, 0, NULL},
{IN_SW_ALICE_HIDDEN_SYNC, isc_spb_prp_wm_sync, "write sync", 0, 0, 0,
FALSE, 0, 0, NULL},
{IN_SW_ALICE_HIDDEN_USEALL, isc_spb_prp_res_use_full, "use full", 0, 0, 0,
FALSE, 0, 0, NULL},
{IN_SW_ALICE_HIDDEN_RESERVE, isc_spb_prp_res, "use reserve", 0, 0, 0,
FALSE, 0, 0, NULL},
{IN_SW_ALICE_HIDDEN_FORCE, isc_spb_prp_shutdown_db, "shut -force", 0, 0, 0,
FALSE, 0, 0, NULL},
{IN_SW_ALICE_HIDDEN_TRAN, isc_spb_prp_deny_new_transactions, "shut -tran",
0, 0, 0, FALSE, 0, 0, NULL},
{IN_SW_ALICE_HIDDEN_ATTACH, isc_spb_prp_deny_new_attachments,
"shut -attach", 0, 0, 0, FALSE, 0, 0, NULL},
{IN_SW_ALICE_HIDDEN_RDONLY, isc_spb_prp_am_readonly, "mode read_only", 0,
0, 0, FALSE, 0, 0, NULL},
{IN_SW_ALICE_HIDDEN_RDWRITE, isc_spb_prp_am_readwrite, "mode read_write",
0, 0, 0, FALSE, 0, 0, NULL},
/************************************************************************/
IN_SW_ALICE_0, 0, NULL, 0,
0, 0, FALSE, 0, 0, NULL
{IN_SW_ALICE_0, 0, NULL, 0,
0, 0, FALSE, 0, 0, NULL}
};
#endif /* ALICE_ALICESWI_H */
#endif /* ALICE_ALICESWI_H */

3
src/alice/all.cpp
View File

@ -24,9 +24,10 @@
//
//____________________________________________________________
//
// $Id: all.cpp,v 1.1.1.1 2001-05-23 13:25:33 tamlin Exp $
// $Id: all.cpp,v 1.2 2001-07-29 23:43:20 skywalker Exp $
//
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include "../jrd/common.h"
#include "../jrd/ibsetjmp.h"

7
src/alice/exe.cpp
View File

@ -24,17 +24,18 @@
//
//____________________________________________________________
//
// $Id: exe.cpp,v 1.2 2001-07-10 17:35:12 awharrison Exp $
// $Id: exe.cpp,v 1.3 2001-07-29 23:43:21 skywalker Exp $
//
// 2001.07.06 Sean Leyne - Code Cleanup, removed "#ifdef READONLY_DATABASE"
// conditionals, as the engine now fully supports
// readonly databases.
//
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <stdlib.h>
#include <string.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/common.h"
#include "../jrd/ibsetjmp.h"
#include "../alice/alice.h"
@ -447,4 +448,4 @@ static void extract_db_info(UCHAR * db_info_buffer)
}
} // extern "C"
} // extern "C"

5
src/alice/tdr.cpp
View File

@ -24,12 +24,13 @@
//
//____________________________________________________________
//
// $Id: tdr.cpp,v 1.2 2001-05-24 14:54:25 tamlin Exp $
// $Id: tdr.cpp,v 1.3 2001-07-29 23:43:21 skywalker Exp $
//
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <string.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/common.h"
#include "../alice/alice.h"
#include "../alice/aliceswi.h"

3
src/burp/backup.epp
View File

@ -22,9 +22,10 @@
* Toni Martir: Added verbose backup records as BACKUP_VERBOSE_INTERVAL
*/
/*
$Id: backup.epp,v 1.1 2001-07-12 06:32:01 bellardo Exp $
$Id: backup.epp,v 1.2 2001-07-29 23:43:21 skywalker Exp $
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <memory.h>
#include <string.h>

1
src/burp/burp.cpp
View File

@ -24,6 +24,7 @@
* readonly databases.
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <stdlib.h>
#include <string.h>

2
src/burp/burp.h
View File

@ -26,7 +26,7 @@
#include "../jrd/ib_stdio.h"
#include "../jrd/common.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/dsc.h"
#include "../burp/burp_proto.h"
#include "../burp/misc_proto.h"

3
src/burp/canonical.cpp
View File

@ -21,9 +21,10 @@
* Contributor(s): ______________________________________.
*/
/*
$Id: canonical.cpp,v 1.1.1.1 2001-05-23 13:26:05 tamlin Exp $
$Id: canonical.cpp,v 1.2 2001-07-29 23:43:21 skywalker Exp $
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <string.h>
#include "../remote/remote.h"

1
src/burp/misc.cpp
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <string.h>
#ifdef UNIXWARE

1
src/burp/mvol.cpp
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <stdlib.h>
#include <string.h>

3
src/burp/restore.epp
View File

@ -23,9 +23,10 @@
* also verbose restoring indexes as DEFERRED when verbose
*/
/*
$Id: restore.epp,v 1.1 2001-07-12 06:32:02 bellardo Exp $
$Id: restore.epp,v 1.2 2001-07-29 23:43:21 skywalker Exp $
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <string.h>
#include <errno.h>

3
src/burp/spit.cpp
View File

@ -25,6 +25,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <stdlib.h>
#include <string.h>
@ -138,7 +139,7 @@ static int write_header(B_FIL, HEADER_REC, FILE_DESC, TEXT *);
******************************************************
*/
SLONG main( int argc, char *argv[])
int main( int argc, char *argv[])
{
SCHAR **end, *prog_name, *string;

4
src/csv/csi.cpp
View File

@ -20,12 +20,12 @@
* All Rights Reserved.
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../jrd/common.h"
#include <stdarg.h>
#include "../csv/csi.h"
#include "../jrd/license.h"
#include "../jrd/codes.h"
#include "gen/codes.h"
#include "../jrd/inf.h"
#include "../jrd/thd.h"
#include "../csv/csi_proto.h"

3
src/csv/css.cpp
View File

@ -21,9 +21,10 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include "../csv/csi.h"
#include "../jrd/codes.h"
#include "gen/codes.h"
#include "../jrd/thd.h"
#include "../csv/css_proto.h"
#include "../jrd/gds_proto.h"

5
src/csv/csu.cpp
View File

@ -21,12 +21,13 @@
* Contributor(s): ______________________________________.
*/
/*
$Id: csu.cpp,v 1.1.1.1 2001-05-23 13:25:33 tamlin Exp $
$Id: csu.cpp,v 1.2 2001-07-29 23:43:21 skywalker Exp $
*/
#include "firebird.h"
#include "../csv/csi.h"
#include "../jrd/license.h"
#include "../jrd/codes.h"
#include "gen/codes.h"
#include "../jrd/thd.h"
#include "../csv/css_proto.h"
#include "../jrd/gds_proto.h"

5
src/csv/csv.cpp
View File

@ -21,12 +21,13 @@
* Contributor(s): ______________________________________.
*/
/*
$Id: csv.cpp,v 1.1.1.1 2001-05-23 13:25:34 tamlin Exp $
$Id: csv.cpp,v 1.2 2001-07-29 23:43:21 skywalker Exp $
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include "../csv/csi.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/license.h"
#include "../csv/css_proto.h"
#include "../jrd/gds_proto.h"

1
src/csv/print.cpp
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../csv/csi.h"
#include "../csv/css_proto.h"
#include "../jrd/gds_proto.h"

9
src/dsql/alld.cpp
View File

@ -68,12 +68,13 @@ nested FOR loops are added.
THREAD_ENTER; // First statment after FOR loop
***************************************************************/
#include "firebird.h"
#include <string.h>
#include "../jrd/ib_stdio.h"
#include "../dsql/dsql.h"
#include "../dsql/node.h"
#include "../dsql/sym.h"
#include "../jrd/codes.h"
#include "gen/codes.h"
#include "../dsql/alld_proto.h"
#include "../dsql/errd_proto.h"
#include "../jrd/gds_proto.h"
@ -95,7 +96,7 @@ extern "C" {
#define BLOCK_ROUNDUP(size) ROUNDUP (size, MAX(BLOCK_FACTOR,ALIGNMENT))
#define EXPAND_BLOCKSIZE(b) (BLOCKS_TO_SIZE ((b)->blk_length))
#define BLKDEF(type, root, tail) sizeof (struct root), tail,
#define BLKDEF(type, root, tail) { sizeof (struct root), tail },
static CONST struct {
USHORT typ_root_length;
USHORT typ_tail_length;
@ -442,8 +443,8 @@ void* ALLD_malloc(ULONG size)
if (tdsql && tdsql->tsql_setjmp)
{
ERRD_post(gds__sys_request, gds_arg_string, "gds__alloc", gds_arg_gds,
gds__virmemexh, gds_arg_end);
ERRD_post(gds_sys_request, gds_arg_string, "gds__alloc", gds_arg_gds,
gds_virmemexh, gds_arg_end);
}
/* Commentary: This expands out to a call to ERRD_error - which

3
src/dsql/array.epp
View File

@ -21,10 +21,11 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include <string.h>
#include "../jrd/common.h"
#include <stdarg.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../dsql/array_proto.h"
#include "../jrd/gds_proto.h"

3
src/dsql/blob.epp
View File

@ -21,9 +21,10 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../jrd/common.h"
#include <stdarg.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/intl.h"
#include "../jrd/constants.h"
#include "../dsql/blob_proto.h"

221
src/dsql/ddl.cpp
View File

@ -20,7 +20,7 @@
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* $Id: ddl.cpp,v 1.3 2001-07-12 05:46:04 bellardo Exp $
* $Id: ddl.cpp,v 1.4 2001-07-29 23:43:21 skywalker Exp $
* 2001.5.20 Claudio Valderrama: Stop null pointer that leads to a crash,
* caused by incomplete yacc syntax that allows ALTER DOMAIN dom SET;
*
@ -29,16 +29,17 @@
* readonly databases.
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <string.h>
#include "../dsql/dsql.h"
#include "../dsql/node.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/thd.h"
#include "../jrd/intl.h"
#include "../jrd/flags.h"
#include "../jrd/constants.h"
#include "../jrd/codes.h"
#include "gen/codes.h"
#include "../dsql/alld_proto.h"
#include "../dsql/errd_proto.h"
#include "../dsql/ddl_proto.h"
@ -366,9 +367,9 @@ void DDL_resolve_intl_type( REQ request, FLD field, STR collation_name)
if ((field->fld_dtype > dtype_any_text) && field->fld_dtype != dtype_blob) {
if (field->fld_character_set || collation_name ||
field->fld_flags & FLD_national)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds__dsql_datatype_err,
gds_arg_gds, gds__collation_requires_text, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds_dsql_datatype_err,
gds_arg_gds, gds_collation_requires_text, 0);
return;
}
@ -382,13 +383,13 @@ void DDL_resolve_intl_type( REQ request, FLD field, STR collation_name)
(UCHAR *)("RDB$FIELD_SUB_TYPE"),
&blob_sub_type))
{
ERRD_post( gds__sqlerr,
ERRD_post( gds_sqlerr,
gds_arg_number,
(SLONG) - 204,
gds_arg_gds,
gds__dsql_datatype_err,
gds_dsql_datatype_err,
gds_arg_gds,
gds__dsql_blob_type_unknown,
gds_dsql_blob_type_unknown,
gds_arg_string,
((STR) field->fld_sub_type_name)->str_data,
0);
@ -401,24 +402,24 @@ void DDL_resolve_intl_type( REQ request, FLD field, STR collation_name)
}
if (field->fld_character_set && (field->fld_sub_type != BLOB_text))
{
ERRD_post( gds__sqlerr,
ERRD_post( gds_sqlerr,
gds_arg_number,
(SLONG) - 204,
gds_arg_gds,
gds__dsql_datatype_err,
gds_dsql_datatype_err,
gds_arg_gds,
gds__collation_requires_text,
gds_collation_requires_text,
0);
}
if (collation_name)
{
ERRD_post( gds__sqlerr,
ERRD_post( gds_sqlerr,
gds_arg_number,
(SLONG) - 204,
gds_arg_gds,
gds__dsql_datatype_err,
gds_dsql_datatype_err,
gds_arg_gds,
gds__collation_requires_text,
gds_collation_requires_text,
0);
}
if (field->fld_sub_type != BLOB_text) {
@ -450,10 +451,10 @@ void DDL_resolve_intl_type( REQ request, FLD field, STR collation_name)
if (field->fld_dtype == dtype_varying)
field_length += sizeof(USHORT);
if (field_length > (ULONG) MAX_COLUMN_SIZE)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds__dsql_datatype_err,
gds_arg_gds, gds__imp_exc,
gds_arg_gds, gds__field_name, gds_arg_string,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds_dsql_datatype_err,
gds_arg_gds, gds_imp_exc,
gds_arg_gds, gds_field_name, gds_arg_string,
field->fld_name, 0);
field->fld_length = (USHORT) field_length;
};
@ -484,9 +485,9 @@ void DDL_resolve_intl_type( REQ request, FLD field, STR collation_name)
/* Error code -204 (IBM's DB2 manual) is close enough */
if (!resolved_charset)
/* specified character set not found */
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds__dsql_datatype_err,
gds_arg_gds, gds__charset_not_found, gds_arg_string,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds_dsql_datatype_err,
gds_arg_gds, gds_charset_not_found, gds_arg_string,
charset_name, 0);
field->fld_character_set_id = resolved_charset->intlsym_charset_id;
resolved_type = resolved_charset;
@ -497,9 +498,9 @@ void DDL_resolve_intl_type( REQ request, FLD field, STR collation_name)
resolved_collation = METD_get_collation(request, collation_name);
if (!resolved_collation)
/* Specified collation not found */
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds__dsql_datatype_err,
gds_arg_gds, gds__collation_not_found, gds_arg_string,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds_dsql_datatype_err,
gds_arg_gds, gds_collation_not_found, gds_arg_string,
collation_name->str_data, 0);
/* If both specified, must be for same character set */
@ -508,9 +509,9 @@ void DDL_resolve_intl_type( REQ request, FLD field, STR collation_name)
resolved_type = resolved_collation;
if ((field->fld_character_set_id != resolved_type->intlsym_charset_id)
&& (field->fld_character_set_id != ttype_dynamic))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 204, gds_arg_gds,
gds__dsql_datatype_err, gds_arg_gds,
gds__collation_not_for_charset, gds_arg_string,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 204, gds_arg_gds,
gds_dsql_datatype_err, gds_arg_gds,
gds_collation_not_for_charset, gds_arg_string,
collation_name->str_data, 0);
}
@ -522,10 +523,10 @@ void DDL_resolve_intl_type( REQ request, FLD field, STR collation_name)
if (field->fld_dtype == dtype_varying)
field_length += sizeof(USHORT);
if (field_length > (ULONG) MAX_COLUMN_SIZE)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds__dsql_datatype_err,
gds_arg_gds, gds__imp_exc,
gds_arg_gds, gds__field_name, gds_arg_string,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds_dsql_datatype_err,
gds_arg_gds, gds_imp_exc,
gds_arg_gds, gds_field_name, gds_arg_string,
field->fld_name, 0);
field->fld_length = (USHORT) field_length;
};
@ -843,8 +844,8 @@ static void define_computed(
/* check if array or blobs are used in expression */
if (check_array_or_blob(input))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_no_blob_array, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_no_blob_array, 0);
/* generate the blr expression */
@ -1471,8 +1472,8 @@ static void define_dimensions( REQ request, FLD field)
if (dims > MAX_ARRAY_DIMENSIONS)
{
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 604,
gds_arg_gds, gds__dsql_max_arr_dim_exceeded, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 604,
gds_arg_gds, gds_dsql_max_arr_dim_exceeded, 0);
}
put_number(request, gds_dyn_fld_dimensions, (SSHORT) dims);
@ -1496,8 +1497,8 @@ static void define_dimensions( REQ request, FLD field)
STUFF(gds_dyn_end);
if (lrange >= hrange)
{
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 604,
gds_arg_gds, gds__dsql_arr_range_error, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 604,
gds_arg_gds, gds_dsql_arr_range_error, 0);
}
}
}
@ -1575,8 +1576,8 @@ static void define_domain( REQ request)
}
else
{
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 637,
gds_arg_gds, gds__dsql_duplicate_spec,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 637,
gds_arg_gds, gds_dsql_duplicate_spec,
gds_arg_string, "NOT NULL", 0);
}
}
@ -1584,8 +1585,8 @@ static void define_domain( REQ request)
{
if (check_flag)
{
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 637,
gds_arg_gds, gds__dsql_duplicate_spec,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 637,
gds_arg_gds, gds_dsql_duplicate_spec,
gds_arg_string, "DOMAIN CHECK CONSTRAINT",
0);
}
@ -1716,9 +1717,9 @@ static void define_field(
/* Get the domain information */
if (!(METD_get_domain(request, field, domain_name->str_data)))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__dsql_domain_not_found,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_dsql_domain_not_found,
/* Specified domain or source field does not exist */
0);
@ -1782,7 +1783,7 @@ static void define_field(
if (node1->nod_type == nod_null) {
if (default_null_flag == TRUE)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 204,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, isc_bad_default_value,
gds_arg_gds, isc_invalid_clause,
gds_arg_string, "default null not null", 0);
@ -2511,9 +2512,9 @@ static void define_shadow( REQ request)
shadow_node = request->req_ddl_node;
ptr = shadow_node->nod_arg;
if (!ptr[e_shadow_number])
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__dsql_shadow_number_err, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_dsql_shadow_number_err, 0);
put_number(request, gds_dyn_def_shadow, (SSHORT) (ptr[e_shadow_number]));
put_cstring(request, gds_dyn_def_file,
@ -2544,9 +2545,9 @@ static void define_shadow( REQ request)
reinterpret_cast<char*>(file->fil_name->str_data));
if (!length && !file->fil_start)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__dsql_file_length_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_dsql_file_length_err,
gds_arg_number, (SLONG) file->fil_name->str_data,
/* Preceding file did not specify length, so %s must include starting page number */
0);
@ -2618,9 +2619,9 @@ static void define_trigger( REQ request, NOD node)
(relation_name =
METD_get_trigger_relation(request, trigger_name,
&trig_type)))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds__dsql_trigger_err, gds_arg_gds,
gds__random, gds_arg_string,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds_dsql_trigger_err, gds_arg_gds,
gds_random, gds_arg_string,
trigger_name->str_data, 0);
relation_node = (NOD) ALLOCDV(type_nod, e_rln_count);
node->nod_arg[e_trg_table] = relation_node;
@ -2776,9 +2777,9 @@ static void define_udf( REQ request)
field->fld_dtype == dtype_cstring ||
field->fld_dtype == dtype_blob ||
field->fld_dtype == dtype_timestamp))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__return_mode_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_return_mode_err,
/* Return mode by value not allowed for this data type */
0);
@ -2788,9 +2789,9 @@ static void define_udf( REQ request)
if (field->fld_dtype == dtype_blob) {
blob_position = (arguments) ? arguments->nod_count + 1 : 1;
if (blob_position > MAX_UDF_ARGUMENTS)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__extern_func_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_extern_func_err,
/* External functions can not have more than 10 parameters */
/* Or 9 if the function returns a BLOB */
0);
@ -2807,9 +2808,9 @@ static void define_udf( REQ request)
/* Function modifies an argument whose value is the function return value */
if (!arguments || position > arguments->nod_count || position < 1)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__extern_func_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_extern_func_err,
/* External functions can not have more than 10 parameters */
/* Not strictly correct -- return position error */
0);
@ -2847,9 +2848,9 @@ static void define_udf( REQ request)
for (ptr = arguments->nod_arg, end = ptr + arguments->nod_count;
ptr < end; ptr++, position++) {
if (position > MAX_UDF_ARGUMENTS)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__extern_func_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_extern_func_err,
/* External functions can not have more than 10 parameters */
0);
@ -3235,9 +3236,9 @@ static void define_view( REQ request)
/* if this is an expression, check to make sure there is a name specified */
if (!ptr && !field)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__specify_field_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_specify_field_err,
/* must specify field name for view select expression */
0);
@ -3276,9 +3277,9 @@ static void define_view( REQ request)
}
if (ptr != end)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__num_field_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_num_field_err,
/* number of fields does not match select list */
0);
@ -3286,16 +3287,16 @@ static void define_view( REQ request)
if ((check = node->nod_arg[e_view_check]) != NULL) {
if (!updatable)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__col_name_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_col_name_err,
/* Only simple column names permitted for VIEW WITH CHECK OPTION */
0);
if (select_expr->nod_count != 1)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__table_view_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_table_view_err,
/* Only one table allowed for VIEW WITH CHECK OPTION */
0);
/*
@ -3303,9 +3304,9 @@ static void define_view( REQ request)
which in turn points to nod_select_expr
*/
else if (select_expr->nod_arg[0]->nod_arg[e_sel_from]->nod_count != 1)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__table_view_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_table_view_err,
/* Only one table allowed for VIEW WITH CHECK OPTION */
0);
@ -3315,9 +3316,9 @@ static void define_view( REQ request)
*/
select_expr = select_expr->nod_arg[0];
if (!(select_expr->nod_arg[e_sel_where]))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__where_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_where_err,
/* No where clause for VIEW WITH CHECK OPTION */
0);
@ -3325,9 +3326,9 @@ static void define_view( REQ request)
if (select_expr->nod_arg[e_sel_distinct] ||
select_expr->nod_arg[e_sel_group] ||
select_expr->nod_arg[e_sel_having])
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__distinct_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_distinct_err,
/* DISTINCT, GROUP or HAVING not permitted for VIEW WITH CHECK OPTION */
0);
@ -3598,18 +3599,18 @@ static void foreign_key( REQ request, NOD element)
the referenced table have a primary key to serve as the implicitly
referenced field, fail. */
if (!columns2)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__reftable_requires_pk,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_reftable_requires_pk,
/* "REFERENCES table" without "(column)" requires PRIMARY
KEY on referenced table */
0);
}
if (columns2 && (columns1->nod_count != columns2->nod_count))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__key_field_count_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_key_field_count_err,
/* foreign key field count does not match primary key */
0);
@ -4255,8 +4256,8 @@ static void modify_domain( REQ request)
/* CVC: So do you want to crash me with ALTER DOMAIN dom SET; ??? */
if (!element->nod_arg[e_dft_default])
{
ERRD_post (gds__sqlerr, gds_arg_number, (SLONG) -104,
gds_arg_gds, gds__command_end_err, /* Unexpected end of command */
ERRD_post (gds_sqlerr, gds_arg_number, (SLONG) -104,
gds_arg_gds, gds_command_end_err, /* Unexpected end of command */
0);
}
/* CVC End modification. */
@ -4282,9 +4283,9 @@ static void modify_domain( REQ request)
correct type, length, scale, etc. */
if (!METD_get_domain(request, &local_field,
domain_name->str_data))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__dsql_domain_not_found,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_dsql_domain_not_found,
/* Specified domain or source field does not exist */
0);
if (element->nod_arg[e_cnstr_condition])
@ -4675,9 +4676,9 @@ static void modify_relation( REQ request)
if ((element->nod_arg[1])->nod_type == nod_cascade)
/* Unsupported DSQL construct */
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 901,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__dsql_construct_err, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 901,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_dsql_construct_err, 0);
assert((element->nod_arg[1])->nod_type == nod_restrict);
put_cstring(request, gds_dyn_delete_local_fld,
@ -4954,8 +4955,8 @@ static SSHORT put_local_variables( REQ request, NOD parameters, SSHORT locals)
while ((++rest) != end) {
rest_field = (FLD) (*rest)->nod_arg[e_dfl_field];
if (!strcmp(field->fld_name, rest_field->fld_name))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 637,
gds_arg_gds, gds__dsql_duplicate_spec,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 637,
gds_arg_gds, gds_dsql_duplicate_spec,
gds_arg_string, field->fld_name, 0);
}
*ptr = var_node =
@ -5105,9 +5106,9 @@ static NOD replace_field_names(
ptr++) {
if ((*ptr)->nod_type == nod_select_expr)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__subquery_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_subquery_err,
/* No subqueries permitted for VIEW WITH CHECK OPTION */
0);
@ -5462,9 +5463,9 @@ static void modify_field(
/* Get the domain information */
if (!(METD_get_domain(request, field, domain_name->str_data)))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__dsql_domain_not_found,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 607,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_dsql_domain_not_found,
/* Specified domain or source field does not exist */
0);
DDL_resolve_intl_type(request, field, NULL);

7
src/dsql/dsql.cpp
View File

@ -24,7 +24,7 @@
* readonly databases.
*/
/*
$Id: dsql.cpp,v 1.5 2001-07-14 00:44:14 skywalker Exp $
$Id: dsql.cpp,v 1.6 2001-07-29 23:43:21 skywalker Exp $
*/
/**************************************************************
V4 Multi-threading changes.
@ -56,13 +56,14 @@ nested FOR loops are added.
#define DSQL_MAIN
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <stdlib.h>
#include <string.h>
#include "../dsql/dsql.h"
#include "../dsql/node.h"
#include "../dsql/sym.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/thd.h"
#include "../jrd/align.h"
#include "../jrd/intl.h"
@ -82,7 +83,7 @@ nested FOR loops are added.
#include "../jrd/sch_proto.h"
#include "../jrd/thd_proto.h"
#include "../jrd/why_proto.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
ASSERT_FILENAME
#ifdef VMS

5
src/dsql/errd.cpp
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <string.h>
#include "../jrd/common.h"
@ -30,7 +31,7 @@
#include "../dsql/dsql.h"
#include "../dsql/sqlda.h"
#include "../jrd/codes.h"
#include "gen/codes.h"
#include "../jrd/iberr.h"
#include "../dsql/errd_proto.h"
#include "../dsql/utld_proto.h"
@ -244,7 +245,7 @@ void ERRD_post( STATUS status, ...)
status_vector[2] != gds_arg_warning)) {
/* this is a blank status vector */
status_vector[0] = gds_arg_gds;
status_vector[1] = gds__dsql_error;
status_vector[1] = gds_dsql_error;
status_vector[2] = gds_arg_end;
}

7
src/dsql/gen.cpp
View File

@ -21,13 +21,14 @@
* Contributor(s): ______________________________________.
*/
/*
$Id: gen.cpp,v 1.1.1.1 2001-05-23 13:25:34 tamlin Exp $
$Id: gen.cpp,v 1.2 2001-07-29 23:43:21 skywalker Exp $
*/
#include "firebird.h"
#include <string.h>
#include <stdio.h>
#include "../dsql/dsql.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/align.h"
#include "../dsql/node.h"
#include "../jrd/intl.h"
@ -40,7 +41,7 @@ $Id: gen.cpp,v 1.1.1.1 2001-05-23 13:25:34 tamlin Exp $
#include "../dsql/metd_proto.h"
#include "../jrd/thd_proto.h"
#include "../jrd/dsc_proto.h"
#include "../include/iberror.h"
#include "gen/iberror.h"
ASSERT_FILENAME static void gen_aggregate(REQ, NOD);
static void gen_cast(REQ, NOD);

3
src/dsql/hsh.cpp
View File

@ -21,10 +21,11 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include <string.h>
#include "../dsql/dsql.h"
#include "../dsql/sym.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../dsql/alld_proto.h"
#include "../dsql/errd_proto.h"
#include "../dsql/hsh_proto.h"

449
src/dsql/keywords.h
View File

@ -18,218 +18,237 @@
* All Rights Reserved.
* Contributor(s): ______________________________________.
See dsql/parse.y for a chronological list. */
NOT_LSS, "!<", 1,
NEQ, "!=", 1,
NOT_GTR, "!>", 1,
LPAREN, "(", 1,
RPAREN, ")", 1, COMMA, ",", 1, LSS, "<", 1, LEQ, "<=", 1, NEQ, "<>", 1, /* Alias of != */
EQL, "=", 1,
GTR, ">", 1,
GEQ, ">=", 1,
ACTION, "ACTION", 1,
ACTIVE, "ACTIVE", 1,
ADD, "ADD", 1,
ADMIN, "ADMIN", 1,
AFTER, "AFTER", 1,
ALL, "ALL", 1,
ALTER, "ALTER", 1, AND, "AND", 1, ANY, "ANY", 1, AS, "AS", 1, ASC, "ASC", 1, /* Alias of ASCENDING */
ASC, "ASCENDING", 1,
AT, "AT", 1,
AUTO, "AUTO", 1,
AVG, "AVG", 1,
BASENAME, "BASE_NAME", 1,
BEFORE, "BEFORE", 1,
BEGIN, "BEGIN", 1,
BETWEEN, "BETWEEN", 1,
BLOB, "BLOB", 1,
BY, "BY", 1,
CACHE, "CACHE", 1,
CASCADE, "CASCADE", 1,
CAST, "CAST", 1,
KW_CHAR, "CHAR", 1,
CHARACTER, "CHARACTER", 1,
CHECK, "CHECK", 1,
CHECK_POINT_LEN, "CHECK_POINT_LENGTH", 1,
COLLATE, "COLLATE", 1,
COLUMN, "COLUMN", 2,
COMMIT, "COMMIT", 1,
COMMITTED, "COMMITTED", 1,
COMPUTED, "COMPUTED", 1,
CONDITIONAL, "CONDITIONAL", 1,
CONSTRAINT, "CONSTRAINT", 1,
CONTAINING, "CONTAINING", 1,
COUNT, "COUNT", 1,
CREATE, "CREATE", 1,
CSTRING, "CSTRING", 1,
CURRENT, "CURRENT", 1,
CURRENT_DATE, "CURRENT_DATE", 2,
CURRENT_TIME, "CURRENT_TIME", 2,
CURRENT_TIMESTAMP, "CURRENT_TIMESTAMP", 2,
CURSOR, "CURSOR", 1,
DATABASE, "DATABASE", 1,
DATE, "DATE", 1,
DAY, "DAY", 2,
DEBUG, "DEBUG", 1,
KW_DEC, "DEC", 1,
DECIMAL, "DECIMAL", 1,
DECLARE, "DECLARE", 1,
DEFAULT, "DEFAULT", 1, DELETE, "DELETE", 1, DESC, "DESC", 1, /* Alias of DESCENDING */
DESC, "DESCENDING", 1,
DISTINCT, "DISTINCT", 1,
DO, "DO", 1,
DOMAIN, "DOMAIN", 1,
KW_DOUBLE, "DOUBLE", 1,
DROP, "DROP", 1,
ELSE, "ELSE", 1,
END, "END", 1,
ENTRY_POINT, "ENTRY_POINT", 1,
ESCAPE, "ESCAPE", 1,
EXCEPTION, "EXCEPTION", 1,
EXECUTE, "EXECUTE", 1,
EXISTS, "EXISTS", 1,
EXIT, "EXIT", 1,
EXTERNAL, "EXTERNAL", 1,
EXTRACT, "EXTRACT", 2,
KW_FILE, "FILE", 1,
FILTER, "FILTER", 1,
KW_FLOAT, "FLOAT", 1,
FOR, "FOR", 1,
FOREIGN, "FOREIGN", 1,
FREE_IT, "FREE_IT", 1,
FROM, "FROM", 1,
FULL, "FULL", 1,
FUNCTION, "FUNCTION", 1,
GDSCODE, "GDSCODE", 1,
GENERATOR, "GENERATOR", 1,
GEN_ID, "GEN_ID", 1,
GRANT, "GRANT", 1,
GROUP, "GROUP", 1,
GROUP_COMMIT_WAIT, "GROUP_COMMIT_WAIT_TIME", 1,
HAVING, "HAVING", 1,
HOUR, "HOUR", 2,
IF, "IF", 1,
IN, "IN", 1,
INACTIVE, "INACTIVE", 1,
INDEX, "INDEX", 1,
INNER, "INNER", 1,
INPUT_TYPE, "INPUT_TYPE", 1,
INSERT, "INSERT", 1,
KW_INT, "INT", 1,
INTEGER, "INTEGER", 1,
INTO, "INTO", 1,
IS, "IS", 1,
ISOLATION, "ISOLATION", 1,
JOIN, "JOIN", 1,
KEY, "KEY", 1,
LEFT, "LEFT", 1,
LENGTH, "LENGTH", 1,
LEVEL, "LEVEL", 1,
LIKE, "LIKE", 1,
LOGFILE, "LOGFILE", 1,
LOG_BUF_SIZE, "LOG_BUFFER_SIZE", 1,
KW_LONG, "LONG", 1,
MANUAL, "MANUAL", 1,
MAXIMUM, "MAX", 1,
MAX_SEGMENT, "MAXIMUM_SEGMENT", 1,
MERGE, "MERGE", 1,
MESSAGE, "MESSAGE", 1,
MINIMUM, "MIN", 1,
MINUTE, "MINUTE", 2,
MODULE_NAME, "MODULE_NAME", 1,
MONTH, "MONTH", 2,
NAMES, "NAMES", 1,
NATIONAL, "NATIONAL", 1,
NATURAL, "NATURAL", 1,
NCHAR, "NCHAR", 1,
NO, "NO", 1,
NOT, "NOT", 1,
KW_NULL, "NULL", 1,
KW_NUMERIC, "NUMERIC", 1,
NUM_LOG_BUFS, "NUM_LOG_BUFFERS", 1,
OF, "OF", 1,
ON, "ON", 1,
ONLY, "ONLY", 1,
OPTION, "OPTION", 1,
OR, "OR", 1,
ORDER, "ORDER", 1,
OUTER, "OUTER", 1,
OUTPUT_TYPE, "OUTPUT_TYPE", 1,
OVERFLOW, "OVERFLOW", 1,
PAGE, "PAGE", 1,
PAGES, "PAGES", 1,
PAGE_SIZE, "PAGE_SIZE", 1,
PARAMETER, "PARAMETER", 1,
PASSWORD, "PASSWORD", 1,
PLAN, "PLAN", 1,
POSITION, "POSITION", 1,
POST_EVENT, "POST_EVENT", 1,
PRECISION, "PRECISION", 1,
PRIMARY, "PRIMARY", 1,
PRIVILEGES, "PRIVILEGES", 1,
PROCEDURE, "PROCEDURE", 1,
PROTECTED, "PROTECTED", 1,
RAW_PARTITIONS, "RAW_PARTITIONS", 1,
DB_KEY, "RDB$DB_KEY", 1,
READ, "READ", 1,
REAL, "REAL", 1,
VERSION, "RECORD_VERSION", 1,
REFERENCES, "REFERENCES", 1, RESERVING, "RESERV", 1, /* Alias of RESERVING */
RESERVING, "RESERVING", 1,
RESTRICT, "RESTRICT", 1,
RETAIN, "RETAIN", 1,
RETURNING_VALUES, "RETURNING_VALUES", 1,
RETURNS, "RETURNS", 1,
REVOKE, "REVOKE", 1,
RIGHT, "RIGHT", 1,
ROLE, "ROLE", 1, ROLLBACK, "ROLLBACK", 1, DATABASE, "SCHEMA", 1, /* Alias of DATABASE */
SECOND, "SECOND", 2,
SEGMENT, "SEGMENT", 1,
SELECT, "SELECT", 1,
SET, "SET", 1,
SHADOW, "SHADOW", 1,
SHARED, "SHARED", 1,
SINGULAR, "SINGULAR", 1,
SIZE, "SIZE", 1,
SMALLINT, "SMALLINT", 1,
SNAPSHOT, "SNAPSHOT", 1,
SOME, "SOME", 1,
SORT, "SORT", 1,
SQLCODE, "SQLCODE", 1,
STABILITY, "STABILITY", 1, STARTING, "STARTING", 1, STARTING, "STARTS", 1, /* Alias of STARTING */
STATISTICS, "STATISTICS", 1,
SUB_TYPE, "SUB_TYPE", 1,
SUM, "SUM", 1,
SUSPEND, "SUSPEND", 1,
TABLE, "TABLE", 1,
THEN, "THEN", 1,
TIME, "TIME", 2,
TIMESTAMP, "TIMESTAMP", 2,
TO, "TO", 1,
TRANSACTION, "TRANSACTION", 1,
TRIGGER, "TRIGGER", 1,
TYPE, "TYPE", 2,
UNCOMMITTED, "UNCOMMITTED", 1,
UNION, "UNION", 1,
UNIQUE, "UNIQUE", 1,
UPDATE, "UPDATE", 1,
KW_UPPER, "UPPER", 1,
USER, "USER", 1,
KW_VALUE, "VALUE", 1,
VALUES, "VALUES", 1,
VARCHAR, "VARCHAR", 1,
VARIABLE, "VARIABLE", 1,
VARYING, "VARYING", 1,
VIEW, "VIEW", 1,
WAIT, "WAIT", 1,
WEEKDAY, "WEEKDAY", 2,
WHEN, "WHEN", 1,
WHERE, "WHERE", 1,
WHILE, "WHILE", 1,
WITH, "WITH", 1,
WORK, "WORK", 1,
WRITE, "WRITE", 1, YEAR, "YEAR", 2, YEARDAY, "YEARDAY", 2, NOT_LSS, "^<", 1, /* Alias of !< */
NEQ, "^=", 1, /* Alias of != */
NOT_GTR, "^>", 1, /* Alias of !> */
CONCATENATE, "||", 1, NOT_LSS, "~<", 1, /* Alias of !< */
NEQ, "~=", 1, /* Alias of != */
NOT_GTR, "~>", 1, /* Alias of !> */
{NOT_LSS, "!<", 1},
{NEQ, "!=", 1},
{NOT_GTR, "!>", 1},
{LPAREN, "(", 1},
{RPAREN, ")", 1},
{COMMA, ",", 1},
{LSS, "<", 1},
{LEQ, "<=", 1},
{NEQ, "<>", 1}, /* Alias of != */
{EQL, "=", 1},
{GTR, ">", 1},
{GEQ, ">=", 1},
{ACTION, "ACTION", 1},
{ACTIVE, "ACTIVE", 1},
{ADD, "ADD", 1},
{ADMIN, "ADMIN", 1},
{AFTER, "AFTER", 1},
{ALL, "ALL", 1},
{ALTER, "ALTER", 1},
{AND, "AND", 1},
{ANY, "ANY", 1},
{AS, "AS", 1},
{ASC, "ASC", 1}, /* Alias of ASCENDING */
{ASC, "ASCENDING", 1},
{AT, "AT", 1},
{AUTO, "AUTO", 1},
{AVG, "AVG", 1},
{BASENAME, "BASE_NAME", 1},
{BEFORE, "BEFORE", 1},
{BEGIN, "BEGIN", 1},
{BETWEEN, "BETWEEN", 1},
{BLOB, "BLOB", 1},
{BY, "BY", 1},
{CACHE, "CACHE", 1},
{CASCADE, "CASCADE", 1},
{CAST, "CAST", 1},
{KW_CHAR, "CHAR", 1},
{CHARACTER, "CHARACTER", 1},
{CHECK, "CHECK", 1},
{CHECK_POINT_LEN, "CHECK_POINT_LENGTH", 1},
{COLLATE, "COLLATE", 1},
{COLUMN, "COLUMN", 2},
{COMMIT, "COMMIT", 1},
{COMMITTED, "COMMITTED", 1},
{COMPUTED, "COMPUTED", 1},
{CONDITIONAL, "CONDITIONAL", 1},
{CONSTRAINT, "CONSTRAINT", 1},
{CONTAINING, "CONTAINING", 1},
{COUNT, "COUNT", 1},
{CREATE, "CREATE", 1},
{CSTRING, "CSTRING", 1},
{CURRENT, "CURRENT", 1},
{CURRENT_DATE, "CURRENT_DATE", 2},
{CURRENT_TIME, "CURRENT_TIME", 2},
{CURRENT_TIMESTAMP, "CURRENT_TIMESTAMP", 2},
{CURSOR, "CURSOR", 1},
{DATABASE, "DATABASE", 1},
{DATE, "DATE", 1},
{DAY, "DAY", 2},
{DEBUG, "DEBUG", 1},
{KW_DEC, "DEC", 1},
{DECIMAL, "DECIMAL", 1},
{DECLARE, "DECLARE", 1},
{DEFAULT, "DEFAULT", 1},
{DELETE, "DELETE", 1},
{DESC, "DESC", 1}, /* Alias of DESCENDING */
{DESC, "DESCENDING", 1},
{DISTINCT, "DISTINCT", 1},
{DO, "DO", 1},
{DOMAIN, "DOMAIN", 1},
{KW_DOUBLE, "DOUBLE", 1},
{DROP, "DROP", 1},
{ELSE, "ELSE", 1},
{END, "END", 1},
{ENTRY_POINT, "ENTRY_POINT", 1},
{ESCAPE, "ESCAPE", 1},
{EXCEPTION, "EXCEPTION", 1},
{EXECUTE, "EXECUTE", 1},
{EXISTS, "EXISTS", 1},
{EXIT, "EXIT", 1},
{EXTERNAL, "EXTERNAL", 1},
{EXTRACT, "EXTRACT", 2},
{KW_FILE, "FILE", 1},
{FILTER, "FILTER", 1},
{KW_FLOAT, "FLOAT", 1},
{FOR, "FOR", 1},
{FOREIGN, "FOREIGN", 1},
{FREE_IT, "FREE_IT", 1},
{FROM, "FROM", 1},
{FULL, "FULL", 1},
{FUNCTION, "FUNCTION", 1},
{GDSCODE, "GDSCODE", 1},
{GENERATOR, "GENERATOR", 1},
{GEN_ID, "GEN_ID", 1},
{GRANT, "GRANT", 1},
{GROUP, "GROUP", 1},
{GROUP_COMMIT_WAIT, "GROUP_COMMIT_WAIT_TIME", 1},
{HAVING, "HAVING", 1},
{HOUR, "HOUR", 2},
{IF, "IF", 1},
{IN, "IN", 1},
{INACTIVE, "INACTIVE", 1},
{INDEX, "INDEX", 1},
{INNER, "INNER", 1},
{INPUT_TYPE, "INPUT_TYPE", 1},
{INSERT, "INSERT", 1},
{KW_INT, "INT", 1},
{INTEGER, "INTEGER", 1},
{INTO, "INTO", 1},
{IS, "IS", 1},
{ISOLATION, "ISOLATION", 1},
{JOIN, "JOIN", 1},
{KEY, "KEY", 1},
{LEFT, "LEFT", 1},
{LENGTH, "LENGTH", 1},
{LEVEL, "LEVEL", 1},
{LIKE, "LIKE", 1},
{LOGFILE, "LOGFILE", 1},
{LOG_BUF_SIZE, "LOG_BUFFER_SIZE", 1},
{KW_LONG, "LONG", 1},
{MANUAL, "MANUAL", 1},
{MAXIMUM, "MAX", 1},
{MAX_SEGMENT, "MAXIMUM_SEGMENT", 1},
{MERGE, "MERGE", 1},
{MESSAGE, "MESSAGE", 1},
{MINIMUM, "MIN", 1},
{MINUTE, "MINUTE", 2},
{MODULE_NAME, "MODULE_NAME", 1},
{MONTH, "MONTH", 2},
{NAMES, "NAMES", 1},
{NATIONAL, "NATIONAL", 1},
{NATURAL, "NATURAL", 1},
{NCHAR, "NCHAR", 1},
{NO, "NO", 1},
{NOT, "NOT", 1},
{KW_NULL, "NULL", 1},
{KW_NUMERIC, "NUMERIC", 1},
{NUM_LOG_BUFS, "NUM_LOG_BUFFERS", 1},
{OF, "OF", 1},
{ON, "ON", 1},
{ONLY, "ONLY", 1},
{OPTION, "OPTION", 1},
{OR, "OR", 1},
{ORDER, "ORDER", 1},
{OUTER, "OUTER", 1},
{OUTPUT_TYPE, "OUTPUT_TYPE", 1},
{OVERFLOW, "OVERFLOW", 1},
{PAGE, "PAGE", 1},
{PAGES, "PAGES", 1},
{PAGE_SIZE, "PAGE_SIZE", 1},
{PARAMETER, "PARAMETER", 1},
{PASSWORD, "PASSWORD", 1},
{PLAN, "PLAN", 1},
{POSITION, "POSITION", 1},
{POST_EVENT, "POST_EVENT", 1},
{PRECISION, "PRECISION", 1},
{PRIMARY, "PRIMARY", 1},
{PRIVILEGES, "PRIVILEGES", 1},
{PROCEDURE, "PROCEDURE", 1},
{PROTECTED, "PROTECTED", 1},
{RAW_PARTITIONS, "RAW_PARTITIONS", 1},
{DB_KEY, "RDB$DB_KEY", 1},
{READ, "READ", 1},
{REAL, "REAL", 1},
{VERSION, "RECORD_VERSION", 1},
{REFERENCES, "REFERENCES", 1},
{RESERVING, "RESERV", 1}, /* Alias of RESERVING */
{RESERVING, "RESERVING", 1},
{RESTRICT, "RESTRICT", 1},
{RETAIN, "RETAIN", 1},
{RETURNING_VALUES, "RETURNING_VALUES", 1},
{RETURNS, "RETURNS", 1},
{REVOKE, "REVOKE", 1},
{RIGHT, "RIGHT", 1},
{ROLE, "ROLE", 1},
{ROLLBACK, "ROLLBACK", 1},
{DATABASE, "SCHEMA", 1}, /* Alias of DATABASE */
{SECOND, "SECOND", 2},
{SEGMENT, "SEGMENT", 1},
{SELECT, "SELECT", 1},
{SET, "SET", 1},
{SHADOW, "SHADOW", 1},
{SHARED, "SHARED", 1},
{SINGULAR, "SINGULAR", 1},
{SIZE, "SIZE", 1},
{SMALLINT, "SMALLINT", 1},
{SNAPSHOT, "SNAPSHOT", 1},
{SOME, "SOME", 1},
{SORT, "SORT", 1},
{SQLCODE, "SQLCODE", 1},
{STABILITY, "STABILITY", 1},
{STARTING, "STARTING", 1},
{STARTING, "STARTS", 1}, /* Alias of STARTING */
{STATISTICS, "STATISTICS", 1},
{SUB_TYPE, "SUB_TYPE", 1},
{SUM, "SUM", 1},
{SUSPEND, "SUSPEND", 1},
{TABLE, "TABLE", 1},
{THEN, "THEN", 1},
{TIME, "TIME", 2},
{TIMESTAMP, "TIMESTAMP", 2},
{TO, "TO", 1},
{TRANSACTION, "TRANSACTION", 1},
{TRIGGER, "TRIGGER", 1},
{TYPE, "TYPE", 2},
{UNCOMMITTED, "UNCOMMITTED", 1},
{UNION, "UNION", 1},
{UNIQUE, "UNIQUE", 1},
{UPDATE, "UPDATE", 1},
{KW_UPPER, "UPPER", 1},
{USER, "USER", 1},
{KW_VALUE, "VALUE", 1},
{VALUES, "VALUES", 1},
{VARCHAR, "VARCHAR", 1},
{VARIABLE, "VARIABLE", 1},
{VARYING, "VARYING", 1},
{VIEW, "VIEW", 1},
{WAIT, "WAIT", 1},
{WEEKDAY, "WEEKDAY", 2},
{WHEN, "WHEN", 1},
{WHERE, "WHERE", 1},
{WHILE, "WHILE", 1},
{WITH, "WITH", 1},
{WORK, "WORK", 1},
{WRITE, "WRITE", 1},
{YEAR, "YEAR", 2},
{YEARDAY, "YEARDAY", 2},
{NOT_LSS, "^<", 1}, /* Alias of !< */
{NEQ, "^=", 1}, /* Alias of != */
{NOT_GTR, "^>", 1}, /* Alias of !> */
{CONCATENATE, "||", 1},
{NOT_LSS, "~<", 1}, /* Alias of !< */
{NEQ, "~=", 1}, /* Alias of != */
{NOT_GTR, "~>", 1}, /* Alias of !> */

3
src/dsql/make.cpp
View File

@ -21,12 +21,13 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include <ctype.h>
#include <string.h>
#include "../dsql/dsql.h"
#include "../dsql/node.h"
#include "../dsql/sym.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/intl.h"
#include "../jrd/constants.h"
#include "../jrd/align.h"

3
src/dsql/metd.epp
View File

@ -21,11 +21,12 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include <string.h>
#include "../dsql/dsql.h"
#include "../dsql/node.h"
#include "../dsql/sym.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/align.h"
#include "../jrd/intl.h"
#include "../jrd/thd.h"

7
src/dsql/movd.cpp
View File

@ -21,13 +21,14 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../jrd/common.h"
#include "../jrd/ib_stdio.h"
#include <stdarg.h>
#include <string.h>
#include "../dsql/dsql.h"
#include "../jrd/codes.h"
#include "gen/codes.h"
#include "../jrd/iberr.h"
#include "../dsql/errd_proto.h"
#include "../dsql/movd_proto.h"
@ -81,9 +82,9 @@ static void post_error( STATUS status, ...)
v = tdsql->tsql_status;
v_end = v + 20;
*v++ = gds_arg_gds;
*v++ = gds__dsql_error;
*v++ = gds_dsql_error;
*v++ = gds_arg_gds;
*v++ = gds__sqlerr;
*v++ = gds_sqlerr;
*v++ = gds_arg_number;
*v++ = -303;

12696
src/dsql/parse.cpp
View File

File diff suppressed because it is too large Load Diff

5
src/dsql/parse.y
View File

@ -22,13 +22,14 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "../jrd/common.h"
#include <stdarg.h>
#include "../include/iberror.h"
#include "gen/iberror.h"
#include "../dsql/dsql.h"
#include "../dsql/node.h"
#include "../dsql/sym.h"
@ -3370,7 +3371,7 @@ typedef struct tok {
static CONST TOK tokens [] = {
#include "../dsql/keywords.h"
0, 0, 0
{0, 0, 0}
};

237
src/dsql/pass1.cpp
View File

@ -21,13 +21,14 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include <string.h>
#include "../jrd/ib_stdio.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../dsql/dsql.h"
#include "../dsql/node.h"
#include "../dsql/sym.h"
#include "../jrd/codes.h"
#include "gen/codes.h"
#include "../jrd/thd.h"
#include "../jrd/intl.h"
#include "../jrd/blr.h"
@ -149,13 +150,13 @@ CTX PASS1_make_context( REQ request, NOD relation_node)
{
if (!(procedure = METD_get_procedure(request, relation_name)))
{
ERRD_post( gds__sqlerr,
ERRD_post( gds_sqlerr,
gds_arg_number,
(SLONG) - 204,
gds_arg_gds,
gds__dsql_procedure_err,
gds_dsql_procedure_err,
gds_arg_gds,
gds__random,
gds_random,
gds_arg_string,
relation_name->str_data,
0);
@ -170,13 +171,13 @@ CTX PASS1_make_context( REQ request, NOD relation_node)
}
if (!relation && !procedure)
{
ERRD_post( gds__sqlerr,
ERRD_post( gds_sqlerr,
gds_arg_number,
(SLONG) - 204,
gds_arg_gds,
gds__dsql_relation_err,
gds_dsql_relation_err,
gds_arg_gds,
gds__random,
gds_random,
gds_arg_string,
relation_name->str_data,
0);
@ -184,8 +185,8 @@ CTX PASS1_make_context( REQ request, NOD relation_node)
}
if (procedure && !procedure->prc_out_count)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 84,
gds_arg_gds, gds__dsql_procedure_use_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 84,
gds_arg_gds, gds_dsql_procedure_use_err,
gds_arg_string, relation_name->str_data, 0);
/* Set up context block */
@ -220,24 +221,24 @@ CTX PASS1_make_context( REQ request, NOD relation_node)
if (conflict->ctx_alias) {
conflict_name = conflict->ctx_alias;
error_code = gds__alias_conflict_err;
error_code = gds_alias_conflict_err;
/* alias %s conflicts with an alias in the same statement */
}
else if (conflict->ctx_procedure) {
conflict_name = conflict->ctx_procedure->prc_name;
error_code = gds__procedure_conflict_error;
error_code = gds_procedure_conflict_error;
/* alias %s conflicts with a procedure in the same statement */
}
else if (conflict->ctx_relation) {
conflict_name = conflict->ctx_relation->rel_name;
error_code = gds__relation_conflict_err;
error_code = gds_relation_conflict_err;
/* alias %s conflicts with a relation in the same statement */
}
else
continue;
if (!strcmp(conflict_name, context->ctx_alias))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 204,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, error_code,
gds_arg_string, conflict_name, 0);
}
@ -258,7 +259,7 @@ CTX PASS1_make_context( REQ request, NOD relation_node)
if (!(request->req_type & REQ_procedure)) {
if (count != procedure->prc_in_count)
ERRD_post(gds__prcmismat, gds_arg_string,
ERRD_post(gds_prcmismat, gds_arg_string,
relation_name->str_data, 0);
if (count) {
@ -369,16 +370,16 @@ NOD PASS1_node(REQ request, NOD input, USHORT proc_flag)
case blr_extract_yearday:
if (sub1->nod_desc.dsc_dtype != dtype_sql_date &&
sub1->nod_desc.dsc_dtype != dtype_timestamp)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 105,
gds_arg_gds, gds__extract_input_mismatch, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 105,
gds_arg_gds, gds_extract_input_mismatch, 0);
break;
case blr_extract_hour:
case blr_extract_minute:
case blr_extract_second:
if (sub1->nod_desc.dsc_dtype != dtype_sql_time &&
sub1->nod_desc.dsc_dtype != dtype_timestamp)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 105,
gds_arg_gds, gds__extract_input_mismatch, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 105,
gds_arg_gds, gds_extract_input_mismatch, 0);
break;
default:
assert(FALSE);
@ -396,13 +397,13 @@ NOD PASS1_node(REQ request, NOD input, USHORT proc_flag)
case nod_insert:
case nod_order:
case nod_select:
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_command_err, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_command_err, 0);
case nod_select_expr:
if (proc_flag)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 206,
gds_arg_gds, gds__dsql_subselect_err, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 206,
gds_arg_gds, gds_dsql_subselect_err, 0);
base = request->req_context;
node = MAKE_node(nod_via, e_via_count);
@ -436,8 +437,8 @@ NOD PASS1_node(REQ request, NOD input, USHORT proc_flag)
case nod_array:
if (proc_flag)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_invalid_array, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_invalid_array, 0);
else
return pass1_field(request, input, 0);
@ -460,8 +461,8 @@ NOD PASS1_node(REQ request, NOD input, USHORT proc_flag)
case nod_parameter:
if (proc_flag)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_command_err, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_command_err, 0);
node = MAKE_node(input->nod_type, e_par_count);
node->nod_count = 0;
node->nod_arg[e_par_parameter] =
@ -504,9 +505,9 @@ NOD PASS1_node(REQ request, NOD input, USHORT proc_flag)
node = compose(node, temp, nod_or);
}
if (list_item_count >= MAX_MEMBER_LIST)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 901,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 901,
gds_arg_gds, isc_imp_exc,
gds_arg_gds, gds__random,
gds_arg_gds, gds_random,
gds_arg_string,
"too many values (more than 1500) in member list to match against",
0);
@ -514,8 +515,8 @@ NOD PASS1_node(REQ request, NOD input, USHORT proc_flag)
}
if (sub2->nod_type == nod_select_expr) {
if (proc_flag)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 206,
gds_arg_gds, gds__dsql_subselect_err, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 206,
gds_arg_gds, gds_dsql_subselect_err, 0);
if (sub2->nod_arg[e_sel_singleton]) {
base = request->req_context;
@ -572,16 +573,16 @@ NOD PASS1_node(REQ request, NOD input, USHORT proc_flag)
case nod_agg_average2:
case nod_agg_total2:
if (proc_flag)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_command_err, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_command_err, 0);
if (request->req_inhibit_map || !(request->req_in_select_list ||
request->req_in_having_clause
|| request->req_in_order_by_clause))
/* either nested aggregate, or not part of a select
list, having clause, or order by clause
*/
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_agg_ref_err, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_agg_ref_err, 0);
++request->req_inhibit_map;
node = MAKE_node(input->nod_type, input->nod_count);
node->nod_flags = input->nod_flags;
@ -860,9 +861,9 @@ NOD PASS1_statement(REQ request, NOD input, USHORT proc_flag)
field2 = (FLD) (*ptr2)->nod_arg[e_dfl_field];
DEV_BLKCHK(field2, type_fld);
if (!strcmp(field->fld_name, field2->fld_name))
ERRD_post(gds__sqlerr, gds_arg_number,
ERRD_post(gds_sqlerr, gds_arg_number,
(SLONG) - 901, gds_arg_gds,
gds__dsql_var_conflict, gds_arg_string,
gds_dsql_var_conflict, gds_arg_string,
field->fld_name, 0);
}
if (parameters = input->nod_arg[e_prc_outputs])
@ -871,9 +872,9 @@ NOD PASS1_statement(REQ request, NOD input, USHORT proc_flag)
field2 = (FLD) (*ptr2)->nod_arg[e_dfl_field];
DEV_BLKCHK(field2, type_fld);
if (!strcmp(field->fld_name, field2->fld_name))
ERRD_post(gds__sqlerr, gds_arg_number,
ERRD_post(gds_sqlerr, gds_arg_number,
(SLONG) - 901, gds_arg_gds,
gds__dsql_var_conflict, gds_arg_string,
gds_dsql_var_conflict, gds_arg_string,
field->fld_name, 0);
}
}
@ -910,9 +911,9 @@ NOD PASS1_statement(REQ request, NOD input, USHORT proc_flag)
name = (STR) input->nod_arg[e_exe_procedure];
DEV_BLKCHK(name, type_str);
if (!(request->req_procedure = METD_get_procedure(request, name)))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds__dsql_procedure_err,
gds_arg_gds, gds__random,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds_dsql_procedure_err,
gds_arg_gds, gds_random,
gds_arg_string, name->str_data, 0);
request->req_type = REQ_EXEC_PROCEDURE;
}
@ -933,7 +934,7 @@ NOD PASS1_statement(REQ request, NOD input, USHORT proc_flag)
else
count = 0;
if (count != request->req_procedure->prc_in_count)
ERRD_post(gds__prcmismat, gds_arg_string, name->str_data, 0);
ERRD_post(gds_prcmismat, gds_arg_string, name->str_data, 0);
if (count) {
/* Initialize this stack variable, and make it look like a node */
memset((SCHAR *) & desc_node, 0, sizeof(desc_node));
@ -1085,14 +1086,14 @@ NOD PASS1_statement(REQ request, NOD input, USHORT proc_flag)
case nod_exit:
if (request->req_flags & REQ_trigger)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104, gds_arg_gds, gds__token_err, /* Token unknown */
gds_arg_gds, gds__random, gds_arg_string, "EXIT", 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104, gds_arg_gds, gds_token_err, /* Token unknown */
gds_arg_gds, gds_random, gds_arg_string, "EXIT", 0);
return input;
case nod_return:
if (request->req_flags & REQ_trigger)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104, gds_arg_gds, gds__token_err, /* Token unknown */
gds_arg_gds, gds__random, gds_arg_string, "RETURN", 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104, gds_arg_gds, gds_token_err, /* Token unknown */
gds_arg_gds, gds_random, gds_arg_string, "RETURN", 0);
input->nod_arg[e_rtn_procedure] = request->req_ddl_node;
return input;
@ -1170,14 +1171,14 @@ NOD PASS1_statement(REQ request, NOD input, USHORT proc_flag)
break;
case nod_union:
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 901,
gds_arg_gds, gds__dsql_command_err, gds_arg_gds, gds__union_err, /* union not supported */
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 901,
gds_arg_gds, gds_dsql_command_err, gds_arg_gds, gds_union_err, /* union not supported */
0);
break;
default:
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 901,
gds_arg_gds, gds__dsql_command_err, gds_arg_gds, gds__dsql_construct_err, /* Unsupported DSQL construct */
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 901,
gds_arg_gds, gds_dsql_command_err, gds_arg_gds, gds_dsql_construct_err, /* Unsupported DSQL construct */
0);
break;
}
@ -1220,7 +1221,7 @@ static BOOLEAN aggregate_found( REQ request, NOD sub, NOD * proj)
aggregate = aggregate_found2(request, sub, proj, &field);
if (field && aggregate)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104, gds_arg_gds, gds__field_aggregate_err, /* field used with aggregate */
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104, gds_arg_gds, gds_field_aggregate_err, /* field used with aggregate */
0);
return aggregate;
@ -1513,11 +1514,11 @@ static void explode_asterisk( NOD node, NOD aggregate, LLS * stack)
if (invalid_reference
(node,
aggregate->
nod_arg[e_agg_group])) ERRD_post(gds__sqlerr,
nod_arg[e_agg_group])) ERRD_post(gds_sqlerr,
gds_arg_number,
(SLONG) - 104,
gds_arg_gds,
gds__field_ref_err,
gds_field_ref_err,
/* invalid field reference */
0);
}
@ -1531,11 +1532,11 @@ static void explode_asterisk( NOD node, NOD aggregate, LLS * stack)
if (invalid_reference
(node,
aggregate->
nod_arg[e_agg_group])) ERRD_post(gds__sqlerr,
nod_arg[e_agg_group])) ERRD_post(gds_sqlerr,
gds_arg_number,
(SLONG) - 104,
gds_arg_gds,
gds__field_ref_err,
gds_field_ref_err,
/* invalid field reference */
0);
}
@ -1606,12 +1607,12 @@ static void field_error( TEXT * qualifier_name, TEXT * field_name)
}
if (field_name)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 206,
gds_arg_gds, gds__dsql_field_err,
gds_arg_gds, gds__random, gds_arg_string, field_name, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 206,
gds_arg_gds, gds_dsql_field_err,
gds_arg_gds, gds_random, gds_arg_string, field_name, 0);
else
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 206,
gds_arg_gds, gds__dsql_field_err, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 206,
gds_arg_gds, gds_dsql_field_err, 0);
}
@ -2205,8 +2206,8 @@ static void pass1_blob( REQ request, NOD input)
(void) PASS1_make_context(request, input->nod_arg[e_blb_relation]);
field = pass1_field(request, input->nod_arg[e_blb_field], 0);
if (field->nod_desc.dsc_dtype != dtype_blob)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 206,
gds_arg_gds, gds__dsql_blob_err, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 206,
gds_arg_gds, gds_dsql_blob_err, 0);
request->req_type =
(input->nod_type ==
@ -2306,9 +2307,9 @@ static NOD pass1_collate( REQ request, NOD sub1, STR collation)
field->fld_length += sizeof(USHORT);
}
else {
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds__dsql_datatype_err,
gds_arg_gds, gds__collation_requires_text, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 204,
gds_arg_gds, gds_dsql_datatype_err,
gds_arg_gds, gds_collation_requires_text, 0);
}
DDL_resolve_intl_type(request, field, collation);
MAKE_desc_from_field(&node->nod_desc, field);
@ -2347,8 +2348,8 @@ static NOD pass1_constant( REQ request, NOD constant)
reinterpret_cast < UCHAR * >(string->str_charset));
if (!resolved)
/* character set name is not defined */
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 504, gds_arg_gds,
gds__charset_not_found, gds_arg_string, string->str_charset,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 504, gds_arg_gds,
gds_charset_not_found, gds_arg_string, string->str_charset,
0);
if (temp_collation_name) {
@ -2357,9 +2358,9 @@ static NOD pass1_constant( REQ request, NOD constant)
/*
** Specified collation not found
*/
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 204, gds_arg_gds,
gds__dsql_datatype_err, gds_arg_gds,
gds__collation_not_found, gds_arg_string,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 204, gds_arg_gds,
gds_dsql_datatype_err, gds_arg_gds,
gds_collation_not_found, gds_arg_string,
temp_collation_name->str_data, 0);
resolved = resolved_collation;
@ -2406,8 +2407,8 @@ static NOD pass1_cursor( REQ request, NOD cursor, NOD relation_name)
if (!symbol)
/* cursor is not defined */
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 504,
gds_arg_gds, gds__dsql_cursor_err, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 504,
gds_arg_gds, gds_dsql_cursor_err, 0);
parent = (REQ) symbol->sym_object;
@ -2419,8 +2420,8 @@ static NOD pass1_cursor( REQ request, NOD cursor, NOD relation_name)
!(source = find_dbkey(parent, relation_name)) ||
(!rv_source && !(request->req_dbb->dbb_flags & DBB_v3)))
/* cursor is not updatable */
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 510,
gds_arg_gds, gds__dsql_cursor_update_err, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 510,
gds_arg_gds, gds_dsql_cursor_update_err, 0);
request->req_parent = parent;
request->req_parent_dbkey = source;
@ -2515,9 +2516,9 @@ static CTX pass1_cursor_context( REQ request, NOD cursor, NOD relation_name)
(reinterpret_cast < const char *>(rname->str_data),
relation->rel_name)) {
if (context)
ERRD_post(gds__sqlerr, gds_arg_number,
ERRD_post(gds_sqlerr, gds_arg_number,
(SLONG) - 504, gds_arg_gds,
gds__dsql_cursor_err, 0);
gds_dsql_cursor_err, 0);
else
context = candidate;
}
@ -2530,8 +2531,8 @@ static CTX pass1_cursor_context( REQ request, NOD cursor, NOD relation_name)
}
}
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 504,
gds_arg_gds, gds__dsql_cursor_err, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 504,
gds_arg_gds, gds_dsql_cursor_err, 0);
return (NULL); /* Added to remove compiler warnings */
}
@ -2735,9 +2736,9 @@ static NOD pass1_field( REQ request, NOD input, USHORT list)
if (field->fld_dtype == dtype_sql_date ||
field->fld_dtype == dtype_sql_time ||
field->fld_dtype == dtype_int64) {
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 206,
gds_arg_gds, gds__dsql_field_err,
gds_arg_gds, gds__random,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 206,
gds_arg_gds, gds_dsql_field_err,
gds_arg_gds, gds_random,
gds_arg_string, field->fld_name,
gds_arg_gds,
isc_sql_dialect_datatype_unsupport,
@ -2829,8 +2830,8 @@ static NOD pass1_insert( REQ request, NOD input)
if (fields->nod_count != values->nod_count)
/* count of column list and value list don't match */
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 804,
gds_arg_gds, gds__dsql_var_count_err, 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 804,
gds_arg_gds, gds_dsql_var_count_err, 0);
stack = NULL;
@ -2943,9 +2944,9 @@ static NOD pass1_alias_list( REQ request, NOD alias_list)
if (!context)
/* there is no alias or table named %s at this scope level */
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__dsql_no_relation_alias,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_dsql_no_relation_alias,
gds_arg_string, ((STR) * arg)->str_data, 0);
/* find the base table using the specified alias list, skipping the first one
@ -2957,9 +2958,9 @@ static NOD pass1_alias_list( REQ request, NOD alias_list)
if (!relation)
/* there is no alias or table named %s at this scope level */
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__dsql_no_relation_alias,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_dsql_no_relation_alias,
gds_arg_string, ((STR) * arg)->str_data, 0);
/* make up a dummy context to hold the resultant relation */
@ -3040,9 +3041,9 @@ static CTX pass1_alias( REQ request, STR alias)
reinterpret_cast < const char *>(alias->str_data))) {
if (relation_context)
/* the table %s is referenced twice; use aliases to differentiate */
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_command_err,
gds_arg_gds, gds__dsql_self_join,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_command_err,
gds_arg_gds, gds_dsql_self_join,
gds_arg_string, alias->str_data, 0);
relation_context = context;
}
@ -3184,8 +3185,8 @@ static NOD pass1_rse( REQ request, NOD input, NOD order)
for (ptr = list->nod_arg, end = ptr + list->nod_count; ptr < end;
ptr++)
if (invalid_reference(*ptr, aggregate->nod_arg[e_agg_group]))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__field_ref_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_field_ref_err,
/* invalid field reference */
0);
}
@ -3205,8 +3206,8 @@ static NOD pass1_rse( REQ request, NOD input, NOD order)
until we can figure out why they don't work: bug #6057 */
if (request->req_flags & REQ_trigger)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104, gds_arg_gds, gds__token_err, /* Token unknown */
gds_arg_gds, gds__random, gds_arg_string, "PLAN", 0);
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104, gds_arg_gds, gds_token_err, /* Token unknown */
gds_arg_gds, gds_random, gds_arg_string, "PLAN", 0);
rse->nod_arg[e_rse_plan] = PASS1_node(request, node, 0);
}
@ -3255,8 +3256,8 @@ static NOD pass1_rse( REQ request, NOD input, NOD order)
if (aggregate)
if (invalid_reference(parent_rse->nod_arg[e_rse_boolean],
aggregate->nod_arg[e_agg_group]))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__field_ref_err,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_field_ref_err,
/* invalid field reference */
0);
#endif
@ -3334,8 +3335,8 @@ static NOD pass1_sort( REQ request, NOD input, NOD s_list)
DEV_BLKCHK(s_list, type_nod);
if (input->nod_type != nod_list)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_command_err, gds_arg_gds, gds__order_by_err, /* invalid ORDER BY clause */
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_command_err, gds_arg_gds, gds_order_by_err, /* invalid ORDER BY clause */
0);
/* Node is simply to be rebuilt -- just recurse merrily */
@ -3347,8 +3348,8 @@ static NOD pass1_sort( REQ request, NOD input, NOD s_list)
DEV_BLKCHK(*ptr, type_nod);
node1 = *ptr;
if (node1->nod_type != nod_order)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_command_err, gds_arg_gds, gds__order_by_err, /* invalid ORDER BY clause */
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_command_err, gds_arg_gds, gds_order_by_err, /* invalid ORDER BY clause */
0);
node2 = MAKE_node(nod_order, e_order_count);
node2->nod_arg[1] = node1->nod_arg[1];
@ -3359,18 +3360,18 @@ static NOD pass1_sort( REQ request, NOD input, NOD s_list)
position = (ULONG) (node1->nod_arg[0]);
if ((position < 1) || !s_list
|| (position >
(ULONG) s_list->nod_count)) ERRD_post(gds__sqlerr,
(ULONG) s_list->nod_count)) ERRD_post(gds_sqlerr,
gds_arg_number,
(SLONG) - 104,
gds_arg_gds,
gds__dsql_command_err, gds_arg_gds, gds__order_by_err, /* invalid ORDER BY clause */
gds_dsql_command_err, gds_arg_gds, gds_order_by_err, /* invalid ORDER BY clause */
0);
node2->nod_arg[0] =
PASS1_node(request, s_list->nod_arg[position - 1], 0);
}
else
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_command_err, gds_arg_gds, gds__order_by_err, /* invalid ORDER BY clause */
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_command_err, gds_arg_gds, gds_order_by_err, /* invalid ORDER BY clause */
0);
if ((*ptr)->nod_arg[e_order_collate]) {
@ -3410,9 +3411,9 @@ static NOD pass1_udf( REQ request, NOD input, USHORT proc_flag)
DEV_BLKCHK(name, type_str);
udf = METD_get_function(request, name);
if (!udf)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 804,
gds_arg_gds, gds__dsql_function_err,
gds_arg_gds, gds__random,
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 804,
gds_arg_gds, gds_dsql_function_err,
gds_arg_gds, gds_random,
gds_arg_string, name->str_data, 0);
node = MAKE_node(nod_udf, input->nod_count);
@ -3528,8 +3529,8 @@ static NOD pass1_union( REQ request, NOD input, NOD order_list)
for (i = 1; i < union_node->nod_count; i++) {
nod1 = union_node->nod_arg[i]->nod_arg[e_rse_items];
if (items->nod_count != nod1->nod_count)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_command_err, gds_arg_gds, gds__dsql_count_mismatch, /* overload of msg */
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_command_err, gds_arg_gds, gds_dsql_count_mismatch, /* overload of msg */
0);
for (j = 0; j < nod1->nod_count; j++) {
@ -3550,8 +3551,8 @@ static NOD pass1_union( REQ request, NOD input, NOD order_list)
(items->nod_arg[j]->nod_desc.dsc_dtype)) ||
((nod1->nod_arg[j]->nod_desc.dsc_length) !=
(items->nod_arg[j]->nod_desc.dsc_length)))
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_command_err, gds_arg_gds, gds__dsql_datatype_err, /* overload of msg */
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_command_err, gds_arg_gds, gds_dsql_datatype_err, /* overload of msg */
0);
/**
We look only at the items->nod_arg[] when creating the
@ -3595,13 +3596,13 @@ static NOD pass1_union( REQ request, NOD input, NOD order_list)
order1 = *ptr;
position = order1->nod_arg[0];
if (position->nod_type != nod_position)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_command_err, gds_arg_gds, gds__order_by_err, /* invalid ORDER BY clause */
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_command_err, gds_arg_gds, gds_order_by_err, /* invalid ORDER BY clause */
0);
number = (ULONG) position->nod_arg[0];
if (number < 1 || number > union_items->nod_count)
ERRD_post(gds__sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds__dsql_command_err, gds_arg_gds, gds__order_by_err, /* invalid ORDER BY clause */
ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,
gds_arg_gds, gds_dsql_command_err, gds_arg_gds, gds_order_by_err, /* invalid ORDER BY clause */
0);
/* make a new order node pointing at the Nth item in the select list */

3
src/dsql/preparse.cpp
View File

@ -22,10 +22,11 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include <stdlib.h>
#include <string.h>
#include "../jrd/common.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../dsql/chars.h"
#include "../dsql/prepa_proto.h"
#include "../dsql/utld_proto.h"

18
src/dsql/user_dsql.cpp
View File

@ -28,6 +28,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <stdlib.h>
#include "../jrd/common.h"
@ -36,7 +37,8 @@
#include "../dsql/chars.h"
#include "../dsql/sqlda.h"
#include "../jrd/blr.h"
#include "../jrd/codes.h"
#include "gen/codes.h"
#include "gen/iberror.h"
#include "../jrd/inf.h"
#include "../jrd/align.h"
#include "../jrd/gds_proto.h"
@ -1507,7 +1509,7 @@ static NAME insert_name( TEXT * symbol, NAME* list_ptr, STMT stmt)
name = (NAME) gds__alloc((SLONG) sizeof(struct name) + l);
/* FREE: by exit handler cleanup() or database_cleanup() */
if (!name) /* NOMEM: */
error_post(gds__virmemexh, 0);
error_post(gds_virmemexh, 0);
name->name_stmt = stmt;
name->name_length = l;
p = name->name_symbol;
@ -1565,13 +1567,13 @@ static STMT lookup_stmt(TEXT* name, NAME list, USHORT type)
return found->name_stmt;
if (type == NAME_statement) {
error_post(gds__dsql_error,
gds_arg_gds, gds__sqlerr, gds_arg_number, (SLONG) - 518,
gds_arg_gds, gds__dsql_request_err, 0);
error_post(gds_dsql_error,
gds_arg_gds, gds_sqlerr, gds_arg_number, (SLONG) - 518,
gds_arg_gds, gds_dsql_request_err, 0);
} else {
error_post(gds__dsql_error,
gds_arg_gds, gds__sqlerr, gds_arg_number, (SLONG) - 504,
gds_arg_gds, gds__dsql_cursor_err, 0);
error_post(gds_dsql_error,
gds_arg_gds, gds_sqlerr, gds_arg_number, (SLONG) - 504,
gds_arg_gds, gds_dsql_cursor_err, 0);
}
return NULL;
}

59
src/dsql/utld.cpp
View File

@ -21,15 +21,16 @@
* Contributor(s): ______________________________________.
*/
/*
$Id: utld.cpp,v 1.1.1.1 2001-05-23 13:25:35 tamlin Exp $
$Id: utld.cpp,v 1.2 2001-07-29 23:43:21 skywalker Exp $
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <string.h>
#include "../dsql/dsql.h"
#include "../dsql/sqlda.h"
#include "../jrd/blr.h"
#include "../jrd/codes.h"
#include "../jrd/gdsold.h"
#include "../jrd/inf.h"
#include "../jrd/align.h"
#include "../dsql/utld_proto.h"
@ -110,7 +111,7 @@ XSQLDA * xsqlda, USHORT * return_index)
if (dialect >= DIALECT_xsqlda)
{
if (xsqlda->version != SQLDA_VERSION1)
return error_dsql_804(status, gds__dsql_sqlda_err);
return error_dsql_804(status, gds_dsql_sqlda_err);
xsqlda->sqld = n;
/* If necessary, inform the application that more sqlda items are needed */
@ -132,12 +133,12 @@ XSQLDA * xsqlda, USHORT * return_index)
/* Loop over the variables being described. */
while (*info != gds__info_end)
while (*info != gds_info_end)
{
while ((item = *info++) != gds__info_sql_describe_end)
while ((item = *info++) != gds_info_sql_describe_end)
switch (item)
{
case gds__info_sql_sqlda_seq:
case gds_info_sql_sqlda_seq:
index = static_cast<USHORT>(get_numeric_info(&info));
if (xsqlda)
xvar = xsqlda->sqlvar + index - 1;
@ -148,54 +149,54 @@ XSQLDA * xsqlda, USHORT * return_index)
}
break;
case gds__info_sql_type:
case gds_info_sql_type:
xvar->sqltype =
static_cast<SSHORT>(get_numeric_info(&info));
break;
case gds__info_sql_sub_type:
case gds_info_sql_sub_type:
xvar->sqlsubtype =
static_cast<SSHORT>(get_numeric_info(&info));
break;
case gds__info_sql_scale:
case gds_info_sql_scale:
xvar->sqlscale =
static_cast<SSHORT>(get_numeric_info(&info));
break;
case gds__info_sql_length:
case gds_info_sql_length:
xvar->sqllen =
static_cast<SSHORT>(get_numeric_info(&info));
break;
case gds__info_sql_field:
case gds_info_sql_field:
xvar->sqlname_length =
static_cast<SSHORT>(get_string_info(&info, xvar->sqlname, sizeof(xvar->sqlname)));
break;
case gds__info_sql_relation:
case gds_info_sql_relation:
xvar->relname_length =
static_cast<SSHORT>(get_string_info(&info, xvar->relname, sizeof(xvar->relname)));
break;
case gds__info_sql_owner:
case gds_info_sql_owner:
xvar->ownname_length =
static_cast<SSHORT>(get_string_info(&info, xvar->ownname, sizeof(xvar->ownname)));
break;
case gds__info_sql_alias:
case gds_info_sql_alias:
xvar->aliasname_length =
static_cast<SSHORT>
(get_string_info
(&info, xvar->aliasname, sizeof(xvar->aliasname)));
break;
case gds__info_truncated:
case gds_info_truncated:
if (return_index)
*return_index = last_index;
default:
return error_dsql_804(status, gds__dsql_sqlda_err);
return error_dsql_804(status, gds_dsql_sqlda_err);
}
if (!xsqlda)
@ -205,8 +206,8 @@ XSQLDA * xsqlda, USHORT * return_index)
last_index = index;
}
if (*info != gds__info_end)
return error_dsql_804(status, gds__dsql_sqlda_err);
if (*info != gds_info_end)
return error_dsql_804(status, gds_dsql_sqlda_err);
return SUCCESS;
}
@ -249,7 +250,7 @@ STATUS DLL_EXPORT UTLD_parse_sqlda(STATUS * status,
if (dialect >= DIALECT_xsqlda)
{
if (xsqlda->version != SQLDA_VERSION1)
return error_dsql_804(status, gds__dsql_sqlda_err);
return error_dsql_804(status, gds_dsql_sqlda_err);
n = xsqlda->sqld;
}
else
@ -333,7 +334,7 @@ STATUS DLL_EXPORT UTLD_parse_sqlda(STATUS * status,
reinterpret_cast<char*>(gds__alloc((SLONG) blr_len));
/* FREE: unknown */
if (!dasup->dasup_clauses[clause].dasup_blr) /* NOMEM: */
return error_dsql_804(status, gds__virmemexh);
return error_dsql_804(status, gds_virmemexh);
memset(dasup->dasup_clauses[clause].dasup_blr, 0, blr_len);
dasup->dasup_clauses[clause].dasup_blr_buf_len = blr_len;
dasup->dasup_clauses[clause].dasup_blr_length = 0;
@ -443,7 +444,7 @@ STATUS DLL_EXPORT UTLD_parse_sqlda(STATUS * status,
dtype = dtype_quad;
break;
default:
return error_dsql_804(status, gds__dsql_sqlda_value_err);
return error_dsql_804(status, gds_dsql_sqlda_value_err);
}
CH_STUFF(p, blr_short);
@ -473,7 +474,7 @@ STATUS DLL_EXPORT UTLD_parse_sqlda(STATUS * status,
reinterpret_cast<char*>(gds__alloc((SLONG) msg_len));
/* FREE: unknown */
if (!dasup->dasup_clauses[clause].dasup_msg) /* NOMEM: */
return error_dsql_804(status, gds__virmemexh);
return error_dsql_804(status, gds_virmemexh);
memset(dasup->dasup_clauses[clause].dasup_msg, 0, msg_len);
dasup->dasup_clauses[clause].dasup_msg_buf_len = msg_len;
}
@ -572,14 +573,14 @@ STATUS DLL_EXPORT UTLD_parse_sqlda(STATUS * status,
/* Make sure user has specified a data location */
if (!xvar->sqldata)
return error_dsql_804(status, gds__dsql_sqlda_value_err);
return error_dsql_804(status, gds_dsql_sqlda_value_err);
memcpy(xvar->sqldata, msg_buf + offset, len);
if (xvar->sqltype & 1)
{
/* Make sure user has specified a location for null indicator */
if (!xvar->sqlind)
return error_dsql_804(status, gds__dsql_sqlda_value_err);
return error_dsql_804(status, gds_dsql_sqlda_value_err);
*xvar->sqlind = *null_ind;
}
}
@ -593,7 +594,7 @@ STATUS DLL_EXPORT UTLD_parse_sqlda(STATUS * status,
{
/* Make sure user has specified a location for null indicator */
if (!xvar->sqlind)
return error_dsql_804(status, gds__dsql_sqlda_value_err);
return error_dsql_804(status, gds_dsql_sqlda_value_err);
*null_ind = *xvar->sqlind;
}
else
@ -601,11 +602,11 @@ STATUS DLL_EXPORT UTLD_parse_sqlda(STATUS * status,
/* Make sure user has specified a data location (unless NULL) */
if (!xvar->sqldata && !*null_ind)
return error_dsql_804(status, gds__dsql_sqlda_value_err);
return error_dsql_804(status, gds_dsql_sqlda_value_err);
/* Copy data - unless known to be NULL */
if ((offset + len) <= sizeof(msg_buf))
return error_dsql_804(status, gds__dsql_sqlda_value_err);
return error_dsql_804(status, gds_dsql_sqlda_value_err);
if (!*null_ind)
memcpy(msg_buf + offset, xvar->sqldata, len);
}
@ -725,9 +726,9 @@ static STATUS error_dsql_804( STATUS * status, STATUS err)
p = status;
*p++ = gds_arg_gds;
*p++ = gds__dsql_error;
*p++ = gds_dsql_error;
*p++ = gds_arg_gds;
*p++ = gds__sqlerr;
*p++ = gds_sqlerr;
*p++ = gds_arg_number;
*p++ = -804;
*p++ = gds_arg_gds;

5
src/dudley/ddl.cpp
View File

@ -21,12 +21,15 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#define DDL_MAIN
#include "../jrd/ib_stdio.h"
#include <stdlib.h>
#include <string.h>
#include "../dudley/ddl.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/license.h"
#include "../dudley/ddl_proto.h"
#include "../dudley/exe_proto.h"

1
src/dudley/exe.epp
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include <string.h>
#include "../dudley/ddl.h"
#include "../jrd/license.h"

3
src/dudley/expand.cpp
View File

@ -21,10 +21,11 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include <setjmp.h>
#include <string.h>
#include "../dudley/ddl.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../dudley/parse.h"
#include "../dudley/ddl_proto.h"
#include "../dudley/expan_proto.h"

3
src/dudley/expr.cpp
View File

@ -21,9 +21,10 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include <setjmp.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../dudley/ddl.h"
#include "../dudley/parse.h"
#include "../jrd/acl.h"

1
src/dudley/extract.epp
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <string.h>
#include "../jrd/gds.h"

3
src/dudley/generate.cpp
View File

@ -21,8 +21,9 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include <string.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../dudley/ddl.h"
#include "../jrd/acl.h"
#include "../dudley/gener_proto.h"

423
src/dudley/hsh.cpp
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../dudley/ddl.h"
#include "../dudley/parse.h"
@ -47,215 +48,219 @@ struct word {
enum kwwords id;
SCHAR *keyword;
} keywords[] = {
KW_OR, "||",
KW_AND, "&&",
KW_GE, ">=",
KW_LE, "<=",
KW_NE, "<>",
KW_NE, "!=",
KW_NE, "~=",
KW_EQ, "==",
KW_GT, ">",
KW_LT, "<",
KW_PERCENT, "%",
KW_EQUALS, "=",
KW_COMMA, ",",
KW_DOT, ".",
KW_L_BRCKET, "[",
KW_LEFT_PAREN, "(",
KW_MINUS, "-",
KW_R_BRCKET, "]",
KW_RIGHT_PAREN, ")",
KW_PLUS, "+",
KW_SEMI, ";",
KW_SLASH, "/",
KW_ASTERISK, "*",
KW_BAR, "|",
KW_COLON, ":",
KW_ABORT, "ABORT",
KW_ACL, "ACL",
KW_ACTIVE, "ACTIVE",
KW_ADD, "ADD",
KW_ALL, "ALL",
KW_ARRAY, "ARRAY",
KW_AT, "AT",
KW_AUTO, "AUTO",
KW_BASED, "BASED",
KW_BASE_NAME, "BASE_NAME",
KW_BEGIN, "BEGIN",
KW_BLOB, "BLOB",
KW_BLR, "BLR",
KW_CACHE, "CACHE",
KW_CASCADE, "CASCADE",
KW_CHAR, "CHAR",
KW_CHECK_POINT_LEN, "CHECK_POINT_LENGTH",
KW_COMPUTED, "COMPUTED_BY",
KW_COMPUTED, "COMPUTED",
KW_CONDITIONAL, "CONDITIONAL",
KW_CONSTRAINT, "CONSTRAINT",
KW_CSTRING, "CSTRING",
KW_DATABASE, "DATABASE",
KW_DATE, "DATE",
KW_DEFINE, "DEFINE",
KW_DEFAULT, "DEFAULT",
KW_DELETE, "DELETE",
KW_DESCRIP, "DESCRIPTION",
KW_DESCRIPTION, "{",
KW_DOUBLE, "DOUBLE",
KW_DROP, "DROP",
KW_DROP, "DELETE",
KW_DUPLICATES, "DUPLICATE",
KW_DUPLICATES, "DUPLICATES",
KW_EDIT_STRING, "EDIT_STRING",
KW_ELSE, "ELSE",
KW_END, "END",
KW_END_DESCRIPTION, "}",
KW_END_FOR, "END_FOR",
KW_END_MODIFY, "END_MODIFY",
KW_END_STORE, "END_STORE",
KW_END_TRIGGER, "END_TRIGGER",
KW_ERASE, "ERASE",
KW_EXIT, "EXIT",
KW_EXTERNAL_FILE, "EXTERNAL_FILE",
KW_FIELD, "FIELD",
KW_FILE, "FILE",
KW_FILTER, "FILTER",
KW_FIXED, "FIXED",
KW_FLOAT, "FLOAT",
KW_FOR, "FOR",
KW_FUNCTION, "FUNCTION",
KW_FUNCTION_ENTRY_POINT, "ENTRY_POINT",
KW_FUNCTION_MODULE_NAME, "MODULE_NAME",
KW_GENERATOR, "GENERATOR",
KW_GRANT, "GRANT",
KW_GROUP, "GROUP",
KW_GROUP_COMMIT_WAIT, "GROUP_COMMIT_WAIT_TIME",
KW_IF, "IF",
KW_INACTIVE, "INACTIVE",
KW_INDEX, "INDEX",
KW_INPUT_TYPE, "INPUT_TYPE",
KW_INSERT, "INSERT",
KW_IS, "IS",
KW_LENGTH, "LENGTH",
KW_LOG_BUF_SIZE, "LOG_BUFFER_SIZE",
KW_LOG_FILE, "LOGFILE",
KW_LONG, "LONG",
KW_MANUAL, "MANUAL",
KW_MESSAGE, "MESSAGE",
KW_MISSING, "MISSING_VALUE",
KW_MISSING, "MISSING",
KW_MODIFY, "MODIFY",
KW_MSGADD, "MSGADD",
KW_MSGDROP, "MSGDROP",
KW_MSGMODIFY, "MSGMODIFY",
KW_NULL, "NULL",
KW_NUM_LOG_BUFS, "NUM_LOG_BUFFERS",
KW_OFFSET, "OFFSET",
KW_ON, "ON",
KW_OPTION, "OPTION",
KW_OUTPUT_TYPE, "OUTPUT_TYPE",
KW_OVERFLOW, "OVERFLOW",
KW_OVERWRITE, "OVERWRITE",
KW_PAGE, "PAGE",
KW_PAGES, "PAGES",
KW_PAGE_NUMBER, "PAGE_NUMBER",
KW_PAGE_SIZE, "PAGE_SIZE",
KW_PARTITIONS, "PARTITIONS",
KW_PASSWORD, "PASSWORD",
KW_POSITION, "POSITION",
KW_POST, "POST",
KW_POST_ERASE, "POST_ERASE",
KW_POST_MODIFY, "POST_MODIFY",
KW_POST_STORE, "POST_STORE",
KW_PRE, "PRE",
KW_PRE_ALLOCATE, "PRE_ALLOCATE",
KW_PRE_ERASE, "PRE_ERASE",
KW_PRE_MODIFY, "PRE_MODIFY",
KW_PRE_STORE, "PRE_STORE",
KW_PRIVILEGES, "PRIVILEGES",
KW_QUAD, "QUAD",
KW_QUERY_NAME, "QUERY_NAME",
KW_QUERY_HEADER, "QUERY_HEADER",
KW_RAW, "RAW",
KW_RAW_PARTITIONS, "RAW_PARTITIONS",
KW_REFERENCE, "REFERENCE",
KW_RELATION, "RELATION", KW_RETURN_ARGUMENT, "RETURN_ARGUMENT", /* function argument return_mode */
KW_RETURN_VALUE, "RETURN_VALUE", /* function argument return_mode */
KW_REVOKE, "REVOKE",
KW_SCALAR_ARRAY_DESCRIPTOR, "SCALAR_ARRAY_DESCRIPTOR",
KW_SCALE, "SCALE",
KW_SELECT, "SELECT",
KW_SECURITY_CLASS, "SECURITY_CLASS",
KW_SEGMENT_LENGTH, "SEGMENT_LENGTH",
KW_SET, "SET",
KW_SET_GENERATOR, "SET_GENERATOR",
KW_SHADOW, "SHADOW",
KW_SHORT, "SHORT",
KW_SIZE, "SIZE",
KW_SORTED, "SORTED",
KW_STATISTICS, "STATISTICS",
KW_STORE, "STORE",
KW_SUB_TYPE, "SUB_TYPE",
KW_SYSTEM_FLAG, "SYSTEM_FLAG",
KW_TEXT, "TEXT",
KW_THEN, "THEN",
KW_TO, "TO",
KW_TRIGGER, "TRIGGER",
KW_TYPES, "TYPES",
KW_UPDATE, "UPDATE",
KW_USER, "USER",
KW_USER_NAME, "RDB$USER_NAME",
KW_USING, "USING",
KW_VALID_IF, "VALID_IF",
KW_VALID_IF, "VALID",
KW_VALUE, "VALUE",
KW_VARYING, "VARYING",
KW_VIEW, "VIEW",
KW_AND, "AND",
KW_ANY, "ANY",
KW_ASCENDING, "ASC",
KW_ASCENDING, "ASCENDING",
KW_ASTERISK, "ASTERISK",
KW_AVERAGE, "AVERAGE",
KW_BETWEEN, "BETWEEN",
KW_BY, "BY",
KW_CONTAINING, "CONTAINING",
KW_COUNT, "COUNT",
KW_CROSS, "CROSS",
KW_DESCENDING, "DESC",
KW_DESCENDING, "DESCENDING",
KW_ELSE, "ELSE",
KW_EQ, "EQ",
KW_FIRST, "FIRST",
KW_FROM, "FROM",
KW_GEN_ID, "GEN_ID",
KW_GE, "GE",
KW_GT, "GT",
KW_IN, "IN",
KW_LE, "LE",
KW_LT, "LT",
KW_MATCHES, "MATCHES",
KW_MATCHES, "MATCHING",
KW_MIN, "MIN",
KW_MINUS, "MINUS",
KW_MISSING, "MISSING",
KW_NE, "NE",
KW_NOT, "NOT",
KW_OF, "OF",
KW_OR, "OR",
KW_OVER, "OVER",
KW_QUIT, "QUIT",
KW_REDUCED, "REDUCED",
KW_SLASH, "SLASH",
KW_SORTED, "SORTED",
KW_STARTS, "STARTS",
KW_STARTS, "STARTING",
KW_STARTS, "STARTS_WITH",
KW_STARTS, "STARTING_WITH",
KW_MAX, "MAX",
KW_TO, "TO",
KW_TOTAL, "TOTAL",
KW_UNIQUE, "UNIQUE", KW_UPPERCASE, "UPPERCASE", KW_WITH, "WITH"};
{KW_OR, "||"},
{KW_AND, "&&"},
{KW_GE, ">="},
{KW_LE, "<="},
{KW_NE, "<>"},
{KW_NE, "!="},
{KW_NE, "~="},
{KW_EQ, "=="},
{KW_GT, ">"},
{KW_LT, "<"},
{KW_PERCENT, "%"},
{KW_EQUALS, "="},
{KW_COMMA, ","},
{KW_DOT, "."},
{KW_L_BRCKET, "["},
{KW_LEFT_PAREN, "("},
{KW_MINUS, "-"},
{KW_R_BRCKET, "]"},
{KW_RIGHT_PAREN, ")"},
{KW_PLUS, "+"},
{KW_SEMI, ";"},
{KW_SLASH, "/"},
{KW_ASTERISK, "*"},
{KW_BAR, "|"},
{KW_COLON, ":"},
{KW_ABORT, "ABORT"},
{KW_ACL, "ACL"},
{KW_ACTIVE, "ACTIVE"},
{KW_ADD, "ADD"},
{KW_ALL, "ALL"},
{KW_ARRAY, "ARRAY"},
{KW_AT, "AT"},
{KW_AUTO, "AUTO"},
{KW_BASED, "BASED"},
{KW_BASE_NAME, "BASE_NAME"},
{KW_BEGIN, "BEGIN"},
{KW_BLOB, "BLOB"},
{KW_BLR, "BLR"},
{KW_CACHE, "CACHE"},
{KW_CASCADE, "CASCADE"},
{KW_CHAR, "CHAR"},
{KW_CHECK_POINT_LEN, "CHECK_POINT_LENGTH"},
{KW_COMPUTED, "COMPUTED_BY"},
{KW_COMPUTED, "COMPUTED"},
{KW_CONDITIONAL, "CONDITIONAL"},
{KW_CONSTRAINT, "CONSTRAINT"},
{KW_CSTRING, "CSTRING"},
{KW_DATABASE, "DATABASE"},
{KW_DATE, "DATE"},
{KW_DEFINE, "DEFINE"},
{KW_DEFAULT, "DEFAULT"},
{KW_DELETE, "DELETE"},
{KW_DESCRIP, "DESCRIPTION"},
{KW_DESCRIPTION, "{"},
{KW_DOUBLE, "DOUBLE"},
{KW_DROP, "DROP"},
{KW_DROP, "DELETE"},
{KW_DUPLICATES, "DUPLICATE"},
{KW_DUPLICATES, "DUPLICATES"},
{KW_EDIT_STRING, "EDIT_STRING"},
{KW_ELSE, "ELSE"},
{KW_END, "END"},
{KW_END_DESCRIPTION, "}"},
{KW_END_FOR, "END_FOR"},
{KW_END_MODIFY, "END_MODIFY"},
{KW_END_STORE, "END_STORE"},
{KW_END_TRIGGER, "END_TRIGGER"},
{KW_ERASE, "ERASE"},
{KW_EXIT, "EXIT"},
{KW_EXTERNAL_FILE, "EXTERNAL_FILE"},
{KW_FIELD, "FIELD"},
{KW_FILE, "FILE"},
{KW_FILTER, "FILTER"},
{KW_FIXED, "FIXED"},
{KW_FLOAT, "FLOAT"},
{KW_FOR, "FOR"},
{KW_FUNCTION, "FUNCTION"},
{KW_FUNCTION_ENTRY_POINT, "ENTRY_POINT"},
{KW_FUNCTION_MODULE_NAME, "MODULE_NAME"},
{KW_GENERATOR, "GENERATOR"},
{KW_GRANT, "GRANT"},
{KW_GROUP, "GROUP"},
{KW_GROUP_COMMIT_WAIT, "GROUP_COMMIT_WAIT_TIME"},
{KW_IF, "IF"},
{KW_INACTIVE, "INACTIVE"},
{KW_INDEX, "INDEX"},
{KW_INPUT_TYPE, "INPUT_TYPE"},
{KW_INSERT, "INSERT"},
{KW_IS, "IS"},
{KW_LENGTH, "LENGTH"},
{KW_LOG_BUF_SIZE, "LOG_BUFFER_SIZE"},
{KW_LOG_FILE, "LOGFILE"},
{KW_LONG, "LONG"},
{KW_MANUAL, "MANUAL"},
{KW_MESSAGE, "MESSAGE"},
{KW_MISSING, "MISSING_VALUE"},
{KW_MISSING, "MISSING"},
{KW_MODIFY, "MODIFY"},
{KW_MSGADD, "MSGADD"},
{KW_MSGDROP, "MSGDROP"},
{KW_MSGMODIFY, "MSGMODIFY"},
{KW_NULL, "NULL"},
{KW_NUM_LOG_BUFS, "NUM_LOG_BUFFERS"},
{KW_OFFSET, "OFFSET"},
{KW_ON, "ON"},
{KW_OPTION, "OPTION"},
{KW_OUTPUT_TYPE, "OUTPUT_TYPE"},
{KW_OVERFLOW, "OVERFLOW"},
{KW_OVERWRITE, "OVERWRITE"},
{KW_PAGE, "PAGE"},
{KW_PAGES, "PAGES"},
{KW_PAGE_NUMBER, "PAGE_NUMBER"},
{KW_PAGE_SIZE, "PAGE_SIZE"},
{KW_PARTITIONS, "PARTITIONS"},
{KW_PASSWORD, "PASSWORD"},
{KW_POSITION, "POSITION"},
{KW_POST, "POST"},
{KW_POST_ERASE, "POST_ERASE"},
{KW_POST_MODIFY, "POST_MODIFY"},
{KW_POST_STORE, "POST_STORE"},
{KW_PRE, "PRE"},
{KW_PRE_ALLOCATE, "PRE_ALLOCATE"},
{KW_PRE_ERASE, "PRE_ERASE"},
{KW_PRE_MODIFY, "PRE_MODIFY"},
{KW_PRE_STORE, "PRE_STORE"},
{KW_PRIVILEGES, "PRIVILEGES"},
{KW_QUAD, "QUAD"},
{KW_QUERY_NAME, "QUERY_NAME"},
{KW_QUERY_HEADER, "QUERY_HEADER"},
{KW_RAW, "RAW"},
{KW_RAW_PARTITIONS, "RAW_PARTITIONS"},
{KW_REFERENCE, "REFERENCE"},
{KW_RELATION, "RELATION"},
{KW_RETURN_ARGUMENT, "RETURN_ARGUMENT"}, /* function argument return_mode */
{KW_RETURN_VALUE, "RETURN_VALUE"}, /* function argument return_mode */
{KW_REVOKE, "REVOKE"},
{KW_SCALAR_ARRAY_DESCRIPTOR, "SCALAR_ARRAY_DESCRIPTOR"},
{KW_SCALE, "SCALE"},
{KW_SELECT, "SELECT"},
{KW_SECURITY_CLASS, "SECURITY_CLASS"},
{KW_SEGMENT_LENGTH, "SEGMENT_LENGTH"},
{KW_SET, "SET"},
{KW_SET_GENERATOR, "SET_GENERATOR"},
{KW_SHADOW, "SHADOW"},
{KW_SHORT, "SHORT"},
{KW_SIZE, "SIZE"},
{KW_SORTED, "SORTED"},
{KW_STATISTICS, "STATISTICS"},
{KW_STORE, "STORE"},
{KW_SUB_TYPE, "SUB_TYPE"},
{KW_SYSTEM_FLAG, "SYSTEM_FLAG"},
{KW_TEXT, "TEXT"},
{KW_THEN, "THEN"},
{KW_TO, "TO"},
{KW_TRIGGER, "TRIGGER"},
{KW_TYPES, "TYPES"},
{KW_UPDATE, "UPDATE"},
{KW_USER, "USER"},
{KW_USER_NAME, "RDB$USER_NAME"},
{KW_USING, "USING"},
{KW_VALID_IF, "VALID_IF"},
{KW_VALID_IF, "VALID"},
{KW_VALUE, "VALUE"},
{KW_VARYING, "VARYING"},
{KW_VIEW, "VIEW"},
{KW_AND, "AND"},
{KW_ANY, "ANY"},
{KW_ASCENDING, "ASC"},
{KW_ASCENDING, "ASCENDING"},
{KW_ASTERISK, "ASTERISK"},
{KW_AVERAGE, "AVERAGE"},
{KW_BETWEEN, "BETWEEN"},
{KW_BY, "BY"},
{KW_CONTAINING, "CONTAINING"},
{KW_COUNT, "COUNT"},
{KW_CROSS, "CROSS"},
{KW_DESCENDING, "DESC"},
{KW_DESCENDING, "DESCENDING"},
{KW_ELSE, "ELSE"},
{KW_EQ, "EQ"},
{KW_FIRST, "FIRST"},
{KW_FROM, "FROM"},
{KW_GEN_ID, "GEN_ID"},
{KW_GE, "GE"},
{KW_GT, "GT"},
{KW_IN, "IN"},
{KW_LE, "LE"},
{KW_LT, "LT"},
{KW_MATCHES, "MATCHES"},
{KW_MATCHES, "MATCHING"},
{KW_MIN, "MIN"},
{KW_MINUS, "MINUS"},
{KW_MISSING, "MISSING"},
{KW_NE, "NE"},
{KW_NOT, "NOT"},
{KW_OF, "OF"},
{KW_OR, "OR"},
{KW_OVER, "OVER"},
{KW_QUIT, "QUIT"},
{KW_REDUCED, "REDUCED"},
{KW_SLASH, "SLASH"},
{KW_SORTED, "SORTED"},
{KW_STARTS, "STARTS"},
{KW_STARTS, "STARTING"},
{KW_STARTS, "STARTS_WITH"},
{KW_STARTS, "STARTING_WITH"},
{KW_MAX, "MAX"},
{KW_TO, "TO"},
{KW_TOTAL, "TOTAL"},
{KW_UNIQUE, "UNIQUE"},
{KW_UPPERCASE, "UPPERCASE"},
{KW_WITH, "WITH"}
};
#define NUMWORDS (sizeof (keywords) / sizeof (struct word))

3
src/dudley/lex.cpp
View File

@ -21,11 +21,12 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../dudley/ddl.h"
#include "../dudley/parse.h"
#include "../jrd/kanji.h"

3
src/dudley/parse.cpp
View File

@ -21,11 +21,12 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include <setjmp.h>
#include <stdlib.h>
#include <string.h>
#define PARSER_MAIN
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/flags.h"
#include "../dudley/ddl.h"
#include "../dudley/parse.h"

3
src/dudley/trn.cpp
View File

@ -21,9 +21,10 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <string.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../dudley/ddl.h"
#include "../jrd/license.h"
#include "../dudley/gener_proto.h"

1
src/extlib/ib_udf.c
View File

@ -19,6 +19,7 @@
* changes to substr and added substrlen
*
*/
#include "firebird.h"
#include <math.h>
#include <stdlib.h>
#include <string.h>

1
src/extlib/ib_util.c
View File

@ -16,6 +16,7 @@
* All Rights Reserved.
* Contributor(s): ______________________________________.
*/
#include "../include/fb_config.h"
#include <stdlib.h>
#include "ib_udf.h"

5
src/gpre/ada.cpp
View File

@ -24,13 +24,14 @@
//
//____________________________________________________________
//
// $Id: ada.cpp,v 1.2 2001-07-12 05:46:04 bellardo Exp $
// $Id: ada.cpp,v 1.3 2001-07-29 23:43:21 skywalker Exp $
//
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include "../jrd/common.h"
#include <stdarg.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../gpre/gpre.h"
#include "../gpre/form.h"
#include "../gpre/pat.h"

5
src/gpre/c_cxx.cpp
View File

@ -25,14 +25,15 @@
//
//____________________________________________________________
//
// $Id: c_cxx.cpp,v 1.2 2001-07-12 05:46:04 bellardo Exp $
// $Id: c_cxx.cpp,v 1.3 2001-07-29 23:43:21 skywalker Exp $
//
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <string.h>
#include "../jrd/common.h"
#include <stdarg.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "gpre.h"
#include "../gpre/form.h"
#include "../gpre/pat.h"

5
src/gpre/cmd.cpp
View File

@ -25,12 +25,13 @@
//
//____________________________________________________________
//
// $Id: cmd.cpp,v 1.2 2001-07-12 05:46:04 bellardo Exp $
// $Id: cmd.cpp,v 1.3 2001-07-29 23:43:21 skywalker Exp $
//
#include "firebird.h"
#include <string.h>
#include "../gpre/gpre.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/flags.h"
#include "../jrd/constants.h"
#include "../gpre/cmd_proto.h"

5
src/gpre/cme.cpp
View File

@ -25,12 +25,13 @@
//
//____________________________________________________________
//
// $Id: cme.cpp,v 1.1.1.1 2001-05-23 13:25:31 tamlin Exp $
// $Id: cme.cpp,v 1.2 2001-07-29 23:43:21 skywalker Exp $
//
#include "firebird.h"
#include <stdlib.h>
#include <string.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../gpre/gpre.h"
#include "../jrd/intl.h"
#include "../intl/charsets.h"

5
src/gpre/cmp.cpp
View File

@ -25,12 +25,13 @@
//
//____________________________________________________________
//
// $Id: cmp.cpp,v 1.2 2001-07-12 05:46:04 bellardo Exp $
// $Id: cmp.cpp,v 1.3 2001-07-29 23:43:21 skywalker Exp $
//
#include "firebird.h"
#include <stdlib.h>
#include <string.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "gpre.h"
#include "../gpre/form.h"
#include "../jrd/align.h"

7
src/gpre/cob.cpp
View File

@ -25,18 +25,19 @@
//
//____________________________________________________________
//
// $Id: cob.cpp,v 1.2 2001-07-12 05:46:04 bellardo Exp $
// $Id: cob.cpp,v 1.3 2001-07-29 23:43:21 skywalker Exp $
//
/* $Id: cob.cpp,v 1.2 2001-07-12 05:46:04 bellardo Exp $ */
/* $Id: cob.cpp,v 1.3 2001-07-29 23:43:21 skywalker Exp $ */
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include "../jrd/common.h"
#include <stdarg.h>
#ifdef UNIXWARE
#include <sys/fcntl.h>
#endif
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../gpre/gpre.h"
#include "../gpre/form.h"
#include "../gpre/pat.h"

5
src/gpre/dyntable.cpp
View File

@ -24,11 +24,12 @@
//
//____________________________________________________________
//
// $Id: dyntable.cpp,v 1.1.1.1 2001-05-23 13:25:32 tamlin Exp $
// $Id: dyntable.cpp,v 1.2 2001-07-29 23:43:21 skywalker Exp $
//
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#define NODE(dyn) dyn, "dyn",
#ifndef NULL

5
src/gpre/exp.cpp
View File

@ -25,12 +25,13 @@
//
//____________________________________________________________
//
// $Id: exp.cpp,v 1.2 2001-07-12 05:46:04 bellardo Exp $
// $Id: exp.cpp,v 1.3 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include <stdlib.h>
#include <string.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../jrd/common.h"
#include "../gpre/gpre.h"
#include "../gpre/parse.h"

5
src/gpre/form.cpp
View File

@ -20,7 +20,7 @@
//
// All Rights Reserved.
// Contributor(s): ______________________________________.
// $Id: form.cpp,v 1.2 2001-07-12 05:46:04 bellardo Exp $
// $Id: form.cpp,v 1.3 2001-07-29 23:43:22 skywalker Exp $
// Revision 1.2 2000/11/27 09:26:13 fsg
// Fixed bugs in gpre to handle PYXIS forms
// and allow edit.e and fred.e to go through
@ -35,9 +35,10 @@
//
//____________________________________________________________
//
// $Id: form.cpp,v 1.2 2001-07-12 05:46:04 bellardo Exp $
// $Id: form.cpp,v 1.3 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include "../gpre/gpre.h"
#include "../gpre/form.h"
#include "../pyxis/phase1.h"

7
src/gpre/form_trn.cpp
View File

@ -20,7 +20,7 @@
//
// All Rights Reserved.
// Contributor(s): ______________________________________.
// $Id: form_trn.cpp,v 1.1.1.1 2001-05-23 13:25:31 tamlin Exp $
// $Id: form_trn.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
// Revision 1.3 2000/11/29 11:11:56 fsg
// Added some more PYXIS datatypes to form_trn.c
//
@ -38,11 +38,12 @@
//
//____________________________________________________________
//
// $Id: form_trn.cpp,v 1.1.1.1 2001-05-23 13:25:31 tamlin Exp $
// $Id: form_trn.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include "../jrd/common.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
//
//The datatypes from dsc.h

5
src/gpre/ftn.cpp
View File

@ -24,13 +24,14 @@
//
//____________________________________________________________
//
// $Id: ftn.cpp,v 1.2 2001-07-12 05:46:04 bellardo Exp $
// $Id: ftn.cpp,v 1.3 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include "../jrd/common.h"
#include <stdarg.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../gpre/gpre.h"
#include "../gpre/form.h"
#include "../gpre/pat.h"

5
src/gpre/gpre.cpp
View File

@ -20,7 +20,7 @@
//
// All Rights Reserved.
// Contributor(s): ______________________________________.
// $Id: gpre.cpp,v 1.3 2001-07-12 05:46:04 bellardo Exp $
// $Id: gpre.cpp,v 1.4 2001-07-29 23:43:22 skywalker Exp $
// Revision 1.2 2000/11/16 15:54:29 fsg
// Added new switch -verbose to gpre that will dump
// parsed lines to stderr
@ -38,11 +38,12 @@
//
//____________________________________________________________
//
// $Id: gpre.cpp,v 1.3 2001-07-12 05:46:04 bellardo Exp $
// $Id: gpre.cpp,v 1.4 2001-07-29 23:43:22 skywalker Exp $
//
#define GPRE_MAIN
#define PARSER_MAIN
#include "firebird.h"
#include <setjmp.h>
#include <stdlib.h>
#include <string.h>

9
src/gpre/gpre_meta.epp
View File

@ -26,11 +26,12 @@
*
*____________________________________________________________
*
* $Id: gpre_meta.epp,v 1.1 2001-07-12 06:32:02 bellardo Exp $
* $Id: gpre_meta.epp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
*/
#include "firebird.h"
#include <string.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../gpre/gpre.h"
#include "../jrd/license.h"
#include "../gpre/parse.h"
@ -490,7 +491,7 @@ BOOLEAN MET_get_domain_default(DBB dbb,
/* open the blob */
stat = isc_open_blob2(status_vect, (void**) &DB, (void**) &gds__trans, (void**) &blob_handle,
blob_id, sizeof(blr_bpb), blr_bpb);
blob_id, sizeof(blr_bpb), const_cast<unsigned char*>(blr_bpb));
if (stat) {
gds__print_status(status_vect);
CPR_exit(FINI_ERROR);
@ -599,7 +600,7 @@ BOOLEAN MET_get_column_default(REL relation,
/* open the blob */
stat = isc_open_blob2(status_vect, (void**) &DB, (void**) &gds__trans,
(void**) &blob_handle, blob_id, sizeof(blr_bpb),
blr_bpb);
const_cast<unsigned char*>(blr_bpb));
if (stat) {
gds__print_status(status_vect);
CPR_exit(FINI_ERROR);

5
src/gpre/gpre_meta_boot.cpp
View File

@ -26,11 +26,12 @@
*
*____________________________________________________________
*
* $Id: gpre_meta_boot.cpp,v 1.1 2001-07-12 06:32:02 bellardo Exp $
* $Id: gpre_meta_boot.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
*/
#include "firebird.h"
#include <string.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../gpre/gpre.h"
#include "../jrd/license.h"
#include "../gpre/parse.h"

8
src/gpre/hsh.cpp
View File

@ -25,9 +25,10 @@
//
//____________________________________________________________
//
// $Id: hsh.cpp,v 1.2 2001-07-12 05:46:04 bellardo Exp $
// $Id: hsh.cpp,v 1.3 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include "../gpre/gpre.h"
#include "../gpre/parse.h"
#ifdef JPN_SJIS
@ -53,13 +54,15 @@ static SYM key_symbols;
static struct word {
SCHAR *keyword;
enum kwwords id;
} keywords[] = {
} keywords[] = {
#include "../gpre/hsh.h"
};
#define NUMWORDS (sizeof (keywords) / sizeof (struct word))
//____________________________________________________________
//
// Release space used by keywords.
@ -94,6 +97,7 @@ void HSH_init(void)
for (ptr = hash_table, i = 0; i < HASH_SIZE; i++)
*ptr++ = NULL;
fflush(stdout);
for (i = 0, word = keywords; i < NUMWORDS; i++, word++) {
for (string = word->keyword; *string; string++);
symbol = (SYM) ALLOC(SYM_LEN);

860
src/gpre/hsh.h
View File

@ -18,441 +18,449 @@
*/
/* Sort this file with "sort -b +1 +0" */
"ABNORMAL", KW_ABNORMAL,
{"ABNORMAL", KW_ABNORMAL},
#ifdef SCROLLABLE_CURSORS
"ABSOLUTE", KW_ABSOLUTE,
{"ABSOLUTE", KW_ABSOLUTE},
#endif
"ACCEPTING", KW_ACCEPTING,
"ACTION", KW_ACTION,
"ACTIVE", KW_ACTIVE,
"ADD", KW_ADD,
"ALL", KW_ALL,
"ALLOCATION", KW_ALLOCATION,
"ALTER", KW_ALTER,
"&", KW_AMPERSAND,
"&&", KW_AND,
"AND", KW_AND,
"ANY", KW_ANY,
"SOME", KW_ANY,
"ANYCASE", KW_ANYCASE,
"ARE", KW_ARE,
"AS", KW_AS,
"ASC", KW_ASCENDING,
"ASCENDING", KW_ASCENDING,
"*", KW_ASTERISK,
"AT", KW_AT,
"AUTO", KW_AUTO,
"AUTOCOMMIT", KW_AUTOCOMMIT,
"AVERAGE", KW_AVERAGE,
"AVG", KW_AVERAGE,
"\\", KW_BACK_SLASH,
"BASED", KW_BASED,
"BASED_ON", KW_BASED,
"BASE_NAME", KW_BASE_NAME,
"BEGIN", KW_BEGIN,
"BETWEEN", KW_BETWEEN,
"BT", KW_BETWEEN,
"BLOB", KW_BLOB,
"BUFFERCOUNT", KW_BUFFERCOUNT,
"BUFFERS", KW_BUFFERS,
"BUFFERSIZE", KW_BUFFERSIZE,
"BY", KW_BY,
"CACHE", KW_CACHE,
"CANCEL_BLOB", KW_CANCEL_BLOB,
"^", KW_CARAT,
"CASCADE", KW_CASCADE,
"CASE", KW_CASE,
"CASE_MENU", KW_CASE_MENU,
"CAST", KW_CAST,
"CHAR", KW_CHAR,
"CHARACTER", KW_CHAR,
"char", KW_CHAR,
"CHECK", KW_CHECK,
"CHECK_POINT_LENGTH", KW_CHECK_POINT_LEN,
"CLEAR_HANDLES", KW_CLEAR_HANDLES,
"CLOSE", KW_CLOSE,
"CLOSE_BLOB", KW_CLOSE_BLOB,
"COLLATE", KW_COLLATE,
":", KW_COLON,
",", KW_COMMA,
"COMMENT", KW_COMMENT,
"COMMIT", KW_COMMIT,
"COMMIT_TRANSACTION", KW_COMMIT,
"COMMIT_TRANSACTIONS", KW_COMMIT,
"COMMITTED", KW_COMMITTED,
"COMPILETIME", KW_COMPILETIME,
"COMPILE_TIME", KW_COMPILETIME,
"COMPUTED", KW_COMPUTED,
"CONCURRENCY", KW_CONCURRENCY,
"CONDITIONAL", KW_CONDITIONAL,
"CONNECT", KW_CONNECT,
"CONSISTENCY", KW_CONSISTENCY,
"CONSTRAINT", KW_CONSTRAINT,
"CONTAINING", KW_CONTAINING,
"CONTINUE", KW_CONTINUE,
"COUNT", KW_COUNT,
"CREATE", KW_CREATE,
"CREATE_BLOB", KW_CREATE_BLOB,
"CREATE_WINDOW", KW_CREATE_WINDOW,
"CROSS", KW_CROSS,
"CSTRING", KW_CSTRING,
"CURRENT", KW_CURRENT,
"CURRENT_DATE", KW_CURRENT_DATE,
"CURRENT_TIME", KW_CURRENT_TIME,
"CURRENT_TIMESTAMP", KW_CURRENT_TIMESTAMP,
"CURSOR", KW_CURSOR,
"DATABASE", KW_DATABASE,
"DATE", KW_DATE,
"DAY", KW_DAY,
"DBA", KW_DBA,
"RDB$DB_KEY", KW_DBKEY,
"--", KW_DEC,
"DEC", KW_DECIMAL,
"DECIMAL", KW_DECIMAL,
"DECLARE", KW_DECLARE,
"DEFAULT", KW_DEFAULT,
"DELETE", KW_DELETE,
"DELETE_WINDOW", KW_DELETE_WINDOW,
"DERIVED_FROM", KW_DERIVED_FROM,
"DESC", KW_DESCENDING,
"DESCENDING", KW_DESCENDING,
"DESCRIBE", KW_DESCRIBE,
"DESCRIPTOR", KW_DESCRIPTOR,
"DIALECT", KW_DIALECT,
"DISCONNECT", KW_DISCONNECT,
"DISPLAY", KW_DISPLAY,
"DISPLAYING", KW_DISPLAYING,
"DISTINCT", KW_DISTINCT,
".", KW_DOT,
"..", KW_DOT_DOT,
"DOMAIN", KW_DOMAIN,
"DOUBLE", KW_DOUBLE,
"double", KW_DOUBLE,
"DROP", KW_DROP,
"ELEMENT", KW_ELEMENT,
"ELSE", KW_ELSE,
"else", KW_ELSE,
"END", KW_END,
"END_ERROR", KW_END_ERROR,
"END-EXEC", KW_END_EXEC,
"END_EXEC", KW_END_EXEC,
"END_FETCH", KW_END_FETCH,
"END_FOR", KW_END_FOR,
"END_FORM", KW_END_FORM,
"END_ITEM", KW_END_ITEM,
"END_MENU", KW_END_MENU,
"END_MODIFY", KW_END_MODIFY,
"END_STORE", KW_END_STORE,
"END_STREAM", KW_END_STREAM,
"ENTREE_LENGTH", KW_ENTREE_LENGTH,
"ENTREE_TEXT", KW_ENTREE_TEXT,
"ENTREE_VALUE", KW_ENTREE_VALUE,
"ENTRY_POINT", KW_ENTRY_POINT,
"==", KW_EQ,
"EQ", KW_EQ,
"=", KW_EQUALS,
"ERASE", KW_ERASE,
"ERROR", KW_ERROR,
"ESCAPE", KW_ESCAPE,
"EVENT", KW_EVENT,
"EVENT_INIT", KW_EVENT_INIT,
"EVENT_WAIT", KW_EVENT_WAIT,
"EXACTCASE", KW_EXACTCASE,
"EXCLUSIVE", KW_EXCLUSIVE,
"EXEC", KW_EXEC,
"EXECUTE", KW_EXECUTE,
"EXISTS", KW_EXISTS,
"EXTERN", KW_EXTERN,
"EXTERNAL", KW_EXTERNAL,
"EXTRACT", KW_EXTRACT,
"FETCH", KW_FETCH,
"FILE", KW_FILE,
"FILENAME", KW_FILENAME,
"FILTER", KW_FILTER,
"FINISH", KW_FINISH,
"FINISH_DATABASE", KW_FINISH,
"FIRST", KW_FIRST,
"FLOAT", KW_FLOAT,
"float", KW_FLOAT,
"FOR", KW_FOR,
"FOREIGN", KW_FOREIGN,
"FORM", KW_FORM,
"FORM_HANDLE", KW_FORM_HANDLE,
"FORWARD", KW_FORWARD,
"FOR_FORM", KW_FOR_FORM,
"FOR_ITEM", KW_FOR_ITEM,
"FOR_MENU", KW_FOR_MENU,
"FOUND", KW_FOUND,
"FROM", KW_FROM,
"FULL", KW_FULL,
"FUNCTION", KW_FUNCTION,
"WINDOW_SCOPE", KW_GDS_WINDOWS,
">=", KW_GE,
"GE", KW_GE,
"^<", KW_GE,
"!<", KW_GE,
"~<", KW_GE,
"GEN_ID", KW_GEN_ID,
"GENERATOR", KW_GENERATOR,
"GET_SEGMENT", KW_GET_SEGMENT,
"GET_SLICE", KW_GET_SLICE,
"GLOBAL", KW_GLOBAL,
"GO", KW_GO,
"GOTO", KW_GOTO,
"GRANT", KW_GRANT,
"GROUP", KW_GROUP,
"GROUP_COMMIT_WAIT_TIME", KW_GROUP_COMMIT_WAIT,
">", KW_GT,
"GT", KW_GT,
"HANDLES", KW_HANDLES,
"HAVING", KW_HAVING,
"HEIGHT", KW_HEIGHT,
"HORIZONTAL", KW_HORIZONTAL,
"HOUR", KW_HOUR,
"IMMEDIATE", KW_IMMEDIATE,
"IN", KW_IN,
"INACTIVE", KW_INACTIVE,
"INIT", KW_INIT,
"++", KW_INC,
"INCLUDE", KW_INCLUDE,
"INDEX", KW_INDEX,
"INDICATOR", KW_INDICATOR,
"INNER", KW_INNER,
"INPUT", KW_INPUT,
"INPUT_TYPE", KW_INPUT_TYPE,
"INSERT", KW_INSERT,
"INT", KW_INT,
"int", KW_INT,
"INTEGER", KW_INTEGER,
"INTERNAL", KW_INTERNAL,
"INTO", KW_INTO,
"IS", KW_IS,
"ISO", KW_ISOLATION,
"ISOLATION", KW_ISOLATION, "JOIN", KW_JOIN, "KEY", KW_KEY,
{"ACCEPTING", KW_ACCEPTING},
{"ACTION", KW_ACTION},
{"ACTIVE", KW_ACTIVE},
{"ADD", KW_ADD},
{"ALL", KW_ALL},
{"ALLOCATION", KW_ALLOCATION},
{"ALTER", KW_ALTER},
{"&", KW_AMPERSAND},
{"&&", KW_AND},
{"AND", KW_AND},
{"ANY", KW_ANY},
{"SOME", KW_ANY},
{"ANYCASE", KW_ANYCASE},
{"ARE", KW_ARE},
{"AS", KW_AS},
{"ASC", KW_ASCENDING},
{"ASCENDING", KW_ASCENDING},
{"*", KW_ASTERISK},
{"AT", KW_AT},
{"AUTO", KW_AUTO},
{"AUTOCOMMIT", KW_AUTOCOMMIT},
{"AVERAGE", KW_AVERAGE},
{"AVG", KW_AVERAGE},
{"\\", KW_BACK_SLASH},
{"BASED", KW_BASED},
{"BASED_ON", KW_BASED},
{"BASE_NAME", KW_BASE_NAME},
{"BEGIN", KW_BEGIN},
{"BETWEEN", KW_BETWEEN},
{"BT", KW_BETWEEN},
{"BLOB", KW_BLOB},
{"BUFFERCOUNT", KW_BUFFERCOUNT},
{"BUFFERS", KW_BUFFERS},
{"BUFFERSIZE", KW_BUFFERSIZE},
{"BY", KW_BY},
{"CACHE", KW_CACHE},
{"CANCEL_BLOB", KW_CANCEL_BLOB},
{"^", KW_CARAT},
{"CASCADE", KW_CASCADE},
{"CASE", KW_CASE},
{"CASE_MENU", KW_CASE_MENU},
{"CAST", KW_CAST},
{"CHAR", KW_CHAR},
{"CHARACTER", KW_CHAR},
{"char", KW_CHAR},
{"CHECK", KW_CHECK},
{"CHECK_POINT_LENGTH", KW_CHECK_POINT_LEN},
{"CLEAR_HANDLES", KW_CLEAR_HANDLES},
{"CLOSE", KW_CLOSE},
{"CLOSE_BLOB", KW_CLOSE_BLOB},
{"COLLATE", KW_COLLATE},
{":", KW_COLON},
{",", KW_COMMA},
{"COMMENT", KW_COMMENT},
{"COMMIT", KW_COMMIT},
{"COMMIT_TRANSACTION", KW_COMMIT},
{"COMMIT_TRANSACTIONS", KW_COMMIT},
{"COMMITTED", KW_COMMITTED},
{"COMPILETIME", KW_COMPILETIME},
{"COMPILE_TIME", KW_COMPILETIME},
{"COMPUTED", KW_COMPUTED},
{"CONCURRENCY", KW_CONCURRENCY},
{"CONDITIONAL", KW_CONDITIONAL},
{"CONNECT", KW_CONNECT},
{"CONSISTENCY", KW_CONSISTENCY},
{"CONSTRAINT", KW_CONSTRAINT},
{"CONTAINING", KW_CONTAINING},
{"CONTINUE", KW_CONTINUE},
{"COUNT", KW_COUNT},
{"CREATE", KW_CREATE},
{"CREATE_BLOB", KW_CREATE_BLOB},
{"CREATE_WINDOW", KW_CREATE_WINDOW},
{"CROSS", KW_CROSS},
{"CSTRING", KW_CSTRING},
{"CURRENT", KW_CURRENT},
{"CURRENT_DATE", KW_CURRENT_DATE},
{"CURRENT_TIME", KW_CURRENT_TIME},
{"CURRENT_TIMESTAMP", KW_CURRENT_TIMESTAMP},
{"CURSOR", KW_CURSOR},
{"DATABASE", KW_DATABASE},
{"DATE", KW_DATE},
{"DAY", KW_DAY},
{"DBA", KW_DBA},
{"RDB$DB_KEY", KW_DBKEY},
{"--", KW_DEC},
{"DEC", KW_DECIMAL},
{"DECIMAL", KW_DECIMAL},
{"DECLARE", KW_DECLARE},
{"DEFAULT", KW_DEFAULT},
{"DELETE", KW_DELETE},
{"DELETE_WINDOW", KW_DELETE_WINDOW},
{"DERIVED_FROM", KW_DERIVED_FROM},
{"DESC", KW_DESCENDING},
{"DESCENDING", KW_DESCENDING},
{"DESCRIBE", KW_DESCRIBE},
{"DESCRIPTOR", KW_DESCRIPTOR},
{"DIALECT", KW_DIALECT},
{"DISCONNECT", KW_DISCONNECT},
{"DISPLAY", KW_DISPLAY},
{"DISPLAYING", KW_DISPLAYING},
{"DISTINCT", KW_DISTINCT},
{".", KW_DOT},
{"..", KW_DOT_DOT},
{"DOMAIN", KW_DOMAIN},
{"DOUBLE", KW_DOUBLE},
{"double", KW_DOUBLE},
{"DROP", KW_DROP},
{"ELEMENT", KW_ELEMENT},
{"ELSE", KW_ELSE},
{"else", KW_ELSE},
{"END", KW_END},
{"END_ERROR", KW_END_ERROR},
{"END-EXEC", KW_END_EXEC},
{"END_EXEC", KW_END_EXEC},
{"END_FETCH", KW_END_FETCH},
{"END_FOR", KW_END_FOR},
{"END_FORM", KW_END_FORM},
{"END_ITEM", KW_END_ITEM},
{"END_MENU", KW_END_MENU},
{"END_MODIFY", KW_END_MODIFY},
{"END_STORE", KW_END_STORE},
{"END_STREAM", KW_END_STREAM},
{"ENTREE_LENGTH", KW_ENTREE_LENGTH},
{"ENTREE_TEXT", KW_ENTREE_TEXT},
{"ENTREE_VALUE", KW_ENTREE_VALUE},
{"ENTRY_POINT", KW_ENTRY_POINT},
{"==", KW_EQ},
{"EQ", KW_EQ},
{"=", KW_EQUALS},
{"ERASE", KW_ERASE},
{"ERROR", KW_ERROR},
{"ESCAPE", KW_ESCAPE},
{"EVENT", KW_EVENT},
{"EVENT_INIT", KW_EVENT_INIT},
{"EVENT_WAIT", KW_EVENT_WAIT},
{"EXACTCASE", KW_EXACTCASE},
{"EXCLUSIVE", KW_EXCLUSIVE},
{"EXEC", KW_EXEC},
{"EXECUTE", KW_EXECUTE},
{"EXISTS", KW_EXISTS},
{"EXTERN", KW_EXTERN},
{"EXTERNAL", KW_EXTERNAL},
{"EXTRACT", KW_EXTRACT},
{"FETCH", KW_FETCH},
{"FILE", KW_FILE},
{"FILENAME", KW_FILENAME},
{"FILTER", KW_FILTER},
{"FINISH", KW_FINISH},
{"FINISH_DATABASE", KW_FINISH},
{"FIRST", KW_FIRST},
{"FLOAT", KW_FLOAT},
{"float", KW_FLOAT},
{"FOR", KW_FOR},
{"FOREIGN", KW_FOREIGN},
{"FORM", KW_FORM},
{"FORM_HANDLE", KW_FORM_HANDLE},
{"FORWARD", KW_FORWARD},
{"FOR_FORM", KW_FOR_FORM},
{"FOR_ITEM", KW_FOR_ITEM},
{"FOR_MENU", KW_FOR_MENU},
{"FOUND", KW_FOUND},
{"FROM", KW_FROM},
{"FULL", KW_FULL},
{"FUNCTION", KW_FUNCTION},
{"WINDOW_SCOPE", KW_GDS_WINDOWS},
{">=", KW_GE},
{"GE", KW_GE},
{"^<", KW_GE},
{"!<", KW_GE},
{"~<", KW_GE},
{"GEN_ID", KW_GEN_ID},
{"GENERATOR", KW_GENERATOR},
{"GET_SEGMENT", KW_GET_SEGMENT},
{"GET_SLICE", KW_GET_SLICE},
{"GLOBAL", KW_GLOBAL},
{"GO", KW_GO},
{"GOTO", KW_GOTO},
{"GRANT", KW_GRANT},
{"GROUP", KW_GROUP},
{"GROUP_COMMIT_WAIT_TIME", KW_GROUP_COMMIT_WAIT},
{">", KW_GT},
{"GT", KW_GT},
{"HANDLES", KW_HANDLES},
{"HAVING", KW_HAVING},
{"HEIGHT", KW_HEIGHT},
{"HORIZONTAL", KW_HORIZONTAL},
{"HOUR", KW_HOUR},
{"IMMEDIATE", KW_IMMEDIATE},
{"IN", KW_IN},
{"INACTIVE", KW_INACTIVE},
{"INIT", KW_INIT},
{"++", KW_INC},
{"INCLUDE", KW_INCLUDE},
{"INDEX", KW_INDEX},
{"INDICATOR", KW_INDICATOR},
{"INNER", KW_INNER},
{"INPUT", KW_INPUT},
{"INPUT_TYPE", KW_INPUT_TYPE},
{"INSERT", KW_INSERT},
{"INT", KW_INT},
{"int", KW_INT},
{"INTEGER", KW_INTEGER},
{"INTERNAL", KW_INTERNAL},
{"INTO", KW_INTO},
{"IS", KW_IS},
{"ISO", KW_ISOLATION},
{"ISOLATION", KW_ISOLATION},
{"JOIN", KW_JOIN},
{"KEY", KW_KEY},
#ifdef SCROLLABLE_CURSORS
"LAST", KW_LAST,
{"LAST", KW_LAST},
#endif
"LC_CTYPE", KW_LC_CTYPE,
"LC_MESSAGES", KW_LC_MESSAGES,
"<=", KW_LE,
"LE", KW_LE,
"^>", KW_LE,
"~>", KW_LE,
"!>", KW_LE,
"LEFT", KW_LEFT,
"(", KW_LEFT_PAREN,
"LENGTH", KW_LENGTH,
"LEVEL", KW_LEVEL,
"LIKE", KW_LIKE,
"LOCK", KW_LOCK,
"LOG_BUFFER_SIZE", KW_LOG_BUF_SIZE,
"LOGFILE", KW_LOG_FILE,
"LONG", KW_LONG,
"long", KW_LONG,
"<", KW_LT,
"LT", KW_LT,
"{", KW_L_BRACE,
"[", KW_L_BRCKET,
"MAIN", KW_MAIN,
"MANUAL", KW_MANUAL,
"MATCHES", KW_MATCHES,
"MATCHING", KW_MATCHES,
"MAX", KW_MAX,
"MAXIMUM_SEGMENT", KW_MAX_SEGMENT,
"MENU_ENTREE", KW_MENU_ENTREE,
"MENU_HANDLE", KW_MENU_HANDLE,
"MERGE", KW_MERGE,
"MIN", KW_MIN,
"MINUTE", KW_MINUTE,
"-", KW_MINUS,
"MISSING", KW_MISSING,
"MODIFY", KW_MODIFY,
"MODULE_NAME", KW_MODULE_NAME,
"MONTH", KW_MONTH,
"NAME", KW_NAME,
"NAMES", KW_NAMES,
"NATIONAL", KW_NATIONAL,
"NATURAL", KW_NATURAL,
"NCHAR", KW_NCHAR,
"!=", KW_NE, "<>", KW_NE, "NE", KW_NE, "^=", KW_NE, "~=", KW_NE,
{"LC_CTYPE", KW_LC_CTYPE},
{"LC_MESSAGES", KW_LC_MESSAGES},
{"<=", KW_LE},
{"LE", KW_LE},
{"^>", KW_LE},
{"~>", KW_LE},
{"!>", KW_LE},
{"LEFT", KW_LEFT},
{"(", KW_LEFT_PAREN},
{"LENGTH", KW_LENGTH},
{"LEVEL", KW_LEVEL},
{"LIKE", KW_LIKE},
{"LOCK", KW_LOCK},
{"LOG_BUFFER_SIZE", KW_LOG_BUF_SIZE},
{"LOGFILE", KW_LOG_FILE},
{"LONG", KW_LONG},
{"long", KW_LONG},
{"<", KW_LT},
{"LT", KW_LT},
{"{", KW_L_BRACE},
{"[", KW_L_BRCKET},
{"MAIN", KW_MAIN},
{"MANUAL", KW_MANUAL},
{"MATCHES", KW_MATCHES},
{"MATCHING", KW_MATCHES},
{"MAX", KW_MAX},
{"MAXIMUM_SEGMENT", KW_MAX_SEGMENT},
{"MENU_ENTREE", KW_MENU_ENTREE},
{"MENU_HANDLE", KW_MENU_HANDLE},
{"MERGE", KW_MERGE},
{"MIN", KW_MIN},
{"MINUTE", KW_MINUTE},
{"-", KW_MINUS},
{"MISSING", KW_MISSING},
{"MODIFY", KW_MODIFY},
{"MODULE_NAME", KW_MODULE_NAME},
{"MONTH", KW_MONTH},
{"NAME", KW_NAME},
{"NAMES", KW_NAMES},
{"NATIONAL", KW_NATIONAL},
{"NATURAL", KW_NATURAL},
{"NCHAR", KW_NCHAR},
{"!=", KW_NE}, {"<>", KW_NE}, {"NE", KW_NE}, {"^=", KW_NE}, {"~=", KW_NE},
#ifdef SCROLLABLE_CURSORS
"NEXT", KW_NEXT,
{"NEXT", KW_NEXT},
#endif
"NO", KW_NO,
"NOT", KW_NOT,
"NO_AUTO_UNDO", KW_NO_AUTO_UNDO,
"NOWAIT", KW_NO_WAIT,
"NO_WAIT", KW_NO_WAIT,
"NO_WAIT", KW_NO_WAIT,
"NULL", KW_NULL,
"NUMERIC", KW_NUMERIC,
"NUM_LOG_BUFFERS", KW_NUM_LOG_BUFS,
"OF", KW_OF,
"ON", KW_ON,
"ON_ERROR", KW_ON_ERROR,
"ONLY", KW_ONLY,
"OPAQUE", KW_OPAQUE,
"OPEN", KW_OPEN,
"OPEN_BLOB", KW_OPEN_BLOB,
"OPTION", KW_OPTION,
"OPTIONS", KW_OPTIONS,
"OR", KW_OR,
"||", KW_OR1,
"ORDER", KW_ORDER,
"OUTER", KW_OUTER,
"OUTPUT", KW_OUTPUT,
"OUTPUT_TYPE", KW_OUTPUT_TYPE,
"OVER", KW_OVER,
"OVERFLOW", KW_OVERFLOW,
"OVERRIDING", KW_OVERRIDING,
"PAGE", KW_PAGE,
"PAGES", KW_PAGES,
"PAGESIZE", KW_PAGESIZE,
"PAGE_SIZE", KW_PAGE_SIZE,
"PARAMETER", KW_PARAMETER,
"PASSWORD", KW_PASSWORD,
"PATHNAME", KW_PATHNAME,
"+", KW_PLUS,
"->", KW_POINTS,
"PLAN", KW_PLAN,
"PRECISION", KW_PRECISION,
"precision", KW_PRECISION,
"PREPARE", KW_PREPARE,
"PREPARE_TRANSACTION", KW_PREPARE, "PRIMARY", KW_PRIMARY,
{"NO", KW_NO},
{"NOT", KW_NOT},
{"NO_AUTO_UNDO", KW_NO_AUTO_UNDO},
{"NOWAIT", KW_NO_WAIT},
{"NO_WAIT", KW_NO_WAIT},
{"NO_WAIT", KW_NO_WAIT},
{"NULL", KW_NULL},
{"NUMERIC", KW_NUMERIC},
{"NUM_LOG_BUFFERS", KW_NUM_LOG_BUFS},
{"OF", KW_OF},
{"ON", KW_ON},
{"ON_ERROR", KW_ON_ERROR},
{"ONLY", KW_ONLY},
{"OPAQUE", KW_OPAQUE},
{"OPEN", KW_OPEN},
{"OPEN_BLOB", KW_OPEN_BLOB},
{"OPTION", KW_OPTION},
{"OPTIONS", KW_OPTIONS},
{"OR", KW_OR},
{"||", KW_OR1},
{"ORDER", KW_ORDER},
{"OUTER", KW_OUTER},
{"OUTPUT", KW_OUTPUT},
{"OUTPUT_TYPE", KW_OUTPUT_TYPE},
{"OVER", KW_OVER},
{"OVERFLOW", KW_OVERFLOW},
{"OVERRIDING", KW_OVERRIDING},
{"PAGE", KW_PAGE},
{"PAGES", KW_PAGES},
{"PAGESIZE", KW_PAGESIZE},
{"PAGE_SIZE", KW_PAGE_SIZE},
{"PARAMETER", KW_PARAMETER},
{"PASSWORD", KW_PASSWORD},
{"PATHNAME", KW_PATHNAME},
{"+", KW_PLUS},
{"->", KW_POINTS},
{"PLAN", KW_PLAN},
{"PRECISION", KW_PRECISION},
{"precision", KW_PRECISION},
{"PREPARE", KW_PREPARE},
{"PREPARE_TRANSACTION",KW_PREPARE},
{"PRIMARY", KW_PRIMARY},
#ifdef SCROLLABLE_CURSORS
"PRIOR", KW_PRIOR,
{"PRIOR", KW_PRIOR},
#endif
"PRIVILEGES", KW_PRIVILEGES,
"PROC", KW_PROC,
"PROCEDURE", KW_PROCEDURE,
"PROTECTED", KW_PROTECTED,
"PUBLIC", KW_PUBLIC,
"PUT_ITEM", KW_PUT_ITEM,
"PUT_SEGMENT", KW_PUT_SEGMENT,
"PUT_SLICE", KW_PUT_SLICE,
"QUADWORD", KW_QUAD,
"RAW_PARTITIONS", KW_RAW_PARTITIONS,
"READ", KW_READ,
"READ_COMMITTED", KW_READ_COMMITTED,
"READY", KW_READY,
"READY_DATABASE", KW_READY,
"READ_ONLY", KW_READ_ONLY,
"READ_WRITE", KW_READ_WRITE,
"REAL", KW_REAL,
"RECORD_VERSION", KW_VERSION,
"REDUCED", KW_REDUCED, "REFERENCES", KW_REFERENCES,
{"PRIVILEGES", KW_PRIVILEGES},
{"PROC", KW_PROC},
{"PROCEDURE", KW_PROCEDURE},
{"PROTECTED", KW_PROTECTED},
{"PUBLIC", KW_PUBLIC},
{"PUT_ITEM", KW_PUT_ITEM},
{"PUT_SEGMENT", KW_PUT_SEGMENT},
{"PUT_SLICE", KW_PUT_SLICE},
{"QUADWORD", KW_QUAD},
{"RAW_PARTITIONS", KW_RAW_PARTITIONS},
{"READ", KW_READ},
{"READ_COMMITTED", KW_READ_COMMITTED},
{"READY", KW_READY},
{"READY_DATABASE", KW_READY},
{"READ_ONLY", KW_READ_ONLY},
{"READ_WRITE", KW_READ_WRITE},
{"REAL", KW_REAL},
{"RECORD_VERSION", KW_VERSION},
{"REDUCED", KW_REDUCED},
{"REFERENCES", KW_REFERENCES},
#ifdef SCROLLABLE_CURSORS
"RELATIVE", KW_RELATIVE,
{"RELATIVE", KW_RELATIVE},
#endif
"RELEASE", KW_RELEASE,
"RELEASE_REQUESTS", KW_RELEASE_REQUESTS,
"REM", KW_REM,
"REQUEST_HANDLE", KW_REQUEST_HANDLE,
"RESERVING", KW_RESERVING,
"RESOURCE", KW_RESOURCE,
"RESTRICT", KW_RESTRICT,
"RETAIN", KW_RETAIN,
"RETURNING_VALUES", KW_RETURNING,
"RETURNS", KW_RETURNS,
"REVOKE", KW_REVOKE,
"RIGHT", KW_RIGHT,
")", KW_RIGHT_PAREN,
"ROLE", KW_ROLE,
"ROLLBACK", KW_ROLLBACK,
"ROLLBACK_TRANSACTION", KW_ROLLBACK,
"^FUNCTION", KW_ROUTINE_PTR,
"^PROCEDURE", KW_ROUTINE_PTR,
"RUN", KW_RUN,
"RUNTIME", KW_RUNTIME,
"}", KW_R_BRACE,
"]", KW_R_BRCKET,
"SAVE", KW_SAVE,
"SAVE_TRANSACTION", KW_SAVE,
"SAVE_TRANSACTIONS", KW_SAVE,
"SCALE", KW_SCALE, "SCHEDULE", KW_SCHEDULE, "SCHEMA", KW_SCHEMA,
{"RELEASE", KW_RELEASE},
{"RELEASE_REQUESTS", KW_RELEASE_REQUESTS},
{"REM", KW_REM},
{"REQUEST_HANDLE", KW_REQUEST_HANDLE},
{"RESERVING", KW_RESERVING},
{"RESOURCE", KW_RESOURCE},
{"RESTRICT", KW_RESTRICT},
{"RETAIN", KW_RETAIN},
{"RETURNING_VALUES", KW_RETURNING},
{"RETURNS", KW_RETURNS},
{"REVOKE", KW_REVOKE},
{"RIGHT", KW_RIGHT},
{")", KW_RIGHT_PAREN},
{"ROLE", KW_ROLE},
{"ROLLBACK", KW_ROLLBACK},
{"ROLLBACK_TRANSACTION", KW_ROLLBACK},
{"^FUNCTION", KW_ROUTINE_PTR},
{"^PROCEDURE", KW_ROUTINE_PTR},
{"RUN", KW_RUN},
{"RUNTIME", KW_RUNTIME},
{"}", KW_R_BRACE},
{"]", KW_R_BRCKET},
{"SAVE", KW_SAVE},
{"SAVE_TRANSACTION", KW_SAVE},
{"SAVE_TRANSACTIONS", KW_SAVE},
{"SCALE", KW_SCALE},
{"SCHEDULE", KW_SCHEDULE},
{"SCHEMA", KW_SCHEMA},
#ifdef SCROLLABLE_CURSORS
"SCROLL", KW_SCROLL,
{"SCROLL", KW_SCROLL},
#endif
"SECTION", KW_SECTION,
"SECOND", KW_SECOND,
"SEGMENT", KW_SEGMENT,
"SELECT", KW_SELECT,
";", KW_SEMI_COLON,
"SET", KW_SET,
"SHARED", KW_SHARED,
"SHADOW", KW_SHADOW,
"SHORT", KW_SHORT,
"short", KW_SHORT,
"SINGULAR", KW_SINGULAR,
"SIZE", KW_SIZE,
"/", KW_SLASH,
"SMALLINT", KW_SMALLINT,
"SNAPSHOT", KW_SNAPSHOT,
"SORT", KW_SORT,
"SORTED", KW_SORTED,
"SQL", KW_SQL,
"SQLERROR", KW_SQLERROR,
"SQLWARNING", KW_SQLWARNING,
"STABILITY", KW_STABILITY,
"STARTING", KW_STARTING,
"STARTING_WITH", KW_STARTING_WITH,
"STARTS", KW_STARTS,
"START_STREAM", KW_START_STREAM,
"START_TRANSACTION", KW_START_TRANSACTION,
"STATE", KW_STATE,
"STATEMENT", KW_STATEMENT,
"STATIC", KW_STATIC,
"STATISTICS", KW_STATISTICS,
"STOGROUP", KW_STOGROUP,
"STORE", KW_STORE,
"STREAM", KW_STREAM,
"STRING", KW_STRING,
"SUB", KW_SUB,
"SUB_TYPE", KW_SUB_TYPE,
"SUBROUTINE", KW_SUBROUTINE,
"SUM", KW_SUM,
"SUSPEND_WINDOW", KW_SUSPEND_WINDOW,
"SYNONYM", KW_SYNONYM,
"TABLE", KW_TABLE,
"TABLESPACE", KW_TABLESPACE,
"TAG", KW_TAG,
"TERMINATING_FIELD", KW_TERMINATING_FIELD,
"TERMINATOR", KW_TERMINATOR,
"TIME", KW_TIME,
"TIMESTAMP", KW_TIMESTAMP,
"TITLE_LENGTH", KW_TITLE_LENGTH,
"TITLE_TEXT", KW_TITLE_TEXT,
"TO", KW_TO,
"TOTAL", KW_TOTAL,
"TRANSACTION", KW_TRANSACTION,
"TRANSACTION_HANDLE", KW_TRANSACTION_HANDLE,
"TRANSPARENT", KW_TRANSPARENT,
"TRIGGER", KW_TRIGGER,
"UNCOMMITTED", KW_UNCOMMITTED,
"UNION", KW_UNION,
"UNIQUE", KW_UNIQUE,
"UPDATE", KW_UPDATE,
"UPPER", KW_UPPER,
"UPPERCASE", KW_UPPERCASE,
"USER", KW_USER,
"USERS", KW_USERS,
"RDB$USER_NAME", KW_USER_NAME,
"USING", KW_USING,
"VALUE", KW_VALUE,
"VALUES", KW_VALUES,
"VAL_PARAM", KW_VAL_PARAM,
"VARCHAR", KW_VARCHAR,
"VARIABLE", KW_VARIABLE,
"VARYING", KW_VARYING,
"VERTICAL", KW_VERTICAL,
"VIEW", KW_VIEW,
"WAIT", KW_WAIT,
"WAKING", KW_WAKING,
"WARNING", KW_WARNING,
"WEEKDAY", KW_WEEKDAY,
"WHENEVER", KW_WHENEVER,
"WIDTH", KW_WIDTH,
"WHERE", KW_WITH,
"WITH", KW_WITH,
"WORK", KW_WORK,
"WRITE", KW_WRITE, "YEAR", KW_YEAR, "YEARDAY", KW_YEARDAY,
{"SECTION", KW_SECTION},
{"SECOND", KW_SECOND},
{"SEGMENT", KW_SEGMENT},
{"SELECT", KW_SELECT},
{";", KW_SEMI_COLON},
{"SET", KW_SET},
{"SHARED", KW_SHARED},
{"SHADOW", KW_SHADOW},
{"SHORT", KW_SHORT},
{"short", KW_SHORT},
{"SINGULAR", KW_SINGULAR},
{"SIZE", KW_SIZE},
{"/", KW_SLASH},
{"SMALLINT", KW_SMALLINT},
{"SNAPSHOT", KW_SNAPSHOT},
{"SORT", KW_SORT},
{"SORTED", KW_SORTED},
{"SQL", KW_SQL},
{"SQLERROR", KW_SQLERROR},
{"SQLWARNING", KW_SQLWARNING},
{"STABILITY", KW_STABILITY},
{"STARTING", KW_STARTING},
{"STARTING_WITH", KW_STARTING_WITH},
{"STARTS", KW_STARTS},
{"START_STREAM", KW_START_STREAM},
{"START_TRANSACTION", KW_START_TRANSACTION},
{"STATE", KW_STATE},
{"STATEMENT", KW_STATEMENT},
{"STATIC", KW_STATIC},
{"STATISTICS", KW_STATISTICS},
{"STOGROUP", KW_STOGROUP},
{"STORE", KW_STORE},
{"STREAM", KW_STREAM},
{"STRING", KW_STRING},
{"SUB", KW_SUB},
{"SUB_TYPE", KW_SUB_TYPE},
{"SUBROUTINE", KW_SUBROUTINE},
{"SUM", KW_SUM},
{"SUSPEND_WINDOW", KW_SUSPEND_WINDOW},
{"SYNONYM", KW_SYNONYM},
{"TABLE", KW_TABLE},
{"TABLESPACE", KW_TABLESPACE},
{"TAG", KW_TAG},
{"TERMINATING_FIELD", KW_TERMINATING_FIELD},
{"TERMINATOR", KW_TERMINATOR},
{"TIME", KW_TIME},
{"TIMESTAMP", KW_TIMESTAMP},
{"TITLE_LENGTH", KW_TITLE_LENGTH},
{"TITLE_TEXT", KW_TITLE_TEXT},
{"TO", KW_TO},
{"TOTAL", KW_TOTAL},
{"TRANSACTION", KW_TRANSACTION},
{"TRANSACTION_HANDLE", KW_TRANSACTION_HANDLE},
{"TRANSPARENT", KW_TRANSPARENT},
{"TRIGGER", KW_TRIGGER},
{"UNCOMMITTED", KW_UNCOMMITTED},
{"UNION", KW_UNION},
{"UNIQUE", KW_UNIQUE},
{"UPDATE", KW_UPDATE},
{"UPPER", KW_UPPER},
{"UPPERCASE", KW_UPPERCASE},
{"USER", KW_USER},
{"USERS", KW_USERS},
{"RDB$USER_NAME", KW_USER_NAME},
{"USING", KW_USING},
{"VALUE", KW_VALUE},
{"VALUES", KW_VALUES},
{"VAL_PARAM", KW_VAL_PARAM},
{"VARCHAR", KW_VARCHAR},
{"VARIABLE", KW_VARIABLE},
{"VARYING", KW_VARYING},
{"VERTICAL", KW_VERTICAL},
{"VIEW", KW_VIEW},
{"WAIT", KW_WAIT},
{"WAKING", KW_WAKING},
{"WARNING", KW_WARNING},
{"WEEKDAY", KW_WEEKDAY},
{"WHENEVER", KW_WHENEVER},
{"WIDTH", KW_WIDTH},
{"WHERE", KW_WITH},
{"WITH", KW_WITH},
{"WORK", KW_WORK},
{"WRITE", KW_WRITE},
{"YEAR", KW_YEAR},
{"YEARDAY", KW_YEARDAY}

5
src/gpre/int.cpp
View File

@ -25,13 +25,14 @@
//
//____________________________________________________________
//
// $Id: int.cpp,v 1.1.1.1 2001-05-23 13:25:31 tamlin Exp $
// $Id: int.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include "../jrd/common.h"
#include <stdarg.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../gpre/gpre.h"
#include "../gpre/gpre_proto.h"
#include "../gpre/lang_proto.h"

5
src/gpre/int_cxx.cpp
View File

@ -25,13 +25,14 @@
//
//____________________________________________________________
//
// $Id: int_cxx.cpp,v 1.1 2001-07-12 06:32:02 bellardo Exp $
// $Id: int_cxx.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include "../jrd/common.h"
#include <stdarg.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../gpre/gpre.h"
#include "../gpre/gpre_proto.h"
#include "../gpre/lang_proto.h"

5
src/gpre/jrdmet.cpp
View File

@ -26,10 +26,11 @@
//
//____________________________________________________________
//
// $Id: jrdmet.cpp,v 1.1.1.1 2001-05-23 13:25:31 tamlin Exp $
// $Id: jrdmet.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
//
#include "../include/jrd/gds.h"
#include "firebird.h"
#include "../jrd/gds.h"
#include "../jrd/common.h"
#include "../jrd/ods.h"

5
src/gpre/movg.cpp
View File

@ -25,13 +25,14 @@
//
//____________________________________________________________
//
// $Id: movg.cpp,v 1.1.1.1 2001-05-23 13:25:32 tamlin Exp $
// $Id: movg.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include "../jrd/common.h"
#include <stdarg.h>
#include "../jrd/codes.h"
#include "gen/codes.h"
#include "../jrd/iberr.h"
#include "../jrd/dsc.h"
#include "../gpre/movg_proto.h"

5
src/gpre/msc.cpp
View File

@ -25,10 +25,10 @@
//
//____________________________________________________________
//
// $Id: msc.cpp,v 1.1.1.1 2001-05-23 13:25:32 tamlin Exp $
// $Id: msc.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
//
//
//$Id: msc.cpp,v 1.1.1.1 2001-05-23 13:25:32 tamlin Exp $
//$Id: msc.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
//
// ***************************************************
@ -48,6 +48,7 @@
// - THANK YOU
//**************************************************
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <string.h>
#include "../gpre/gpre.h"

3
src/gpre/noform.cpp
View File

@ -24,9 +24,10 @@
//
//____________________________________________________________
//
// $Id: noform.cpp,v 1.1.1.1 2001-05-23 13:25:32 tamlin Exp $
// $Id: noform.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include "../gpre/gpre.h"
#include "../gpre/form.h"
#include "../gpre/form_proto.h"

7
src/gpre/par.cpp
View File

@ -20,7 +20,7 @@
//
// All Rights Reserved.
// Contributor(s): ______________________________________.
// $Id: par.cpp,v 1.2 2001-07-12 05:46:04 bellardo Exp $
// $Id: par.cpp,v 1.3 2001-07-29 23:43:22 skywalker Exp $
// Revision 1.2 2000/11/27 09:26:13 fsg
// Fixed bugs in gpre to handle PYXIS forms
// and allow edit.e and fred.e to go through
@ -37,13 +37,14 @@
//
//____________________________________________________________
//
// $Id: par.cpp,v 1.2 2001-07-12 05:46:04 bellardo Exp $
// $Id: par.cpp,v 1.3 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include <setjmp.h>
#include <stdlib.h>
#include <string.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../gpre/gpre.h"
#include "../gpre/parse.h"
#include "../gpre/form.h"

5
src/gpre/pas.cpp
View File

@ -24,14 +24,15 @@
//
//____________________________________________________________
//
// $Id: pas.cpp,v 1.1.1.1 2001-05-23 13:25:31 tamlin Exp $
// $Id: pas.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include "../jrd/common.h"
#include <stdarg.h>
#include <string.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../gpre/gpre.h"
#include "../gpre/form.h"
#include "../gpre/pat.h"

3
src/gpre/pat.cpp
View File

@ -24,9 +24,10 @@
//
//____________________________________________________________
//
// $Id: pat.cpp,v 1.1.1.1 2001-05-23 13:25:31 tamlin Exp $
// $Id: pat.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <string.h>
#include "../gpre/gpre.h"

8
src/gpre/pretty.cpp
View File

@ -25,13 +25,14 @@
//
//____________________________________________________________
//
// $Id: pretty.cpp,v 1.2 2001-07-12 05:46:04 bellardo Exp $
// $Id: pretty.cpp,v 1.3 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include "../jrd/common.h"
#include <stdarg.h>
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../gpre/prett_proto.h"
#include "../jrd/gds_proto.h"
@ -123,13 +124,12 @@ const char *menu_strings[] = {
"VERTICAL"
};
int PRETTY_print_cdb(
SCHAR * blr,
//____________________________________________________________
//
// Pretty print create database parameter buffer thru callback routine.
//
int PRETTY_print_cdb( SCHAR * blr,
int (*routine) (), SCHAR * user_arg, SSHORT language)
{

5
src/gpre/sqe.cpp
View File

@ -20,7 +20,7 @@
//
// All Rights Reserved.
// Contributor(s): ______________________________________.
// $Id: sqe.cpp,v 1.1.1.1 2001-05-23 13:25:31 tamlin Exp $
// $Id: sqe.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
// Revision 1.3 2000/11/16 15:54:29 fsg
// Added new switch -verbose to gpre that will dump
// parsed lines to stderr
@ -38,8 +38,9 @@
//
//____________________________________________________________
//
// $Id: sqe.cpp,v 1.1.1.1 2001-05-23 13:25:31 tamlin Exp $
// $Id: sqe.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include <stdio.h>
#include <string.h>
#include "../gpre/gpre.h"

5
src/gpre/sql.cpp
View File

@ -25,13 +25,14 @@
//
//____________________________________________________________
//
// $Id: sql.cpp,v 1.1.1.1 2001-05-23 13:25:30 tamlin Exp $
// $Id: sql.cpp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
//
#include "firebird.h"
#include <stdlib.h>
#include <string.h>
#include "../gpre/gpre.h"
#include "../include/jrd/gds.h"
#include "../jrd/gds.h"
#include "../gpre/parse.h"
#include "../jrd/intl.h"
#include "../wal/wal.h"

1
src/intl/cs_big5.c
View File

@ -22,6 +22,7 @@
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
extern USHORT CVBIG5_big5_to_unicode();

1
src/intl/cs_gb2312.c
View File

@ -22,6 +22,7 @@
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
extern USHORT CVGB_gb2312_to_unicode();

1
src/intl/cs_jis.c
View File

@ -22,6 +22,7 @@
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
extern USHORT CV_wc_to_wc();

1
src/intl/cs_jis_20208_1990.c
View File

@ -16,6 +16,7 @@
* All Rights Reserved.
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
USHORT *from_unicode_mapping_array;

1
src/intl/cs_ksc.c
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
extern USHORT CVKSC_ksc_to_unicode();

1
src/intl/cs_narrow.c
View File

@ -22,6 +22,7 @@
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
extern USHORT CV_nc_to_unicode();

1
src/intl/cs_unicode.c
View File

@ -22,6 +22,7 @@
*/
#include "firebird.h"
#include "../intl/ldcommon.h"

1
src/intl/cs_utffss.c
View File

@ -24,6 +24,7 @@
/* Note: all routines have cousins in jrd/intl.c */
#include "firebird.h"
#include "../intl/ldcommon.h"

1
src/intl/cv_big5.c
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
/* These macros have a duplicate in lc_big5.c */

1
src/intl/cv_gb2312.c
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
/* These macros have a duplicate in lc_gb2312.c */

1
src/intl/cv_jis.c
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
#include "../intl/cs_sjis.h"

1
src/intl/cv_ksc.c
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../intl/ldcommon.h"

1
src/intl/cv_narrow.c
View File

@ -22,6 +22,7 @@
*/
#include "firebird.h"
#include "../intl/ldcommon.h"

1
src/intl/dtest.c
View File

@ -28,6 +28,7 @@
* Set the static full_debug to 1 to turn on ib_printf debugging.
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#define DEBUG
#include <assert.h>

1
src/intl/dtest2.c
View File

@ -23,6 +23,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
static int full_debug = 0;

1
src/intl/lc_ascii.c
View File

@ -22,6 +22,7 @@
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
extern USHORT famasc_key_length();

1
src/intl/lc_big5.c
View File

@ -22,6 +22,7 @@
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
#include "../jrd/license.h"

1
src/intl/lc_dos.c
View File

@ -22,6 +22,7 @@
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
extern USHORT LC_NARROW_key_length();

1
src/intl/lc_gb2312.c
View File

@ -22,6 +22,7 @@
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
#include "../jrd/license.h"

1
src/intl/lc_jis.c
View File

@ -22,6 +22,7 @@
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
#include "../jrd/license.h"

1
src/intl/lc_ksc.c
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
#include "../jrd/license.h"

1
src/intl/lc_latin1.c
View File

@ -23,6 +23,7 @@
*/
#include "firebird.h"
#include "../intl/ldcommon.h"
extern USHORT LC_NARROW_key_length();

Some files were not shown because too many files have changed in this diff Show More