Mercurial > vim

comparison src/eval.c @ 791:98a88a884610 v7.0230

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0230
author vimboss
date Mon, 20 Mar 2006 21:59:49 +0000
parents 1a44839049ae
children 86ce35c9750f
comparison
equal deleted inserted replaced
790:c8680debe1cc 791:98a88a884610
19380 verbose_leave_scroll(); 19380 verbose_leave_scroll();
19381 --no_wait_return; 19381 --no_wait_return;
19382 } 19382 }
19383 } 19383 }
19384 #ifdef FEAT_PROFILE 19384 #ifdef FEAT_PROFILE
19385 if (do_profiling) 19385 if (do_profiling == PROF_YES)
19386 { 19386 {
19387 if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL)) 19387 if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
19388 func_do_profile(fp); 19388 func_do_profile(fp);
19389 if (fp->uf_profiling 19389 if (fp->uf_profiling
19390 || (fc.caller != NULL && &fc.caller->func->uf_profiling)) 19390 || (fc.caller != NULL && &fc.caller->func->uf_profiling))
19415 rettv->v_type = VAR_NUMBER; 19415 rettv->v_type = VAR_NUMBER;
19416 rettv->vval.v_number = -1; 19416 rettv->vval.v_number = -1;
19417 } 19417 }
19418 19418
19419 #ifdef FEAT_PROFILE 19419 #ifdef FEAT_PROFILE
19420 if (fp->uf_profiling || (fc.caller != NULL && &fc.caller->func->uf_profiling)) 19420 if (do_profiling == PROF_YES && (fp->uf_profiling
19421 || (fc.caller != NULL && &fc.caller->func->uf_profiling)))
19421 { 19422 {
19422 profile_end(&fp->uf_tm_start); 19423 profile_end(&fp->uf_tm_start);
19423 profile_sub_wait(&wait_start, &fp->uf_tm_start); 19424 profile_sub_wait(&wait_start, &fp->uf_tm_start);
19424 profile_add(&fp->uf_tm_total, &fp->uf_tm_start); 19425 profile_add(&fp->uf_tm_total, &fp->uf_tm_start);
19425 profile_self(&fp->uf_tm_self, &fp->uf_tm_start, &fp->uf_tm_children); 19426 profile_self(&fp->uf_tm_self, &fp->uf_tm_start, &fp->uf_tm_children);
19465 vim_free(sourcing_name); 19466 vim_free(sourcing_name);
19466 sourcing_name = save_sourcing_name; 19467 sourcing_name = save_sourcing_name;
19467 sourcing_lnum = save_sourcing_lnum; 19468 sourcing_lnum = save_sourcing_lnum;
19468 current_SID = save_current_SID; 19469 current_SID = save_current_SID;
19469 #ifdef FEAT_PROFILE 19470 #ifdef FEAT_PROFILE
19470 if (do_profiling) 19471 if (do_profiling == PROF_YES)
19471 script_prof_restore(&wait_start); 19472 script_prof_restore(&wait_start);
19472 #endif 19473 #endif
19473 19474
19474 if (p_verbose >= 12 && sourcing_name != NULL) 19475 if (p_verbose >= 12 && sourcing_name != NULL)
19475 { 19476 {
19708 fcp->breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, 19709 fcp->breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name,
19709 sourcing_lnum); 19710 sourcing_lnum);
19710 fcp->dbg_tick = debug_tick; 19711 fcp->dbg_tick = debug_tick;
19711 } 19712 }
19712 #ifdef FEAT_PROFILE 19713 #ifdef FEAT_PROFILE
19713 if (do_profiling) 19714 if (do_profiling == PROF_YES)
19714 func_line_end(cookie); 19715 func_line_end(cookie);
19715 #endif 19716 #endif
19716 19717
19717 gap = &fp->uf_lines; 19718 gap = &fp->uf_lines;
19718 if (((fp->uf_flags & FC_ABORT) && did_emsg && !aborted_in_try()) 19719 if (((fp->uf_flags & FC_ABORT) && did_emsg && !aborted_in_try())
19729 else 19730 else
19730 { 19731 {
19731 retval = vim_strsave(((char_u **)(gap->ga_data))[fcp->linenr++]); 19732 retval = vim_strsave(((char_u **)(gap->ga_data))[fcp->linenr++]);
19732 sourcing_lnum = fcp->linenr; 19733 sourcing_lnum = fcp->linenr;
19733 #ifdef FEAT_PROFILE 19734 #ifdef FEAT_PROFILE
19734 if (do_profiling) 19735 if (do_profiling == PROF_YES)
19735 func_line_start(cookie); 19736 func_line_start(cookie);
19736 #endif 19737 #endif
19737 } 19738 }
19738 } 19739 }
19739 19740