Menu
▾
▴
[Firebird-checkins] CVS: firebird2/src/dudley ddl.cpp,1.28,1.29 ddl.h,1.19,1.20 ddl_proto.h,1.9,1.10 exe.epp,1.41,1.42 expand.cpp,1.19,1.20 expr.cpp,1.17,1.18 extract.epp,1.27,1.28 parse.cpp,1.34,1.35 parse_proto.h,1.7,1.8
|
From: Claudio V. C. <ro...@us...> - 2004-02-02 11:04:43
|
Build Version : T2.0.0.6424 Firebird 2.0 UNSTABLE (writeBuildNum.sh,v 1.6426 2004/02/02 11:01:10 robocop Exp ) Update of /cvsroot/firebird/firebird2/src/dudley In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10856/src/dudley Modified Files: ddl.cpp ddl.h ddl_proto.h exe.epp expand.cpp expr.cpp extract.epp parse.cpp parse_proto.h Log Message: Cleanup Index: ddl.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/dudley/ddl.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -b -U3 -r1.28 -r1.29 --- ddl.cpp 31 Dec 2003 05:35:40 -0000 1.28 +++ ddl.cpp 2 Feb 2004 11:01:08 -0000 1.29 @@ -54,7 +54,7 @@ const TEXT* DDL_prompt; -static LLS free_stack; +static dudley_lls* free_stack; static TEXT DDL_message[256]; static const char* const FOPEN_INPUT_TYPE = "r"; @@ -614,7 +614,7 @@ } -DUDLEY_NOD DDL_pop(LLS * pointer) +DUDLEY_NOD DDL_pop(dudley_lls** pointer) { /************************************** * @@ -626,7 +626,7 @@ * Pop an item off a linked list stack. Free the stack node. * **************************************/ - LLS stack; + dudley_lls* stack; DUDLEY_NOD node; stack = *pointer; @@ -639,7 +639,7 @@ } -void DDL_push( DUDLEY_NOD object, LLS * pointer) +void DDL_push( DUDLEY_NOD object, dudley_lls** pointer) { /************************************** * @@ -651,14 +651,14 @@ * Push an arbitrary object onto a linked list stack. * **************************************/ - LLS stack; + dudley_lls* stack; if (free_stack) { stack = free_stack; free_stack = stack->lls_next; } else - stack = (LLS) DDL_alloc(sizeof(lls)); + stack = (dudley_lls*) DDL_alloc(sizeof(dudley_lls)); stack->lls_object = object; stack->lls_next = *pointer; @@ -722,3 +722,4 @@ ib_printf("%s\n", reprompt); } } + Index: ddl.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/dudley/ddl.h,v retrieving revision 1.19 retrieving revision 1.20 diff -b -U3 -r1.19 -r1.20 --- ddl.h 29 Oct 2003 10:53:05 -0000 1.19 +++ ddl.h 2 Feb 2004 11:01:08 -0000 1.20 @@ -302,10 +302,10 @@ /* Linked list stack stuff */ -typedef struct lls { - struct dudley_nod *lls_object; /* object on stack */ - lls* lls_next; /* next item on stack */ -} *LLS; +struct dudley_lls { + struct dudley_nod *lls_object; // object on stack + dudley_lls* lls_next; // next item on stack +}; /* General Syntax node, produced by parser */ Index: ddl_proto.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/dudley/ddl_proto.h,v retrieving revision 1.9 retrieving revision 1.10 diff -b -U3 -r1.9 -r1.10 --- ddl_proto.h 29 Oct 2003 10:53:05 -0000 1.9 +++ ddl_proto.h 2 Feb 2004 11:01:08 -0000 1.10 @@ -36,16 +36,16 @@ const TEXT*, const TEXT*); void DDL_msg_put(USHORT, const TEXT*, const TEXT*, const TEXT*, const TEXT*, const TEXT*); -DUDLEY_NOD DDL_pop(LLS*); -void DDL_push(DUDLEY_NOD, LLS*); +DUDLEY_NOD DDL_pop(dudley_lls**); +void DDL_push(DUDLEY_NOD, dudley_lls**); bool DDL_yes_no(USHORT); -inline void LLS_PUSH(DUDLEY_NOD object, LLS* stack) +inline void LLS_PUSH(DUDLEY_NOD object, dudley_lls** stack) { DDL_push(object, stack); } -inline DUDLEY_NOD LLS_POP(LLS* stack) +inline DUDLEY_NOD LLS_POP(dudley_lls** stack) { return DDL_pop(stack); } Index: exe.epp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/dudley/exe.epp,v retrieving revision 1.41 retrieving revision 1.42 diff -b -U3 -r1.41 -r1.42 --- exe.epp 6 Jan 2004 10:33:09 -0000 1.41 +++ exe.epp 2 Feb 2004 11:01:08 -0000 1.42 @@ -117,7 +117,7 @@ static int string_length(SCHAR); static void wal_info(UCHAR *, SLONG *, SCHAR *, SLONG *); -static LLS files_to_delete = NULL; +static dudley_lls* files_to_delete = NULL; static const TEXT alloc_info[] = { isc_info_allocation, isc_info_end }; #define MOVE_SYMBOL(symbol, field) move_symbol (symbol, field, sizeof (field) - 1) @@ -2491,9 +2491,9 @@ * **************************************/ SYM string; - LLS files, first_file; - files = first_file = NULL; + dudley_lls* files = NULL; + dudley_lls* first_file = NULL; FOR FIL IN RDB$FILES WITH FIL.RDB$SHADOW_NUMBER EQ shadow_number Index: expand.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/dudley/expand.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -b -U3 -r1.19 -r1.20 --- expand.cpp 18 Nov 2003 12:34:26 -0000 1.19 +++ expand.cpp 2 Feb 2004 11:01:08 -0000 1.20 @@ -40,19 +40,19 @@ static void expand_index(ACT); static void expand_relation(DUDLEY_REL); static void expand_trigger(DUDLEY_TRG); -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 DUDLEY_FLD field_context(DUDLEY_NOD, dudley_lls*, DUDLEY_CTX *); +static DUDLEY_FLD field_search(DUDLEY_NOD, dudley_lls*, DUDLEY_CTX *); +static DUDLEY_CTX lookup_context(SYM, dudley_lls*); 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); -static DUDLEY_NOD resolve(DUDLEY_NOD, LLS, LLS); -static void resolve_rse(DUDLEY_NOD, LLS *); +static DUDLEY_NOD resolve(DUDLEY_NOD, dudley_lls*, dudley_lls*); +static void resolve_rse(DUDLEY_NOD, dudley_lls**); static SSHORT context_id; -static LLS request_context; +static dudley_lls* request_context; void EXP_actions(void) { @@ -304,12 +304,11 @@ * to fields and contexts. * **************************************/ - LLS contexts, stack; DUDLEY_CTX my_context, context; DUDLEY_NOD rse; context_id = 0; - contexts = NULL; + dudley_lls* contexts = NULL; request_context = NULL; if (!relation->rel_rse) @@ -317,12 +316,13 @@ &request_context); else { rse = relation->rel_rse; - contexts = (LLS) rse->nod_arg[s_rse_contexts]; + contexts = (dudley_lls*) rse->nod_arg[s_rse_contexts]; my_context = lookup_context(NULL, contexts); my_context->ctx_view_rse = TRUE; /* drop view context from context stack & build the request stack */ + dudley_lls* stack; for (stack = NULL; contexts; contexts = contexts->lls_next) LLS_PUSH(contexts->lls_object, &stack); @@ -355,13 +355,14 @@ * to fields and contexts. * **************************************/ - LLS contexts, update; DUDLEY_CTX old, new_ctx; DUDLEY_REL relation; context_id = 2; old = new_ctx = NULL; - request_context = contexts = update = NULL; + request_context = NULL; + dudley_lls* contexts = NULL; + dudley_lls* update = NULL; relation = trigger->trg_relation; @@ -385,7 +386,7 @@ } -static DUDLEY_FLD field_context( DUDLEY_NOD node, LLS contexts, DUDLEY_CTX * output_context) +static DUDLEY_FLD field_context( DUDLEY_NOD node, dudley_lls* contexts, DUDLEY_CTX * output_context) { /************************************** * @@ -451,7 +452,7 @@ } -static DUDLEY_FLD field_search( DUDLEY_NOD node, LLS contexts, DUDLEY_CTX * output_context) +static DUDLEY_FLD field_search( DUDLEY_NOD node, dudley_lls* contexts, DUDLEY_CTX * output_context) { /************************************** * @@ -506,7 +507,7 @@ } -static DUDLEY_CTX lookup_context( SYM symbol, LLS contexts) +static DUDLEY_CTX lookup_context( SYM symbol, dudley_lls* contexts) { /************************************** * @@ -700,7 +701,7 @@ } -static DUDLEY_NOD resolve( DUDLEY_NOD node, LLS right, LLS left) +static DUDLEY_NOD resolve( DUDLEY_NOD node, dudley_lls* right, dudley_lls* left) { /************************************** * @@ -869,7 +870,7 @@ } -static void resolve_rse( DUDLEY_NOD rse, LLS * stack) +static void resolve_rse( DUDLEY_NOD rse, dudley_lls** stack) { /************************************** * @@ -885,7 +886,6 @@ * **************************************/ DUDLEY_NOD sub; - LLS contexts, temp; DUDLEY_CTX context; SYM name, symbol; @@ -894,8 +894,9 @@ if (sub = rse->nod_arg[s_rse_first]) rse->nod_arg[s_rse_first] = resolve(sub, *stack, 0); - contexts = (LLS) rse->nod_arg[s_rse_contexts]; + dudley_lls* contexts = (dudley_lls*) rse->nod_arg[s_rse_contexts]; + dudley_lls* temp; for (temp = NULL; contexts;) LLS_PUSH(LLS_POP(&contexts), &temp); Index: expr.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/dudley/expr.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -b -U3 -r1.17 -r1.18 --- expr.cpp 21 Jan 2004 07:16:13 -0000 1.17 +++ expr.cpp 2 Feb 2004 11:01:08 -0000 1.18 @@ -120,7 +120,7 @@ * **************************************/ DUDLEY_NOD node, boolean, field_name, a_boolean; - LLS stack; + dudley_lls* stack; DUDLEY_CTX context; SYM field_sym; @@ -211,7 +211,7 @@ * Parse a single trigger statement. * **************************************/ - LLS stack; + dudley_lls* stack; DUDLEY_NOD node; int number; @@ -494,7 +494,7 @@ * **************************************/ DUDLEY_NOD field, array; - LLS stack; + dudley_lls* stack; stack = NULL; @@ -582,7 +582,7 @@ **************************************/ SYM symbol; DUDLEY_NOD node; - LLS stack; + dudley_lls* stack; /* Look for symbol of type function. If we don't find it, give up */ @@ -1075,7 +1075,7 @@ * Parse a sort list. * **************************************/ - LLS stack; + dudley_lls* stack; SSHORT direction; direction = 0; Index: extract.epp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/dudley/extract.epp,v retrieving revision 1.27 retrieving revision 1.28 diff -b -U3 -r1.27 -r1.28 --- extract.epp 6 Jan 2004 10:33:09 -0000 1.27 +++ extract.epp 2 Feb 2004 11:01:08 -0000 1.28 @@ -672,14 +672,22 @@ if (F.RDB$SEGMENT_LENGTH) ib_fprintf(output_file, " segment_length %u", (USHORT) F.RDB$SEGMENT_LENGTH); - if (F.RDB$FIELD_SUB_TYPE == 1) + switch (F.RDB$FIELD_SUB_TYPE) + { + case 1: ib_fprintf(output_file, " sub_type text"); - else if (F.RDB$FIELD_SUB_TYPE == 2) + break; + case 2: ib_fprintf(output_file, " sub_type BLR"); - else if (F.RDB$FIELD_SUB_TYPE == 3) + break; + case 3: ib_fprintf(output_file, " sub_type ACL"); - else if (F.RDB$FIELD_SUB_TYPE) + break; + default: + if (F.RDB$FIELD_SUB_TYPE) ib_fprintf(output_file, " sub_type %d", F.RDB$FIELD_SUB_TYPE); + break; + } } else { strcpy(s, F.RDB$FIELD_NAME); Index: parse.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/dudley/parse.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -b -U3 -r1.34 -r1.35 --- parse.cpp 6 Jan 2004 10:33:09 -0000 1.34 +++ parse.cpp 2 Feb 2004 11:01:09 -0000 1.35 @@ -127,7 +127,7 @@ static int get_system_flag(void); static void get_trigger_attributes(int *, int *, int *); static void grant_user_privilege(void); -static DUDLEY_CTX lookup_context(SYM, LLS); +static DUDLEY_CTX lookup_context(SYM, dudley_lls*); static DUDLEY_FLD lookup_global_field(DUDLEY_FLD); static ACT make_action(enum act_t, DBB); static ACT make_computed_field(DUDLEY_FLD); @@ -162,7 +162,7 @@ static TXT start_text(void); static void validate_field(DUDLEY_FLD); -static LLS local_context; +static dudley_lls* local_context; void PARSE_actions(void) @@ -287,7 +287,7 @@ } -DUDLEY_NOD PARSE_make_list(LLS stack) +DUDLEY_NOD PARSE_make_list(dudley_lls* stack) { /************************************** * @@ -301,7 +301,7 @@ * **************************************/ DUDLEY_NOD node; - LLS temp; + dudley_lls* temp; USHORT count; temp = stack; @@ -1036,7 +1036,7 @@ * Define a new index. * **************************************/ - LLS stack; + dudley_lls* stack; SYM index_name, rel_name; TXT description = NULL; SSHORT count; @@ -1553,7 +1553,7 @@ SYM symbol; SSHORT position; DUDLEY_CTX context, my_context; - LLS contexts; + dudley_lls* contexts; ACT rel_actions, action; /* Pick up relation name */ @@ -1578,7 +1578,7 @@ /* add my context to the context stack */ - contexts = (LLS) relation->rel_rse->nod_arg[s_rse_contexts]; + contexts = (dudley_lls*) relation->rel_rse->nod_arg[s_rse_contexts]; my_context = make_context(0, relation); LLS_PUSH((DUDLEY_NOD) my_context, &contexts); relation->rel_rse->nod_arg[s_rse_contexts] = (DUDLEY_NOD) contexts; @@ -2223,7 +2223,7 @@ } -static DUDLEY_CTX lookup_context( SYM symbol, LLS contexts) +static DUDLEY_CTX lookup_context( SYM symbol, dudley_lls* contexts) { /************************************** * @@ -3335,7 +3335,7 @@ * **************************************/ int n; - LLS stack; + dudley_lls* stack; /* Pick up purely optional clauses */ Index: parse_proto.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/dudley/parse_proto.h,v retrieving revision 1.7 retrieving revision 1.8 diff -b -U3 -r1.7 -r1.8 --- parse_proto.h 5 Oct 2003 06:42:03 -0000 1.7 +++ parse_proto.h 2 Feb 2004 11:01:09 -0000 1.8 @@ -30,7 +30,7 @@ void PARSE_error(USHORT, TEXT*, TEXT*); FUNC PARSE_function(int); enum kwwords PARSE_keyword(void); -DUDLEY_NOD PARSE_make_list(LLS); +DUDLEY_NOD PARSE_make_list(dudley_lls*); DUDLEY_NOD PARSE_make_node(enum nod_t, USHORT); bool PARSE_match(enum kwwords); int PARSE_number(void); |