Mercurial > vim
changeset 21148:667192c5938b v8.2.1125
patch 8.2.1125: Vim9: double quote can be a string or a comment
Commit: https://github.com/vim/vim/commit/962d7213194647e90f9bdc608f693d39dd07cbd5
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 4 14:15:00 2020 +0200
patch 8.2.1125: Vim9: double quote can be a string or a comment
Problem: Vim9: double quote can be a string or a comment.
Solution: Only support comments starting with # to avoid confusion.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 04 Jul 2020 14:30:04 +0200 |
| parents | 569f5ca4ac7b |
| children | 88c6f4be165f |
| files | src/dict.c src/eval.c src/list.c src/proto/eval.pro src/version.c src/vim9script.c |
| diffstat | 6 files changed, 15 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dict.c +++ b/src/dict.c @@ -787,8 +787,8 @@ get_literal_key(char_u **arg, typval_T * /* * Allocate a variable for a Dictionary and fill it from "*arg". + * "*arg" points to the "{". * "literal" is TRUE for #{key: val} - * "flags" can have EVAL_EVALUATE and other EVAL_ flags. * Return OK or FAIL. Returns NOTDONE for {expr}. */ int @@ -830,7 +830,7 @@ eval_dict(char_u **arg, typval_T *rettv, tvkey.v_type = VAR_UNKNOWN; tv.v_type = VAR_UNKNOWN; - *arg = skipwhite_and_linebreak_keep_string(*arg + 1, evalarg); + *arg = skipwhite_and_linebreak(*arg + 1, evalarg); while (**arg != '}' && **arg != NUL) { if ((literal @@ -862,7 +862,7 @@ eval_dict(char_u **arg, typval_T *rettv, goto failret; } - *arg = skipwhite_and_linebreak_keep_string(*arg + 1, evalarg); + *arg = skipwhite_and_linebreak(*arg + 1, evalarg); if (eval1(arg, &tv, evalarg) == FAIL) // recursive! { if (evaluate) @@ -904,7 +904,7 @@ eval_dict(char_u **arg, typval_T *rettv, } // the "}" can be on the next line - *arg = skipwhite_and_linebreak_keep_string(*arg, evalarg); + *arg = skipwhite_and_linebreak(*arg, evalarg); if (**arg == '}') break; if (!had_comma)
--- a/src/eval.c +++ b/src/eval.c @@ -1866,9 +1866,9 @@ eval_func( } /* - * If inside Vim9 script, "arg" points to the end of a line (ignoring comments) - * and there is a next line, return the next line (skipping blanks) and set - * "getnext". + * If inside Vim9 script, "arg" points to the end of a line (ignoring a # + * comment) and there is a next line, return the next line (skipping blanks) + * and set "getnext". * Otherwise just return "arg" unmodified and set "getnext" to FALSE. * "arg" must point somewhere inside a line, not at the start. */ @@ -1880,7 +1880,7 @@ eval_next_non_blank(char_u *arg, evalarg && evalarg != NULL && evalarg->eval_cookie != NULL && (*arg == NUL || (VIM_ISWHITE(arg[-1]) - && (*arg == '"' || *arg == '#')))) + && *arg == '#' && arg[1] != '{'))) { char_u *p = getline_peek(evalarg->eval_getline, evalarg->eval_cookie); @@ -1927,6 +1927,8 @@ skipwhite_and_linebreak(char_u *arg, eva int getnext; char_u *p = skipwhite(arg); + if (evalarg == NULL) + return skipwhite(arg); eval_next_non_blank(p, evalarg, &getnext); if (getnext) return eval_next_line(evalarg); @@ -1934,20 +1936,6 @@ skipwhite_and_linebreak(char_u *arg, eva } /* - * Call eval_next_non_blank() and get the next line if needed, but not when a - * double quote follows. Used inside an expression. - */ - char_u * -skipwhite_and_linebreak_keep_string(char_u *arg, evalarg_T *evalarg) -{ - char_u *p = skipwhite(arg); - - if (*p == '"') - return p; - return skipwhite_and_linebreak(arg, evalarg); -} - -/* * After using "evalarg" filled from "eap" free the memory. */ void
--- a/src/list.c +++ b/src/list.c @@ -1177,7 +1177,7 @@ eval_list(char_u **arg, typval_T *rettv, return FAIL; } - *arg = skipwhite_and_linebreak_keep_string(*arg + 1, evalarg); + *arg = skipwhite_and_linebreak(*arg + 1, evalarg); while (**arg != ']' && **arg != NUL) { if (eval1(arg, &tv, evalarg) == FAIL) // recursive! @@ -1209,7 +1209,7 @@ eval_list(char_u **arg, typval_T *rettv, // The "]" can be on the next line. But a double quoted string may // follow, not a comment. - *arg = skipwhite_and_linebreak_keep_string(*arg, evalarg); + *arg = skipwhite_and_linebreak(*arg, evalarg); if (**arg == ']') break;
--- a/src/proto/eval.pro +++ b/src/proto/eval.pro @@ -32,7 +32,6 @@ int pattern_match(char_u *pat, char_u *t char_u *eval_next_non_blank(char_u *arg, evalarg_T *evalarg, int *getnext); char_u *eval_next_line(evalarg_T *evalarg); char_u *skipwhite_and_linebreak(char_u *arg, evalarg_T *evalarg); -char_u *skipwhite_and_linebreak_keep_string(char_u *arg, evalarg_T *evalarg); void clear_evalarg(evalarg_T *evalarg, exarg_T *eap); int eval0(char_u *arg, typval_T *rettv, exarg_T *eap, evalarg_T *evalarg); int eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg);