vim: src/channel.c comparison

comparison src/channel.c @ 7864:6b0891de44a9 v7.4.1229

commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 31 20:24:32 2016 +0100 patch 7.4.1229 Problem: "eval" and "expr" channel commands don't work yet. Solution: Implement them. Update the error numbers. Also add "redraw".

author	Christian Brabandt <cb@256bit.org>
date	Sun, 31 Jan 2016 20:30:04 +0100
parents	28f569c7dab9
children	17e6ff1a74f1

comparison

equal deleted inserted replaced

-:e18a688b2e3b
+:6b0891de44a9
 idx = add_channel();
 if (idx < 0)
 {
 	CHERROR("All channels are in use\n", "");
-	EMSG(_("E999: All channels are in use"));
+	EMSG(_("E897: All channels are in use"));
 	return -1;
 }
 if ((sd = (sock_T)socket(AF_INET, SOCK_STREAM, 0)) == (sock_T)-1)
 {
 	CHERROR("error in socket() in channel_open()\n", "");
-	PERROR("E999: socket() in channel_open()");
+	PERROR("E898: socket() in channel_open()");
 	return -1;
 }
 /* Get the server internet address and put into addr structure */
 /* fill in the socket address structure and connect to server */
 server.sin_family = AF_INET;
 server.sin_port = htons(port);
 if ((host = gethostbyname(hostname)) == NULL)
 {
 	CHERROR("error in gethostbyname() in channel_open()\n", "");
-	PERROR("E999: gethostbyname() in channel_open()");
+	PERROR("E901: gethostbyname() in channel_open()");
 	sock_close(sd);
 	return -1;
 }
 memcpy((char *)&server.sin_addr, host->h_addr, host->h_length);
 	    sock_close(sd);
 	    if ((sd = (sock_T)socket(AF_INET, SOCK_STREAM, 0)) == (sock_T)-1)
 	    {
 		SOCK_ERRNO;
 		CHERROR("socket() retry in channel_open()\n", "");
-		PERROR("E999: socket() retry in channel_open()");
+		PERROR("E900: socket() retry in channel_open()");
 		return -1;
 	    }
 	    if (connect(sd, (struct sockaddr *)&server, sizeof(server)))
 	    {
 		int retries = 36;
 		}
 		if (!success)
 		{
 		    /* Get here when the server can't be found. */
 		    CHERROR("Cannot connect to port after retry\n", "");
-		    PERROR(_("E999: Cannot connect to port after retry2"));
+		    PERROR(_("E899: Cannot connect to port after retry2"));
 		    sock_close(sd);
 		    return -1;
 		}
 	    }
 	}
 	else
 	{
 	    CHERROR("Cannot connect to port\n", "");
-	    PERROR(_("E999: Cannot connect to port"));
+	    PERROR(_("E902: Cannot connect to port"));
 	    sock_close(sd);
 	    return -1;
 	}
 }
 channels[idx].ch_req_callback = callback == NULL
 					       ? NULL : vim_strsave(callback);
 }
 /*
-* Decode JSON "msg", which must have the form "[expr1, expr2]".
+* Decode JSON "msg", which must have the form "[expr1, expr2, expr3]".
 * Put "expr1" in "tv1".
 * Put "expr2" in "tv2".
+* Put "expr3" in "tv3". If "tv3" is NULL there is no "expr3".
+*
 * Return OK or FAIL.
 */
 int
-channel_decode_json(char_u *msg, typval_T *tv1, typval_T *tv2)
+channel_decode_json(char_u *msg, typval_T *tv1, typval_T *tv2, typval_T *tv3)
 {
 js_read_T	reader;
 typval_T	listtv;
 reader.js_buf = msg;
 reader.js_eof = TRUE;
 reader.js_used = 0;
 json_decode(&reader, &listtv);
-if (listtv.v_type == VAR_LIST && listtv.vval.v_list->lv_len == 2)
+if (listtv.v_type == VAR_LIST)
 {
-	/* Move the item from the list and then change the type to avoid the
+	list_T *list = listtv.vval.v_list;
-	 * item being freed. */
-	*tv1 = listtv.vval.v_list->lv_first->li_tv;
+	if (list->lv_len == 2 || (tv3 != NULL && list->lv_len == 3))
-	listtv.vval.v_list->lv_first->li_tv.v_type = VAR_NUMBER;
+	{
-	*tv2 = listtv.vval.v_list->lv_last->li_tv;
+	    /* Move the item from the list and then change the type to avoid the
-	listtv.vval.v_list->lv_last->li_tv.v_type = VAR_NUMBER;
+	     * item being freed. */
-	list_unref(listtv.vval.v_list);
+	    *tv1 = list->lv_first->li_tv;
-	return OK;
+	    list->lv_first->li_tv.v_type = VAR_NUMBER;
+	    *tv2 = list->lv_first->li_next->li_tv;
+	    list->lv_first->li_next->li_tv.v_type = VAR_NUMBER;
+	    if (tv3 != NULL)
+	    {
+		if (list->lv_len == 3)
+		{
+		    *tv3 = list->lv_last->li_tv;
+		    list->lv_last->li_tv.v_type = VAR_NUMBER;
+		}
+		else
+		    tv3->v_type = VAR_UNKNOWN;
+	    }
+	    list_unref(list);
+	    return OK;
+	}
 }
 /* give error message? */
 clear_tv(&listtv);
 return FAIL;
 setcursor();
 cursor_on();
 out_flush();
 }
+/*
+* Execute a command received over channel "idx".
+* "cmd" is the command string, "arg2" the second argument.
+* "arg3" is the third argument, NULL if missing.
+*/
 static void
-channel_exe_cmd(char_u *cmd, typval_T *arg)
+channel_exe_cmd(int idx, char_u *cmd, typval_T *arg2, typval_T *arg3)
 {
+char_u *arg;
+if (arg2->v_type != VAR_STRING)
+{
+	if (p_verbose > 2)
+	    EMSG("E903: received ex command with non-string argument");
+	return;
+}
+arg = arg2->vval.v_string;
 if (STRCMP(cmd, "ex") == 0)
 {
-	if (arg->v_type == VAR_STRING)
+	do_cmdline_cmd(arg);
-	    do_cmdline_cmd(arg->vval.v_string);
-	else if (p_verbose > 2)
-	    EMSG("E999: received ex command with non-string argument");
 }
 else if (STRCMP(cmd, "normal") == 0)
 {
-	if (arg->v_type == VAR_STRING)
+	exarg_T ea;
-	{
-	    exarg_T ea;
+	ea.arg = arg;
+	ea.addr_count = 0;
-	    ea.arg = arg->vval.v_string;
+	ea.forceit = TRUE; /* no mapping */
-	    ea.addr_count = 0;
+	ex_normal(&ea);
-	    ea.forceit = TRUE; /* no mapping */
+}
-	    ex_normal(&ea);
+else if (STRCMP(cmd, "redraw") == 0)
+{
-	    update_screen(0);
+	exarg_T ea;
-	    showruler(FALSE);
-	    setcursor();
+	ea.forceit = *arg != NUL;
-	    out_flush();
+	ex_redraw(&ea);
+	showruler(FALSE);
+	setcursor();
+	out_flush();
 #ifdef FEAT_GUI
-	    if (gui.in_use)
+	if (gui.in_use)
+	{
+	    gui_update_cursor(FALSE, FALSE);
+	    gui_mch_flush();
+	}
+#endif
+}
+else if (STRCMP(cmd, "expr") == 0 || STRCMP(cmd, "eval") == 0)
+{
+	int is_eval = cmd[1] == 'v';
+	if (is_eval && arg3->v_type != VAR_NUMBER)
+	{
+	    if (p_verbose > 2)
+		EMSG("E904: third argument for eval must be a number");
+	}
+	else
+	{
+	    typval_T	*tv = eval_expr(arg, NULL);
+	    typval_T	err_tv;
+	    char_u	*json;
+	    if (is_eval)
 	    {
-		gui_update_cursor(FALSE, FALSE);
+		if (tv == NULL)
-		gui_mch_flush();
+		{
+		    err_tv.v_type = VAR_STRING;
+		    err_tv.vval.v_string = (char_u *)"ERROR";
+		    tv = &err_tv;
+		}
+		json = json_encode_nr_expr(arg3->vval.v_number, tv);
+		channel_send(idx, json, "eval");
+		vim_free(json);
 	    }
-#endif
+	    free_tv(tv);
 	}
-	else if (p_verbose > 2)
-	    EMSG("E999: received normal command with non-string argument");
 }
 else if (p_verbose > 2)
-	EMSG2("E999: received unknown command: %s", cmd);
+	EMSG2("E905: received unknown command: %s", cmd);
 }
 /*
 * Invoke a callback for channel "idx" if needed.
 */
 may_invoke_callback(int idx)
 {
 char_u	*msg;
 typval_T	typetv;
 typval_T	argv[3];
+typval_T	arg3;
 char_u	*cmd = NULL;
 int		seq_nr = -1;
 int		ret = OK;
 if (channel_peek(idx) == NULL)
 	;
 msg = channel_get(idx);
 if (channels[idx].ch_json_mode)
 {
-	ret = channel_decode_json(msg, &typetv, &argv[1]);
+	ret = channel_decode_json(msg, &typetv, &argv[1], &arg3);
 	if (ret == OK)
 	{
+	    /* TODO: error if arg3 is set when it shouldn't? */
 	    if (typetv.v_type == VAR_STRING)
 		cmd = typetv.vval.v_string;
 	    else if (typetv.v_type == VAR_NUMBER)
 		seq_nr = typetv.vval.v_number;
 	}
 if (ret == OK)
 {
 	if (cmd != NULL)
 	{
-	    channel_exe_cmd(cmd, &argv[1]);
+	    channel_exe_cmd(idx, cmd, &argv[1], &arg3);
 	}
 	else if (channels[idx].ch_req_callback != NULL && seq_nr != 0)
 	{
 	    /* TODO: check the sequence number */
 	    /* invoke the one-time callback */
 	if (channels[idx].ch_json_mode)
 	{
 	    clear_tv(&typetv);
 	    clear_tv(&argv[1]);
+	    clear_tv(&arg3);
 	}
 }
 vim_free(msg);
 }
 	if (len < 0)
 	{
 	    /* Todo: which channel? */
 	    CHERROR("%s(): cannot from channel\n", "channel_read");
-	    PERROR(_("E999: read from channel"));
+	    PERROR(_("E896: read from channel"));
 	}
 }
 #if defined(CH_HAS_GUI) && defined(FEAT_GUI_GTK)
 if (CH_HAS_GUI && gtk_main_level() > 0)

Mercurial > vim

comparison src/channel.c @ 7864:6b0891de44a9 v7.4.1229