vim: src/vim9script.c annotate

annotate src/vim9script.c @ 20433:5950284a517f v8.2.0771

patch 8.2.0771: Vim9: cannot call a compiled closure from not compiled code Commit: https://github.com/vim/vim/commit/6f5b6dfb16228c0ce1e4379b7bafed02eaddbab2 Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 16 21:20:12 2020 +0200 patch 8.2.0771: Vim9: cannot call a compiled closure from not compiled code Problem: Vim9: cannot call a compiled closure from not compiled code. Solution: Pass funcexe to call_user_func().

author	Bram Moolenaar <Bram@vim.org>
date	Sat, 16 May 2020 21:30:10 +0200
parents	918b9a05cf35
children	7fb80f486aad

rev	line source
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	1 /* vi:set ts=8 sts=4 sw=4 noet:
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	2 *
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	3 * VIM - Vi IMproved by Bram Moolenaar
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	4 *
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	5 * Do ":help uganda" in Vim to read copying and usage conditions.
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	6 * Do ":help credits" in Vim to see a list of people who contributed.
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	7 * See README.txt for an overview of the Vim source code.
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	8 */
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	9
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	10 /*
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	11 * vim9script.c: :vim9script, :import, :export and friends
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	12 */
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	13
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	14 #include "vim.h"
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	15
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	16 #if defined(FEAT_EVAL) \|\| defined(PROTO)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	17
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	18 #include "vim9.h"
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	19
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	20 static char e_needs_vim9[] = N_("E1042: import/export can only be used in vim9script");
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	21
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	22 int
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	23 in_vim9script(void)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	24 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	25 // TODO: go up the stack?
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	26 return current_sctx.sc_version == SCRIPT_VERSION_VIM9;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	27 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	28
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	29 /*
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	30 * ":vim9script".
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	31 */
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	32 void
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	33 ex_vim9script(exarg_T *eap)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	34 {
20339 7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	35 scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid);
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	36 garray_T *gap;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	37 garray_T func_ga;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	38 int idx;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	39 ufunc_T *ufunc;
20401 918b9a05cf35 patch 8.2.0755: Vim9: No error when variable initializer is not a constant Bram Moolenaar <Bram@vim.org> parents: 20351 diff changeset	40 int start_called_emsg = called_emsg;
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	41
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	42 if (!getline_equal(eap->getline, eap->cookie, getsourceline))
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	43 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	44 emsg(_("E1038: vim9script can only be used in a script"));
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	45 return;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	46 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	47 if (si->sn_had_command)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	48 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	49 emsg(_("E1039: vim9script must be the first command in a script"));
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	50 return;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	51 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	52 current_sctx.sc_version = SCRIPT_VERSION_VIM9;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	53 si->sn_version = SCRIPT_VERSION_VIM9;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	54 si->sn_had_command = TRUE;
20339 7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	55 ga_init2(&func_ga, sizeof(ufunc_T *), 20);
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	56
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	57 if (STRCMP(p_cpo, CPO_VIM) != 0)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	58 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	59 si->sn_save_cpo = p_cpo;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	60 p_cpo = vim_strsave((char_u *)CPO_VIM);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	61 }
20339 7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	62
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	63 // Make a pass through the script to find:
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	64 // - function declarations
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	65 // - variable and constant declarations
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	66 // - imports
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	67 // The types are recognized, so that they can be used when compiling a
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	68 // function.
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	69 gap = source_get_line_ga(eap->cookie);
20401 918b9a05cf35 patch 8.2.0755: Vim9: No error when variable initializer is not a constant Bram Moolenaar <Bram@vim.org> parents: 20351 diff changeset	70 while (called_emsg == start_called_emsg)
20339 7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	71 {
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	72 char_u *line;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	73 char_u *p;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	74
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	75 if (ga_grow(gap, 1) == FAIL)
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	76 return;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	77 line = eap->getline(':', eap->cookie, 0, TRUE);
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	78 if (line == NULL)
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	79 break;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	80 ((char_u **)(gap->ga_data))[gap->ga_len++] = line;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	81 line = skipwhite(line);
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	82 p = line;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	83 if (checkforcmd(&p, "function", 2) \|\| checkforcmd(&p, "def", 3))
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	84 {
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	85 int lnum_start = SOURCING_LNUM - 1;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	86
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	87 // Handle :function and :def by calling def_function().
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	88 // It will read upto the matching :endded or :endfunction.
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	89 eap->cmdidx = *line == 'f' ? CMD_function : CMD_def;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	90 eap->cmd = line;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	91 eap->arg = p;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	92 eap->forceit = FALSE;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	93 ufunc = def_function(eap, NULL, NULL, FALSE);
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	94
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	95 if (ufunc != NULL && *line == 'd' && ga_grow(&func_ga, 1) == OK)
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	96 {
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	97 // Add the function to the list of :def functions, so that it
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	98 // can be referenced by index. It's compiled below.
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	99 add_def_function(ufunc);
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	100 ((ufunc_T **)(func_ga.ga_data))[func_ga.ga_len++] = ufunc;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	101 }
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	102
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	103 // Store empty lines in place of the function, we don't need to
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	104 // process it again.
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	105 vim_free(((char_u **)(gap->ga_data))[--gap->ga_len]);
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	106 if (ga_grow(gap, SOURCING_LNUM - lnum_start) == OK)
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	107 while (lnum_start < SOURCING_LNUM)
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	108 {
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	109 // getsourceline() will skip over NULL lines.
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	110 ((char_u **)(gap->ga_data))[gap->ga_len++] = NULL;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	111 ++lnum_start;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	112 }
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	113 }
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	114 else if (checkforcmd(&p, "let", 3) \|\| checkforcmd(&p, "const", 4))
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	115 {
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	116 eap->cmd = line;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	117 eap->arg = p;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	118 eap->forceit = FALSE;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	119 eap->cmdidx = *line == 'l' ? CMD_let: CMD_const;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	120
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	121 // The command will be executed again, it's OK to redefine the
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	122 // variable then.
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	123 ex_let_const(eap, TRUE);
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	124 }
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	125 else if (checkforcmd(&p, "import", 3))
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	126 {
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	127 eap->arg = p;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	128 ex_import(eap);
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	129
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	130 // Store empty line, we don't need to process the command again.
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	131 vim_free(((char_u **)(gap->ga_data))[--gap->ga_len]);
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	132 ((char_u **)(gap->ga_data))[gap->ga_len++] = NULL;
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	133 }
20351 680296770464 patch 8.2.0731: Vim9: parsing declarations continues after :finish Bram Moolenaar <Bram@vim.org> parents: 20339 diff changeset	134 else if (checkforcmd(&p, "finish", 4))
680296770464 patch 8.2.0731: Vim9: parsing declarations continues after :finish Bram Moolenaar <Bram@vim.org> parents: 20339 diff changeset	135 {
680296770464 patch 8.2.0731: Vim9: parsing declarations continues after :finish Bram Moolenaar <Bram@vim.org> parents: 20339 diff changeset	136 break;
680296770464 patch 8.2.0731: Vim9: parsing declarations continues after :finish Bram Moolenaar <Bram@vim.org> parents: 20339 diff changeset	137 }
20339 7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	138 }
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	139
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	140 // Compile the :def functions.
20401 918b9a05cf35 patch 8.2.0755: Vim9: No error when variable initializer is not a constant Bram Moolenaar <Bram@vim.org> parents: 20351 diff changeset	141 for (idx = 0; idx < func_ga.ga_len && called_emsg == start_called_emsg; ++idx)
20339 7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	142 {
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	143 ufunc = ((ufunc_T **)(func_ga.ga_data))[idx];
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	144 compile_def_function(ufunc, FALSE, NULL);
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	145 }
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	146 ga_clear(&func_ga);
7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	147
20401 918b9a05cf35 patch 8.2.0755: Vim9: No error when variable initializer is not a constant Bram Moolenaar <Bram@vim.org> parents: 20351 diff changeset	148 if (called_emsg == start_called_emsg)
918b9a05cf35 patch 8.2.0755: Vim9: No error when variable initializer is not a constant Bram Moolenaar <Bram@vim.org> parents: 20351 diff changeset	149 {
918b9a05cf35 patch 8.2.0755: Vim9: No error when variable initializer is not a constant Bram Moolenaar <Bram@vim.org> parents: 20351 diff changeset	150 // Return to process the commands at the script level.
918b9a05cf35 patch 8.2.0755: Vim9: No error when variable initializer is not a constant Bram Moolenaar <Bram@vim.org> parents: 20351 diff changeset	151 source_use_line_ga(eap->cookie);
918b9a05cf35 patch 8.2.0755: Vim9: No error when variable initializer is not a constant Bram Moolenaar <Bram@vim.org> parents: 20351 diff changeset	152 }
918b9a05cf35 patch 8.2.0755: Vim9: No error when variable initializer is not a constant Bram Moolenaar <Bram@vim.org> parents: 20351 diff changeset	153 else
918b9a05cf35 patch 8.2.0755: Vim9: No error when variable initializer is not a constant Bram Moolenaar <Bram@vim.org> parents: 20351 diff changeset	154 {
918b9a05cf35 patch 8.2.0755: Vim9: No error when variable initializer is not a constant Bram Moolenaar <Bram@vim.org> parents: 20351 diff changeset	155 // If there was an error in the first or second phase then don't
918b9a05cf35 patch 8.2.0755: Vim9: No error when variable initializer is not a constant Bram Moolenaar <Bram@vim.org> parents: 20351 diff changeset	156 // execute the script lines.
918b9a05cf35 patch 8.2.0755: Vim9: No error when variable initializer is not a constant Bram Moolenaar <Bram@vim.org> parents: 20351 diff changeset	157 do_finish(eap, FALSE);
918b9a05cf35 patch 8.2.0755: Vim9: No error when variable initializer is not a constant Bram Moolenaar <Bram@vim.org> parents: 20351 diff changeset	158 }
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	159 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	160
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	161 /*
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	162 * ":export let Name: type"
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	163 * ":export const Name: type"
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	164 * ":export def Name(..."
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	165 * ":export class Name ..."
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	166 *
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	167 * ":export {Name, ...}"
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	168 */
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	169 void
20339 7587d892c00c patch 8.2.0725: Vim9: cannot call a function declared later in Vim9 script Bram Moolenaar <Bram@vim.org> parents: 20189 diff changeset	170 ex_export(exarg_T *eap)
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	171 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	172 if (current_sctx.sc_version != SCRIPT_VERSION_VIM9)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	173 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	174 emsg(_(e_needs_vim9));
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	175 return;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	176 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	177
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	178 eap->cmd = eap->arg;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	179 (void)find_ex_command(eap, NULL, lookup_scriptvar, NULL);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	180 switch (eap->cmdidx)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	181 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	182 case CMD_let:
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	183 case CMD_const:
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	184 case CMD_def:
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	185 // case CMD_class:
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	186 is_export = TRUE;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	187 do_cmdline(eap->cmd, eap->getline, eap->cookie,
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	188 DOCMD_VERBOSE + DOCMD_NOWAIT);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	189
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	190 // The command will reset "is_export" when exporting an item.
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	191 if (is_export)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	192 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	193 emsg(_("E1044: export with invalid argument"));
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	194 is_export = FALSE;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	195 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	196 break;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	197 default:
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	198 emsg(_("E1043: Invalid command after :export"));
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	199 break;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	200 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	201 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	202
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	203 /*
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	204 * Add a new imported item entry to the current script.
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	205 */
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	206 static imported_T *
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	207 new_imported(garray_T *gap)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	208 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	209 if (ga_grow(gap, 1) == OK)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	210 return ((imported_T *)gap->ga_data + gap->ga_len++);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	211 return NULL;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	212 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	213
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	214 /*
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	215 * Free all imported items in script "sid".
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	216 */
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	217 void
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	218 free_imports(int sid)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	219 {
19191 133ef7ba4e4e patch 8.2.0154: reallocating the list of scripts is inefficient Bram Moolenaar <Bram@vim.org> parents: 19181 diff changeset	220 scriptitem_T *si = SCRIPT_ITEM(sid);
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	221 int idx;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	222
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	223 for (idx = 0; idx < si->sn_imports.ga_len; ++idx)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	224 {
19726 ad37a198a708 patch 8.2.0419: various memory leaks in Vim9 script code Bram Moolenaar <Bram@vim.org> parents: 19623 diff changeset	225 imported_T imp = ((imported_T )si->sn_imports.ga_data) + idx;
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	226
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	227 vim_free(imp->imp_name);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	228 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	229 ga_clear(&si->sn_imports);
19726 ad37a198a708 patch 8.2.0419: various memory leaks in Vim9 script code Bram Moolenaar <Bram@vim.org> parents: 19623 diff changeset	230 ga_clear(&si->sn_var_vals);
ad37a198a708 patch 8.2.0419: various memory leaks in Vim9 script code Bram Moolenaar <Bram@vim.org> parents: 19623 diff changeset	231 ga_clear(&si->sn_type_list);
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	232 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	233
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	234 /*
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	235 * ":import Item from 'filename'"
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	236 * ":import Item as Alias from 'filename'"
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	237 * ":import {Item} from 'filename'".
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	238 * ":import {Item as Alias} from 'filename'"
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	239 * ":import {Item, Item} from 'filename'"
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	240 * ":import {Item, Item as Alias} from 'filename'"
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	241 *
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	242 * ":import * as Name from 'filename'"
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	243 */
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	244 void
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	245 ex_import(exarg_T *eap)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	246 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	247 if (current_sctx.sc_version != SCRIPT_VERSION_VIM9)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	248 emsg(_(e_needs_vim9));
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	249 else
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	250 {
19623 2fee087c94cb patch 8.2.0368: Vim9: import that redefines local variable does not fail Bram Moolenaar <Bram@vim.org> parents: 19511 diff changeset	251 char_u *cmd_end = handle_import(eap->arg, NULL,
2fee087c94cb patch 8.2.0368: Vim9: import that redefines local variable does not fail Bram Moolenaar <Bram@vim.org> parents: 19511 diff changeset	252 current_sctx.sc_sid, NULL);
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	253
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	254 if (cmd_end != NULL)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	255 eap->nextcmd = check_nextcmd(cmd_end);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	256 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	257 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	258
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	259 /*
19509 17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	260 * Find an exported item in "sid" matching the name at "*argp".
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	261 * When it is a variable return the index.
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	262 * When it is a user function return "*ufunc".
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	263 * When not found returns -1 and "*ufunc" is NULL.
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	264 */
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	265 int
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	266 find_exported(
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	267 int sid,
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	268 char_u **argp,
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	269 int *name_len,
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	270 ufunc_T **ufunc,
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	271 type_T **type)
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	272 {
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	273 char_u name = argp;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	274 char_u arg = argp;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	275 int cc;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	276 int idx = -1;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	277 svar_T *sv;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	278 scriptitem_T *script = SCRIPT_ITEM(sid);
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	279
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	280 // isolate one name
19511 7e76d5fba19f patch 8.2.0313: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19509 diff changeset	281 while (eval_isnamec(*arg))
19509 17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	282 ++arg;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	283 *name_len = (int)(arg - name);
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	284
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	285 // find name in "script"
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	286 // TODO: also find script-local user function
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	287 cc = *arg;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	288 *arg = NUL;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	289 idx = get_script_item_idx(sid, name, FALSE);
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	290 if (idx >= 0)
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	291 {
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	292 sv = ((svar_T *)script->sn_var_vals.ga_data) + idx;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	293 if (!sv->sv_export)
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	294 {
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	295 semsg(_("E1049: Item not exported in script: %s"), name);
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	296 *arg = cc;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	297 return -1;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	298 }
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	299 *type = sv->sv_type;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	300 *ufunc = NULL;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	301 }
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	302 else
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	303 {
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	304 char_u buffer[200];
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	305 char_u *funcname;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	306
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	307 // it could be a user function.
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	308 if (STRLEN(name) < sizeof(buffer) - 10)
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	309 funcname = buffer;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	310 else
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	311 {
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	312 funcname = alloc(STRLEN(name) + 10);
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	313 if (funcname == NULL)
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	314 {
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	315 *arg = cc;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	316 return -1;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	317 }
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	318 }
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	319 funcname[0] = K_SPECIAL;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	320 funcname[1] = KS_EXTRA;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	321 funcname[2] = (int)KE_SNR;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	322 sprintf((char *)funcname + 3, "%ld_%s", (long)sid, name);
20189 63cc54100ae4 patch 8.2.0650: Vim9: script function can be deleted Bram Moolenaar <Bram@vim.org> parents: 19726 diff changeset	323 *ufunc = find_func(funcname, FALSE, NULL);
19509 17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	324 if (funcname != buffer)
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	325 vim_free(funcname);
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	326
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	327 if (*ufunc == NULL)
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	328 {
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	329 semsg(_("E1048: Item not found in script: %s"), name);
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	330 *arg = cc;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	331 return -1;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	332 }
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	333 }
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	334 *arg = cc;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	335 arg = skipwhite(arg);
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	336 *argp = arg;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	337
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	338 return idx;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	339 }
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	340
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	341 /*
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	342 * Handle an ":import" command and add the resulting imported_T to "gap", when
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	343 * not NULL, or script "import_sid" sn_imports.
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	344 * Returns a pointer to after the command or NULL in case of failure
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	345 */
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	346 char_u *
19623 2fee087c94cb patch 8.2.0368: Vim9: import that redefines local variable does not fail Bram Moolenaar <Bram@vim.org> parents: 19511 diff changeset	347 handle_import(char_u arg_start, garray_T gap, int import_sid, void *cctx)
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	348 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	349 char_u *arg = arg_start;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	350 char_u *cmd_end;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	351 char_u *as_ptr = NULL;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	352 char_u *from_ptr;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	353 int as_len = 0;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	354 int ret = FAIL;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	355 typval_T tv;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	356 int sid = -1;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	357 int res;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	358
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	359 if (*arg == '{')
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	360 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	361 // skip over {item} list
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	362 while (arg != NUL && arg != '}')
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	363 ++arg;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	364 if (*arg == '}')
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	365 arg = skipwhite(arg + 1);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	366 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	367 else
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	368 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	369 if (arg == '')
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	370 arg = skipwhite(arg + 1);
19511 7e76d5fba19f patch 8.2.0313: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19509 diff changeset	371 else if (eval_isnamec1(*arg))
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	372 {
19511 7e76d5fba19f patch 8.2.0313: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19509 diff changeset	373 while (eval_isnamec(*arg))
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	374 ++arg;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	375 arg = skipwhite(arg);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	376 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	377 if (STRNCMP("as", arg, 2) == 0 && VIM_ISWHITE(arg[2]))
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	378 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	379 // skip over "as Name "
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	380 arg = skipwhite(arg + 2);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	381 as_ptr = arg;
19511 7e76d5fba19f patch 8.2.0313: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19509 diff changeset	382 if (eval_isnamec1(*arg))
7e76d5fba19f patch 8.2.0313: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19509 diff changeset	383 while (eval_isnamec(*arg))
7e76d5fba19f patch 8.2.0313: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19509 diff changeset	384 ++arg;
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	385 as_len = (int)(arg - as_ptr);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	386 arg = skipwhite(arg);
19623 2fee087c94cb patch 8.2.0368: Vim9: import that redefines local variable does not fail Bram Moolenaar <Bram@vim.org> parents: 19511 diff changeset	387 if (check_defined(as_ptr, as_len, cctx) == FAIL)
2fee087c94cb patch 8.2.0368: Vim9: import that redefines local variable does not fail Bram Moolenaar <Bram@vim.org> parents: 19511 diff changeset	388 return NULL;
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	389 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	390 else if (arg_start == '')
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	391 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	392 emsg(_("E1045: Missing \"as\" after *"));
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	393 return NULL;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	394 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	395 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	396 if (STRNCMP("from", arg, 4) != 0 \|\| !VIM_ISWHITE(arg[4]))
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	397 {
19511 7e76d5fba19f patch 8.2.0313: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19509 diff changeset	398 emsg(_("E1070: Missing \"from\""));
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	399 return NULL;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	400 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	401 from_ptr = arg;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	402 arg = skipwhite(arg + 4);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	403 tv.v_type = VAR_UNKNOWN;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	404 // TODO: should we accept any expression?
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	405 if (*arg == '\'')
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	406 ret = get_lit_string_tv(&arg, &tv, TRUE);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	407 else if (*arg == '"')
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	408 ret = get_string_tv(&arg, &tv, TRUE);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	409 if (ret == FAIL \|\| tv.vval.v_string == NULL \|\| *tv.vval.v_string == NUL)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	410 {
19511 7e76d5fba19f patch 8.2.0313: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19509 diff changeset	411 emsg(_("E1071: Invalid string after \"from\""));
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	412 return NULL;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	413 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	414 cmd_end = arg;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	415
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	416 // find script tv.vval.v_string
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	417 if (*tv.vval.v_string == '.')
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	418 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	419 size_t len;
19191 133ef7ba4e4e patch 8.2.0154: reallocating the list of scripts is inefficient Bram Moolenaar <Bram@vim.org> parents: 19181 diff changeset	420 scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid);
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	421 char_u *tail = gettail(si->sn_name);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	422 char_u *from_name;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	423
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	424 // Relative to current script: "./name.vim", "../../name.vim".
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	425 len = STRLEN(si->sn_name) - STRLEN(tail) + STRLEN(tv.vval.v_string) + 2;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	426 from_name = alloc((int)len);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	427 if (from_name == NULL)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	428 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	429 clear_tv(&tv);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	430 return NULL;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	431 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	432 vim_strncpy(from_name, si->sn_name, tail - si->sn_name);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	433 add_pathsep(from_name);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	434 STRCAT(from_name, tv.vval.v_string);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	435 simplify_filename(from_name);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	436
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	437 res = do_source(from_name, FALSE, DOSO_NONE, &sid);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	438 vim_free(from_name);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	439 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	440 else if (mch_isFullName(tv.vval.v_string))
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	441 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	442 // Absolute path: "/tmp/name.vim"
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	443 res = do_source(tv.vval.v_string, FALSE, DOSO_NONE, &sid);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	444 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	445 else
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	446 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	447 size_t len = 7 + STRLEN(tv.vval.v_string) + 1;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	448 char_u *from_name;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	449
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	450 // Find file in "import" subdirs in 'runtimepath'.
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	451 from_name = alloc((int)len);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	452 if (from_name == NULL)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	453 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	454 clear_tv(&tv);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	455 return NULL;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	456 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	457 vim_snprintf((char *)from_name, len, "import/%s", tv.vval.v_string);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	458 res = source_in_path(p_rtp, from_name, DIP_NOAFTER, &sid);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	459 vim_free(from_name);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	460 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	461
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	462 if (res == FAIL \|\| sid <= 0)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	463 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	464 semsg(_("E1053: Could not import \"%s\""), tv.vval.v_string);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	465 clear_tv(&tv);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	466 return NULL;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	467 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	468 clear_tv(&tv);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	469
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	470 if (arg_start == '')
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	471 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	472 imported_T *imported = new_imported(gap != NULL ? gap
19191 133ef7ba4e4e patch 8.2.0154: reallocating the list of scripts is inefficient Bram Moolenaar <Bram@vim.org> parents: 19181 diff changeset	473 : &SCRIPT_ITEM(import_sid)->sn_imports);
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	474
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	475 if (imported == NULL)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	476 return NULL;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	477 imported->imp_name = vim_strnsave(as_ptr, as_len);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	478 imported->imp_sid = sid;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	479 imported->imp_all = TRUE;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	480 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	481 else
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	482 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	483 arg = arg_start;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	484 if (*arg == '{')
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	485 arg = skipwhite(arg + 1);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	486 for (;;)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	487 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	488 char_u *name = arg;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	489 int name_len;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	490 int idx;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	491 imported_T *imported;
19509 17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	492 ufunc_T *ufunc = NULL;
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	493 type_T *type;
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	494
19509 17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	495 idx = find_exported(sid, &arg, &name_len, &ufunc, &type);
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	496
19509 17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	497 if (idx < 0 && ufunc == NULL)
17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	498 return NULL;
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	499
19623 2fee087c94cb patch 8.2.0368: Vim9: import that redefines local variable does not fail Bram Moolenaar <Bram@vim.org> parents: 19511 diff changeset	500 if (check_defined(name, name_len, cctx) == FAIL)
2fee087c94cb patch 8.2.0368: Vim9: import that redefines local variable does not fail Bram Moolenaar <Bram@vim.org> parents: 19511 diff changeset	501 return NULL;
2fee087c94cb patch 8.2.0368: Vim9: import that redefines local variable does not fail Bram Moolenaar <Bram@vim.org> parents: 19511 diff changeset	502
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	503 imported = new_imported(gap != NULL ? gap
19191 133ef7ba4e4e patch 8.2.0154: reallocating the list of scripts is inefficient Bram Moolenaar <Bram@vim.org> parents: 19181 diff changeset	504 : &SCRIPT_ITEM(import_sid)->sn_imports);
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	505 if (imported == NULL)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	506 return NULL;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	507
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	508 // TODO: check for "as" following
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	509 // imported->imp_name = vim_strnsave(as_ptr, as_len);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	510 imported->imp_name = vim_strnsave(name, name_len);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	511 imported->imp_sid = sid;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	512 if (idx >= 0)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	513 {
19509 17f0d6dc6a73 patch 8.2.0312: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19227 diff changeset	514 imported->imp_type = type;
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	515 imported->imp_var_vals_idx = idx;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	516 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	517 else
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	518 imported->imp_funcname = ufunc->uf_name;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	519
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	520 arg = skipwhite(arg);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	521 if (*arg_start != '{')
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	522 break;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	523 if (*arg == '}')
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	524 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	525 arg = skipwhite(arg + 1);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	526 break;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	527 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	528
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	529 if (*arg != ',')
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	530 {
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	531 emsg(_("E1046: Missing comma in import"));
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	532 return NULL;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	533 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	534 arg = skipwhite(arg + 1);
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	535 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	536 if (arg != from_ptr)
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	537 {
19511 7e76d5fba19f patch 8.2.0313: Vim9: insufficient script tests Bram Moolenaar <Bram@vim.org> parents: 19509 diff changeset	538 // cannot happen, just in case the above has a flaw
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	539 emsg(_("E1047: syntax error in import"));
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	540 return NULL;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	541 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	542 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	543 return cmd_end;
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	544 }
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	545
94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: diff changeset	546 #endif // FEAT_EVAL

Mercurial > vim

annotate src/vim9script.c @ 20433:5950284a517f v8.2.0771