From: Adriano d. S. F. <asf...@us...> - 2008-12-31 20:22:43
|
Build Version : T2.5.0.22089 Firebird 2.5 Alpha 1 (writeBuildNum.sh,v 1.22250 2008/12/31 20:22:08 asfernandes ) Update of /cvsroot/firebird/firebird2/src/gpre In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16521/src/gpre Modified Files: gpre_meta.epp int_cxx.cpp par.cpp pas.cpp pat.cpp rmc.cpp sqe.cpp sql.cpp Log Message: Misc Index: gpre_meta.epp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/gpre/gpre_meta.epp,v retrieving revision 1.65 retrieving revision 1.66 diff -b -U3 -r1.65 -r1.66 --- gpre_meta.epp 31 Dec 2008 09:35:52 -0000 1.65 +++ gpre_meta.epp 31 Dec 2008 20:22:05 -0000 1.66 @@ -1075,12 +1075,14 @@ gpre_prc* procedure = NULL; for (gpre_sym* symbol = HSH_lookup(name); symbol; symbol = symbol->sym_homonym) + { if (symbol->sym_type == SYM_procedure && (procedure = (gpre_prc*) symbol->sym_object) && procedure->prc_database == database && (!owner[0] || (procedure->prc_owner && !strcmp(owner, procedure->prc_owner->sym_string)))) { break; } + } if (!procedure) return NULL; @@ -1182,12 +1184,14 @@ const MetIdentifier name(string), owner(owner_name); for (gpre_sym* symbol = HSH_lookup(name); symbol; symbol = symbol->sym_homonym) + { if (symbol->sym_type == SYM_relation && (relation = (gpre_rel*) symbol->sym_object) && relation->rel_database == database && (!owner[0] || (relation->rel_owner && !strcmp(owner, relation->rel_owner->sym_string)))) { return relation; } + } return NULL; } @@ -1375,11 +1379,13 @@ gpre_sym* symbol; for (symbol = HSH_lookup(name); symbol; symbol = symbol->sym_homonym) + { if (symbol->sym_type == SYM_index && (index = (IND) symbol->sym_object) && index->ind_relation->rel_database == database) { return index; } + } if (gpreGlob.sw_language == lang_internal) return NULL; Index: int_cxx.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/gpre/int_cxx.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -b -U3 -r1.45 -r1.46 --- int_cxx.cpp 31 Dec 2008 09:35:52 -0000 1.45 +++ int_cxx.cpp 31 Dec 2008 20:22:05 -0000 1.46 @@ -650,7 +650,7 @@ const gpre_fld* field = reference->ref_field; const gpre_sym* symbol = field->fld_symbol; const TEXT* name = symbol->sym_string; - const char* fmtstr = 0; + const char* fmtstr = NULL; switch (field->fld_dtype) { Index: par.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/gpre/par.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -b -U3 -r1.76 -r1.77 --- par.cpp 31 Dec 2008 09:35:52 -0000 1.76 +++ par.cpp 31 Dec 2008 20:22:05 -0000 1.77 @@ -1020,7 +1020,7 @@ int length = string - buffer; fb_assert(length < sizeof(buffer)); - string = (SCHAR *) MSC_alloc(length + 1); + string = (SCHAR*) MSC_alloc(length + 1); if (length) memcpy(string, buffer, length); // MSC_alloc filled the string with zeroes. Index: pas.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/gpre/pas.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -b -U3 -r1.61 -r1.62 --- pas.cpp 31 Dec 2008 09:35:52 -0000 1.61 +++ pas.cpp 31 Dec 2008 20:22:05 -0000 1.62 @@ -1965,8 +1965,11 @@ printa(column, "GDS__DETACH_DATABASE (%s, %s);", status_vector(action), db->dbb_name->sym_string); } + if (!db) - for (db = gpreGlob.isc_databases; db; db = db->dbb_next) { + { + for (db = gpreGlob.isc_databases; db; db = db->dbb_next) + { if ((action->act_error || (action->act_flags & ACT_sql)) && (db != gpreGlob.isc_databases)) { @@ -1977,6 +1980,7 @@ printa(column + INDENT, "GDS__DETACH_DATABASE (%s, %s);", status_vector(action), db->dbb_name->sym_string); } + } set_sqlcode(action, column); } @@ -2789,6 +2793,7 @@ slc::slc_repeat *tail, *end; for (tail = slice->slc_rpt, end = tail + slice->slc_dimensions; tail < end; ++tail) + { if (tail->slc_upper != tail->slc_lower) { const ref* lower = (const ref*) tail->slc_lower->nod_arg[0]; const ref* upper = (const ref*) tail->slc_upper->nod_arg[0]; @@ -2797,6 +2802,7 @@ else fprintf(gpreGlob.out_file, " * ( %s + 1)", upper->ref_value); } + } fprintf(gpreGlob.out_file, ";"); Index: pat.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/gpre/pat.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -b -U3 -r1.34 -r1.35 --- pat.cpp 29 Dec 2008 10:26:36 -0000 1.34 +++ pat.cpp 31 Dec 2008 20:22:05 -0000 1.35 @@ -177,10 +177,12 @@ bool handle_flag = false, long_flag = false; const ops* oper_iter; for (oper_iter = operators; oper_iter->ops_type != NL; oper_iter++) + { if (oper_iter->ops_string[0] == pattern[0] && oper_iter->ops_string[1] == pattern[1]) { break; } + } pattern += 2; switch (oper_iter->ops_type) Index: rmc.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/gpre/rmc.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -b -U3 -r1.16 -r1.17 --- rmc.cpp 31 Dec 2008 09:35:52 -0000 1.16 +++ rmc.cpp 31 Dec 2008 20:22:05 -0000 1.17 @@ -1591,8 +1591,10 @@ // point, the handles are the user's responsibility if (action->act_request->req_flags & (REQ_sql_blob_open | REQ_sql_blob_create)) + { printa(names[COLUMN], false, "MOVE 0 TO %s%d", names[isc_a_pos], action->act_request->req_blobs->blb_ident); + } } Index: sqe.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/gpre/sqe.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -b -U3 -r1.60 -r1.61 --- sqe.cpp 31 Dec 2008 09:35:52 -0000 1.60 +++ sqe.cpp 31 Dec 2008 20:22:05 -0000 1.61 @@ -2385,7 +2385,7 @@ // lookup the contexts for the aliases - gpre_nod* index_list = 0; + gpre_nod* index_list = NULL; gpre_ctx* context = par_alias_list(request, alias_list); // parse the access type @@ -2526,7 +2526,7 @@ // ORDER clause. In this case, post only the complete expression, and not // the sub-expressions. - map* tmp_map = 0; + map* tmp_map = NULL; for (const ops* op = stat_ops; op->rel_kw != KW_none; op++) { MSC_match(KW_ALL); Index: sql.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/gpre/sql.cpp,v retrieving revision 1.79 retrieving revision 1.80 diff -b -U3 -r1.79 -r1.80 --- sql.cpp 31 Dec 2008 09:35:52 -0000 1.79 +++ sql.cpp 31 Dec 2008 20:22:05 -0000 1.80 @@ -143,8 +143,8 @@ static inline bool end_of_command() { return - gpreGlob.sw_language != lang_cobol && gpreGlob.token_global.tok_keyword == KW_SEMI_COLON || - gpreGlob.sw_language == lang_cobol && gpreGlob.token_global.tok_keyword == KW_END_EXEC; + (gpreGlob.sw_language != lang_cobol && gpreGlob.token_global.tok_keyword == KW_SEMI_COLON) || + (gpreGlob.sw_language == lang_cobol && gpreGlob.token_global.tok_keyword == KW_END_EXEC); } static inline bool range_short_integer(const SLONG x) |