[Firebird-checkins] CVS: firebird2/src/dudley ddl.h,1.4,1.5 exe.epp,1.9,1.10 expand.cpp,1.7,1.8 generate.cpp,1.5,1.6 parse.cpp,1.11,1.12 trn.cpp,1.5,1.6

[Ignacio O. <hip...@us...>]

Build Version :  T1.5.0.1632 Firebird 1.5 Alpha 4

(writeBuildNum.sh,v 1.1614 2002/11/30 17:37:47 hippoman Exp )

Update of /cvsroot/firebird/firebird2/src/dudley
In directory sc8-pr-cvs1:/tmp/cvs-serv11163

Modified Files:
	ddl.h exe.epp expand.cpp generate.cpp parse.cpp trn.cpp 
Log Message:
Changed struct fld and FLD to local module names

Index: ddl.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/dudley/ddl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -U3 -r1.4 -r1.5
--- ddl.h	20 Nov 2002 23:11:54 -0000	1.4
+++ ddl.h	30 Nov 2002 17:37:46 -0000	1.5
@@ -95,7 +95,7 @@
 typedef struct act {
 	enum act_t act_type;		/* what to do */
 	struct act *act_next;		/* next action in system */
-	struct dbb *act_object;		/* object in question (dudley_rel, fld, idx, etc.) */
+	struct dbb *act_object;		/* object in question (dudley_rel, dudley_fld, idx, etc.) */
 	USHORT act_line;			/* line the action started on */
 	USHORT act_flags;
 } *ACT;
@@ -110,7 +110,7 @@
 typedef struct dudley_ctx {
 	struct sym *ctx_name;
 	struct dudley_rel *ctx_relation;
-	struct fld *ctx_field;
+	struct dudley_fld *ctx_field;
 	USHORT ctx_view_rse;
 	USHORT ctx_context_id;
 } *DUDLEY_CTX;
@@ -162,7 +162,7 @@
 
 /* Field block.  Fields are what farms and databases are all about */
 
-typedef struct fld {
+typedef struct dudley_fld {
 	SSHORT fld_dtype;			/* data type of field */
 	SSHORT fld_length;			/* field length in bytes */
 	SSHORT fld_scale;			/* scale factor */
@@ -173,14 +173,14 @@
 	SSHORT fld_dimension;		/* size of multi-dim. array */
 	SSHORT fld_system;			/* 0 if field is user defined */
 	USHORT fld_flags;			/* misc trash */
-	struct fld *fld_next;		/* next field in relation */
+	struct dudley_fld *fld_next;		/* next field in relation */
 	struct dudley_rel *fld_relation;	/* relation */
 	struct sym *fld_security_class;
 	struct dudley_ctx *fld_context;	/* context for view */
 	struct dbb *fld_database;	/* database for global fields */
 	struct sym *fld_name;		/* field name */
 	struct sym *fld_source;		/* name of global field */
-	struct fld *fld_source_field;	/* global field for computed field */
+	struct dudley_fld *fld_source_field;	/* global field for computed field */
 	struct sym *fld_base;		/* base field for views */
 	struct sym *fld_query_name;	/* query name */
 	struct dudley_nod *fld_query_header;	/* query header */
@@ -193,7 +193,7 @@
 	struct txt *fld_compute_src;	/* computed_by source */
 	struct txt *fld_valid_src;	/* validation source */
 	SLONG *fld_ranges;			/* ranges for multi-dim. array */
-} *FLD;
+} *DUDLEY_FLD;
 
 #define fld_explicit_position	1
 #define fld_modify		2
@@ -207,7 +207,7 @@
 #define fld_null_query_name	512
 #define fld_null_query_header	1024
 
-#define FLD_LEN sizeof (struct fld)
+#define FLD_LEN sizeof (struct dudley_fld)
 
 
 /* File description block */
@@ -361,7 +361,7 @@
 typedef struct dudley_rel {
 	struct dbb *rel_database;	/* parent database */
 	struct sym *rel_filename;	/* external filename */
-	struct fld *rel_fields;		/* linked list of known fields */
+	struct dudley_fld *rel_fields;		/* linked list of known fields */
 	struct sym *rel_name;		/* symbol for relation */
 	struct sym *rel_security_class;	/* name of security class */
 	struct dudley_rel *rel_next;		/* next relation in database */

Index: exe.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/dudley/exe.epp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -U3 -r1.9 -r1.10
--- exe.epp	21 Nov 2002 20:43:57 -0000	1.9
+++ exe.epp	30 Nov 2002 17:37:46 -0000	1.10
@@ -56,13 +56,13 @@
 DATABASE DB = FILENAME "yachts.lnk";
 
 static void add_cache(DBB);
-static void add_field(FLD);
+static void add_field(DUDLEY_FLD);
 static void add_files(DBB, FIL);
 static void add_filter(FILTER);
 static void add_function(FUNC);
 static void add_function_arg(FUNCARG);
 static void add_generator(SYM);
-static void add_global_field(FLD);
+static void add_global_field(DUDLEY_FLD);
 static void add_index(DUDLEY_IDX);
 static void add_log_files(DBB);
 static void add_relation(DUDLEY_REL);
@@ -73,17 +73,17 @@
 static void add_user_privilege(USERPRIV);
 static void add_view(DUDLEY_REL);
 static void alloc_file_name(FIL *, UCHAR *);
-static FLD check_field(SYM, SYM);
+static DUDLEY_FLD check_field(SYM, SYM);
 static BOOLEAN check_function(SYM);
-static BOOLEAN check_range(FLD);
+static BOOLEAN check_range(DUDLEY_FLD);
 static BOOLEAN check_relation(SYM);
 static void close_blob(void *);
 static void *create_blob(SLONG *, USHORT, UCHAR *);
 static void drop_cache(DBB);
-static void drop_field(FLD);
+static void drop_field(DUDLEY_FLD);
 static void drop_filter(FILTER);
 static void drop_function(FUNC);
-static void drop_global_field(FLD);
+static void drop_global_field(DUDLEY_FLD);
 static void drop_index(DUDLEY_IDX);
 static void drop_relation(DUDLEY_REL);
 static void drop_security_class(SCL);
@@ -93,7 +93,7 @@
 static void drop_type(TYP);
 static void drop_user_privilege(USERPRIV);
 static void erase_userpriv(USERPRIV, TEXT *, USRE, UPFE);
-static void get_field_desc(FLD);
+static void get_field_desc(DUDLEY_FLD);
 static void get_global_fields(void);
 static void get_log_names(SCHAR *, FIL *, SCHAR *, SLONG, SSHORT, SSHORT);
 static void get_log_names_serial(FIL *);
@@ -104,8 +104,8 @@
 static void get_udfs(DBB);
 static void make_desc(DUDLEY_NOD, DSC *);
 static int make_dtype(USHORT);
-static void modify_field(FLD);
-static void modify_global_field(FLD);
+static void modify_field(DUDLEY_FLD);
+static void modify_global_field(DUDLEY_FLD);
 static void modify_index(DUDLEY_IDX);
 static void modify_relation(DUDLEY_REL);
 static void modify_trigger(DUDLEY_TRG);
@@ -116,7 +116,7 @@
 static void store_acl(SCL, SLONG *);
 static void store_blr(DUDLEY_NOD, SLONG *, DUDLEY_REL);
 static void store_query_header(DUDLEY_NOD, SLONG *);
-static void store_range(FLD);
+static void store_range(DUDLEY_FLD);
 static void store_text(TXT, SLONG *);
 static void store_userpriv(USERPRIV, TEXT *, TEXT *, USRE, UPFE);
 static int string_length(SCHAR);
@@ -500,15 +500,15 @@
 				break;
 
 			case act_a_field:
-				add_field((FLD) action->act_object);
+				add_field((DUDLEY_FLD) action->act_object);
 				break;
 
 			case act_m_field:
-				modify_field((FLD) action->act_object);
+				modify_field((DUDLEY_FLD) action->act_object);
 				break;
 
 			case act_d_field:
-				drop_field((FLD) action->act_object);
+				drop_field((DUDLEY_FLD) action->act_object);
 				break;
 
 			case act_a_filter:
@@ -532,15 +532,15 @@
 				break;
 
 			case act_a_gfield:
-				add_global_field((FLD) action->act_object);
+				add_global_field((DUDLEY_FLD) action->act_object);
 				break;
 
 			case act_m_gfield:
-				modify_global_field((FLD) action->act_object);
+				modify_global_field((DUDLEY_FLD) action->act_object);
 				break;
 
 			case act_d_gfield:
-				drop_global_field((FLD) action->act_object);
+				drop_global_field((DUDLEY_FLD) action->act_object);
 				break;
 
 			case act_a_index:
@@ -969,7 +969,7 @@
 }
 
 
-static void add_field( FLD field)
+static void add_field( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -1243,7 +1243,7 @@
 }
 
 
-static void add_global_field( FLD field)
+static void add_global_field( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -1361,7 +1361,7 @@
  **************************************/
 	SYM *symbol;
 	USHORT i, size, error, if_any;
-	FLD field;
+	DUDLEY_FLD field;
 
 	error = if_any = FALSE;
 
@@ -1817,7 +1817,7 @@
  *	Add a new view relation.
  *
  **************************************/
-	FLD field;
+	DUDLEY_FLD field;
 	DUDLEY_REL target;
 	DUDLEY_NOD rse, *arg, contexts;
 	DUDLEY_CTX context;
@@ -1973,7 +1973,7 @@
 }
 
 
-static FLD check_field( SYM relation, SYM field)
+static DUDLEY_FLD check_field( SYM relation, SYM field)
 {
 /**************************************
  *
@@ -1992,7 +1992,7 @@
 		X.RDB$FIELD_NAME EQ field->sym_string
         {
             if (symbol = HSH_typed_lookup(X.RDB$FIELD_SOURCE, (USHORT) 0, SYM_global)) 
-                return (FLD) symbol->sym_object;
+                return (DUDLEY_FLD) symbol->sym_object;
         } 
     END_FOR;
 
@@ -2024,7 +2024,7 @@
 }
 
 
-static BOOLEAN check_range( FLD field)
+static BOOLEAN check_range( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -2192,7 +2192,7 @@
 }
 
 
-static void drop_field( FLD field)
+static void drop_field( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -2323,7 +2323,7 @@
 }
 
 
-static void drop_global_field( FLD field)
+static void drop_global_field( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -2813,7 +2813,7 @@
 }
 
 
-static void get_field_desc( FLD field)
+static void get_field_desc( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -2829,10 +2829,10 @@
 
 	if_any = FALSE;
 
-	FOR FLD IN RDB$RELATION_FIELDS CROSS SRC IN RDB$FIELDS
-		WITH FLD.RDB$FIELD_NAME = field->fld_name->sym_string
-		AND FLD.RDB$RELATION_NAME = field->fld_relation->rel_name->sym_string
-		AND FLD.RDB$FIELD_SOURCE = SRC.RDB$FIELD_NAME
+	FOR DUDLEY_FLD IN RDB$RELATION_FIELDS CROSS SRC IN RDB$FIELDS
+		WITH DUDLEY_FLD.RDB$FIELD_NAME = field->fld_name->sym_string
+		AND DUDLEY_FLD.RDB$RELATION_NAME = field->fld_relation->rel_name->sym_string
+		AND DUDLEY_FLD.RDB$FIELD_SOURCE = SRC.RDB$FIELD_NAME
 
 		field->fld_dtype = SRC.RDB$FIELD_TYPE;
 	    field->fld_length = SRC.RDB$FIELD_LENGTH;
@@ -2862,11 +2862,11 @@
  *	Get global fields for database.
  *
  **************************************/
-	FLD field;
+	DUDLEY_FLD field;
 	SYM symbol;
 
 	FOR X IN RDB$FIELDS 
-        field = (FLD) DDL_alloc(FLD_LEN);
+        field = (DUDLEY_FLD) DDL_alloc(FLD_LEN);
 	    field->fld_name = symbol =
             get_symbol(SYM_global, X.RDB$FIELD_NAME, (DUDLEY_CTX) field);
         HSH_insert(symbol);
@@ -3015,7 +3015,7 @@
  *
  **************************************/
 	DUDLEY_REL relation;
-	FLD field;
+	DUDLEY_FLD field;
 	SYM symbol;
 
 	FOR R IN RDB$RELATIONS 
@@ -3030,7 +3030,7 @@
         FOR RFR IN RDB$RELATION_FIELDS WITH 
             RFR.RDB$RELATION_NAME = R.RDB$RELATION_NAME 
 
-            field = (FLD) DDL_alloc(FLD_LEN);
+            field = (DUDLEY_FLD) DDL_alloc(FLD_LEN);
             field->fld_name = get_symbol(SYM_field, RFR.RDB$FIELD_NAME, (DUDLEY_CTX) field);
             HSH_insert(field->fld_name);
             field->fld_relation = relation;
@@ -3226,7 +3226,7 @@
  *	Invent a descriptor based on expression tree.
  *
  **************************************/
-	FLD field;
+	DUDLEY_FLD field;
 	DSC desc1, desc2;
 	CON constant;
 	FUNC function;
@@ -3369,7 +3369,7 @@
 		return;
 
 	case nod_field:
-		field = (FLD) node->nod_arg[s_fld_field];
+		field = (DUDLEY_FLD) node->nod_arg[s_fld_field];
 		if (!field->fld_dtype)
 			get_field_desc(field);
 		desc->dsc_dtype = field->fld_dtype;
@@ -3509,7 +3509,7 @@
 }
 
 
-static void modify_field( FLD field)
+static void modify_field( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -3588,7 +3588,7 @@
 }
 
 
-static void modify_global_field( FLD field)
+static void modify_global_field( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -4174,7 +4174,7 @@
 }
 
 
-static void store_range( FLD field)
+static void store_range( DUDLEY_FLD field)
 {
 /**************************************
  *

Index: expand.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/dudley/expand.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -U3 -r1.7 -r1.8
--- expand.cpp	17 Nov 2002 00:01:39 -0000	1.7
+++ expand.cpp	30 Nov 2002 17:37:46 -0000	1.8
@@ -35,16 +35,16 @@
 
 static void expand_action(ACT);
 static void expand_error(USHORT, TEXT *, TEXT *, TEXT *, TEXT *, TEXT *);
-static void expand_field(FLD);
-static void expand_global_field(FLD);
+static void expand_field(DUDLEY_FLD);
+static void expand_global_field(DUDLEY_FLD);
 static void expand_index(ACT);
 static void expand_relation(DUDLEY_REL);
 static void expand_trigger(DUDLEY_TRG);
-static FLD field_context(DUDLEY_NOD, LLS, DUDLEY_CTX *);
-static FLD field_search(DUDLEY_NOD, LLS, DUDLEY_CTX *);
+static DUDLEY_FLD field_context(DUDLEY_NOD, LLS, DUDLEY_CTX *);
+static DUDLEY_FLD field_search(DUDLEY_NOD, LLS, DUDLEY_CTX *);
 static DUDLEY_CTX lookup_context(SYM, LLS);
-static FLD lookup_field(FLD);
-static FLD lookup_global_field(FLD);
+static DUDLEY_FLD lookup_field(DUDLEY_FLD);
+static DUDLEY_FLD lookup_global_field(DUDLEY_FLD);
 static DUDLEY_REL lookup_relation(DUDLEY_REL);
 static DUDLEY_TRG lookup_trigger(DUDLEY_TRG);
 static DUDLEY_CTX make_context(TEXT *, DUDLEY_REL, USHORT);
@@ -109,12 +109,12 @@
 
 	switch (action->act_type) {
 	case act_a_field:
-		expand_field((FLD) action->act_object);
+		expand_field((DUDLEY_FLD) action->act_object);
 		break;
 
 	case act_m_field:
 	case act_d_field:
-		lookup_field((FLD) action->act_object);
+		lookup_field((DUDLEY_FLD) action->act_object);
 		break;
 
 	case act_d_filter:
@@ -130,16 +130,16 @@
 */ break;
 
 	case act_a_gfield:
-		expand_global_field((FLD) action->act_object);
+		expand_global_field((DUDLEY_FLD) action->act_object);
 		break;
 
 	case act_m_gfield:
-		lookup_global_field((FLD) action->act_object);
-		expand_global_field((FLD) action->act_object);
+		lookup_global_field((DUDLEY_FLD) action->act_object);
+		expand_global_field((DUDLEY_FLD) action->act_object);
 		break;
 
 	case act_d_gfield:
-		lookup_global_field((FLD) action->act_object);
+		lookup_global_field((DUDLEY_FLD) action->act_object);
 		break;
 
 	case act_a_index:
@@ -221,7 +221,7 @@
 }
 
 
-static void expand_field( FLD field)
+static void expand_field( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -245,11 +245,11 @@
 	}
 
 	if (!field->fld_source_field)
-		field->fld_source_field = (FLD) field->fld_source->sym_object;
+		field->fld_source_field = (DUDLEY_FLD) field->fld_source->sym_object;
 }
 
 
-static void expand_global_field( FLD field)
+static void expand_global_field( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -394,7 +394,7 @@
 }
 
 
-static FLD field_context( DUDLEY_NOD node, LLS contexts, DUDLEY_CTX * output_context)
+static DUDLEY_FLD field_context( DUDLEY_NOD node, LLS contexts, DUDLEY_CTX * output_context)
 {
 /**************************************
  *
@@ -412,7 +412,7 @@
  *
  *
  **************************************/
-	FLD field;
+	DUDLEY_FLD field;
 	DUDLEY_CTX context;
 	SYM name, symbol;
 
@@ -439,13 +439,13 @@
 	for (; symbol; symbol = symbol->sym_homonym) {
 		if (context->ctx_relation) {
 			if (symbol->sym_type == SYM_field) {
-				field = (FLD) symbol->sym_object;
+				field = (DUDLEY_FLD) symbol->sym_object;
 				if (field->fld_relation == context->ctx_relation)
 					return field;
 			}
 		}
 		else if (symbol->sym_type == SYM_global)
-			return (FLD) symbol->sym_object;
+			return (DUDLEY_FLD) symbol->sym_object;
 	}
 
 	if (context->ctx_relation)
@@ -460,7 +460,7 @@
 }
 
 
-static FLD field_search( DUDLEY_NOD node, LLS contexts, DUDLEY_CTX * output_context)
+static DUDLEY_FLD field_search( DUDLEY_NOD node, LLS contexts, DUDLEY_CTX * output_context)
 {
 /**************************************
  *
@@ -476,7 +476,7 @@
  *	work backward.
  * 
  **************************************/
-	FLD field;
+	DUDLEY_FLD field;
 	DUDLEY_CTX context, old_context;
 	SYM name, symbol, ctx_name;
 
@@ -501,7 +501,7 @@
 				*output_context = context;
 				for (symbol = name; symbol; symbol = symbol->sym_homonym) {
 					if (symbol->sym_type == SYM_field) {
-						field = (FLD) symbol->sym_object;
+						field = (DUDLEY_FLD) symbol->sym_object;
 						if (field->fld_relation == context->ctx_relation)
 							return field;
 					}
@@ -555,7 +555,7 @@
 }
 
 
-static FLD lookup_field( FLD old_field)
+static DUDLEY_FLD lookup_field( DUDLEY_FLD old_field)
 {
 /**************************************
  *
@@ -574,7 +574,7 @@
  **************************************/
 	DUDLEY_REL relation;
 	SYM symbol, name;
-	FLD field;
+	DUDLEY_FLD field;
 
 	if (old_field->fld_source)
 		lookup_global_field(old_field);
@@ -586,7 +586,7 @@
 
 	for (; symbol; symbol = symbol->sym_homonym)
 		if (symbol->sym_type == SYM_field) {
-			field = (FLD) symbol->sym_object;
+			field = (DUDLEY_FLD) symbol->sym_object;
 			if (field->fld_relation == relation)
 				return field;
 		}
@@ -599,7 +599,7 @@
 }
 
 
-static FLD lookup_global_field( FLD field)
+static DUDLEY_FLD lookup_global_field( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -617,7 +617,7 @@
 	name = (field->fld_source) ? field->fld_source : field->fld_name;
 	if (symbol =
 		HSH_typed_lookup(name->sym_string, name->sym_length,
-						 SYM_global)) return (FLD) symbol->sym_object;
+						 SYM_global)) return (DUDLEY_FLD) symbol->sym_object;
 
 	expand_error(103, name->sym_string, 0, 0, 0, 0);	/* msg 103: global field %s isn't defined */
 
@@ -727,7 +727,7 @@
  **************************************/
 	DUDLEY_NOD *arg, *end, field, sub;
 	SYM symbol, name;
-	FLD fld;
+	DUDLEY_FLD fld;
 	DUDLEY_CTX context, old_context;
 	TEXT name_string[65], *p, *q;
 

Index: generate.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/dudley/generate.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -U3 -r1.5 -r1.6
--- generate.cpp	17 Nov 2002 00:01:39 -0000	1.5
+++ generate.cpp	30 Nov 2002 17:37:46 -0000	1.6
@@ -121,7 +121,7 @@
  *	Generate blr.
  *
  **************************************/
-	FLD field;
+	DUDLEY_FLD field;
 	DUDLEY_REL relation;
 	SYM symbol;
 	CON constant;
@@ -147,7 +147,7 @@
 		if (sub = node->nod_arg[s_fld_subs])
 			STUFF(blr_index);
 		STUFF(blr_field);
-		field = (FLD) node->nod_arg[s_fld_field];
+		field = (DUDLEY_FLD) node->nod_arg[s_fld_field];
 		context = (DUDLEY_CTX) node->nod_arg[s_fld_context];
 		STUFF(context->ctx_context_id);
 		symbol = field->fld_name;

Index: parse.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/dudley/parse.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -U3 -r1.11 -r1.12
--- parse.cpp	17 Nov 2002 00:01:39 -0000	1.11
+++ parse.cpp	30 Nov 2002 17:37:46 -0000	1.12
@@ -80,7 +80,7 @@
 
 static BOOLEAN check_filename(SYM, USHORT);
 static SYM copy_symbol(SYM);
-static FLD create_global_field(FLD);
+static DUDLEY_FLD create_global_field(DUDLEY_FLD);
 static FIL define_cache(void);
 static void define_database(enum act_t);
 static void define_field(void);
@@ -112,11 +112,11 @@
 static void get_trigger_attributes(int *, int *, int *);
 static void grant_user_privilege(void);
 static DUDLEY_CTX lookup_context(SYM, LLS);
-static FLD lookup_global_field(FLD);
+static DUDLEY_FLD lookup_global_field(DUDLEY_FLD);
 static ACT make_action(enum act_t, DBB);
-static ACT make_computed_field(FLD);
+static ACT make_computed_field(DUDLEY_FLD);
 static DUDLEY_CTX make_context(TEXT *, DUDLEY_REL);
-static ACT make_global_field(FLD);
+static ACT make_global_field(DUDLEY_FLD);
 static void mod_old_trigger(void);
 static void modify_field(void);
 static void modify_index(void);
@@ -127,13 +127,13 @@
 static void modify_type(void);
 static void modify_view(void);
 static BOOLEAN parse_action(void);
-static void parse_array(FLD);
+static void parse_array(DUDLEY_FLD);
 static TXT parse_description(void);
 static void parse_end(void);
-static FLD parse_field(FLD);
-static void parse_field_clauses(FLD);
-static void parse_field_dtype(FLD);
-static void parse_field_subtype(FLD);
+static DUDLEY_FLD parse_field(DUDLEY_FLD);
+static void parse_field_clauses(DUDLEY_FLD);
+static void parse_field_dtype(DUDLEY_FLD);
+static void parse_field_subtype(DUDLEY_FLD);
 static FUNCARG parse_function_arg(FUNC, USHORT *);
 static SCE parse_identifier(void);
 static OBJ_T parse_object(void);
@@ -144,7 +144,7 @@
 static DUDLEY_NOD set_generator(void);
 static void sort_out_attributes(DUDLEY_TRG, SLONG, SLONG, SLONG);
 static TXT start_text(void);
-static void validate_field(FLD);
+static void validate_field(DUDLEY_FLD);
 
 static LLS local_context;
 
@@ -567,7 +567,7 @@
 }
 
 
-static FLD create_global_field( FLD local_field)
+static DUDLEY_FLD create_global_field( DUDLEY_FLD local_field)
 {
 /**************************************
  *
@@ -585,10 +585,10 @@
  *	block.
  *
  **************************************/
-	FLD global_field;
+	DUDLEY_FLD global_field;
 	SYM old_name, new_name;
 
-	global_field = (FLD) DDL_alloc(FLD_LEN);
+	global_field = (DUDLEY_FLD) DDL_alloc(FLD_LEN);
 	global_field->fld_dtype = local_field->fld_dtype;
 	global_field->fld_length = local_field->fld_length;
 	global_field->fld_scale = local_field->fld_scale;
@@ -829,9 +829,9 @@
  *	Parse a DEFINE FIELD statement.
  *
  **************************************/
-	FLD field;
+	DUDLEY_FLD field;
 
-	field = (FLD) DDL_alloc(FLD_LEN);
+	field = (DUDLEY_FLD) DDL_alloc(FLD_LEN);
 	parse_field(field);
 	field->fld_database = database;
 
@@ -1212,7 +1212,7 @@
  *
  **************************************/
 	DUDLEY_REL relation;
-	FLD field, global;
+	DUDLEY_FLD field, global;
 	SYM symbol;
 	DSC desc;
 	SSHORT position;
@@ -1251,7 +1251,7 @@
 	while (TRUE) {
 		MATCH(KW_ADD);
 		MATCH(KW_FIELD);
-		field = (FLD) DDL_alloc(FLD_LEN);
+		field = (DUDLEY_FLD) DDL_alloc(FLD_LEN);
 		parse_field(field);
 		field->fld_relation = relation;
 		field->fld_database = database;
@@ -1541,7 +1541,7 @@
  *
  **************************************/
 	DUDLEY_REL relation;
-	FLD field, *ptr;
+	DUDLEY_FLD field, *ptr;
 	SYM symbol;
 	SSHORT position;
 	DUDLEY_CTX context, my_context;
@@ -1598,7 +1598,7 @@
 	while (TRUE) {
 		MATCH(KW_ADD);
 		MATCH(KW_FIELD);
-		field = (FLD) DDL_alloc(FLD_LEN);
+		field = (DUDLEY_FLD) DDL_alloc(FLD_LEN);
 		field->fld_flags |= fld_local;
 		field->fld_relation = relation;
 		*ptr = field;
@@ -1732,9 +1732,9 @@
  *	Parse the DROP (DELETE) field statement.
  *
  **************************************/
-	FLD field;
+	DUDLEY_FLD field;
 
-	field = (FLD) DDL_alloc(FLD_LEN);
+	field = (DUDLEY_FLD) DDL_alloc(FLD_LEN);
 	field->fld_name = PARSE_symbol(tok_ident);
 	parse_end();
 
@@ -1755,7 +1755,7 @@
  *
  **************************************/
 	DUDLEY_IDX index;
-	FLD field;
+	DUDLEY_FLD field;
 
 	index = (DUDLEY_IDX) DDL_alloc(IDX_LEN(0));
 	index->idx_name = PARSE_symbol(tok_ident);
@@ -1778,7 +1778,7 @@
  *
  **************************************/
 	DUDLEY_REL relation;
-	FLD field;
+	DUDLEY_FLD field;
 
 	relation = PARSE_relation();
 	parse_end();
@@ -2251,7 +2251,7 @@
 }
 
 
-static FLD lookup_global_field( FLD field)
+static DUDLEY_FLD lookup_global_field( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -2270,7 +2270,7 @@
 
 	if (symbol = HSH_typed_lookup(name->sym_string, name->sym_length,
 								  SYM_global))
-			return (FLD) symbol->sym_object;
+			return (DUDLEY_FLD) symbol->sym_object;
 
 	PARSE_error(230, name->sym_string, 0);	/* msg 230: global field %s isn't defined */
 
@@ -2303,7 +2303,7 @@
 }
 
 
-static ACT make_computed_field( FLD field)
+static ACT make_computed_field( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -2314,7 +2314,7 @@
  * Functional description
  *
  **************************************/
-	FLD computed;
+	DUDLEY_FLD computed;
 	SYM symbol;
 	TEXT s[64];
 	USHORT i, l;
@@ -2372,7 +2372,7 @@
 }
 
 
-static ACT make_global_field( FLD field)
+static ACT make_global_field( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -2459,7 +2459,7 @@
  *
  **************************************/
 	SYM symbol;
-	FLD field;
+	DUDLEY_FLD field;
 
 	if (!local_context)
 		LLS_PUSH(DDL_alloc(CTX_LEN), &local_context);
@@ -2472,7 +2472,7 @@
 
 	if (!symbol)
 		PARSE_error(167, DDL_token.tok_string, 0);	/*msg 167: expected global field name, encountered \"%s\" */
-	field = (FLD) symbol->sym_object;
+	field = (DUDLEY_FLD) symbol->sym_object;
 	LEX_token();
 	field->fld_flags |= fld_modify;
 
@@ -2571,7 +2571,7 @@
  *
  **************************************/
 	DUDLEY_REL relation;
-	FLD field, global;
+	DUDLEY_FLD field, global;
 	TEXT modify_relation;
 
 	relation = PARSE_relation();
@@ -2611,7 +2611,7 @@
 			if (MATCH(KW_ADD)) {
 				MATCH(KW_FIELD);
 				{
-					field = (FLD) DDL_alloc(FLD_LEN);
+					field = (DUDLEY_FLD) DDL_alloc(FLD_LEN);
 					parse_field(field);
 					field->fld_relation = relation;
 					field->fld_database = database;
@@ -2637,7 +2637,7 @@
 			}
 			else if (MATCH(KW_MODIFY)) {
 				MATCH(KW_FIELD);
-				field = (FLD) DDL_alloc(FLD_LEN);
+				field = (DUDLEY_FLD) DDL_alloc(FLD_LEN);
 				field->fld_flags |= (fld_modify | fld_local);
 				parse_field(field);
 				field->fld_relation = relation;
@@ -2667,7 +2667,7 @@
 				}
 				else {
 					MATCH(KW_FIELD);
-					field = (FLD) DDL_alloc(FLD_LEN);
+					field = (DUDLEY_FLD) DDL_alloc(FLD_LEN);
 					field->fld_flags |= fld_local;
 					field->fld_relation = relation;
 					field->fld_database = database;
@@ -2893,7 +2893,7 @@
  *
  **************************************/
 	DUDLEY_REL relation;
-	FLD field, global;
+	DUDLEY_FLD field, global;
 	USHORT view_modify;
 
 	relation = PARSE_relation();
@@ -2924,7 +2924,7 @@
 		while (TRUE) {
 			if (MATCH(KW_MODIFY)) {
 				MATCH(KW_FIELD);
-				field = (FLD) DDL_alloc(FLD_LEN);
+				field = (DUDLEY_FLD) DDL_alloc(FLD_LEN);
 				field->fld_flags |= (fld_modify | fld_local);
 				parse_field(field);
 				field->fld_relation = relation;
@@ -2954,7 +2954,7 @@
 				}
 				else {
 					MATCH(KW_FIELD);
-					field = (FLD) DDL_alloc(FLD_LEN);
+					field = (DUDLEY_FLD) DDL_alloc(FLD_LEN);
 					field->fld_flags |= fld_local;
 					field->fld_relation = relation;
 					field->fld_database = database;
@@ -3163,7 +3163,7 @@
 }
 
 
-static void parse_array( FLD field)
+static void parse_array( DUDLEY_FLD field)
 {
 /************************************** 
  *
@@ -3267,7 +3267,7 @@
 }
 
 
-static FLD parse_field( FLD field)
+static DUDLEY_FLD parse_field( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -3309,7 +3309,7 @@
 
 
 
-static void parse_field_clauses( FLD field)
+static void parse_field_clauses( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -3453,7 +3453,7 @@
 }
 
 
-static void parse_field_dtype( FLD field)
+static void parse_field_dtype( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -3548,7 +3548,7 @@
 }
 
 
-static void parse_field_subtype( FLD field)
+static void parse_field_subtype( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -3593,10 +3593,10 @@
  *
  **************************************/
 	FUNCARG func_arg;
-	FLD field;
+	DUDLEY_FLD field;
 
 	func_arg = (FUNCARG) DDL_alloc(FUNCARG_LEN);
-	field = (FLD) DDL_alloc(FLD_LEN);
+	field = (DUDLEY_FLD) DDL_alloc(FLD_LEN);
 	parse_field_dtype(field);
 	func_arg->funcarg_dtype = field->fld_dtype;
 	func_arg->funcarg_scale = field->fld_scale;
@@ -4185,7 +4185,7 @@
 }
 
 
-static void validate_field( FLD field)
+static void validate_field( DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -4198,7 +4198,7 @@
  *	together.
  *
  **************************************/
-	FLD global;
+	DUDLEY_FLD global;
 	TEXT option[128];
 
 	*option = 0;

Index: trn.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/dudley/trn.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -U3 -r1.5 -r1.6
--- trn.cpp	17 Nov 2002 00:01:39 -0000	1.5
+++ trn.cpp	30 Nov 2002 17:37:46 -0000	1.6
@@ -34,24 +34,24 @@
 #include "../jrd/gds_proto.h"
 #include "../jrd/gdsassert.h"
 
-static void add_dimensions(STR, FLD);
-static void add_field(STR, FLD, DUDLEY_REL);
+static void add_dimensions(STR, DUDLEY_FLD);
+static void add_field(STR, DUDLEY_FLD, DUDLEY_REL);
 static void add_files(STR, FIL, DBB);
 static void add_filter(STR, FILTER);
 static void add_function(STR, FUNC);
 static void add_function_arg(STR, FUNCARG);
 static void add_generator(STR, SYM);
-static void add_global_field(STR, FLD);
+static void add_global_field(STR, DUDLEY_FLD);
 static void add_index(STR, DUDLEY_IDX);
 static void add_relation(STR, DUDLEY_REL);
 static void add_security_class(STR, SCL);
 static void add_trigger(STR, DUDLEY_TRG);
 static void add_trigger_msg(STR, TRGMSG);
 static void add_view(STR, DUDLEY_REL);
-static void drop_field(STR, FLD);
+static void drop_field(STR, DUDLEY_FLD);
 static void drop_filter(STR, FILTER);
 static void drop_function(STR, FUNC);
-static void drop_global_field(STR, FLD);
+static void drop_global_field(STR, DUDLEY_FLD);
 static void drop_index(STR, DUDLEY_IDX);
 static void drop_relation(STR, DUDLEY_REL);
 static void drop_security_class(STR, SCL);
@@ -62,8 +62,8 @@
 static int gen_dyn_cxx(int *, int, SCHAR *);
 static int gen_dyn_pas(int *, int, SCHAR *);
 static void modify_database(STR, DBB);
-static void modify_field(STR, FLD, DUDLEY_REL);
-static void modify_global_field(STR, FLD);
+static void modify_field(STR, DUDLEY_FLD, DUDLEY_REL);
+static void modify_global_field(STR, DUDLEY_FLD);
 static void modify_index(STR, DUDLEY_IDX);
 static void modify_relation(STR, DUDLEY_REL);
 static void modify_trigger(STR, DUDLEY_TRG);
@@ -153,15 +153,15 @@
 				break;
 
 			case act_a_field:
-				add_field(dyn, (FLD) action->act_object, NULL);
+				add_field(dyn, (DUDLEY_FLD) action->act_object, NULL);
 				break;
 
 			case act_m_field:
-				modify_field(dyn, (FLD) action->act_object, NULL);
+				modify_field(dyn, (DUDLEY_FLD) action->act_object, NULL);
 				break;
 
 			case act_d_field:
-				drop_field(dyn, (FLD) action->act_object);
+				drop_field(dyn, (DUDLEY_FLD) action->act_object);
 				break;
 
 			case act_a_filter:
@@ -189,15 +189,15 @@
 				break;
 
 			case act_a_gfield:
-				add_global_field(dyn, (FLD) action->act_object);
+				add_global_field(dyn, (DUDLEY_FLD) action->act_object);
 				break;
 
 			case act_m_gfield:
-				modify_global_field(dyn, (FLD) action->act_object);
+				modify_global_field(dyn, (DUDLEY_FLD) action->act_object);
 				break;
 
 			case act_d_gfield:
-				drop_global_field(dyn, (FLD) action->act_object);
+				drop_global_field(dyn, (DUDLEY_FLD) action->act_object);
 				break;
 
 			case act_a_index:
@@ -351,7 +351,7 @@
 }
 
 
-static void add_dimensions( STR dyn, FLD field)
+static void add_dimensions( STR dyn, DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -383,7 +383,7 @@
 }
 
 
-static void add_field( STR dyn, FLD field, DUDLEY_REL view)
+static void add_field( STR dyn, DUDLEY_FLD field, DUDLEY_REL view)
 {
 /**************************************
  *
@@ -398,7 +398,7 @@
  **************************************/
 	SYM name, symbol;
 	DUDLEY_REL relation;
-	FLD source_field;
+	DUDLEY_FLD source_field;
 	int n;
 
 	name = field->fld_name;
@@ -594,7 +594,7 @@
 }
 
 
-static void add_global_field( STR dyn, FLD field)
+static void add_global_field( STR dyn, DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -802,7 +802,7 @@
  *	Generate dynamic DDL to create a view.
  *
  **************************************/
-	FLD field;
+	DUDLEY_FLD field;
 	DUDLEY_CTX context;
 	DUDLEY_NOD *arg, contexts;
 	SSHORT i;
@@ -881,7 +881,7 @@
 }
 
 
-static void drop_field( STR dyn, FLD field)
+static void drop_field( STR dyn, DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -950,7 +950,7 @@
 }
 
 
-static void drop_global_field( STR dyn, FLD field)
+static void drop_global_field( STR dyn, DUDLEY_FLD field)
 {
 /**************************************
  *
@@ -1212,7 +1212,7 @@
 }
 
 
-static void modify_field( STR dyn, FLD field, DUDLEY_REL view)
+static void modify_field( STR dyn, DUDLEY_FLD field, DUDLEY_REL view)
 {
 /**************************************
  *
@@ -1227,7 +1227,7 @@
  **************************************/
 	SYM name, symbol;
 	DUDLEY_REL relation;
-	FLD source_field;
+	DUDLEY_FLD source_field;
 	int n;
 
 	name = field->fld_name;
@@ -1292,7 +1292,7 @@
 }
 
 
-static void modify_global_field( STR dyn, FLD field)
+static void modify_global_field( STR dyn, DUDLEY_FLD field)
 {
 /**************************************
  *