RemoteEditor/vim7: src/if_tcl.c comparison

comparison src/if_tcl.c @ 48:67300faee616 v7-3-618

v7-3-618

author	Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date	Wed, 01 Aug 2012 18:08:28 +0900
parents	c16898406ff2
children

comparison

equal deleted inserted replaced

-:6c0584ec21b1
+:67300faee616
 #ifdef DYNAMIC_TCL
 # define USE_TCL_STUBS /* use tcl's stubs mechanism */
 #endif
 #include <tcl.h>
-#include <errno.h>
 #include <string.h>
 typedef struct
 {
 Tcl_Interp *interp;
+int exitvalue;
 int range_start, range_end;
 int lbase;
 char *curbuf, *curwin;
 } tcl_info;
-static tcl_info tclinfo = { NULL, 0, 0, 0, NULL, NULL };
+static tcl_info tclinfo = { NULL, 0, 0, 0, 0, NULL, NULL };
 #define VAR_RANGE1	"::vim::range(start)"
 #define VAR_RANGE2	"::vim::range(begin)"
 #define VAR_RANGE3	"::vim::range(end)"
 #define VAR_CURBUF	"::vim::current(buffer)"
 /****************************************************************************
 Tcl commands
 ****************************************************************************/
 /*
-* Replace standard "exit" and "catch" commands.
+* Replace standard "exit" command.
 *
-* This is a design flaw in Tcl -  the standard "exit" command just calls
+* Delete the Tcl interpreter; a new one will be created with the next
-* exit() and kills the application.  It should return TCL_EXIT to the
+* :tcl command). The exit code is saved (and retrieved in tclexit()).
-* app, which then decides if it wants to terminate or not.  In our case,
+* Since Tcl's exit is never expected to return and this replacement
-* we just delete the Tcl interpreter (and create a new one with the next
+* does, then (except for a trivial case) additional Tcl commands will
-* :tcl command).
+* be run. Since the interpreter is now marked as deleted, an error
-*/
+* will be returned -- typically "attempt to call eval in deleted
-#define TCL_EXIT	5
+* interpreter". Hopefully, at this point, checks for TCL_ERROR take
+* place and control percolates back up to Vim -- but with this new error
+* string in the interpreter's result value. Therefore it would be
+* useless for this routine to return the exit code via Tcl_SetResult().
+*/
 static int
 exitcmd(dummy, interp, objc, objv)
 ClientData dummy UNUSED;
 Tcl_Interp *interp;
 int objc;
 	case 2:
 	    if (Tcl_GetIntFromObj(interp, objv[1], &value) != TCL_OK)
 		break;
 	    /* FALLTHROUGH */
 	case 1:
-	    Tcl_SetObjResult(interp, Tcl_NewIntObj(value));
+	    tclinfo.exitvalue = value;
-	    return TCL_EXIT;
+	    Tcl_DeleteInterp(interp);
+	    break;
 	default:
 	    Tcl_WrongNumArgs(interp, 1, objv, "?returnCode?");
-}
-return TCL_ERROR;
-}
-static int
-catchcmd(dummy, interp, objc, objv)
-ClientData	dummy UNUSED;
-Tcl_Interp	*interp;
-int		objc;
-Tcl_Obj	*CONST objv[];
-{
-char    *varname = NULL;
-int	    result;
-switch (objc)
-{
-	case 3:
-	    varname = Tcl_GetStringFromObj(objv[2], NULL);
-	    /* fallthrough */
-	case 2:
-	    Tcl_ResetResult(interp);
-	    Tcl_AllowExceptions(interp);
-	    result = Tcl_EvalObj(interp, objv[1]);
-	    if (result == TCL_EXIT)
-		return result;
-	    if (varname)
-	    {
-		if (Tcl_SetVar(interp, varname, Tcl_GetStringResult(interp), 0) == NULL)
-		{
-		    Tcl_SetResult(interp, "couldn't save command result in variable", TCL_STATIC);
-		    return TCL_ERROR;
-		}
-	    }
-	    Tcl_SetObjResult(interp, Tcl_NewIntObj(result));
-	    return TCL_OK;
-	default:
-	    Tcl_WrongNumArgs(interp, 1, objv, "command ?varName?");
 }
 return TCL_ERROR;
 }
 /*
 }
 /*
 *  "::vim::buffer list" - create a list of buffer commands.
 *  "::vim::buffer {N}" - create buffer command for buffer N.
+*  "::vim::buffer exists {N}" - test if buffer N exists.
 *  "::vim::buffer new" - create a new buffer (not implemented)
 */
 static int
 buffercmd(dummy, interp, objc, objv)
 ClientData dummy UNUSED;
 static Tcl_ChannelType channel_type =
 {
 "vimmessage",	/* typeName */
-NULL,		/* version */
+TCL_CHANNEL_VERSION_2, /* version */
 channel_close,	/* closeProc */
 channel_input,	/* inputProc */
 channel_output,	/* outputProc */
 NULL,		/* seekProc */
 NULL,		/* setOptionProc */
 NULL,		/* blockModeProc */
 #ifdef TCL_CHANNEL_VERSION_2
 NULL,		/* flushProc */
 NULL,		/* handlerProc */
 #endif
+/* The following should not be necessary since TCL_CHANNEL_VERSION_2 was
+* set above */
 #ifdef TCL_CHANNEL_VERSION_3
 NULL,		/* wideSeekProc */
 #endif
 #ifdef TCL_CHANNEL_VERSION_4
 NULL,		/* threadActionProc */
 if (!tclinfo.interp)
 {
 	Tcl_Interp *interp;
 	static Tcl_Channel ch1, ch2;
-	/* replace stdout and stderr */
+	/* Create replacement channels for stdout and stderr; this has to be
+	 * done each time an interpreter is created since the channels are closed
+	 * when the interpreter is deleted */
 	ch1 = Tcl_CreateChannel(&channel_type, "vimout", VIMOUT, TCL_WRITABLE);
 	ch2 = Tcl_CreateChannel(&channel_type, "vimerr", VIMERR, TCL_WRITABLE);
 	Tcl_SetStdChannel(ch1, TCL_STDOUT);
 	Tcl_SetStdChannel(ch2, TCL_STDERR);
 	/* VIM sure is interactive */
 	Tcl_SetVar(interp, "tcl_interactive", "1", TCL_GLOBAL_ONLY);
 #endif
 	Tcl_SetChannelOption(interp, ch1, "-buffering", "line");
+#ifdef WIN3264
+	Tcl_SetChannelOption(interp, ch1, "-translation", "lf");
+#endif
 	Tcl_SetChannelOption(interp, ch2, "-buffering", "line");
+#ifdef WIN3264
-	/* replace some standard Tcl commands */
+	Tcl_SetChannelOption(interp, ch2, "-translation", "lf");
+#endif
+	/* replace standard Tcl exit command */
 	Tcl_DeleteCommand(interp, "exit");
 	Tcl_CreateObjCommand(interp, "exit", exitcmd,
-	    (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-	Tcl_DeleteCommand(interp, "catch");
-	Tcl_CreateObjCommand(interp, "catch", catchcmd,
 	    (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
 	/* new commands, in ::vim namespace */
 	Tcl_CreateObjCommand(interp, "::vim::buffer", buffercmd,
 	    (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
 	/* Interpreter already exists, just update variables */
 	tclinfo.range_start = row2tcl(eap->line1);
 	tclinfo.range_end = row2tcl(eap->line2);
 	tclupdatevars();
 }
+tclinfo.exitvalue = 0;
 return OK;
 }
 static void
 tclerrmsg(text)
 tclexit(error)
 int error;
 {
 int newerr = OK;
-if (error == TCL_EXIT )
+if (Tcl_InterpDeleted(tclinfo.interp)     /* True if we intercepted Tcl's exit command */
-{
+#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 5) || TCL_MAJOR_VERSION > 8
-	int retval;
+	|| Tcl_LimitExceeded(tclinfo.interp)  /* True if the interpreter cannot continue */
+#endif
+	)
+{
 	char buf[50];
-	Tcl_Obj *robj;
+	sprintf(buf, _("E572: exit code %d"), tclinfo.exitvalue);
-	robj = Tcl_GetObjResult(tclinfo.interp);
+	tclerrmsg(buf);
-	if( Tcl_GetIntFromObj(tclinfo.interp, robj, &retval) != TCL_OK )
+	if (tclinfo.exitvalue == 0)
 	{
-	    EMSG(_("E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"));
+	    did_emsg = 0;
-	    newerr = FAIL;
+	    newerr = OK;
 	}
 	else
-	{
+	    newerr = FAIL;
-	    sprintf(buf, _("E572: exit code %d"), retval);
-	    tclerrmsg(buf);
-	    if (retval == 0 )
-	    {
-		did_emsg = 0;
-		newerr = OK;
-	    }
-	    else
-		newerr = FAIL;
-	}
 	tcldelthisinterp();
 }
 else
 {
 	    break;
 	}
 	Tcl_SetVar(tclinfo.interp, var_line, line, 0);
 	Tcl_AllowExceptions(tclinfo.interp);
 	err = Tcl_Eval(tclinfo.interp, script);
-	if (err != TCL_OK)
+	if (err != TCL_OK
+	    || Tcl_InterpDeleted(tclinfo.interp)
+#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 5) || TCL_MAJOR_VERSION > 8
+	    || Tcl_LimitExceeded(tclinfo.interp)
+#endif
+	   )
 	    break;
 	line = (char *)Tcl_GetVar(tclinfo.interp, var_line, 0);
 	if (line)
 	{
 	    if (ml_replace((linenr_T)rs, (char_u *)line, TRUE) != OK)

Mercurial > hg > RemoteEditor > vim7

comparison src/if_tcl.c @ 48:67300faee616 v7-3-618