vim: src/ex_eval.c comparison

comparison src/ex_eval.c @ 79:e918d3e340a4

updated for version 7.0032

author	vimboss
date	Thu, 06 Jan 2005 23:24:37 +0000
parents	388f285bda1b
children	f6e567606d47

comparison

equal deleted inserted replaced

-:b00be47310ed
+:e918d3e340a4
 #if defined(FEAT_EVAL) || defined(PROTO)
 static void	free_msglist __ARGS((struct msglist *l));
 static int	throw_exception __ARGS((void *, int, char_u *));
 static char_u	*get_end_emsg __ARGS((struct condstack *cstack));
-static void	rewind_conditionals __ARGS((struct condstack *,
-							    int, int, int *));
 /*
 * Exception handling terms:
 *
 *	:try		":try" command		\
 ex_endif(eap)
 exarg_T	*eap;
 {
 did_endif = TRUE;
 if (eap->cstack->cs_idx < 0
-	    || (eap->cstack->cs_flags[eap->cstack->cs_idx] &
+	    || (eap->cstack->cs_flags[eap->cstack->cs_idx]
-		(CSF_WHILE | CSF_FOR | CSF_TRY)))
+					   & (CSF_WHILE | CSF_FOR | CSF_TRY)))
 	eap->errmsg = (char_u *)N_("E580: :endif without :if");
 else
 {
 	/*
 	 * When debugging or a breakpoint was encountered, display the debug
 	     */
 	    if ((cstack->cs_lflags & CSL_HAD_LOOP) != 0)
 	    {
 		/* Jumping here from a ":continue" or ":endfor": use the
 		 * previously evaluated list. */
-		fi = cstack->cs_fors[cstack->cs_idx];
+		fi = cstack->cs_forinfo[cstack->cs_idx];
 		error = FALSE;
 	    }
 	    else
 	    {
 		/* Evaluate the argument and get the info in a structure. */
 		fi = eval_for_line(eap->arg, &error, &eap->nextcmd, skip);
-		cstack->cs_fors[cstack->cs_idx] = fi;
+		cstack->cs_forinfo[cstack->cs_idx] = fi;
 	    }
 	    /* use the element at the start of the list and advance */
 	    if (!error && fi != NULL && !skip)
 		result = next_for_item(fi, eap->arg);
 		result = FALSE;
 	    if (!result)
 	    {
 		free_for_info(fi);
-		cstack->cs_fors[cstack->cs_idx] = NULL;
+		cstack->cs_forinfo[cstack->cs_idx] = NULL;
 	    }
 	}
 	/*
 	 * If this cstack entry was just initialised and is active, set the
 	 * next).  Therefor, inactivate all conditionals except the ":while"
 	 * itself (if reached). */
 	idx = cleanup_conditionals(cstack, CSF_WHILE | CSF_FOR, FALSE);
 	if ((cstack->cs_flags[idx] & (CSF_WHILE | CSF_FOR)))
 	{
-	    if (cstack->cs_idx > idx)
+	    rewind_conditionals(cstack, idx, CSF_TRY, &cstack->cs_trylevel);
-		rewind_conditionals(cstack, idx, CSF_TRY, &cstack->cs_trylevel);
 	    /*
 	     * Set CSL_HAD_CONT, so do_cmdline() will jump back to the
 	     * matching ":while".
 	     */
 	    /* Give up for a ":catch" after ":finally" and ignore it.
 	     * Just parse. */
 	    eap->errmsg = (char_u *)N_("E604: :catch after :finally");
 	    give_up = TRUE;
 	}
-	else if (cstack->cs_idx > idx)
+	else
 	    rewind_conditionals(cstack, idx, CSF_WHILE | CSF_FOR,
 						       &cstack->cs_looplevel);
 }
 if (ends_excmd(*eap->arg))	/* no argument, catch all errors */
 	{
 	    /* Give up for a multiple ":finally" and ignore it. */
 	    eap->errmsg = (char_u *)N_("E607: multiple :finally");
 	    return;
 	}
-	if (cstack->cs_idx > idx)
+	rewind_conditionals(cstack, idx, CSF_WHILE | CSF_FOR,
-	    rewind_conditionals(cstack, idx, CSF_WHILE | CSF_FOR,
 						       &cstack->cs_looplevel);
 	/*
 	 * Don't do something when the corresponding try block never got active
 	 * (because of an inactive surrounding conditional or after an error or
 		 * discarded if the finally clause is left by a ":continue",
 		 * ":break", ":return", ":finish", error, interrupt, or another
 		 * exception.  When emsg() is called for a missing ":endif" or
 		 * a missing ":endwhile"/":endfor" detected here, the
 		 * exception will be discarded. */
-		if (did_throw && cstack->cs_exception[cstack->cs_idx] !=
+		if (did_throw && cstack->cs_exception[cstack->cs_idx]
-							    current_exception)
+							 != current_exception)
 		    EMSG(_(e_internal));
 	    }
 	    /*
 	     * Set CSL_HAD_FINA, so do_cmdline() will reset did_emsg,
 /*
 * Make conditionals inactive and discard what's pending in finally clauses
 * until the conditional type searched for or a try conditional not in its
-* finally clause is reached.  If this is in an active catch clause, finish the
+* finally clause is reached.  If this is in an active catch clause, finish
-* caught exception.  Return the cstack index where the search stopped.
+* the caught exception.
+* Return the cstack index where the search stopped.
 * Values used for "searched_cond" are (CSF_WHILE | CSF_FOR) or CSF_TRY or 0,
 * the latter meaning the innermost try conditional not in its finally clause.
 * "inclusive" tells whether the conditional searched for should be made
 * inactive itself (a try conditional not in its finally claused possibly find
 * before is always made inactive).  If "inclusive" is TRUE and
 /*
 * Rewind conditionals until index "idx" is reached.  "cond_type" and
 * "cond_level" specify a conditional type and the address of a level variable
 * which is to be decremented with each skipped conditional of the specified
 * type.
-*/
+* Also free "for info" structures where needed.
-static void
+*/
+void
 rewind_conditionals(cstack, idx, cond_type, cond_level)
 struct condstack   *cstack;
 int		idx;
 int		cond_type;
 int		*cond_level;
 {
 while (cstack->cs_idx > idx)
 {
 	if (cstack->cs_flags[cstack->cs_idx] & cond_type)
 	    --*cond_level;
+	if (cstack->cs_flags[cstack->cs_idx] & CSF_FOR)
+	    free_for_info(cstack->cs_forinfo[cstack->cs_idx]);
 	--cstack->cs_idx;
 }
 }
 /*

Mercurial > vim

comparison src/ex_eval.c @ 79:e918d3e340a4