Mercurial > vim
annotate src/vim9execute.c @ 30092:53e7e912eeec v9.0.0382
patch 9.0.0382: freeing the wrong string on failure
Commit: https://github.com/vim/vim/commit/31ea6bf530a814991f669122dbc9921117a862c3
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Sep 5 10:47:13 2022 +0100
patch 9.0.0382: freeing the wrong string on failure
Problem: Freeing the wrong string on failure.
Solution: Adjust the argument. Reorder the code.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 05 Sep 2022 12:00:06 +0200 |
| parents | a542dfb1c1a2 |
| children | 458162398682 |
| 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 * vim9execute.c: execute Vim9 script instructions |
|
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 #define USING_FLOAT_STUFF |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
15 #include "vim.h" |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
16 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
17 #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
|
18 |
|
26662
4b23672d1f0e
patch 8.2.3860: Vim9: codecov struggles with the file size
Bram Moolenaar <Bram@vim.org>
parents:
26644
diff
changeset
|
19 // When not generating protos this is included in proto.h |
|
4b23672d1f0e
patch 8.2.3860: Vim9: codecov struggles with the file size
Bram Moolenaar <Bram@vim.org>
parents:
26644
diff
changeset
|
20 #ifdef PROTO |
|
4b23672d1f0e
patch 8.2.3860: Vim9: codecov struggles with the file size
Bram Moolenaar <Bram@vim.org>
parents:
26644
diff
changeset
|
21 # include "vim9.h" |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
22 #endif |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
23 |
|
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 // Structure put on ec_trystack when ISN_TRY is encountered. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
26 typedef struct { |
|
23921
a834f9c082e3
patch 8.2.2503: Vim9: a caught error may leave something on the stack
Bram Moolenaar <Bram@vim.org>
parents:
23917
diff
changeset
|
27 int tcd_frame_idx; // ec_frame_idx at ISN_TRY |
|
a834f9c082e3
patch 8.2.2503: Vim9: a caught error may leave something on the stack
Bram Moolenaar <Bram@vim.org>
parents:
23917
diff
changeset
|
28 int tcd_stack_len; // size of ectx.ec_stack at ISN_TRY |
|
25080
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
29 int tcd_in_catch; // in catch or finally block |
|
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
30 int tcd_did_throw; // set did_throw in :endtry |
|
23994
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
31 int tcd_catch_idx; // instruction of the first :catch or :finally |
|
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
32 int tcd_finally_idx; // instruction of the :finally block or zero |
|
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
33 int tcd_endtry_idx; // instruction of the :endtry |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
34 int tcd_caught; // catch block entered |
|
24122
e8b21a3bb0d5
patch 8.2.2602: Vim9: continue doesn't work if :while is very first command
Bram Moolenaar <Bram@vim.org>
parents:
24112
diff
changeset
|
35 int tcd_cont; // :continue encountered, jump here (minus one) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
36 int tcd_return; // when TRUE return from end of :finally |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
37 } trycmd_T; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
38 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
39 // Data local to a function. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
40 // On a function call, if not empty, is saved on the stack and restored when |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
41 // returning. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
42 typedef struct { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
43 int floc_restore_cmdmod; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
44 cmdmod_T floc_save_cmdmod; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
45 int floc_restore_cmdmod_stacklen; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
46 } funclocal_T; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
47 |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
48 // Structure to hold a reference to an outer_T, with information of whether it |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
49 // was allocated. |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
50 typedef struct { |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
51 outer_T *or_outer; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
52 partial_T *or_partial; // decrement "or_partial->pt_refcount" later |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
53 int or_outer_allocated; // free "or_outer" later |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
54 } outer_ref_T; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
55 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
56 // A stack is used to store: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
57 // - arguments passed to a :def function |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
58 // - info about the calling function, to use when returning |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
59 // - local variables |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
60 // - temporary values |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
61 // |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
62 // In detail (FP == Frame Pointer): |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
63 // arg1 first argument from caller (if present) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
64 // arg2 second argument from caller (if present) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
65 // extra_arg1 any missing optional argument default value |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
66 // FP -> cur_func calling function |
|
28809
d0241e74bfdb
patch 8.2.4928: various white space and cosmetic mistakes
Bram Moolenaar <Bram@vim.org>
parents:
28692
diff
changeset
|
67 // current previous instruction pointer |
|
d0241e74bfdb
patch 8.2.4928: various white space and cosmetic mistakes
Bram Moolenaar <Bram@vim.org>
parents:
28692
diff
changeset
|
68 // frame_ptr previous Frame Pointer |
|
d0241e74bfdb
patch 8.2.4928: various white space and cosmetic mistakes
Bram Moolenaar <Bram@vim.org>
parents:
28692
diff
changeset
|
69 // var1 space for local variable |
|
d0241e74bfdb
patch 8.2.4928: various white space and cosmetic mistakes
Bram Moolenaar <Bram@vim.org>
parents:
28692
diff
changeset
|
70 // var2 space for local variable |
|
d0241e74bfdb
patch 8.2.4928: various white space and cosmetic mistakes
Bram Moolenaar <Bram@vim.org>
parents:
28692
diff
changeset
|
71 // .... fixed space for max. number of local variables |
|
d0241e74bfdb
patch 8.2.4928: various white space and cosmetic mistakes
Bram Moolenaar <Bram@vim.org>
parents:
28692
diff
changeset
|
72 // temp temporary values |
|
d0241e74bfdb
patch 8.2.4928: various white space and cosmetic mistakes
Bram Moolenaar <Bram@vim.org>
parents:
28692
diff
changeset
|
73 // .... flexible space for temporary values (can grow big) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
74 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
75 /* |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
76 * Execution context. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
77 */ |
|
23285
112fa621b127
patch 8.2.2188: Vim9: crash when calling global function from :def function
Bram Moolenaar <Bram@vim.org>
parents:
23266
diff
changeset
|
78 struct ectx_S { |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
79 garray_T ec_stack; // stack of typval_T values |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
80 int ec_frame_idx; // index in ec_stack: context of ec_dfunc_idx |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
81 int ec_initial_frame_idx; // frame index when called |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
82 |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
83 outer_ref_T *ec_outer_ref; // outer scope used for closures, allocated |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
84 funclocal_T ec_funclocal; |
|
20244
23d75968ca5e
patch 8.2.0677: Vim9: no support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20225
diff
changeset
|
85 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
86 garray_T ec_trystack; // stack of trycmd_T values |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
87 |
|
25533
df39041f13ed
patch 8.2.3303: some structures could be smaller
Bram Moolenaar <Bram@vim.org>
parents:
25477
diff
changeset
|
88 isn_T *ec_instr; // array with instructions |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
89 int ec_dfunc_idx; // current function index |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
90 int ec_iidx; // index in ec_instr: instruction to execute |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
91 |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
92 garray_T ec_funcrefs; // partials that might be a closure |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
93 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
94 int ec_did_emsg_before; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
95 int ec_trylevel_at_start; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
96 where_T ec_where; |
|
23285
112fa621b127
patch 8.2.2188: Vim9: crash when calling global function from :def function
Bram Moolenaar <Bram@vim.org>
parents:
23266
diff
changeset
|
97 }; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
98 |
|
23976
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
99 #ifdef FEAT_PROFILE |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
100 // stack of profinfo_T used when profiling. |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
101 static garray_T profile_info_ga = {0, 0, sizeof(profinfo_T), 20, NULL}; |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
102 #endif |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
103 |
|
30065
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
104 // Get pointer to item in the stack. |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
105 #define STACK_TV(idx) (((typval_T *)ectx->ec_stack.ga_data) + idx) |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
106 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
107 // Get pointer to item relative to the bottom of the stack, -1 is the last one. |
|
21826
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
108 #define STACK_TV_BOT(idx) (((typval_T *)ectx->ec_stack.ga_data) + ectx->ec_stack.ga_len + (idx)) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
109 |
|
30065
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
110 // Get pointer to a local variable on the stack. Negative for arguments. |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
111 #define STACK_TV_VAR(idx) (((typval_T *)ectx->ec_stack.ga_data) + ectx->ec_frame_idx + STACK_FRAME_SIZE + idx) |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
112 |
|
21771
fcf978444298
patch 8.2.1435: Vim9: always converting to string for ".." leads to mistakes
Bram Moolenaar <Bram@vim.org>
parents:
21757
diff
changeset
|
113 void |
|
fcf978444298
patch 8.2.1435: Vim9: always converting to string for ".." leads to mistakes
Bram Moolenaar <Bram@vim.org>
parents:
21757
diff
changeset
|
114 to_string_error(vartype_T vartype) |
|
fcf978444298
patch 8.2.1435: Vim9: always converting to string for ".." leads to mistakes
Bram Moolenaar <Bram@vim.org>
parents:
21757
diff
changeset
|
115 { |
|
21821
0deb6f96a5a3
patch 8.2.1460: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
21815
diff
changeset
|
116 semsg(_(e_cannot_convert_str_to_string), vartype_name(vartype)); |
|
21771
fcf978444298
patch 8.2.1435: Vim9: always converting to string for ".." leads to mistakes
Bram Moolenaar <Bram@vim.org>
parents:
21757
diff
changeset
|
117 } |
|
fcf978444298
patch 8.2.1435: Vim9: always converting to string for ".." leads to mistakes
Bram Moolenaar <Bram@vim.org>
parents:
21757
diff
changeset
|
118 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
119 /* |
|
19328
e99e6d794597
patch 8.2.0222: Vim9: optional function arguments don't work yet
Bram Moolenaar <Bram@vim.org>
parents:
19316
diff
changeset
|
120 * Return the number of arguments, including optional arguments and any vararg. |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
121 */ |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
122 static int |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
123 ufunc_argcount(ufunc_T *ufunc) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
124 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
125 return ufunc->uf_args.ga_len + (ufunc->uf_va_name != NULL ? 1 : 0); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
126 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
127 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
128 /* |
|
28598
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
129 * Create a new string from "count" items at the bottom of the stack. |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
130 * A trailing NUL is appended. |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
131 * When "count" is zero an empty string is added to the stack. |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
132 */ |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
133 static int |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
134 exe_concat(int count, ectx_T *ectx) |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
135 { |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
136 int idx; |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
137 int len = 0; |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
138 typval_T *tv; |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
139 garray_T ga; |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
140 |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
141 ga_init2(&ga, sizeof(char), 1); |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
142 // Preallocate enough space for the whole string to avoid having to grow |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
143 // and copy. |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
144 for (idx = 0; idx < count; ++idx) |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
145 { |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
146 tv = STACK_TV_BOT(idx - count); |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
147 if (tv->vval.v_string != NULL) |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
148 len += (int)STRLEN(tv->vval.v_string); |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
149 } |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
150 |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
151 if (ga_grow(&ga, len + 1) == FAIL) |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
152 return FAIL; |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
153 |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
154 for (idx = 0; idx < count; ++idx) |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
155 { |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
156 tv = STACK_TV_BOT(idx - count); |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
157 ga_concat(&ga, tv->vval.v_string); |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
158 clear_tv(tv); |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
159 } |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
160 |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
161 // add a terminating NUL |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
162 ga_append(&ga, NUL); |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
163 |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
164 ectx->ec_stack.ga_len -= count - 1; |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
165 STACK_TV_BOT(-1)->vval.v_string = ga.ga_data; |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
166 |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
167 return OK; |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
168 } |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
169 |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
170 /* |
|
19981
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
171 * Create a new list from "count" items at the bottom of the stack. |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
172 * When "count" is zero an empty list is added to the stack. |
|
28217
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
173 * When "count" is -1 a NULL list is added to the stack. |
|
19981
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
174 */ |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
175 static int |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
176 exe_newlist(int count, ectx_T *ectx) |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
177 { |
|
28217
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
178 list_T *list = NULL; |
|
19981
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
179 int idx; |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
180 typval_T *tv; |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
181 |
|
28217
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
182 if (count >= 0) |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
183 { |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
184 list = list_alloc_with_items(count); |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
185 if (list == NULL) |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
186 return FAIL; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
187 for (idx = 0; idx < count; ++idx) |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
188 list_set_item(list, idx, STACK_TV_BOT(idx - count)); |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
189 } |
|
19981
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
190 |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
191 if (count > 0) |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
192 ectx->ec_stack.ga_len -= count - 1; |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
193 else if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
28217
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
194 { |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
195 list_unref(list); |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
196 return FAIL; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
197 } |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
198 else |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
199 ++ectx->ec_stack.ga_len; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
200 tv = STACK_TV_BOT(-1); |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
201 tv->v_type = VAR_LIST; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
202 tv->vval.v_list = list; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
203 if (list != NULL) |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
204 ++list->lv_refcount; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
205 return OK; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
206 } |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
207 |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
208 /* |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
209 * Implementation of ISN_NEWDICT. |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
210 * Returns FAIL on total failure, MAYBE on error. |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
211 */ |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
212 static int |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
213 exe_newdict(int count, ectx_T *ectx) |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
214 { |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
215 dict_T *dict = NULL; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
216 dictitem_T *item; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
217 char_u *key; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
218 int idx; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
219 typval_T *tv; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
220 |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
221 if (count >= 0) |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
222 { |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
223 dict = dict_alloc(); |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
224 if (unlikely(dict == NULL)) |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
225 return FAIL; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
226 for (idx = 0; idx < count; ++idx) |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
227 { |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
228 // have already checked key type is VAR_STRING |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
229 tv = STACK_TV_BOT(2 * (idx - count)); |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
230 // check key is unique |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
231 key = tv->vval.v_string == NULL |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
232 ? (char_u *)"" : tv->vval.v_string; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
233 item = dict_find(dict, key, -1); |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
234 if (item != NULL) |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
235 { |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
236 semsg(_(e_duplicate_key_in_dicitonary), key); |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
237 dict_unref(dict); |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
238 return MAYBE; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
239 } |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
240 item = dictitem_alloc(key); |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
241 clear_tv(tv); |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
242 if (unlikely(item == NULL)) |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
243 { |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
244 dict_unref(dict); |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
245 return FAIL; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
246 } |
|
28343
909994047400
patch 8.2.4697: Vim9: crash when adding a duplicate key to a dictionary
Bram Moolenaar <Bram@vim.org>
parents:
28309
diff
changeset
|
247 tv = STACK_TV_BOT(2 * (idx - count) + 1); |
|
909994047400
patch 8.2.4697: Vim9: crash when adding a duplicate key to a dictionary
Bram Moolenaar <Bram@vim.org>
parents:
28309
diff
changeset
|
248 item->di_tv = *tv; |
|
28217
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
249 item->di_tv.v_lock = 0; |
|
28343
909994047400
patch 8.2.4697: Vim9: crash when adding a duplicate key to a dictionary
Bram Moolenaar <Bram@vim.org>
parents:
28309
diff
changeset
|
250 tv->v_type = VAR_UNKNOWN; |
|
28217
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
251 if (dict_add(dict, item) == FAIL) |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
252 { |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
253 // can this ever happen? |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
254 dict_unref(dict); |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
255 return FAIL; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
256 } |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
257 } |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
258 } |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
259 |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
260 if (count > 0) |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
261 ectx->ec_stack.ga_len -= 2 * count - 1; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
262 else if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
19981
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
263 return FAIL; |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
264 else |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
265 ++ectx->ec_stack.ga_len; |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
266 tv = STACK_TV_BOT(-1); |
|
28217
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
267 tv->v_type = VAR_DICT; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
268 tv->v_lock = 0; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
269 tv->vval.v_dict = dict; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
270 if (dict != NULL) |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
271 ++dict->dv_refcount; |
|
19981
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
272 return OK; |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
273 } |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
274 |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
275 /* |
|
24978
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
276 * If debug_tick changed check if "ufunc" has a breakpoint and update |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
277 * "uf_has_breakpoint". |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
278 */ |
|
28097
632a84e2ce92
patch 8.2.4573: a nested function is compiled for debugging without context
Bram Moolenaar <Bram@vim.org>
parents:
28033
diff
changeset
|
279 void |
|
24978
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
280 update_has_breakpoint(ufunc_T *ufunc) |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
281 { |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
282 if (ufunc->uf_debug_tick != debug_tick) |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
283 { |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
284 linenr_T breakpoint; |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
285 |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
286 ufunc->uf_debug_tick = debug_tick; |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
287 breakpoint = dbg_find_breakpoint(FALSE, ufunc->uf_name, 0); |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
288 ufunc->uf_has_breakpoint = breakpoint > 0; |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
289 } |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
290 } |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
291 |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
292 static garray_T dict_stack = GA_EMPTY; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
293 |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
294 /* |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
295 * Put a value on the dict stack. This consumes "tv". |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
296 */ |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
297 static int |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
298 dict_stack_save(typval_T *tv) |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
299 { |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
300 if (dict_stack.ga_growsize == 0) |
|
27028
c9474ae175f4
patch 8.2.4043: using int for second argument of ga_init2()
Bram Moolenaar <Bram@vim.org>
parents:
27026
diff
changeset
|
301 ga_init2(&dict_stack, sizeof(typval_T), 10); |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
302 if (ga_grow(&dict_stack, 1) == FAIL) |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
303 return FAIL; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
304 ((typval_T *)dict_stack.ga_data)[dict_stack.ga_len] = *tv; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
305 ++dict_stack.ga_len; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
306 return OK; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
307 } |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
308 |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
309 /* |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
310 * Get the typval at top of the dict stack. |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
311 */ |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
312 static typval_T * |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
313 dict_stack_get_tv(void) |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
314 { |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
315 if (dict_stack.ga_len == 0) |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
316 return NULL; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
317 return ((typval_T *)dict_stack.ga_data) + dict_stack.ga_len - 1; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
318 } |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
319 |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
320 /* |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
321 * Get the dict at top of the dict stack. |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
322 */ |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
323 static dict_T * |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
324 dict_stack_get_dict(void) |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
325 { |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
326 typval_T *tv; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
327 |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
328 if (dict_stack.ga_len == 0) |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
329 return NULL; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
330 tv = ((typval_T *)dict_stack.ga_data) + dict_stack.ga_len - 1; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
331 if (tv->v_type == VAR_DICT) |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
332 return tv->vval.v_dict; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
333 return NULL; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
334 } |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
335 |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
336 /* |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
337 * Drop an item from the dict stack. |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
338 */ |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
339 static void |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
340 dict_stack_drop(void) |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
341 { |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
342 if (dict_stack.ga_len == 0) |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
343 { |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
344 iemsg("Dict stack underflow"); |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
345 return; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
346 } |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
347 --dict_stack.ga_len; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
348 clear_tv(((typval_T *)dict_stack.ga_data) + dict_stack.ga_len); |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
349 } |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
350 |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
351 /* |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
352 * Drop items from the dict stack until the length is equal to "len". |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
353 */ |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
354 static void |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
355 dict_stack_clear(int len) |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
356 { |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
357 while (dict_stack.ga_len > len) |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
358 dict_stack_drop(); |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
359 } |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
360 |
|
24978
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
361 /* |
|
27591
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
362 * Get a pointer to useful "pt_outer" of "pt". |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
363 */ |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
364 static outer_T * |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
365 get_pt_outer(partial_T *pt) |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
366 { |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
367 partial_T *ptref = pt->pt_outer_partial; |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
368 |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
369 if (ptref == NULL) |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
370 return &pt->pt_outer; |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
371 |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
372 // partial using partial (recursively) |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
373 while (ptref->pt_outer_partial != NULL) |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
374 ptref = ptref->pt_outer_partial; |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
375 return &ptref->pt_outer; |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
376 } |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
377 |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
378 /* |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
379 * Call compiled function "cdf_idx" from compiled code. |
|
23557
f50ee1ae4d9b
patch 8.2.2321: Vim9: cannot nest closures
Bram Moolenaar <Bram@vim.org>
parents:
23553
diff
changeset
|
380 * This adds a stack frame and sets the instruction pointer to the start of the |
|
f50ee1ae4d9b
patch 8.2.2321: Vim9: cannot nest closures
Bram Moolenaar <Bram@vim.org>
parents:
23553
diff
changeset
|
381 * called function. |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
382 * If "pt" is not null use "pt->pt_outer" for ec_outer_ref->or_outer. |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
383 * |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
384 * Stack has: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
385 * - current arguments (already there) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
386 * - omitted optional argument (default values) added here |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
387 * - stack frame: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
388 * - pointer to calling function |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
389 * - Index of next instruction in calling function |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
390 * - previous frame pointer |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
391 * - reserved space for local variables |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
392 */ |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
393 static int |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
394 call_dfunc( |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
395 int cdf_idx, |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
396 partial_T *pt, |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
397 int argcount_arg, |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
398 ectx_T *ectx) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
399 { |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
400 int argcount = argcount_arg; |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
401 dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) + cdf_idx; |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
402 ufunc_T *ufunc = dfunc->df_ufunc; |
|
24918
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
403 int did_emsg_before = did_emsg_cumul + did_emsg; |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
404 int arg_to_add; |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
405 int vararg_count = 0; |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
406 int varcount; |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
407 int idx; |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
408 estack_T *entry; |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
409 funclocal_T *floc = NULL; |
|
25222
fbb530e081ca
patch 8.2.3147: Vim9: profiling does not work with a nested function
Bram Moolenaar <Bram@vim.org>
parents:
25159
diff
changeset
|
410 int res = OK; |
|
28101
3bc0a639dfb0
patch 8.2.4575: Vim9: test for profiling still fails
Bram Moolenaar <Bram@vim.org>
parents:
28097
diff
changeset
|
411 compiletype_T compile_type; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
412 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
413 if (dfunc->df_deleted) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
414 { |
|
23285
112fa621b127
patch 8.2.2188: Vim9: crash when calling global function from :def function
Bram Moolenaar <Bram@vim.org>
parents:
23266
diff
changeset
|
415 // don't use ufunc->uf_name, it may have been freed |
|
26877
06a137af96f8
patch 8.2.3967: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26865
diff
changeset
|
416 emsg_funcname(e_function_was_deleted_str, |
|
23285
112fa621b127
patch 8.2.2188: Vim9: crash when calling global function from :def function
Bram Moolenaar <Bram@vim.org>
parents:
23266
diff
changeset
|
417 dfunc->df_name == NULL ? (char_u *)"unknown" : dfunc->df_name); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
418 return FAIL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
419 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
420 |
|
23735
7caffd835aa1
patch 8.2.2409: Vim9: profiling only works for one function
Bram Moolenaar <Bram@vim.org>
parents:
23725
diff
changeset
|
421 #ifdef FEAT_PROFILE |
|
23976
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
422 if (do_profiling == PROF_YES) |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
423 { |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
424 if (GA_GROW_OK(&profile_info_ga, 1)) |
|
23976
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
425 { |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
426 profinfo_T *info = ((profinfo_T *)profile_info_ga.ga_data) |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
427 + profile_info_ga.ga_len; |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
428 ++profile_info_ga.ga_len; |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
429 CLEAR_POINTER(info); |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
430 profile_may_start_func(info, ufunc, |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
431 (((dfunc_T *)def_functions.ga_data) |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
432 + ectx->ec_dfunc_idx)->df_ufunc); |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
433 } |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
434 } |
|
23735
7caffd835aa1
patch 8.2.2409: Vim9: profiling only works for one function
Bram Moolenaar <Bram@vim.org>
parents:
23725
diff
changeset
|
435 #endif |
|
7caffd835aa1
patch 8.2.2409: Vim9: profiling only works for one function
Bram Moolenaar <Bram@vim.org>
parents:
23725
diff
changeset
|
436 |
|
24918
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
437 // When debugging and using "cont" switches to the not-debugged |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
438 // instructions, may need to still compile them. |
|
28101
3bc0a639dfb0
patch 8.2.4575: Vim9: test for profiling still fails
Bram Moolenaar <Bram@vim.org>
parents:
28097
diff
changeset
|
439 compile_type = get_compile_type(ufunc); |
|
3bc0a639dfb0
patch 8.2.4575: Vim9: test for profiling still fails
Bram Moolenaar <Bram@vim.org>
parents:
28097
diff
changeset
|
440 if (func_needs_compiling(ufunc, compile_type)) |
|
25222
fbb530e081ca
patch 8.2.3147: Vim9: profiling does not work with a nested function
Bram Moolenaar <Bram@vim.org>
parents:
25159
diff
changeset
|
441 { |
|
28101
3bc0a639dfb0
patch 8.2.4575: Vim9: test for profiling still fails
Bram Moolenaar <Bram@vim.org>
parents:
28097
diff
changeset
|
442 res = compile_def_function(ufunc, FALSE, compile_type, NULL); |
|
25222
fbb530e081ca
patch 8.2.3147: Vim9: profiling does not work with a nested function
Bram Moolenaar <Bram@vim.org>
parents:
25159
diff
changeset
|
443 |
|
fbb530e081ca
patch 8.2.3147: Vim9: profiling does not work with a nested function
Bram Moolenaar <Bram@vim.org>
parents:
25159
diff
changeset
|
444 // compile_def_function() may cause def_functions.ga_data to change |
|
fbb530e081ca
patch 8.2.3147: Vim9: profiling does not work with a nested function
Bram Moolenaar <Bram@vim.org>
parents:
25159
diff
changeset
|
445 dfunc = ((dfunc_T *)def_functions.ga_data) + cdf_idx; |
|
fbb530e081ca
patch 8.2.3147: Vim9: profiling does not work with a nested function
Bram Moolenaar <Bram@vim.org>
parents:
25159
diff
changeset
|
446 } |
|
fbb530e081ca
patch 8.2.3147: Vim9: profiling does not work with a nested function
Bram Moolenaar <Bram@vim.org>
parents:
25159
diff
changeset
|
447 if (res == FAIL || INSTRUCTIONS(dfunc) == NULL) |
|
24918
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
448 { |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
449 if (did_emsg_cumul + did_emsg == did_emsg_before) |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
450 semsg(_(e_function_is_not_compiled_str), |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
451 printable_func_name(ufunc)); |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
452 return FAIL; |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
453 } |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
454 |
|
19975
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
455 if (ufunc->uf_va_name != NULL) |
|
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
456 { |
|
19981
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
457 // Need to make a list out of the vararg arguments. |
|
19975
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
458 // Stack at time of call with 2 varargs: |
|
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
459 // normal_arg |
|
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
460 // optional_arg |
|
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
461 // vararg_1 |
|
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
462 // vararg_2 |
|
19981
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
463 // After creating the list: |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
464 // normal_arg |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
465 // optional_arg |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
466 // vararg-list |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
467 // With missing optional arguments we get: |
|
19975
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
468 // normal_arg |
|
19981
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
469 // After creating the list |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
470 // normal_arg |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
471 // (space for optional_arg) |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
472 // vararg-list |
|
19975
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
473 vararg_count = argcount - ufunc->uf_args.ga_len; |
|
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
474 if (vararg_count < 0) |
|
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
475 vararg_count = 0; |
|
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
476 else |
|
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
477 argcount -= vararg_count; |
|
19981
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
478 if (exe_newlist(vararg_count, ectx) == FAIL) |
|
19975
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
479 return FAIL; |
|
19981
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
480 |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
481 vararg_count = 1; |
|
19975
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
482 } |
|
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
483 |
|
19981
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
484 arg_to_add = ufunc->uf_args.ga_len - argcount; |
|
19975
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
485 if (arg_to_add < 0) |
|
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
486 { |
|
29322
ac102d0fb50f
patch 9.0.0004: plural messages not translated properly
Bram Moolenaar <Bram@vim.org>
parents:
28968
diff
changeset
|
487 semsg(NGETTEXT(e_one_argument_too_many, e_nr_arguments_too_many, |
|
ac102d0fb50f
patch 9.0.0004: plural messages not translated properly
Bram Moolenaar <Bram@vim.org>
parents:
28968
diff
changeset
|
488 -arg_to_add), -arg_to_add); |
|
19975
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
489 return FAIL; |
|
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
490 } |
|
27756
60ac4228a73d
patch 8.2.4404: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27665
diff
changeset
|
491 else if (arg_to_add > ufunc->uf_def_args.ga_len) |
|
60ac4228a73d
patch 8.2.4404: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27665
diff
changeset
|
492 { |
|
60ac4228a73d
patch 8.2.4404: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27665
diff
changeset
|
493 int missing = arg_to_add - ufunc->uf_def_args.ga_len; |
|
60ac4228a73d
patch 8.2.4404: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27665
diff
changeset
|
494 |
|
29322
ac102d0fb50f
patch 9.0.0004: plural messages not translated properly
Bram Moolenaar <Bram@vim.org>
parents:
28968
diff
changeset
|
495 semsg(NGETTEXT(e_one_argument_too_few, e_nr_arguments_too_few, |
|
ac102d0fb50f
patch 9.0.0004: plural messages not translated properly
Bram Moolenaar <Bram@vim.org>
parents:
28968
diff
changeset
|
496 missing), missing); |
|
27756
60ac4228a73d
patch 8.2.4404: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27665
diff
changeset
|
497 return FAIL; |
|
60ac4228a73d
patch 8.2.4404: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27665
diff
changeset
|
498 } |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
499 |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
500 // Reserve space for: |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
501 // - missing arguments |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
502 // - stack frame |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
503 // - local variables |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
504 // - if needed: a counter for number of closures created in |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
505 // ectx->ec_funcrefs. |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
506 varcount = dfunc->df_varcount + dfunc->df_has_closure; |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
507 if (GA_GROW_FAILS(&ectx->ec_stack, arg_to_add + STACK_FRAME_SIZE + varcount)) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
508 return FAIL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
509 |
|
22908
54219df706b5
patch 8.2.2001: Vim9: :def function does not apply 'maxfuncdepth'
Bram Moolenaar <Bram@vim.org>
parents:
22860
diff
changeset
|
510 // If depth of calling is getting too high, don't execute the function. |
|
54219df706b5
patch 8.2.2001: Vim9: :def function does not apply 'maxfuncdepth'
Bram Moolenaar <Bram@vim.org>
parents:
22860
diff
changeset
|
511 if (funcdepth_increment() == FAIL) |
|
54219df706b5
patch 8.2.2001: Vim9: :def function does not apply 'maxfuncdepth'
Bram Moolenaar <Bram@vim.org>
parents:
22860
diff
changeset
|
512 return FAIL; |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
513 ++ex_nesting_level; |
|
22908
54219df706b5
patch 8.2.2001: Vim9: :def function does not apply 'maxfuncdepth'
Bram Moolenaar <Bram@vim.org>
parents:
22860
diff
changeset
|
514 |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
515 // Only make a copy of funclocal if it contains something to restore. |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
516 if (ectx->ec_funclocal.floc_restore_cmdmod) |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
517 { |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
518 floc = ALLOC_ONE(funclocal_T); |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
519 if (floc == NULL) |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
520 return FAIL; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
521 *floc = ectx->ec_funclocal; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
522 ectx->ec_funclocal.floc_restore_cmdmod = FALSE; |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
523 } |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
524 |
|
19981
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
525 // Move the vararg-list to below the missing optional arguments. |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
526 if (vararg_count > 0 && arg_to_add > 0) |
|
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
527 *STACK_TV_BOT(arg_to_add - 1) = *STACK_TV_BOT(-1); |
|
19328
e99e6d794597
patch 8.2.0222: Vim9: optional function arguments don't work yet
Bram Moolenaar <Bram@vim.org>
parents:
19316
diff
changeset
|
528 |
|
e99e6d794597
patch 8.2.0222: Vim9: optional function arguments don't work yet
Bram Moolenaar <Bram@vim.org>
parents:
19316
diff
changeset
|
529 // Reserve space for omitted optional arguments, filled in soon. |
|
19975
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
530 for (idx = 0; idx < arg_to_add; ++idx) |
|
19981
014daa59ba50
patch 8.2.0546: Vim9: varargs implementation is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
19975
diff
changeset
|
531 STACK_TV_BOT(idx - vararg_count)->v_type = VAR_UNKNOWN; |
|
19975
4e8e0ce576af
patch 8.2.0543: Vim9: function with varargs does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
19964
diff
changeset
|
532 ectx->ec_stack.ga_len += arg_to_add; |
|
19181
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 // Store current execution state in stack frame for ISN_RETURN. |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
535 STACK_TV_BOT(STACK_FRAME_FUNC_OFF)->vval.v_number = ectx->ec_dfunc_idx; |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
536 STACK_TV_BOT(STACK_FRAME_IIDX_OFF)->vval.v_number = ectx->ec_iidx; |
|
24545
fe29b220eece
patch 8.2.2812: Vim9: still crash when using substitute expression
Bram Moolenaar <Bram@vim.org>
parents:
24541
diff
changeset
|
537 STACK_TV_BOT(STACK_FRAME_INSTR_OFF)->vval.v_string = (void *)ectx->ec_instr; |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
538 STACK_TV_BOT(STACK_FRAME_OUTER_OFF)->vval.v_string = |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
539 (void *)ectx->ec_outer_ref; |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
540 STACK_TV_BOT(STACK_FRAME_FUNCLOCAL_OFF)->vval.v_string = (void *)floc; |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
541 STACK_TV_BOT(STACK_FRAME_IDX_OFF)->vval.v_number = ectx->ec_frame_idx; |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
542 ectx->ec_frame_idx = ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
543 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
544 // Initialize local variables |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
545 for (idx = 0; idx < dfunc->df_varcount; ++idx) |
|
26729
b969fdb8cd46
patch 8.2.3893: Vim9: many local variables are initialized with an instruction
Bram Moolenaar <Bram@vim.org>
parents:
26698
diff
changeset
|
546 { |
|
b969fdb8cd46
patch 8.2.3893: Vim9: many local variables are initialized with an instruction
Bram Moolenaar <Bram@vim.org>
parents:
26698
diff
changeset
|
547 typval_T *tv = STACK_TV_BOT(STACK_FRAME_SIZE + idx); |
|
b969fdb8cd46
patch 8.2.3893: Vim9: many local variables are initialized with an instruction
Bram Moolenaar <Bram@vim.org>
parents:
26698
diff
changeset
|
548 |
|
b969fdb8cd46
patch 8.2.3893: Vim9: many local variables are initialized with an instruction
Bram Moolenaar <Bram@vim.org>
parents:
26698
diff
changeset
|
549 tv->v_type = VAR_NUMBER; |
|
b969fdb8cd46
patch 8.2.3893: Vim9: many local variables are initialized with an instruction
Bram Moolenaar <Bram@vim.org>
parents:
26698
diff
changeset
|
550 tv->vval.v_number = 0; |
|
b969fdb8cd46
patch 8.2.3893: Vim9: many local variables are initialized with an instruction
Bram Moolenaar <Bram@vim.org>
parents:
26698
diff
changeset
|
551 } |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
552 if (dfunc->df_has_closure) |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
553 { |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
554 typval_T *tv = STACK_TV_BOT(STACK_FRAME_SIZE + dfunc->df_varcount); |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
555 |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
556 tv->v_type = VAR_NUMBER; |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
557 tv->vval.v_number = 0; |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
558 } |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
559 ectx->ec_stack.ga_len += STACK_FRAME_SIZE + varcount; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
560 |
|
23699
317018f62643
patch 8.2.2391: memory leak when creating a global function with closure
Bram Moolenaar <Bram@vim.org>
parents:
23697
diff
changeset
|
561 if (pt != NULL || ufunc->uf_partial != NULL |
|
317018f62643
patch 8.2.2391: memory leak when creating a global function with closure
Bram Moolenaar <Bram@vim.org>
parents:
23697
diff
changeset
|
562 || (ufunc->uf_flags & FC_CLOSURE)) |
|
23285
112fa621b127
patch 8.2.2188: Vim9: crash when calling global function from :def function
Bram Moolenaar <Bram@vim.org>
parents:
23266
diff
changeset
|
563 { |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
564 outer_ref_T *ref = ALLOC_CLEAR_ONE(outer_ref_T); |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
565 |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
566 if (ref == NULL) |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
567 return FAIL; |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
568 if (pt != NULL) |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
569 { |
|
27591
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
570 ref->or_outer = get_pt_outer(pt); |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
571 ++pt->pt_refcount; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
572 ref->or_partial = pt; |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
573 } |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
574 else if (ufunc->uf_partial != NULL) |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
575 { |
|
27591
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
576 ref->or_outer = get_pt_outer(ufunc->uf_partial); |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
577 ++ufunc->uf_partial->pt_refcount; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
578 ref->or_partial = ufunc->uf_partial; |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
579 } |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
580 else |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
581 { |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
582 ref->or_outer = ALLOC_CLEAR_ONE(outer_T); |
|
25350
0c5b84c5862a
patch 8.2.3212: Vim9: execution speed can be improved
Bram Moolenaar <Bram@vim.org>
parents:
25330
diff
changeset
|
583 if (unlikely(ref->or_outer == NULL)) |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
584 { |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
585 vim_free(ref); |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
586 return FAIL; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
587 } |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
588 ref->or_outer_allocated = TRUE; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
589 ref->or_outer->out_stack = &ectx->ec_stack; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
590 ref->or_outer->out_frame_idx = ectx->ec_frame_idx; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
591 if (ectx->ec_outer_ref != NULL) |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
592 ref->or_outer->out_up = ectx->ec_outer_ref->or_outer; |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
593 } |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
594 ectx->ec_outer_ref = ref; |
|
23557
f50ee1ae4d9b
patch 8.2.2321: Vim9: cannot nest closures
Bram Moolenaar <Bram@vim.org>
parents:
23553
diff
changeset
|
595 } |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
596 else |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
597 ectx->ec_outer_ref = NULL; |
|
23285
112fa621b127
patch 8.2.2188: Vim9: crash when calling global function from :def function
Bram Moolenaar <Bram@vim.org>
parents:
23266
diff
changeset
|
598 |
|
24146
03fc95628eb0
patch 8.2.2614: Vim9: function is deleted while executing
Bram Moolenaar <Bram@vim.org>
parents:
24128
diff
changeset
|
599 ++ufunc->uf_calls; |
|
03fc95628eb0
patch 8.2.2614: Vim9: function is deleted while executing
Bram Moolenaar <Bram@vim.org>
parents:
24128
diff
changeset
|
600 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
601 // Set execution state to the start of the called function. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
602 ectx->ec_dfunc_idx = cdf_idx; |
|
23735
7caffd835aa1
patch 8.2.2409: Vim9: profiling only works for one function
Bram Moolenaar <Bram@vim.org>
parents:
23725
diff
changeset
|
603 ectx->ec_instr = INSTRUCTIONS(dfunc); |
|
23717
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
604 entry = estack_push_ufunc(ufunc, 1); |
|
21206
caab594592cc
patch 8.2.1154: Vim9: crash when using imported function
Bram Moolenaar <Bram@vim.org>
parents:
21168
diff
changeset
|
605 if (entry != NULL) |
|
caab594592cc
patch 8.2.1154: Vim9: crash when using imported function
Bram Moolenaar <Bram@vim.org>
parents:
21168
diff
changeset
|
606 { |
|
caab594592cc
patch 8.2.1154: Vim9: crash when using imported function
Bram Moolenaar <Bram@vim.org>
parents:
21168
diff
changeset
|
607 // Set the script context to the script where the function was defined. |
|
24471
baf75c8e1b7b
patch 8.2.2775: Vim9: wrong line number used for some commands
Bram Moolenaar <Bram@vim.org>
parents:
24454
diff
changeset
|
608 // Save the current context so it can be restored on return. |
|
baf75c8e1b7b
patch 8.2.2775: Vim9: wrong line number used for some commands
Bram Moolenaar <Bram@vim.org>
parents:
24454
diff
changeset
|
609 entry->es_save_sctx = current_sctx; |
|
baf75c8e1b7b
patch 8.2.2775: Vim9: wrong line number used for some commands
Bram Moolenaar <Bram@vim.org>
parents:
24454
diff
changeset
|
610 current_sctx = ufunc->uf_script_ctx; |
|
21206
caab594592cc
patch 8.2.1154: Vim9: crash when using imported function
Bram Moolenaar <Bram@vim.org>
parents:
21168
diff
changeset
|
611 } |
|
19328
e99e6d794597
patch 8.2.0222: Vim9: optional function arguments don't work yet
Bram Moolenaar <Bram@vim.org>
parents:
19316
diff
changeset
|
612 |
|
24272
cabed216cc2f
patch 8.2.2677: Vim9: cannot use only some of the default arguments
Bram Moolenaar <Bram@vim.org>
parents:
24234
diff
changeset
|
613 // Start execution at the first instruction. |
|
cabed216cc2f
patch 8.2.2677: Vim9: cannot use only some of the default arguments
Bram Moolenaar <Bram@vim.org>
parents:
24234
diff
changeset
|
614 ectx->ec_iidx = 0; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
615 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
616 return OK; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
617 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
618 |
|
26560
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
619 // Double linked list of funcstack_T in use. |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
620 static funcstack_T *first_funcstack = NULL; |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
621 |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
622 static void |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
623 add_funcstack_to_list(funcstack_T *funcstack) |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
624 { |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
625 // Link in list of funcstacks. |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
626 if (first_funcstack != NULL) |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
627 first_funcstack->fs_prev = funcstack; |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
628 funcstack->fs_next = first_funcstack; |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
629 funcstack->fs_prev = NULL; |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
630 first_funcstack = funcstack; |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
631 } |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
632 |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
633 static void |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
634 remove_funcstack_from_list(funcstack_T *funcstack) |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
635 { |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
636 if (funcstack->fs_prev == NULL) |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
637 first_funcstack = funcstack->fs_next; |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
638 else |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
639 funcstack->fs_prev->fs_next = funcstack->fs_next; |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
640 if (funcstack->fs_next != NULL) |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
641 funcstack->fs_next->fs_prev = funcstack->fs_prev; |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
642 } |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
643 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
644 /* |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
645 * Used when returning from a function: Check if any closure is still |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
646 * referenced. If so then move the arguments and variables to a separate piece |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
647 * of stack to be used when the closure is called. |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
648 * When "free_arguments" is TRUE the arguments are to be freed. |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
649 * Returns FAIL when out of memory. |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
650 */ |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
651 static int |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
652 handle_closure_in_use(ectx_T *ectx, int free_arguments) |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
653 { |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
654 dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
655 + ectx->ec_dfunc_idx; |
|
22324
a4ed0de125d9
patch 8.2.1711: Vim9: leaking memory when using partial
Bram Moolenaar <Bram@vim.org>
parents:
22320
diff
changeset
|
656 int argcount; |
|
a4ed0de125d9
patch 8.2.1711: Vim9: leaking memory when using partial
Bram Moolenaar <Bram@vim.org>
parents:
22320
diff
changeset
|
657 int top; |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
658 int idx; |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
659 typval_T *tv; |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
660 int closure_in_use = FALSE; |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
661 garray_T *gap = &ectx->ec_funcrefs; |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
662 varnumber_T closure_count; |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
663 |
|
22324
a4ed0de125d9
patch 8.2.1711: Vim9: leaking memory when using partial
Bram Moolenaar <Bram@vim.org>
parents:
22320
diff
changeset
|
664 if (dfunc->df_ufunc == NULL) |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
665 return OK; // function was freed |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
666 if (dfunc->df_has_closure == 0) |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
667 return OK; // no closures |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
668 tv = STACK_TV(ectx->ec_frame_idx + STACK_FRAME_SIZE + dfunc->df_varcount); |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
669 closure_count = tv->vval.v_number; |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
670 if (closure_count == 0) |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
671 return OK; // no funcrefs created |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
672 |
|
22324
a4ed0de125d9
patch 8.2.1711: Vim9: leaking memory when using partial
Bram Moolenaar <Bram@vim.org>
parents:
22320
diff
changeset
|
673 argcount = ufunc_argcount(dfunc->df_ufunc); |
|
a4ed0de125d9
patch 8.2.1711: Vim9: leaking memory when using partial
Bram Moolenaar <Bram@vim.org>
parents:
22320
diff
changeset
|
674 top = ectx->ec_frame_idx - argcount; |
|
a4ed0de125d9
patch 8.2.1711: Vim9: leaking memory when using partial
Bram Moolenaar <Bram@vim.org>
parents:
22320
diff
changeset
|
675 |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
676 // Check if any created closure is still in use. |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
677 for (idx = 0; idx < closure_count; ++idx) |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
678 { |
|
22401
df1d7a560b35
patch 8.2.1749: Vim9: crash when closure fails in nested function
Bram Moolenaar <Bram@vim.org>
parents:
22391
diff
changeset
|
679 partial_T *pt; |
|
df1d7a560b35
patch 8.2.1749: Vim9: crash when closure fails in nested function
Bram Moolenaar <Bram@vim.org>
parents:
22391
diff
changeset
|
680 int off = gap->ga_len - closure_count + idx; |
|
df1d7a560b35
patch 8.2.1749: Vim9: crash when closure fails in nested function
Bram Moolenaar <Bram@vim.org>
parents:
22391
diff
changeset
|
681 |
|
df1d7a560b35
patch 8.2.1749: Vim9: crash when closure fails in nested function
Bram Moolenaar <Bram@vim.org>
parents:
22391
diff
changeset
|
682 if (off < 0) |
|
df1d7a560b35
patch 8.2.1749: Vim9: crash when closure fails in nested function
Bram Moolenaar <Bram@vim.org>
parents:
22391
diff
changeset
|
683 continue; // count is off or already done |
|
df1d7a560b35
patch 8.2.1749: Vim9: crash when closure fails in nested function
Bram Moolenaar <Bram@vim.org>
parents:
22391
diff
changeset
|
684 pt = ((partial_T **)gap->ga_data)[off]; |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
685 if (pt->pt_refcount > 1) |
|
20257
683c2da4982b
patch 8.2.0684: Vim9: memory leak when using lambda
Bram Moolenaar <Bram@vim.org>
parents:
20255
diff
changeset
|
686 { |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
687 int refcount = pt->pt_refcount; |
|
20283
934657e365e5
patch 8.2.0697: Vim9: memory leak when using nested function
Bram Moolenaar <Bram@vim.org>
parents:
20281
diff
changeset
|
688 int i; |
|
934657e365e5
patch 8.2.0697: Vim9: memory leak when using nested function
Bram Moolenaar <Bram@vim.org>
parents:
20281
diff
changeset
|
689 |
|
26771
fc859aea8cec
patch 8.2.3914: various spelling mistakes in comments
Bram Moolenaar <Bram@vim.org>
parents:
26747
diff
changeset
|
690 // A Reference in a local variable doesn't count, it gets |
|
20283
934657e365e5
patch 8.2.0697: Vim9: memory leak when using nested function
Bram Moolenaar <Bram@vim.org>
parents:
20281
diff
changeset
|
691 // unreferenced on return. |
|
934657e365e5
patch 8.2.0697: Vim9: memory leak when using nested function
Bram Moolenaar <Bram@vim.org>
parents:
20281
diff
changeset
|
692 for (i = 0; i < dfunc->df_varcount; ++i) |
|
934657e365e5
patch 8.2.0697: Vim9: memory leak when using nested function
Bram Moolenaar <Bram@vim.org>
parents:
20281
diff
changeset
|
693 { |
|
934657e365e5
patch 8.2.0697: Vim9: memory leak when using nested function
Bram Moolenaar <Bram@vim.org>
parents:
20281
diff
changeset
|
694 typval_T *stv = STACK_TV(ectx->ec_frame_idx |
|
934657e365e5
patch 8.2.0697: Vim9: memory leak when using nested function
Bram Moolenaar <Bram@vim.org>
parents:
20281
diff
changeset
|
695 + STACK_FRAME_SIZE + i); |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
696 if (stv->v_type == VAR_PARTIAL && pt == stv->vval.v_partial) |
|
20283
934657e365e5
patch 8.2.0697: Vim9: memory leak when using nested function
Bram Moolenaar <Bram@vim.org>
parents:
20281
diff
changeset
|
697 --refcount; |
|
934657e365e5
patch 8.2.0697: Vim9: memory leak when using nested function
Bram Moolenaar <Bram@vim.org>
parents:
20281
diff
changeset
|
698 } |
|
934657e365e5
patch 8.2.0697: Vim9: memory leak when using nested function
Bram Moolenaar <Bram@vim.org>
parents:
20281
diff
changeset
|
699 if (refcount > 1) |
|
934657e365e5
patch 8.2.0697: Vim9: memory leak when using nested function
Bram Moolenaar <Bram@vim.org>
parents:
20281
diff
changeset
|
700 { |
|
934657e365e5
patch 8.2.0697: Vim9: memory leak when using nested function
Bram Moolenaar <Bram@vim.org>
parents:
20281
diff
changeset
|
701 closure_in_use = TRUE; |
|
934657e365e5
patch 8.2.0697: Vim9: memory leak when using nested function
Bram Moolenaar <Bram@vim.org>
parents:
20281
diff
changeset
|
702 break; |
|
934657e365e5
patch 8.2.0697: Vim9: memory leak when using nested function
Bram Moolenaar <Bram@vim.org>
parents:
20281
diff
changeset
|
703 } |
|
20257
683c2da4982b
patch 8.2.0684: Vim9: memory leak when using lambda
Bram Moolenaar <Bram@vim.org>
parents:
20255
diff
changeset
|
704 } |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
705 } |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
706 |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
707 if (closure_in_use) |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
708 { |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
709 funcstack_T *funcstack = ALLOC_CLEAR_ONE(funcstack_T); |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
710 typval_T *stack; |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
711 |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
712 // A closure is using the arguments and/or local variables. |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
713 // Move them to the called function. |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
714 if (funcstack == NULL) |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
715 return FAIL; |
|
26560
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
716 |
|
22541
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
717 funcstack->fs_var_offset = argcount + STACK_FRAME_SIZE; |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
718 funcstack->fs_ga.ga_len = funcstack->fs_var_offset + dfunc->df_varcount; |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
719 stack = ALLOC_CLEAR_MULT(typval_T, funcstack->fs_ga.ga_len); |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
720 funcstack->fs_ga.ga_data = stack; |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
721 if (stack == NULL) |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
722 { |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
723 vim_free(funcstack); |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
724 return FAIL; |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
725 } |
|
26560
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
726 add_funcstack_to_list(funcstack); |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
727 |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
728 // Move or copy the arguments. |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
729 for (idx = 0; idx < argcount; ++idx) |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
730 { |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
731 tv = STACK_TV(top + idx); |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
732 if (free_arguments) |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
733 { |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
734 *(stack + idx) = *tv; |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
735 tv->v_type = VAR_UNKNOWN; |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
736 } |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
737 else |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
738 copy_tv(tv, stack + idx); |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
739 } |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
740 // Move the local variables. |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
741 for (idx = 0; idx < dfunc->df_varcount; ++idx) |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
742 { |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
743 tv = STACK_TV(ectx->ec_frame_idx + STACK_FRAME_SIZE + idx); |
|
20297
5f0611bc6377
patch 8.2.0704: Vim9: memory leak in disassemble test
Bram Moolenaar <Bram@vim.org>
parents:
20295
diff
changeset
|
744 |
|
22541
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
745 // A partial created for a local function, that is also used as a |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
746 // local variable, has a reference count for the variable, thus |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
747 // will never go down to zero. When all these refcounts are one |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
748 // then the funcstack is unused. We need to count how many we have |
|
26560
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
749 // so we know when to check. |
|
20297
5f0611bc6377
patch 8.2.0704: Vim9: memory leak in disassemble test
Bram Moolenaar <Bram@vim.org>
parents:
20295
diff
changeset
|
750 if (tv->v_type == VAR_PARTIAL && tv->vval.v_partial != NULL) |
|
5f0611bc6377
patch 8.2.0704: Vim9: memory leak in disassemble test
Bram Moolenaar <Bram@vim.org>
parents:
20295
diff
changeset
|
751 { |
|
22541
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
752 int i; |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
753 |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
754 for (i = 0; i < closure_count; ++i) |
|
22541
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
755 if (tv->vval.v_partial == ((partial_T **)gap->ga_data)[ |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
756 gap->ga_len - closure_count + i]) |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
757 ++funcstack->fs_min_refcount; |
|
20297
5f0611bc6377
patch 8.2.0704: Vim9: memory leak in disassemble test
Bram Moolenaar <Bram@vim.org>
parents:
20295
diff
changeset
|
758 } |
|
5f0611bc6377
patch 8.2.0704: Vim9: memory leak in disassemble test
Bram Moolenaar <Bram@vim.org>
parents:
20295
diff
changeset
|
759 |
|
22541
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
760 *(stack + funcstack->fs_var_offset + idx) = *tv; |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
761 tv->v_type = VAR_UNKNOWN; |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
762 } |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
763 |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
764 for (idx = 0; idx < closure_count; ++idx) |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
765 { |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
766 partial_T *pt = ((partial_T **)gap->ga_data)[gap->ga_len |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
767 - closure_count + idx]; |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
768 if (pt->pt_refcount > 1) |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
769 { |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
770 ++funcstack->fs_refcount; |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
771 pt->pt_funcstack = funcstack; |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
772 pt->pt_outer.out_stack = &funcstack->fs_ga; |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
773 pt->pt_outer.out_frame_idx = ectx->ec_frame_idx - top; |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
774 } |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
775 } |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
776 } |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
777 |
|
22371
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
778 for (idx = 0; idx < closure_count; ++idx) |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
779 partial_unref(((partial_T **)gap->ga_data)[gap->ga_len |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
780 - closure_count + idx]); |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
781 gap->ga_len -= closure_count; |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
782 if (gap->ga_len == 0) |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
783 ga_clear(gap); |
|
15003353a464
patch 8.2.1734: Vim9: cannot use a funcref for a closure twice
Bram Moolenaar <Bram@vim.org>
parents:
22324
diff
changeset
|
784 |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
785 return OK; |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
786 } |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
787 |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
788 /* |
|
22541
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
789 * Called when a partial is freed or its reference count goes down to one. The |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
790 * funcstack may be the only reference to the partials in the local variables. |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
791 * Go over all of them, the funcref and can be freed if all partials |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
792 * referencing the funcstack have a reference count of one. |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
793 */ |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
794 void |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
795 funcstack_check_refcount(funcstack_T *funcstack) |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
796 { |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
797 int i; |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
798 garray_T *gap = &funcstack->fs_ga; |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
799 int done = 0; |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
800 |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
801 if (funcstack->fs_refcount > funcstack->fs_min_refcount) |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
802 return; |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
803 for (i = funcstack->fs_var_offset; i < gap->ga_len; ++i) |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
804 { |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
805 typval_T *tv = ((typval_T *)gap->ga_data) + i; |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
806 |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
807 if (tv->v_type == VAR_PARTIAL && tv->vval.v_partial != NULL |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
808 && tv->vval.v_partial->pt_funcstack == funcstack |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
809 && tv->vval.v_partial->pt_refcount == 1) |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
810 ++done; |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
811 } |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
812 if (done == funcstack->fs_min_refcount) |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
813 { |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
814 typval_T *stack = gap->ga_data; |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
815 |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
816 // All partials referencing the funcstack have a reference count of |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
817 // one, thus the funcstack is no longer of use. |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
818 for (i = 0; i < gap->ga_len; ++i) |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
819 clear_tv(stack + i); |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
820 vim_free(stack); |
|
26560
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
821 remove_funcstack_from_list(funcstack); |
|
22541
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
822 vim_free(funcstack); |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
823 } |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
824 } |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
825 |
|
7d6ba4204f66
patch 8.2.1819: Vim9: Memory leak when using a closure
Bram Moolenaar <Bram@vim.org>
parents:
22527
diff
changeset
|
826 /* |
|
26560
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
827 * For garbage collecting: set references in all variables referenced by |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
828 * all funcstacks. |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
829 */ |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
830 int |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
831 set_ref_in_funcstacks(int copyID) |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
832 { |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
833 funcstack_T *funcstack; |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
834 |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
835 for (funcstack = first_funcstack; funcstack != NULL; |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
836 funcstack = funcstack->fs_next) |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
837 { |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
838 typval_T *stack = funcstack->fs_ga.ga_data; |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
839 int i; |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
840 |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
841 for (i = 0; i < funcstack->fs_ga.ga_len; ++i) |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
842 if (set_ref_in_item(stack + i, copyID, NULL, NULL)) |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
843 return TRUE; // abort |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
844 } |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
845 return FALSE; |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
846 } |
|
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
847 |
|
30083
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
848 // Ugly static to avoid passing the execution context around through many |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
849 // layers. |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
850 static ectx_T *current_ectx = NULL; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
851 |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
852 /* |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
853 * Return TRUE if currently executing a :def function. |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
854 * Can be used by builtin functions only. |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
855 */ |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
856 int |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
857 in_def_function(void) |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
858 { |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
859 return current_ectx != NULL; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
860 } |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
861 |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
862 /* |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
863 * Add an entry for a deferred function call to the currently executing |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
864 * function. |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
865 * Return the list or NULL when failed. |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
866 */ |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
867 static list_T * |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
868 add_defer_item(int var_idx, int argcount, ectx_T *ectx) |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
869 { |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
870 typval_T *defer_tv = STACK_TV_VAR(var_idx); |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
871 list_T *defer_l; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
872 list_T *l; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
873 typval_T listval; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
874 |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
875 if (defer_tv->v_type != VAR_LIST) |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
876 { |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
877 // first time, allocate the list |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
878 if (rettv_list_alloc(defer_tv) == FAIL) |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
879 return NULL; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
880 } |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
881 defer_l = defer_tv->vval.v_list; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
882 |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
883 l = list_alloc_with_items(argcount + 1); |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
884 if (l == NULL) |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
885 return NULL; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
886 listval.v_type = VAR_LIST; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
887 listval.vval.v_list = l; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
888 listval.v_lock = 0; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
889 if (list_insert_tv(defer_l, &listval, defer_l->lv_first) == FAIL) |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
890 { |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
891 vim_free(l); |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
892 return NULL; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
893 } |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
894 |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
895 return l; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
896 } |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
897 |
|
26560
454a1c9ef797
patch 8.2.3809: Vim9: crash when garbage collecting a nested partial
Bram Moolenaar <Bram@vim.org>
parents:
26558
diff
changeset
|
898 /* |
|
30065
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
899 * Handle ISN_DEFER. Stack has a function reference and "argcount" arguments. |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
900 * The local variable that lists deferred functions is "var_idx". |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
901 * Returns OK or FAIL. |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
902 */ |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
903 static int |
|
30083
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
904 defer_command(int var_idx, int argcount, ectx_T *ectx) |
|
30065
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
905 { |
|
30083
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
906 list_T *l = add_defer_item(var_idx, argcount, ectx); |
|
30065
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
907 int i; |
|
30083
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
908 typval_T *func_tv; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
909 |
|
30065
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
910 if (l == NULL) |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
911 return FAIL; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
912 |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
913 func_tv = STACK_TV_BOT(-argcount - 1); |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
914 // TODO: check type is a funcref |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
915 list_set_item(l, 0, func_tv); |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
916 |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
917 for (i = 1; i <= argcount; ++i) |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
918 list_set_item(l, i, STACK_TV_BOT(-argcount + i - 1)); |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
919 ectx->ec_stack.ga_len -= argcount + 1; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
920 return OK; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
921 } |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
922 |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
923 /* |
|
30083
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
924 * Add a deferred function "name" with one argument "arg_tv". |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
925 * Consumes "name", also on failure. |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
926 * Only to be called when in_def_function() returns TRUE. |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
927 */ |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
928 int |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
929 add_defer_function(char_u *name, int argcount, typval_T *argvars) |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
930 { |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
931 dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
932 + current_ectx->ec_dfunc_idx; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
933 list_T *l; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
934 typval_T func_tv; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
935 int i; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
936 |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
937 if (dfunc->df_defer_var_idx == 0) |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
938 { |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
939 iemsg("df_defer_var_idx is zero"); |
|
30092
53e7e912eeec
patch 9.0.0382: freeing the wrong string on failure
Bram Moolenaar <Bram@vim.org>
parents:
30083
diff
changeset
|
940 vim_free(name); |
|
30083
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
941 return FAIL; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
942 } |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
943 |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
944 l = add_defer_item(dfunc->df_defer_var_idx - 1, 1, current_ectx); |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
945 if (l == NULL) |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
946 { |
|
30092
53e7e912eeec
patch 9.0.0382: freeing the wrong string on failure
Bram Moolenaar <Bram@vim.org>
parents:
30083
diff
changeset
|
947 vim_free(name); |
|
30083
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
948 return FAIL; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
949 } |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
950 |
|
30092
53e7e912eeec
patch 9.0.0382: freeing the wrong string on failure
Bram Moolenaar <Bram@vim.org>
parents:
30083
diff
changeset
|
951 func_tv.v_type = VAR_FUNC; |
|
53e7e912eeec
patch 9.0.0382: freeing the wrong string on failure
Bram Moolenaar <Bram@vim.org>
parents:
30083
diff
changeset
|
952 func_tv.v_lock = 0; |
|
53e7e912eeec
patch 9.0.0382: freeing the wrong string on failure
Bram Moolenaar <Bram@vim.org>
parents:
30083
diff
changeset
|
953 func_tv.vval.v_string = name; |
|
30083
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
954 list_set_item(l, 0, &func_tv); |
|
30092
53e7e912eeec
patch 9.0.0382: freeing the wrong string on failure
Bram Moolenaar <Bram@vim.org>
parents:
30083
diff
changeset
|
955 |
|
30083
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
956 for (i = 0; i < argcount; ++i) |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
957 list_set_item(l, i + 1, argvars + i); |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
958 return OK; |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
959 } |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
960 |
|
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
961 /* |
|
30065
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
962 * Invoked when returning from a function: Invoke any deferred calls. |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
963 */ |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
964 static void |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
965 invoke_defer_funcs(ectx_T *ectx) |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
966 { |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
967 dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
968 + ectx->ec_dfunc_idx; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
969 typval_T *defer_tv = STACK_TV_VAR(dfunc->df_defer_var_idx - 1); |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
970 listitem_T *li; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
971 |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
972 if (defer_tv->v_type != VAR_LIST) |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
973 return; // no function added |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
974 for (li = defer_tv->vval.v_list->lv_first; li != NULL; li = li->li_next) |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
975 { |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
976 list_T *l = li->li_tv.vval.v_list; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
977 typval_T rettv; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
978 typval_T argvars[MAX_FUNC_ARGS]; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
979 int i; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
980 listitem_T *arg_li = l->lv_first; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
981 funcexe_T funcexe; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
982 |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
983 for (i = 0; i < l->lv_len - 1; ++i) |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
984 { |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
985 arg_li = arg_li->li_next; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
986 argvars[i] = arg_li->li_tv; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
987 } |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
988 |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
989 CLEAR_FIELD(funcexe); |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
990 funcexe.fe_evaluate = TRUE; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
991 rettv.v_type = VAR_UNKNOWN; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
992 (void)call_func(l->lv_first->li_tv.vval.v_string, -1, |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
993 &rettv, l->lv_len - 1, argvars, &funcexe); |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
994 clear_tv(&rettv); |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
995 } |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
996 } |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
997 |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
998 /* |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
999 * Return from the current function. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1000 */ |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1001 static int |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
1002 func_return(ectx_T *ectx) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1003 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1004 int idx; |
|
23009
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1005 int ret_idx; |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1006 dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1007 + ectx->ec_dfunc_idx; |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1008 int argcount = ufunc_argcount(dfunc->df_ufunc); |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1009 int top = ectx->ec_frame_idx - argcount; |
|
21206
caab594592cc
patch 8.2.1154: Vim9: crash when using imported function
Bram Moolenaar <Bram@vim.org>
parents:
21168
diff
changeset
|
1010 estack_T *entry; |
|
23976
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1011 int prev_dfunc_idx = STACK_TV(ectx->ec_frame_idx |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1012 + STACK_FRAME_FUNC_OFF)->vval.v_number; |
|
24549
dd87d08f86de
patch 8.2.2814: Vim9: unused variable
Bram Moolenaar <Bram@vim.org>
parents:
24545
diff
changeset
|
1013 funclocal_T *floc; |
|
dd87d08f86de
patch 8.2.2814: Vim9: unused variable
Bram Moolenaar <Bram@vim.org>
parents:
24545
diff
changeset
|
1014 #ifdef FEAT_PROFILE |
|
23976
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1015 dfunc_T *prev_dfunc = ((dfunc_T *)def_functions.ga_data) |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1016 + prev_dfunc_idx; |
|
24549
dd87d08f86de
patch 8.2.2814: Vim9: unused variable
Bram Moolenaar <Bram@vim.org>
parents:
24545
diff
changeset
|
1017 |
|
23976
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1018 if (do_profiling == PROF_YES) |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1019 { |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1020 ufunc_T *caller = prev_dfunc->df_ufunc; |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1021 |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1022 if (dfunc->df_ufunc->uf_profiling |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1023 || (caller != NULL && caller->uf_profiling)) |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1024 { |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1025 profile_may_end_func(((profinfo_T *)profile_info_ga.ga_data) |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1026 + profile_info_ga.ga_len - 1, dfunc->df_ufunc, caller); |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1027 --profile_info_ga.ga_len; |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1028 } |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1029 } |
|
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1030 #endif |
|
26558
ad00a5cb005d
patch 8.2.3808: Vim9: obsolete TODO items
Bram Moolenaar <Bram@vim.org>
parents:
26534
diff
changeset
|
1031 |
|
30065
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
1032 if (dfunc->df_defer_var_idx > 0) |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
1033 invoke_defer_funcs(ectx); |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
1034 |
|
26558
ad00a5cb005d
patch 8.2.3808: Vim9: obsolete TODO items
Bram Moolenaar <Bram@vim.org>
parents:
26534
diff
changeset
|
1035 // No check for uf_refcount being zero, cannot think of a way that would |
|
ad00a5cb005d
patch 8.2.3808: Vim9: obsolete TODO items
Bram Moolenaar <Bram@vim.org>
parents:
26534
diff
changeset
|
1036 // happen. |
|
24146
03fc95628eb0
patch 8.2.2614: Vim9: function is deleted while executing
Bram Moolenaar <Bram@vim.org>
parents:
24128
diff
changeset
|
1037 --dfunc->df_ufunc->uf_calls; |
|
03fc95628eb0
patch 8.2.2614: Vim9: function is deleted while executing
Bram Moolenaar <Bram@vim.org>
parents:
24128
diff
changeset
|
1038 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1039 // execution context goes one level up |
|
21206
caab594592cc
patch 8.2.1154: Vim9: crash when using imported function
Bram Moolenaar <Bram@vim.org>
parents:
21168
diff
changeset
|
1040 entry = estack_pop(); |
|
caab594592cc
patch 8.2.1154: Vim9: crash when using imported function
Bram Moolenaar <Bram@vim.org>
parents:
21168
diff
changeset
|
1041 if (entry != NULL) |
|
24471
baf75c8e1b7b
patch 8.2.2775: Vim9: wrong line number used for some commands
Bram Moolenaar <Bram@vim.org>
parents:
24454
diff
changeset
|
1042 current_sctx = entry->es_save_sctx; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1043 |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1044 if (handle_closure_in_use(ectx, TRUE) == FAIL) |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1045 return FAIL; |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1046 |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1047 // Clear the arguments. |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1048 for (idx = top; idx < ectx->ec_frame_idx; ++idx) |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1049 clear_tv(STACK_TV(idx)); |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1050 |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1051 // Clear local variables and temp values, but not the return value. |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1052 for (idx = ectx->ec_frame_idx + STACK_FRAME_SIZE; |
|
19328
e99e6d794597
patch 8.2.0222: Vim9: optional function arguments don't work yet
Bram Moolenaar <Bram@vim.org>
parents:
19316
diff
changeset
|
1053 idx < ectx->ec_stack.ga_len - 1; ++idx) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1054 clear_tv(STACK_TV(idx)); |
|
19328
e99e6d794597
patch 8.2.0222: Vim9: optional function arguments don't work yet
Bram Moolenaar <Bram@vim.org>
parents:
19316
diff
changeset
|
1055 |
|
23009
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1056 // The return value should be on top of the stack. However, when aborting |
|
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1057 // it may not be there and ec_frame_idx is the top of the stack. |
|
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1058 ret_idx = ectx->ec_stack.ga_len - 1; |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1059 if (ret_idx == ectx->ec_frame_idx + STACK_FRAME_IDX_OFF) |
|
23009
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1060 ret_idx = 0; |
|
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1061 |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1062 if (ectx->ec_outer_ref != NULL) |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1063 { |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1064 if (ectx->ec_outer_ref->or_outer_allocated) |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1065 vim_free(ectx->ec_outer_ref->or_outer); |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1066 partial_unref(ectx->ec_outer_ref->or_partial); |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1067 vim_free(ectx->ec_outer_ref); |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1068 } |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1069 |
|
19328
e99e6d794597
patch 8.2.0222: Vim9: optional function arguments don't work yet
Bram Moolenaar <Bram@vim.org>
parents:
19316
diff
changeset
|
1070 // Restore the previous frame. |
|
23976
03819ebd3e6d
patch 8.2.2530: Vim9: not enough testing for profiling
Bram Moolenaar <Bram@vim.org>
parents:
23934
diff
changeset
|
1071 ectx->ec_dfunc_idx = prev_dfunc_idx; |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1072 ectx->ec_iidx = STACK_TV(ectx->ec_frame_idx |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1073 + STACK_FRAME_IIDX_OFF)->vval.v_number; |
|
24545
fe29b220eece
patch 8.2.2812: Vim9: still crash when using substitute expression
Bram Moolenaar <Bram@vim.org>
parents:
24541
diff
changeset
|
1074 ectx->ec_instr = (void *)STACK_TV(ectx->ec_frame_idx |
|
fe29b220eece
patch 8.2.2812: Vim9: still crash when using substitute expression
Bram Moolenaar <Bram@vim.org>
parents:
24541
diff
changeset
|
1075 + STACK_FRAME_INSTR_OFF)->vval.v_string; |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1076 ectx->ec_outer_ref = (void *)STACK_TV(ectx->ec_frame_idx |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1077 + STACK_FRAME_OUTER_OFF)->vval.v_string; |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1078 floc = (void *)STACK_TV(ectx->ec_frame_idx |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1079 + STACK_FRAME_FUNCLOCAL_OFF)->vval.v_string; |
|
22460
4097509ecc1e
patch 8.2.1778: Vim9: returning from a partial call clears outer context
Bram Moolenaar <Bram@vim.org>
parents:
22401
diff
changeset
|
1080 // restoring ec_frame_idx must be last |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1081 ectx->ec_frame_idx = STACK_TV(ectx->ec_frame_idx |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1082 + STACK_FRAME_IDX_OFF)->vval.v_number; |
|
24541
df90c61c306c
patch 8.2.2810: Vim9: crash when calling a function in a substitute expression
Bram Moolenaar <Bram@vim.org>
parents:
24504
diff
changeset
|
1083 |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1084 if (floc == NULL) |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
1085 ectx->ec_funclocal.floc_restore_cmdmod = FALSE; |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1086 else |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1087 { |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
1088 ectx->ec_funclocal = *floc; |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1089 vim_free(floc); |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1090 } |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1091 |
|
23009
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1092 if (ret_idx > 0) |
|
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1093 { |
|
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1094 // Reset the stack to the position before the call, with a spot for the |
|
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1095 // return value, moved there from above the frame. |
|
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1096 ectx->ec_stack.ga_len = top + 1; |
|
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1097 *STACK_TV_BOT(-1) = *STACK_TV(ret_idx); |
|
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1098 } |
|
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1099 else |
|
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1100 // Reset the stack to the position before the call. |
|
1fa84623fc68
patch 8.2.2051: Vim9: crash when aborting a user function call
Bram Moolenaar <Bram@vim.org>
parents:
22975
diff
changeset
|
1101 ectx->ec_stack.ga_len = top; |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1102 |
|
22908
54219df706b5
patch 8.2.2001: Vim9: :def function does not apply 'maxfuncdepth'
Bram Moolenaar <Bram@vim.org>
parents:
22860
diff
changeset
|
1103 funcdepth_decrement(); |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
1104 --ex_nesting_level; |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
1105 return OK; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1106 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1107 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1108 /* |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1109 * Prepare arguments and rettv for calling a builtin or user function. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1110 */ |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1111 static int |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1112 call_prepare(int argcount, typval_T *argvars, ectx_T *ectx) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1113 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1114 int idx; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1115 typval_T *tv; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1116 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1117 // Move arguments from bottom of the stack to argvars[] and add terminator. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1118 for (idx = 0; idx < argcount; ++idx) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1119 argvars[idx] = *STACK_TV_BOT(idx - argcount); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1120 argvars[argcount].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
|
1121 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1122 // Result replaces the arguments on the stack. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1123 if (argcount > 0) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1124 ectx->ec_stack.ga_len -= argcount - 1; |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
1125 else if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1126 return FAIL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1127 else |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1128 ++ectx->ec_stack.ga_len; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1129 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1130 // Default return value is zero. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1131 tv = STACK_TV_BOT(-1); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1132 tv->v_type = VAR_NUMBER; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1133 tv->vval.v_number = 0; |
|
28233
e31f1a949d4e
patch 8.2.4643: Vim9: variable may be locked unintentionally
Bram Moolenaar <Bram@vim.org>
parents:
28231
diff
changeset
|
1134 tv->v_lock = 0; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1135 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1136 return OK; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1137 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1138 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1139 /* |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1140 * Call a builtin function by index. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1141 */ |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1142 static int |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1143 call_bfunc(int func_idx, int argcount, ectx_T *ectx) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1144 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1145 typval_T argvars[MAX_FUNC_ARGS]; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1146 int idx; |
|
22736
56907027dba7
patch 8.2.1916: Vim9: function call is aborted even when "silent!" is used
Bram Moolenaar <Bram@vim.org>
parents:
22715
diff
changeset
|
1147 int did_emsg_before = did_emsg; |
|
21303
7c50dfe302f8
patch 8.2.1202: Vim9: crash when calling a closure from a builtin function
Bram Moolenaar <Bram@vim.org>
parents:
21299
diff
changeset
|
1148 ectx_T *prev_ectx = current_ectx; |
|
25326
cfbf40f749b0
patch 8.2.3200: Vim9: hard to guess where a type error is given
Bram Moolenaar <Bram@vim.org>
parents:
25324
diff
changeset
|
1149 char *save_func_name = ectx->ec_where.wt_func_name; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1150 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1151 if (call_prepare(argcount, argvars, ectx) == FAIL) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1152 return FAIL; |
|
25326
cfbf40f749b0
patch 8.2.3200: Vim9: hard to guess where a type error is given
Bram Moolenaar <Bram@vim.org>
parents:
25324
diff
changeset
|
1153 ectx->ec_where.wt_func_name = internal_func_name(func_idx); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1154 |
|
21303
7c50dfe302f8
patch 8.2.1202: Vim9: crash when calling a closure from a builtin function
Bram Moolenaar <Bram@vim.org>
parents:
21299
diff
changeset
|
1155 // Call the builtin function. Set "current_ectx" so that when it |
|
7c50dfe302f8
patch 8.2.1202: Vim9: crash when calling a closure from a builtin function
Bram Moolenaar <Bram@vim.org>
parents:
21299
diff
changeset
|
1156 // recursively invokes call_def_function() a closure context can be set. |
|
7c50dfe302f8
patch 8.2.1202: Vim9: crash when calling a closure from a builtin function
Bram Moolenaar <Bram@vim.org>
parents:
21299
diff
changeset
|
1157 current_ectx = ectx; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1158 call_internal_func_by_idx(func_idx, argvars, STACK_TV_BOT(-1)); |
|
21303
7c50dfe302f8
patch 8.2.1202: Vim9: crash when calling a closure from a builtin function
Bram Moolenaar <Bram@vim.org>
parents:
21299
diff
changeset
|
1159 current_ectx = prev_ectx; |
|
25326
cfbf40f749b0
patch 8.2.3200: Vim9: hard to guess where a type error is given
Bram Moolenaar <Bram@vim.org>
parents:
25324
diff
changeset
|
1160 ectx->ec_where.wt_func_name = save_func_name; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1161 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1162 // Clear the arguments. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1163 for (idx = 0; idx < argcount; ++idx) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1164 clear_tv(&argvars[idx]); |
|
20287
ce1b73835822
patch 8.2.0699: Vim9: not all errors tested
Bram Moolenaar <Bram@vim.org>
parents:
20283
diff
changeset
|
1165 |
|
23177
cc24ac009f29
patch 8.2.2134: Vim9: get E1099 when autocmd triggered in builtin function
Bram Moolenaar <Bram@vim.org>
parents:
23156
diff
changeset
|
1166 if (did_emsg > did_emsg_before) |
|
20287
ce1b73835822
patch 8.2.0699: Vim9: not all errors tested
Bram Moolenaar <Bram@vim.org>
parents:
20283
diff
changeset
|
1167 return FAIL; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1168 return OK; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1169 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1170 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1171 /* |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1172 * Execute a user defined function. |
|
23557
f50ee1ae4d9b
patch 8.2.2321: Vim9: cannot nest closures
Bram Moolenaar <Bram@vim.org>
parents:
23553
diff
changeset
|
1173 * If the function is compiled this will add a stack frame and set the |
|
f50ee1ae4d9b
patch 8.2.2321: Vim9: cannot nest closures
Bram Moolenaar <Bram@vim.org>
parents:
23553
diff
changeset
|
1174 * instruction pointer at the start of the function. |
|
f50ee1ae4d9b
patch 8.2.2321: Vim9: cannot nest closures
Bram Moolenaar <Bram@vim.org>
parents:
23553
diff
changeset
|
1175 * Otherwise the function is called here. |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1176 * If "pt" is not null use "pt->pt_outer" for ec_outer_ref->or_outer. |
|
19532
b8f778dda1a1
patch 8.2.0323: Vim9: calling a function that is defined later is slow
Bram Moolenaar <Bram@vim.org>
parents:
19528
diff
changeset
|
1177 * "iptr" can be used to replace the instruction with a more efficient one. |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1178 */ |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1179 static int |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1180 call_ufunc( |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1181 ufunc_T *ufunc, |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1182 partial_T *pt, |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1183 int argcount, |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1184 ectx_T *ectx, |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
1185 isn_T *iptr, |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
1186 dict_T *selfdict) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1187 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1188 typval_T argvars[MAX_FUNC_ARGS]; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1189 funcexe_T funcexe; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1190 int error; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1191 int idx; |
|
22742
f7f2d73ff85e
patch 8.2.1919: assert_fails() setting emsg_silent changes normal execution
Bram Moolenaar <Bram@vim.org>
parents:
22736
diff
changeset
|
1192 int did_emsg_before = did_emsg; |
|
28101
3bc0a639dfb0
patch 8.2.4575: Vim9: test for profiling still fails
Bram Moolenaar <Bram@vim.org>
parents:
28097
diff
changeset
|
1193 compiletype_T compile_type = get_compile_type(ufunc); |
|
24932
afaa7f3aae56
patch 8.2.3003: Vim9: closure compiled with wrong compile type
Bram Moolenaar <Bram@vim.org>
parents:
24918
diff
changeset
|
1194 |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
1195 if (func_needs_compiling(ufunc, compile_type) |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
1196 && compile_def_function(ufunc, FALSE, compile_type, NULL) |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
1197 == FAIL) |
|
20528
489cb75c76b6
patch 8.2.0818: Vim9: using a discovery phase doesn't work well
Bram Moolenaar <Bram@vim.org>
parents:
20433
diff
changeset
|
1198 return FAIL; |
|
20943
1693ca876049
patch 8.2.1023: Vim9: redefining a function uses a new index every time
Bram Moolenaar <Bram@vim.org>
parents:
20919
diff
changeset
|
1199 if (ufunc->uf_def_status == UF_COMPILED) |
|
19532
b8f778dda1a1
patch 8.2.0323: Vim9: calling a function that is defined later is slow
Bram Moolenaar <Bram@vim.org>
parents:
19528
diff
changeset
|
1200 { |
|
23254
4b7e996354e0
patch 8.2.2173: Vim9: get internal error when assigning to undefined variable
Bram Moolenaar <Bram@vim.org>
parents:
23252
diff
changeset
|
1201 error = check_user_func_argcount(ufunc, argcount); |
|
23252
35583da6397e
patch 8.2.2172: Vim9: number of arguments is not always checked
Bram Moolenaar <Bram@vim.org>
parents:
23249
diff
changeset
|
1202 if (error != FCERR_UNKNOWN) |
|
35583da6397e
patch 8.2.2172: Vim9: number of arguments is not always checked
Bram Moolenaar <Bram@vim.org>
parents:
23249
diff
changeset
|
1203 { |
|
35583da6397e
patch 8.2.2172: Vim9: number of arguments is not always checked
Bram Moolenaar <Bram@vim.org>
parents:
23249
diff
changeset
|
1204 if (error == FCERR_TOOMANY) |
|
28263
c446812efd60
patch 8.2.4657: errors for functions are sometimes hard to read
Bram Moolenaar <Bram@vim.org>
parents:
28253
diff
changeset
|
1205 semsg(_(e_too_many_arguments_for_function_str), |
|
c446812efd60
patch 8.2.4657: errors for functions are sometimes hard to read
Bram Moolenaar <Bram@vim.org>
parents:
28253
diff
changeset
|
1206 printable_func_name(ufunc)); |
|
23252
35583da6397e
patch 8.2.2172: Vim9: number of arguments is not always checked
Bram Moolenaar <Bram@vim.org>
parents:
23249
diff
changeset
|
1207 else |
|
26602
fac6673086df
patch 8.2.3830: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26560
diff
changeset
|
1208 semsg(_(e_not_enough_arguments_for_function_str), |
|
28263
c446812efd60
patch 8.2.4657: errors for functions are sometimes hard to read
Bram Moolenaar <Bram@vim.org>
parents:
28253
diff
changeset
|
1209 printable_func_name(ufunc)); |
|
23252
35583da6397e
patch 8.2.2172: Vim9: number of arguments is not always checked
Bram Moolenaar <Bram@vim.org>
parents:
23249
diff
changeset
|
1210 return FAIL; |
|
35583da6397e
patch 8.2.2172: Vim9: number of arguments is not always checked
Bram Moolenaar <Bram@vim.org>
parents:
23249
diff
changeset
|
1211 } |
|
35583da6397e
patch 8.2.2172: Vim9: number of arguments is not always checked
Bram Moolenaar <Bram@vim.org>
parents:
23249
diff
changeset
|
1212 |
|
19532
b8f778dda1a1
patch 8.2.0323: Vim9: calling a function that is defined later is slow
Bram Moolenaar <Bram@vim.org>
parents:
19528
diff
changeset
|
1213 // The function has been compiled, can call it quickly. For a function |
|
b8f778dda1a1
patch 8.2.0323: Vim9: calling a function that is defined later is slow
Bram Moolenaar <Bram@vim.org>
parents:
19528
diff
changeset
|
1214 // that was defined later: we can call it directly next time. |
|
b8f778dda1a1
patch 8.2.0323: Vim9: calling a function that is defined later is slow
Bram Moolenaar <Bram@vim.org>
parents:
19528
diff
changeset
|
1215 if (iptr != NULL) |
|
b8f778dda1a1
patch 8.2.0323: Vim9: calling a function that is defined later is slow
Bram Moolenaar <Bram@vim.org>
parents:
19528
diff
changeset
|
1216 { |
|
19726
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
1217 delete_instr(iptr); |
|
19532
b8f778dda1a1
patch 8.2.0323: Vim9: calling a function that is defined later is slow
Bram Moolenaar <Bram@vim.org>
parents:
19528
diff
changeset
|
1218 iptr->isn_type = ISN_DCALL; |
|
b8f778dda1a1
patch 8.2.0323: Vim9: calling a function that is defined later is slow
Bram Moolenaar <Bram@vim.org>
parents:
19528
diff
changeset
|
1219 iptr->isn_arg.dfunc.cdf_idx = ufunc->uf_dfunc_idx; |
|
b8f778dda1a1
patch 8.2.0323: Vim9: calling a function that is defined later is slow
Bram Moolenaar <Bram@vim.org>
parents:
19528
diff
changeset
|
1220 iptr->isn_arg.dfunc.cdf_argcount = argcount; |
|
b8f778dda1a1
patch 8.2.0323: Vim9: calling a function that is defined later is slow
Bram Moolenaar <Bram@vim.org>
parents:
19528
diff
changeset
|
1221 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
1222 return call_dfunc(ufunc->uf_dfunc_idx, pt, argcount, ectx); |
|
19532
b8f778dda1a1
patch 8.2.0323: Vim9: calling a function that is defined later is slow
Bram Moolenaar <Bram@vim.org>
parents:
19528
diff
changeset
|
1223 } |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1224 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1225 if (call_prepare(argcount, argvars, ectx) == FAIL) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1226 return FAIL; |
|
20007
aadd1cae2ff5
patch 8.2.0559: clearing a struct is verbose
Bram Moolenaar <Bram@vim.org>
parents:
19981
diff
changeset
|
1227 CLEAR_FIELD(funcexe); |
|
26534
28745eec1dda
patch 8.2.3796: the funcexe_T struct members are not named consistently
Bram Moolenaar <Bram@vim.org>
parents:
26506
diff
changeset
|
1228 funcexe.fe_evaluate = TRUE; |
|
28745eec1dda
patch 8.2.3796: the funcexe_T struct members are not named consistently
Bram Moolenaar <Bram@vim.org>
parents:
26506
diff
changeset
|
1229 funcexe.fe_selfdict = selfdict != NULL ? selfdict : dict_stack_get_dict(); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1230 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1231 // Call the user function. Result goes in last position on the stack. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1232 error = call_user_func_check(ufunc, argcount, argvars, |
|
26534
28745eec1dda
patch 8.2.3796: the funcexe_T struct members are not named consistently
Bram Moolenaar <Bram@vim.org>
parents:
26506
diff
changeset
|
1233 STACK_TV_BOT(-1), &funcexe, funcexe.fe_selfdict); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1234 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1235 // Clear the arguments. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1236 for (idx = 0; idx < argcount; ++idx) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1237 clear_tv(&argvars[idx]); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1238 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1239 if (error != FCERR_NONE) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1240 { |
|
28263
c446812efd60
patch 8.2.4657: errors for functions are sometimes hard to read
Bram Moolenaar <Bram@vim.org>
parents:
28253
diff
changeset
|
1241 user_func_error(error, printable_func_name(ufunc), &funcexe); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1242 return FAIL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1243 } |
|
22742
f7f2d73ff85e
patch 8.2.1919: assert_fails() setting emsg_silent changes normal execution
Bram Moolenaar <Bram@vim.org>
parents:
22736
diff
changeset
|
1244 if (did_emsg > did_emsg_before) |
|
21757
6c03897bcd60
patch 8.2.1428: Vim9: :def function does not abort on nested function error
Bram Moolenaar <Bram@vim.org>
parents:
21753
diff
changeset
|
1245 // Error other than from calling the function itself. |
|
6c03897bcd60
patch 8.2.1428: Vim9: :def function does not abort on nested function error
Bram Moolenaar <Bram@vim.org>
parents:
21753
diff
changeset
|
1246 return FAIL; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1247 return OK; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1248 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1249 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1250 /* |
|
24220
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1251 * If command modifiers were applied restore them. |
|
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1252 */ |
|
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1253 static void |
|
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1254 may_restore_cmdmod(funclocal_T *funclocal) |
|
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1255 { |
|
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1256 if (funclocal->floc_restore_cmdmod) |
|
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1257 { |
|
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1258 cmdmod.cmod_filter_regmatch.regprog = NULL; |
|
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1259 undo_cmdmod(&cmdmod); |
|
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1260 cmdmod = funclocal->floc_save_cmdmod; |
|
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1261 funclocal->floc_restore_cmdmod = FALSE; |
|
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1262 } |
|
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1263 } |
|
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1264 |
|
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
1265 /* |
|
25609
f8bcd21e6e24
patch 8.2.3341: Vim9: function call aborted despite try/catch
Bram Moolenaar <Bram@vim.org>
parents:
25605
diff
changeset
|
1266 * Return TRUE if an error was given (not caught in try/catch) or CTRL-C was |
|
f8bcd21e6e24
patch 8.2.3341: Vim9: function call aborted despite try/catch
Bram Moolenaar <Bram@vim.org>
parents:
25605
diff
changeset
|
1267 * pressed. |
|
21753
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1268 */ |
|
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1269 static int |
|
25609
f8bcd21e6e24
patch 8.2.3341: Vim9: function call aborted despite try/catch
Bram Moolenaar <Bram@vim.org>
parents:
25605
diff
changeset
|
1270 vim9_aborting(int prev_uncaught_emsg) |
|
21753
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1271 { |
|
25609
f8bcd21e6e24
patch 8.2.3341: Vim9: function call aborted despite try/catch
Bram Moolenaar <Bram@vim.org>
parents:
25605
diff
changeset
|
1272 return uncaught_emsg > prev_uncaught_emsg || got_int || did_throw; |
|
21753
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1273 } |
|
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1274 |
|
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1275 /* |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1276 * Execute a function by "name". |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1277 * This can be a builtin function or a user function. |
|
19532
b8f778dda1a1
patch 8.2.0323: Vim9: calling a function that is defined later is slow
Bram Moolenaar <Bram@vim.org>
parents:
19528
diff
changeset
|
1278 * "iptr" can be used to replace the instruction with a more efficient one. |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1279 * Returns FAIL if not found without an error message. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1280 */ |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1281 static int |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1282 call_by_name( |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1283 char_u *name, |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1284 int argcount, |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1285 ectx_T *ectx, |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
1286 isn_T *iptr, |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
1287 dict_T *selfdict) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1288 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1289 ufunc_T *ufunc; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1290 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1291 if (builtin_function(name, -1)) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1292 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1293 int func_idx = find_internal_func(name); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1294 |
|
27918
7d70b420de00
patch 8.2.4484: Vim9: some error messages are not tested
Bram Moolenaar <Bram@vim.org>
parents:
27841
diff
changeset
|
1295 if (func_idx < 0) // Impossible? |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1296 return FAIL; |
|
21232
3f14e0d4a4dd
patch 8.2.1167: Vim9: builtin function method call only supports first arg
Bram Moolenaar <Bram@vim.org>
parents:
21206
diff
changeset
|
1297 if (check_internal_func(func_idx, argcount) < 0) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1298 return FAIL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1299 return call_bfunc(func_idx, argcount, ectx); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1300 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1301 |
|
27114
98a01021e465
patch 8.2.4086: "cctx" argument of find_func_even_dead() is unused
Bram Moolenaar <Bram@vim.org>
parents:
27086
diff
changeset
|
1302 ufunc = find_func(name, FALSE); |
|
21753
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1303 |
|
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1304 if (ufunc == NULL) |
|
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1305 { |
|
25609
f8bcd21e6e24
patch 8.2.3341: Vim9: function call aborted despite try/catch
Bram Moolenaar <Bram@vim.org>
parents:
25605
diff
changeset
|
1306 int prev_uncaught_emsg = uncaught_emsg; |
|
21753
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1307 |
|
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1308 if (script_autoload(name, TRUE)) |
|
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1309 // loaded a package, search for the function again |
|
27114
98a01021e465
patch 8.2.4086: "cctx" argument of find_func_even_dead() is unused
Bram Moolenaar <Bram@vim.org>
parents:
27086
diff
changeset
|
1310 ufunc = find_func(name, FALSE); |
|
25609
f8bcd21e6e24
patch 8.2.3341: Vim9: function call aborted despite try/catch
Bram Moolenaar <Bram@vim.org>
parents:
25605
diff
changeset
|
1311 |
|
f8bcd21e6e24
patch 8.2.3341: Vim9: function call aborted despite try/catch
Bram Moolenaar <Bram@vim.org>
parents:
25605
diff
changeset
|
1312 if (vim9_aborting(prev_uncaught_emsg)) |
|
21753
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1313 return FAIL; // bail out if loading the script caused an error |
|
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1314 } |
|
9ef7ae8ab51c
patch 8.2.1426: Vim9: cannot call autoload function in :def function
Bram Moolenaar <Bram@vim.org>
parents:
21576
diff
changeset
|
1315 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1316 if (ufunc != NULL) |
|
24065
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1317 { |
|
25543
a84e75d73fde
patch 8.2.3308: Vim9: no runtime check for argument type with varargs only
Bram Moolenaar <Bram@vim.org>
parents:
25541
diff
changeset
|
1318 if (ufunc->uf_arg_types != NULL || ufunc->uf_va_type != NULL) |
|
24065
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1319 { |
|
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1320 int i; |
|
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1321 typval_T *argv = STACK_TV_BOT(0) - argcount; |
|
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1322 |
|
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1323 // The function can change at runtime, check that the argument |
|
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1324 // types are correct. |
|
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1325 for (i = 0; i < argcount; ++i) |
|
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1326 { |
|
24077
5006d95ef82d
patch 8.2.2580: Vim9: checking vararg type may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
24065
diff
changeset
|
1327 type_T *type = NULL; |
|
5006d95ef82d
patch 8.2.2580: Vim9: checking vararg type may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
24065
diff
changeset
|
1328 |
|
25543
a84e75d73fde
patch 8.2.3308: Vim9: no runtime check for argument type with varargs only
Bram Moolenaar <Bram@vim.org>
parents:
25541
diff
changeset
|
1329 if (i < ufunc->uf_args.ga_len && ufunc->uf_arg_types != NULL) |
|
24077
5006d95ef82d
patch 8.2.2580: Vim9: checking vararg type may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
24065
diff
changeset
|
1330 type = ufunc->uf_arg_types[i]; |
|
5006d95ef82d
patch 8.2.2580: Vim9: checking vararg type may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
24065
diff
changeset
|
1331 else if (ufunc->uf_va_type != NULL) |
|
5006d95ef82d
patch 8.2.2580: Vim9: checking vararg type may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
24065
diff
changeset
|
1332 type = ufunc->uf_va_type->tt_member; |
|
24065
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1333 if (type != NULL && check_typval_arg_type(type, |
|
25326
cfbf40f749b0
patch 8.2.3200: Vim9: hard to guess where a type error is given
Bram Moolenaar <Bram@vim.org>
parents:
25324
diff
changeset
|
1334 &argv[i], NULL, i + 1) == FAIL) |
|
24065
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1335 return FAIL; |
|
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1336 } |
|
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1337 } |
|
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1338 |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
1339 return call_ufunc(ufunc, NULL, argcount, ectx, iptr, selfdict); |
|
24065
a6aec9a89184
patch 8.2.2574: Vim9: crash when calling partial with wrong function
Bram Moolenaar <Bram@vim.org>
parents:
24014
diff
changeset
|
1340 } |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1341 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1342 return FAIL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1343 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1344 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1345 static int |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1346 call_partial( |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1347 typval_T *tv, |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1348 int argcount_arg, |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1349 ectx_T *ectx) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1350 { |
|
21347
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1351 int argcount = argcount_arg; |
|
19862
846fbbacce3a
patch 8.2.0487: Vim9: compiling not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19842
diff
changeset
|
1352 char_u *name = NULL; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1353 int called_emsg_before = called_emsg; |
|
23582
b875bbd517a6
patch 8.2.2333: Vim9: warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
23580
diff
changeset
|
1354 int res = FAIL; |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
1355 dict_T *selfdict = NULL; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1356 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1357 if (tv->v_type == VAR_PARTIAL) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1358 { |
|
21347
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1359 partial_T *pt = tv->vval.v_partial; |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1360 int i; |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1361 |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1362 if (pt->pt_argc > 0) |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1363 { |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1364 // Make space for arguments from the partial, shift the "argcount" |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1365 // arguments up. |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
1366 if (GA_GROW_FAILS(&ectx->ec_stack, pt->pt_argc)) |
|
21347
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1367 return FAIL; |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1368 for (i = 1; i <= argcount; ++i) |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1369 *STACK_TV_BOT(-i + pt->pt_argc) = *STACK_TV_BOT(-i); |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1370 ectx->ec_stack.ga_len += pt->pt_argc; |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1371 argcount += pt->pt_argc; |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1372 |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1373 // copy the arguments from the partial onto the stack |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1374 for (i = 0; i < pt->pt_argc; ++i) |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1375 copy_tv(&pt->pt_argv[i], STACK_TV_BOT(-argcount + i)); |
|
d636c7bbe9ab
patch 8.2.1224: Vim9: arguments from partial are not used
Bram Moolenaar <Bram@vim.org>
parents:
21303
diff
changeset
|
1376 } |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
1377 selfdict = pt->pt_dict; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1378 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1379 if (pt->pt_func != NULL) |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
1380 return call_ufunc(pt->pt_func, pt, argcount, ectx, NULL, selfdict); |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1381 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1382 name = pt->pt_name; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1383 } |
|
19862
846fbbacce3a
patch 8.2.0487: Vim9: compiling not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19842
diff
changeset
|
1384 else if (tv->v_type == VAR_FUNC) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1385 name = tv->vval.v_string; |
|
21983
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1386 if (name != NULL) |
|
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1387 { |
|
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1388 char_u fname_buf[FLEN_FIXED + 1]; |
|
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1389 char_u *tofree = NULL; |
|
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1390 int error = FCERR_NONE; |
|
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1391 char_u *fname; |
|
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1392 |
|
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1393 // May need to translate <SNR>123_ to K_SNR. |
|
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1394 fname = fname_trans_sid(name, fname_buf, &tofree, &error); |
|
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1395 if (error != FCERR_NONE) |
|
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1396 res = FAIL; |
|
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1397 else |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
1398 res = call_by_name(fname, argcount, ectx, NULL, selfdict); |
|
21983
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1399 vim_free(tofree); |
|
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1400 } |
|
3fe594c72d8c
patch 8.2.1541: Vim9: cannot find function reference for s:Func
Bram Moolenaar <Bram@vim.org>
parents:
21969
diff
changeset
|
1401 |
|
23582
b875bbd517a6
patch 8.2.2333: Vim9: warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
23580
diff
changeset
|
1402 if (res == FAIL) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1403 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1404 if (called_emsg == called_emsg_before) |
|
28263
c446812efd60
patch 8.2.4657: errors for functions are sometimes hard to read
Bram Moolenaar <Bram@vim.org>
parents:
28253
diff
changeset
|
1405 emsg_funcname(e_unknown_function_str, |
|
20287
ce1b73835822
patch 8.2.0699: Vim9: not all errors tested
Bram Moolenaar <Bram@vim.org>
parents:
20283
diff
changeset
|
1406 name == NULL ? (char_u *)"[unknown]" : name); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1407 return FAIL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1408 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1409 return OK; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1410 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1411 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1412 /* |
|
22272
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1413 * Check if "lock" is VAR_LOCKED or VAR_FIXED. If so give an error and return |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1414 * TRUE. |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1415 */ |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1416 static int |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1417 error_if_locked(int lock, char *error) |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1418 { |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1419 if (lock & (VAR_LOCKED | VAR_FIXED)) |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1420 { |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1421 emsg(_(error)); |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1422 return TRUE; |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1423 } |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1424 return FALSE; |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1425 } |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1426 |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
1427 /* |
|
23982
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1428 * Give an error if "tv" is not a number and return FAIL. |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1429 */ |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1430 static int |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1431 check_for_number(typval_T *tv) |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1432 { |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1433 if (tv->v_type != VAR_NUMBER) |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1434 { |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1435 semsg(_(e_expected_str_but_got_str), |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1436 vartype_name(VAR_NUMBER), vartype_name(tv->v_type)); |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1437 return FAIL; |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1438 } |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1439 return OK; |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1440 } |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1441 |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
1442 /* |
|
19455
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
1443 * Store "tv" in variable "name". |
|
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
1444 * This is for s: and g: variables. |
|
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
1445 */ |
|
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
1446 static void |
|
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
1447 store_var(char_u *name, typval_T *tv) |
|
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
1448 { |
|
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
1449 funccal_entry_T entry; |
|
24293
bbf4b3185554
patch 8.2.2687: Vim9: cannot use "const" for global variable in :def function
Bram Moolenaar <Bram@vim.org>
parents:
24272
diff
changeset
|
1450 int flags = ASSIGN_DECL; |
|
bbf4b3185554
patch 8.2.2687: Vim9: cannot use "const" for global variable in :def function
Bram Moolenaar <Bram@vim.org>
parents:
24272
diff
changeset
|
1451 |
|
bbf4b3185554
patch 8.2.2687: Vim9: cannot use "const" for global variable in :def function
Bram Moolenaar <Bram@vim.org>
parents:
24272
diff
changeset
|
1452 if (tv->v_lock) |
|
bbf4b3185554
patch 8.2.2687: Vim9: cannot use "const" for global variable in :def function
Bram Moolenaar <Bram@vim.org>
parents:
24272
diff
changeset
|
1453 flags |= ASSIGN_CONST; |
|
19455
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
1454 save_funccal(&entry); |
|
26980
8796f1384750
patch 8.2.4019: Vim9: import mechanism is too complicated
Bram Moolenaar <Bram@vim.org>
parents:
26891
diff
changeset
|
1455 set_var_const(name, 0, NULL, tv, FALSE, flags, 0); |
|
19455
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
1456 restore_funccal(); |
|
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
1457 } |
|
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
1458 |
|
23227
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1459 /* |
|
23266
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1460 * Convert "tv" to a string. |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1461 * Return FAIL if not allowed. |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1462 */ |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1463 static int |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
1464 do_2string(typval_T *tv, int is_2string_any, int tolerant) |
|
23266
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1465 { |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1466 if (tv->v_type != VAR_STRING) |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1467 { |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1468 char_u *str; |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1469 |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1470 if (is_2string_any) |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1471 { |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1472 switch (tv->v_type) |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1473 { |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1474 case VAR_SPECIAL: |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1475 case VAR_BOOL: |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1476 case VAR_NUMBER: |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1477 case VAR_FLOAT: |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1478 case VAR_BLOB: break; |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
1479 |
|
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
1480 case VAR_LIST: |
|
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
1481 if (tolerant) |
|
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
1482 { |
|
24806
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1483 char_u *s, *e, *p; |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1484 garray_T ga; |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1485 |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1486 ga_init2(&ga, sizeof(char_u *), 1); |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1487 |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1488 // Convert to NL separated items, then |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1489 // escape the items and replace the NL with |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1490 // a space. |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
1491 str = typval2string(tv, TRUE); |
|
24806
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1492 if (str == NULL) |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1493 return FAIL; |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1494 s = str; |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1495 while ((e = vim_strchr(s, '\n')) != NULL) |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1496 { |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1497 *e = NUL; |
|
25994
e8873138ffbb
patch 8.2.3530: ":buf {a}" fails while ":edit {a}" works
Bram Moolenaar <Bram@vim.org>
parents:
25814
diff
changeset
|
1498 p = vim_strsave_fnameescape(s, |
|
e8873138ffbb
patch 8.2.3530: ":buf {a}" fails while ":edit {a}" works
Bram Moolenaar <Bram@vim.org>
parents:
25814
diff
changeset
|
1499 VSE_NONE); |
|
24806
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1500 if (p != NULL) |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1501 { |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1502 ga_concat(&ga, p); |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1503 ga_concat(&ga, (char_u *)" "); |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1504 vim_free(p); |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1505 } |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1506 s = e + 1; |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1507 } |
|
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1508 vim_free(str); |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
1509 clear_tv(tv); |
|
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
1510 tv->v_type = VAR_STRING; |
|
24806
28127371aa18
patch 8.2.2941: Vim9: using does not handle a list of strings
Bram Moolenaar <Bram@vim.org>
parents:
24796
diff
changeset
|
1511 tv->vval.v_string = ga.ga_data; |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
1512 return OK; |
|
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
1513 } |
|
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
1514 // FALLTHROUGH |
|
23266
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1515 default: to_string_error(tv->v_type); |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1516 return FAIL; |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1517 } |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1518 } |
|
23788
d12ef361d9de
patch 8.2.2435: setline() gives an error for some types
Bram Moolenaar <Bram@vim.org>
parents:
23735
diff
changeset
|
1519 str = typval_tostring(tv, TRUE); |
|
23266
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1520 clear_tv(tv); |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1521 tv->v_type = VAR_STRING; |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1522 tv->vval.v_string = str; |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1523 } |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1524 return OK; |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1525 } |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1526 |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
1527 /* |
|
23227
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1528 * When the value of "sv" is a null list of dict, allocate it. |
|
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1529 */ |
|
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1530 static void |
|
28231
66b245d84f37
patch 8.2.4642: Vim9: in :def function script var cannot be null
Bram Moolenaar <Bram@vim.org>
parents:
28217
diff
changeset
|
1531 allocate_if_null(svar_T *sv) |
|
23227
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1532 { |
|
28231
66b245d84f37
patch 8.2.4642: Vim9: in :def function script var cannot be null
Bram Moolenaar <Bram@vim.org>
parents:
28217
diff
changeset
|
1533 typval_T *tv = sv->sv_tv; |
|
66b245d84f37
patch 8.2.4642: Vim9: in :def function script var cannot be null
Bram Moolenaar <Bram@vim.org>
parents:
28217
diff
changeset
|
1534 |
|
23227
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1535 switch (tv->v_type) |
|
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1536 { |
|
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1537 case VAR_LIST: |
|
28231
66b245d84f37
patch 8.2.4642: Vim9: in :def function script var cannot be null
Bram Moolenaar <Bram@vim.org>
parents:
28217
diff
changeset
|
1538 if (tv->vval.v_list == NULL && sv->sv_type != &t_list_empty) |
|
23839
23d6ead591c1
patch 8.2.2461: Coverity warns for unchecked return value
Bram Moolenaar <Bram@vim.org>
parents:
23788
diff
changeset
|
1539 (void)rettv_list_alloc(tv); |
|
23227
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1540 break; |
|
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1541 case VAR_DICT: |
|
28231
66b245d84f37
patch 8.2.4642: Vim9: in :def function script var cannot be null
Bram Moolenaar <Bram@vim.org>
parents:
28217
diff
changeset
|
1542 if (tv->vval.v_dict == NULL && sv->sv_type != &t_dict_empty) |
|
23839
23d6ead591c1
patch 8.2.2461: Coverity warns for unchecked return value
Bram Moolenaar <Bram@vim.org>
parents:
23788
diff
changeset
|
1543 (void)rettv_dict_alloc(tv); |
|
23227
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1544 break; |
|
24482
3d5a66e478f8
patch 8.2.2781: add() silently skips when adding to null list or blob
Bram Moolenaar <Bram@vim.org>
parents:
24480
diff
changeset
|
1545 case VAR_BLOB: |
|
28231
66b245d84f37
patch 8.2.4642: Vim9: in :def function script var cannot be null
Bram Moolenaar <Bram@vim.org>
parents:
28217
diff
changeset
|
1546 if (tv->vval.v_blob == NULL && sv->sv_type != &t_blob_null) |
|
24482
3d5a66e478f8
patch 8.2.2781: add() silently skips when adding to null list or blob
Bram Moolenaar <Bram@vim.org>
parents:
24480
diff
changeset
|
1547 (void)rettv_blob_alloc(tv); |
|
3d5a66e478f8
patch 8.2.2781: add() silently skips when adding to null list or blob
Bram Moolenaar <Bram@vim.org>
parents:
24480
diff
changeset
|
1548 break; |
|
23227
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1549 default: |
|
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1550 break; |
|
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1551 } |
|
ccbbbbed371f
patch 8.2.2159: Vim9: when declaring a list it is not allocated yet
Bram Moolenaar <Bram@vim.org>
parents:
23177
diff
changeset
|
1552 } |
|
20089
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
1553 |
|
23551
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1554 /* |
|
24128
fcbb1d4df15b
patch 8.2.2605: Vim9: string index and slice does not include composing chars
Bram Moolenaar <Bram@vim.org>
parents:
24122
diff
changeset
|
1555 * Return the character "str[index]" where "index" is the character index, |
|
fcbb1d4df15b
patch 8.2.2605: Vim9: string index and slice does not include composing chars
Bram Moolenaar <Bram@vim.org>
parents:
24122
diff
changeset
|
1556 * including composing characters. |
|
fcbb1d4df15b
patch 8.2.2605: Vim9: string index and slice does not include composing chars
Bram Moolenaar <Bram@vim.org>
parents:
24122
diff
changeset
|
1557 * If "index" is out of range NULL is returned. |
|
23551
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1558 */ |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1559 char_u * |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1560 char_from_string(char_u *str, varnumber_T index) |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1561 { |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1562 size_t nbyte = 0; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1563 varnumber_T nchar = index; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1564 size_t slen; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1565 |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1566 if (str == NULL) |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1567 return NULL; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1568 slen = STRLEN(str); |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1569 |
|
24226
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1570 // Do the same as for a list: a negative index counts from the end. |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1571 // Optimization to check the first byte to be below 0x80 (and no composing |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1572 // character follows) makes this a lot faster. |
|
23551
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1573 if (index < 0) |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1574 { |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1575 int clen = 0; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1576 |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1577 for (nbyte = 0; nbyte < slen; ++clen) |
|
24226
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1578 { |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1579 if (str[nbyte] < 0x80 && str[nbyte + 1] < 0x80) |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1580 ++nbyte; |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1581 else if (enc_utf8) |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1582 nbyte += utfc_ptr2len(str + nbyte); |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1583 else |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1584 nbyte += mb_ptr2len(str + nbyte); |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1585 } |
|
23551
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1586 nchar = clen + index; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1587 if (nchar < 0) |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1588 // unlike list: index out of range results in empty string |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1589 return NULL; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1590 } |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1591 |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1592 for (nbyte = 0; nchar > 0 && nbyte < slen; --nchar) |
|
24226
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1593 { |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1594 if (str[nbyte] < 0x80 && str[nbyte + 1] < 0x80) |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1595 ++nbyte; |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1596 else if (enc_utf8) |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1597 nbyte += utfc_ptr2len(str + nbyte); |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1598 else |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1599 nbyte += mb_ptr2len(str + nbyte); |
|
f49f80a0905d
patch 8.2.2654: Vim9: getting a character from a string can be slow
Bram Moolenaar <Bram@vim.org>
parents:
24220
diff
changeset
|
1600 } |
|
23551
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1601 if (nbyte >= slen) |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1602 return NULL; |
|
24128
fcbb1d4df15b
patch 8.2.2605: Vim9: string index and slice does not include composing chars
Bram Moolenaar <Bram@vim.org>
parents:
24122
diff
changeset
|
1603 return vim_strnsave(str + nbyte, mb_ptr2len(str + nbyte)); |
|
23551
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1604 } |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1605 |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1606 /* |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1607 * Get the byte index for character index "idx" in string "str" with length |
|
24128
fcbb1d4df15b
patch 8.2.2605: Vim9: string index and slice does not include composing chars
Bram Moolenaar <Bram@vim.org>
parents:
24122
diff
changeset
|
1608 * "str_len". Composing characters are included. |
|
23551
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1609 * If going over the end return "str_len". |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1610 * If "idx" is negative count from the end, -1 is the last character. |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1611 * When going over the start return -1. |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1612 */ |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1613 static long |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1614 char_idx2byte(char_u *str, size_t str_len, varnumber_T idx) |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1615 { |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1616 varnumber_T nchar = idx; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1617 size_t nbyte = 0; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1618 |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1619 if (nchar >= 0) |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1620 { |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1621 while (nchar > 0 && nbyte < str_len) |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1622 { |
|
24128
fcbb1d4df15b
patch 8.2.2605: Vim9: string index and slice does not include composing chars
Bram Moolenaar <Bram@vim.org>
parents:
24122
diff
changeset
|
1623 nbyte += mb_ptr2len(str + nbyte); |
|
23551
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1624 --nchar; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1625 } |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1626 } |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1627 else |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1628 { |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1629 nbyte = str_len; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1630 while (nchar < 0 && nbyte > 0) |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1631 { |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1632 --nbyte; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1633 nbyte -= mb_head_off(str, str + nbyte); |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1634 ++nchar; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1635 } |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1636 if (nchar < 0) |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1637 return -1; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1638 } |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1639 return (long)nbyte; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1640 } |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1641 |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1642 /* |
|
24128
fcbb1d4df15b
patch 8.2.2605: Vim9: string index and slice does not include composing chars
Bram Moolenaar <Bram@vim.org>
parents:
24122
diff
changeset
|
1643 * Return the slice "str[first : last]" using character indexes. Composing |
|
fcbb1d4df15b
patch 8.2.2605: Vim9: string index and slice does not include composing chars
Bram Moolenaar <Bram@vim.org>
parents:
24122
diff
changeset
|
1644 * characters are included. |
|
23604
1816ea68c022
patch 8.2.2344: using inclusive index for slice is not always desired
Bram Moolenaar <Bram@vim.org>
parents:
23582
diff
changeset
|
1645 * "exclusive" is TRUE for slice(). |
|
23551
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1646 * Return NULL when the result is empty. |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1647 */ |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1648 char_u * |
|
23604
1816ea68c022
patch 8.2.2344: using inclusive index for slice is not always desired
Bram Moolenaar <Bram@vim.org>
parents:
23582
diff
changeset
|
1649 string_slice(char_u *str, varnumber_T first, varnumber_T last, int exclusive) |
|
23551
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1650 { |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1651 long start_byte, end_byte; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1652 size_t slen; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1653 |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1654 if (str == NULL) |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1655 return NULL; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1656 slen = STRLEN(str); |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1657 start_byte = char_idx2byte(str, slen, first); |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1658 if (start_byte < 0) |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1659 start_byte = 0; // first index very negative: use zero |
|
23604
1816ea68c022
patch 8.2.2344: using inclusive index for slice is not always desired
Bram Moolenaar <Bram@vim.org>
parents:
23582
diff
changeset
|
1660 if ((last == -1 && !exclusive) || last == VARNUM_MAX) |
|
23551
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1661 end_byte = (long)slen; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1662 else |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1663 { |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1664 end_byte = char_idx2byte(str, slen, last); |
|
23604
1816ea68c022
patch 8.2.2344: using inclusive index for slice is not always desired
Bram Moolenaar <Bram@vim.org>
parents:
23582
diff
changeset
|
1665 if (!exclusive && end_byte >= 0 && end_byte < (long)slen) |
|
23551
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1666 // end index is inclusive |
|
24128
fcbb1d4df15b
patch 8.2.2605: Vim9: string index and slice does not include composing chars
Bram Moolenaar <Bram@vim.org>
parents:
24122
diff
changeset
|
1667 end_byte += mb_ptr2len(str + end_byte); |
|
23551
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1668 } |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1669 |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1670 if (start_byte >= (long)slen || end_byte <= start_byte) |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1671 return NULL; |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1672 return vim_strnsave(str + start_byte, end_byte - start_byte); |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1673 } |
|
1bb7fa4f9b35
patch 8.2.2318: Vim9: string and list index work differently
Bram Moolenaar <Bram@vim.org>
parents:
23543
diff
changeset
|
1674 |
|
25461
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1675 /* |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1676 * Get a script variable for ISN_STORESCRIPT and ISN_LOADSCRIPT. |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1677 * When "dfunc_idx" is negative don't give an error. |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1678 * Returns NULL for an error. |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1679 */ |
|
23362
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1680 static svar_T * |
|
25461
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1681 get_script_svar(scriptref_T *sref, int dfunc_idx) |
|
23362
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1682 { |
|
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1683 scriptitem_T *si = SCRIPT_ITEM(sref->sref_sid); |
|
25461
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1684 dfunc_T *dfunc = dfunc_idx < 0 ? NULL |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1685 : ((dfunc_T *)def_functions.ga_data) + dfunc_idx; |
|
23362
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1686 svar_T *sv; |
|
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1687 |
|
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1688 if (sref->sref_seq != si->sn_script_seq) |
|
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1689 { |
|
25461
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1690 // The script was reloaded after the function was compiled, the |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1691 // script_idx may not be valid. |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1692 if (dfunc != NULL) |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1693 semsg(_(e_script_variable_invalid_after_reload_in_function_str), |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1694 printable_func_name(dfunc->df_ufunc)); |
|
23362
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1695 return NULL; |
|
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1696 } |
|
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1697 sv = ((svar_T *)si->sn_var_vals.ga_data) + sref->sref_idx; |
|
25425
effe5f2b4d01
patch 8.2.3249: Vim9: error for re-imported function with default argument
Bram Moolenaar <Bram@vim.org>
parents:
25350
diff
changeset
|
1698 if (!equal_type(sv->sv_type, sref->sref_type, 0)) |
|
23362
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1699 { |
|
25461
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1700 if (dfunc != NULL) |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
1701 emsg(_(e_script_variable_type_changed)); |
|
23362
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1702 return NULL; |
|
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1703 } |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
1704 |
|
28345
fabe722b24e9
patch 8.2.4698: Vim9: script variable has no flag that it was set
Bram Moolenaar <Bram@vim.org>
parents:
28343
diff
changeset
|
1705 if ((sv->sv_flags & SVFLAG_EXPORTED) == 0 |
|
fabe722b24e9
patch 8.2.4698: Vim9: script variable has no flag that it was set
Bram Moolenaar <Bram@vim.org>
parents:
28343
diff
changeset
|
1706 && sref->sref_sid != current_sctx.sc_sid) |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
1707 { |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
1708 if (dfunc != NULL) |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
1709 semsg(_(e_item_not_exported_in_script_str), sv->sv_name); |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
1710 return NULL; |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
1711 } |
|
23362
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1712 return sv; |
|
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1713 } |
|
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
1714 |
|
19455
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
1715 /* |
|
24826
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1716 * Function passed to do_cmdline() for splitting a script joined by NL |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1717 * characters. |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1718 */ |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1719 static char_u * |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1720 get_split_sourceline( |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1721 int c UNUSED, |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1722 void *cookie, |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1723 int indent UNUSED, |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1724 getline_opt_T options UNUSED) |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1725 { |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1726 source_cookie_T *sp = (source_cookie_T *)cookie; |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1727 char_u *p; |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1728 char_u *line; |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1729 |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1730 p = vim_strchr(sp->nextline, '\n'); |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1731 if (p == NULL) |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1732 { |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1733 line = vim_strsave(sp->nextline); |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1734 sp->nextline += STRLEN(sp->nextline); |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1735 } |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1736 else |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1737 { |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1738 line = vim_strnsave(sp->nextline, p - sp->nextline); |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1739 sp->nextline = p + 1; |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1740 } |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1741 return line; |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1742 } |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1743 |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
1744 /* |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1745 * Execute a function by "name". |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1746 * This can be a builtin function, user function or a funcref. |
|
19532
b8f778dda1a1
patch 8.2.0323: Vim9: calling a function that is defined later is slow
Bram Moolenaar <Bram@vim.org>
parents:
19528
diff
changeset
|
1747 * "iptr" can be used to replace the instruction with a more efficient one. |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1748 */ |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1749 static int |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1750 call_eval_func( |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1751 char_u *name, |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1752 int argcount, |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1753 ectx_T *ectx, |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
1754 isn_T *iptr) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1755 { |
|
21757
6c03897bcd60
patch 8.2.1428: Vim9: :def function does not abort on nested function error
Bram Moolenaar <Bram@vim.org>
parents:
21753
diff
changeset
|
1756 int called_emsg_before = called_emsg; |
|
6c03897bcd60
patch 8.2.1428: Vim9: :def function does not abort on nested function error
Bram Moolenaar <Bram@vim.org>
parents:
21753
diff
changeset
|
1757 int res; |
|
6c03897bcd60
patch 8.2.1428: Vim9: :def function does not abort on nested function error
Bram Moolenaar <Bram@vim.org>
parents:
21753
diff
changeset
|
1758 |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
1759 res = call_by_name(name, argcount, ectx, iptr, NULL); |
|
21757
6c03897bcd60
patch 8.2.1428: Vim9: :def function does not abort on nested function error
Bram Moolenaar <Bram@vim.org>
parents:
21753
diff
changeset
|
1760 if (res == FAIL && called_emsg == called_emsg_before) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1761 { |
|
20140
39a18a0df429
patch 8.2.0625: Vim9: confusing error when calling unknown function
Bram Moolenaar <Bram@vim.org>
parents:
20099
diff
changeset
|
1762 dictitem_T *v; |
|
39a18a0df429
patch 8.2.0625: Vim9: confusing error when calling unknown function
Bram Moolenaar <Bram@vim.org>
parents:
20099
diff
changeset
|
1763 |
|
39a18a0df429
patch 8.2.0625: Vim9: confusing error when calling unknown function
Bram Moolenaar <Bram@vim.org>
parents:
20099
diff
changeset
|
1764 v = find_var(name, NULL, FALSE); |
|
28263
c446812efd60
patch 8.2.4657: errors for functions are sometimes hard to read
Bram Moolenaar <Bram@vim.org>
parents:
28253
diff
changeset
|
1765 if (v == NULL || (v->di_tv.v_type != VAR_PARTIAL |
|
c446812efd60
patch 8.2.4657: errors for functions are sometimes hard to read
Bram Moolenaar <Bram@vim.org>
parents:
28253
diff
changeset
|
1766 && v->di_tv.v_type != VAR_FUNC)) |
|
20140
39a18a0df429
patch 8.2.0625: Vim9: confusing error when calling unknown function
Bram Moolenaar <Bram@vim.org>
parents:
20099
diff
changeset
|
1767 { |
|
28263
c446812efd60
patch 8.2.4657: errors for functions are sometimes hard to read
Bram Moolenaar <Bram@vim.org>
parents:
28253
diff
changeset
|
1768 emsg_funcname(e_unknown_function_str, name); |
|
20140
39a18a0df429
patch 8.2.0625: Vim9: confusing error when calling unknown function
Bram Moolenaar <Bram@vim.org>
parents:
20099
diff
changeset
|
1769 return FAIL; |
|
39a18a0df429
patch 8.2.0625: Vim9: confusing error when calling unknown function
Bram Moolenaar <Bram@vim.org>
parents:
20099
diff
changeset
|
1770 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
1771 return call_partial(&v->di_tv, argcount, ectx); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1772 } |
|
21757
6c03897bcd60
patch 8.2.1428: Vim9: :def function does not abort on nested function error
Bram Moolenaar <Bram@vim.org>
parents:
21753
diff
changeset
|
1773 return res; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1774 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1775 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1776 /* |
|
23249
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1777 * When a function reference is used, fill a partial with the information |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1778 * needed, especially when it is used as a closure. |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1779 */ |
|
23285
112fa621b127
patch 8.2.2188: Vim9: crash when calling global function from :def function
Bram Moolenaar <Bram@vim.org>
parents:
23266
diff
changeset
|
1780 int |
|
23249
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1781 fill_partial_and_closure(partial_T *pt, ufunc_T *ufunc, ectx_T *ectx) |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1782 { |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1783 pt->pt_func = ufunc; |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1784 pt->pt_refcount = 1; |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1785 |
|
23699
317018f62643
patch 8.2.2391: memory leak when creating a global function with closure
Bram Moolenaar <Bram@vim.org>
parents:
23697
diff
changeset
|
1786 if (ufunc->uf_flags & FC_CLOSURE) |
|
23249
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1787 { |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1788 dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1789 + ectx->ec_dfunc_idx; |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1790 |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1791 // The closure may need to find arguments and local variables in the |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1792 // current stack. |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1793 pt->pt_outer.out_stack = &ectx->ec_stack; |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
1794 pt->pt_outer.out_frame_idx = ectx->ec_frame_idx; |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1795 if (ectx->ec_outer_ref != NULL) |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1796 { |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1797 // The current context already has a context, link to that one. |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1798 pt->pt_outer.out_up = ectx->ec_outer_ref->or_outer; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1799 if (ectx->ec_outer_ref->or_partial != NULL) |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1800 { |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1801 pt->pt_outer.out_up_partial = ectx->ec_outer_ref->or_partial; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1802 ++pt->pt_outer.out_up_partial->pt_refcount; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1803 } |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1804 } |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1805 |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1806 // If this function returns and the closure is still being used, we |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1807 // need to make a copy of the context (arguments and local variables). |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1808 // Store a reference to the partial so we can handle that. |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
1809 if (GA_GROW_FAILS(&ectx->ec_funcrefs, 1)) |
|
23249
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1810 { |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1811 vim_free(pt); |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1812 return FAIL; |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1813 } |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1814 // Extra variable keeps the count of closures created in the current |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
1815 // function call. |
|
23249
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1816 ++(((typval_T *)ectx->ec_stack.ga_data) + ectx->ec_frame_idx |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1817 + STACK_FRAME_SIZE + dfunc->df_varcount)->vval.v_number; |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1818 |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1819 ((partial_T **)ectx->ec_funcrefs.ga_data) |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1820 [ectx->ec_funcrefs.ga_len] = pt; |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1821 ++pt->pt_refcount; |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1822 ++ectx->ec_funcrefs.ga_len; |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1823 } |
|
23699
317018f62643
patch 8.2.2391: memory leak when creating a global function with closure
Bram Moolenaar <Bram@vim.org>
parents:
23697
diff
changeset
|
1824 ++ufunc->uf_refcount; |
|
23249
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1825 return OK; |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1826 } |
|
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
1827 |
|
25605
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1828 /* |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1829 * Execute iptr->isn_arg.string as an Ex command. |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1830 */ |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1831 static int |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1832 exec_command(isn_T *iptr) |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1833 { |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1834 source_cookie_T cookie; |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1835 |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1836 SOURCING_LNUM = iptr->isn_lnum; |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1837 // Pass getsourceline to get an error for a missing ":end" |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1838 // command. |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1839 CLEAR_FIELD(cookie); |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1840 cookie.sourcing_lnum = iptr->isn_lnum - 1; |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1841 if (do_cmdline(iptr->isn_arg.string, |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1842 getsourceline, &cookie, |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1843 DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_KEYTYPED) == FAIL |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1844 || did_emsg) |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1845 return FAIL; |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1846 return OK; |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1847 } |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
1848 |
|
28447
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1849 /* |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1850 * If script "sid" is not loaded yet then load it now. |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1851 * Caller must make sure "sid" is a valid script ID. |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1852 * "loaded" is set to TRUE if the script had to be loaded. |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1853 * Returns FAIL if loading fails, OK if already loaded or loaded now. |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1854 */ |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1855 int |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1856 may_load_script(int sid, int *loaded) |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1857 { |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1858 scriptitem_T *si = SCRIPT_ITEM(sid); |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1859 |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1860 if (si->sn_state == SN_STATE_NOT_LOADED) |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1861 { |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1862 *loaded = TRUE; |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1863 if (do_source(si->sn_name, FALSE, DOSO_NONE, NULL) == FAIL) |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1864 { |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1865 semsg(_(e_cant_open_file_str), si->sn_name); |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1866 return FAIL; |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1867 } |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1868 } |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1869 return OK; |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1870 } |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
1871 |
|
24606
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
1872 // used for v_instr of typval of VAR_INSTR |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
1873 struct instr_S { |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
1874 ectx_T *instr_ectx; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
1875 isn_T *instr_instr; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
1876 }; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
1877 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
1878 // used for substitute_instr |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
1879 typedef struct subs_expr_S { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
1880 ectx_T *subs_ectx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
1881 isn_T *subs_instr; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
1882 int subs_status; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
1883 } subs_expr_T; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1884 |
|
24918
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1885 // Set when calling do_debug(). |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1886 static ectx_T *debug_context = NULL; |
|
24948
5c418c774f95
patch 8.2.3011: Vim9: cannot get argument values during debugging
Bram Moolenaar <Bram@vim.org>
parents:
24936
diff
changeset
|
1887 static int debug_var_count; |
|
24918
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1888 |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1889 /* |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1890 * When debugging lookup "name" and return the typeval. |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1891 * When not found return NULL. |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1892 */ |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1893 typval_T * |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1894 lookup_debug_var(char_u *name) |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1895 { |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1896 int idx; |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1897 dfunc_T *dfunc; |
|
24948
5c418c774f95
patch 8.2.3011: Vim9: cannot get argument values during debugging
Bram Moolenaar <Bram@vim.org>
parents:
24936
diff
changeset
|
1898 ufunc_T *ufunc; |
|
24918
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1899 ectx_T *ectx = debug_context; |
|
24948
5c418c774f95
patch 8.2.3011: Vim9: cannot get argument values during debugging
Bram Moolenaar <Bram@vim.org>
parents:
24936
diff
changeset
|
1900 int varargs_off; |
|
24918
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1901 |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1902 if (ectx == NULL) |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1903 return NULL; |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1904 dfunc = ((dfunc_T *)def_functions.ga_data) + ectx->ec_dfunc_idx; |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1905 |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1906 // Go through the local variable names, from last to first. |
|
24948
5c418c774f95
patch 8.2.3011: Vim9: cannot get argument values during debugging
Bram Moolenaar <Bram@vim.org>
parents:
24936
diff
changeset
|
1907 for (idx = debug_var_count - 1; idx >= 0; --idx) |
|
24918
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1908 { |
|
28033
73f4d1e479f2
patch 8.2.4541: Crash in debugger when a variable is not available
Bram Moolenaar <Bram@vim.org>
parents:
28019
diff
changeset
|
1909 char_u *varname = ((char_u **)dfunc->df_var_names.ga_data)[idx]; |
|
73f4d1e479f2
patch 8.2.4541: Crash in debugger when a variable is not available
Bram Moolenaar <Bram@vim.org>
parents:
28019
diff
changeset
|
1910 |
|
73f4d1e479f2
patch 8.2.4541: Crash in debugger when a variable is not available
Bram Moolenaar <Bram@vim.org>
parents:
28019
diff
changeset
|
1911 // the variable name may be NULL when not available in this block |
|
73f4d1e479f2
patch 8.2.4541: Crash in debugger when a variable is not available
Bram Moolenaar <Bram@vim.org>
parents:
28019
diff
changeset
|
1912 if (varname != NULL && STRCMP(varname, name) == 0) |
|
24918
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1913 return STACK_TV_VAR(idx); |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1914 } |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1915 |
|
24948
5c418c774f95
patch 8.2.3011: Vim9: cannot get argument values during debugging
Bram Moolenaar <Bram@vim.org>
parents:
24936
diff
changeset
|
1916 // Go through argument names. |
|
5c418c774f95
patch 8.2.3011: Vim9: cannot get argument values during debugging
Bram Moolenaar <Bram@vim.org>
parents:
24936
diff
changeset
|
1917 ufunc = dfunc->df_ufunc; |
|
5c418c774f95
patch 8.2.3011: Vim9: cannot get argument values during debugging
Bram Moolenaar <Bram@vim.org>
parents:
24936
diff
changeset
|
1918 varargs_off = ufunc->uf_va_name == NULL ? 0 : 1; |
|
5c418c774f95
patch 8.2.3011: Vim9: cannot get argument values during debugging
Bram Moolenaar <Bram@vim.org>
parents:
24936
diff
changeset
|
1919 for (idx = 0; idx < ufunc->uf_args.ga_len; ++idx) |
|
5c418c774f95
patch 8.2.3011: Vim9: cannot get argument values during debugging
Bram Moolenaar <Bram@vim.org>
parents:
24936
diff
changeset
|
1920 if (STRCMP(((char_u **)(ufunc->uf_args.ga_data))[idx], name) == 0) |
|
5c418c774f95
patch 8.2.3011: Vim9: cannot get argument values during debugging
Bram Moolenaar <Bram@vim.org>
parents:
24936
diff
changeset
|
1921 return STACK_TV(ectx->ec_frame_idx - ufunc->uf_args.ga_len |
|
5c418c774f95
patch 8.2.3011: Vim9: cannot get argument values during debugging
Bram Moolenaar <Bram@vim.org>
parents:
24936
diff
changeset
|
1922 - varargs_off + idx); |
|
5c418c774f95
patch 8.2.3011: Vim9: cannot get argument values during debugging
Bram Moolenaar <Bram@vim.org>
parents:
24936
diff
changeset
|
1923 if (ufunc->uf_va_name != NULL && STRCMP(ufunc->uf_va_name, name) == 0) |
|
5c418c774f95
patch 8.2.3011: Vim9: cannot get argument values during debugging
Bram Moolenaar <Bram@vim.org>
parents:
24936
diff
changeset
|
1924 return STACK_TV(ectx->ec_frame_idx - 1); |
|
5c418c774f95
patch 8.2.3011: Vim9: cannot get argument values during debugging
Bram Moolenaar <Bram@vim.org>
parents:
24936
diff
changeset
|
1925 |
|
24918
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1926 return NULL; |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1927 } |
|
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
1928 |
|
25719
154663508d9b
patch 8.2.3395: Vim9: expression breakpoint not checked in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25609
diff
changeset
|
1929 /* |
|
154663508d9b
patch 8.2.3395: Vim9: expression breakpoint not checked in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25609
diff
changeset
|
1930 * Return TRUE if there might be a breakpoint in "ufunc", which is when a |
|
154663508d9b
patch 8.2.3395: Vim9: expression breakpoint not checked in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25609
diff
changeset
|
1931 * breakpoint was set in that function or when there is any expression. |
|
154663508d9b
patch 8.2.3395: Vim9: expression breakpoint not checked in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25609
diff
changeset
|
1932 */ |
|
154663508d9b
patch 8.2.3395: Vim9: expression breakpoint not checked in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25609
diff
changeset
|
1933 int |
|
154663508d9b
patch 8.2.3395: Vim9: expression breakpoint not checked in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25609
diff
changeset
|
1934 may_break_in_function(ufunc_T *ufunc) |
|
154663508d9b
patch 8.2.3395: Vim9: expression breakpoint not checked in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25609
diff
changeset
|
1935 { |
|
154663508d9b
patch 8.2.3395: Vim9: expression breakpoint not checked in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25609
diff
changeset
|
1936 return ufunc->uf_has_breakpoint || debug_has_expr_breakpoint(); |
|
154663508d9b
patch 8.2.3395: Vim9: expression breakpoint not checked in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25609
diff
changeset
|
1937 } |
|
154663508d9b
patch 8.2.3395: Vim9: expression breakpoint not checked in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25609
diff
changeset
|
1938 |
|
24952
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1939 static void |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1940 handle_debug(isn_T *iptr, ectx_T *ectx) |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1941 { |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1942 char_u *line; |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1943 ufunc_T *ufunc = (((dfunc_T *)def_functions.ga_data) |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1944 + ectx->ec_dfunc_idx)->df_ufunc; |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1945 isn_T *ni; |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1946 int end_lnum = iptr->isn_lnum; |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1947 garray_T ga; |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1948 int lnum; |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1949 |
|
24978
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
1950 if (ex_nesting_level > debug_break_level) |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
1951 { |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
1952 linenr_T breakpoint; |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
1953 |
|
25719
154663508d9b
patch 8.2.3395: Vim9: expression breakpoint not checked in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25609
diff
changeset
|
1954 if (!may_break_in_function(ufunc)) |
|
24978
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
1955 return; |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
1956 |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
1957 // check for the next breakpoint if needed |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
1958 breakpoint = dbg_find_breakpoint(FALSE, ufunc->uf_name, |
|
25004
70f55a30f03c
patch 8.2.3039: Vim9: breakpoint at a comment line does not work
Bram Moolenaar <Bram@vim.org>
parents:
24984
diff
changeset
|
1959 iptr->isn_arg.debug.dbg_break_lnum); |
|
24978
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
1960 if (breakpoint <= 0 || breakpoint > iptr->isn_lnum) |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
1961 return; |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
1962 } |
|
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
1963 |
|
24952
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1964 SOURCING_LNUM = iptr->isn_lnum; |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1965 debug_context = ectx; |
|
25004
70f55a30f03c
patch 8.2.3039: Vim9: breakpoint at a comment line does not work
Bram Moolenaar <Bram@vim.org>
parents:
24984
diff
changeset
|
1966 debug_var_count = iptr->isn_arg.debug.dbg_var_names_len; |
|
24952
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1967 |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1968 for (ni = iptr + 1; ni->isn_type != ISN_FINISH; ++ni) |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1969 if (ni->isn_type == ISN_DEBUG |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1970 || ni->isn_type == ISN_RETURN |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1971 || ni->isn_type == ISN_RETURN_VOID) |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1972 { |
|
26252
3d92646fe6c8
patch 8.2.3657: Vim9: debug text misses one line of return statement
Bram Moolenaar <Bram@vim.org>
parents:
25994
diff
changeset
|
1973 end_lnum = ni->isn_lnum + (ni->isn_type == ISN_DEBUG ? 0 : 1); |
|
24952
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1974 break; |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1975 } |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1976 |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1977 if (end_lnum > iptr->isn_lnum) |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1978 { |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1979 ga_init2(&ga, sizeof(char_u *), 10); |
|
26698
254fffd11fda
patch 8.2.3878: Vim9: debugger tries to read more lines than there are
Bram Moolenaar <Bram@vim.org>
parents:
26672
diff
changeset
|
1980 for (lnum = iptr->isn_lnum; lnum < end_lnum |
|
254fffd11fda
patch 8.2.3878: Vim9: debugger tries to read more lines than there are
Bram Moolenaar <Bram@vim.org>
parents:
26672
diff
changeset
|
1981 && lnum <= ufunc->uf_lines.ga_len; ++lnum) |
|
24960
64b70a958f19
patch 8.2.3017: Vim9: debugger shows too many lines
Bram Moolenaar <Bram@vim.org>
parents:
24956
diff
changeset
|
1982 { |
|
25159
b2a6a71a11e8
patch 8.2.3116: Vim9: crash when debugging a function with line continuation
Bram Moolenaar <Bram@vim.org>
parents:
25082
diff
changeset
|
1983 char_u *p = ((char_u **)ufunc->uf_lines.ga_data)[lnum - 1]; |
|
b2a6a71a11e8
patch 8.2.3116: Vim9: crash when debugging a function with line continuation
Bram Moolenaar <Bram@vim.org>
parents:
25082
diff
changeset
|
1984 |
|
b2a6a71a11e8
patch 8.2.3116: Vim9: crash when debugging a function with line continuation
Bram Moolenaar <Bram@vim.org>
parents:
25082
diff
changeset
|
1985 if (p == NULL) |
|
b2a6a71a11e8
patch 8.2.3116: Vim9: crash when debugging a function with line continuation
Bram Moolenaar <Bram@vim.org>
parents:
25082
diff
changeset
|
1986 continue; // left over from continuation line |
|
b2a6a71a11e8
patch 8.2.3116: Vim9: crash when debugging a function with line continuation
Bram Moolenaar <Bram@vim.org>
parents:
25082
diff
changeset
|
1987 p = skipwhite(p); |
|
24960
64b70a958f19
patch 8.2.3017: Vim9: debugger shows too many lines
Bram Moolenaar <Bram@vim.org>
parents:
24956
diff
changeset
|
1988 if (*p == '#') |
|
64b70a958f19
patch 8.2.3017: Vim9: debugger shows too many lines
Bram Moolenaar <Bram@vim.org>
parents:
24956
diff
changeset
|
1989 break; |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
1990 if (GA_GROW_OK(&ga, 1)) |
|
24960
64b70a958f19
patch 8.2.3017: Vim9: debugger shows too many lines
Bram Moolenaar <Bram@vim.org>
parents:
24956
diff
changeset
|
1991 ((char_u **)(ga.ga_data))[ga.ga_len++] = p; |
|
64b70a958f19
patch 8.2.3017: Vim9: debugger shows too many lines
Bram Moolenaar <Bram@vim.org>
parents:
24956
diff
changeset
|
1992 if (STRNCMP(p, "def ", 4) == 0) |
|
64b70a958f19
patch 8.2.3017: Vim9: debugger shows too many lines
Bram Moolenaar <Bram@vim.org>
parents:
24956
diff
changeset
|
1993 break; |
|
64b70a958f19
patch 8.2.3017: Vim9: debugger shows too many lines
Bram Moolenaar <Bram@vim.org>
parents:
24956
diff
changeset
|
1994 } |
|
24952
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1995 line = ga_concat_strings(&ga, " "); |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1996 vim_free(ga.ga_data); |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1997 } |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1998 else |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
1999 line = ((char_u **)ufunc->uf_lines.ga_data)[iptr->isn_lnum - 1]; |
|
24954
9b7fac4c70a0
patch 8.2.3014: Coverity warns for freeing static string
Bram Moolenaar <Bram@vim.org>
parents:
24952
diff
changeset
|
2000 |
|
9b7fac4c70a0
patch 8.2.3014: Coverity warns for freeing static string
Bram Moolenaar <Bram@vim.org>
parents:
24952
diff
changeset
|
2001 do_debug(line == NULL ? (char_u *)"[empty]" : line); |
|
24952
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
2002 debug_context = NULL; |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
2003 |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
2004 if (end_lnum > iptr->isn_lnum) |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
2005 vim_free(line); |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
2006 } |
|
ffe784fdec57
patch 8.2.3013: Vim: when debugging only first line of command is displayed
Bram Moolenaar <Bram@vim.org>
parents:
24948
diff
changeset
|
2007 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2008 /* |
|
27565
0b12dd90a5d6
patch 8.2.4309: Vim9: crash when using a partial in the wrong context
Bram Moolenaar <Bram@vim.org>
parents:
27517
diff
changeset
|
2009 * Store a value in a list, dict or blob variable. |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2010 * Returns OK, FAIL or NOTDONE (uncatchable error). |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2011 */ |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2012 static int |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2013 execute_storeindex(isn_T *iptr, ectx_T *ectx) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2014 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2015 vartype_T dest_type = iptr->isn_arg.vartype; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2016 typval_T *tv; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2017 typval_T *tv_idx = STACK_TV_BOT(-2); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2018 typval_T *tv_dest = STACK_TV_BOT(-1); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2019 int status = OK; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2020 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2021 // Stack contains: |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2022 // -3 value to be stored |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2023 // -2 index |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2024 // -1 dict or list |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2025 tv = STACK_TV_BOT(-3); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2026 SOURCING_LNUM = iptr->isn_lnum; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2027 if (dest_type == VAR_ANY) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2028 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2029 dest_type = tv_dest->v_type; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2030 if (dest_type == VAR_DICT) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2031 status = do_2string(tv_idx, TRUE, FALSE); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2032 else if (dest_type == VAR_LIST && tv_idx->v_type != VAR_NUMBER) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2033 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2034 emsg(_(e_number_expected)); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2035 status = FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2036 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2037 } |
|
27762
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2038 |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2039 if (status == OK) |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2040 { |
|
27762
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2041 if (dest_type == VAR_LIST) |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2042 { |
|
27762
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2043 long lidx = (long)tv_idx->vval.v_number; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2044 list_T *list = tv_dest->vval.v_list; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2045 |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2046 if (list == NULL) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2047 { |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2048 emsg(_(e_list_not_set)); |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2049 return FAIL; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2050 } |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2051 if (lidx < 0 && list->lv_len + lidx >= 0) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2052 // negative index is relative to the end |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2053 lidx = list->lv_len + lidx; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2054 if (lidx < 0 || lidx > list->lv_len) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2055 { |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2056 semsg(_(e_list_index_out_of_range_nr), lidx); |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2057 return FAIL; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2058 } |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2059 if (lidx < list->lv_len) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2060 { |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2061 listitem_T *li = list_find(list, lidx); |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2062 |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2063 if (error_if_locked(li->li_tv.v_lock, |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2064 e_cannot_change_locked_list_item)) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2065 return FAIL; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2066 // overwrite existing list item |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2067 clear_tv(&li->li_tv); |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2068 li->li_tv = *tv; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2069 } |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2070 else |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2071 { |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2072 if (error_if_locked(list->lv_lock, e_cannot_change_locked_list)) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2073 return FAIL; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2074 // append to list, only fails when out of memory |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2075 if (list_append_tv(list, tv) == FAIL) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2076 return NOTDONE; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2077 clear_tv(tv); |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2078 } |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2079 } |
|
27762
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2080 else if (dest_type == VAR_DICT) |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2081 { |
|
27762
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2082 char_u *key = tv_idx->vval.v_string; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2083 dict_T *dict = tv_dest->vval.v_dict; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2084 dictitem_T *di; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2085 |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2086 SOURCING_LNUM = iptr->isn_lnum; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2087 if (dict == NULL) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2088 { |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2089 emsg(_(e_dictionary_not_set)); |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2090 return FAIL; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2091 } |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2092 if (key == NULL) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2093 key = (char_u *)""; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2094 di = dict_find(dict, key, -1); |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2095 if (di != NULL) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2096 { |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2097 if (error_if_locked(di->di_tv.v_lock, |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2098 e_cannot_change_dict_item)) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2099 return FAIL; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2100 // overwrite existing value |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2101 clear_tv(&di->di_tv); |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2102 di->di_tv = *tv; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2103 } |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2104 else |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2105 { |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2106 if (error_if_locked(dict->dv_lock, e_cannot_change_dict)) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2107 return FAIL; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2108 // add to dict, only fails when out of memory |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2109 if (dict_add_tv(dict, (char *)key, tv) == FAIL) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2110 return NOTDONE; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2111 clear_tv(tv); |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2112 } |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2113 } |
|
27762
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2114 else if (dest_type == VAR_BLOB) |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2115 { |
|
27762
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2116 long lidx = (long)tv_idx->vval.v_number; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2117 blob_T *blob = tv_dest->vval.v_blob; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2118 varnumber_T nr; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2119 int error = FALSE; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2120 int len; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2121 |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2122 if (blob == NULL) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2123 { |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2124 emsg(_(e_blob_not_set)); |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2125 return FAIL; |
|
27762
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2126 } |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2127 len = blob_len(blob); |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2128 if (lidx < 0 && len + lidx >= 0) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2129 // negative index is relative to the end |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2130 lidx = len + lidx; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2131 |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2132 // Can add one byte at the end. |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2133 if (lidx < 0 || lidx > len) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2134 { |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2135 semsg(_(e_blob_index_out_of_range_nr), lidx); |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2136 return FAIL; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2137 } |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2138 if (value_check_lock(blob->bv_lock, (char_u *)"blob", FALSE)) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2139 return FAIL; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2140 nr = tv_get_number_chk(tv, &error); |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2141 if (error) |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2142 return FAIL; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2143 blob_set_append(blob, lidx, nr); |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2144 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2145 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2146 { |
|
27762
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2147 status = FAIL; |
|
3196066c5795
patch 8.2.4407: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27756
diff
changeset
|
2148 semsg(_(e_cannot_index_str), vartype_name(dest_type)); |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2149 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2150 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2151 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2152 clear_tv(tv_idx); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2153 clear_tv(tv_dest); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2154 ectx->ec_stack.ga_len -= 3; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2155 if (status == FAIL) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2156 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2157 clear_tv(tv); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2158 return FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2159 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2160 return OK; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2161 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2162 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2163 /* |
|
27764
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2164 * Store a value in a list or blob range. |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2165 */ |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2166 static int |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2167 execute_storerange(isn_T *iptr, ectx_T *ectx) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2168 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2169 typval_T *tv; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2170 typval_T *tv_idx1 = STACK_TV_BOT(-3); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2171 typval_T *tv_idx2 = STACK_TV_BOT(-2); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2172 typval_T *tv_dest = STACK_TV_BOT(-1); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2173 int status = OK; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2174 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2175 // Stack contains: |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2176 // -4 value to be stored |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2177 // -3 first index or "none" |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2178 // -2 second index or "none" |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2179 // -1 destination list or blob |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2180 tv = STACK_TV_BOT(-4); |
|
27764
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2181 SOURCING_LNUM = iptr->isn_lnum; |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2182 if (tv_dest->v_type == VAR_LIST) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2183 { |
|
28131
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2184 long n1; |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2185 long n2; |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2186 listitem_T *li1; |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2187 |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2188 n1 = (long)tv_get_number_chk(tv_idx1, NULL); |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2189 if (tv_idx2->v_type == VAR_SPECIAL |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2190 && tv_idx2->vval.v_number == VVAL_NONE) |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2191 n2 = list_len(tv_dest->vval.v_list) - 1; |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2192 else |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2193 n2 = (long)tv_get_number_chk(tv_idx2, NULL); |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2194 |
|
28273
fff70771d4bb
patch 8.2.4662: no error for using out of range list index
Bram Moolenaar <Bram@vim.org>
parents:
28263
diff
changeset
|
2195 li1 = check_range_index_one(tv_dest->vval.v_list, &n1, TRUE, FALSE); |
|
28131
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2196 if (li1 == NULL) |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2197 status = FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2198 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2199 { |
|
28131
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2200 status = check_range_index_two(tv_dest->vval.v_list, |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2201 &n1, li1, &n2, FALSE); |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2202 if (status != FAIL) |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2203 status = list_assign_range( |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2204 tv_dest->vval.v_list, |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2205 tv->vval.v_list, |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2206 n1, |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2207 n2, |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2208 tv_idx2->v_type == VAR_SPECIAL, |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2209 (char_u *)"=", |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2210 (char_u *)"[unknown]"); |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2211 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2212 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2213 else if (tv_dest->v_type == VAR_BLOB) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2214 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2215 varnumber_T n1; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2216 varnumber_T n2; |
|
28131
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2217 long bloblen; |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2218 |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2219 n1 = tv_get_number_chk(tv_idx1, NULL); |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2220 if (tv_idx2->v_type == VAR_SPECIAL |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2221 && tv_idx2->vval.v_number == VVAL_NONE) |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2222 n2 = blob_len(tv_dest->vval.v_blob) - 1; |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2223 else |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2224 n2 = tv_get_number_chk(tv_idx2, NULL); |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2225 bloblen = blob_len(tv_dest->vval.v_blob); |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2226 |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2227 if (check_blob_index(bloblen, n1, FALSE) == FAIL |
|
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2228 || check_blob_range(bloblen, n1, n2, FALSE) == FAIL) |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2229 status = FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2230 else |
|
28131
d8bf200cd761
patch 8.2.4590: Vim9: range type check has wrong offset
Bram Moolenaar <Bram@vim.org>
parents:
28125
diff
changeset
|
2231 status = blob_set_range(tv_dest->vval.v_blob, n1, n2, tv); |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2232 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2233 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2234 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2235 status = FAIL; |
|
27764
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2236 emsg(_(e_list_or_blob_required)); |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2237 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2238 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2239 clear_tv(tv_idx1); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2240 clear_tv(tv_idx2); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2241 clear_tv(tv_dest); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2242 ectx->ec_stack.ga_len -= 4; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2243 clear_tv(tv); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2244 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2245 return status; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2246 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2247 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2248 /* |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2249 * Unlet item in list or dict variable. |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2250 */ |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2251 static int |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2252 execute_unletindex(isn_T *iptr, ectx_T *ectx) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2253 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2254 typval_T *tv_idx = STACK_TV_BOT(-2); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2255 typval_T *tv_dest = STACK_TV_BOT(-1); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2256 int status = OK; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2257 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2258 // Stack contains: |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2259 // -2 index |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2260 // -1 dict or list |
|
27766
2a394907825d
patch 8.2.4409: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27764
diff
changeset
|
2261 SOURCING_LNUM = iptr->isn_lnum; |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2262 if (tv_dest->v_type == VAR_DICT) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2263 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2264 // unlet a dict item, index must be a string |
|
27764
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2265 if (tv_idx->v_type != VAR_STRING && tv_idx->v_type != VAR_NUMBER) |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2266 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2267 semsg(_(e_expected_str_but_got_str), |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2268 vartype_name(VAR_STRING), |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2269 vartype_name(tv_idx->v_type)); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2270 status = FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2271 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2272 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2273 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2274 dict_T *d = tv_dest->vval.v_dict; |
|
27764
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2275 char_u *key; |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2276 dictitem_T *di = NULL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2277 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2278 if (d != NULL && value_check_lock( |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2279 d->dv_lock, NULL, FALSE)) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2280 status = FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2281 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2282 { |
|
27764
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2283 if (tv_idx->v_type == VAR_STRING) |
|
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2284 { |
|
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2285 key = tv_idx->vval.v_string; |
|
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2286 if (key == NULL) |
|
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2287 key = (char_u *)""; |
|
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2288 } |
|
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2289 else |
|
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2290 { |
|
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2291 key = tv_get_string(tv_idx); |
|
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
2292 } |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2293 if (d != NULL) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2294 di = dict_find(d, key, (int)STRLEN(key)); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2295 if (di == NULL) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2296 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2297 // NULL dict is equivalent to empty dict |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2298 semsg(_(e_key_not_present_in_dictionary), |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2299 key); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2300 status = FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2301 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2302 else if (var_check_fixed(di->di_flags, |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2303 NULL, FALSE) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2304 || var_check_ro(di->di_flags, |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2305 NULL, FALSE)) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2306 status = FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2307 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2308 dictitem_remove(d, di); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2309 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2310 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2311 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2312 else if (tv_dest->v_type == VAR_LIST) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2313 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2314 // unlet a List item, index must be a number |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2315 if (check_for_number(tv_idx) == FAIL) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2316 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2317 status = FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2318 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2319 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2320 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2321 list_T *l = tv_dest->vval.v_list; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2322 long n = (long)tv_idx->vval.v_number; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2323 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2324 if (l != NULL && value_check_lock( |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2325 l->lv_lock, NULL, FALSE)) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2326 status = FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2327 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2328 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2329 listitem_T *li = list_find(l, n); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2330 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2331 if (li == NULL) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2332 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2333 semsg(_(e_list_index_out_of_range_nr), n); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2334 status = FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2335 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2336 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2337 listitem_remove(l, li); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2338 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2339 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2340 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2341 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2342 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2343 status = FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2344 semsg(_(e_cannot_index_str), |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2345 vartype_name(tv_dest->v_type)); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2346 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2347 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2348 clear_tv(tv_idx); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2349 clear_tv(tv_dest); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2350 ectx->ec_stack.ga_len -= 2; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2351 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2352 return status; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2353 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2354 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2355 /* |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2356 * Unlet a range of items in a list variable. |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2357 */ |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2358 static int |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2359 execute_unletrange(isn_T *iptr, ectx_T *ectx) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2360 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2361 // Stack contains: |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2362 // -3 index1 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2363 // -2 index2 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2364 // -1 dict or list |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2365 typval_T *tv_idx1 = STACK_TV_BOT(-3); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2366 typval_T *tv_idx2 = STACK_TV_BOT(-2); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2367 typval_T *tv_dest = STACK_TV_BOT(-1); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2368 int status = OK; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2369 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2370 if (tv_dest->v_type == VAR_LIST) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2371 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2372 // indexes must be a number |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2373 SOURCING_LNUM = iptr->isn_lnum; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2374 if (check_for_number(tv_idx1) == FAIL |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2375 || (tv_idx2->v_type != VAR_SPECIAL |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2376 && check_for_number(tv_idx2) == FAIL)) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2377 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2378 status = FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2379 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2380 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2381 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2382 list_T *l = tv_dest->vval.v_list; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2383 long n1 = (long)tv_idx1->vval.v_number; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2384 long n2 = tv_idx2->v_type == VAR_SPECIAL |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2385 ? 0 : (long)tv_idx2->vval.v_number; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2386 listitem_T *li; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2387 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2388 li = list_find_index(l, &n1); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2389 if (li == NULL) |
|
27766
2a394907825d
patch 8.2.4409: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27764
diff
changeset
|
2390 { |
|
2a394907825d
patch 8.2.4409: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27764
diff
changeset
|
2391 semsg(_(e_list_index_out_of_range_nr), |
|
2a394907825d
patch 8.2.4409: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27764
diff
changeset
|
2392 (long)tv_idx1->vval.v_number); |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2393 status = FAIL; |
|
27766
2a394907825d
patch 8.2.4409: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27764
diff
changeset
|
2394 } |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2395 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2396 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2397 if (n1 < 0) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2398 n1 = list_idx_of_item(l, li); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2399 if (n2 < 0) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2400 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2401 listitem_T *li2 = list_find(l, n2); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2402 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2403 if (li2 == NULL) |
|
27766
2a394907825d
patch 8.2.4409: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27764
diff
changeset
|
2404 { |
|
2a394907825d
patch 8.2.4409: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27764
diff
changeset
|
2405 semsg(_(e_list_index_out_of_range_nr), n2); |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2406 status = FAIL; |
|
27766
2a394907825d
patch 8.2.4409: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27764
diff
changeset
|
2407 } |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2408 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2409 n2 = list_idx_of_item(l, li2); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2410 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2411 if (status != FAIL |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2412 && tv_idx2->v_type != VAR_SPECIAL |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2413 && n2 < n1) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2414 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2415 semsg(_(e_list_index_out_of_range_nr), n2); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2416 status = FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2417 } |
|
28152
b96409b84eaf
patch 8.2.4600: Vim9: not enough test coverage for executing :def function
Bram Moolenaar <Bram@vim.org>
parents:
28131
diff
changeset
|
2418 if (status != FAIL) |
|
b96409b84eaf
patch 8.2.4600: Vim9: not enough test coverage for executing :def function
Bram Moolenaar <Bram@vim.org>
parents:
28131
diff
changeset
|
2419 list_unlet_range(l, li, n1, |
|
b96409b84eaf
patch 8.2.4600: Vim9: not enough test coverage for executing :def function
Bram Moolenaar <Bram@vim.org>
parents:
28131
diff
changeset
|
2420 tv_idx2->v_type != VAR_SPECIAL, n2); |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2421 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2422 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2423 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2424 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2425 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2426 status = FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2427 SOURCING_LNUM = iptr->isn_lnum; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2428 semsg(_(e_cannot_index_str), |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2429 vartype_name(tv_dest->v_type)); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2430 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2431 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2432 clear_tv(tv_idx1); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2433 clear_tv(tv_idx2); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2434 clear_tv(tv_dest); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2435 ectx->ec_stack.ga_len -= 3; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2436 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2437 return status; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2438 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2439 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2440 /* |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2441 * Top of a for loop. |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2442 */ |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2443 static int |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2444 execute_for(isn_T *iptr, ectx_T *ectx) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2445 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2446 typval_T *tv; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2447 typval_T *ltv = STACK_TV_BOT(-1); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2448 typval_T *idxtv = |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2449 STACK_TV_VAR(iptr->isn_arg.forloop.for_idx); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2450 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2451 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2452 return FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2453 if (ltv->v_type == VAR_LIST) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2454 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2455 list_T *list = ltv->vval.v_list; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2456 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2457 // push the next item from the list |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2458 ++idxtv->vval.v_number; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2459 if (list == NULL |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2460 || idxtv->vval.v_number >= list->lv_len) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2461 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2462 // past the end of the list, jump to "endfor" |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2463 ectx->ec_iidx = iptr->isn_arg.forloop.for_end; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2464 may_restore_cmdmod(&ectx->ec_funclocal); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2465 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2466 else if (list->lv_first == &range_list_item) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2467 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2468 // non-materialized range() list |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2469 tv = STACK_TV_BOT(0); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2470 tv->v_type = VAR_NUMBER; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2471 tv->v_lock = 0; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2472 tv->vval.v_number = list_find_nr( |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2473 list, idxtv->vval.v_number, NULL); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2474 ++ectx->ec_stack.ga_len; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2475 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2476 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2477 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2478 listitem_T *li = list_find(list, |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2479 idxtv->vval.v_number); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2480 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2481 copy_tv(&li->li_tv, STACK_TV_BOT(0)); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2482 ++ectx->ec_stack.ga_len; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2483 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2484 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2485 else if (ltv->v_type == VAR_STRING) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2486 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2487 char_u *str = ltv->vval.v_string; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2488 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2489 // The index is for the last byte of the previous |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2490 // character. |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2491 ++idxtv->vval.v_number; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2492 if (str == NULL || str[idxtv->vval.v_number] == NUL) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2493 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2494 // past the end of the string, jump to "endfor" |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2495 ectx->ec_iidx = iptr->isn_arg.forloop.for_end; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2496 may_restore_cmdmod(&ectx->ec_funclocal); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2497 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2498 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2499 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2500 int clen = mb_ptr2len(str + idxtv->vval.v_number); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2501 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2502 // Push the next character from the string. |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2503 tv = STACK_TV_BOT(0); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2504 tv->v_type = VAR_STRING; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2505 tv->vval.v_string = vim_strnsave( |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2506 str + idxtv->vval.v_number, clen); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2507 ++ectx->ec_stack.ga_len; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2508 idxtv->vval.v_number += clen - 1; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2509 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2510 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2511 else if (ltv->v_type == VAR_BLOB) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2512 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2513 blob_T *blob = ltv->vval.v_blob; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2514 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2515 // When we get here the first time make a copy of the |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2516 // blob, so that the iteration still works when it is |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2517 // changed. |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2518 if (idxtv->vval.v_number == -1 && blob != NULL) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2519 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2520 blob_copy(blob, ltv); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2521 blob_unref(blob); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2522 blob = ltv->vval.v_blob; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2523 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2524 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2525 // The index is for the previous byte. |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2526 ++idxtv->vval.v_number; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2527 if (blob == NULL |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2528 || idxtv->vval.v_number >= blob_len(blob)) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2529 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2530 // past the end of the blob, jump to "endfor" |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2531 ectx->ec_iidx = iptr->isn_arg.forloop.for_end; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2532 may_restore_cmdmod(&ectx->ec_funclocal); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2533 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2534 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2535 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2536 // Push the next byte from the blob. |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2537 tv = STACK_TV_BOT(0); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2538 tv->v_type = VAR_NUMBER; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2539 tv->vval.v_number = blob_get(blob, |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2540 idxtv->vval.v_number); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2541 ++ectx->ec_stack.ga_len; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2542 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2543 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2544 else |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2545 { |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2546 semsg(_(e_for_loop_on_str_not_supported), |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2547 vartype_name(ltv->v_type)); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2548 return FAIL; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2549 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2550 return OK; |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2551 } |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2552 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2553 /* |
|
27376
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2554 * Load instruction for w:/b:/g:/t: variable. |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2555 * "isn_type" is used instead of "iptr->isn_type". |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2556 */ |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2557 static int |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2558 load_namespace_var(ectx_T *ectx, isntype_T isn_type, isn_T *iptr) |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2559 { |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2560 dictitem_T *di = NULL; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2561 hashtab_T *ht = NULL; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2562 char namespace; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2563 |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2564 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2565 return NOTDONE; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2566 switch (isn_type) |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2567 { |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2568 case ISN_LOADG: |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2569 ht = get_globvar_ht(); |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2570 namespace = 'g'; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2571 break; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2572 case ISN_LOADB: |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2573 ht = &curbuf->b_vars->dv_hashtab; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2574 namespace = 'b'; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2575 break; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2576 case ISN_LOADW: |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2577 ht = &curwin->w_vars->dv_hashtab; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2578 namespace = 'w'; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2579 break; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2580 case ISN_LOADT: |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2581 ht = &curtab->tp_vars->dv_hashtab; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2582 namespace = 't'; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2583 break; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2584 default: // Cannot reach here |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2585 return NOTDONE; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2586 } |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2587 di = find_var_in_ht(ht, 0, iptr->isn_arg.string, TRUE); |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2588 |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2589 if (di == NULL) |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2590 { |
|
27841
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2591 if (isn_type == ISN_LOADG) |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2592 { |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2593 ufunc_T *ufunc = find_func(iptr->isn_arg.string, TRUE); |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2594 |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2595 // g:Something could be a function |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2596 if (ufunc != NULL) |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2597 { |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2598 typval_T *tv = STACK_TV_BOT(0); |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2599 |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2600 ++ectx->ec_stack.ga_len; |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2601 tv->v_type = VAR_FUNC; |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2602 tv->vval.v_string = alloc(STRLEN(iptr->isn_arg.string) + 3); |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2603 if (tv->vval.v_string == NULL) |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2604 return FAIL; |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2605 STRCPY(tv->vval.v_string, "g:"); |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2606 STRCPY(tv->vval.v_string + 2, iptr->isn_arg.string); |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2607 return OK; |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2608 } |
|
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2609 } |
|
27376
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2610 SOURCING_LNUM = iptr->isn_lnum; |
|
27841
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2611 if (vim_strchr(iptr->isn_arg.string, AUTOLOAD_CHAR) != NULL) |
|
27376
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2612 // no check if the item exists in the script but |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2613 // isn't exported, it is too complicated |
|
27841
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2614 semsg(_(e_item_not_found_in_script_str), iptr->isn_arg.string); |
|
27376
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2615 else |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2616 semsg(_(e_undefined_variable_char_str), |
|
27841
5ce69c07a106
patch 8.2.4446: Vim9: cannot refer to a global function like a local one
Bram Moolenaar <Bram@vim.org>
parents:
27774
diff
changeset
|
2617 namespace, iptr->isn_arg.string); |
|
27376
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2618 return FAIL; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2619 } |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2620 else |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2621 { |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2622 copy_tv(&di->di_tv, STACK_TV_BOT(0)); |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2623 ++ectx->ec_stack.ga_len; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2624 } |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2625 return OK; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2626 } |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2627 |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
2628 /* |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2629 * Execute instructions in execution context "ectx". |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2630 * Return OK or FAIL; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2631 */ |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2632 static int |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2633 exec_instructions(ectx_T *ectx) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2634 { |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
2635 int ret = FAIL; |
|
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
2636 int save_trylevel_at_start = ectx->ec_trylevel_at_start; |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
2637 int dict_stack_len_at_start = dict_stack.ga_len; |
|
23917
4b417b776b95
patch 8.2.2501: not always clear where an error is reported
Bram Moolenaar <Bram@vim.org>
parents:
23839
diff
changeset
|
2638 |
|
24272
cabed216cc2f
patch 8.2.2677: Vim9: cannot use only some of the default arguments
Bram Moolenaar <Bram@vim.org>
parents:
24234
diff
changeset
|
2639 // Start execution at the first instruction. |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2640 ectx->ec_iidx = 0; |
|
19328
e99e6d794597
patch 8.2.0222: Vim9: optional function arguments don't work yet
Bram Moolenaar <Bram@vim.org>
parents:
19316
diff
changeset
|
2641 |
|
24637
4a4f64cdc798
patch 8.2.2857: Vim9: exception in ISN_INSTR caught at wrong level
Bram Moolenaar <Bram@vim.org>
parents:
24614
diff
changeset
|
2642 // Only catch exceptions in this instruction list. |
|
4a4f64cdc798
patch 8.2.2857: Vim9: exception in ISN_INSTR caught at wrong level
Bram Moolenaar <Bram@vim.org>
parents:
24614
diff
changeset
|
2643 ectx->ec_trylevel_at_start = trylevel; |
|
4a4f64cdc798
patch 8.2.2857: Vim9: exception in ISN_INSTR caught at wrong level
Bram Moolenaar <Bram@vim.org>
parents:
24614
diff
changeset
|
2644 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2645 for (;;) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2646 { |
|
25324
af0fd37ae687
patch 8.2.3199: Vim9: execution speed can be improved
Bram Moolenaar <Bram@vim.org>
parents:
25308
diff
changeset
|
2647 static int breakcheck_count = 0; // using "static" makes it faster |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2648 isn_T *iptr; |
|
25324
af0fd37ae687
patch 8.2.3199: Vim9: execution speed can be improved
Bram Moolenaar <Bram@vim.org>
parents:
25308
diff
changeset
|
2649 typval_T *tv; |
|
19726
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
2650 |
|
25350
0c5b84c5862a
patch 8.2.3212: Vim9: execution speed can be improved
Bram Moolenaar <Bram@vim.org>
parents:
25330
diff
changeset
|
2651 if (unlikely(++breakcheck_count >= 100)) |
|
20409
fd1b6f4f497e
patch 8.2.0759: Vim9: missing changes for performance improvements
Bram Moolenaar <Bram@vim.org>
parents:
20353
diff
changeset
|
2652 { |
|
fd1b6f4f497e
patch 8.2.0759: Vim9: missing changes for performance improvements
Bram Moolenaar <Bram@vim.org>
parents:
20353
diff
changeset
|
2653 line_breakcheck(); |
|
fd1b6f4f497e
patch 8.2.0759: Vim9: missing changes for performance improvements
Bram Moolenaar <Bram@vim.org>
parents:
20353
diff
changeset
|
2654 breakcheck_count = 0; |
|
fd1b6f4f497e
patch 8.2.0759: Vim9: missing changes for performance improvements
Bram Moolenaar <Bram@vim.org>
parents:
20353
diff
changeset
|
2655 } |
|
25350
0c5b84c5862a
patch 8.2.3212: Vim9: execution speed can be improved
Bram Moolenaar <Bram@vim.org>
parents:
25330
diff
changeset
|
2656 if (unlikely(got_int)) |
|
19726
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
2657 { |
|
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
2658 // Turn CTRL-C into an exception. |
|
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
2659 got_int = FALSE; |
|
19736
4174c4da6ff7
patch 8.2.0424: checking for wrong return value
Bram Moolenaar <Bram@vim.org>
parents:
19726
diff
changeset
|
2660 if (throw_exception("Vim:Interrupt", ET_INTERRUPT, NULL) == FAIL) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
2661 goto theend; |
|
19726
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
2662 did_throw = TRUE; |
|
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
2663 } |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2664 |
|
25350
0c5b84c5862a
patch 8.2.3212: Vim9: execution speed can be improved
Bram Moolenaar <Bram@vim.org>
parents:
25330
diff
changeset
|
2665 if (unlikely(did_emsg && msg_list != NULL && *msg_list != NULL)) |
|
20079
336483164ca6
patch 8.2.0595: Vim9: not all commands using ends_excmd() tested
Bram Moolenaar <Bram@vim.org>
parents:
20021
diff
changeset
|
2666 { |
|
336483164ca6
patch 8.2.0595: Vim9: not all commands using ends_excmd() tested
Bram Moolenaar <Bram@vim.org>
parents:
20021
diff
changeset
|
2667 // Turn an error message into an exception. |
|
336483164ca6
patch 8.2.0595: Vim9: not all commands using ends_excmd() tested
Bram Moolenaar <Bram@vim.org>
parents:
20021
diff
changeset
|
2668 did_emsg = FALSE; |
|
336483164ca6
patch 8.2.0595: Vim9: not all commands using ends_excmd() tested
Bram Moolenaar <Bram@vim.org>
parents:
20021
diff
changeset
|
2669 if (throw_exception(*msg_list, ET_ERROR, NULL) == FAIL) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
2670 goto theend; |
|
20079
336483164ca6
patch 8.2.0595: Vim9: not all commands using ends_excmd() tested
Bram Moolenaar <Bram@vim.org>
parents:
20021
diff
changeset
|
2671 did_throw = TRUE; |
|
336483164ca6
patch 8.2.0595: Vim9: not all commands using ends_excmd() tested
Bram Moolenaar <Bram@vim.org>
parents:
20021
diff
changeset
|
2672 *msg_list = NULL; |
|
336483164ca6
patch 8.2.0595: Vim9: not all commands using ends_excmd() tested
Bram Moolenaar <Bram@vim.org>
parents:
20021
diff
changeset
|
2673 } |
|
336483164ca6
patch 8.2.0595: Vim9: not all commands using ends_excmd() tested
Bram Moolenaar <Bram@vim.org>
parents:
20021
diff
changeset
|
2674 |
|
25350
0c5b84c5862a
patch 8.2.3212: Vim9: execution speed can be improved
Bram Moolenaar <Bram@vim.org>
parents:
25330
diff
changeset
|
2675 if (unlikely(did_throw)) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2676 { |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2677 garray_T *trystack = &ectx->ec_trystack; |
|
19726
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
2678 trycmd_T *trycmd = NULL; |
|
25080
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
2679 int index = trystack->ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2680 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2681 // An exception jumps to the first catch, finally, or returns from |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2682 // the current function. |
|
25080
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
2683 while (index > 0) |
|
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
2684 { |
|
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
2685 trycmd = ((trycmd_T *)trystack->ga_data) + index - 1; |
|
25082
5c7a09cf97a1
patch 8.2.3078: Vim9: profile test fails
Bram Moolenaar <Bram@vim.org>
parents:
25080
diff
changeset
|
2686 if (!trycmd->tcd_in_catch || trycmd->tcd_finally_idx != 0) |
|
25080
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
2687 break; |
|
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
2688 // In the catch and finally block of this try we have to go up |
|
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
2689 // one level. |
|
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
2690 --index; |
|
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
2691 trycmd = NULL; |
|
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
2692 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2693 if (trycmd != NULL && trycmd->tcd_frame_idx == ectx->ec_frame_idx) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2694 { |
|
25082
5c7a09cf97a1
patch 8.2.3078: Vim9: profile test fails
Bram Moolenaar <Bram@vim.org>
parents:
25080
diff
changeset
|
2695 if (trycmd->tcd_in_catch) |
|
5c7a09cf97a1
patch 8.2.3078: Vim9: profile test fails
Bram Moolenaar <Bram@vim.org>
parents:
25080
diff
changeset
|
2696 { |
|
5c7a09cf97a1
patch 8.2.3078: Vim9: profile test fails
Bram Moolenaar <Bram@vim.org>
parents:
25080
diff
changeset
|
2697 // exception inside ":catch", jump to ":finally" once |
|
5c7a09cf97a1
patch 8.2.3078: Vim9: profile test fails
Bram Moolenaar <Bram@vim.org>
parents:
25080
diff
changeset
|
2698 ectx->ec_iidx = trycmd->tcd_finally_idx; |
|
5c7a09cf97a1
patch 8.2.3078: Vim9: profile test fails
Bram Moolenaar <Bram@vim.org>
parents:
25080
diff
changeset
|
2699 trycmd->tcd_finally_idx = 0; |
|
5c7a09cf97a1
patch 8.2.3078: Vim9: profile test fails
Bram Moolenaar <Bram@vim.org>
parents:
25080
diff
changeset
|
2700 } |
|
5c7a09cf97a1
patch 8.2.3078: Vim9: profile test fails
Bram Moolenaar <Bram@vim.org>
parents:
25080
diff
changeset
|
2701 else |
|
5c7a09cf97a1
patch 8.2.3078: Vim9: profile test fails
Bram Moolenaar <Bram@vim.org>
parents:
25080
diff
changeset
|
2702 // jump to first ":catch" |
|
5c7a09cf97a1
patch 8.2.3078: Vim9: profile test fails
Bram Moolenaar <Bram@vim.org>
parents:
25080
diff
changeset
|
2703 ectx->ec_iidx = trycmd->tcd_catch_idx; |
|
25080
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
2704 trycmd->tcd_in_catch = TRUE; |
|
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
2705 did_throw = FALSE; // don't come back here until :endtry |
|
146c9720e563
patch 8.2.3077: Vim9: an error in a catch block is not reported
Bram Moolenaar <Bram@vim.org>
parents:
25078
diff
changeset
|
2706 trycmd->tcd_did_throw = TRUE; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2707 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2708 else |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2709 { |
|
21787
837e6a429950
patch 8.2.1443: Vim9: crash when interrupting a nested :def function
Bram Moolenaar <Bram@vim.org>
parents:
21771
diff
changeset
|
2710 // Not inside try or need to return from current functions. |
|
837e6a429950
patch 8.2.1443: Vim9: crash when interrupting a nested :def function
Bram Moolenaar <Bram@vim.org>
parents:
21771
diff
changeset
|
2711 // Push a dummy return value. |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
2712 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
2713 goto theend; |
|
21787
837e6a429950
patch 8.2.1443: Vim9: crash when interrupting a nested :def function
Bram Moolenaar <Bram@vim.org>
parents:
21771
diff
changeset
|
2714 tv = STACK_TV_BOT(0); |
|
837e6a429950
patch 8.2.1443: Vim9: crash when interrupting a nested :def function
Bram Moolenaar <Bram@vim.org>
parents:
21771
diff
changeset
|
2715 tv->v_type = VAR_NUMBER; |
|
837e6a429950
patch 8.2.1443: Vim9: crash when interrupting a nested :def function
Bram Moolenaar <Bram@vim.org>
parents:
21771
diff
changeset
|
2716 tv->vval.v_number = 0; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2717 ++ectx->ec_stack.ga_len; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2718 if (ectx->ec_frame_idx == ectx->ec_initial_frame_idx) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2719 { |
|
21787
837e6a429950
patch 8.2.1443: Vim9: crash when interrupting a nested :def function
Bram Moolenaar <Bram@vim.org>
parents:
21771
diff
changeset
|
2720 // At the toplevel we are done. |
|
19445
6e27e1ffa2a6
patch 8.2.0280: Vim9: throw in :def function not caught higher up
Bram Moolenaar <Bram@vim.org>
parents:
19411
diff
changeset
|
2721 need_rethrow = TRUE; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2722 if (handle_closure_in_use(ectx, FALSE) == FAIL) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
2723 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2724 goto done; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2725 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2726 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2727 if (func_return(ectx) == FAIL) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
2728 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2729 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2730 continue; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2731 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2732 |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2733 /* |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2734 * Big switch on the instruction. Most compilers will be turning this |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2735 * into an efficient lookup table, since the "case" values are an enum |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2736 * with sequential numbers. It may look ugly, but it should be the |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2737 * most efficient way. |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
2738 */ |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2739 iptr = &ectx->ec_instr[ectx->ec_iidx++]; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2740 switch (iptr->isn_type) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2741 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2742 // execute Ex command line |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2743 case ISN_EXEC: |
|
25605
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
2744 if (exec_command(iptr) == FAIL) |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
2745 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2746 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2747 |
|
24826
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2748 // execute Ex command line split at NL characters. |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2749 case ISN_EXEC_SPLIT: |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2750 { |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2751 source_cookie_T cookie; |
|
24830
f7445dcba17f
patch 8.2.2953: Vim9: leaking memory when using heredoc script
Bram Moolenaar <Bram@vim.org>
parents:
24826
diff
changeset
|
2752 char_u *line; |
|
24826
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2753 |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2754 SOURCING_LNUM = iptr->isn_lnum; |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2755 CLEAR_FIELD(cookie); |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2756 cookie.sourcing_lnum = iptr->isn_lnum - 1; |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2757 cookie.nextline = iptr->isn_arg.string; |
|
24830
f7445dcba17f
patch 8.2.2953: Vim9: leaking memory when using heredoc script
Bram Moolenaar <Bram@vim.org>
parents:
24826
diff
changeset
|
2758 line = get_split_sourceline(0, &cookie, 0, 0); |
|
f7445dcba17f
patch 8.2.2953: Vim9: leaking memory when using heredoc script
Bram Moolenaar <Bram@vim.org>
parents:
24826
diff
changeset
|
2759 if (do_cmdline(line, |
|
24826
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2760 get_split_sourceline, &cookie, |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2761 DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_KEYTYPED) |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2762 == FAIL |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2763 || did_emsg) |
|
24830
f7445dcba17f
patch 8.2.2953: Vim9: leaking memory when using heredoc script
Bram Moolenaar <Bram@vim.org>
parents:
24826
diff
changeset
|
2764 { |
|
f7445dcba17f
patch 8.2.2953: Vim9: leaking memory when using heredoc script
Bram Moolenaar <Bram@vim.org>
parents:
24826
diff
changeset
|
2765 vim_free(line); |
|
24826
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2766 goto on_error; |
|
24830
f7445dcba17f
patch 8.2.2953: Vim9: leaking memory when using heredoc script
Bram Moolenaar <Bram@vim.org>
parents:
24826
diff
changeset
|
2767 } |
|
f7445dcba17f
patch 8.2.2953: Vim9: leaking memory when using heredoc script
Bram Moolenaar <Bram@vim.org>
parents:
24826
diff
changeset
|
2768 vim_free(line); |
|
24826
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2769 } |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2770 break; |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
2771 |
|
26370
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2772 // execute Ex command line that is only a range |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2773 case ISN_EXECRANGE: |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2774 { |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2775 exarg_T ea; |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2776 char *error = NULL; |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2777 |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2778 CLEAR_FIELD(ea); |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2779 ea.cmdidx = CMD_SIZE; |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2780 ea.addr_type = ADDR_LINES; |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2781 ea.cmd = iptr->isn_arg.string; |
|
27768
b081ba78675a
patch 8.2.4410: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27766
diff
changeset
|
2782 SOURCING_LNUM = iptr->isn_lnum; |
|
26370
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2783 parse_cmd_address(&ea, &error, FALSE); |
|
26406
fcc57227e99b
patch 8.2.3734: Vim9: crash when no pattern match found
Bram Moolenaar <Bram@vim.org>
parents:
26378
diff
changeset
|
2784 if (ea.cmd == NULL) |
|
fcc57227e99b
patch 8.2.3734: Vim9: crash when no pattern match found
Bram Moolenaar <Bram@vim.org>
parents:
26378
diff
changeset
|
2785 goto on_error; |
|
27768
b081ba78675a
patch 8.2.4410: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27766
diff
changeset
|
2786 // error is always NULL when using ADDR_LINES |
|
b081ba78675a
patch 8.2.4410: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27766
diff
changeset
|
2787 error = ex_range_without_command(&ea); |
|
26370
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2788 if (error != NULL) |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2789 { |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2790 emsg(error); |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2791 goto on_error; |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2792 } |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2793 } |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2794 break; |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
2795 |
|
24645
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2796 // Evaluate an expression with legacy syntax, push it onto the |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2797 // stack. |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2798 case ISN_LEGACY_EVAL: |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2799 { |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2800 char_u *arg = iptr->isn_arg.string; |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2801 int res; |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2802 int save_flags = cmdmod.cmod_flags; |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2803 |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
2804 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
2805 goto theend; |
|
24645
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2806 tv = STACK_TV_BOT(0); |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2807 init_tv(tv); |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2808 cmdmod.cmod_flags |= CMOD_LEGACY; |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2809 res = eval0(arg, tv, NULL, &EVALARG_EVALUATE); |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2810 cmdmod.cmod_flags = save_flags; |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2811 if (res == FAIL) |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2812 goto on_error; |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2813 ++ectx->ec_stack.ga_len; |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2814 } |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2815 break; |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
2816 |
|
24606
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2817 // push typeval VAR_INSTR with instructions to be executed |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2818 case ISN_INSTR: |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2819 { |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
2820 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
2821 goto theend; |
|
24606
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2822 tv = STACK_TV_BOT(0); |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2823 tv->vval.v_instr = ALLOC_ONE(instr_T); |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2824 if (tv->vval.v_instr == NULL) |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2825 goto on_error; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2826 ++ectx->ec_stack.ga_len; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2827 |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2828 tv->v_type = VAR_INSTR; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2829 tv->vval.v_instr->instr_ectx = ectx; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2830 tv->vval.v_instr->instr_instr = iptr->isn_arg.instr; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2831 } |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2832 break; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
2833 |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
2834 case ISN_SOURCE: |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
2835 { |
|
28447
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
2836 int notused; |
|
28459
52ef65c0637f
patch 8.2.4754: using cached values after unsetting some environment variables
Bram Moolenaar <Bram@vim.org>
parents:
28447
diff
changeset
|
2837 |
|
28447
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
2838 SOURCING_LNUM = iptr->isn_lnum; |
|
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
2839 if (may_load_script((int)iptr->isn_arg.number, ¬used) |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
2840 == FAIL) |
|
28447
6f753a8125f0
patch 8.2.4748: cannot use an imported function in a mapping
Bram Moolenaar <Bram@vim.org>
parents:
28345
diff
changeset
|
2841 goto on_error; |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
2842 } |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
2843 break; |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
2844 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2845 // execute :substitute with an expression |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2846 case ISN_SUBSTITUTE: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2847 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2848 subs_T *subs = &iptr->isn_arg.subs; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2849 source_cookie_T cookie; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2850 struct subs_expr_S *save_instr = substitute_instr; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2851 struct subs_expr_S subs_instr; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2852 int res; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2853 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2854 subs_instr.subs_ectx = ectx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2855 subs_instr.subs_instr = subs->subs_instr; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2856 subs_instr.subs_status = OK; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2857 substitute_instr = &subs_instr; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2858 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2859 SOURCING_LNUM = iptr->isn_lnum; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2860 // This is very much like ISN_EXEC |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2861 CLEAR_FIELD(cookie); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2862 cookie.sourcing_lnum = iptr->isn_lnum - 1; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2863 res = do_cmdline(subs->subs_cmd, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2864 getsourceline, &cookie, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2865 DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_KEYTYPED); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2866 substitute_instr = save_instr; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2867 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2868 if (res == FAIL || did_emsg |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2869 || subs_instr.subs_status == FAIL) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2870 goto on_error; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2871 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2872 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2873 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2874 case ISN_FINISH: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2875 goto done; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2876 |
|
24490
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2877 case ISN_REDIRSTART: |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2878 // create a dummy entry for var_redir_str() |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2879 if (alloc_redir_lval() == FAIL) |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2880 goto on_error; |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2881 |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2882 // The output is stored in growarray "redir_ga" until |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2883 // redirection ends. |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2884 init_redir_ga(); |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2885 redir_vname = 1; |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2886 break; |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2887 |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2888 case ISN_REDIREND: |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2889 { |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2890 char_u *res = get_clear_redir_ga(); |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2891 |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2892 // End redirection, put redirected text on the stack. |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2893 clear_redir_lval(); |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2894 redir_vname = 0; |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2895 |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
2896 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24490
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2897 { |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2898 vim_free(res); |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
2899 goto theend; |
|
24490
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2900 } |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2901 tv = STACK_TV_BOT(0); |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2902 tv->v_type = VAR_STRING; |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2903 tv->vval.v_string = res; |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2904 ++ectx->ec_stack.ga_len; |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2905 } |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2906 break; |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
2907 |
|
24590
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2908 case ISN_CEXPR_AUCMD: |
|
24594
5c456a88f651
patch 8.2.2836: build failure without the +quickfix feature
Bram Moolenaar <Bram@vim.org>
parents:
24590
diff
changeset
|
2909 #ifdef FEAT_QUICKFIX |
|
28156
088d8dc22045
patch 8.2.4602: Vim9: not enough test coverage for executing :def function
Bram Moolenaar <Bram@vim.org>
parents:
28152
diff
changeset
|
2910 force_abort = TRUE; |
|
24590
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2911 if (trigger_cexpr_autocmd(iptr->isn_arg.number) == FAIL) |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2912 goto on_error; |
|
28156
088d8dc22045
patch 8.2.4602: Vim9: not enough test coverage for executing :def function
Bram Moolenaar <Bram@vim.org>
parents:
28152
diff
changeset
|
2913 force_abort = FALSE; |
|
24594
5c456a88f651
patch 8.2.2836: build failure without the +quickfix feature
Bram Moolenaar <Bram@vim.org>
parents:
24590
diff
changeset
|
2914 #endif |
|
24590
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2915 break; |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2916 |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2917 case ISN_CEXPR_CORE: |
|
24594
5c456a88f651
patch 8.2.2836: build failure without the +quickfix feature
Bram Moolenaar <Bram@vim.org>
parents:
24590
diff
changeset
|
2918 #ifdef FEAT_QUICKFIX |
|
24590
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2919 { |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2920 exarg_T ea; |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2921 int res; |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2922 |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2923 CLEAR_FIELD(ea); |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2924 ea.cmdidx = iptr->isn_arg.cexpr.cexpr_ref->cer_cmdidx; |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2925 ea.forceit = iptr->isn_arg.cexpr.cexpr_ref->cer_forceit; |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2926 ea.cmdlinep = &iptr->isn_arg.cexpr.cexpr_ref->cer_cmdline; |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2927 --ectx->ec_stack.ga_len; |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2928 tv = STACK_TV_BOT(0); |
|
29429
aeba55253de4
patch 9.0.0056: wrong line number reported when :cexpr fails in :def function
Bram Moolenaar <Bram@vim.org>
parents:
29322
diff
changeset
|
2929 SOURCING_LNUM = iptr->isn_lnum; |
|
24590
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2930 res = cexpr_core(&ea, tv); |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2931 clear_tv(tv); |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2932 if (res == FAIL) |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2933 goto on_error; |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2934 } |
|
24594
5c456a88f651
patch 8.2.2836: build failure without the +quickfix feature
Bram Moolenaar <Bram@vim.org>
parents:
24590
diff
changeset
|
2935 #endif |
|
24590
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2936 break; |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
2937 |
|
20170
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2938 // execute Ex command from pieces on the stack |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2939 case ISN_EXECCONCAT: |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2940 { |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2941 int count = iptr->isn_arg.number; |
|
20225
eaaee0dfa435
patch 8.2.0668: compiler warning for int/size_t usage
Bram Moolenaar <Bram@vim.org>
parents:
20189
diff
changeset
|
2942 size_t len = 0; |
|
20170
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2943 int pass; |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2944 int i; |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2945 char_u *cmd = NULL; |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2946 char_u *str; |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2947 |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2948 for (pass = 1; pass <= 2; ++pass) |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2949 { |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2950 for (i = 0; i < count; ++i) |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2951 { |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2952 tv = STACK_TV_BOT(i - count); |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2953 str = tv->vval.v_string; |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2954 if (str != NULL && *str != NUL) |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2955 { |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2956 if (pass == 2) |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2957 STRCPY(cmd + len, str); |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2958 len += STRLEN(str); |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2959 } |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2960 if (pass == 2) |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2961 clear_tv(tv); |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2962 } |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2963 if (pass == 1) |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2964 { |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2965 cmd = alloc(len + 1); |
|
25350
0c5b84c5862a
patch 8.2.3212: Vim9: execution speed can be improved
Bram Moolenaar <Bram@vim.org>
parents:
25330
diff
changeset
|
2966 if (unlikely(cmd == NULL)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
2967 goto theend; |
|
20170
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2968 len = 0; |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2969 } |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2970 } |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2971 |
|
20172
1d84eaed0ec8
patch 8.2.0641: Vim9: not expanded in :hardcopy and syn-include
Bram Moolenaar <Bram@vim.org>
parents:
20170
diff
changeset
|
2972 SOURCING_LNUM = iptr->isn_lnum; |
|
20170
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2973 do_cmdline_cmd(cmd); |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2974 vim_free(cmd); |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2975 } |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2976 break; |
|
0612c64a2b87
patch 8.2.0640: Vim9: expanding does not work
Bram Moolenaar <Bram@vim.org>
parents:
20142
diff
changeset
|
2977 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2978 // execute :echo {string} ... |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2979 case ISN_ECHO: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2980 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2981 int count = iptr->isn_arg.echo.echo_count; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2982 int atstart = TRUE; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2983 int needclr = TRUE; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2984 int idx; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2985 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2986 for (idx = 0; idx < count; ++idx) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2987 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2988 tv = STACK_TV_BOT(idx - count); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2989 echo_one(tv, iptr->isn_arg.echo.echo_with_white, |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2990 &atstart, &needclr); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2991 clear_tv(tv); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2992 } |
|
19463
798fce18d049
patch 8.2.0289: Vim9: :echo did not clear the rest of the line
Bram Moolenaar <Bram@vim.org>
parents:
19459
diff
changeset
|
2993 if (needclr) |
|
798fce18d049
patch 8.2.0289: Vim9: :echo did not clear the rest of the line
Bram Moolenaar <Bram@vim.org>
parents:
19459
diff
changeset
|
2994 msg_clr_eos(); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
2995 ectx->ec_stack.ga_len -= count; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2996 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2997 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2998 |
|
20142
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
2999 // :execute {string} ... |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3000 // :echomsg {string} ... |
|
30025
d269dd3cd31d
patch 9.0.0350: :echowindow does not work in a compiled function
Bram Moolenaar <Bram@vim.org>
parents:
29429
diff
changeset
|
3001 // :echowindow {string} ... |
|
25541
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
3002 // :echoconsole {string} ... |
|
20142
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3003 // :echoerr {string} ... |
|
19528
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3004 case ISN_EXECUTE: |
|
20142
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3005 case ISN_ECHOMSG: |
|
30025
d269dd3cd31d
patch 9.0.0350: :echowindow does not work in a compiled function
Bram Moolenaar <Bram@vim.org>
parents:
29429
diff
changeset
|
3006 case ISN_ECHOWINDOW: |
|
25541
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
3007 case ISN_ECHOCONSOLE: |
|
20142
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3008 case ISN_ECHOERR: |
|
19528
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3009 { |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3010 int count = iptr->isn_arg.number; |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3011 garray_T ga; |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3012 char_u buf[NUMBUFLEN]; |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3013 char_u *p; |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3014 int len; |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3015 int failed = FALSE; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3016 int idx; |
|
19528
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3017 |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3018 ga_init2(&ga, 1, 80); |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3019 for (idx = 0; idx < count; ++idx) |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3020 { |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3021 tv = STACK_TV_BOT(idx - count); |
|
21835
b530ead4265a
patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument
Bram Moolenaar <Bram@vim.org>
parents:
21833
diff
changeset
|
3022 if (iptr->isn_type == ISN_EXECUTE) |
|
19528
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3023 { |
|
21835
b530ead4265a
patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument
Bram Moolenaar <Bram@vim.org>
parents:
21833
diff
changeset
|
3024 if (tv->v_type == VAR_CHANNEL |
|
b530ead4265a
patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument
Bram Moolenaar <Bram@vim.org>
parents:
21833
diff
changeset
|
3025 || tv->v_type == VAR_JOB) |
|
b530ead4265a
patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument
Bram Moolenaar <Bram@vim.org>
parents:
21833
diff
changeset
|
3026 { |
|
b530ead4265a
patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument
Bram Moolenaar <Bram@vim.org>
parents:
21833
diff
changeset
|
3027 SOURCING_LNUM = iptr->isn_lnum; |
|
24614
07b3d21a8b4b
patch 8.2.2846: Vim9: "echo Func()" does not give an error for using void
Bram Moolenaar <Bram@vim.org>
parents:
24606
diff
changeset
|
3028 semsg(_(e_using_invalid_value_as_string_str), |
|
07b3d21a8b4b
patch 8.2.2846: Vim9: "echo Func()" does not give an error for using void
Bram Moolenaar <Bram@vim.org>
parents:
24606
diff
changeset
|
3029 vartype_name(tv->v_type)); |
|
21835
b530ead4265a
patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument
Bram Moolenaar <Bram@vim.org>
parents:
21833
diff
changeset
|
3030 break; |
|
b530ead4265a
patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument
Bram Moolenaar <Bram@vim.org>
parents:
21833
diff
changeset
|
3031 } |
|
b530ead4265a
patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument
Bram Moolenaar <Bram@vim.org>
parents:
21833
diff
changeset
|
3032 else |
|
b530ead4265a
patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument
Bram Moolenaar <Bram@vim.org>
parents:
21833
diff
changeset
|
3033 p = tv_get_string_buf(tv, buf); |
|
19528
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3034 } |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3035 else |
|
21835
b530ead4265a
patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument
Bram Moolenaar <Bram@vim.org>
parents:
21833
diff
changeset
|
3036 p = tv_stringify(tv, buf); |
|
19528
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3037 |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3038 len = (int)STRLEN(p); |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3039 if (GA_GROW_FAILS(&ga, len + 2)) |
|
19528
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3040 failed = TRUE; |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3041 else |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3042 { |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3043 if (ga.ga_len > 0) |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3044 ((char_u *)(ga.ga_data))[ga.ga_len++] = ' '; |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3045 STRCPY((char_u *)(ga.ga_data) + ga.ga_len, p); |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3046 ga.ga_len += len; |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3047 } |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3048 clear_tv(tv); |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3049 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3050 ectx->ec_stack.ga_len -= count; |
|
21835
b530ead4265a
patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument
Bram Moolenaar <Bram@vim.org>
parents:
21833
diff
changeset
|
3051 if (failed) |
|
22952
629472e2e4c5
patch 8.2.2023: Vim: memory leak when :execute fails
Bram Moolenaar <Bram@vim.org>
parents:
22948
diff
changeset
|
3052 { |
|
629472e2e4c5
patch 8.2.2023: Vim: memory leak when :execute fails
Bram Moolenaar <Bram@vim.org>
parents:
22948
diff
changeset
|
3053 ga_clear(&ga); |
|
21835
b530ead4265a
patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument
Bram Moolenaar <Bram@vim.org>
parents:
21833
diff
changeset
|
3054 goto on_error; |
|
22952
629472e2e4c5
patch 8.2.2023: Vim: memory leak when :execute fails
Bram Moolenaar <Bram@vim.org>
parents:
22948
diff
changeset
|
3055 } |
|
21835
b530ead4265a
patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument
Bram Moolenaar <Bram@vim.org>
parents:
21833
diff
changeset
|
3056 |
|
b530ead4265a
patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument
Bram Moolenaar <Bram@vim.org>
parents:
21833
diff
changeset
|
3057 if (ga.ga_data != NULL) |
|
20142
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3058 { |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3059 if (iptr->isn_type == ISN_EXECUTE) |
|
21933
5edd776d886d
patch 8.2.1516: Vim9: error for :exe has wrong line number
Bram Moolenaar <Bram@vim.org>
parents:
21863
diff
changeset
|
3060 { |
|
5edd776d886d
patch 8.2.1516: Vim9: error for :exe has wrong line number
Bram Moolenaar <Bram@vim.org>
parents:
21863
diff
changeset
|
3061 SOURCING_LNUM = iptr->isn_lnum; |
|
20142
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3062 do_cmdline_cmd((char_u *)ga.ga_data); |
|
22948
707b90980de5
patch 8.2.2021: Vim9: get E1099 when autocommand resets did_emsg
Bram Moolenaar <Bram@vim.org>
parents:
22908
diff
changeset
|
3063 if (did_emsg) |
|
22952
629472e2e4c5
patch 8.2.2023: Vim: memory leak when :execute fails
Bram Moolenaar <Bram@vim.org>
parents:
22948
diff
changeset
|
3064 { |
|
629472e2e4c5
patch 8.2.2023: Vim: memory leak when :execute fails
Bram Moolenaar <Bram@vim.org>
parents:
22948
diff
changeset
|
3065 ga_clear(&ga); |
|
22948
707b90980de5
patch 8.2.2021: Vim9: get E1099 when autocommand resets did_emsg
Bram Moolenaar <Bram@vim.org>
parents:
22908
diff
changeset
|
3066 goto on_error; |
|
22952
629472e2e4c5
patch 8.2.2023: Vim: memory leak when :execute fails
Bram Moolenaar <Bram@vim.org>
parents:
22948
diff
changeset
|
3067 } |
|
21933
5edd776d886d
patch 8.2.1516: Vim9: error for :exe has wrong line number
Bram Moolenaar <Bram@vim.org>
parents:
21863
diff
changeset
|
3068 } |
|
20142
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3069 else |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3070 { |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3071 msg_sb_eol(); |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3072 if (iptr->isn_type == ISN_ECHOMSG) |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3073 { |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3074 msg_attr(ga.ga_data, echo_attr); |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3075 out_flush(); |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3076 } |
|
30025
d269dd3cd31d
patch 9.0.0350: :echowindow does not work in a compiled function
Bram Moolenaar <Bram@vim.org>
parents:
29429
diff
changeset
|
3077 #ifdef HAS_MESSAGE_WINDOW |
|
d269dd3cd31d
patch 9.0.0350: :echowindow does not work in a compiled function
Bram Moolenaar <Bram@vim.org>
parents:
29429
diff
changeset
|
3078 else if (iptr->isn_type == ISN_ECHOWINDOW) |
|
d269dd3cd31d
patch 9.0.0350: :echowindow does not work in a compiled function
Bram Moolenaar <Bram@vim.org>
parents:
29429
diff
changeset
|
3079 { |
|
d269dd3cd31d
patch 9.0.0350: :echowindow does not work in a compiled function
Bram Moolenaar <Bram@vim.org>
parents:
29429
diff
changeset
|
3080 start_echowindow(); |
|
d269dd3cd31d
patch 9.0.0350: :echowindow does not work in a compiled function
Bram Moolenaar <Bram@vim.org>
parents:
29429
diff
changeset
|
3081 msg_attr(ga.ga_data, echo_attr); |
|
d269dd3cd31d
patch 9.0.0350: :echowindow does not work in a compiled function
Bram Moolenaar <Bram@vim.org>
parents:
29429
diff
changeset
|
3082 end_echowindow(); |
|
d269dd3cd31d
patch 9.0.0350: :echowindow does not work in a compiled function
Bram Moolenaar <Bram@vim.org>
parents:
29429
diff
changeset
|
3083 } |
|
d269dd3cd31d
patch 9.0.0350: :echowindow does not work in a compiled function
Bram Moolenaar <Bram@vim.org>
parents:
29429
diff
changeset
|
3084 #endif |
|
25541
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
3085 else if (iptr->isn_type == ISN_ECHOCONSOLE) |
|
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
3086 { |
|
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
3087 ui_write(ga.ga_data, (int)STRLEN(ga.ga_data), |
|
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
3088 TRUE); |
|
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
3089 ui_write((char_u *)"\r\n", 2, TRUE); |
|
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
3090 } |
|
20142
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3091 else |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3092 { |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3093 SOURCING_LNUM = iptr->isn_lnum; |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3094 emsg(ga.ga_data); |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3095 } |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3096 } |
|
fe8d0a4344df
patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script
Bram Moolenaar <Bram@vim.org>
parents:
20140
diff
changeset
|
3097 } |
|
19528
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3098 ga_clear(&ga); |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3099 } |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3100 break; |
|
3b026343f398
patch 8.2.0321: Vim9: ":execute" does not work yet
Bram Moolenaar <Bram@vim.org>
parents:
19463
diff
changeset
|
3101 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3102 // load local variable or argument |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3103 case ISN_LOAD: |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3104 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3105 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3106 copy_tv(STACK_TV_VAR(iptr->isn_arg.number), STACK_TV_BOT(0)); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3107 ++ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3108 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3109 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3110 // load v: variable |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3111 case ISN_LOADV: |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3112 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3113 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3114 copy_tv(get_vim_var_tv(iptr->isn_arg.number), STACK_TV_BOT(0)); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3115 ++ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3116 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3117 |
|
19283
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3118 // load s: variable in Vim9 script |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3119 case ISN_LOADSCRIPT: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3120 { |
|
23330
e8eb4fd44902
patch 8.2.2208: Vim9: after reloading a script variable index may be invalid
Bram Moolenaar <Bram@vim.org>
parents:
23295
diff
changeset
|
3121 scriptref_T *sref = iptr->isn_arg.script.scriptref; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3122 svar_T *sv; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3123 |
|
25461
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
3124 sv = get_script_svar(sref, ectx->ec_dfunc_idx); |
|
23362
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
3125 if (sv == NULL) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3126 goto theend; |
|
28231
66b245d84f37
patch 8.2.4642: Vim9: in :def function script var cannot be null
Bram Moolenaar <Bram@vim.org>
parents:
28217
diff
changeset
|
3127 allocate_if_null(sv); |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3128 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3129 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3130 copy_tv(sv->sv_tv, STACK_TV_BOT(0)); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3131 ++ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3132 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3133 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3134 |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3135 // load s: variable in old script or autoload import |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3136 case ISN_LOADS: |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3137 case ISN_LOADEXPORT: |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3138 { |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3139 int sid = iptr->isn_arg.loadstore.ls_sid; |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3140 hashtab_T *ht = &SCRIPT_VARS(sid); |
|
19283
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3141 char_u *name = iptr->isn_arg.loadstore.ls_name; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3142 dictitem_T *di = find_var_in_ht(ht, 0, name, TRUE); |
|
19455
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
3143 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3144 if (di == NULL) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3145 { |
|
21793
0706bd071fa3
patch 8.2.1446: Vim9: line number in error message is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21789
diff
changeset
|
3146 SOURCING_LNUM = iptr->isn_lnum; |
|
21821
0deb6f96a5a3
patch 8.2.1460: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
21815
diff
changeset
|
3147 semsg(_(e_undefined_variable_str), name); |
|
21365
fca850f4d603
patch 8.2.1233: Vim9: various errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21359
diff
changeset
|
3148 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3149 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3150 else |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3151 { |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3152 if (iptr->isn_type == ISN_LOADEXPORT) |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3153 { |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3154 int idx = get_script_item_idx(sid, name, 0, |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3155 NULL, NULL); |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3156 svar_T *sv; |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3157 |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3158 if (idx >= 0) |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3159 { |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3160 sv = ((svar_T *)SCRIPT_ITEM(sid) |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3161 ->sn_var_vals.ga_data) + idx; |
|
28345
fabe722b24e9
patch 8.2.4698: Vim9: script variable has no flag that it was set
Bram Moolenaar <Bram@vim.org>
parents:
28343
diff
changeset
|
3162 if ((sv->sv_flags & SVFLAG_EXPORTED) == 0) |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3163 { |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3164 SOURCING_LNUM = iptr->isn_lnum; |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3165 semsg(_(e_item_not_exported_in_script_str), |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3166 name); |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3167 goto on_error; |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3168 } |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3169 } |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3170 } |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3171 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3172 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3173 copy_tv(&di->di_tv, STACK_TV_BOT(0)); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3174 ++ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3175 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3176 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3177 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3178 |
|
20089
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3179 // load g:/b:/w:/t: variable |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3180 case ISN_LOADG: |
|
20089
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3181 case ISN_LOADB: |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3182 case ISN_LOADW: |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3183 case ISN_LOADT: |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3184 { |
|
27376
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3185 int res = load_namespace_var(ectx, iptr->isn_type, iptr); |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3186 |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3187 if (res == NOTDONE) |
|
27205
6c177a9b436e
patch 8.2.4131: Vim9: calling function in autoload import does not work
Bram Moolenaar <Bram@vim.org>
parents:
27114
diff
changeset
|
3188 goto theend; |
|
27376
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3189 if (res == FAIL) |
|
21365
fca850f4d603
patch 8.2.1233: Vim9: various errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21359
diff
changeset
|
3190 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3191 } |
|
27376
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3192 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3193 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3194 |
|
23233
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3195 // load autoload variable |
|
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3196 case ISN_LOADAUTO: |
|
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3197 { |
|
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3198 char_u *name = iptr->isn_arg.string; |
|
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3199 |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3200 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3201 goto theend; |
|
23233
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3202 SOURCING_LNUM = iptr->isn_lnum; |
|
26980
8796f1384750
patch 8.2.4019: Vim9: import mechanism is too complicated
Bram Moolenaar <Bram@vim.org>
parents:
26891
diff
changeset
|
3203 if (eval_variable(name, (int)STRLEN(name), 0, |
|
24112
0346a59ed5bf
patch 8.2.2597: Vim9: "import * as" does not work at script level
Bram Moolenaar <Bram@vim.org>
parents:
24077
diff
changeset
|
3204 STACK_TV_BOT(0), NULL, EVAL_VAR_VERBOSE) == FAIL) |
|
23233
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3205 goto on_error; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3206 ++ectx->ec_stack.ga_len; |
|
23233
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3207 } |
|
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3208 break; |
|
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3209 |
|
21399
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3210 // load g:/b:/w:/t: namespace |
|
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3211 case ISN_LOADGDICT: |
|
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3212 case ISN_LOADBDICT: |
|
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3213 case ISN_LOADWDICT: |
|
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3214 case ISN_LOADTDICT: |
|
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3215 { |
|
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3216 dict_T *d = NULL; |
|
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3217 |
|
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3218 switch (iptr->isn_type) |
|
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3219 { |
|
21401
aa7675a4a0cd
patch 8.2.1251: Vim9: warning for pointer usage, test failure undetected
Bram Moolenaar <Bram@vim.org>
parents:
21399
diff
changeset
|
3220 case ISN_LOADGDICT: d = get_globvar_dict(); break; |
|
aa7675a4a0cd
patch 8.2.1251: Vim9: warning for pointer usage, test failure undetected
Bram Moolenaar <Bram@vim.org>
parents:
21399
diff
changeset
|
3221 case ISN_LOADBDICT: d = curbuf->b_vars; break; |
|
aa7675a4a0cd
patch 8.2.1251: Vim9: warning for pointer usage, test failure undetected
Bram Moolenaar <Bram@vim.org>
parents:
21399
diff
changeset
|
3222 case ISN_LOADWDICT: d = curwin->w_vars; break; |
|
aa7675a4a0cd
patch 8.2.1251: Vim9: warning for pointer usage, test failure undetected
Bram Moolenaar <Bram@vim.org>
parents:
21399
diff
changeset
|
3223 case ISN_LOADTDICT: d = curtab->tp_vars; break; |
|
21399
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3224 default: // Cannot reach here |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3225 goto theend; |
|
21399
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3226 } |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3227 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3228 goto theend; |
|
21399
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3229 tv = STACK_TV_BOT(0); |
|
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3230 tv->v_type = VAR_DICT; |
|
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3231 tv->v_lock = 0; |
|
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3232 tv->vval.v_dict = d; |
|
24014
e45b2e28e45e
patch 8.2.2549: crash after using "g:" in a for loop
Bram Moolenaar <Bram@vim.org>
parents:
24002
diff
changeset
|
3233 ++d->dv_refcount; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3234 ++ectx->ec_stack.ga_len; |
|
21399
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3235 } |
|
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3236 break; |
|
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3237 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3238 // load &option |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3239 case ISN_LOADOPT: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3240 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3241 typval_T optval; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3242 char_u *name = iptr->isn_arg.string; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3243 |
|
19872
8a7bede7b138
patch 8.2.0492: Vim9: some error messages not tested
Bram Moolenaar <Bram@vim.org>
parents:
19862
diff
changeset
|
3244 // This is not expected to fail, name is checked during |
|
8a7bede7b138
patch 8.2.0492: Vim9: some error messages not tested
Bram Moolenaar <Bram@vim.org>
parents:
19862
diff
changeset
|
3245 // compilation: don't set SOURCING_LNUM. |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3246 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3247 goto theend; |
|
21120
4d844a65183d
patch 8.2.1111: inconsistent naming of get_list_tv() and eval_dict()
Bram Moolenaar <Bram@vim.org>
parents:
20943
diff
changeset
|
3248 if (eval_option(&name, &optval, TRUE) == FAIL) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3249 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3250 *STACK_TV_BOT(0) = optval; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3251 ++ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3252 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3253 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3254 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3255 // load $ENV |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3256 case ISN_LOADENV: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3257 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3258 typval_T optval; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3259 char_u *name = iptr->isn_arg.string; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3260 |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3261 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3262 goto theend; |
|
19455
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
3263 // name is always valid, checked when compiling |
|
21120
4d844a65183d
patch 8.2.1111: inconsistent naming of get_list_tv() and eval_dict()
Bram Moolenaar <Bram@vim.org>
parents:
20943
diff
changeset
|
3264 (void)eval_env_var(&name, &optval, TRUE); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3265 *STACK_TV_BOT(0) = optval; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3266 ++ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3267 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3268 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3269 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3270 // load @register |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3271 case ISN_LOADREG: |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3272 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3273 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3274 tv = STACK_TV_BOT(0); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3275 tv->v_type = VAR_STRING; |
|
21399
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3276 tv->v_lock = 0; |
|
22612
b08f435d5b86
patch 8.2.1854: Vim9: crash when throwing exception for NULL string
Bram Moolenaar <Bram@vim.org>
parents:
22596
diff
changeset
|
3277 // This may result in NULL, which should be equivalent to an |
|
b08f435d5b86
patch 8.2.1854: Vim9: crash when throwing exception for NULL string
Bram Moolenaar <Bram@vim.org>
parents:
22596
diff
changeset
|
3278 // empty string. |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3279 tv->vval.v_string = get_reg_contents( |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3280 iptr->isn_arg.number, GREG_EXPR_SRC); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3281 ++ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3282 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3283 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3284 // store local variable |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3285 case ISN_STORE: |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3286 --ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3287 tv = STACK_TV_VAR(iptr->isn_arg.number); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3288 clear_tv(tv); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3289 *tv = *STACK_TV_BOT(0); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3290 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3291 |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3292 // store s: variable in old script or autoload import |
|
19283
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3293 case ISN_STORES: |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3294 case ISN_STOREEXPORT: |
|
19283
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3295 { |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3296 int sid = iptr->isn_arg.loadstore.ls_sid; |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3297 hashtab_T *ht = &SCRIPT_VARS(sid); |
|
19283
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3298 char_u *name = iptr->isn_arg.loadstore.ls_name; |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3299 dictitem_T *di = find_var_in_ht(ht, 0, |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3300 iptr->isn_type == ISN_STORES |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3301 ? name + 2 : name, TRUE); |
|
19283
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3302 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3303 --ectx->ec_stack.ga_len; |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3304 SOURCING_LNUM = iptr->isn_lnum; |
|
19283
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3305 if (di == NULL) |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3306 { |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3307 if (iptr->isn_type == ISN_STOREEXPORT) |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3308 { |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3309 semsg(_(e_undefined_variable_str), name); |
|
28253
d817abf991df
patch 8.2.4652: leaking memory if assignment fails
Bram Moolenaar <Bram@vim.org>
parents:
28249
diff
changeset
|
3310 clear_tv(STACK_TV_BOT(0)); |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3311 goto on_error; |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3312 } |
|
19912
d4fa9db88d16
patch 8.2.0512: Vim9: no optional arguments in func type
Bram Moolenaar <Bram@vim.org>
parents:
19874
diff
changeset
|
3313 store_var(name, STACK_TV_BOT(0)); |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3314 } |
|
19455
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
3315 else |
|
19283
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3316 { |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3317 if (iptr->isn_type == ISN_STOREEXPORT) |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3318 { |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3319 int idx = get_script_item_idx(sid, name, 0, |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3320 NULL, NULL); |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3321 |
|
28621
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
3322 // can this ever fail? |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3323 if (idx >= 0) |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3324 { |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3325 svar_T *sv = ((svar_T *)SCRIPT_ITEM(sid) |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3326 ->sn_var_vals.ga_data) + idx; |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3327 |
|
28345
fabe722b24e9
patch 8.2.4698: Vim9: script variable has no flag that it was set
Bram Moolenaar <Bram@vim.org>
parents:
28343
diff
changeset
|
3328 if ((sv->sv_flags & SVFLAG_EXPORTED) == 0) |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3329 { |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3330 semsg(_(e_item_not_exported_in_script_str), |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3331 name); |
|
28253
d817abf991df
patch 8.2.4652: leaking memory if assignment fails
Bram Moolenaar <Bram@vim.org>
parents:
28249
diff
changeset
|
3332 clear_tv(STACK_TV_BOT(0)); |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3333 goto on_error; |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3334 } |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3335 } |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
3336 } |
|
24305
c88d0b5c5a42
patch 8.2.2693: Vim9: locked script variable can be changed
Bram Moolenaar <Bram@vim.org>
parents:
24303
diff
changeset
|
3337 if (var_check_permission(di, name) == FAIL) |
|
24325
52a0e187264b
patch 8.2.2703: Vim9: memory leak when failing on locked variable
Bram Moolenaar <Bram@vim.org>
parents:
24305
diff
changeset
|
3338 { |
|
52a0e187264b
patch 8.2.2703: Vim9: memory leak when failing on locked variable
Bram Moolenaar <Bram@vim.org>
parents:
24305
diff
changeset
|
3339 clear_tv(STACK_TV_BOT(0)); |
|
24305
c88d0b5c5a42
patch 8.2.2693: Vim9: locked script variable can be changed
Bram Moolenaar <Bram@vim.org>
parents:
24303
diff
changeset
|
3340 goto on_error; |
|
24325
52a0e187264b
patch 8.2.2703: Vim9: memory leak when failing on locked variable
Bram Moolenaar <Bram@vim.org>
parents:
24305
diff
changeset
|
3341 } |
|
19455
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
3342 clear_tv(&di->di_tv); |
|
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
3343 di->di_tv = *STACK_TV_BOT(0); |
|
19283
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3344 } |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3345 } |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3346 break; |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3347 |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3348 // store script-local variable in Vim9 script |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3349 case ISN_STORESCRIPT: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3350 { |
|
23362
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
3351 scriptref_T *sref = iptr->isn_arg.script.scriptref; |
|
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
3352 svar_T *sv; |
|
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
3353 |
|
25461
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
3354 sv = get_script_svar(sref, ectx->ec_dfunc_idx); |
|
23362
f181fe2150ab
patch 8.2.2224: Vim9: crash if script reloaded with different variable type
Bram Moolenaar <Bram@vim.org>
parents:
23350
diff
changeset
|
3355 if (sv == NULL) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3356 goto theend; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3357 --ectx->ec_stack.ga_len; |
|
24303
17b49af76766
patch 8.2.2692: Vim9: locked script variable can be changed
Bram Moolenaar <Bram@vim.org>
parents:
24293
diff
changeset
|
3358 |
|
17b49af76766
patch 8.2.2692: Vim9: locked script variable can be changed
Bram Moolenaar <Bram@vim.org>
parents:
24293
diff
changeset
|
3359 // "const" and "final" are checked at compile time, locking |
|
17b49af76766
patch 8.2.2692: Vim9: locked script variable can be changed
Bram Moolenaar <Bram@vim.org>
parents:
24293
diff
changeset
|
3360 // the value needs to be checked here. |
|
17b49af76766
patch 8.2.2692: Vim9: locked script variable can be changed
Bram Moolenaar <Bram@vim.org>
parents:
24293
diff
changeset
|
3361 SOURCING_LNUM = iptr->isn_lnum; |
|
17b49af76766
patch 8.2.2692: Vim9: locked script variable can be changed
Bram Moolenaar <Bram@vim.org>
parents:
24293
diff
changeset
|
3362 if (value_check_lock(sv->sv_tv->v_lock, sv->sv_name, FALSE)) |
|
24325
52a0e187264b
patch 8.2.2703: Vim9: memory leak when failing on locked variable
Bram Moolenaar <Bram@vim.org>
parents:
24305
diff
changeset
|
3363 { |
|
52a0e187264b
patch 8.2.2703: Vim9: memory leak when failing on locked variable
Bram Moolenaar <Bram@vim.org>
parents:
24305
diff
changeset
|
3364 clear_tv(STACK_TV_BOT(0)); |
|
24303
17b49af76766
patch 8.2.2692: Vim9: locked script variable can be changed
Bram Moolenaar <Bram@vim.org>
parents:
24293
diff
changeset
|
3365 goto on_error; |
|
24325
52a0e187264b
patch 8.2.2703: Vim9: memory leak when failing on locked variable
Bram Moolenaar <Bram@vim.org>
parents:
24305
diff
changeset
|
3366 } |
|
24303
17b49af76766
patch 8.2.2692: Vim9: locked script variable can be changed
Bram Moolenaar <Bram@vim.org>
parents:
24293
diff
changeset
|
3367 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3368 clear_tv(sv->sv_tv); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3369 *sv->sv_tv = *STACK_TV_BOT(0); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3370 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3371 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3372 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3373 // store option |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3374 case ISN_STOREOPT: |
|
26470
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
3375 case ISN_STOREFUNCOPT: |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3376 { |
|
26470
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
3377 char_u *opt_name = iptr->isn_arg.storeopt.so_name; |
|
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
3378 int opt_flags = iptr->isn_arg.storeopt.so_flags; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3379 long n = 0; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3380 char_u *s = NULL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3381 char *msg; |
|
26506
4a1d2abc2016
patch 8.2.3783: confusing error for using a variable as a function
Bram Moolenaar <Bram@vim.org>
parents:
26470
diff
changeset
|
3382 char_u numbuf[NUMBUFLEN]; |
|
4a1d2abc2016
patch 8.2.3783: confusing error for using a variable as a function
Bram Moolenaar <Bram@vim.org>
parents:
26470
diff
changeset
|
3383 char_u *tofree = NULL; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3384 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3385 --ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3386 tv = STACK_TV_BOT(0); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3387 if (tv->v_type == VAR_STRING) |
|
19219
89931701e033
patch 8.2.0168: Coverity warning for assigning NULL to an option
Bram Moolenaar <Bram@vim.org>
parents:
19217
diff
changeset
|
3388 { |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3389 s = tv->vval.v_string; |
|
19219
89931701e033
patch 8.2.0168: Coverity warning for assigning NULL to an option
Bram Moolenaar <Bram@vim.org>
parents:
19217
diff
changeset
|
3390 if (s == NULL) |
|
89931701e033
patch 8.2.0168: Coverity warning for assigning NULL to an option
Bram Moolenaar <Bram@vim.org>
parents:
19217
diff
changeset
|
3391 s = (char_u *)""; |
|
89931701e033
patch 8.2.0168: Coverity warning for assigning NULL to an option
Bram Moolenaar <Bram@vim.org>
parents:
19217
diff
changeset
|
3392 } |
|
26470
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
3393 else if (iptr->isn_type == ISN_STOREFUNCOPT) |
|
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
3394 { |
|
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
3395 SOURCING_LNUM = iptr->isn_lnum; |
|
26506
4a1d2abc2016
patch 8.2.3783: confusing error for using a variable as a function
Bram Moolenaar <Bram@vim.org>
parents:
26470
diff
changeset
|
3396 // If the option can be set to a function reference or |
|
4a1d2abc2016
patch 8.2.3783: confusing error for using a variable as a function
Bram Moolenaar <Bram@vim.org>
parents:
26470
diff
changeset
|
3397 // a lambda and the passed value is a function |
|
4a1d2abc2016
patch 8.2.3783: confusing error for using a variable as a function
Bram Moolenaar <Bram@vim.org>
parents:
26470
diff
changeset
|
3398 // reference, then convert it to the name (string) of |
|
4a1d2abc2016
patch 8.2.3783: confusing error for using a variable as a function
Bram Moolenaar <Bram@vim.org>
parents:
26470
diff
changeset
|
3399 // the function reference. |
|
4a1d2abc2016
patch 8.2.3783: confusing error for using a variable as a function
Bram Moolenaar <Bram@vim.org>
parents:
26470
diff
changeset
|
3400 s = tv2string(tv, &tofree, numbuf, 0); |
|
4a1d2abc2016
patch 8.2.3783: confusing error for using a variable as a function
Bram Moolenaar <Bram@vim.org>
parents:
26470
diff
changeset
|
3401 if (s == NULL || *s == NUL) |
|
26470
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
3402 { |
|
28156
088d8dc22045
patch 8.2.4602: Vim9: not enough test coverage for executing :def function
Bram Moolenaar <Bram@vim.org>
parents:
28152
diff
changeset
|
3403 // cannot happen? |
|
26470
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
3404 clear_tv(tv); |
|
28156
088d8dc22045
patch 8.2.4602: Vim9: not enough test coverage for executing :def function
Bram Moolenaar <Bram@vim.org>
parents:
28152
diff
changeset
|
3405 vim_free(tofree); |
|
26470
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
3406 goto on_error; |
|
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
3407 } |
|
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
3408 } |
|
20419
d54dfb5f12db
patch 8.2.0764: Vim9: assigning to option not fully tested
Bram Moolenaar <Bram@vim.org>
parents:
20411
diff
changeset
|
3409 else |
|
d54dfb5f12db
patch 8.2.0764: Vim9: assigning to option not fully tested
Bram Moolenaar <Bram@vim.org>
parents:
20411
diff
changeset
|
3410 // must be VAR_NUMBER, CHECKTYPE makes sure |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3411 n = tv->vval.v_number; |
|
26470
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
3412 msg = set_option_value(opt_name, n, s, opt_flags); |
|
20427
0ab8f8880a33
patch 8.2.0768: Vim9: memory leak in script test
Bram Moolenaar <Bram@vim.org>
parents:
20419
diff
changeset
|
3413 clear_tv(tv); |
|
26506
4a1d2abc2016
patch 8.2.3783: confusing error for using a variable as a function
Bram Moolenaar <Bram@vim.org>
parents:
26470
diff
changeset
|
3414 vim_free(tofree); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3415 if (msg != NULL) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3416 { |
|
21793
0706bd071fa3
patch 8.2.1446: Vim9: line number in error message is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21789
diff
changeset
|
3417 SOURCING_LNUM = iptr->isn_lnum; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3418 emsg(_(msg)); |
|
21371
8e1081ede3b8
patch 8.2.1236: Vim9: a few errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21365
diff
changeset
|
3419 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3420 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3421 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3422 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3423 |
|
19283
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3424 // store $ENV |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3425 case ISN_STOREENV: |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3426 --ectx->ec_stack.ga_len; |
|
19726
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
3427 tv = STACK_TV_BOT(0); |
|
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
3428 vim_setenv_ext(iptr->isn_arg.string, tv_get_string(tv)); |
|
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
3429 clear_tv(tv); |
|
19283
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3430 break; |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3431 |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3432 // store @r |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3433 case ISN_STOREREG: |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3434 { |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3435 int reg = iptr->isn_arg.number; |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3436 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3437 --ectx->ec_stack.ga_len; |
|
19449
f8408ba21982
patch 8.2.0282: Vim9: setting number option not tested
Bram Moolenaar <Bram@vim.org>
parents:
19445
diff
changeset
|
3438 tv = STACK_TV_BOT(0); |
|
24956
d0b6a8d82cef
patch 8.2.3015: Vim9: Assigning to @# requires a string
Bram Moolenaar <Bram@vim.org>
parents:
24954
diff
changeset
|
3439 write_reg_contents(reg, tv_get_string(tv), -1, FALSE); |
|
19449
f8408ba21982
patch 8.2.0282: Vim9: setting number option not tested
Bram Moolenaar <Bram@vim.org>
parents:
19445
diff
changeset
|
3440 clear_tv(tv); |
|
19283
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3441 } |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3442 break; |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3443 |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3444 // store v: variable |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3445 case ISN_STOREV: |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3446 --ectx->ec_stack.ga_len; |
|
19283
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3447 if (set_vim_var_tv(iptr->isn_arg.number, STACK_TV_BOT(0)) |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3448 == FAIL) |
|
21371
8e1081ede3b8
patch 8.2.1236: Vim9: a few errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21365
diff
changeset
|
3449 // should not happen, type is checked when compiling |
|
8e1081ede3b8
patch 8.2.1236: Vim9: a few errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21365
diff
changeset
|
3450 goto on_error; |
|
19283
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3451 break; |
|
9dc843109c97
patch 8.2.0200: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19281
diff
changeset
|
3452 |
|
20089
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3453 // store g:/b:/w:/t: variable |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3454 case ISN_STOREG: |
|
20089
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3455 case ISN_STOREB: |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3456 case ISN_STOREW: |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3457 case ISN_STORET: |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3458 { |
|
23295
d9ae7dd3a0f2
patch 8.2.2193: Vim9: can change constant in :def function
Bram Moolenaar <Bram@vim.org>
parents:
23285
diff
changeset
|
3459 dictitem_T *di; |
|
d9ae7dd3a0f2
patch 8.2.2193: Vim9: can change constant in :def function
Bram Moolenaar <Bram@vim.org>
parents:
23285
diff
changeset
|
3460 hashtab_T *ht; |
|
d9ae7dd3a0f2
patch 8.2.2193: Vim9: can change constant in :def function
Bram Moolenaar <Bram@vim.org>
parents:
23285
diff
changeset
|
3461 char_u *name = iptr->isn_arg.string + 2; |
|
d9ae7dd3a0f2
patch 8.2.2193: Vim9: can change constant in :def function
Bram Moolenaar <Bram@vim.org>
parents:
23285
diff
changeset
|
3462 |
|
20089
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3463 switch (iptr->isn_type) |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3464 { |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3465 case ISN_STOREG: |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3466 ht = get_globvar_ht(); |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3467 break; |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3468 case ISN_STOREB: |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3469 ht = &curbuf->b_vars->dv_hashtab; |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3470 break; |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3471 case ISN_STOREW: |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3472 ht = &curwin->w_vars->dv_hashtab; |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3473 break; |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3474 case ISN_STORET: |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3475 ht = &curtab->tp_vars->dv_hashtab; |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3476 break; |
|
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3477 default: // Cannot reach here |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3478 goto theend; |
|
20089
7fc5d62fe2a5
patch 8.2.0600: Vim9: cannot read or write w:, t: and b: variables
Bram Moolenaar <Bram@vim.org>
parents:
20079
diff
changeset
|
3479 } |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3480 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3481 --ectx->ec_stack.ga_len; |
|
23295
d9ae7dd3a0f2
patch 8.2.2193: Vim9: can change constant in :def function
Bram Moolenaar <Bram@vim.org>
parents:
23285
diff
changeset
|
3482 di = find_var_in_ht(ht, 0, name, TRUE); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3483 if (di == NULL) |
|
19455
655631882288
patch 8.2.0285: unused error message; cannot create s:var
Bram Moolenaar <Bram@vim.org>
parents:
19449
diff
changeset
|
3484 store_var(iptr->isn_arg.string, STACK_TV_BOT(0)); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3485 else |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3486 { |
|
23295
d9ae7dd3a0f2
patch 8.2.2193: Vim9: can change constant in :def function
Bram Moolenaar <Bram@vim.org>
parents:
23285
diff
changeset
|
3487 SOURCING_LNUM = iptr->isn_lnum; |
|
d9ae7dd3a0f2
patch 8.2.2193: Vim9: can change constant in :def function
Bram Moolenaar <Bram@vim.org>
parents:
23285
diff
changeset
|
3488 if (var_check_permission(di, name) == FAIL) |
|
d9ae7dd3a0f2
patch 8.2.2193: Vim9: can change constant in :def function
Bram Moolenaar <Bram@vim.org>
parents:
23285
diff
changeset
|
3489 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3490 clear_tv(&di->di_tv); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3491 di->di_tv = *STACK_TV_BOT(0); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3492 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3493 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3494 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3495 |
|
23233
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3496 // store an autoload variable |
|
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3497 case ISN_STOREAUTO: |
|
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3498 SOURCING_LNUM = iptr->isn_lnum; |
|
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3499 set_var(iptr->isn_arg.string, STACK_TV_BOT(-1), TRUE); |
|
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3500 clear_tv(STACK_TV_BOT(-1)); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3501 --ectx->ec_stack.ga_len; |
|
23233
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3502 break; |
|
657216220293
patch 8.2.2162: Vim9: Cannot load or store autoload variables
Bram Moolenaar <Bram@vim.org>
parents:
23229
diff
changeset
|
3503 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3504 // store number in local variable |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3505 case ISN_STORENR: |
|
19597
1098989a90ee
patch 8.2.0355: Vim9: str_val is confusing, it's a number
Bram Moolenaar <Bram@vim.org>
parents:
19572
diff
changeset
|
3506 tv = STACK_TV_VAR(iptr->isn_arg.storenr.stnr_idx); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3507 clear_tv(tv); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3508 tv->v_type = VAR_NUMBER; |
|
19597
1098989a90ee
patch 8.2.0355: Vim9: str_val is confusing, it's a number
Bram Moolenaar <Bram@vim.org>
parents:
19572
diff
changeset
|
3509 tv->vval.v_number = iptr->isn_arg.storenr.stnr_val; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3510 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3511 |
|
23266
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
3512 // store value in list or dict variable |
|
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
3513 case ISN_STOREINDEX: |
|
20349
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
3514 { |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
3515 int res = execute_storeindex(iptr, ectx); |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
3516 |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
3517 if (res == FAIL) |
|
21576
f4252efe370e
patch 8.2.1338: Vim9: assigning to script-local variable doesn't check type
Bram Moolenaar <Bram@vim.org>
parents:
21574
diff
changeset
|
3518 goto on_error; |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
3519 if (res == NOTDONE) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
3520 goto theend; |
|
20349
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
3521 } |
|
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
3522 break; |
|
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
3523 |
|
27764
1662d2d2e27b
patch 8.2.4408: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27762
diff
changeset
|
3524 // store value in list or blob range |
|
24434
602e528a8e43
patch 8.2.2757: Vim9: blob tests for legacy and Vim9 script are separate
Bram Moolenaar <Bram@vim.org>
parents:
24432
diff
changeset
|
3525 case ISN_STORERANGE: |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
3526 if (execute_storerange(iptr, ectx) == FAIL) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
3527 goto on_error; |
|
24434
602e528a8e43
patch 8.2.2757: Vim9: blob tests for legacy and Vim9 script are separate
Bram Moolenaar <Bram@vim.org>
parents:
24432
diff
changeset
|
3528 break; |
|
602e528a8e43
patch 8.2.2757: Vim9: blob tests for legacy and Vim9 script are separate
Bram Moolenaar <Bram@vim.org>
parents:
24432
diff
changeset
|
3529 |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3530 // load or store variable or argument from outer scope |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3531 case ISN_LOADOUTER: |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3532 case ISN_STOREOUTER: |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3533 { |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3534 int depth = iptr->isn_arg.outer.outer_depth; |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
3535 outer_T *outer = ectx->ec_outer_ref == NULL ? NULL |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
3536 : ectx->ec_outer_ref->or_outer; |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3537 |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3538 while (depth > 1 && outer != NULL) |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3539 { |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3540 outer = outer->out_up; |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3541 --depth; |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3542 } |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3543 if (outer == NULL) |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3544 { |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3545 SOURCING_LNUM = iptr->isn_lnum; |
|
26378
a926ccd92ae1
patch 8.2.3720: Vim9: Internal error when invoking closure in legacy context
Bram Moolenaar <Bram@vim.org>
parents:
26370
diff
changeset
|
3546 if (ectx->ec_frame_idx == ectx->ec_initial_frame_idx |
|
a926ccd92ae1
patch 8.2.3720: Vim9: Internal error when invoking closure in legacy context
Bram Moolenaar <Bram@vim.org>
parents:
26370
diff
changeset
|
3547 || ectx->ec_outer_ref == NULL) |
|
a926ccd92ae1
patch 8.2.3720: Vim9: Internal error when invoking closure in legacy context
Bram Moolenaar <Bram@vim.org>
parents:
26370
diff
changeset
|
3548 // Possibly :def function called from legacy |
|
a926ccd92ae1
patch 8.2.3720: Vim9: Internal error when invoking closure in legacy context
Bram Moolenaar <Bram@vim.org>
parents:
26370
diff
changeset
|
3549 // context. |
|
a926ccd92ae1
patch 8.2.3720: Vim9: Internal error when invoking closure in legacy context
Bram Moolenaar <Bram@vim.org>
parents:
26370
diff
changeset
|
3550 emsg(_(e_closure_called_from_invalid_context)); |
|
a926ccd92ae1
patch 8.2.3720: Vim9: Internal error when invoking closure in legacy context
Bram Moolenaar <Bram@vim.org>
parents:
26370
diff
changeset
|
3551 else |
|
a926ccd92ae1
patch 8.2.3720: Vim9: Internal error when invoking closure in legacy context
Bram Moolenaar <Bram@vim.org>
parents:
26370
diff
changeset
|
3552 iemsg("LOADOUTER depth more than scope levels"); |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3553 goto theend; |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3554 } |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3555 tv = ((typval_T *)outer->out_stack->ga_data) |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3556 + outer->out_frame_idx + STACK_FRAME_SIZE |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3557 + iptr->isn_arg.outer.outer_idx; |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3558 if (iptr->isn_type == ISN_LOADOUTER) |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3559 { |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3560 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3561 goto theend; |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3562 copy_tv(tv, STACK_TV_BOT(0)); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3563 ++ectx->ec_stack.ga_len; |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3564 } |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3565 else |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3566 { |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3567 --ectx->ec_stack.ga_len; |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3568 clear_tv(tv); |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3569 *tv = *STACK_TV_BOT(0); |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3570 } |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3571 } |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3572 break; |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
3573 |
|
23517
36bf9a6fbd4c
patch 8.2.2301: Vim9: cannot unlet a dict or list item
Bram Moolenaar <Bram@vim.org>
parents:
23513
diff
changeset
|
3574 // unlet item in list or dict variable |
|
36bf9a6fbd4c
patch 8.2.2301: Vim9: cannot unlet a dict or list item
Bram Moolenaar <Bram@vim.org>
parents:
23513
diff
changeset
|
3575 case ISN_UNLETINDEX: |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
3576 if (execute_unletindex(iptr, ectx) == FAIL) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
3577 goto on_error; |
|
23517
36bf9a6fbd4c
patch 8.2.2301: Vim9: cannot unlet a dict or list item
Bram Moolenaar <Bram@vim.org>
parents:
23513
diff
changeset
|
3578 break; |
|
36bf9a6fbd4c
patch 8.2.2301: Vim9: cannot unlet a dict or list item
Bram Moolenaar <Bram@vim.org>
parents:
23513
diff
changeset
|
3579 |
|
23982
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
3580 // unlet range of items in list variable |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
3581 case ISN_UNLETRANGE: |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
3582 if (execute_unletrange(iptr, ectx) == FAIL) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
3583 goto on_error; |
|
23982
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
3584 break; |
|
9fcd71d0db89
patch 8.2.2533: Vim9: cannot use a range with :unlet
Bram Moolenaar <Bram@vim.org>
parents:
23976
diff
changeset
|
3585 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3586 // push constant |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3587 case ISN_PUSHNR: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3588 case ISN_PUSHBOOL: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3589 case ISN_PUSHSPEC: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3590 case ISN_PUSHF: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3591 case ISN_PUSHS: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3592 case ISN_PUSHBLOB: |
|
19558
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3593 case ISN_PUSHFUNC: |
|
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3594 case ISN_PUSHCHANNEL: |
|
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3595 case ISN_PUSHJOB: |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3596 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3597 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3598 tv = STACK_TV_BOT(0); |
|
21399
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3599 tv->v_lock = 0; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3600 ++ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3601 switch (iptr->isn_type) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3602 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3603 case ISN_PUSHNR: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3604 tv->v_type = VAR_NUMBER; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3605 tv->vval.v_number = iptr->isn_arg.number; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3606 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3607 case ISN_PUSHBOOL: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3608 tv->v_type = VAR_BOOL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3609 tv->vval.v_number = iptr->isn_arg.number; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3610 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3611 case ISN_PUSHSPEC: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3612 tv->v_type = VAR_SPECIAL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3613 tv->vval.v_number = iptr->isn_arg.number; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3614 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3615 #ifdef FEAT_FLOAT |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3616 case ISN_PUSHF: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3617 tv->v_type = VAR_FLOAT; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3618 tv->vval.v_float = iptr->isn_arg.fnumber; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3619 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3620 #endif |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3621 case ISN_PUSHBLOB: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3622 blob_copy(iptr->isn_arg.blob, tv); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3623 break; |
|
19558
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3624 case ISN_PUSHFUNC: |
|
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3625 tv->v_type = VAR_FUNC; |
|
19566
ec1eeb1b69e2
patch 8.2.0340: Vim9: function and partial types not tested
Bram Moolenaar <Bram@vim.org>
parents:
19558
diff
changeset
|
3626 if (iptr->isn_arg.string == NULL) |
|
ec1eeb1b69e2
patch 8.2.0340: Vim9: function and partial types not tested
Bram Moolenaar <Bram@vim.org>
parents:
19558
diff
changeset
|
3627 tv->vval.v_string = NULL; |
|
ec1eeb1b69e2
patch 8.2.0340: Vim9: function and partial types not tested
Bram Moolenaar <Bram@vim.org>
parents:
19558
diff
changeset
|
3628 else |
|
ec1eeb1b69e2
patch 8.2.0340: Vim9: function and partial types not tested
Bram Moolenaar <Bram@vim.org>
parents:
19558
diff
changeset
|
3629 tv->vval.v_string = |
|
ec1eeb1b69e2
patch 8.2.0340: Vim9: function and partial types not tested
Bram Moolenaar <Bram@vim.org>
parents:
19558
diff
changeset
|
3630 vim_strsave(iptr->isn_arg.string); |
|
19558
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3631 break; |
|
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3632 case ISN_PUSHCHANNEL: |
|
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3633 #ifdef FEAT_JOB_CHANNEL |
|
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3634 tv->v_type = VAR_CHANNEL; |
|
28156
088d8dc22045
patch 8.2.4602: Vim9: not enough test coverage for executing :def function
Bram Moolenaar <Bram@vim.org>
parents:
28152
diff
changeset
|
3635 tv->vval.v_channel = NULL; |
|
19558
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3636 #endif |
|
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3637 break; |
|
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3638 case ISN_PUSHJOB: |
|
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3639 #ifdef FEAT_JOB_CHANNEL |
|
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3640 tv->v_type = VAR_JOB; |
|
28156
088d8dc22045
patch 8.2.4602: Vim9: not enough test coverage for executing :def function
Bram Moolenaar <Bram@vim.org>
parents:
28152
diff
changeset
|
3641 tv->vval.v_job = NULL; |
|
19558
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3642 #endif |
|
8eeec8886c02
patch 8.2.0336: Vim9: insufficient test coverage for compiling
Bram Moolenaar <Bram@vim.org>
parents:
19538
diff
changeset
|
3643 break; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3644 default: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3645 tv->v_type = VAR_STRING; |
|
28019
53e2bf6032e5
patch 8.2.4534: Vim9: "is" operator with empty string and null returns true
Bram Moolenaar <Bram@vim.org>
parents:
28002
diff
changeset
|
3646 tv->vval.v_string = iptr->isn_arg.string == NULL |
|
53e2bf6032e5
patch 8.2.4534: Vim9: "is" operator with empty string and null returns true
Bram Moolenaar <Bram@vim.org>
parents:
28002
diff
changeset
|
3647 ? NULL : vim_strsave(iptr->isn_arg.string); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3648 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3649 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3650 |
|
27376
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3651 case ISN_AUTOLOAD: |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3652 { |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3653 char_u *name = iptr->isn_arg.string; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3654 |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3655 (void)script_autoload(name, FALSE); |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3656 if (find_func(name, TRUE)) |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3657 { |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3658 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3659 goto theend; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3660 tv = STACK_TV_BOT(0); |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3661 tv->v_lock = 0; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3662 ++ectx->ec_stack.ga_len; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3663 tv->v_type = VAR_FUNC; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3664 tv->vval.v_string = vim_strsave(name); |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3665 } |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3666 else |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3667 { |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3668 int res = load_namespace_var(ectx, ISN_LOADG, iptr); |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3669 |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3670 if (res == NOTDONE) |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3671 goto theend; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3672 if (res == FAIL) |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3673 goto on_error; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3674 } |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3675 } |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3676 break; |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
3677 |
|
20091
a64c16ff98b8
patch 8.2.0601: Vim9: :unlet is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
20089
diff
changeset
|
3678 case ISN_UNLET: |
|
a64c16ff98b8
patch 8.2.0601: Vim9: :unlet is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
20089
diff
changeset
|
3679 if (do_unlet(iptr->isn_arg.unlet.ul_name, |
|
a64c16ff98b8
patch 8.2.0601: Vim9: :unlet is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
20089
diff
changeset
|
3680 iptr->isn_arg.unlet.ul_forceit) == FAIL) |
|
21371
8e1081ede3b8
patch 8.2.1236: Vim9: a few errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21365
diff
changeset
|
3681 goto on_error; |
|
20091
a64c16ff98b8
patch 8.2.0601: Vim9: :unlet is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
20089
diff
changeset
|
3682 break; |
|
20099
058b41f85bcb
patch 8.2.0605: Vim9: cannot unlet an environment variable
Bram Moolenaar <Bram@vim.org>
parents:
20091
diff
changeset
|
3683 case ISN_UNLETENV: |
|
28459
52ef65c0637f
patch 8.2.4754: using cached values after unsetting some environment variables
Bram Moolenaar <Bram@vim.org>
parents:
28447
diff
changeset
|
3684 vim_unsetenv_ext(iptr->isn_arg.unlet.ul_name); |
|
20099
058b41f85bcb
patch 8.2.0605: Vim9: cannot unlet an environment variable
Bram Moolenaar <Bram@vim.org>
parents:
20091
diff
changeset
|
3685 break; |
|
20091
a64c16ff98b8
patch 8.2.0601: Vim9: :unlet is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
20089
diff
changeset
|
3686 |
|
25605
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3687 case ISN_LOCKUNLOCK: |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3688 { |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3689 typval_T *lval_root_save = lval_root; |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3690 int res; |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3691 |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3692 // Stack has the local variable, argument the whole :lock |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3693 // or :unlock command, like ISN_EXEC. |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3694 --ectx->ec_stack.ga_len; |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3695 lval_root = STACK_TV_BOT(0); |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3696 res = exec_command(iptr); |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3697 clear_tv(lval_root); |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3698 lval_root = lval_root_save; |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3699 if (res == FAIL) |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3700 goto on_error; |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3701 } |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3702 break; |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
3703 |
|
22272
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
3704 case ISN_LOCKCONST: |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
3705 item_lock(STACK_TV_BOT(-1), 100, TRUE, TRUE); |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
3706 break; |
|
eb1f5f618c75
patch 8.2.1685: Vim9: cannot declare a constant value
Bram Moolenaar <Bram@vim.org>
parents:
22262
diff
changeset
|
3707 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3708 // create a list from items on the stack; uses a single allocation |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3709 // for the list header and the items |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3710 case ISN_NEWLIST: |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3711 if (exe_newlist(iptr->isn_arg.number, ectx) == FAIL) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3712 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3713 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3714 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3715 // create a dict from items on the stack |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3716 case ISN_NEWDICT: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3717 { |
|
28217
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
3718 int res; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
3719 |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
3720 SOURCING_LNUM = iptr->isn_lnum; |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
3721 res = exe_newdict(iptr->isn_arg.number, ectx); |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
3722 if (res == FAIL) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3723 goto theend; |
|
28217
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
3724 if (res == MAYBE) |
|
662d2d5db9a6
patch 8.2.4634: Vim9: cannot initialize a variable to null_list
Bram Moolenaar <Bram@vim.org>
parents:
28156
diff
changeset
|
3725 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3726 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3727 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3728 |
|
28598
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
3729 case ISN_CONCAT: |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
3730 if (exe_concat(iptr->isn_arg.number, ectx) == FAIL) |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
3731 goto theend; |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
3732 break; |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
3733 |
|
28002
1012048eed26
patch 8.2.4526: Vim9: cannot set variables to a null value
Bram Moolenaar <Bram@vim.org>
parents:
27924
diff
changeset
|
3734 // create a partial with NULL value |
|
1012048eed26
patch 8.2.4526: Vim9: cannot set variables to a null value
Bram Moolenaar <Bram@vim.org>
parents:
27924
diff
changeset
|
3735 case ISN_NEWPARTIAL: |
|
1012048eed26
patch 8.2.4526: Vim9: cannot set variables to a null value
Bram Moolenaar <Bram@vim.org>
parents:
27924
diff
changeset
|
3736 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
1012048eed26
patch 8.2.4526: Vim9: cannot set variables to a null value
Bram Moolenaar <Bram@vim.org>
parents:
27924
diff
changeset
|
3737 goto theend; |
|
1012048eed26
patch 8.2.4526: Vim9: cannot set variables to a null value
Bram Moolenaar <Bram@vim.org>
parents:
27924
diff
changeset
|
3738 ++ectx->ec_stack.ga_len; |
|
1012048eed26
patch 8.2.4526: Vim9: cannot set variables to a null value
Bram Moolenaar <Bram@vim.org>
parents:
27924
diff
changeset
|
3739 tv = STACK_TV_BOT(-1); |
|
1012048eed26
patch 8.2.4526: Vim9: cannot set variables to a null value
Bram Moolenaar <Bram@vim.org>
parents:
27924
diff
changeset
|
3740 tv->v_type = VAR_PARTIAL; |
|
1012048eed26
patch 8.2.4526: Vim9: cannot set variables to a null value
Bram Moolenaar <Bram@vim.org>
parents:
27924
diff
changeset
|
3741 tv->v_lock = 0; |
|
1012048eed26
patch 8.2.4526: Vim9: cannot set variables to a null value
Bram Moolenaar <Bram@vim.org>
parents:
27924
diff
changeset
|
3742 tv->vval.v_partial = NULL; |
|
1012048eed26
patch 8.2.4526: Vim9: cannot set variables to a null value
Bram Moolenaar <Bram@vim.org>
parents:
27924
diff
changeset
|
3743 break; |
|
1012048eed26
patch 8.2.4526: Vim9: cannot set variables to a null value
Bram Moolenaar <Bram@vim.org>
parents:
27924
diff
changeset
|
3744 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3745 // call a :def function |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3746 case ISN_DCALL: |
|
22214
efa1511a5bf3
patch 8.2.1656: Vim9: callstack wrong if :def function calls :def function
Bram Moolenaar <Bram@vim.org>
parents:
22176
diff
changeset
|
3747 SOURCING_LNUM = iptr->isn_lnum; |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
3748 if (call_dfunc(iptr->isn_arg.dfunc.cdf_idx, |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
3749 NULL, |
|
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
3750 iptr->isn_arg.dfunc.cdf_argcount, |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3751 ectx) == FAIL) |
|
21371
8e1081ede3b8
patch 8.2.1236: Vim9: a few errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21365
diff
changeset
|
3752 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3753 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3754 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3755 // call a builtin function |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3756 case ISN_BCALL: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3757 SOURCING_LNUM = iptr->isn_lnum; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3758 if (call_bfunc(iptr->isn_arg.bfunc.cbf_idx, |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3759 iptr->isn_arg.bfunc.cbf_argcount, |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3760 ectx) == FAIL) |
|
21375
92e2ed2a2778
patch 8.2.1238: Vim9: a few remaining errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21371
diff
changeset
|
3761 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3762 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3763 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3764 // call a funcref or partial |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3765 case ISN_PCALL: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3766 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3767 cpfunc_T *pfunc = &iptr->isn_arg.pfunc; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3768 int r; |
|
20433
5950284a517f
patch 8.2.0771: Vim9: cannot call a compiled closure from not compiled code
Bram Moolenaar <Bram@vim.org>
parents:
20427
diff
changeset
|
3769 typval_T partial_tv; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3770 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3771 SOURCING_LNUM = iptr->isn_lnum; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3772 if (pfunc->cpf_top) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3773 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3774 // funcref is above the arguments |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3775 tv = STACK_TV_BOT(-pfunc->cpf_argcount - 1); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3776 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3777 else |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3778 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3779 // Get the funcref from the stack. |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3780 --ectx->ec_stack.ga_len; |
|
20433
5950284a517f
patch 8.2.0771: Vim9: cannot call a compiled closure from not compiled code
Bram Moolenaar <Bram@vim.org>
parents:
20427
diff
changeset
|
3781 partial_tv = *STACK_TV_BOT(0); |
|
5950284a517f
patch 8.2.0771: Vim9: cannot call a compiled closure from not compiled code
Bram Moolenaar <Bram@vim.org>
parents:
20427
diff
changeset
|
3782 tv = &partial_tv; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3783 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3784 r = call_partial(tv, pfunc->cpf_argcount, ectx); |
|
20433
5950284a517f
patch 8.2.0771: Vim9: cannot call a compiled closure from not compiled code
Bram Moolenaar <Bram@vim.org>
parents:
20427
diff
changeset
|
3785 if (tv == &partial_tv) |
|
5950284a517f
patch 8.2.0771: Vim9: cannot call a compiled closure from not compiled code
Bram Moolenaar <Bram@vim.org>
parents:
20427
diff
changeset
|
3786 clear_tv(&partial_tv); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3787 if (r == FAIL) |
|
21375
92e2ed2a2778
patch 8.2.1238: Vim9: a few remaining errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21371
diff
changeset
|
3788 goto on_error; |
|
19862
846fbbacce3a
patch 8.2.0487: Vim9: compiling not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19842
diff
changeset
|
3789 } |
|
846fbbacce3a
patch 8.2.0487: Vim9: compiling not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19842
diff
changeset
|
3790 break; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3791 |
|
19862
846fbbacce3a
patch 8.2.0487: Vim9: compiling not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19842
diff
changeset
|
3792 case ISN_PCALL_END: |
|
846fbbacce3a
patch 8.2.0487: Vim9: compiling not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19842
diff
changeset
|
3793 // PCALL finished, arguments have been consumed and replaced by |
|
846fbbacce3a
patch 8.2.0487: Vim9: compiling not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19842
diff
changeset
|
3794 // the return value. Now clear the funcref from the stack, |
|
846fbbacce3a
patch 8.2.0487: Vim9: compiling not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19842
diff
changeset
|
3795 // and move the return value in its place. |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3796 --ectx->ec_stack.ga_len; |
|
19862
846fbbacce3a
patch 8.2.0487: Vim9: compiling not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19842
diff
changeset
|
3797 clear_tv(STACK_TV_BOT(-1)); |
|
846fbbacce3a
patch 8.2.0487: Vim9: compiling not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19842
diff
changeset
|
3798 *STACK_TV_BOT(-1) = *STACK_TV_BOT(0); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3799 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3800 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3801 // call a user defined function or funcref/partial |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3802 case ISN_UCALL: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3803 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3804 cufunc_T *cufunc = &iptr->isn_arg.ufunc; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3805 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3806 SOURCING_LNUM = iptr->isn_lnum; |
|
24218
40e27d96e395
patch 8.2.2650: Vim9: command modifiers not handled in nested function
Bram Moolenaar <Bram@vim.org>
parents:
24146
diff
changeset
|
3807 if (call_eval_func(cufunc->cuf_name, cufunc->cuf_argcount, |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3808 ectx, iptr) == FAIL) |
|
21375
92e2ed2a2778
patch 8.2.1238: Vim9: a few remaining errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21371
diff
changeset
|
3809 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3810 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3811 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3812 |
|
30065
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
3813 // :defer func(arg) |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
3814 case ISN_DEFER: |
|
30083
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
3815 if (defer_command(iptr->isn_arg.defer.defer_var_idx, |
|
30065
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
3816 iptr->isn_arg.defer.defer_argcount, ectx) == FAIL) |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
3817 goto on_error; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
3818 break; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
3819 |
|
24936
345619f35112
patch 8.2.3005: Vim9: using a void value does not give a proper error message
Bram Moolenaar <Bram@vim.org>
parents:
24932
diff
changeset
|
3820 // return from a :def function call without a value |
|
345619f35112
patch 8.2.3005: Vim9: using a void value does not give a proper error message
Bram Moolenaar <Bram@vim.org>
parents:
24932
diff
changeset
|
3821 case ISN_RETURN_VOID: |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3822 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3823 goto theend; |
|
23543
f90e429453fd
patch 8.2.2314: Vim9: returning zero takes two instructions
Bram Moolenaar <Bram@vim.org>
parents:
23541
diff
changeset
|
3824 tv = STACK_TV_BOT(0); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3825 ++ectx->ec_stack.ga_len; |
|
24936
345619f35112
patch 8.2.3005: Vim9: using a void value does not give a proper error message
Bram Moolenaar <Bram@vim.org>
parents:
24932
diff
changeset
|
3826 tv->v_type = VAR_VOID; |
|
23543
f90e429453fd
patch 8.2.2314: Vim9: returning zero takes two instructions
Bram Moolenaar <Bram@vim.org>
parents:
23541
diff
changeset
|
3827 tv->vval.v_number = 0; |
|
f90e429453fd
patch 8.2.2314: Vim9: returning zero takes two instructions
Bram Moolenaar <Bram@vim.org>
parents:
23541
diff
changeset
|
3828 tv->v_lock = 0; |
|
f90e429453fd
patch 8.2.2314: Vim9: returning zero takes two instructions
Bram Moolenaar <Bram@vim.org>
parents:
23541
diff
changeset
|
3829 // FALLTHROUGH |
|
f90e429453fd
patch 8.2.2314: Vim9: returning zero takes two instructions
Bram Moolenaar <Bram@vim.org>
parents:
23541
diff
changeset
|
3830 |
|
24936
345619f35112
patch 8.2.3005: Vim9: using a void value does not give a proper error message
Bram Moolenaar <Bram@vim.org>
parents:
24932
diff
changeset
|
3831 // return from a :def function call with what is on the stack |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3832 case ISN_RETURN: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3833 { |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3834 garray_T *trystack = &ectx->ec_trystack; |
|
19726
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
3835 trycmd_T *trycmd = NULL; |
|
19221
f63f3b423ad3
patch 8.2.0169: Coverity warning for dead code
Bram Moolenaar <Bram@vim.org>
parents:
19219
diff
changeset
|
3836 |
|
f63f3b423ad3
patch 8.2.0169: Coverity warning for dead code
Bram Moolenaar <Bram@vim.org>
parents:
19219
diff
changeset
|
3837 if (trystack->ga_len > 0) |
|
f63f3b423ad3
patch 8.2.0169: Coverity warning for dead code
Bram Moolenaar <Bram@vim.org>
parents:
19219
diff
changeset
|
3838 trycmd = ((trycmd_T *)trystack->ga_data) |
|
f63f3b423ad3
patch 8.2.0169: Coverity warning for dead code
Bram Moolenaar <Bram@vim.org>
parents:
19219
diff
changeset
|
3839 + trystack->ga_len - 1; |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
3840 if (trycmd != NULL |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3841 && trycmd->tcd_frame_idx == ectx->ec_frame_idx) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3842 { |
|
24002
5dbed4837ea3
patch 8.2.2543: Vim9: a return inside try/catch does not restore properly
Bram Moolenaar <Bram@vim.org>
parents:
23994
diff
changeset
|
3843 // jump to ":finally" or ":endtry" |
|
5dbed4837ea3
patch 8.2.2543: Vim9: a return inside try/catch does not restore properly
Bram Moolenaar <Bram@vim.org>
parents:
23994
diff
changeset
|
3844 if (trycmd->tcd_finally_idx != 0) |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3845 ectx->ec_iidx = trycmd->tcd_finally_idx; |
|
24002
5dbed4837ea3
patch 8.2.2543: Vim9: a return inside try/catch does not restore properly
Bram Moolenaar <Bram@vim.org>
parents:
23994
diff
changeset
|
3846 else |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3847 ectx->ec_iidx = trycmd->tcd_endtry_idx; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3848 trycmd->tcd_return = TRUE; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3849 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3850 else |
|
21375
92e2ed2a2778
patch 8.2.1238: Vim9: a few remaining errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21371
diff
changeset
|
3851 goto func_return; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3852 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3853 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3854 |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
3855 // push a partial, a reference to a compiled function |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3856 case ISN_FUNCREF: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3857 { |
|
23249
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
3858 partial_T *pt = ALLOC_CLEAR_ONE(partial_T); |
|
26323
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
3859 ufunc_T *ufunc; |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
3860 funcref_T *funcref = &iptr->isn_arg.funcref; |
|
23249
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
3861 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3862 if (pt == NULL) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3863 goto theend; |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3864 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
3865 { |
|
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
3866 vim_free(pt); |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3867 goto theend; |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
3868 } |
|
26323
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
3869 if (funcref->fr_func_name == NULL) |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
3870 { |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
3871 dfunc_T *pt_dfunc = ((dfunc_T *)def_functions.ga_data) |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
3872 + funcref->fr_dfunc_idx; |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
3873 |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
3874 ufunc = pt_dfunc->df_ufunc; |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
3875 } |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
3876 else |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
3877 { |
|
27114
98a01021e465
patch 8.2.4086: "cctx" argument of find_func_even_dead() is unused
Bram Moolenaar <Bram@vim.org>
parents:
27086
diff
changeset
|
3878 ufunc = find_func(funcref->fr_func_name, FALSE); |
|
26323
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
3879 } |
|
27774
89b1bc6fd40a
patch 8.2.4413: Vim9: Coverity warns for using NULL pointer
Bram Moolenaar <Bram@vim.org>
parents:
27768
diff
changeset
|
3880 if (ufunc == NULL) |
|
89b1bc6fd40a
patch 8.2.4413: Vim9: Coverity warns for using NULL pointer
Bram Moolenaar <Bram@vim.org>
parents:
27768
diff
changeset
|
3881 { |
|
89b1bc6fd40a
patch 8.2.4413: Vim9: Coverity warns for using NULL pointer
Bram Moolenaar <Bram@vim.org>
parents:
27768
diff
changeset
|
3882 SOURCING_LNUM = iptr->isn_lnum; |
|
89b1bc6fd40a
patch 8.2.4413: Vim9: Coverity warns for using NULL pointer
Bram Moolenaar <Bram@vim.org>
parents:
27768
diff
changeset
|
3883 iemsg("ufunc unexpectedly NULL for FUNCREF"); |
|
89b1bc6fd40a
patch 8.2.4413: Vim9: Coverity warns for using NULL pointer
Bram Moolenaar <Bram@vim.org>
parents:
27768
diff
changeset
|
3884 goto theend; |
|
89b1bc6fd40a
patch 8.2.4413: Vim9: Coverity warns for using NULL pointer
Bram Moolenaar <Bram@vim.org>
parents:
27768
diff
changeset
|
3885 } |
|
26323
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
3886 if (fill_partial_and_closure(pt, ufunc, ectx) == FAIL) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3887 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3888 tv = STACK_TV_BOT(0); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3889 ++ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3890 tv->vval.v_partial = pt; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3891 tv->v_type = VAR_PARTIAL; |
|
21399
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
3892 tv->v_lock = 0; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3893 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3894 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3895 |
|
21558
1c4d4aa22b37
patch 8.2.1329: Vim9: cannot define global function inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
21481
diff
changeset
|
3896 // Create a global function from a lambda. |
|
1c4d4aa22b37
patch 8.2.1329: Vim9: cannot define global function inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
21481
diff
changeset
|
3897 case ISN_NEWFUNC: |
|
1c4d4aa22b37
patch 8.2.1329: Vim9: cannot define global function inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
21481
diff
changeset
|
3898 { |
|
1c4d4aa22b37
patch 8.2.1329: Vim9: cannot define global function inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
21481
diff
changeset
|
3899 newfunc_T *newfunc = &iptr->isn_arg.newfunc; |
|
23285
112fa621b127
patch 8.2.2188: Vim9: crash when calling global function from :def function
Bram Moolenaar <Bram@vim.org>
parents:
23266
diff
changeset
|
3900 |
|
112fa621b127
patch 8.2.2188: Vim9: crash when calling global function from :def function
Bram Moolenaar <Bram@vim.org>
parents:
23266
diff
changeset
|
3901 if (copy_func(newfunc->nf_lambda, newfunc->nf_global, |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3902 ectx) == FAIL) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3903 goto theend; |
|
21558
1c4d4aa22b37
patch 8.2.1329: Vim9: cannot define global function inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
21481
diff
changeset
|
3904 } |
|
1c4d4aa22b37
patch 8.2.1329: Vim9: cannot define global function inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
21481
diff
changeset
|
3905 break; |
|
1c4d4aa22b37
patch 8.2.1329: Vim9: cannot define global function inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
21481
diff
changeset
|
3906 |
|
22973
4c97c0747017
patch 8.2.2033: Vim9: :def without argument gives compilation error
Bram Moolenaar <Bram@vim.org>
parents:
22952
diff
changeset
|
3907 // List functions |
|
4c97c0747017
patch 8.2.2033: Vim9: :def without argument gives compilation error
Bram Moolenaar <Bram@vim.org>
parents:
22952
diff
changeset
|
3908 case ISN_DEF: |
|
4c97c0747017
patch 8.2.2033: Vim9: :def without argument gives compilation error
Bram Moolenaar <Bram@vim.org>
parents:
22952
diff
changeset
|
3909 if (iptr->isn_arg.string == NULL) |
|
4c97c0747017
patch 8.2.2033: Vim9: :def without argument gives compilation error
Bram Moolenaar <Bram@vim.org>
parents:
22952
diff
changeset
|
3910 list_functions(NULL); |
|
4c97c0747017
patch 8.2.2033: Vim9: :def without argument gives compilation error
Bram Moolenaar <Bram@vim.org>
parents:
22952
diff
changeset
|
3911 else |
|
4c97c0747017
patch 8.2.2033: Vim9: :def without argument gives compilation error
Bram Moolenaar <Bram@vim.org>
parents:
22952
diff
changeset
|
3912 { |
|
27026
32120100fde8
patch 8.2.4042: Vim9: build error
Bram Moolenaar <Bram@vim.org>
parents:
26980
diff
changeset
|
3913 exarg_T ea; |
|
32120100fde8
patch 8.2.4042: Vim9: build error
Bram Moolenaar <Bram@vim.org>
parents:
26980
diff
changeset
|
3914 garray_T lines_to_free; |
|
22973
4c97c0747017
patch 8.2.2033: Vim9: :def without argument gives compilation error
Bram Moolenaar <Bram@vim.org>
parents:
22952
diff
changeset
|
3915 |
|
4c97c0747017
patch 8.2.2033: Vim9: :def without argument gives compilation error
Bram Moolenaar <Bram@vim.org>
parents:
22952
diff
changeset
|
3916 CLEAR_FIELD(ea); |
|
4c97c0747017
patch 8.2.2033: Vim9: :def without argument gives compilation error
Bram Moolenaar <Bram@vim.org>
parents:
22952
diff
changeset
|
3917 ea.cmd = ea.arg = iptr->isn_arg.string; |
|
27026
32120100fde8
patch 8.2.4042: Vim9: build error
Bram Moolenaar <Bram@vim.org>
parents:
26980
diff
changeset
|
3918 ga_init2(&lines_to_free, sizeof(char_u *), 50); |
|
32120100fde8
patch 8.2.4042: Vim9: build error
Bram Moolenaar <Bram@vim.org>
parents:
26980
diff
changeset
|
3919 define_function(&ea, NULL, &lines_to_free); |
|
32120100fde8
patch 8.2.4042: Vim9: build error
Bram Moolenaar <Bram@vim.org>
parents:
26980
diff
changeset
|
3920 ga_clear_strings(&lines_to_free); |
|
22973
4c97c0747017
patch 8.2.2033: Vim9: :def without argument gives compilation error
Bram Moolenaar <Bram@vim.org>
parents:
22952
diff
changeset
|
3921 } |
|
4c97c0747017
patch 8.2.2033: Vim9: :def without argument gives compilation error
Bram Moolenaar <Bram@vim.org>
parents:
22952
diff
changeset
|
3922 break; |
|
4c97c0747017
patch 8.2.2033: Vim9: :def without argument gives compilation error
Bram Moolenaar <Bram@vim.org>
parents:
22952
diff
changeset
|
3923 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3924 // jump if a condition is met |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3925 case ISN_JUMP: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3926 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3927 jumpwhen_T when = iptr->isn_arg.jump.jump_when; |
|
22494
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
3928 int error = FALSE; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3929 int jump = TRUE; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3930 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3931 if (when != JUMP_ALWAYS) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3932 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3933 tv = STACK_TV_BOT(-1); |
|
22494
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
3934 if (when == JUMP_IF_COND_FALSE |
|
22500
ef8a3177edc1
patch 8.2.1798: Vim9: trinary operator condition is too permissive
Bram Moolenaar <Bram@vim.org>
parents:
22494
diff
changeset
|
3935 || when == JUMP_IF_FALSE |
|
22494
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
3936 || when == JUMP_IF_COND_TRUE) |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
3937 { |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
3938 SOURCING_LNUM = iptr->isn_lnum; |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
3939 jump = tv_get_bool_chk(tv, &error); |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
3940 if (error) |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
3941 goto on_error; |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
3942 } |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
3943 else |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
3944 jump = tv2bool(tv); |
|
28625
56860e29ce5d
patch 8.2.4836: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28623
diff
changeset
|
3945 if (when == JUMP_IF_FALSE || when == JUMP_IF_COND_FALSE) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3946 jump = !jump; |
|
19334
61646c189622
patch 8.2.0225: compiling lambda not tested yet
Bram Moolenaar <Bram@vim.org>
parents:
19328
diff
changeset
|
3947 if (when == JUMP_IF_FALSE || !jump) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3948 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3949 // drop the value from the stack |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3950 clear_tv(tv); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3951 --ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3952 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3953 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3954 if (jump) |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3955 ectx->ec_iidx = iptr->isn_arg.jump.jump_where; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3956 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3957 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3958 |
|
24272
cabed216cc2f
patch 8.2.2677: Vim9: cannot use only some of the default arguments
Bram Moolenaar <Bram@vim.org>
parents:
24234
diff
changeset
|
3959 // Jump if an argument with a default value was already set and not |
|
cabed216cc2f
patch 8.2.2677: Vim9: cannot use only some of the default arguments
Bram Moolenaar <Bram@vim.org>
parents:
24234
diff
changeset
|
3960 // v:none. |
|
cabed216cc2f
patch 8.2.2677: Vim9: cannot use only some of the default arguments
Bram Moolenaar <Bram@vim.org>
parents:
24234
diff
changeset
|
3961 case ISN_JUMP_IF_ARG_SET: |
|
cabed216cc2f
patch 8.2.2677: Vim9: cannot use only some of the default arguments
Bram Moolenaar <Bram@vim.org>
parents:
24234
diff
changeset
|
3962 tv = STACK_TV_VAR(iptr->isn_arg.jumparg.jump_arg_off); |
|
cabed216cc2f
patch 8.2.2677: Vim9: cannot use only some of the default arguments
Bram Moolenaar <Bram@vim.org>
parents:
24234
diff
changeset
|
3963 if (tv->v_type != VAR_UNKNOWN |
|
cabed216cc2f
patch 8.2.2677: Vim9: cannot use only some of the default arguments
Bram Moolenaar <Bram@vim.org>
parents:
24234
diff
changeset
|
3964 && !(tv->v_type == VAR_SPECIAL |
|
cabed216cc2f
patch 8.2.2677: Vim9: cannot use only some of the default arguments
Bram Moolenaar <Bram@vim.org>
parents:
24234
diff
changeset
|
3965 && tv->vval.v_number == VVAL_NONE)) |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3966 ectx->ec_iidx = iptr->isn_arg.jumparg.jump_where; |
|
24272
cabed216cc2f
patch 8.2.2677: Vim9: cannot use only some of the default arguments
Bram Moolenaar <Bram@vim.org>
parents:
24234
diff
changeset
|
3967 break; |
|
cabed216cc2f
patch 8.2.2677: Vim9: cannot use only some of the default arguments
Bram Moolenaar <Bram@vim.org>
parents:
24234
diff
changeset
|
3968 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3969 // top of a for loop |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3970 case ISN_FOR: |
|
27340
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
3971 if (execute_for(iptr, ectx) == FAIL) |
|
2b3cc874334c
patch 8.2.4198: Vim9: the switch for executing instructions is too long
Bram Moolenaar <Bram@vim.org>
parents:
27217
diff
changeset
|
3972 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3973 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3974 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3975 // start of ":try" block |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3976 case ISN_TRY: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3977 { |
|
19726
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
3978 trycmd_T *trycmd = NULL; |
|
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
3979 |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
3980 if (GA_GROW_FAILS(&ectx->ec_trystack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
3981 goto theend; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3982 trycmd = ((trycmd_T *)ectx->ec_trystack.ga_data) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3983 + ectx->ec_trystack.ga_len; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3984 ++ectx->ec_trystack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3985 ++trylevel; |
|
23934
f9a4ede76237
patch 8.2.2509: tests fail on s390 build
Bram Moolenaar <Bram@vim.org>
parents:
23927
diff
changeset
|
3986 CLEAR_POINTER(trycmd); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3987 trycmd->tcd_frame_idx = ectx->ec_frame_idx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
3988 trycmd->tcd_stack_len = ectx->ec_stack.ga_len; |
|
24220
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
3989 trycmd->tcd_catch_idx = |
|
26672
3516017e5f54
patch 8.2.3865: Vim9: compiler complains about using "try" as a struct member
Bram Moolenaar <Bram@vim.org>
parents:
26662
diff
changeset
|
3990 iptr->isn_arg.tryref.try_ref->try_catch; |
|
24220
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
3991 trycmd->tcd_finally_idx = |
|
26672
3516017e5f54
patch 8.2.3865: Vim9: compiler complains about using "try" as a struct member
Bram Moolenaar <Bram@vim.org>
parents:
26662
diff
changeset
|
3992 iptr->isn_arg.tryref.try_ref->try_finally; |
|
24220
a7a9176bb542
patch 8.2.2651: Vim9: restoring command modifiers happens after jump
Bram Moolenaar <Bram@vim.org>
parents:
24218
diff
changeset
|
3993 trycmd->tcd_endtry_idx = |
|
26672
3516017e5f54
patch 8.2.3865: Vim9: compiler complains about using "try" as a struct member
Bram Moolenaar <Bram@vim.org>
parents:
26662
diff
changeset
|
3994 iptr->isn_arg.tryref.try_ref->try_endtry; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3995 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3996 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3997 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3998 case ISN_PUSHEXC: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3999 if (current_exception == NULL) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4000 { |
|
21793
0706bd071fa3
patch 8.2.1446: Vim9: line number in error message is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21789
diff
changeset
|
4001 SOURCING_LNUM = iptr->isn_lnum; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4002 iemsg("Evaluating catch while current_exception is NULL"); |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
4003 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4004 } |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
4005 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
4006 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4007 tv = STACK_TV_BOT(0); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4008 ++ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4009 tv->v_type = VAR_STRING; |
|
21399
5cb6e676defd
patch 8.2.1250: Vim9: cannot use the g:, b:, t: and w: namespaces
Bram Moolenaar <Bram@vim.org>
parents:
21393
diff
changeset
|
4010 tv->v_lock = 0; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4011 tv->vval.v_string = vim_strsave( |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4012 (char_u *)current_exception->value); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4013 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4014 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4015 case ISN_CATCH: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4016 { |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4017 garray_T *trystack = &ectx->ec_trystack; |
|
28621
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4018 trycmd_T *trycmd; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4019 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4020 may_restore_cmdmod(&ectx->ec_funclocal); |
|
28621
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4021 trycmd = ((trycmd_T *)trystack->ga_data) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4022 + trystack->ga_len - 1; |
|
28621
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4023 trycmd->tcd_caught = TRUE; |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4024 trycmd->tcd_did_throw = FALSE; |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4025 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4026 did_emsg = got_int = did_throw = FALSE; |
|
23656
c6f7df86cd9d
patch 8.2.2370: Vim9: command fails in catch block
Bram Moolenaar <Bram@vim.org>
parents:
23650
diff
changeset
|
4027 force_abort = need_rethrow = FALSE; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4028 catch_exception(current_exception); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4029 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4030 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4031 |
|
23927
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4032 case ISN_TRYCONT: |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4033 { |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4034 garray_T *trystack = &ectx->ec_trystack; |
|
23927
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4035 trycont_T *trycont = &iptr->isn_arg.trycont; |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4036 int i; |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4037 trycmd_T *trycmd; |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4038 int iidx = trycont->tct_where; |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4039 |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4040 if (trystack->ga_len < trycont->tct_levels) |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4041 { |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4042 siemsg("TRYCONT: expected %d levels, found %d", |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4043 trycont->tct_levels, trystack->ga_len); |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
4044 goto theend; |
|
23927
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4045 } |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4046 // Make :endtry jump to any outer try block and the last |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4047 // :endtry inside the loop to the loop start. |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4048 for (i = trycont->tct_levels; i > 0; --i) |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4049 { |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4050 trycmd = ((trycmd_T *)trystack->ga_data) |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4051 + trystack->ga_len - i; |
|
24122
e8b21a3bb0d5
patch 8.2.2602: Vim9: continue doesn't work if :while is very first command
Bram Moolenaar <Bram@vim.org>
parents:
24112
diff
changeset
|
4052 // Add one to tcd_cont to be able to jump to |
|
e8b21a3bb0d5
patch 8.2.2602: Vim9: continue doesn't work if :while is very first command
Bram Moolenaar <Bram@vim.org>
parents:
24112
diff
changeset
|
4053 // instruction with index zero. |
|
e8b21a3bb0d5
patch 8.2.2602: Vim9: continue doesn't work if :while is very first command
Bram Moolenaar <Bram@vim.org>
parents:
24112
diff
changeset
|
4054 trycmd->tcd_cont = iidx + 1; |
|
23994
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
4055 iidx = trycmd->tcd_finally_idx == 0 |
|
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
4056 ? trycmd->tcd_endtry_idx : trycmd->tcd_finally_idx; |
|
23927
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4057 } |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4058 // jump to :finally or :endtry of current try statement |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4059 ectx->ec_iidx = iidx; |
|
23927
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4060 } |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4061 break; |
|
5e5780e3f75d
patch 8.2.2506: Vim9: :continue does not work correctly in a :try block
Bram Moolenaar <Bram@vim.org>
parents:
23921
diff
changeset
|
4062 |
|
23994
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
4063 case ISN_FINALLY: |
|
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
4064 { |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4065 garray_T *trystack = &ectx->ec_trystack; |
|
23994
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
4066 trycmd_T *trycmd = ((trycmd_T *)trystack->ga_data) |
|
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
4067 + trystack->ga_len - 1; |
|
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
4068 |
|
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
4069 // Reset the index to avoid a return statement jumps here |
|
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
4070 // again. |
|
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
4071 trycmd->tcd_finally_idx = 0; |
|
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
4072 break; |
|
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
4073 } |
|
3daeb2060f25
patch 8.2.2539: Vim9: return from finally block causes a hang
Bram Moolenaar <Bram@vim.org>
parents:
23982
diff
changeset
|
4074 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4075 // end of ":try" block |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4076 case ISN_ENDTRY: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4077 { |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4078 garray_T *trystack = &ectx->ec_trystack; |
|
28621
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4079 trycmd_T *trycmd; |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4080 |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4081 --trystack->ga_len; |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4082 --trylevel; |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4083 trycmd = ((trycmd_T *)trystack->ga_data) + trystack->ga_len; |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4084 if (trycmd->tcd_did_throw) |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4085 did_throw = TRUE; |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4086 if (trycmd->tcd_caught && current_exception != NULL) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4087 { |
|
28621
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4088 // discard the exception |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4089 if (caught_stack == current_exception) |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4090 caught_stack = caught_stack->caught; |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4091 discard_current_exception(); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4092 } |
|
28621
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4093 |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4094 if (trycmd->tcd_return) |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4095 goto func_return; |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4096 |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4097 while (ectx->ec_stack.ga_len > trycmd->tcd_stack_len) |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4098 { |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4099 --ectx->ec_stack.ga_len; |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4100 clear_tv(STACK_TV_BOT(0)); |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4101 } |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4102 if (trycmd->tcd_cont != 0) |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4103 // handling :continue: jump to outer try block or |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4104 // start of the loop |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4105 ectx->ec_iidx = trycmd->tcd_cont - 1; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4106 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4107 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4108 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4109 case ISN_THROW: |
|
23618
d228ca435f3a
patch 8.2.2351: Vim9: error msg for "throw" in function called with "silent!"
Bram Moolenaar <Bram@vim.org>
parents:
23604
diff
changeset
|
4110 { |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4111 garray_T *trystack = &ectx->ec_trystack; |
|
23725
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4112 |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4113 if (trystack->ga_len == 0 && trylevel == 0 && emsg_silent) |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4114 { |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4115 // throwing an exception while using "silent!" causes |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4116 // the function to abort but not display an error. |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4117 tv = STACK_TV_BOT(-1); |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4118 clear_tv(tv); |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4119 tv->v_type = VAR_NUMBER; |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4120 tv->vval.v_number = 0; |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4121 goto done; |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4122 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4123 --ectx->ec_stack.ga_len; |
|
23725
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4124 tv = STACK_TV_BOT(0); |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4125 if (tv->vval.v_string == NULL |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4126 || *skipwhite(tv->vval.v_string) == NUL) |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4127 { |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4128 vim_free(tv->vval.v_string); |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4129 SOURCING_LNUM = iptr->isn_lnum; |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4130 emsg(_(e_throw_with_empty_string)); |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
4131 goto theend; |
|
23725
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4132 } |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4133 |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4134 // Inside a "catch" we need to first discard the caught |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4135 // exception. |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4136 if (trystack->ga_len > 0) |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4137 { |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4138 trycmd_T *trycmd = ((trycmd_T *)trystack->ga_data) |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4139 + trystack->ga_len - 1; |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4140 if (trycmd->tcd_caught && current_exception != NULL) |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4141 { |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4142 // discard the exception |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4143 if (caught_stack == current_exception) |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4144 caught_stack = caught_stack->caught; |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4145 discard_current_exception(); |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4146 trycmd->tcd_caught = FALSE; |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4147 } |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4148 } |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4149 |
|
27665
a6ffe874a24b
patch 8.2.4358: Vim9: line number of exception is not set
Bram Moolenaar <Bram@vim.org>
parents:
27591
diff
changeset
|
4150 SOURCING_LNUM = iptr->isn_lnum; |
|
23725
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4151 if (throw_exception(tv->vval.v_string, ET_USER, NULL) |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4152 == FAIL) |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4153 { |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4154 vim_free(tv->vval.v_string); |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
4155 goto theend; |
|
23725
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4156 } |
|
f98692ae09a0
patch 8.2.2404: Vim9: profiling try/catch not correct
Bram Moolenaar <Bram@vim.org>
parents:
23719
diff
changeset
|
4157 did_throw = TRUE; |
|
23618
d228ca435f3a
patch 8.2.2351: Vim9: error msg for "throw" in function called with "silent!"
Bram Moolenaar <Bram@vim.org>
parents:
23604
diff
changeset
|
4158 } |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4159 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4160 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4161 // compare with special values |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4162 case ISN_COMPAREBOOL: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4163 case ISN_COMPARESPECIAL: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4164 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4165 typval_T *tv1 = STACK_TV_BOT(-2); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4166 typval_T *tv2 = STACK_TV_BOT(-1); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4167 varnumber_T arg1 = tv1->vval.v_number; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4168 varnumber_T arg2 = tv2->vval.v_number; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4169 int res; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4170 |
|
28621
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4171 if (iptr->isn_arg.op.op_type == EXPR_EQUAL) |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4172 res = arg1 == arg2; |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4173 else |
|
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4174 res = arg1 != arg2; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4175 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4176 --ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4177 tv1->v_type = VAR_BOOL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4178 tv1->vval.v_number = res ? VVAL_TRUE : VVAL_FALSE; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4179 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4180 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4181 |
|
27924
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4182 case ISN_COMPARENULL: |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4183 { |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4184 typval_T *tv1 = STACK_TV_BOT(-2); |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4185 typval_T *tv2 = STACK_TV_BOT(-1); |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4186 int res; |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4187 |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4188 res = typval_compare_null(tv1, tv2); |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4189 if (res == MAYBE) |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4190 goto on_error; |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4191 if (iptr->isn_arg.op.op_type == EXPR_NEQUAL) |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4192 res = !res; |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4193 clear_tv(tv1); |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4194 clear_tv(tv2); |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4195 --ectx->ec_stack.ga_len; |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4196 tv1->v_type = VAR_BOOL; |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4197 tv1->vval.v_number = res ? VVAL_TRUE : VVAL_FALSE; |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4198 } |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4199 break; |
|
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
4200 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4201 // Operation with two number arguments |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4202 case ISN_OPNR: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4203 case ISN_COMPARENR: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4204 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4205 typval_T *tv1 = STACK_TV_BOT(-2); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4206 typval_T *tv2 = STACK_TV_BOT(-1); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4207 varnumber_T arg1 = tv1->vval.v_number; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4208 varnumber_T arg2 = tv2->vval.v_number; |
|
25545
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4209 varnumber_T res = 0; |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4210 int div_zero = FALSE; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4211 |
|
28962
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4212 if (iptr->isn_arg.op.op_type == EXPR_LSHIFT |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4213 || iptr->isn_arg.op.op_type == EXPR_RSHIFT) |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4214 { |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4215 if (arg2 < 0) |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4216 { |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4217 SOURCING_LNUM = iptr->isn_lnum; |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4218 emsg(_(e_bitshift_ops_must_be_postive)); |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4219 goto on_error; |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4220 } |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4221 } |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4222 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4223 switch (iptr->isn_arg.op.op_type) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4224 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4225 case EXPR_MULT: res = arg1 * arg2; break; |
|
25545
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4226 case EXPR_DIV: if (arg2 == 0) |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4227 div_zero = TRUE; |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4228 else |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4229 res = arg1 / arg2; |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4230 break; |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4231 case EXPR_REM: if (arg2 == 0) |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4232 div_zero = TRUE; |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4233 else |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4234 res = arg1 % arg2; |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4235 break; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4236 case EXPR_SUB: res = arg1 - arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4237 case EXPR_ADD: res = arg1 + arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4238 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4239 case EXPR_EQUAL: res = arg1 == arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4240 case EXPR_NEQUAL: res = arg1 != arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4241 case EXPR_GREATER: res = arg1 > arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4242 case EXPR_GEQUAL: res = arg1 >= arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4243 case EXPR_SMALLER: res = arg1 < arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4244 case EXPR_SEQUAL: res = arg1 <= arg2; break; |
|
28962
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4245 case EXPR_LSHIFT: if (arg2 > MAX_LSHIFT_BITS) |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4246 res = 0; |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4247 else |
|
28968
3043a3e2ef95
patch 8.2.5006: asan warns for undefined behavior
Bram Moolenaar <Bram@vim.org>
parents:
28964
diff
changeset
|
4248 res = (uvarnumber_T)arg1 << arg2; |
|
28962
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4249 break; |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4250 case EXPR_RSHIFT: if (arg2 > MAX_LSHIFT_BITS) |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4251 res = 0; |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4252 else |
|
28964
8973f2f00872
patch 8.2.5004: right shift on negative number does not work as documented
Bram Moolenaar <Bram@vim.org>
parents:
28962
diff
changeset
|
4253 res = (uvarnumber_T)arg1 >> arg2; |
|
28962
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
4254 break; |
|
25545
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4255 default: break; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4256 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4257 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4258 --ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4259 if (iptr->isn_type == ISN_COMPARENR) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4260 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4261 tv1->v_type = VAR_BOOL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4262 tv1->vval.v_number = res ? VVAL_TRUE : VVAL_FALSE; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4263 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4264 else |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4265 tv1->vval.v_number = res; |
|
25545
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4266 if (div_zero) |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4267 { |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4268 SOURCING_LNUM = iptr->isn_lnum; |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4269 emsg(_(e_divide_by_zero)); |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4270 goto on_error; |
|
08a0abcb46c1
patch 8.2.3309: Vim9: divide by zero causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
25543
diff
changeset
|
4271 } |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4272 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4273 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4274 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4275 // Computation with two float arguments |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4276 case ISN_OPFLOAT: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4277 case ISN_COMPAREFLOAT: |
|
19193
9f98957582d6
patch 8.2.0155: warnings from MinGW compiler; tests fail without +float
Bram Moolenaar <Bram@vim.org>
parents:
19191
diff
changeset
|
4278 #ifdef FEAT_FLOAT |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4279 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4280 typval_T *tv1 = STACK_TV_BOT(-2); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4281 typval_T *tv2 = STACK_TV_BOT(-1); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4282 float_T arg1 = tv1->vval.v_float; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4283 float_T arg2 = tv2->vval.v_float; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4284 float_T res = 0; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4285 int cmp = FALSE; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4286 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4287 switch (iptr->isn_arg.op.op_type) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4288 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4289 case EXPR_MULT: res = arg1 * arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4290 case EXPR_DIV: res = arg1 / arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4291 case EXPR_SUB: res = arg1 - arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4292 case EXPR_ADD: res = arg1 + arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4293 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4294 case EXPR_EQUAL: cmp = arg1 == arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4295 case EXPR_NEQUAL: cmp = arg1 != arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4296 case EXPR_GREATER: cmp = arg1 > arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4297 case EXPR_GEQUAL: cmp = arg1 >= arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4298 case EXPR_SMALLER: cmp = arg1 < arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4299 case EXPR_SEQUAL: cmp = arg1 <= arg2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4300 default: cmp = 0; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4301 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4302 --ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4303 if (iptr->isn_type == ISN_COMPAREFLOAT) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4304 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4305 tv1->v_type = VAR_BOOL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4306 tv1->vval.v_number = cmp ? VVAL_TRUE : VVAL_FALSE; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4307 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4308 else |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4309 tv1->vval.v_float = res; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4310 } |
|
19193
9f98957582d6
patch 8.2.0155: warnings from MinGW compiler; tests fail without +float
Bram Moolenaar <Bram@vim.org>
parents:
19191
diff
changeset
|
4311 #endif |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4312 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4313 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4314 case ISN_COMPARELIST: |
|
26644
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4315 case ISN_COMPAREDICT: |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4316 case ISN_COMPAREFUNC: |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4317 case ISN_COMPARESTRING: |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4318 case ISN_COMPAREBLOB: |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4319 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4320 typval_T *tv1 = STACK_TV_BOT(-2); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4321 typval_T *tv2 = STACK_TV_BOT(-1); |
|
26644
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4322 exprtype_T exprtype = iptr->isn_arg.op.op_type; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4323 int ic = iptr->isn_arg.op.op_ic; |
|
26644
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4324 int res = FALSE; |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4325 int status = OK; |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4326 |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4327 SOURCING_LNUM = iptr->isn_lnum; |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4328 if (iptr->isn_type == ISN_COMPARELIST) |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4329 { |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4330 status = typval_compare_list(tv1, tv2, |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4331 exprtype, ic, &res); |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4332 } |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4333 else if (iptr->isn_type == ISN_COMPAREDICT) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4334 { |
|
26644
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4335 status = typval_compare_dict(tv1, tv2, |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4336 exprtype, ic, &res); |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4337 } |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4338 else if (iptr->isn_type == ISN_COMPAREFUNC) |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4339 { |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4340 status = typval_compare_func(tv1, tv2, |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4341 exprtype, ic, &res); |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4342 } |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4343 else if (iptr->isn_type == ISN_COMPARESTRING) |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4344 { |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4345 status = typval_compare_string(tv1, tv2, |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4346 exprtype, ic, &res); |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4347 } |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4348 else |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4349 { |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4350 status = typval_compare_blob(tv1, tv2, exprtype, &res); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4351 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4352 --ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4353 clear_tv(tv1); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4354 clear_tv(tv2); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4355 tv1->v_type = VAR_BOOL; |
|
26644
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4356 tv1->vval.v_number = res ? VVAL_TRUE : VVAL_FALSE; |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4357 if (status == FAIL) |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4358 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4359 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4360 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4361 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4362 case ISN_COMPAREANY: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4363 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4364 typval_T *tv1 = STACK_TV_BOT(-2); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4365 typval_T *tv2 = STACK_TV_BOT(-1); |
|
23553
5c094273c015
patch 8.2.2319: "exptype_T" can be read as "expected type"
Bram Moolenaar <Bram@vim.org>
parents:
23551
diff
changeset
|
4366 exprtype_T exprtype = iptr->isn_arg.op.op_type; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4367 int ic = iptr->isn_arg.op.op_ic; |
|
26644
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4368 int status; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4369 |
|
22262
3f082bd15d29
patch 8.2.1680: Vim9: line number for compare error is wrong
Bram Moolenaar <Bram@vim.org>
parents:
22238
diff
changeset
|
4370 SOURCING_LNUM = iptr->isn_lnum; |
|
26644
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4371 status = typval_compare(tv1, tv2, exprtype, ic); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4372 clear_tv(tv2); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4373 --ectx->ec_stack.ga_len; |
|
26644
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4374 if (status == FAIL) |
|
2fc1e528e0e1
patch 8.2.3851: Vim9: overhead when comparing string, dict or function
Bram Moolenaar <Bram@vim.org>
parents:
26626
diff
changeset
|
4375 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4376 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4377 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4378 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4379 case ISN_ADDLIST: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4380 case ISN_ADDBLOB: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4381 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4382 typval_T *tv1 = STACK_TV_BOT(-2); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4383 typval_T *tv2 = STACK_TV_BOT(-1); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4384 |
|
22633
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4385 // add two lists or blobs |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4386 if (iptr->isn_type == ISN_ADDLIST) |
|
25776
f31cf0388eab
patch 8.2.3423: Vim9: list += list creates a new list in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25719
diff
changeset
|
4387 { |
|
f31cf0388eab
patch 8.2.3423: Vim9: list += list creates a new list in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25719
diff
changeset
|
4388 if (iptr->isn_arg.op.op_type == EXPR_APPEND |
|
f31cf0388eab
patch 8.2.3423: Vim9: list += list creates a new list in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25719
diff
changeset
|
4389 && tv1->vval.v_list != NULL) |
|
f31cf0388eab
patch 8.2.3423: Vim9: list += list creates a new list in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25719
diff
changeset
|
4390 list_extend(tv1->vval.v_list, tv2->vval.v_list, |
|
f31cf0388eab
patch 8.2.3423: Vim9: list += list creates a new list in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25719
diff
changeset
|
4391 NULL); |
|
f31cf0388eab
patch 8.2.3423: Vim9: list += list creates a new list in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25719
diff
changeset
|
4392 else |
|
f31cf0388eab
patch 8.2.3423: Vim9: list += list creates a new list in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25719
diff
changeset
|
4393 eval_addlist(tv1, tv2); |
|
f31cf0388eab
patch 8.2.3423: Vim9: list += list creates a new list in :def function
Bram Moolenaar <Bram@vim.org>
parents:
25719
diff
changeset
|
4394 } |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4395 else |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4396 eval_addblob(tv1, tv2); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4397 clear_tv(tv2); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4398 --ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4399 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4400 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4401 |
|
22633
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4402 case ISN_LISTAPPEND: |
|
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4403 { |
|
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4404 typval_T *tv1 = STACK_TV_BOT(-2); |
|
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4405 typval_T *tv2 = STACK_TV_BOT(-1); |
|
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4406 list_T *l = tv1->vval.v_list; |
|
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4407 |
|
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4408 // add an item to a list |
|
26891
902b8bee5254
patch 8.2.3974: Vim9: LISTAPPEND instruction does not check for a locked list
Bram Moolenaar <Bram@vim.org>
parents:
26883
diff
changeset
|
4409 SOURCING_LNUM = iptr->isn_lnum; |
|
22633
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4410 if (l == NULL) |
|
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4411 { |
|
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4412 emsg(_(e_cannot_add_to_null_list)); |
|
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4413 goto on_error; |
|
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4414 } |
|
26891
902b8bee5254
patch 8.2.3974: Vim9: LISTAPPEND instruction does not check for a locked list
Bram Moolenaar <Bram@vim.org>
parents:
26883
diff
changeset
|
4415 if (value_check_lock(l->lv_lock, NULL, FALSE)) |
|
902b8bee5254
patch 8.2.3974: Vim9: LISTAPPEND instruction does not check for a locked list
Bram Moolenaar <Bram@vim.org>
parents:
26883
diff
changeset
|
4416 goto on_error; |
|
22633
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4417 if (list_append_tv(l, tv2) == FAIL) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
4418 goto theend; |
|
22641
6dce588f7a46
patch 8.2.1869: Vim9: memory leak when using add()
Bram Moolenaar <Bram@vim.org>
parents:
22637
diff
changeset
|
4419 clear_tv(tv2); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4420 --ectx->ec_stack.ga_len; |
|
22633
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4421 } |
|
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4422 break; |
|
6589dae9696c
patch 8.2.1865: Vim9: add() does not check type of argument
Bram Moolenaar <Bram@vim.org>
parents:
22623
diff
changeset
|
4423 |
|
22637
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4424 case ISN_BLOBAPPEND: |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4425 { |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4426 typval_T *tv1 = STACK_TV_BOT(-2); |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4427 typval_T *tv2 = STACK_TV_BOT(-1); |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4428 blob_T *b = tv1->vval.v_blob; |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4429 int error = FALSE; |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4430 varnumber_T n; |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4431 |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4432 // add a number to a blob |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4433 if (b == NULL) |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4434 { |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4435 SOURCING_LNUM = iptr->isn_lnum; |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4436 emsg(_(e_cannot_add_to_null_blob)); |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4437 goto on_error; |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4438 } |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4439 n = tv_get_number_chk(tv2, &error); |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4440 if (error) |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4441 goto on_error; |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4442 ga_append(&b->bv_ga, (int)n); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4443 --ectx->ec_stack.ga_len; |
|
22637
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4444 } |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4445 break; |
|
4d4042683371
patch 8.2.1867: Vim9: argument to add() not checked for blob
Bram Moolenaar <Bram@vim.org>
parents:
22633
diff
changeset
|
4446 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4447 // Computation with two arguments of unknown type |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4448 case ISN_OPANY: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4449 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4450 typval_T *tv1 = STACK_TV_BOT(-2); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4451 typval_T *tv2 = STACK_TV_BOT(-1); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4452 varnumber_T n1, n2; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4453 #ifdef FEAT_FLOAT |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4454 float_T f1 = 0, f2 = 0; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4455 #endif |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4456 int error = FALSE; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4457 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4458 if (iptr->isn_arg.op.op_type == EXPR_ADD) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4459 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4460 if (tv1->v_type == VAR_LIST && tv2->v_type == VAR_LIST) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4461 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4462 eval_addlist(tv1, tv2); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4463 clear_tv(tv2); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4464 --ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4465 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4466 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4467 else if (tv1->v_type == VAR_BLOB |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4468 && tv2->v_type == VAR_BLOB) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4469 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4470 eval_addblob(tv1, tv2); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4471 clear_tv(tv2); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4472 --ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4473 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4474 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4475 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4476 #ifdef FEAT_FLOAT |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4477 if (tv1->v_type == VAR_FLOAT) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4478 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4479 f1 = tv1->vval.v_float; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4480 n1 = 0; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4481 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4482 else |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4483 #endif |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4484 { |
|
23100
9c3a6c33c0e5
patch 8.2.2096: Vim9: command modifiers not restored after assignment
Bram Moolenaar <Bram@vim.org>
parents:
23098
diff
changeset
|
4485 SOURCING_LNUM = iptr->isn_lnum; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4486 n1 = tv_get_number_chk(tv1, &error); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4487 if (error) |
|
21375
92e2ed2a2778
patch 8.2.1238: Vim9: a few remaining errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21371
diff
changeset
|
4488 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4489 #ifdef FEAT_FLOAT |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4490 if (tv2->v_type == VAR_FLOAT) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4491 f1 = n1; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4492 #endif |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4493 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4494 #ifdef FEAT_FLOAT |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4495 if (tv2->v_type == VAR_FLOAT) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4496 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4497 f2 = tv2->vval.v_float; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4498 n2 = 0; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4499 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4500 else |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4501 #endif |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4502 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4503 n2 = tv_get_number_chk(tv2, &error); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4504 if (error) |
|
21375
92e2ed2a2778
patch 8.2.1238: Vim9: a few remaining errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21371
diff
changeset
|
4505 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4506 #ifdef FEAT_FLOAT |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4507 if (tv1->v_type == VAR_FLOAT) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4508 f2 = n2; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4509 #endif |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4510 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4511 #ifdef FEAT_FLOAT |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4512 // if there is a float on either side the result is a float |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4513 if (tv1->v_type == VAR_FLOAT || tv2->v_type == VAR_FLOAT) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4514 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4515 switch (iptr->isn_arg.op.op_type) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4516 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4517 case EXPR_MULT: f1 = f1 * f2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4518 case EXPR_DIV: f1 = f1 / f2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4519 case EXPR_SUB: f1 = f1 - f2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4520 case EXPR_ADD: f1 = f1 + f2; break; |
|
21793
0706bd071fa3
patch 8.2.1446: Vim9: line number in error message is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21789
diff
changeset
|
4521 default: SOURCING_LNUM = iptr->isn_lnum; |
|
26877
06a137af96f8
patch 8.2.3967: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26865
diff
changeset
|
4522 emsg(_(e_cannot_use_percent_with_float)); |
|
21365
fca850f4d603
patch 8.2.1233: Vim9: various errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21359
diff
changeset
|
4523 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4524 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4525 clear_tv(tv1); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4526 clear_tv(tv2); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4527 tv1->v_type = VAR_FLOAT; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4528 tv1->vval.v_float = f1; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4529 --ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4530 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4531 else |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4532 #endif |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4533 { |
|
23681
423af0f7beae
patch 8.2.2382: build failure
Bram Moolenaar <Bram@vim.org>
parents:
23673
diff
changeset
|
4534 int failed = FALSE; |
|
423af0f7beae
patch 8.2.2382: build failure
Bram Moolenaar <Bram@vim.org>
parents:
23673
diff
changeset
|
4535 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4536 switch (iptr->isn_arg.op.op_type) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4537 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4538 case EXPR_MULT: n1 = n1 * n2; break; |
|
23681
423af0f7beae
patch 8.2.2382: build failure
Bram Moolenaar <Bram@vim.org>
parents:
23673
diff
changeset
|
4539 case EXPR_DIV: n1 = num_divide(n1, n2, &failed); |
|
423af0f7beae
patch 8.2.2382: build failure
Bram Moolenaar <Bram@vim.org>
parents:
23673
diff
changeset
|
4540 if (failed) |
|
23673
6d35bc0f161e
patch 8.2.2378: Vim9: no error message for dividing by zero
Bram Moolenaar <Bram@vim.org>
parents:
23671
diff
changeset
|
4541 goto on_error; |
|
6d35bc0f161e
patch 8.2.2378: Vim9: no error message for dividing by zero
Bram Moolenaar <Bram@vim.org>
parents:
23671
diff
changeset
|
4542 break; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4543 case EXPR_SUB: n1 = n1 - n2; break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4544 case EXPR_ADD: n1 = n1 + n2; break; |
|
23681
423af0f7beae
patch 8.2.2382: build failure
Bram Moolenaar <Bram@vim.org>
parents:
23673
diff
changeset
|
4545 default: n1 = num_modulus(n1, n2, &failed); |
|
423af0f7beae
patch 8.2.2382: build failure
Bram Moolenaar <Bram@vim.org>
parents:
23673
diff
changeset
|
4546 if (failed) |
|
23673
6d35bc0f161e
patch 8.2.2378: Vim9: no error message for dividing by zero
Bram Moolenaar <Bram@vim.org>
parents:
23671
diff
changeset
|
4547 goto on_error; |
|
6d35bc0f161e
patch 8.2.2378: Vim9: no error message for dividing by zero
Bram Moolenaar <Bram@vim.org>
parents:
23671
diff
changeset
|
4548 break; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4549 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4550 clear_tv(tv1); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4551 clear_tv(tv2); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4552 tv1->v_type = VAR_NUMBER; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4553 tv1->vval.v_number = n1; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4554 --ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4555 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4556 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4557 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4558 |
|
21393
320581a133d9
patch 8.2.1247: Vim9: cannot index a character in a string
Bram Moolenaar <Bram@vim.org>
parents:
21383
diff
changeset
|
4559 case ISN_STRINDEX: |
|
21826
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4560 case ISN_STRSLICE: |
|
21393
320581a133d9
patch 8.2.1247: Vim9: cannot index a character in a string
Bram Moolenaar <Bram@vim.org>
parents:
21383
diff
changeset
|
4561 { |
|
21826
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4562 int is_slice = iptr->isn_type == ISN_STRSLICE; |
|
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4563 varnumber_T n1 = 0, n2; |
|
21393
320581a133d9
patch 8.2.1247: Vim9: cannot index a character in a string
Bram Moolenaar <Bram@vim.org>
parents:
21383
diff
changeset
|
4564 char_u *res; |
|
320581a133d9
patch 8.2.1247: Vim9: cannot index a character in a string
Bram Moolenaar <Bram@vim.org>
parents:
21383
diff
changeset
|
4565 |
|
320581a133d9
patch 8.2.1247: Vim9: cannot index a character in a string
Bram Moolenaar <Bram@vim.org>
parents:
21383
diff
changeset
|
4566 // string index: string is at stack-2, index at stack-1 |
|
21826
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4567 // string slice: string is at stack-3, first index at |
|
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4568 // stack-2, second index at stack-1 |
|
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4569 if (is_slice) |
|
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4570 { |
|
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4571 tv = STACK_TV_BOT(-2); |
|
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4572 n1 = tv->vval.v_number; |
|
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4573 } |
|
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4574 |
|
21393
320581a133d9
patch 8.2.1247: Vim9: cannot index a character in a string
Bram Moolenaar <Bram@vim.org>
parents:
21383
diff
changeset
|
4575 tv = STACK_TV_BOT(-1); |
|
21826
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4576 n2 = tv->vval.v_number; |
|
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4577 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4578 ectx->ec_stack.ga_len -= is_slice ? 2 : 1; |
|
21393
320581a133d9
patch 8.2.1247: Vim9: cannot index a character in a string
Bram Moolenaar <Bram@vim.org>
parents:
21383
diff
changeset
|
4579 tv = STACK_TV_BOT(-1); |
|
21826
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4580 if (is_slice) |
|
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4581 // Slice: Select the characters from the string |
|
23604
1816ea68c022
patch 8.2.2344: using inclusive index for slice is not always desired
Bram Moolenaar <Bram@vim.org>
parents:
23582
diff
changeset
|
4582 res = string_slice(tv->vval.v_string, n1, n2, FALSE); |
|
21826
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4583 else |
|
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4584 // Index: The resulting variable is a string of a |
|
24128
fcbb1d4df15b
patch 8.2.2605: Vim9: string index and slice does not include composing chars
Bram Moolenaar <Bram@vim.org>
parents:
24122
diff
changeset
|
4585 // single character (including composing characters). |
|
fcbb1d4df15b
patch 8.2.2605: Vim9: string index and slice does not include composing chars
Bram Moolenaar <Bram@vim.org>
parents:
24122
diff
changeset
|
4586 // If the index is too big or negative the result is |
|
fcbb1d4df15b
patch 8.2.2605: Vim9: string index and slice does not include composing chars
Bram Moolenaar <Bram@vim.org>
parents:
24122
diff
changeset
|
4587 // empty. |
|
21826
ccad66ac6c3e
patch 8.2.1462: Vim9: string slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21823
diff
changeset
|
4588 res = char_from_string(tv->vval.v_string, n2); |
|
21393
320581a133d9
patch 8.2.1247: Vim9: cannot index a character in a string
Bram Moolenaar <Bram@vim.org>
parents:
21383
diff
changeset
|
4589 vim_free(tv->vval.v_string); |
|
320581a133d9
patch 8.2.1247: Vim9: cannot index a character in a string
Bram Moolenaar <Bram@vim.org>
parents:
21383
diff
changeset
|
4590 tv->vval.v_string = res; |
|
320581a133d9
patch 8.2.1247: Vim9: cannot index a character in a string
Bram Moolenaar <Bram@vim.org>
parents:
21383
diff
changeset
|
4591 } |
|
320581a133d9
patch 8.2.1247: Vim9: cannot index a character in a string
Bram Moolenaar <Bram@vim.org>
parents:
21383
diff
changeset
|
4592 break; |
|
320581a133d9
patch 8.2.1247: Vim9: cannot index a character in a string
Bram Moolenaar <Bram@vim.org>
parents:
21383
diff
changeset
|
4593 |
|
320581a133d9
patch 8.2.1247: Vim9: cannot index a character in a string
Bram Moolenaar <Bram@vim.org>
parents:
21383
diff
changeset
|
4594 case ISN_LISTINDEX: |
|
21828
af5db9b6d210
patch 8.2.1463: Vim9: list slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21826
diff
changeset
|
4595 case ISN_LISTSLICE: |
|
24432
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4596 case ISN_BLOBINDEX: |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4597 case ISN_BLOBSLICE: |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4598 { |
|
24432
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4599 int is_slice = iptr->isn_type == ISN_LISTSLICE |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4600 || iptr->isn_type == ISN_BLOBSLICE; |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4601 int is_blob = iptr->isn_type == ISN_BLOBINDEX |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4602 || iptr->isn_type == ISN_BLOBSLICE; |
|
21828
af5db9b6d210
patch 8.2.1463: Vim9: list slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21826
diff
changeset
|
4603 varnumber_T n1, n2; |
|
24432
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4604 typval_T *val_tv; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4605 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4606 // list index: list is at stack-2, index at stack-1 |
|
21828
af5db9b6d210
patch 8.2.1463: Vim9: list slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21826
diff
changeset
|
4607 // list slice: list is at stack-3, indexes at stack-2 and |
|
af5db9b6d210
patch 8.2.1463: Vim9: list slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21826
diff
changeset
|
4608 // stack-1 |
|
24432
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4609 // Same for blob. |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4610 val_tv = is_slice ? STACK_TV_BOT(-3) : STACK_TV_BOT(-2); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4611 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4612 tv = STACK_TV_BOT(-1); |
|
21828
af5db9b6d210
patch 8.2.1463: Vim9: list slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21826
diff
changeset
|
4613 n1 = n2 = tv->vval.v_number; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4614 clear_tv(tv); |
|
21828
af5db9b6d210
patch 8.2.1463: Vim9: list slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21826
diff
changeset
|
4615 |
|
af5db9b6d210
patch 8.2.1463: Vim9: list slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21826
diff
changeset
|
4616 if (is_slice) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4617 { |
|
21828
af5db9b6d210
patch 8.2.1463: Vim9: list slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21826
diff
changeset
|
4618 tv = STACK_TV_BOT(-2); |
|
af5db9b6d210
patch 8.2.1463: Vim9: list slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21826
diff
changeset
|
4619 n1 = tv->vval.v_number; |
|
af5db9b6d210
patch 8.2.1463: Vim9: list slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21826
diff
changeset
|
4620 clear_tv(tv); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4621 } |
|
21828
af5db9b6d210
patch 8.2.1463: Vim9: list slice not supported yet
Bram Moolenaar <Bram@vim.org>
parents:
21826
diff
changeset
|
4622 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4623 ectx->ec_stack.ga_len -= is_slice ? 2 : 1; |
|
21166
64f664f9b23a
patch 8.2.1134: Vim9: getting a list member may not work
Bram Moolenaar <Bram@vim.org>
parents:
21152
diff
changeset
|
4624 tv = STACK_TV_BOT(-1); |
|
21859
3e5d0832a2e7
patch 8.2.1479: Vim9: error for list index uses wrong line number
Bram Moolenaar <Bram@vim.org>
parents:
21835
diff
changeset
|
4625 SOURCING_LNUM = iptr->isn_lnum; |
|
24432
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4626 if (is_blob) |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4627 { |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4628 if (blob_slice_or_index(val_tv->vval.v_blob, is_slice, |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4629 n1, n2, FALSE, tv) == FAIL) |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4630 goto on_error; |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4631 } |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4632 else |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4633 { |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4634 if (list_slice_or_index(val_tv->vval.v_list, is_slice, |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4635 n1, n2, FALSE, tv, TRUE) == FAIL) |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4636 goto on_error; |
|
aa150abca273
patch 8.2.2756: Vim9: blob index and slice not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
24416
diff
changeset
|
4637 } |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4638 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4639 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4640 |
|
21833
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4641 case ISN_ANYINDEX: |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4642 case ISN_ANYSLICE: |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4643 { |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4644 int is_slice = iptr->isn_type == ISN_ANYSLICE; |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4645 typval_T *var1, *var2; |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4646 int res; |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4647 |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4648 // index: composite is at stack-2, index at stack-1 |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4649 // slice: composite is at stack-3, indexes at stack-2 and |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4650 // stack-1 |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4651 tv = is_slice ? STACK_TV_BOT(-3) : STACK_TV_BOT(-2); |
|
21863
809b1e7fbd72
patch 8.2.1481: Vim9: line number reported with error may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
21859
diff
changeset
|
4652 SOURCING_LNUM = iptr->isn_lnum; |
|
21833
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4653 if (check_can_index(tv, TRUE, TRUE) == FAIL) |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4654 goto on_error; |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4655 var1 = is_slice ? STACK_TV_BOT(-2) : STACK_TV_BOT(-1); |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4656 var2 = is_slice ? STACK_TV_BOT(-1) : NULL; |
|
23604
1816ea68c022
patch 8.2.2344: using inclusive index for slice is not always desired
Bram Moolenaar <Bram@vim.org>
parents:
23582
diff
changeset
|
4657 res = eval_index_inner(tv, is_slice, var1, var2, |
|
1816ea68c022
patch 8.2.2344: using inclusive index for slice is not always desired
Bram Moolenaar <Bram@vim.org>
parents:
23582
diff
changeset
|
4658 FALSE, NULL, -1, TRUE); |
|
21833
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4659 clear_tv(var1); |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4660 if (is_slice) |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4661 clear_tv(var2); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4662 ectx->ec_stack.ga_len -= is_slice ? 2 : 1; |
|
21833
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4663 if (res == FAIL) |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4664 goto on_error; |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4665 } |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4666 break; |
|
e3f9528bddda
patch 8.2.1466: Vim9: cannot index or slice a variable with type "any"
Bram Moolenaar <Bram@vim.org>
parents:
21831
diff
changeset
|
4667 |
|
20871
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4668 case ISN_SLICE: |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4669 { |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4670 list_T *list; |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4671 int count = iptr->isn_arg.number; |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4672 |
|
20915
a3853794a768
patch 8.2.1009: Vim9: some failures not checked for
Bram Moolenaar <Bram@vim.org>
parents:
20871
diff
changeset
|
4673 // type will have been checked to be a list |
|
20871
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4674 tv = STACK_TV_BOT(-1); |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4675 list = tv->vval.v_list; |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4676 |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4677 // no error for short list, expect it to be checked earlier |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4678 if (list != NULL && list->lv_len >= count) |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4679 { |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4680 list_T *newlist = list_slice(list, |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4681 count, list->lv_len - 1); |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4682 |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4683 if (newlist != NULL) |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4684 { |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4685 list_unref(list); |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4686 tv->vval.v_list = newlist; |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4687 ++newlist->lv_refcount; |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4688 } |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4689 } |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4690 } |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4691 break; |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4692 |
|
20859
876e16c48bd1
patch 8.2.0981: Vim9: cannot compile "[var, var] = list"
Bram Moolenaar <Bram@vim.org>
parents:
20538
diff
changeset
|
4693 case ISN_GETITEM: |
|
876e16c48bd1
patch 8.2.0981: Vim9: cannot compile "[var, var] = list"
Bram Moolenaar <Bram@vim.org>
parents:
20538
diff
changeset
|
4694 { |
|
876e16c48bd1
patch 8.2.0981: Vim9: cannot compile "[var, var] = list"
Bram Moolenaar <Bram@vim.org>
parents:
20538
diff
changeset
|
4695 listitem_T *li; |
|
24984
71b1e2ef0069
patch 8.2.3029: Vim9: crash when using operator and list unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
24980
diff
changeset
|
4696 getitem_T *gi = &iptr->isn_arg.getitem; |
|
20859
876e16c48bd1
patch 8.2.0981: Vim9: cannot compile "[var, var] = list"
Bram Moolenaar <Bram@vim.org>
parents:
20538
diff
changeset
|
4697 |
|
20919
96bf2b304932
patch 8.2.1011: Vim9: some code not tested
Bram Moolenaar <Bram@vim.org>
parents:
20915
diff
changeset
|
4698 // Get list item: list is at stack-1, push item. |
|
96bf2b304932
patch 8.2.1011: Vim9: some code not tested
Bram Moolenaar <Bram@vim.org>
parents:
20915
diff
changeset
|
4699 // List type and length is checked for when compiling. |
|
24984
71b1e2ef0069
patch 8.2.3029: Vim9: crash when using operator and list unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
24980
diff
changeset
|
4700 tv = STACK_TV_BOT(-1 - gi->gi_with_op); |
|
71b1e2ef0069
patch 8.2.3029: Vim9: crash when using operator and list unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
24980
diff
changeset
|
4701 li = list_find(tv->vval.v_list, gi->gi_index); |
|
20859
876e16c48bd1
patch 8.2.0981: Vim9: cannot compile "[var, var] = list"
Bram Moolenaar <Bram@vim.org>
parents:
20538
diff
changeset
|
4702 |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
4703 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
4704 goto theend; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4705 ++ectx->ec_stack.ga_len; |
|
20859
876e16c48bd1
patch 8.2.0981: Vim9: cannot compile "[var, var] = list"
Bram Moolenaar <Bram@vim.org>
parents:
20538
diff
changeset
|
4706 copy_tv(&li->li_tv, STACK_TV_BOT(-1)); |
|
23917
4b417b776b95
patch 8.2.2501: not always clear where an error is reported
Bram Moolenaar <Bram@vim.org>
parents:
23839
diff
changeset
|
4707 |
|
4b417b776b95
patch 8.2.2501: not always clear where an error is reported
Bram Moolenaar <Bram@vim.org>
parents:
23839
diff
changeset
|
4708 // Useful when used in unpack assignment. Reset at |
|
4b417b776b95
patch 8.2.2501: not always clear where an error is reported
Bram Moolenaar <Bram@vim.org>
parents:
23839
diff
changeset
|
4709 // ISN_DROP. |
|
24984
71b1e2ef0069
patch 8.2.3029: Vim9: crash when using operator and list unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
24980
diff
changeset
|
4710 ectx->ec_where.wt_index = gi->gi_index + 1; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4711 ectx->ec_where.wt_variable = TRUE; |
|
20859
876e16c48bd1
patch 8.2.0981: Vim9: cannot compile "[var, var] = list"
Bram Moolenaar <Bram@vim.org>
parents:
20538
diff
changeset
|
4712 } |
|
876e16c48bd1
patch 8.2.0981: Vim9: cannot compile "[var, var] = list"
Bram Moolenaar <Bram@vim.org>
parents:
20538
diff
changeset
|
4713 break; |
|
876e16c48bd1
patch 8.2.0981: Vim9: cannot compile "[var, var] = list"
Bram Moolenaar <Bram@vim.org>
parents:
20538
diff
changeset
|
4714 |
|
20349
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4715 case ISN_MEMBER: |
|
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4716 { |
|
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4717 dict_T *dict; |
|
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4718 char_u *key; |
|
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4719 dictitem_T *di; |
|
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4720 |
|
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4721 // dict member: dict is at stack-2, key at stack-1 |
|
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4722 tv = STACK_TV_BOT(-2); |
|
20411
23af9e1a5283
patch 8.2.0760: Vim9: dict member errors not tested
Bram Moolenaar <Bram@vim.org>
parents:
20409
diff
changeset
|
4723 // no need to check for VAR_DICT, CHECKTYPE will check. |
|
20349
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4724 dict = tv->vval.v_dict; |
|
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4725 |
|
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4726 tv = STACK_TV_BOT(-1); |
|
20411
23af9e1a5283
patch 8.2.0760: Vim9: dict member errors not tested
Bram Moolenaar <Bram@vim.org>
parents:
20409
diff
changeset
|
4727 // no need to check for VAR_STRING, 2STRING will check. |
|
20349
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4728 key = tv->vval.v_string; |
|
22752
84fca115b1bb
patch 8.2.1924: Vim9: crash when indexing dict with NULL key
Bram Moolenaar <Bram@vim.org>
parents:
22742
diff
changeset
|
4729 if (key == NULL) |
|
84fca115b1bb
patch 8.2.1924: Vim9: crash when indexing dict with NULL key
Bram Moolenaar <Bram@vim.org>
parents:
22742
diff
changeset
|
4730 key = (char_u *)""; |
|
20411
23af9e1a5283
patch 8.2.0760: Vim9: dict member errors not tested
Bram Moolenaar <Bram@vim.org>
parents:
20409
diff
changeset
|
4731 |
|
20349
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4732 if ((di = dict_find(dict, key, -1)) == NULL) |
|
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4733 { |
|
21793
0706bd071fa3
patch 8.2.1446: Vim9: line number in error message is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21789
diff
changeset
|
4734 SOURCING_LNUM = iptr->isn_lnum; |
|
26877
06a137af96f8
patch 8.2.3967: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26865
diff
changeset
|
4735 semsg(_(e_key_not_present_in_dictionary), key); |
|
23098
bdafc132a4a1
patch 8.2.2095: Vim9: crash when failed dict member is followed by concat
Bram Moolenaar <Bram@vim.org>
parents:
23074
diff
changeset
|
4736 |
|
bdafc132a4a1
patch 8.2.2095: Vim9: crash when failed dict member is followed by concat
Bram Moolenaar <Bram@vim.org>
parents:
23074
diff
changeset
|
4737 // If :silent! is used we will continue, make sure the |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4738 // stack contents makes sense and the dict stack is |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4739 // updated. |
|
23098
bdafc132a4a1
patch 8.2.2095: Vim9: crash when failed dict member is followed by concat
Bram Moolenaar <Bram@vim.org>
parents:
23074
diff
changeset
|
4740 clear_tv(tv); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4741 --ectx->ec_stack.ga_len; |
|
23098
bdafc132a4a1
patch 8.2.2095: Vim9: crash when failed dict member is followed by concat
Bram Moolenaar <Bram@vim.org>
parents:
23074
diff
changeset
|
4742 tv = STACK_TV_BOT(-1); |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4743 (void) dict_stack_save(tv); |
|
23098
bdafc132a4a1
patch 8.2.2095: Vim9: crash when failed dict member is followed by concat
Bram Moolenaar <Bram@vim.org>
parents:
23074
diff
changeset
|
4744 tv->v_type = VAR_NUMBER; |
|
bdafc132a4a1
patch 8.2.2095: Vim9: crash when failed dict member is followed by concat
Bram Moolenaar <Bram@vim.org>
parents:
23074
diff
changeset
|
4745 tv->vval.v_number = 0; |
|
23074
cd885eb0e50c
patch 8.2.2083: Vim9: crash when using ":silent!" and getting member fails
Bram Moolenaar <Bram@vim.org>
parents:
23009
diff
changeset
|
4746 goto on_fatal_error; |
|
20349
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4747 } |
|
21168
f26a606e6dbc
patch 8.2.1135: Vim9: getting a dict member may not work
Bram Moolenaar <Bram@vim.org>
parents:
21166
diff
changeset
|
4748 clear_tv(tv); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4749 --ectx->ec_stack.ga_len; |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4750 // Put the dict used on the dict stack, it might be used by |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4751 // a dict function later. |
|
21168
f26a606e6dbc
patch 8.2.1135: Vim9: getting a dict member may not work
Bram Moolenaar <Bram@vim.org>
parents:
21166
diff
changeset
|
4752 tv = STACK_TV_BOT(-1); |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4753 if (dict_stack_save(tv) == FAIL) |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4754 goto on_fatal_error; |
|
21168
f26a606e6dbc
patch 8.2.1135: Vim9: getting a dict member may not work
Bram Moolenaar <Bram@vim.org>
parents:
21166
diff
changeset
|
4755 copy_tv(&di->di_tv, tv); |
|
20349
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4756 } |
|
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4757 break; |
|
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4758 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4759 // dict member with string key |
|
20349
e29b2ec8d4d2
patch 8.2.0730: Vim9: Assignment to dict member does not work
Bram Moolenaar <Bram@vim.org>
parents:
20341
diff
changeset
|
4760 case ISN_STRINGMEMBER: |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4761 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4762 dict_T *dict; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4763 dictitem_T *di; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4764 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4765 tv = STACK_TV_BOT(-1); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4766 if (tv->v_type != VAR_DICT || tv->vval.v_dict == NULL) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4767 { |
|
21793
0706bd071fa3
patch 8.2.1446: Vim9: line number in error message is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21789
diff
changeset
|
4768 SOURCING_LNUM = iptr->isn_lnum; |
|
26877
06a137af96f8
patch 8.2.3967: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26865
diff
changeset
|
4769 emsg(_(e_dictionary_required)); |
|
21375
92e2ed2a2778
patch 8.2.1238: Vim9: a few remaining errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21371
diff
changeset
|
4770 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4771 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4772 dict = tv->vval.v_dict; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4773 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4774 if ((di = dict_find(dict, iptr->isn_arg.string, -1)) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4775 == NULL) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4776 { |
|
21793
0706bd071fa3
patch 8.2.1446: Vim9: line number in error message is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21789
diff
changeset
|
4777 SOURCING_LNUM = iptr->isn_lnum; |
|
27517
f00a7a2bee21
patch 8.2.4286: Vim9: strict type checking after copy() and deepcopy()
Bram Moolenaar <Bram@vim.org>
parents:
27394
diff
changeset
|
4778 semsg(_(e_key_not_present_in_dictionary), |
|
f00a7a2bee21
patch 8.2.4286: Vim9: strict type checking after copy() and deepcopy()
Bram Moolenaar <Bram@vim.org>
parents:
27394
diff
changeset
|
4779 iptr->isn_arg.string); |
|
21375
92e2ed2a2778
patch 8.2.1238: Vim9: a few remaining errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21371
diff
changeset
|
4780 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4781 } |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4782 // Put the dict used on the dict stack, it might be used by |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4783 // a dict function later. |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4784 if (dict_stack_save(tv) == FAIL) |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4785 goto on_fatal_error; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4786 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4787 copy_tv(&di->di_tv, tv); |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4788 } |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4789 break; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4790 |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4791 case ISN_CLEARDICT: |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4792 dict_stack_drop(); |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4793 break; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4794 |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4795 case ISN_USEDICT: |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4796 { |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4797 typval_T *dict_tv = dict_stack_get_tv(); |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4798 |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4799 // Turn "dict.Func" into a partial for "Func" bound to |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4800 // "dict". Don't do this when "Func" is already a partial |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4801 // that was bound explicitly (pt_auto is FALSE). |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4802 tv = STACK_TV_BOT(-1); |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4803 if (dict_tv != NULL |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4804 && dict_tv->v_type == VAR_DICT |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4805 && dict_tv->vval.v_dict != NULL |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4806 && (tv->v_type == VAR_FUNC |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4807 || (tv->v_type == VAR_PARTIAL |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4808 && (tv->vval.v_partial->pt_auto |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4809 || tv->vval.v_partial->pt_dict == NULL)))) |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4810 dict_tv->vval.v_dict = |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4811 make_partial(dict_tv->vval.v_dict, tv); |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
4812 dict_stack_drop(); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4813 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4814 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4815 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4816 case ISN_NEGATENR: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4817 tv = STACK_TV_BOT(-1); |
|
27768
b081ba78675a
patch 8.2.4410: Vim9: some code not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
27766
diff
changeset
|
4818 // CHECKTYPE should have checked the variable type |
|
19842
e4ade28bfaf7
patch 8.2.0477: Vim9: error messages not tested
Bram Moolenaar <Bram@vim.org>
parents:
19766
diff
changeset
|
4819 #ifdef FEAT_FLOAT |
|
e4ade28bfaf7
patch 8.2.0477: Vim9: error messages not tested
Bram Moolenaar <Bram@vim.org>
parents:
19766
diff
changeset
|
4820 if (tv->v_type == VAR_FLOAT) |
|
e4ade28bfaf7
patch 8.2.0477: Vim9: error messages not tested
Bram Moolenaar <Bram@vim.org>
parents:
19766
diff
changeset
|
4821 tv->vval.v_float = -tv->vval.v_float; |
|
e4ade28bfaf7
patch 8.2.0477: Vim9: error messages not tested
Bram Moolenaar <Bram@vim.org>
parents:
19766
diff
changeset
|
4822 else |
|
e4ade28bfaf7
patch 8.2.0477: Vim9: error messages not tested
Bram Moolenaar <Bram@vim.org>
parents:
19766
diff
changeset
|
4823 #endif |
|
e4ade28bfaf7
patch 8.2.0477: Vim9: error messages not tested
Bram Moolenaar <Bram@vim.org>
parents:
19766
diff
changeset
|
4824 tv->vval.v_number = -tv->vval.v_number; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4825 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4826 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4827 case ISN_CHECKTYPE: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4828 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4829 checktype_T *ct = &iptr->isn_arg.type; |
|
28901
11609f025219
patch 8.2.4973: Vim9: type error for list unpack mentions argument
Bram Moolenaar <Bram@vim.org>
parents:
28809
diff
changeset
|
4830 int save_wt_variable = ectx->ec_where.wt_variable; |
|
28907
8f599b6d9f54
patch 8.2.4976: Coverity complains about not restoring a saved value
Bram Moolenaar <Bram@vim.org>
parents:
28901
diff
changeset
|
4831 int r; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4832 |
|
23697
19073a768852
patch 8.2.2390: Vim9: using positive offset is unexpected
Bram Moolenaar <Bram@vim.org>
parents:
23695
diff
changeset
|
4833 tv = STACK_TV_BOT((int)ct->ct_off); |
|
22284
6b385c2b9ff5
patch 8.2.1691: Vim9: list<any> is not accepted where list<number> is expected
Bram Moolenaar <Bram@vim.org>
parents:
22272
diff
changeset
|
4834 SOURCING_LNUM = iptr->isn_lnum; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4835 if (!ectx->ec_where.wt_variable) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4836 ectx->ec_where.wt_index = ct->ct_arg_idx; |
|
28901
11609f025219
patch 8.2.4973: Vim9: type error for list unpack mentions argument
Bram Moolenaar <Bram@vim.org>
parents:
28809
diff
changeset
|
4837 ectx->ec_where.wt_variable = ct->ct_is_var; |
|
28907
8f599b6d9f54
patch 8.2.4976: Coverity complains about not restoring a saved value
Bram Moolenaar <Bram@vim.org>
parents:
28901
diff
changeset
|
4838 r = check_typval_type(ct->ct_type, tv, ectx->ec_where); |
|
8f599b6d9f54
patch 8.2.4976: Coverity complains about not restoring a saved value
Bram Moolenaar <Bram@vim.org>
parents:
28901
diff
changeset
|
4839 ectx->ec_where.wt_variable = save_wt_variable; |
|
8f599b6d9f54
patch 8.2.4976: Coverity complains about not restoring a saved value
Bram Moolenaar <Bram@vim.org>
parents:
28901
diff
changeset
|
4840 if (r == FAIL) |
|
22284
6b385c2b9ff5
patch 8.2.1691: Vim9: list<any> is not accepted where list<number> is expected
Bram Moolenaar <Bram@vim.org>
parents:
22272
diff
changeset
|
4841 goto on_error; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4842 if (!ectx->ec_where.wt_variable) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4843 ectx->ec_where.wt_index = 0; |
|
22284
6b385c2b9ff5
patch 8.2.1691: Vim9: list<any> is not accepted where list<number> is expected
Bram Moolenaar <Bram@vim.org>
parents:
22272
diff
changeset
|
4844 |
|
6b385c2b9ff5
patch 8.2.1691: Vim9: list<any> is not accepted where list<number> is expected
Bram Moolenaar <Bram@vim.org>
parents:
22272
diff
changeset
|
4845 // number 0 is FALSE, number 1 is TRUE |
|
6b385c2b9ff5
patch 8.2.1691: Vim9: list<any> is not accepted where list<number> is expected
Bram Moolenaar <Bram@vim.org>
parents:
22272
diff
changeset
|
4846 if (tv->v_type == VAR_NUMBER |
|
6b385c2b9ff5
patch 8.2.1691: Vim9: list<any> is not accepted where list<number> is expected
Bram Moolenaar <Bram@vim.org>
parents:
22272
diff
changeset
|
4847 && ct->ct_type->tt_type == VAR_BOOL |
|
6b385c2b9ff5
patch 8.2.1691: Vim9: list<any> is not accepted where list<number> is expected
Bram Moolenaar <Bram@vim.org>
parents:
22272
diff
changeset
|
4848 && (tv->vval.v_number == 0 |
|
6b385c2b9ff5
patch 8.2.1691: Vim9: list<any> is not accepted where list<number> is expected
Bram Moolenaar <Bram@vim.org>
parents:
22272
diff
changeset
|
4849 || tv->vval.v_number == 1)) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4850 { |
|
22284
6b385c2b9ff5
patch 8.2.1691: Vim9: list<any> is not accepted where list<number> is expected
Bram Moolenaar <Bram@vim.org>
parents:
22272
diff
changeset
|
4851 tv->v_type = VAR_BOOL; |
|
6b385c2b9ff5
patch 8.2.1691: Vim9: list<any> is not accepted where list<number> is expected
Bram Moolenaar <Bram@vim.org>
parents:
22272
diff
changeset
|
4852 tv->vval.v_number = tv->vval.v_number |
|
22238
939f7184566f
patch 8.2.1668: Vim9: not accepting 0 or 1 as bool when type is any
Bram Moolenaar <Bram@vim.org>
parents:
22214
diff
changeset
|
4853 ? VVAL_TRUE : VVAL_FALSE; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4854 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4855 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4856 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4857 |
|
20871
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4858 case ISN_CHECKLEN: |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4859 { |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4860 int min_len = iptr->isn_arg.checklen.cl_min_len; |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4861 list_T *list = NULL; |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4862 |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4863 tv = STACK_TV_BOT(-1); |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4864 if (tv->v_type == VAR_LIST) |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4865 list = tv->vval.v_list; |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4866 if (list == NULL || list->lv_len < min_len |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4867 || (list->lv_len > min_len |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4868 && !iptr->isn_arg.checklen.cl_more_OK)) |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4869 { |
|
21793
0706bd071fa3
patch 8.2.1446: Vim9: line number in error message is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21789
diff
changeset
|
4870 SOURCING_LNUM = iptr->isn_lnum; |
|
21821
0deb6f96a5a3
patch 8.2.1460: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
21815
diff
changeset
|
4871 semsg(_(e_expected_nr_items_but_got_nr), |
|
20871
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4872 min_len, list == NULL ? 0 : list->lv_len); |
|
21365
fca850f4d603
patch 8.2.1233: Vim9: various errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21359
diff
changeset
|
4873 goto on_error; |
|
20871
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4874 } |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4875 } |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4876 break; |
|
65d9189d4dca
patch 8.2.0987: Vim9: cannot assign to [var; var]
Bram Moolenaar <Bram@vim.org>
parents:
20859
diff
changeset
|
4877 |
|
23458
d2b1269c2c68
patch 8.2.2272: Vim9: extend() can violate the type of a variable
Bram Moolenaar <Bram@vim.org>
parents:
23454
diff
changeset
|
4878 case ISN_SETTYPE: |
|
27517
f00a7a2bee21
patch 8.2.4286: Vim9: strict type checking after copy() and deepcopy()
Bram Moolenaar <Bram@vim.org>
parents:
27394
diff
changeset
|
4879 set_tv_type(STACK_TV_BOT(-1), iptr->isn_arg.type.ct_type); |
|
23458
d2b1269c2c68
patch 8.2.2272: Vim9: extend() can violate the type of a variable
Bram Moolenaar <Bram@vim.org>
parents:
23454
diff
changeset
|
4880 break; |
|
d2b1269c2c68
patch 8.2.2272: Vim9: extend() can violate the type of a variable
Bram Moolenaar <Bram@vim.org>
parents:
23454
diff
changeset
|
4881 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4882 case ISN_2BOOL: |
|
22494
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
4883 case ISN_COND2BOOL: |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4884 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4885 int n; |
|
22494
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
4886 int error = FALSE; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4887 |
|
22494
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
4888 if (iptr->isn_type == ISN_2BOOL) |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
4889 { |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
4890 tv = STACK_TV_BOT(iptr->isn_arg.tobool.offset); |
|
22494
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
4891 n = tv2bool(tv); |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
4892 if (iptr->isn_arg.tobool.invert) |
|
22494
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
4893 n = !n; |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
4894 } |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
4895 else |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
4896 { |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
4897 tv = STACK_TV_BOT(-1); |
|
22494
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
4898 SOURCING_LNUM = iptr->isn_lnum; |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
4899 n = tv_get_bool_chk(tv, &error); |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
4900 if (error) |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
4901 goto on_error; |
|
4c21f7f6f9e3
patch 8.2.1795: Vim9: operators && and || have a confusing result
Bram Moolenaar <Bram@vim.org>
parents:
22460
diff
changeset
|
4902 } |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4903 clear_tv(tv); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4904 tv->v_type = VAR_BOOL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4905 tv->vval.v_number = n ? VVAL_TRUE : VVAL_FALSE; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4906 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4907 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4908 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4909 case ISN_2STRING: |
|
21771
fcf978444298
patch 8.2.1435: Vim9: always converting to string for ".." leads to mistakes
Bram Moolenaar <Bram@vim.org>
parents:
21757
diff
changeset
|
4910 case ISN_2STRING_ANY: |
|
23523
b0a6e7325169
patch 8.2.2304: Vim9: no test for unletting an imported variable
Bram Moolenaar <Bram@vim.org>
parents:
23517
diff
changeset
|
4911 SOURCING_LNUM = iptr->isn_lnum; |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
4912 if (do_2string(STACK_TV_BOT(iptr->isn_arg.tostring.offset), |
|
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
4913 iptr->isn_type == ISN_2STRING_ANY, |
|
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
4914 iptr->isn_arg.tostring.tolerant) == FAIL) |
|
23266
00f7cd9b6033
patch 8.2.2179: Vim9: crash when indexing a dict with a number
Bram Moolenaar <Bram@vim.org>
parents:
23254
diff
changeset
|
4915 goto on_error; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4916 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4917 |
|
23156
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4918 case ISN_RANGE: |
|
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4919 { |
|
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4920 exarg_T ea; |
|
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4921 char *errormsg; |
|
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4922 |
|
23541
a2a38bc68dd9
patch 8.2.2313: Vim9: using uninitialized field when parsing range
Bram Moolenaar <Bram@vim.org>
parents:
23527
diff
changeset
|
4923 ea.line2 = 0; |
|
23513
872239543313
patch 8.2.2299: Vim9: invalid memory access making error message flaky
Bram Moolenaar <Bram@vim.org>
parents:
23503
diff
changeset
|
4924 ea.addr_count = 0; |
|
23156
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4925 ea.addr_type = ADDR_LINES; |
|
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4926 ea.cmd = iptr->isn_arg.string; |
|
23541
a2a38bc68dd9
patch 8.2.2313: Vim9: using uninitialized field when parsing range
Bram Moolenaar <Bram@vim.org>
parents:
23527
diff
changeset
|
4927 ea.skip = FALSE; |
|
23156
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4928 if (parse_cmd_address(&ea, &errormsg, FALSE) == FAIL) |
|
23541
a2a38bc68dd9
patch 8.2.2313: Vim9: using uninitialized field when parsing range
Bram Moolenaar <Bram@vim.org>
parents:
23527
diff
changeset
|
4929 goto on_error; |
|
23671
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4930 |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
4931 if (GA_GROW_FAILS(&ectx->ec_stack, 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
4932 goto theend; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4933 ++ectx->ec_stack.ga_len; |
|
23671
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4934 tv = STACK_TV_BOT(-1); |
|
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4935 tv->v_type = VAR_NUMBER; |
|
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4936 tv->v_lock = 0; |
|
28621
333be301dfe8
patch 8.2.4834: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28598
diff
changeset
|
4937 tv->vval.v_number = ea.line2; |
|
23156
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4938 } |
|
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4939 break; |
|
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4940 |
|
22176
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4941 case ISN_PUT: |
|
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4942 { |
|
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4943 int regname = iptr->isn_arg.put.put_regname; |
|
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4944 linenr_T lnum = iptr->isn_arg.put.put_lnum; |
|
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4945 char_u *expr = NULL; |
|
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4946 int dir = FORWARD; |
|
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4947 |
|
23156
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4948 if (lnum < -2) |
|
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4949 { |
|
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4950 // line number was put on the stack by ISN_RANGE |
|
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4951 tv = STACK_TV_BOT(-1); |
|
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4952 curwin->w_cursor.lnum = tv->vval.v_number; |
|
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4953 if (lnum == LNUM_VARIABLE_RANGE_ABOVE) |
|
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4954 dir = BACKWARD; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4955 --ectx->ec_stack.ga_len; |
|
23156
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4956 } |
|
6aa8ddf7a3fa
patch 8.2.2124: Vim9: a range cannot be computed at runtime
Bram Moolenaar <Bram@vim.org>
parents:
23102
diff
changeset
|
4957 else if (lnum == -2) |
|
22176
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4958 // :put! above cursor |
|
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4959 dir = BACKWARD; |
|
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4960 else if (lnum >= 0) |
|
27585
a31dd0a3cb39
patch 8.2.4319: :put does not work properly in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
27565
diff
changeset
|
4961 { |
|
a31dd0a3cb39
patch 8.2.4319: :put does not work properly in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
27565
diff
changeset
|
4962 curwin->w_cursor.lnum = lnum; |
|
a31dd0a3cb39
patch 8.2.4319: :put does not work properly in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
27565
diff
changeset
|
4963 if (lnum == 0) |
|
a31dd0a3cb39
patch 8.2.4319: :put does not work properly in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
27565
diff
changeset
|
4964 // check_cursor() below will move to line 1 |
|
a31dd0a3cb39
patch 8.2.4319: :put does not work properly in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
27565
diff
changeset
|
4965 dir = BACKWARD; |
|
a31dd0a3cb39
patch 8.2.4319: :put does not work properly in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
27565
diff
changeset
|
4966 } |
|
23671
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4967 |
|
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4968 if (regname == '=') |
|
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4969 { |
|
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4970 tv = STACK_TV_BOT(-1); |
|
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4971 if (tv->v_type == VAR_STRING) |
|
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4972 expr = tv->vval.v_string; |
|
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4973 else |
|
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4974 { |
|
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4975 expr = typval2string(tv, TRUE); // allocates value |
|
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4976 clear_tv(tv); |
|
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4977 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4978 --ectx->ec_stack.ga_len; |
|
23671
9ee9c4246a7f
patch 8.2.2377: Vim9: crash when using a range after another expression
Bram Moolenaar <Bram@vim.org>
parents:
23656
diff
changeset
|
4979 } |
|
22176
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4980 check_cursor(); |
|
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4981 do_put(regname, expr, dir, 1L, PUT_LINE|PUT_CURSLINE); |
|
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4982 vim_free(expr); |
|
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4983 } |
|
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4984 break; |
|
6941d3205be9
patch 8.2.1637: Vim9: :put ={expr} does not work inside :def function
Bram Moolenaar <Bram@vim.org>
parents:
22004
diff
changeset
|
4985 |
|
22703
f2bfee4ac356
patch 8.2.1900: Vim9: command modifiers do not work
Bram Moolenaar <Bram@vim.org>
parents:
22691
diff
changeset
|
4986 case ISN_CMDMOD: |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4987 ectx->ec_funclocal.floc_save_cmdmod = cmdmod; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4988 ectx->ec_funclocal.floc_restore_cmdmod = TRUE; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4989 ectx->ec_funclocal.floc_restore_cmdmod_stacklen = |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4990 ectx->ec_stack.ga_len; |
|
22703
f2bfee4ac356
patch 8.2.1900: Vim9: command modifiers do not work
Bram Moolenaar <Bram@vim.org>
parents:
22691
diff
changeset
|
4991 cmdmod = *iptr->isn_arg.cmdmod.cf_cmdmod; |
|
f2bfee4ac356
patch 8.2.1900: Vim9: command modifiers do not work
Bram Moolenaar <Bram@vim.org>
parents:
22691
diff
changeset
|
4992 apply_cmdmod(&cmdmod); |
|
22691
dda110a14be4
patch 8.2.1894: Vim9: command modifiers are not supported
Bram Moolenaar <Bram@vim.org>
parents:
22641
diff
changeset
|
4993 break; |
|
dda110a14be4
patch 8.2.1894: Vim9: command modifiers are not supported
Bram Moolenaar <Bram@vim.org>
parents:
22641
diff
changeset
|
4994 |
|
22703
f2bfee4ac356
patch 8.2.1900: Vim9: command modifiers do not work
Bram Moolenaar <Bram@vim.org>
parents:
22691
diff
changeset
|
4995 case ISN_CMDMOD_REV: |
|
f2bfee4ac356
patch 8.2.1900: Vim9: command modifiers do not work
Bram Moolenaar <Bram@vim.org>
parents:
22691
diff
changeset
|
4996 // filter regprog is owned by the instruction, don't free it |
|
f2bfee4ac356
patch 8.2.1900: Vim9: command modifiers do not work
Bram Moolenaar <Bram@vim.org>
parents:
22691
diff
changeset
|
4997 cmdmod.cmod_filter_regmatch.regprog = NULL; |
|
f2bfee4ac356
patch 8.2.1900: Vim9: command modifiers do not work
Bram Moolenaar <Bram@vim.org>
parents:
22691
diff
changeset
|
4998 undo_cmdmod(&cmdmod); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
4999 cmdmod = ectx->ec_funclocal.floc_save_cmdmod; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5000 ectx->ec_funclocal.floc_restore_cmdmod = FALSE; |
|
22691
dda110a14be4
patch 8.2.1894: Vim9: command modifiers are not supported
Bram Moolenaar <Bram@vim.org>
parents:
22641
diff
changeset
|
5001 break; |
|
dda110a14be4
patch 8.2.1894: Vim9: command modifiers are not supported
Bram Moolenaar <Bram@vim.org>
parents:
22641
diff
changeset
|
5002 |
|
22975
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5003 case ISN_UNPACK: |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5004 { |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5005 int count = iptr->isn_arg.unpack.unp_count; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5006 int semicolon = iptr->isn_arg.unpack.unp_semicolon; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5007 list_T *l; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5008 listitem_T *li; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5009 int i; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5010 |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5011 // Check there is a valid list to unpack. |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5012 tv = STACK_TV_BOT(-1); |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5013 if (tv->v_type != VAR_LIST) |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5014 { |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5015 SOURCING_LNUM = iptr->isn_lnum; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5016 emsg(_(e_for_argument_must_be_sequence_of_lists)); |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5017 goto on_error; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5018 } |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5019 l = tv->vval.v_list; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5020 if (l == NULL |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5021 || l->lv_len < (semicolon ? count - 1 : count)) |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5022 { |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5023 SOURCING_LNUM = iptr->isn_lnum; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5024 emsg(_(e_list_value_does_not_have_enough_items)); |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5025 goto on_error; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5026 } |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5027 else if (!semicolon && l->lv_len > count) |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5028 { |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5029 SOURCING_LNUM = iptr->isn_lnum; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5030 emsg(_(e_list_value_has_more_items_than_targets)); |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5031 goto on_error; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5032 } |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5033 |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5034 CHECK_LIST_MATERIALIZE(l); |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
5035 if (GA_GROW_FAILS(&ectx->ec_stack, count - 1)) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
5036 goto theend; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5037 ectx->ec_stack.ga_len += count - 1; |
|
22975
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5038 |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5039 // Variable after semicolon gets a list with the remaining |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5040 // items. |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5041 if (semicolon) |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5042 { |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5043 list_T *rem_list = |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5044 list_alloc_with_items(l->lv_len - count + 1); |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5045 |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5046 if (rem_list == NULL) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
5047 goto theend; |
|
22975
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5048 tv = STACK_TV_BOT(-count); |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5049 tv->vval.v_list = rem_list; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5050 ++rem_list->lv_refcount; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5051 tv->v_lock = 0; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5052 li = l->lv_first; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5053 for (i = 0; i < count - 1; ++i) |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5054 li = li->li_next; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5055 for (i = 0; li != NULL; ++i) |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5056 { |
|
28125
ed151877ebac
patch 8.2.4587: Vim9: double free after unpacking a list
Bram Moolenaar <Bram@vim.org>
parents:
28101
diff
changeset
|
5057 typval_T tvcopy; |
|
ed151877ebac
patch 8.2.4587: Vim9: double free after unpacking a list
Bram Moolenaar <Bram@vim.org>
parents:
28101
diff
changeset
|
5058 |
|
ed151877ebac
patch 8.2.4587: Vim9: double free after unpacking a list
Bram Moolenaar <Bram@vim.org>
parents:
28101
diff
changeset
|
5059 copy_tv(&li->li_tv, &tvcopy); |
|
ed151877ebac
patch 8.2.4587: Vim9: double free after unpacking a list
Bram Moolenaar <Bram@vim.org>
parents:
28101
diff
changeset
|
5060 list_set_item(rem_list, i, &tvcopy); |
|
22975
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5061 li = li->li_next; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5062 } |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5063 --count; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5064 } |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5065 |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5066 // Produce the values in reverse order, first item last. |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5067 li = l->lv_first; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5068 for (i = 0; i < count; ++i) |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5069 { |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5070 tv = STACK_TV_BOT(-i - 1); |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5071 copy_tv(&li->li_tv, tv); |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5072 li = li->li_next; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5073 } |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5074 |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5075 list_unref(l); |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5076 } |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5077 break; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5078 |
|
23717
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5079 case ISN_PROF_START: |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5080 case ISN_PROF_END: |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5081 { |
|
23719
1a7c2685d780
patch 8.2.2401: build fails without +profiling feature
Bram Moolenaar <Bram@vim.org>
parents:
23717
diff
changeset
|
5082 #ifdef FEAT_PROFILE |
|
23717
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5083 funccall_T cookie; |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5084 ufunc_T *cur_ufunc = |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5085 (((dfunc_T *)def_functions.ga_data) |
|
24918
f11779c1d123
patch 8.2.2996: Vim9: when debugging cannot inspect local variables
Bram Moolenaar <Bram@vim.org>
parents:
24909
diff
changeset
|
5086 + ectx->ec_dfunc_idx)->df_ufunc; |
|
23717
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5087 |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5088 cookie.func = cur_ufunc; |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5089 if (iptr->isn_type == ISN_PROF_START) |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5090 { |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5091 func_line_start(&cookie, iptr->isn_lnum); |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5092 // if we get here the instruction is executed |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5093 func_line_exec(&cookie); |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5094 } |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5095 else |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5096 func_line_end(&cookie); |
|
23719
1a7c2685d780
patch 8.2.2401: build fails without +profiling feature
Bram Moolenaar <Bram@vim.org>
parents:
23717
diff
changeset
|
5097 #endif |
|
23717
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5098 } |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5099 break; |
|
e3720756acdc
patch 8.2.2400: Vim9: compiled functions are not profiled
Bram Moolenaar <Bram@vim.org>
parents:
23699
diff
changeset
|
5100 |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
5101 case ISN_DEBUG: |
|
24978
2818b8108d92
patch 8.2.3026: Vim9: cannot set breakpoint in compiled function
Bram Moolenaar <Bram@vim.org>
parents:
24960
diff
changeset
|
5102 handle_debug(iptr, ectx); |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
5103 break; |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
5104 |
|
21232
3f14e0d4a4dd
patch 8.2.1167: Vim9: builtin function method call only supports first arg
Bram Moolenaar <Bram@vim.org>
parents:
21206
diff
changeset
|
5105 case ISN_SHUFFLE: |
|
3f14e0d4a4dd
patch 8.2.1167: Vim9: builtin function method call only supports first arg
Bram Moolenaar <Bram@vim.org>
parents:
21206
diff
changeset
|
5106 { |
|
22975
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5107 typval_T tmp_tv; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5108 int item = iptr->isn_arg.shuffle.shfl_item; |
|
a943b175586a
patch 8.2.2034: Vim9: list unpack in for statement not compiled yet
Bram Moolenaar <Bram@vim.org>
parents:
22973
diff
changeset
|
5109 int up = iptr->isn_arg.shuffle.shfl_up; |
|
21232
3f14e0d4a4dd
patch 8.2.1167: Vim9: builtin function method call only supports first arg
Bram Moolenaar <Bram@vim.org>
parents:
21206
diff
changeset
|
5110 |
|
3f14e0d4a4dd
patch 8.2.1167: Vim9: builtin function method call only supports first arg
Bram Moolenaar <Bram@vim.org>
parents:
21206
diff
changeset
|
5111 tmp_tv = *STACK_TV_BOT(-item); |
|
3f14e0d4a4dd
patch 8.2.1167: Vim9: builtin function method call only supports first arg
Bram Moolenaar <Bram@vim.org>
parents:
21206
diff
changeset
|
5112 for ( ; up > 0 && item > 1; --up) |
|
3f14e0d4a4dd
patch 8.2.1167: Vim9: builtin function method call only supports first arg
Bram Moolenaar <Bram@vim.org>
parents:
21206
diff
changeset
|
5113 { |
|
3f14e0d4a4dd
patch 8.2.1167: Vim9: builtin function method call only supports first arg
Bram Moolenaar <Bram@vim.org>
parents:
21206
diff
changeset
|
5114 *STACK_TV_BOT(-item) = *STACK_TV_BOT(-item + 1); |
|
3f14e0d4a4dd
patch 8.2.1167: Vim9: builtin function method call only supports first arg
Bram Moolenaar <Bram@vim.org>
parents:
21206
diff
changeset
|
5115 --item; |
|
3f14e0d4a4dd
patch 8.2.1167: Vim9: builtin function method call only supports first arg
Bram Moolenaar <Bram@vim.org>
parents:
21206
diff
changeset
|
5116 } |
|
3f14e0d4a4dd
patch 8.2.1167: Vim9: builtin function method call only supports first arg
Bram Moolenaar <Bram@vim.org>
parents:
21206
diff
changeset
|
5117 *STACK_TV_BOT(-item) = tmp_tv; |
|
3f14e0d4a4dd
patch 8.2.1167: Vim9: builtin function method call only supports first arg
Bram Moolenaar <Bram@vim.org>
parents:
21206
diff
changeset
|
5118 } |
|
3f14e0d4a4dd
patch 8.2.1167: Vim9: builtin function method call only supports first arg
Bram Moolenaar <Bram@vim.org>
parents:
21206
diff
changeset
|
5119 break; |
|
3f14e0d4a4dd
patch 8.2.1167: Vim9: builtin function method call only supports first arg
Bram Moolenaar <Bram@vim.org>
parents:
21206
diff
changeset
|
5120 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5121 case ISN_DROP: |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5122 --ectx->ec_stack.ga_len; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5123 clear_tv(STACK_TV_BOT(0)); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5124 ectx->ec_where.wt_index = 0; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5125 ectx->ec_where.wt_variable = FALSE; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5126 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5127 } |
|
21365
fca850f4d603
patch 8.2.1233: Vim9: various errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21359
diff
changeset
|
5128 continue; |
|
fca850f4d603
patch 8.2.1233: Vim9: various errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21359
diff
changeset
|
5129 |
|
21375
92e2ed2a2778
patch 8.2.1238: Vim9: a few remaining errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21371
diff
changeset
|
5130 func_return: |
|
22314
41e118669df3
patch 8.2.1706: Vim9: crash after running into the "Multiple closures" error
Bram Moolenaar <Bram@vim.org>
parents:
22310
diff
changeset
|
5131 // Restore previous function. If the frame pointer is where we started |
|
41e118669df3
patch 8.2.1706: Vim9: crash after running into the "Multiple closures" error
Bram Moolenaar <Bram@vim.org>
parents:
22310
diff
changeset
|
5132 // then there is none and we are done. |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5133 if (ectx->ec_frame_idx == ectx->ec_initial_frame_idx) |
|
21375
92e2ed2a2778
patch 8.2.1238: Vim9: a few remaining errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21371
diff
changeset
|
5134 goto done; |
|
22314
41e118669df3
patch 8.2.1706: Vim9: crash after running into the "Multiple closures" error
Bram Moolenaar <Bram@vim.org>
parents:
22310
diff
changeset
|
5135 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5136 if (func_return(ectx) == FAIL) |
|
21375
92e2ed2a2778
patch 8.2.1238: Vim9: a few remaining errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21371
diff
changeset
|
5137 // only fails when out of memory |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
5138 goto theend; |
|
21421
0f0fee4122d3
patch 8.2.1261: Vim9: common type of function not tested
Bram Moolenaar <Bram@vim.org>
parents:
21401
diff
changeset
|
5139 continue; |
|
21375
92e2ed2a2778
patch 8.2.1238: Vim9: a few remaining errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21371
diff
changeset
|
5140 |
|
21365
fca850f4d603
patch 8.2.1233: Vim9: various errors not caught by try/catch
Bram Moolenaar <Bram@vim.org>
parents:
21359
diff
changeset
|
5141 on_error: |
|
23074
cd885eb0e50c
patch 8.2.2083: Vim9: crash when using ":silent!" and getting member fails
Bram Moolenaar <Bram@vim.org>
parents:
23009
diff
changeset
|
5142 // Jump here for an error that does not require aborting execution. |
|
23102
3239b0f3c592
patch 8.2.2097: Vim9: using :silent! when calling a function prevents abort
Bram Moolenaar <Bram@vim.org>
parents:
23100
diff
changeset
|
5143 // If "emsg_silent" is set then ignore the error, unless it was set |
|
3239b0f3c592
patch 8.2.2097: Vim9: using :silent! when calling a function prevents abort
Bram Moolenaar <Bram@vim.org>
parents:
23100
diff
changeset
|
5144 // when calling the function. |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5145 if (did_emsg_cumul + did_emsg == ectx->ec_did_emsg_before |
|
23102
3239b0f3c592
patch 8.2.2097: Vim9: using :silent! when calling a function prevents abort
Bram Moolenaar <Bram@vim.org>
parents:
23100
diff
changeset
|
5146 && emsg_silent && did_emsg_def == 0) |
|
23689
e7f5931b46ca
patch 8.2.2386: Vim9: crash when using ":silent! put"
Bram Moolenaar <Bram@vim.org>
parents:
23681
diff
changeset
|
5147 { |
|
e7f5931b46ca
patch 8.2.2386: Vim9: crash when using ":silent! put"
Bram Moolenaar <Bram@vim.org>
parents:
23681
diff
changeset
|
5148 // If a sequence of instructions causes an error while ":silent!" |
|
e7f5931b46ca
patch 8.2.2386: Vim9: crash when using ":silent! put"
Bram Moolenaar <Bram@vim.org>
parents:
23681
diff
changeset
|
5149 // was used, restore the stack length and jump ahead to restoring |
|
e7f5931b46ca
patch 8.2.2386: Vim9: crash when using ":silent! put"
Bram Moolenaar <Bram@vim.org>
parents:
23681
diff
changeset
|
5150 // the cmdmod. |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5151 if (ectx->ec_funclocal.floc_restore_cmdmod) |
|
23689
e7f5931b46ca
patch 8.2.2386: Vim9: crash when using ":silent! put"
Bram Moolenaar <Bram@vim.org>
parents:
23681
diff
changeset
|
5152 { |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5153 while (ectx->ec_stack.ga_len |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5154 > ectx->ec_funclocal.floc_restore_cmdmod_stacklen) |
|
23689
e7f5931b46ca
patch 8.2.2386: Vim9: crash when using ":silent! put"
Bram Moolenaar <Bram@vim.org>
parents:
23681
diff
changeset
|
5155 { |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5156 --ectx->ec_stack.ga_len; |
|
23689
e7f5931b46ca
patch 8.2.2386: Vim9: crash when using ":silent! put"
Bram Moolenaar <Bram@vim.org>
parents:
23681
diff
changeset
|
5157 clear_tv(STACK_TV_BOT(0)); |
|
e7f5931b46ca
patch 8.2.2386: Vim9: crash when using ":silent! put"
Bram Moolenaar <Bram@vim.org>
parents:
23681
diff
changeset
|
5158 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5159 while (ectx->ec_instr[ectx->ec_iidx].isn_type != ISN_CMDMOD_REV) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5160 ++ectx->ec_iidx; |
|
23689
e7f5931b46ca
patch 8.2.2386: Vim9: crash when using ":silent! put"
Bram Moolenaar <Bram@vim.org>
parents:
23681
diff
changeset
|
5161 } |
|
22760
d235c5fa0bbe
patch 8.2.1928: Vim9: "silent!" not effective when list index is wrong
Bram Moolenaar <Bram@vim.org>
parents:
22758
diff
changeset
|
5162 continue; |
|
23689
e7f5931b46ca
patch 8.2.2386: Vim9: crash when using ":silent! put"
Bram Moolenaar <Bram@vim.org>
parents:
23681
diff
changeset
|
5163 } |
|
23074
cd885eb0e50c
patch 8.2.2083: Vim9: crash when using ":silent!" and getting member fails
Bram Moolenaar <Bram@vim.org>
parents:
23009
diff
changeset
|
5164 on_fatal_error: |
|
cd885eb0e50c
patch 8.2.2083: Vim9: crash when using ":silent!" and getting member fails
Bram Moolenaar <Bram@vim.org>
parents:
23009
diff
changeset
|
5165 // Jump here for an error that messes up the stack. |
|
22736
56907027dba7
patch 8.2.1916: Vim9: function call is aborted even when "silent!" is used
Bram Moolenaar <Bram@vim.org>
parents:
22715
diff
changeset
|
5166 // If we are not inside a try-catch started here, abort execution. |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5167 if (trylevel <= ectx->ec_trylevel_at_start) |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
5168 goto theend; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5169 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5170 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5171 done: |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
5172 ret = OK; |
|
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
5173 theend: |
|
30065
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
5174 { |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
5175 dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
5176 + ectx->ec_dfunc_idx; |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
5177 |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
5178 if (dfunc->df_defer_var_idx > 0) |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
5179 invoke_defer_funcs(ectx); |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
5180 } |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
5181 |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
5182 dict_stack_clear(dict_stack_len_at_start); |
|
24659
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
5183 ectx->ec_trylevel_at_start = save_trylevel_at_start; |
|
982516c8d692
patch 8.2.2868: Vim9: when executing compiled expression trylevel is changed
Bram Moolenaar <Bram@vim.org>
parents:
24645
diff
changeset
|
5184 return ret; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5185 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5186 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5187 /* |
|
30083
a542dfb1c1a2
patch 9.0.0379: cleaning up after writefile() is a hassle
Bram Moolenaar <Bram@vim.org>
parents:
30071
diff
changeset
|
5188 * Execute the instructions from a VAR_INSTR typval and put the result in |
|
24606
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5189 * "rettv". |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5190 * Return OK or FAIL. |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5191 */ |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5192 int |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5193 exe_typval_instr(typval_T *tv, typval_T *rettv) |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5194 { |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5195 ectx_T *ectx = tv->vval.v_instr->instr_ectx; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5196 isn_T *save_instr = ectx->ec_instr; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5197 int save_iidx = ectx->ec_iidx; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5198 int res; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5199 |
|
28692
bfd8e25fa207
patch 8.2.4870: Vim9: expression in :substitute is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
28625
diff
changeset
|
5200 // Initialize rettv so that it is safe for caller to invoke clear_tv(rettv) |
|
bfd8e25fa207
patch 8.2.4870: Vim9: expression in :substitute is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
28625
diff
changeset
|
5201 // even when the compilation fails. |
|
bfd8e25fa207
patch 8.2.4870: Vim9: expression in :substitute is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
28625
diff
changeset
|
5202 rettv->v_type = VAR_UNKNOWN; |
|
bfd8e25fa207
patch 8.2.4870: Vim9: expression in :substitute is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
28625
diff
changeset
|
5203 |
|
24606
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5204 ectx->ec_instr = tv->vval.v_instr->instr_instr; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5205 res = exec_instructions(ectx); |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5206 if (res == OK) |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5207 { |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5208 *rettv = *STACK_TV_BOT(-1); |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5209 --ectx->ec_stack.ga_len; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5210 } |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5211 |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5212 ectx->ec_instr = save_instr; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5213 ectx->ec_iidx = save_iidx; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5214 |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5215 return res; |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5216 } |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5217 |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5218 /* |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5219 * Execute the instructions from an ISN_SUBSTITUTE command, which are in |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5220 * "substitute_instr". |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5221 */ |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5222 char_u * |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5223 exe_substitute_instr(void) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5224 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5225 ectx_T *ectx = substitute_instr->subs_ectx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5226 isn_T *save_instr = ectx->ec_instr; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5227 int save_iidx = ectx->ec_iidx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5228 char_u *res; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5229 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5230 ectx->ec_instr = substitute_instr->subs_instr; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5231 if (exec_instructions(ectx) == OK) |
|
24339
236e9ebdb30e
patch 8.2.2710: Vim9: not all tests cover script and :def function
Bram Moolenaar <Bram@vim.org>
parents:
24325
diff
changeset
|
5232 { |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5233 typval_T *tv = STACK_TV_BOT(-1); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5234 |
|
24816
1bed37e82c2e
patch 8.2.2946: Vim9: substitute expression cannot be a List
Bram Moolenaar <Bram@vim.org>
parents:
24812
diff
changeset
|
5235 res = typval2string(tv, TRUE); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5236 --ectx->ec_stack.ga_len; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5237 clear_tv(tv); |
|
24339
236e9ebdb30e
patch 8.2.2710: Vim9: not all tests cover script and :def function
Bram Moolenaar <Bram@vim.org>
parents:
24325
diff
changeset
|
5238 } |
|
236e9ebdb30e
patch 8.2.2710: Vim9: not all tests cover script and :def function
Bram Moolenaar <Bram@vim.org>
parents:
24325
diff
changeset
|
5239 else |
|
236e9ebdb30e
patch 8.2.2710: Vim9: not all tests cover script and :def function
Bram Moolenaar <Bram@vim.org>
parents:
24325
diff
changeset
|
5240 { |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5241 substitute_instr->subs_status = FAIL; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5242 res = vim_strsave((char_u *)""); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5243 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5244 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5245 ectx->ec_instr = save_instr; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5246 ectx->ec_iidx = save_iidx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5247 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5248 return res; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5249 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5250 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5251 /* |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5252 * Call a "def" function from old Vim script. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5253 * Return OK or FAIL. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5254 */ |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5255 int |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5256 call_def_function( |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5257 ufunc_T *ufunc, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5258 int argc_arg, // nr of arguments |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5259 typval_T *argv, // arguments |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5260 partial_T *partial, // optional partial for context |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5261 typval_T *rettv) // return value |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5262 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5263 ectx_T ectx; // execution context |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5264 int argc = argc_arg; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5265 typval_T *tv; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5266 int idx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5267 int ret = FAIL; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5268 int defcount = ufunc->uf_args.ga_len - argc; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5269 sctx_T save_current_sctx = current_sctx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5270 int did_emsg_before = did_emsg_cumul + did_emsg; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5271 int save_suppress_errthrow = suppress_errthrow; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5272 msglist_T **saved_msg_list = NULL; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5273 msglist_T *private_msg_list = NULL; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5274 int save_emsg_silent_def = emsg_silent_def; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5275 int save_did_emsg_def = did_emsg_def; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5276 int orig_funcdepth; |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
5277 int orig_nesting_level = ex_nesting_level; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5278 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5279 // Get pointer to item in the stack. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5280 #undef STACK_TV |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5281 #define STACK_TV(idx) (((typval_T *)ectx.ec_stack.ga_data) + idx) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5282 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5283 // Get pointer to item at the bottom of the stack, -1 is the bottom. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5284 #undef STACK_TV_BOT |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5285 #define STACK_TV_BOT(idx) (((typval_T *)ectx.ec_stack.ga_data) + ectx.ec_stack.ga_len + idx) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5286 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5287 // Get pointer to a local variable on the stack. Negative for arguments. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5288 #undef STACK_TV_VAR |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5289 #define STACK_TV_VAR(idx) (((typval_T *)ectx.ec_stack.ga_data) + ectx.ec_frame_idx + STACK_FRAME_SIZE + idx) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5290 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5291 if (ufunc->uf_def_status == UF_NOT_COMPILED |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5292 || ufunc->uf_def_status == UF_COMPILE_ERROR |
|
28101
3bc0a639dfb0
patch 8.2.4575: Vim9: test for profiling still fails
Bram Moolenaar <Bram@vim.org>
parents:
28097
diff
changeset
|
5293 || (func_needs_compiling(ufunc, get_compile_type(ufunc)) |
|
3bc0a639dfb0
patch 8.2.4575: Vim9: test for profiling still fails
Bram Moolenaar <Bram@vim.org>
parents:
28097
diff
changeset
|
5294 && compile_def_function(ufunc, FALSE, |
|
3bc0a639dfb0
patch 8.2.4575: Vim9: test for profiling still fails
Bram Moolenaar <Bram@vim.org>
parents:
28097
diff
changeset
|
5295 get_compile_type(ufunc), NULL) == FAIL)) |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5296 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5297 if (did_emsg_cumul + did_emsg == did_emsg_before) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5298 semsg(_(e_function_is_not_compiled_str), |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5299 printable_func_name(ufunc)); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5300 return FAIL; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5301 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5302 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5303 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5304 // Check the function was really compiled. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5305 dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5306 + ufunc->uf_dfunc_idx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5307 if (INSTRUCTIONS(dfunc) == NULL) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5308 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5309 iemsg("using call_def_function() on not compiled function"); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5310 return FAIL; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5311 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5312 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5313 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5314 // If depth of calling is getting too high, don't execute the function. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5315 orig_funcdepth = funcdepth_get(); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5316 if (funcdepth_increment() == FAIL) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5317 return FAIL; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5318 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5319 CLEAR_FIELD(ectx); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5320 ectx.ec_dfunc_idx = ufunc->uf_dfunc_idx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5321 ga_init2(&ectx.ec_stack, sizeof(typval_T), 500); |
|
25477
a8f526c9b172
patch 8.2.3275: optimizer can use hints about ga_grow() normally succeeding
Bram Moolenaar <Bram@vim.org>
parents:
25475
diff
changeset
|
5322 if (GA_GROW_FAILS(&ectx.ec_stack, 20)) |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5323 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5324 funcdepth_decrement(); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5325 return FAIL; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5326 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5327 ga_init2(&ectx.ec_trystack, sizeof(trycmd_T), 10); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5328 ga_init2(&ectx.ec_funcrefs, sizeof(partial_T *), 10); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5329 ectx.ec_did_emsg_before = did_emsg_before; |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
5330 ++ex_nesting_level; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5331 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5332 idx = argc - ufunc->uf_args.ga_len; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5333 if (idx > 0 && ufunc->uf_va_name == NULL) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5334 { |
|
29322
ac102d0fb50f
patch 9.0.0004: plural messages not translated properly
Bram Moolenaar <Bram@vim.org>
parents:
28968
diff
changeset
|
5335 semsg(NGETTEXT(e_one_argument_too_many, e_nr_arguments_too_many, |
|
ac102d0fb50f
patch 9.0.0004: plural messages not translated properly
Bram Moolenaar <Bram@vim.org>
parents:
28968
diff
changeset
|
5336 idx), idx); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5337 goto failed_early; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5338 } |
|
24810
30095f94d081
patch 8.2.2943: Vim9: check for argument count ignores default values
Bram Moolenaar <Bram@vim.org>
parents:
24808
diff
changeset
|
5339 idx = argc - ufunc->uf_args.ga_len + ufunc->uf_def_args.ga_len; |
|
30095f94d081
patch 8.2.2943: Vim9: check for argument count ignores default values
Bram Moolenaar <Bram@vim.org>
parents:
24808
diff
changeset
|
5340 if (idx < 0) |
|
24808
0bc60e26a2b5
patch 8.2.2942: Vim9: error when calling function with too few arguments
Bram Moolenaar <Bram@vim.org>
parents:
24806
diff
changeset
|
5341 { |
|
29322
ac102d0fb50f
patch 9.0.0004: plural messages not translated properly
Bram Moolenaar <Bram@vim.org>
parents:
28968
diff
changeset
|
5342 semsg(NGETTEXT(e_one_argument_too_few, e_nr_arguments_too_few, |
|
ac102d0fb50f
patch 9.0.0004: plural messages not translated properly
Bram Moolenaar <Bram@vim.org>
parents:
28968
diff
changeset
|
5343 -idx), -idx); |
|
24808
0bc60e26a2b5
patch 8.2.2942: Vim9: error when calling function with too few arguments
Bram Moolenaar <Bram@vim.org>
parents:
24806
diff
changeset
|
5344 goto failed_early; |
|
0bc60e26a2b5
patch 8.2.2942: Vim9: error when calling function with too few arguments
Bram Moolenaar <Bram@vim.org>
parents:
24806
diff
changeset
|
5345 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5346 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5347 // Put arguments on the stack, but no more than what the function expects. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5348 // A lambda can be called with more arguments than it uses. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5349 for (idx = 0; idx < argc |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5350 && (ufunc->uf_va_name != NULL || idx < ufunc->uf_args.ga_len); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5351 ++idx) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5352 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5353 if (idx >= ufunc->uf_args.ga_len - ufunc->uf_def_args.ga_len |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5354 && argv[idx].v_type == VAR_SPECIAL |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5355 && argv[idx].vval.v_number == VVAL_NONE) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5356 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5357 // Use the default value. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5358 STACK_TV_BOT(0)->v_type = VAR_UNKNOWN; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5359 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5360 else |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5361 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5362 if (ufunc->uf_arg_types != NULL && idx < ufunc->uf_args.ga_len |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5363 && check_typval_arg_type( |
|
25326
cfbf40f749b0
patch 8.2.3200: Vim9: hard to guess where a type error is given
Bram Moolenaar <Bram@vim.org>
parents:
25324
diff
changeset
|
5364 ufunc->uf_arg_types[idx], &argv[idx], |
|
cfbf40f749b0
patch 8.2.3200: Vim9: hard to guess where a type error is given
Bram Moolenaar <Bram@vim.org>
parents:
25324
diff
changeset
|
5365 NULL, idx + 1) == FAIL) |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5366 goto failed_early; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5367 copy_tv(&argv[idx], STACK_TV_BOT(0)); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5368 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5369 ++ectx.ec_stack.ga_len; |
|
24339
236e9ebdb30e
patch 8.2.2710: Vim9: not all tests cover script and :def function
Bram Moolenaar <Bram@vim.org>
parents:
24325
diff
changeset
|
5370 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5371 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5372 // Turn varargs into a list. Empty list if no args. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5373 if (ufunc->uf_va_name != NULL) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5374 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5375 int vararg_count = argc - ufunc->uf_args.ga_len; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5376 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5377 if (vararg_count < 0) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5378 vararg_count = 0; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5379 else |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5380 argc -= vararg_count; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5381 if (exe_newlist(vararg_count, &ectx) == FAIL) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5382 goto failed_early; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5383 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5384 // Check the type of the list items. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5385 tv = STACK_TV_BOT(-1); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5386 if (ufunc->uf_va_type != NULL |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5387 && ufunc->uf_va_type != &t_list_any |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5388 && ufunc->uf_va_type->tt_member != &t_any |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5389 && tv->vval.v_list != NULL) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5390 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5391 type_T *expected = ufunc->uf_va_type->tt_member; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5392 listitem_T *li = tv->vval.v_list->lv_first; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5393 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5394 for (idx = 0; idx < vararg_count; ++idx) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5395 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5396 if (check_typval_arg_type(expected, &li->li_tv, |
|
25326
cfbf40f749b0
patch 8.2.3200: Vim9: hard to guess where a type error is given
Bram Moolenaar <Bram@vim.org>
parents:
25324
diff
changeset
|
5397 NULL, argc + idx + 1) == FAIL) |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5398 goto failed_early; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5399 li = li->li_next; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5400 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5401 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5402 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5403 if (defcount > 0) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5404 // Move varargs list to below missing default arguments. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5405 *STACK_TV_BOT(defcount - 1) = *STACK_TV_BOT(-1); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5406 --ectx.ec_stack.ga_len; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5407 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5408 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5409 // Make space for omitted arguments, will store default value below. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5410 // Any varargs list goes after them. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5411 if (defcount > 0) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5412 for (idx = 0; idx < defcount; ++idx) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5413 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5414 STACK_TV_BOT(0)->v_type = VAR_UNKNOWN; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5415 ++ectx.ec_stack.ga_len; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5416 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5417 if (ufunc->uf_va_name != NULL) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5418 ++ectx.ec_stack.ga_len; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5419 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5420 // Frame pointer points to just after arguments. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5421 ectx.ec_frame_idx = ectx.ec_stack.ga_len; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5422 ectx.ec_initial_frame_idx = ectx.ec_frame_idx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5423 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5424 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5425 dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5426 + ufunc->uf_dfunc_idx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5427 ufunc_T *base_ufunc = dfunc->df_ufunc; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5428 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5429 // "uf_partial" is on the ufunc that "df_ufunc" points to, as is done |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5430 // by copy_func(). |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5431 if (partial != NULL || base_ufunc->uf_partial != NULL) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5432 { |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5433 ectx.ec_outer_ref = ALLOC_CLEAR_ONE(outer_ref_T); |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5434 if (ectx.ec_outer_ref == NULL) |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5435 goto failed_early; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5436 if (partial != NULL) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5437 { |
|
27591
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
5438 outer_T *outer = get_pt_outer(partial); |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
5439 |
|
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
5440 if (outer->out_stack == NULL) |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5441 { |
|
27565
0b12dd90a5d6
patch 8.2.4309: Vim9: crash when using a partial in the wrong context
Bram Moolenaar <Bram@vim.org>
parents:
27517
diff
changeset
|
5442 if (current_ectx != NULL) |
|
0b12dd90a5d6
patch 8.2.4309: Vim9: crash when using a partial in the wrong context
Bram Moolenaar <Bram@vim.org>
parents:
27517
diff
changeset
|
5443 { |
|
0b12dd90a5d6
patch 8.2.4309: Vim9: crash when using a partial in the wrong context
Bram Moolenaar <Bram@vim.org>
parents:
27517
diff
changeset
|
5444 if (current_ectx->ec_outer_ref != NULL |
|
0b12dd90a5d6
patch 8.2.4309: Vim9: crash when using a partial in the wrong context
Bram Moolenaar <Bram@vim.org>
parents:
27517
diff
changeset
|
5445 && current_ectx->ec_outer_ref->or_outer != NULL) |
|
0b12dd90a5d6
patch 8.2.4309: Vim9: crash when using a partial in the wrong context
Bram Moolenaar <Bram@vim.org>
parents:
27517
diff
changeset
|
5446 ectx.ec_outer_ref->or_outer = |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5447 current_ectx->ec_outer_ref->or_outer; |
|
27565
0b12dd90a5d6
patch 8.2.4309: Vim9: crash when using a partial in the wrong context
Bram Moolenaar <Bram@vim.org>
parents:
27517
diff
changeset
|
5448 } |
|
0b12dd90a5d6
patch 8.2.4309: Vim9: crash when using a partial in the wrong context
Bram Moolenaar <Bram@vim.org>
parents:
27517
diff
changeset
|
5449 // Should there be an error here? |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5450 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5451 else |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5452 { |
|
27591
d91be28bbdbb
patch 8.2.4322: Vim9: crash when using funcref with closure
Bram Moolenaar <Bram@vim.org>
parents:
27585
diff
changeset
|
5453 ectx.ec_outer_ref->or_outer = outer; |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5454 ++partial->pt_refcount; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5455 ectx.ec_outer_ref->or_partial = partial; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5456 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5457 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5458 else |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5459 { |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5460 ectx.ec_outer_ref->or_outer = &base_ufunc->uf_partial->pt_outer; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5461 ++base_ufunc->uf_partial->pt_refcount; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5462 ectx.ec_outer_ref->or_partial = base_ufunc->uf_partial; |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5463 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5464 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5465 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5466 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5467 // dummy frame entries |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5468 for (idx = 0; idx < STACK_FRAME_SIZE; ++idx) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5469 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5470 STACK_TV(ectx.ec_stack.ga_len)->v_type = VAR_UNKNOWN; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5471 ++ectx.ec_stack.ga_len; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5472 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5473 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5474 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5475 // Reserve space for local variables and any closure reference count. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5476 dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5477 + ufunc->uf_dfunc_idx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5478 |
|
26729
b969fdb8cd46
patch 8.2.3893: Vim9: many local variables are initialized with an instruction
Bram Moolenaar <Bram@vim.org>
parents:
26698
diff
changeset
|
5479 // Initialize variables to zero. That avoids having to generate |
|
b969fdb8cd46
patch 8.2.3893: Vim9: many local variables are initialized with an instruction
Bram Moolenaar <Bram@vim.org>
parents:
26698
diff
changeset
|
5480 // initializing instructions for "var nr: number", "var x: any", etc. |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5481 for (idx = 0; idx < dfunc->df_varcount; ++idx) |
|
26729
b969fdb8cd46
patch 8.2.3893: Vim9: many local variables are initialized with an instruction
Bram Moolenaar <Bram@vim.org>
parents:
26698
diff
changeset
|
5482 { |
|
b969fdb8cd46
patch 8.2.3893: Vim9: many local variables are initialized with an instruction
Bram Moolenaar <Bram@vim.org>
parents:
26698
diff
changeset
|
5483 STACK_TV_VAR(idx)->v_type = VAR_NUMBER; |
|
b969fdb8cd46
patch 8.2.3893: Vim9: many local variables are initialized with an instruction
Bram Moolenaar <Bram@vim.org>
parents:
26698
diff
changeset
|
5484 STACK_TV_VAR(idx)->vval.v_number = 0; |
|
b969fdb8cd46
patch 8.2.3893: Vim9: many local variables are initialized with an instruction
Bram Moolenaar <Bram@vim.org>
parents:
26698
diff
changeset
|
5485 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5486 ectx.ec_stack.ga_len += dfunc->df_varcount; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5487 if (dfunc->df_has_closure) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5488 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5489 STACK_TV_VAR(idx)->v_type = VAR_NUMBER; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5490 STACK_TV_VAR(idx)->vval.v_number = 0; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5491 ++ectx.ec_stack.ga_len; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5492 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5493 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5494 ectx.ec_instr = INSTRUCTIONS(dfunc); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5495 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5496 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5497 // Following errors are in the function, not the caller. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5498 // Commands behave like vim9script. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5499 estack_push_ufunc(ufunc, 1); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5500 current_sctx = ufunc->uf_script_ctx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5501 current_sctx.sc_version = SCRIPT_VERSION_VIM9; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5502 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5503 // Use a specific location for storing error messages to be converted to an |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5504 // exception. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5505 saved_msg_list = msg_list; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5506 msg_list = &private_msg_list; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5507 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5508 // Do turn errors into exceptions. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5509 suppress_errthrow = FALSE; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5510 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5511 // Do not delete the function while executing it. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5512 ++ufunc->uf_calls; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5513 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5514 // When ":silent!" was used before calling then we still abort the |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5515 // function. If ":silent!" is used in the function then we don't. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5516 emsg_silent_def = emsg_silent; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5517 did_emsg_def = 0; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5518 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5519 ectx.ec_where.wt_index = 0; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5520 ectx.ec_where.wt_variable = FALSE; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5521 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5522 // Execute the instructions until done. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5523 ret = exec_instructions(&ectx); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5524 if (ret == OK) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5525 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5526 // function finished, get result from the stack. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5527 if (ufunc->uf_ret_type == &t_void) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5528 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5529 rettv->v_type = VAR_VOID; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5530 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5531 else |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5532 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5533 tv = STACK_TV_BOT(-1); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5534 *rettv = *tv; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5535 tv->v_type = VAR_UNKNOWN; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5536 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5537 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5538 |
|
19532
b8f778dda1a1
patch 8.2.0323: Vim9: calling a function that is defined later is slow
Bram Moolenaar <Bram@vim.org>
parents:
19528
diff
changeset
|
5539 // When failed need to unwind the call stack. |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5540 while (ectx.ec_frame_idx != ectx.ec_initial_frame_idx) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5541 func_return(&ectx); |
|
21969
ba2415df82d7
patch 8.2.1534: Vim9: type error for argument type is not at call position
Bram Moolenaar <Bram@vim.org>
parents:
21933
diff
changeset
|
5542 |
|
22401
df1d7a560b35
patch 8.2.1749: Vim9: crash when closure fails in nested function
Bram Moolenaar <Bram@vim.org>
parents:
22391
diff
changeset
|
5543 // Deal with any remaining closures, they may be in use somewhere. |
|
df1d7a560b35
patch 8.2.1749: Vim9: crash when closure fails in nested function
Bram Moolenaar <Bram@vim.org>
parents:
22391
diff
changeset
|
5544 if (ectx.ec_funcrefs.ga_len > 0) |
|
23249
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
5545 { |
|
22401
df1d7a560b35
patch 8.2.1749: Vim9: crash when closure fails in nested function
Bram Moolenaar <Bram@vim.org>
parents:
22391
diff
changeset
|
5546 handle_closure_in_use(&ectx, FALSE); |
|
26662
4b23672d1f0e
patch 8.2.3860: Vim9: codecov struggles with the file size
Bram Moolenaar <Bram@vim.org>
parents:
26644
diff
changeset
|
5547 ga_clear(&ectx.ec_funcrefs); |
|
23249
43532077b5ff
patch 8.2.2170: Vim9: a global function defined in a :def function fails
Bram Moolenaar <Bram@vim.org>
parents:
23233
diff
changeset
|
5548 } |
|
22401
df1d7a560b35
patch 8.2.1749: Vim9: crash when closure fails in nested function
Bram Moolenaar <Bram@vim.org>
parents:
22391
diff
changeset
|
5549 |
|
21969
ba2415df82d7
patch 8.2.1534: Vim9: type error for argument type is not at call position
Bram Moolenaar <Bram@vim.org>
parents:
21933
diff
changeset
|
5550 estack_pop(); |
|
ba2415df82d7
patch 8.2.1534: Vim9: type error for argument type is not at call position
Bram Moolenaar <Bram@vim.org>
parents:
21933
diff
changeset
|
5551 current_sctx = save_current_sctx; |
|
ba2415df82d7
patch 8.2.1534: Vim9: type error for argument type is not at call position
Bram Moolenaar <Bram@vim.org>
parents:
21933
diff
changeset
|
5552 |
|
26445
568f93dcdc62
patch 8.2.3753: Vim9: function unreferenced while called is never deleted
Bram Moolenaar <Bram@vim.org>
parents:
26430
diff
changeset
|
5553 if (--ufunc->uf_calls <= 0 && ufunc->uf_refcount <= 0) |
|
568f93dcdc62
patch 8.2.3753: Vim9: function unreferenced while called is never deleted
Bram Moolenaar <Bram@vim.org>
parents:
26430
diff
changeset
|
5554 // Function was unreferenced while being used, free it now. |
|
568f93dcdc62
patch 8.2.3753: Vim9: function unreferenced while called is never deleted
Bram Moolenaar <Bram@vim.org>
parents:
26430
diff
changeset
|
5555 func_clear_free(ufunc, FALSE); |
|
24146
03fc95628eb0
patch 8.2.2614: Vim9: function is deleted while executing
Bram Moolenaar <Bram@vim.org>
parents:
24128
diff
changeset
|
5556 |
|
22621
576a69fc0066
patch 8.2.1859: Vim9: crash in unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
22614
diff
changeset
|
5557 if (*msg_list != NULL && saved_msg_list != NULL) |
|
576a69fc0066
patch 8.2.1859: Vim9: crash in unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
22614
diff
changeset
|
5558 { |
|
576a69fc0066
patch 8.2.1859: Vim9: crash in unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
22614
diff
changeset
|
5559 msglist_T **plist = saved_msg_list; |
|
576a69fc0066
patch 8.2.1859: Vim9: crash in unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
22614
diff
changeset
|
5560 |
|
576a69fc0066
patch 8.2.1859: Vim9: crash in unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
22614
diff
changeset
|
5561 // Append entries from the current msg_list (uncaught exceptions) to |
|
576a69fc0066
patch 8.2.1859: Vim9: crash in unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
22614
diff
changeset
|
5562 // the saved msg_list. |
|
576a69fc0066
patch 8.2.1859: Vim9: crash in unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
22614
diff
changeset
|
5563 while (*plist != NULL) |
|
576a69fc0066
patch 8.2.1859: Vim9: crash in unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
22614
diff
changeset
|
5564 plist = &(*plist)->next; |
|
576a69fc0066
patch 8.2.1859: Vim9: crash in unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
22614
diff
changeset
|
5565 |
|
576a69fc0066
patch 8.2.1859: Vim9: crash in unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
22614
diff
changeset
|
5566 *plist = *msg_list; |
|
576a69fc0066
patch 8.2.1859: Vim9: crash in unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
22614
diff
changeset
|
5567 } |
|
576a69fc0066
patch 8.2.1859: Vim9: crash in unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
22614
diff
changeset
|
5568 msg_list = saved_msg_list; |
|
576a69fc0066
patch 8.2.1859: Vim9: crash in unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
22614
diff
changeset
|
5569 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5570 if (ectx.ec_funclocal.floc_restore_cmdmod) |
|
22703
f2bfee4ac356
patch 8.2.1900: Vim9: command modifiers do not work
Bram Moolenaar <Bram@vim.org>
parents:
22691
diff
changeset
|
5571 { |
|
f2bfee4ac356
patch 8.2.1900: Vim9: command modifiers do not work
Bram Moolenaar <Bram@vim.org>
parents:
22691
diff
changeset
|
5572 cmdmod.cmod_filter_regmatch.regprog = NULL; |
|
f2bfee4ac356
patch 8.2.1900: Vim9: command modifiers do not work
Bram Moolenaar <Bram@vim.org>
parents:
22691
diff
changeset
|
5573 undo_cmdmod(&cmdmod); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5574 cmdmod = ectx.ec_funclocal.floc_save_cmdmod; |
|
22703
f2bfee4ac356
patch 8.2.1900: Vim9: command modifiers do not work
Bram Moolenaar <Bram@vim.org>
parents:
22691
diff
changeset
|
5575 } |
|
23102
3239b0f3c592
patch 8.2.2097: Vim9: using :silent! when calling a function prevents abort
Bram Moolenaar <Bram@vim.org>
parents:
23100
diff
changeset
|
5576 emsg_silent_def = save_emsg_silent_def; |
|
3239b0f3c592
patch 8.2.2097: Vim9: using :silent! when calling a function prevents abort
Bram Moolenaar <Bram@vim.org>
parents:
23100
diff
changeset
|
5577 did_emsg_def += save_did_emsg_def; |
|
22691
dda110a14be4
patch 8.2.1894: Vim9: command modifiers are not supported
Bram Moolenaar <Bram@vim.org>
parents:
22641
diff
changeset
|
5578 |
|
20021
4895e5cf1746
patch 8.2.0566: Vim9: variable can be used uninitialized
Bram Moolenaar <Bram@vim.org>
parents:
20017
diff
changeset
|
5579 failed_early: |
|
28343
909994047400
patch 8.2.4697: Vim9: crash when adding a duplicate key to a dictionary
Bram Moolenaar <Bram@vim.org>
parents:
28309
diff
changeset
|
5580 // Free all arguments and local variables. |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5581 for (idx = 0; idx < ectx.ec_stack.ga_len; ++idx) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5582 clear_tv(STACK_TV(idx)); |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
5583 ex_nesting_level = orig_nesting_level; |
|
20247
e46e72aaff74
patch 8.2.0679: Vim9: incomplete support for closures
Bram Moolenaar <Bram@vim.org>
parents:
20244
diff
changeset
|
5584 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5585 vim_free(ectx.ec_stack.ga_data); |
|
19726
ad37a198a708
patch 8.2.0419: various memory leaks in Vim9 script code
Bram Moolenaar <Bram@vim.org>
parents:
19635
diff
changeset
|
5586 vim_free(ectx.ec_trystack.ga_data); |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5587 if (ectx.ec_outer_ref != NULL) |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
5588 { |
|
24858
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5589 if (ectx.ec_outer_ref->or_outer_allocated) |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5590 vim_free(ectx.ec_outer_ref->or_outer); |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5591 partial_unref(ectx.ec_outer_ref->or_partial); |
|
193cc8bd8a2f
patch 8.2.2967: Vim9: crash when using two levels of partials
Bram Moolenaar <Bram@vim.org>
parents:
24830
diff
changeset
|
5592 vim_free(ectx.ec_outer_ref); |
|
23559
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
5593 } |
|
64dfb69e7d46
patch 8.2.2322: Vim9: closure nested limiting to one level
Bram Moolenaar <Bram@vim.org>
parents:
23557
diff
changeset
|
5594 |
|
22310
74d0a7a30583
patch 8.2.1704: Vim9: crash in for loop when autoload script has an error
Bram Moolenaar <Bram@vim.org>
parents:
22302
diff
changeset
|
5595 // Not sure if this is necessary. |
|
74d0a7a30583
patch 8.2.1704: Vim9: crash in for loop when autoload script has an error
Bram Moolenaar <Bram@vim.org>
parents:
22302
diff
changeset
|
5596 suppress_errthrow = save_suppress_errthrow; |
|
74d0a7a30583
patch 8.2.1704: Vim9: crash in for loop when autoload script has an error
Bram Moolenaar <Bram@vim.org>
parents:
22302
diff
changeset
|
5597 |
|
25260
a60895011da9
patch 8.2.3166: Vim9: nested autoload call error overruled by "Unknown error"
Bram Moolenaar <Bram@vim.org>
parents:
25222
diff
changeset
|
5598 if (ret != OK && did_emsg_cumul + did_emsg == did_emsg_before |
|
a60895011da9
patch 8.2.3166: Vim9: nested autoload call error overruled by "Unknown error"
Bram Moolenaar <Bram@vim.org>
parents:
25222
diff
changeset
|
5599 && !need_rethrow) |
|
21821
0deb6f96a5a3
patch 8.2.1460: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
21815
diff
changeset
|
5600 semsg(_(e_unknown_error_while_executing_str), |
|
21401
aa7675a4a0cd
patch 8.2.1251: Vim9: warning for pointer usage, test failure undetected
Bram Moolenaar <Bram@vim.org>
parents:
21399
diff
changeset
|
5601 printable_func_name(ufunc)); |
|
22908
54219df706b5
patch 8.2.2001: Vim9: :def function does not apply 'maxfuncdepth'
Bram Moolenaar <Bram@vim.org>
parents:
22860
diff
changeset
|
5602 funcdepth_restore(orig_funcdepth); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5603 return ret; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5604 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5605 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5606 /* |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5607 * List instructions "instr" up to "instr_count" or until ISN_FINISH. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5608 * "ufunc" has the source lines, NULL for the instructions of ISN_SUBSTITUTE. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5609 * "pfx" is prefixed to every line. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5610 */ |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5611 static void |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5612 list_instructions(char *pfx, isn_T *instr, int instr_count, ufunc_T *ufunc) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5613 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5614 int line_idx = 0; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5615 int prev_current = 0; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5616 int current; |
|
24504
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5617 int def_arg_idx = 0; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5618 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5619 for (current = 0; current < instr_count; ++current) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5620 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5621 isn_T *iptr = &instr[current]; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5622 char *line; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5623 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5624 if (ufunc != NULL) |
|
24504
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5625 { |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5626 while (line_idx < iptr->isn_lnum |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5627 && line_idx < ufunc->uf_lines.ga_len) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5628 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5629 if (current > prev_current) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5630 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5631 msg_puts("\n\n"); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5632 prev_current = current; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5633 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5634 line = ((char **)ufunc->uf_lines.ga_data)[line_idx++]; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5635 if (line != NULL) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5636 msg(line); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5637 } |
|
24504
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5638 if (iptr->isn_type == ISN_JUMP_IF_ARG_SET) |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5639 { |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5640 int first_def_arg = ufunc->uf_args.ga_len |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5641 - ufunc->uf_def_args.ga_len; |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5642 |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5643 if (def_arg_idx > 0) |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5644 msg_puts("\n\n"); |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5645 msg_start(); |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5646 msg_puts(" "); |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5647 msg_puts(((char **)(ufunc->uf_args.ga_data))[ |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5648 first_def_arg + def_arg_idx]); |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5649 msg_puts(" = "); |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5650 msg_puts(((char **)(ufunc->uf_def_args.ga_data))[def_arg_idx++]); |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5651 msg_clr_eos(); |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5652 msg_end(); |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5653 } |
|
e7577f79d6eb
patch 8.2.2792: Vim9: :disas shows instructions for default args but no text
Bram Moolenaar <Bram@vim.org>
parents:
24490
diff
changeset
|
5654 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5655 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5656 switch (iptr->isn_type) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5657 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5658 case ISN_EXEC: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5659 smsg("%s%4d EXEC %s", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5660 break; |
|
24826
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
5661 case ISN_EXEC_SPLIT: |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
5662 smsg("%s%4d EXEC_SPLIT %s", pfx, current, iptr->isn_arg.string); |
|
a8d64f1a223b
patch 8.2.2951: Vim9: cannot use heredoc for :python, :lua, etc.
Bram Moolenaar <Bram@vim.org>
parents:
24816
diff
changeset
|
5663 break; |
|
26370
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
5664 case ISN_EXECRANGE: |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
5665 smsg("%s%4d EXECRANGE %s", pfx, current, iptr->isn_arg.string); |
|
a3a0885d9dd8
patch 8.2.3716: Vim9: range without a command is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
26325
diff
changeset
|
5666 break; |
|
24645
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
5667 case ISN_LEGACY_EVAL: |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
5668 smsg("%s%4d EVAL legacy %s", pfx, current, |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
5669 iptr->isn_arg.string); |
|
668df21d8bc6
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Bram Moolenaar <Bram@vim.org>
parents:
24637
diff
changeset
|
5670 break; |
|
24490
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
5671 case ISN_REDIRSTART: |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
5672 smsg("%s%4d REDIR", pfx, current); |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
5673 break; |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
5674 case ISN_REDIREND: |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
5675 smsg("%s%4d REDIR END%s", pfx, current, |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
5676 iptr->isn_arg.number ? " append" : ""); |
|
08050e45bd06
patch 8.2.2785: Vim9: cannot redirect to local variable
Bram Moolenaar <Bram@vim.org>
parents:
24488
diff
changeset
|
5677 break; |
|
24590
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
5678 case ISN_CEXPR_AUCMD: |
|
24594
5c456a88f651
patch 8.2.2836: build failure without the +quickfix feature
Bram Moolenaar <Bram@vim.org>
parents:
24590
diff
changeset
|
5679 #ifdef FEAT_QUICKFIX |
|
24590
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
5680 smsg("%s%4d CEXPR pre %s", pfx, current, |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
5681 cexpr_get_auname(iptr->isn_arg.number)); |
|
24594
5c456a88f651
patch 8.2.2836: build failure without the +quickfix feature
Bram Moolenaar <Bram@vim.org>
parents:
24590
diff
changeset
|
5682 #endif |
|
24590
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
5683 break; |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
5684 case ISN_CEXPR_CORE: |
|
24594
5c456a88f651
patch 8.2.2836: build failure without the +quickfix feature
Bram Moolenaar <Bram@vim.org>
parents:
24590
diff
changeset
|
5685 #ifdef FEAT_QUICKFIX |
|
24590
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
5686 { |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
5687 cexprref_T *cer = iptr->isn_arg.cexpr.cexpr_ref; |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
5688 |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
5689 smsg("%s%4d CEXPR core %s%s \"%s\"", pfx, current, |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
5690 cexpr_get_auname(cer->cer_cmdidx), |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
5691 cer->cer_forceit ? "!" : "", |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
5692 cer->cer_cmdline); |
|
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
5693 } |
|
24594
5c456a88f651
patch 8.2.2836: build failure without the +quickfix feature
Bram Moolenaar <Bram@vim.org>
parents:
24590
diff
changeset
|
5694 #endif |
|
24590
2818f846f099
patch 8.2.2834: Vim9: :cexpr does not work with local variables
Bram Moolenaar <Bram@vim.org>
parents:
24549
diff
changeset
|
5695 break; |
|
24606
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5696 case ISN_INSTR: |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5697 smsg("%s%4d INSTR", pfx, current); |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5698 list_instructions(" ", iptr->isn_arg.instr, INT_MAX, NULL); |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5699 msg(" -------------"); |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5700 break; |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5701 case ISN_SOURCE: |
|
24606
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5702 { |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5703 scriptitem_T *si = SCRIPT_ITEM(iptr->isn_arg.number); |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5704 |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5705 smsg("%s%4d SOURCE %s", pfx, current, si->sn_name); |
|
24606
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5706 } |
|
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
5707 break; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5708 case ISN_SUBSTITUTE: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5709 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5710 subs_T *subs = &iptr->isn_arg.subs; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5711 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5712 smsg("%s%4d SUBSTITUTE %s", pfx, current, subs->subs_cmd); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5713 list_instructions(" ", subs->subs_instr, INT_MAX, NULL); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5714 msg(" -------------"); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5715 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5716 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5717 case ISN_EXECCONCAT: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5718 smsg("%s%4d EXECCONCAT %lld", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5719 (varnumber_T)iptr->isn_arg.number); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5720 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5721 case ISN_ECHO: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5722 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5723 echo_T *echo = &iptr->isn_arg.echo; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5724 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5725 smsg("%s%4d %s %d", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5726 echo->echo_with_white ? "ECHO" : "ECHON", |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5727 echo->echo_count); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5728 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5729 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5730 case ISN_EXECUTE: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5731 smsg("%s%4d EXECUTE %lld", pfx, current, |
|
25541
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
5732 (varnumber_T)(iptr->isn_arg.number)); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5733 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5734 case ISN_ECHOMSG: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5735 smsg("%s%4d ECHOMSG %lld", pfx, current, |
|
25541
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
5736 (varnumber_T)(iptr->isn_arg.number)); |
|
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
5737 break; |
|
30025
d269dd3cd31d
patch 9.0.0350: :echowindow does not work in a compiled function
Bram Moolenaar <Bram@vim.org>
parents:
29429
diff
changeset
|
5738 case ISN_ECHOWINDOW: |
|
d269dd3cd31d
patch 9.0.0350: :echowindow does not work in a compiled function
Bram Moolenaar <Bram@vim.org>
parents:
29429
diff
changeset
|
5739 smsg("%s%4d ECHOWINDOW %lld", pfx, current, |
|
d269dd3cd31d
patch 9.0.0350: :echowindow does not work in a compiled function
Bram Moolenaar <Bram@vim.org>
parents:
29429
diff
changeset
|
5740 (varnumber_T)(iptr->isn_arg.number)); |
|
d269dd3cd31d
patch 9.0.0350: :echowindow does not work in a compiled function
Bram Moolenaar <Bram@vim.org>
parents:
29429
diff
changeset
|
5741 break; |
|
25541
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
5742 case ISN_ECHOCONSOLE: |
|
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
5743 smsg("%s%4d ECHOCONSOLE %lld", pfx, current, |
|
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
5744 (varnumber_T)(iptr->isn_arg.number)); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5745 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5746 case ISN_ECHOERR: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5747 smsg("%s%4d ECHOERR %lld", pfx, current, |
|
25541
2ae1d5a4ae5c
patch 8.2.3307: Vim9: :echoconsole cannot access local variables
Bram Moolenaar <Bram@vim.org>
parents:
25533
diff
changeset
|
5748 (varnumber_T)(iptr->isn_arg.number)); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5749 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5750 case ISN_LOAD: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5751 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5752 if (iptr->isn_arg.number < 0) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5753 smsg("%s%4d LOAD arg[%lld]", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5754 (varnumber_T)(iptr->isn_arg.number |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5755 + STACK_FRAME_SIZE)); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5756 else |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5757 smsg("%s%4d LOAD $%lld", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5758 (varnumber_T)(iptr->isn_arg.number)); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5759 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5760 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5761 case ISN_LOADOUTER: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5762 { |
|
28623
1d92ba691dc4
patch 8.2.4835: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28621
diff
changeset
|
5763 if (iptr->isn_arg.outer.outer_idx < 0) |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5764 smsg("%s%4d LOADOUTER level %d arg[%d]", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5765 iptr->isn_arg.outer.outer_depth, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5766 iptr->isn_arg.outer.outer_idx |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5767 + STACK_FRAME_SIZE); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5768 else |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5769 smsg("%s%4d LOADOUTER level %d $%d", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5770 iptr->isn_arg.outer.outer_depth, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5771 iptr->isn_arg.outer.outer_idx); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5772 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5773 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5774 case ISN_LOADV: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5775 smsg("%s%4d LOADV v:%s", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5776 get_vim_var_name(iptr->isn_arg.number)); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5777 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5778 case ISN_LOADSCRIPT: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5779 { |
|
25461
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5780 scriptref_T *sref = iptr->isn_arg.script.scriptref; |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5781 scriptitem_T *si = SCRIPT_ITEM(sref->sref_sid); |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5782 svar_T *sv; |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5783 |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5784 sv = get_script_svar(sref, -1); |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5785 if (sv == NULL) |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5786 smsg("%s%4d LOADSCRIPT [deleted] from %s", |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5787 pfx, current, si->sn_name); |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5788 else |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5789 smsg("%s%4d LOADSCRIPT %s-%d from %s", pfx, current, |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5790 sv->sv_name, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5791 sref->sref_idx, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5792 si->sn_name); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5793 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5794 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5795 case ISN_LOADS: |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5796 case ISN_LOADEXPORT: |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5797 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5798 scriptitem_T *si = SCRIPT_ITEM( |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5799 iptr->isn_arg.loadstore.ls_sid); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5800 |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5801 smsg("%s%4d %s s:%s from %s", pfx, current, |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5802 iptr->isn_type == ISN_LOADS ? "LOADS" |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5803 : "LOADEXPORT", |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5804 iptr->isn_arg.loadstore.ls_name, si->sn_name); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5805 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5806 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5807 case ISN_LOADAUTO: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5808 smsg("%s%4d LOADAUTO %s", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5809 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5810 case ISN_LOADG: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5811 smsg("%s%4d LOADG g:%s", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5812 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5813 case ISN_LOADB: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5814 smsg("%s%4d LOADB b:%s", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5815 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5816 case ISN_LOADW: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5817 smsg("%s%4d LOADW w:%s", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5818 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5819 case ISN_LOADT: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5820 smsg("%s%4d LOADT t:%s", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5821 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5822 case ISN_LOADGDICT: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5823 smsg("%s%4d LOAD g:", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5824 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5825 case ISN_LOADBDICT: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5826 smsg("%s%4d LOAD b:", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5827 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5828 case ISN_LOADWDICT: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5829 smsg("%s%4d LOAD w:", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5830 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5831 case ISN_LOADTDICT: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5832 smsg("%s%4d LOAD t:", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5833 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5834 case ISN_LOADOPT: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5835 smsg("%s%4d LOADOPT %s", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5836 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5837 case ISN_LOADENV: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5838 smsg("%s%4d LOADENV %s", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5839 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5840 case ISN_LOADREG: |
|
25461
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5841 smsg("%s%4d LOADREG @%c", pfx, current, |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5842 (int)(iptr->isn_arg.number)); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5843 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5844 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5845 case ISN_STORE: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5846 if (iptr->isn_arg.number < 0) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5847 smsg("%s%4d STORE arg[%lld]", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5848 iptr->isn_arg.number + STACK_FRAME_SIZE); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5849 else |
|
25461
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5850 smsg("%s%4d STORE $%lld", pfx, current, |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5851 iptr->isn_arg.number); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5852 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5853 case ISN_STOREOUTER: |
|
28625
56860e29ce5d
patch 8.2.4836: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28623
diff
changeset
|
5854 smsg("%s%4d STOREOUTER level %d $%d", pfx, current, |
|
56860e29ce5d
patch 8.2.4836: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28623
diff
changeset
|
5855 iptr->isn_arg.outer.outer_depth, |
|
56860e29ce5d
patch 8.2.4836: Vim9: some lines not covered by tests
Bram Moolenaar <Bram@vim.org>
parents:
28623
diff
changeset
|
5856 iptr->isn_arg.outer.outer_idx); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5857 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5858 case ISN_STOREV: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5859 smsg("%s%4d STOREV v:%s", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5860 get_vim_var_name(iptr->isn_arg.number)); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5861 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5862 case ISN_STOREAUTO: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5863 smsg("%s%4d STOREAUTO %s", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5864 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5865 case ISN_STOREG: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5866 smsg("%s%4d STOREG %s", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5867 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5868 case ISN_STOREB: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5869 smsg("%s%4d STOREB %s", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5870 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5871 case ISN_STOREW: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5872 smsg("%s%4d STOREW %s", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5873 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5874 case ISN_STORET: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5875 smsg("%s%4d STORET %s", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5876 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5877 case ISN_STORES: |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5878 case ISN_STOREEXPORT: |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5879 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5880 scriptitem_T *si = SCRIPT_ITEM( |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5881 iptr->isn_arg.loadstore.ls_sid); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5882 |
|
28249
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5883 smsg("%s%4d %s %s in %s", pfx, current, |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5884 iptr->isn_type == ISN_STORES |
|
4b322951ebac
patch 8.2.4650: "import autoload" only works with using 'runtimepath'
Bram Moolenaar <Bram@vim.org>
parents:
28233
diff
changeset
|
5885 ? "STORES" : "STOREEXPORT", |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5886 iptr->isn_arg.loadstore.ls_name, si->sn_name); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5887 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5888 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5889 case ISN_STORESCRIPT: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5890 { |
|
25461
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5891 scriptref_T *sref = iptr->isn_arg.script.scriptref; |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5892 scriptitem_T *si = SCRIPT_ITEM(sref->sref_sid); |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5893 svar_T *sv; |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5894 |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5895 sv = get_script_svar(sref, -1); |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5896 if (sv == NULL) |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5897 smsg("%s%4d STORESCRIPT [deleted] in %s", |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5898 pfx, current, si->sn_name); |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5899 else |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5900 smsg("%s%4d STORESCRIPT %s-%d in %s", pfx, current, |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5901 sv->sv_name, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5902 sref->sref_idx, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5903 si->sn_name); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5904 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5905 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5906 case ISN_STOREOPT: |
|
26470
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
5907 case ISN_STOREFUNCOPT: |
|
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
5908 smsg("%s%4d %s &%s", pfx, current, |
|
ff0310e6f889
patch 8.2.3765: Vim9: cannot use a lambda for 'opfunc' and others
Bram Moolenaar <Bram@vim.org>
parents:
26445
diff
changeset
|
5909 iptr->isn_type == ISN_STOREOPT ? "STOREOPT" : "STOREFUNCOPT", |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5910 iptr->isn_arg.storeopt.so_name); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5911 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5912 case ISN_STOREENV: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5913 smsg("%s%4d STOREENV $%s", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5914 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5915 case ISN_STOREREG: |
|
25461
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5916 smsg("%s%4d STOREREG @%c", pfx, current, |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
5917 (int)iptr->isn_arg.number); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5918 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5919 case ISN_STORENR: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5920 smsg("%s%4d STORE %lld in $%d", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5921 iptr->isn_arg.storenr.stnr_val, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5922 iptr->isn_arg.storenr.stnr_idx); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5923 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5924 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5925 case ISN_STOREINDEX: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5926 smsg("%s%4d STOREINDEX %s", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5927 vartype_name(iptr->isn_arg.vartype)); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5928 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5929 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5930 case ISN_STORERANGE: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5931 smsg("%s%4d STORERANGE", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5932 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5933 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5934 // constants |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5935 case ISN_PUSHNR: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5936 smsg("%s%4d PUSHNR %lld", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5937 (varnumber_T)(iptr->isn_arg.number)); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5938 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5939 case ISN_PUSHBOOL: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5940 case ISN_PUSHSPEC: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5941 smsg("%s%4d PUSH %s", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5942 get_var_special_name(iptr->isn_arg.number)); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5943 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5944 case ISN_PUSHF: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5945 #ifdef FEAT_FLOAT |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5946 smsg("%s%4d PUSHF %g", pfx, current, iptr->isn_arg.fnumber); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5947 #endif |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5948 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5949 case ISN_PUSHS: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5950 smsg("%s%4d PUSHS \"%s\"", pfx, current, iptr->isn_arg.string); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5951 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5952 case ISN_PUSHBLOB: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5953 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5954 char_u *r; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5955 char_u numbuf[NUMBUFLEN]; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5956 char_u *tofree; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5957 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5958 r = blob2string(iptr->isn_arg.blob, &tofree, numbuf); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5959 smsg("%s%4d PUSHBLOB %s", pfx, current, r); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5960 vim_free(tofree); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5961 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5962 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5963 case ISN_PUSHFUNC: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5964 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5965 char *name = (char *)iptr->isn_arg.string; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5966 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5967 smsg("%s%4d PUSHFUNC \"%s\"", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5968 name == NULL ? "[none]" : name); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5969 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5970 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5971 case ISN_PUSHCHANNEL: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5972 #ifdef FEAT_JOB_CHANNEL |
|
28156
088d8dc22045
patch 8.2.4602: Vim9: not enough test coverage for executing :def function
Bram Moolenaar <Bram@vim.org>
parents:
28152
diff
changeset
|
5973 smsg("%s%4d PUSHCHANNEL 0", pfx, current); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5974 #endif |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5975 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5976 case ISN_PUSHJOB: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5977 #ifdef FEAT_JOB_CHANNEL |
|
28156
088d8dc22045
patch 8.2.4602: Vim9: not enough test coverage for executing :def function
Bram Moolenaar <Bram@vim.org>
parents:
28152
diff
changeset
|
5978 smsg("%s%4d PUSHJOB \"no process\"", pfx, current); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5979 #endif |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5980 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5981 case ISN_PUSHEXC: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5982 smsg("%s%4d PUSH v:exception", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5983 break; |
|
27376
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
5984 case ISN_AUTOLOAD: |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
5985 smsg("%s%4d AUTOLOAD %s", pfx, current, iptr->isn_arg.string); |
|
1a6421c5be20
patch 8.2.4216: Vim9: cannot use a function from an autoload import directly
Bram Moolenaar <Bram@vim.org>
parents:
27340
diff
changeset
|
5986 break; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5987 case ISN_UNLET: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5988 smsg("%s%4d UNLET%s %s", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5989 iptr->isn_arg.unlet.ul_forceit ? "!" : "", |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5990 iptr->isn_arg.unlet.ul_name); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5991 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5992 case ISN_UNLETENV: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5993 smsg("%s%4d UNLETENV%s $%s", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5994 iptr->isn_arg.unlet.ul_forceit ? "!" : "", |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5995 iptr->isn_arg.unlet.ul_name); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5996 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5997 case ISN_UNLETINDEX: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5998 smsg("%s%4d UNLETINDEX", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
5999 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6000 case ISN_UNLETRANGE: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6001 smsg("%s%4d UNLETRANGE", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6002 break; |
|
25605
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
6003 case ISN_LOCKUNLOCK: |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
6004 smsg("%s%4d LOCKUNLOCK %s", pfx, current, iptr->isn_arg.string); |
|
6f13d9ea0d04
patch 8.2.3339: Vim9: cannot lock a member in a local dict
Bram Moolenaar <Bram@vim.org>
parents:
25591
diff
changeset
|
6005 break; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6006 case ISN_LOCKCONST: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6007 smsg("%s%4d LOCKCONST", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6008 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6009 case ISN_NEWLIST: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6010 smsg("%s%4d NEWLIST size %lld", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6011 (varnumber_T)(iptr->isn_arg.number)); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6012 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6013 case ISN_NEWDICT: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6014 smsg("%s%4d NEWDICT size %lld", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6015 (varnumber_T)(iptr->isn_arg.number)); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6016 break; |
|
28002
1012048eed26
patch 8.2.4526: Vim9: cannot set variables to a null value
Bram Moolenaar <Bram@vim.org>
parents:
27924
diff
changeset
|
6017 case ISN_NEWPARTIAL: |
|
1012048eed26
patch 8.2.4526: Vim9: cannot set variables to a null value
Bram Moolenaar <Bram@vim.org>
parents:
27924
diff
changeset
|
6018 smsg("%s%4d NEWPARTIAL", pfx, current); |
|
1012048eed26
patch 8.2.4526: Vim9: cannot set variables to a null value
Bram Moolenaar <Bram@vim.org>
parents:
27924
diff
changeset
|
6019 break; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6020 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6021 // function call |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6022 case ISN_BCALL: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6023 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6024 cbfunc_T *cbfunc = &iptr->isn_arg.bfunc; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6025 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6026 smsg("%s%4d BCALL %s(argc %d)", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6027 internal_func_name(cbfunc->cbf_idx), |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6028 cbfunc->cbf_argcount); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6029 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6030 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6031 case ISN_DCALL: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6032 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6033 cdfunc_T *cdfunc = &iptr->isn_arg.dfunc; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6034 dfunc_T *df = ((dfunc_T *)def_functions.ga_data) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6035 + cdfunc->cdf_idx; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6036 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6037 smsg("%s%4d DCALL %s(argc %d)", pfx, current, |
|
25461
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
6038 printable_func_name(df->df_ufunc), |
|
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
6039 cdfunc->cdf_argcount); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6040 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6041 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6042 case ISN_UCALL: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6043 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6044 cufunc_T *cufunc = &iptr->isn_arg.ufunc; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6045 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6046 smsg("%s%4d UCALL %s(argc %d)", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6047 cufunc->cuf_name, cufunc->cuf_argcount); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6048 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6049 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6050 case ISN_PCALL: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6051 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6052 cpfunc_T *cpfunc = &iptr->isn_arg.pfunc; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6053 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6054 smsg("%s%4d PCALL%s (argc %d)", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6055 cpfunc->cpf_top ? " top" : "", cpfunc->cpf_argcount); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6056 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6057 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6058 case ISN_PCALL_END: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6059 smsg("%s%4d PCALL end", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6060 break; |
|
30065
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
6061 case ISN_DEFER: |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
6062 smsg("%s%4d DEFER %d args", pfx, current, |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
6063 (int)iptr->isn_arg.defer.defer_argcount); |
|
6cf788ab844c
patch 9.0.0370: cleaning up afterwards can make a function messy
Bram Moolenaar <Bram@vim.org>
parents:
30025
diff
changeset
|
6064 break; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6065 case ISN_RETURN: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6066 smsg("%s%4d RETURN", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6067 break; |
|
24936
345619f35112
patch 8.2.3005: Vim9: using a void value does not give a proper error message
Bram Moolenaar <Bram@vim.org>
parents:
24932
diff
changeset
|
6068 case ISN_RETURN_VOID: |
|
345619f35112
patch 8.2.3005: Vim9: using a void value does not give a proper error message
Bram Moolenaar <Bram@vim.org>
parents:
24932
diff
changeset
|
6069 smsg("%s%4d RETURN void", pfx, current); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6070 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6071 case ISN_FUNCREF: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6072 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6073 funcref_T *funcref = &iptr->isn_arg.funcref; |
|
26323
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
6074 char_u *name; |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
6075 |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
6076 if (funcref->fr_func_name == NULL) |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
6077 { |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
6078 dfunc_T *df = ((dfunc_T *)def_functions.ga_data) |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
6079 + funcref->fr_dfunc_idx; |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
6080 name = df->df_ufunc->uf_name; |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
6081 } |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
6082 else |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
6083 name = funcref->fr_func_name; |
|
3841da4eac23
patch 8.2.3692: Vim9: cannot use :func inside a :def function
Bram Moolenaar <Bram@vim.org>
parents:
26252
diff
changeset
|
6084 smsg("%s%4d FUNCREF %s", pfx, current, name); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6085 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6086 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6087 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6088 case ISN_NEWFUNC: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6089 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6090 newfunc_T *newfunc = &iptr->isn_arg.newfunc; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6091 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6092 smsg("%s%4d NEWFUNC %s %s", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6093 newfunc->nf_lambda, newfunc->nf_global); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6094 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6095 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6096 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6097 case ISN_DEF: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6098 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6099 char_u *name = iptr->isn_arg.string; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6100 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6101 smsg("%s%4d DEF %s", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6102 name == NULL ? (char_u *)"" : name); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6103 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6104 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6105 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6106 case ISN_JUMP: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6107 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6108 char *when = "?"; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6109 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6110 switch (iptr->isn_arg.jump.jump_when) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6111 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6112 case JUMP_ALWAYS: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6113 when = "JUMP"; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6114 break; |
|
25814
dd4e86558836
patch 8.2.3442: Vim9: || and && are not handled at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25800
diff
changeset
|
6115 case JUMP_NEVER: |
|
dd4e86558836
patch 8.2.3442: Vim9: || and && are not handled at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25800
diff
changeset
|
6116 iemsg("JUMP_NEVER should not be used"); |
|
dd4e86558836
patch 8.2.3442: Vim9: || and && are not handled at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25800
diff
changeset
|
6117 break; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6118 case JUMP_AND_KEEP_IF_TRUE: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6119 when = "JUMP_AND_KEEP_IF_TRUE"; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6120 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6121 case JUMP_IF_FALSE: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6122 when = "JUMP_IF_FALSE"; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6123 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6124 case JUMP_IF_COND_FALSE: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6125 when = "JUMP_IF_COND_FALSE"; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6126 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6127 case JUMP_IF_COND_TRUE: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6128 when = "JUMP_IF_COND_TRUE"; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6129 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6130 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6131 smsg("%s%4d %s -> %d", pfx, current, when, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6132 iptr->isn_arg.jump.jump_where); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6133 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6134 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6135 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6136 case ISN_JUMP_IF_ARG_SET: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6137 smsg("%s%4d JUMP_IF_ARG_SET arg[%d] -> %d", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6138 iptr->isn_arg.jumparg.jump_arg_off + STACK_FRAME_SIZE, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6139 iptr->isn_arg.jump.jump_where); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6140 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6141 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6142 case ISN_FOR: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6143 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6144 forloop_T *forloop = &iptr->isn_arg.forloop; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6145 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6146 smsg("%s%4d FOR $%d -> %d", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6147 forloop->for_idx, forloop->for_end); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6148 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6149 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6150 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6151 case ISN_TRY: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6152 { |
|
26672
3516017e5f54
patch 8.2.3865: Vim9: compiler complains about using "try" as a struct member
Bram Moolenaar <Bram@vim.org>
parents:
26662
diff
changeset
|
6153 try_T *try = &iptr->isn_arg.tryref; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6154 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6155 if (try->try_ref->try_finally == 0) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6156 smsg("%s%4d TRY catch -> %d, endtry -> %d", |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6157 pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6158 try->try_ref->try_catch, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6159 try->try_ref->try_endtry); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6160 else |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6161 smsg("%s%4d TRY catch -> %d, finally -> %d, endtry -> %d", |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6162 pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6163 try->try_ref->try_catch, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6164 try->try_ref->try_finally, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6165 try->try_ref->try_endtry); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6166 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6167 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6168 case ISN_CATCH: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6169 smsg("%s%4d CATCH", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6170 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6171 case ISN_TRYCONT: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6172 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6173 trycont_T *trycont = &iptr->isn_arg.trycont; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6174 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6175 smsg("%s%4d TRY-CONTINUE %d level%s -> %d", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6176 trycont->tct_levels, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6177 trycont->tct_levels == 1 ? "" : "s", |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6178 trycont->tct_where); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6179 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6180 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6181 case ISN_FINALLY: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6182 smsg("%s%4d FINALLY", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6183 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6184 case ISN_ENDTRY: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6185 smsg("%s%4d ENDTRY", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6186 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6187 case ISN_THROW: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6188 smsg("%s%4d THROW", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6189 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6190 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6191 // expression operations on number |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6192 case ISN_OPNR: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6193 case ISN_OPFLOAT: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6194 case ISN_OPANY: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6195 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6196 char *what; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6197 char *ins; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6198 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6199 switch (iptr->isn_arg.op.op_type) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6200 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6201 case EXPR_MULT: what = "*"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6202 case EXPR_DIV: what = "/"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6203 case EXPR_REM: what = "%"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6204 case EXPR_SUB: what = "-"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6205 case EXPR_ADD: what = "+"; break; |
|
28962
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
6206 case EXPR_LSHIFT: what = "<<"; break; |
|
abdea69d21b6
patch 8.2.5003: cannot do bitwise shifts
Bram Moolenaar <Bram@vim.org>
parents:
28946
diff
changeset
|
6207 case EXPR_RSHIFT: what = ">>"; break; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6208 default: what = "???"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6209 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6210 switch (iptr->isn_type) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6211 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6212 case ISN_OPNR: ins = "OPNR"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6213 case ISN_OPFLOAT: ins = "OPFLOAT"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6214 case ISN_OPANY: ins = "OPANY"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6215 default: ins = "???"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6216 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6217 smsg("%s%4d %s %s", pfx, current, ins, what); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6218 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6219 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6220 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6221 case ISN_COMPAREBOOL: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6222 case ISN_COMPARESPECIAL: |
|
27924
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
6223 case ISN_COMPARENULL: |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6224 case ISN_COMPARENR: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6225 case ISN_COMPAREFLOAT: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6226 case ISN_COMPARESTRING: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6227 case ISN_COMPAREBLOB: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6228 case ISN_COMPARELIST: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6229 case ISN_COMPAREDICT: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6230 case ISN_COMPAREFUNC: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6231 case ISN_COMPAREANY: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6232 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6233 char *p; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6234 char buf[10]; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6235 char *type; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6236 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6237 switch (iptr->isn_arg.op.op_type) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6238 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6239 case EXPR_EQUAL: p = "=="; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6240 case EXPR_NEQUAL: p = "!="; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6241 case EXPR_GREATER: p = ">"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6242 case EXPR_GEQUAL: p = ">="; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6243 case EXPR_SMALLER: p = "<"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6244 case EXPR_SEQUAL: p = "<="; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6245 case EXPR_MATCH: p = "=~"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6246 case EXPR_IS: p = "is"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6247 case EXPR_ISNOT: p = "isnot"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6248 case EXPR_NOMATCH: p = "!~"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6249 default: p = "???"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6250 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6251 STRCPY(buf, p); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6252 if (iptr->isn_arg.op.op_ic == TRUE) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6253 strcat(buf, "?"); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6254 switch(iptr->isn_type) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6255 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6256 case ISN_COMPAREBOOL: type = "COMPAREBOOL"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6257 case ISN_COMPARESPECIAL: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6258 type = "COMPARESPECIAL"; break; |
|
27924
e6e3abc28c7a
patch 8.2.4487: Vim9: cannot compare with v:null
Bram Moolenaar <Bram@vim.org>
parents:
27918
diff
changeset
|
6259 case ISN_COMPARENULL: type = "COMPARENULL"; break; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6260 case ISN_COMPARENR: type = "COMPARENR"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6261 case ISN_COMPAREFLOAT: type = "COMPAREFLOAT"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6262 case ISN_COMPARESTRING: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6263 type = "COMPARESTRING"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6264 case ISN_COMPAREBLOB: type = "COMPAREBLOB"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6265 case ISN_COMPARELIST: type = "COMPARELIST"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6266 case ISN_COMPAREDICT: type = "COMPAREDICT"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6267 case ISN_COMPAREFUNC: type = "COMPAREFUNC"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6268 case ISN_COMPAREANY: type = "COMPAREANY"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6269 default: type = "???"; break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6270 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6271 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6272 smsg("%s%4d %s %s", pfx, current, type, buf); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6273 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6274 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6275 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6276 case ISN_ADDLIST: smsg("%s%4d ADDLIST", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6277 case ISN_ADDBLOB: smsg("%s%4d ADDBLOB", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6278 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6279 // expression operations |
|
28598
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
6280 case ISN_CONCAT: |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
6281 smsg("%s%4d CONCAT size %lld", pfx, current, |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
6282 (varnumber_T)(iptr->isn_arg.number)); |
|
d550054e1328
patch 8.2.4823: concat more than 2 strings in :def function is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28459
diff
changeset
|
6283 break; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6284 case ISN_STRINDEX: smsg("%s%4d STRINDEX", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6285 case ISN_STRSLICE: smsg("%s%4d STRSLICE", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6286 case ISN_BLOBINDEX: smsg("%s%4d BLOBINDEX", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6287 case ISN_BLOBSLICE: smsg("%s%4d BLOBSLICE", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6288 case ISN_LISTAPPEND: smsg("%s%4d LISTAPPEND", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6289 case ISN_BLOBAPPEND: smsg("%s%4d BLOBAPPEND", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6290 case ISN_LISTINDEX: smsg("%s%4d LISTINDEX", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6291 case ISN_LISTSLICE: smsg("%s%4d LISTSLICE", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6292 case ISN_ANYINDEX: smsg("%s%4d ANYINDEX", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6293 case ISN_ANYSLICE: smsg("%s%4d ANYSLICE", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6294 case ISN_SLICE: smsg("%s%4d SLICE %lld", |
|
25591
ea69398b40d1
patch 8.2.3332: Vim9: cannot assign to range in list
Bram Moolenaar <Bram@vim.org>
parents:
25545
diff
changeset
|
6295 pfx, current, iptr->isn_arg.number); break; |
|
24984
71b1e2ef0069
patch 8.2.3029: Vim9: crash when using operator and list unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
24980
diff
changeset
|
6296 case ISN_GETITEM: smsg("%s%4d ITEM %lld%s", pfx, current, |
|
71b1e2ef0069
patch 8.2.3029: Vim9: crash when using operator and list unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
24980
diff
changeset
|
6297 iptr->isn_arg.getitem.gi_index, |
|
71b1e2ef0069
patch 8.2.3029: Vim9: crash when using operator and list unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
24980
diff
changeset
|
6298 iptr->isn_arg.getitem.gi_with_op ? |
|
71b1e2ef0069
patch 8.2.3029: Vim9: crash when using operator and list unpack assignment
Bram Moolenaar <Bram@vim.org>
parents:
24980
diff
changeset
|
6299 " with op" : ""); break; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6300 case ISN_MEMBER: smsg("%s%4d MEMBER", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6301 case ISN_STRINGMEMBER: smsg("%s%4d MEMBER %s", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6302 iptr->isn_arg.string); break; |
|
25800
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
6303 case ISN_CLEARDICT: smsg("%s%4d CLEARDICT", pfx, current); break; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
6304 case ISN_USEDICT: smsg("%s%4d USEDICT", pfx, current); break; |
|
fe8d153cb268
patch 8.2.3435: Vim9: dict is not passed to dict function
Bram Moolenaar <Bram@vim.org>
parents:
25776
diff
changeset
|
6305 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6306 case ISN_NEGATENR: smsg("%s%4d NEGATENR", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6307 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6308 case ISN_CHECKTYPE: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6309 { |
|
28901
11609f025219
patch 8.2.4973: Vim9: type error for list unpack mentions argument
Bram Moolenaar <Bram@vim.org>
parents:
28809
diff
changeset
|
6310 checktype_T *ct = &iptr->isn_arg.type; |
|
11609f025219
patch 8.2.4973: Vim9: type error for list unpack mentions argument
Bram Moolenaar <Bram@vim.org>
parents:
28809
diff
changeset
|
6311 char *tofree; |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6312 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6313 if (ct->ct_arg_idx == 0) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6314 smsg("%s%4d CHECKTYPE %s stack[%d]", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6315 type_name(ct->ct_type, &tofree), |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6316 (int)ct->ct_off); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6317 else |
|
28901
11609f025219
patch 8.2.4973: Vim9: type error for list unpack mentions argument
Bram Moolenaar <Bram@vim.org>
parents:
28809
diff
changeset
|
6318 smsg("%s%4d CHECKTYPE %s stack[%d] %s %d", |
|
25591
ea69398b40d1
patch 8.2.3332: Vim9: cannot assign to range in list
Bram Moolenaar <Bram@vim.org>
parents:
25545
diff
changeset
|
6319 pfx, current, |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6320 type_name(ct->ct_type, &tofree), |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6321 (int)ct->ct_off, |
|
28901
11609f025219
patch 8.2.4973: Vim9: type error for list unpack mentions argument
Bram Moolenaar <Bram@vim.org>
parents:
28809
diff
changeset
|
6322 ct->ct_is_var ? "var": "arg", |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6323 (int)ct->ct_arg_idx); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6324 vim_free(tofree); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6325 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6326 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6327 case ISN_CHECKLEN: smsg("%s%4d CHECKLEN %s%d", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6328 iptr->isn_arg.checklen.cl_more_OK ? ">= " : "", |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6329 iptr->isn_arg.checklen.cl_min_len); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6330 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6331 case ISN_SETTYPE: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6332 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6333 char *tofree; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6334 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6335 smsg("%s%4d SETTYPE %s", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6336 type_name(iptr->isn_arg.type.ct_type, &tofree)); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6337 vim_free(tofree); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6338 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6339 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6340 case ISN_COND2BOOL: smsg("%s%4d COND2BOOL", pfx, current); break; |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
6341 case ISN_2BOOL: if (iptr->isn_arg.tobool.invert) |
|
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
6342 smsg("%s%4d INVERT %d (!val)", pfx, current, |
|
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
6343 iptr->isn_arg.tobool.offset); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6344 else |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
6345 smsg("%s%4d 2BOOL %d (!!val)", pfx, current, |
|
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
6346 iptr->isn_arg.tobool.offset); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6347 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6348 case ISN_2STRING: smsg("%s%4d 2STRING stack[%lld]", pfx, current, |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
6349 (varnumber_T)(iptr->isn_arg.tostring.offset)); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6350 break; |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
6351 case ISN_2STRING_ANY: smsg("%s%4d 2STRING_ANY stack[%lld]", |
|
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
6352 pfx, current, |
|
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
6353 (varnumber_T)(iptr->isn_arg.tostring.offset)); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6354 break; |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
6355 case ISN_RANGE: smsg("%s%4d RANGE %s", pfx, current, |
|
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
6356 iptr->isn_arg.string); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6357 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6358 case ISN_PUT: |
|
28809
d0241e74bfdb
patch 8.2.4928: various white space and cosmetic mistakes
Bram Moolenaar <Bram@vim.org>
parents:
28692
diff
changeset
|
6359 if (iptr->isn_arg.put.put_lnum == LNUM_VARIABLE_RANGE_ABOVE) |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6360 smsg("%s%4d PUT %c above range", |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
6361 pfx, current, iptr->isn_arg.put.put_regname); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6362 else if (iptr->isn_arg.put.put_lnum == LNUM_VARIABLE_RANGE) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6363 smsg("%s%4d PUT %c range", |
|
24796
7c1375eb1636
patch 8.2.2936: Vim9: converting number to bool uses wrong stack offset
Bram Moolenaar <Bram@vim.org>
parents:
24659
diff
changeset
|
6364 pfx, current, iptr->isn_arg.put.put_regname); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6365 else |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6366 smsg("%s%4d PUT %c %ld", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6367 iptr->isn_arg.put.put_regname, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6368 (long)iptr->isn_arg.put.put_lnum); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6369 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6370 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6371 case ISN_CMDMOD: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6372 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6373 char_u *buf; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6374 size_t len = produce_cmdmods( |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6375 NULL, iptr->isn_arg.cmdmod.cf_cmdmod, FALSE); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6376 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6377 buf = alloc(len + 1); |
|
25350
0c5b84c5862a
patch 8.2.3212: Vim9: execution speed can be improved
Bram Moolenaar <Bram@vim.org>
parents:
25330
diff
changeset
|
6378 if (likely(buf != NULL)) |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6379 { |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6380 (void)produce_cmdmods( |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6381 buf, iptr->isn_arg.cmdmod.cf_cmdmod, FALSE); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6382 smsg("%s%4d CMDMOD %s", pfx, current, buf); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6383 vim_free(buf); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6384 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6385 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6386 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6387 case ISN_CMDMOD_REV: smsg("%s%4d CMDMOD_REV", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6388 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6389 case ISN_PROF_START: |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6390 smsg("%s%4d PROFILE START line %d", pfx, current, |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6391 iptr->isn_lnum); |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6392 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6393 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6394 case ISN_PROF_END: |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6395 smsg("%s%4d PROFILE END", pfx, current); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6396 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6397 |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6398 case ISN_DEBUG: |
|
25004
70f55a30f03c
patch 8.2.3039: Vim9: breakpoint at a comment line does not work
Bram Moolenaar <Bram@vim.org>
parents:
24984
diff
changeset
|
6399 smsg("%s%4d DEBUG line %d-%d varcount %lld", pfx, current, |
|
70f55a30f03c
patch 8.2.3039: Vim9: breakpoint at a comment line does not work
Bram Moolenaar <Bram@vim.org>
parents:
24984
diff
changeset
|
6400 iptr->isn_arg.debug.dbg_break_lnum + 1, |
|
70f55a30f03c
patch 8.2.3039: Vim9: breakpoint at a comment line does not work
Bram Moolenaar <Bram@vim.org>
parents:
24984
diff
changeset
|
6401 iptr->isn_lnum, |
|
70f55a30f03c
patch 8.2.3039: Vim9: breakpoint at a comment line does not work
Bram Moolenaar <Bram@vim.org>
parents:
24984
diff
changeset
|
6402 iptr->isn_arg.debug.dbg_var_names_len); |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6403 break; |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6404 |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6405 case ISN_UNPACK: smsg("%s%4d UNPACK %d%s", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6406 iptr->isn_arg.unpack.unp_count, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6407 iptr->isn_arg.unpack.unp_semicolon ? " semicolon" : ""); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6408 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6409 case ISN_SHUFFLE: smsg("%s%4d SHUFFLE %d up %d", pfx, current, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6410 iptr->isn_arg.shuffle.shfl_item, |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6411 iptr->isn_arg.shuffle.shfl_up); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6412 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6413 case ISN_DROP: smsg("%s%4d DROP", pfx, current); break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6414 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6415 case ISN_FINISH: // End of list of instructions for ISN_SUBSTITUTE. |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6416 return; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6417 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6418 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6419 out_flush(); // output one line at a time |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6420 ui_breakcheck(); |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6421 if (got_int) |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6422 break; |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6423 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6424 } |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6425 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6426 /* |
|
24909
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6427 * Handle command line completion for the :disassemble command. |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6428 */ |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6429 void |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6430 set_context_in_disassemble_cmd(expand_T *xp, char_u *arg) |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6431 { |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6432 char_u *p; |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6433 |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6434 // Default: expand user functions, "debug" and "profile" |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6435 xp->xp_context = EXPAND_DISASSEMBLE; |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6436 xp->xp_pattern = arg; |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6437 |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6438 // first argument already typed: only user function names |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6439 if (*arg != NUL && *(p = skiptowhite(arg)) != NUL) |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6440 { |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6441 xp->xp_context = EXPAND_USER_FUNC; |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6442 xp->xp_pattern = skipwhite(p); |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6443 } |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6444 } |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6445 |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6446 /* |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6447 * Function given to ExpandGeneric() to obtain the list of :disassemble |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6448 * arguments. |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6449 */ |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6450 char_u * |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6451 get_disassemble_argument(expand_T *xp, int idx) |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6452 { |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6453 if (idx == 0) |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6454 return (char_u *)"debug"; |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6455 if (idx == 1) |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6456 return (char_u *)"profile"; |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6457 return get_user_func_name(xp, idx - 2); |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6458 } |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6459 |
|
09d222e89a84
patch 8.2.2992: Vim9: completion for :disassemble is incomplete
Bram Moolenaar <Bram@vim.org>
parents:
24899
diff
changeset
|
6460 /* |
|
23229
b545334ae654
patch 8.2.2160: various typos
Bram Moolenaar <Bram@vim.org>
parents:
23227
diff
changeset
|
6461 * ":disassemble". |
|
19334
61646c189622
patch 8.2.0225: compiling lambda not tested yet
Bram Moolenaar <Bram@vim.org>
parents:
19328
diff
changeset
|
6462 * We don't really need this at runtime, but we do have tests that require it, |
|
61646c189622
patch 8.2.0225: compiling lambda not tested yet
Bram Moolenaar <Bram@vim.org>
parents:
19328
diff
changeset
|
6463 * so always include this. |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6464 */ |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6465 void |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6466 ex_disassemble(exarg_T *eap) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6467 { |
|
19390
e4b326c9424a
patch 8.2.0253: crash when using :disassamble without argument
Bram Moolenaar <Bram@vim.org>
parents:
19342
diff
changeset
|
6468 char_u *arg = eap->arg; |
|
19281
9fcdeaa18bd1
patch 8.2.0199: Vim9 script commands not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
19221
diff
changeset
|
6469 ufunc_T *ufunc; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6470 dfunc_T *dfunc; |
|
28946
e78e398fff3d
patch 8.2.4995: still a compiler warning for possibly uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
28940
diff
changeset
|
6471 isn_T *instr = NULL; // init to shut up gcc warning |
|
e78e398fff3d
patch 8.2.4995: still a compiler warning for possibly uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
28940
diff
changeset
|
6472 int instr_count = 0; // init to shut up gcc warning |
|
28940
b02044bc8c20
patch 8.2.4992: compiler warning for possibly uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
28934
diff
changeset
|
6473 compiletype_T compile_type = CT_NONE; |
|
28934
a712ea475390
patch 8.2.4989: cannot specify a function name for :defcompile
Bram Moolenaar <Bram@vim.org>
parents:
28907
diff
changeset
|
6474 |
|
a712ea475390
patch 8.2.4989: cannot specify a function name for :defcompile
Bram Moolenaar <Bram@vim.org>
parents:
28907
diff
changeset
|
6475 ufunc = find_func_by_name(arg, &compile_type); |
|
a712ea475390
patch 8.2.4989: cannot specify a function name for :defcompile
Bram Moolenaar <Bram@vim.org>
parents:
28907
diff
changeset
|
6476 if (ufunc == NULL) |
|
19390
e4b326c9424a
patch 8.2.0253: crash when using :disassamble without argument
Bram Moolenaar <Bram@vim.org>
parents:
19342
diff
changeset
|
6477 return; |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6478 if (func_needs_compiling(ufunc, compile_type) |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6479 && compile_def_function(ufunc, FALSE, compile_type, NULL) == FAIL) |
|
20528
489cb75c76b6
patch 8.2.0818: Vim9: using a discovery phase doesn't work well
Bram Moolenaar <Bram@vim.org>
parents:
20433
diff
changeset
|
6480 return; |
|
20943
1693ca876049
patch 8.2.1023: Vim9: redefining a function uses a new index every time
Bram Moolenaar <Bram@vim.org>
parents:
20919
diff
changeset
|
6481 if (ufunc->uf_def_status != UF_COMPILED) |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6482 { |
|
21821
0deb6f96a5a3
patch 8.2.1460: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
21815
diff
changeset
|
6483 semsg(_(e_function_is_not_compiled_str), eap->arg); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6484 return; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6485 } |
|
25461
891d08245543
patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Bram Moolenaar <Bram@vim.org>
parents:
25425
diff
changeset
|
6486 msg((char *)printable_func_name(ufunc)); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6487 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6488 dfunc = ((dfunc_T *)def_functions.ga_data) + ufunc->uf_dfunc_idx; |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6489 switch (compile_type) |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6490 { |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6491 case CT_PROFILE: |
|
23719
1a7c2685d780
patch 8.2.2401: build fails without +profiling feature
Bram Moolenaar <Bram@vim.org>
parents:
23717
diff
changeset
|
6492 #ifdef FEAT_PROFILE |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6493 instr = dfunc->df_instr_prof; |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6494 instr_count = dfunc->df_instr_prof_count; |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6495 break; |
|
23719
1a7c2685d780
patch 8.2.2401: build fails without +profiling feature
Bram Moolenaar <Bram@vim.org>
parents:
23717
diff
changeset
|
6496 #endif |
|
24895
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6497 // FALLTHROUGH |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6498 case CT_NONE: |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6499 instr = dfunc->df_instr; |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6500 instr_count = dfunc->df_instr_count; |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6501 break; |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6502 case CT_DEBUG: |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6503 instr = dfunc->df_instr_debug; |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6504 instr_count = dfunc->df_instr_debug_count; |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6505 break; |
|
e61a2085c89b
patch 8.2.2985: Vim9: a compiled function cannot be debugged
Bram Moolenaar <Bram@vim.org>
parents:
24858
diff
changeset
|
6506 } |
|
24488
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6507 |
|
f293bb501b30
patch 8.2.2784: Vim9: cannot use =expr in :substitute
Bram Moolenaar <Bram@vim.org>
parents:
24482
diff
changeset
|
6508 list_instructions("", instr, instr_count, ufunc); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6509 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6510 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6511 /* |
|
22500
ef8a3177edc1
patch 8.2.1798: Vim9: trinary operator condition is too permissive
Bram Moolenaar <Bram@vim.org>
parents:
22494
diff
changeset
|
6512 * Return TRUE when "tv" is not falsy: non-zero, non-empty string, non-empty |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6513 * list, etc. Mostly like what JavaScript does, except that empty list and |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6514 * empty dictionary are FALSE. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6515 */ |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6516 int |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6517 tv2bool(typval_T *tv) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6518 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6519 switch (tv->v_type) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6520 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6521 case VAR_NUMBER: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6522 return tv->vval.v_number != 0; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6523 case VAR_FLOAT: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6524 #ifdef FEAT_FLOAT |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6525 return tv->vval.v_float != 0.0; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6526 #else |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6527 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6528 #endif |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6529 case VAR_PARTIAL: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6530 return tv->vval.v_partial != NULL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6531 case VAR_FUNC: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6532 case VAR_STRING: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6533 return 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
|
6534 case VAR_LIST: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6535 return tv->vval.v_list != NULL && tv->vval.v_list->lv_len > 0; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6536 case VAR_DICT: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6537 return tv->vval.v_dict != NULL |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6538 && tv->vval.v_dict->dv_hashtab.ht_used > 0; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6539 case VAR_BOOL: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6540 case VAR_SPECIAL: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6541 return tv->vval.v_number == VVAL_TRUE ? TRUE : FALSE; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6542 case VAR_JOB: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6543 #ifdef FEAT_JOB_CHANNEL |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6544 return tv->vval.v_job != NULL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6545 #else |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6546 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6547 #endif |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6548 case VAR_CHANNEL: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6549 #ifdef FEAT_JOB_CHANNEL |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6550 return tv->vval.v_channel != NULL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6551 #else |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6552 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6553 #endif |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6554 case VAR_BLOB: |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6555 return tv->vval.v_blob != NULL && tv->vval.v_blob->bv_ga.ga_len > 0; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6556 case VAR_UNKNOWN: |
|
19922
1f42c49c3d29
patch 8.2.0517: Vim9: cannot separate "func" and "func(): void"
Bram Moolenaar <Bram@vim.org>
parents:
19912
diff
changeset
|
6557 case VAR_ANY: |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6558 case VAR_VOID: |
|
24606
a4fda40e0bb9
patch 8.2.2842: Vim9: skip argument to searchpair() is not compiled
Bram Moolenaar <Bram@vim.org>
parents:
24594
diff
changeset
|
6559 case VAR_INSTR: |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6560 break; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6561 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6562 return FALSE; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6563 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6564 |
|
22860
53acb89ec9f2
patch 8.2.1977: Vim9: error for using a string in a condition is confusing
Bram Moolenaar <Bram@vim.org>
parents:
22810
diff
changeset
|
6565 void |
|
53acb89ec9f2
patch 8.2.1977: Vim9: error for using a string in a condition is confusing
Bram Moolenaar <Bram@vim.org>
parents:
22810
diff
changeset
|
6566 emsg_using_string_as(typval_T *tv, int as_number) |
|
53acb89ec9f2
patch 8.2.1977: Vim9: error for using a string in a condition is confusing
Bram Moolenaar <Bram@vim.org>
parents:
22810
diff
changeset
|
6567 { |
|
53acb89ec9f2
patch 8.2.1977: Vim9: error for using a string in a condition is confusing
Bram Moolenaar <Bram@vim.org>
parents:
22810
diff
changeset
|
6568 semsg(_(as_number ? e_using_string_as_number_str |
|
53acb89ec9f2
patch 8.2.1977: Vim9: error for using a string in a condition is confusing
Bram Moolenaar <Bram@vim.org>
parents:
22810
diff
changeset
|
6569 : e_using_string_as_bool_str), |
|
53acb89ec9f2
patch 8.2.1977: Vim9: error for using a string in a condition is confusing
Bram Moolenaar <Bram@vim.org>
parents:
22810
diff
changeset
|
6570 tv->vval.v_string == NULL |
|
53acb89ec9f2
patch 8.2.1977: Vim9: error for using a string in a condition is confusing
Bram Moolenaar <Bram@vim.org>
parents:
22810
diff
changeset
|
6571 ? (char_u *)"" : tv->vval.v_string); |
|
53acb89ec9f2
patch 8.2.1977: Vim9: error for using a string in a condition is confusing
Bram Moolenaar <Bram@vim.org>
parents:
22810
diff
changeset
|
6572 } |
|
53acb89ec9f2
patch 8.2.1977: Vim9: error for using a string in a condition is confusing
Bram Moolenaar <Bram@vim.org>
parents:
22810
diff
changeset
|
6573 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6574 /* |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6575 * If "tv" is a string give an error and return FAIL. |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6576 */ |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6577 int |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6578 check_not_string(typval_T *tv) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6579 { |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6580 if (tv->v_type == VAR_STRING) |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6581 { |
|
22860
53acb89ec9f2
patch 8.2.1977: Vim9: error for using a string in a condition is confusing
Bram Moolenaar <Bram@vim.org>
parents:
22810
diff
changeset
|
6582 emsg_using_string_as(tv, TRUE); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6583 clear_tv(tv); |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6584 return FAIL; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6585 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6586 return OK; |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6587 } |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6588 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6589 |
|
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6590 #endif // FEAT_EVAL |