diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-05-30 17:06:14 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-05-30 17:06:14 +0200 |
commit | 367d59e6ba65cf554d167933775fa17e40dcc6a7 (patch) | |
tree | a7d7fc8c309c7a57f2974c785fe1f1a3dd2875ea | |
parent | d5c2c7763d73b91efd64a49da8221f9955debdd5 (diff) |
patch 8.2.0847: typval related code is spread outv8.2.0847
Problem: Typval related code is spread out.
Solution: Move code to new typval.c file. (Yegappan Lakshmanan, closes #6093)
-rw-r--r-- | Filelist | 3 | ||||
-rw-r--r-- | src/Make_cyg_ming.mak | 1 | ||||
-rw-r--r-- | src/Make_morph.mak | 1 | ||||
-rw-r--r-- | src/Make_mvc.mak | 4 | ||||
-rw-r--r-- | src/Make_vms.mms | 5 | ||||
-rw-r--r-- | src/Makefile | 10 | ||||
-rw-r--r-- | src/README.md | 1 | ||||
-rw-r--r-- | src/eval.c | 1428 | ||||
-rw-r--r-- | src/evalfunc.c | 81 | ||||
-rw-r--r-- | src/globals.h | 3 | ||||
-rw-r--r-- | src/proto.h | 1 | ||||
-rw-r--r-- | src/proto/eval.pro | 22 | ||||
-rw-r--r-- | src/proto/evalfunc.pro | 3 | ||||
-rw-r--r-- | src/proto/typval.pro | 30 | ||||
-rw-r--r-- | src/typval.c | 1508 | ||||
-rw-r--r-- | src/version.c | 2 |
16 files changed, 1569 insertions, 1534 deletions
@@ -133,6 +133,7 @@ SRC_ALL = \ src/textobject.c \ src/textprop.c \ src/time.c \ + src/typval.c \ src/ui.c \ src/undo.c \ src/usercmd.c \ @@ -285,6 +286,7 @@ SRC_ALL = \ src/proto/textobject.pro \ src/proto/textprop.pro \ src/proto/time.pro \ + src/proto/typval.pro \ src/proto/ui.pro \ src/proto/undo.pro \ src/proto/usercmd.pro \ @@ -347,6 +349,7 @@ SRC_ALL = \ src/libvterm/t/29state_fallback.test \ src/libvterm/t/30state_pen.test \ src/libvterm/t/31state_rep.test \ + src/libvterm/t/32state_flow.test \ src/libvterm/t/60screen_ascii.test \ src/libvterm/t/61screen_unicode.test \ src/libvterm/t/62screen_damage.test \ diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 517ed2bfbc..d0b82f1b80 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -791,6 +791,7 @@ OBJ = \ $(OUTDIR)/textobject.o \ $(OUTDIR)/textprop.o \ $(OUTDIR)/time.o \ + $(OUTDIR)/typval.o \ $(OUTDIR)/ui.o \ $(OUTDIR)/undo.o \ $(OUTDIR)/usercmd.o \ diff --git a/src/Make_morph.mak b/src/Make_morph.mak index 43414e72cf..4efc1d67ab 100644 --- a/src/Make_morph.mak +++ b/src/Make_morph.mak @@ -107,6 +107,7 @@ SRC = arabic.c \ textobject.c \ textprop.c \ time.c \ + typval.c \ ui.c \ undo.c \ usercmd.c \ diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 8240f50568..aec94a981d 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -811,6 +811,7 @@ OBJ = \ $(OUTDIR)\textobject.obj \ $(OUTDIR)\textprop.obj \ $(OUTDIR)\time.obj \ + $(OUTDIR)\typval.obj \ $(OUTDIR)\ui.obj \ $(OUTDIR)\undo.obj \ $(OUTDIR)\usercmd.obj \ @@ -1755,6 +1756,8 @@ $(OUTDIR)/textprop.obj: $(OUTDIR) textprop.c $(INCL) $(OUTDIR)/time.obj: $(OUTDIR) time.c $(INCL) +$(OUTDIR)/typval.obj: $(OUTDIR) typval.c $(INCL) + $(OUTDIR)/ui.obj: $(OUTDIR) ui.c $(INCL) $(OUTDIR)/undo.obj: $(OUTDIR) undo.c $(INCL) @@ -1954,6 +1957,7 @@ proto.h: \ proto/textobject.pro \ proto/textprop.pro \ proto/time.pro \ + proto/typval.pro \ proto/ui.pro \ proto/undo.pro \ proto/usercmd.pro \ diff --git a/src/Make_vms.mms b/src/Make_vms.mms index 954d50a14f..e5ff857518 100644 --- a/src/Make_vms.mms +++ b/src/Make_vms.mms @@ -386,6 +386,7 @@ SRC = \ textobject.c \ textprop.c \ time.c \ + typval.c \ ui.c \ undo.c \ usercmd.c \ @@ -497,6 +498,7 @@ OBJ = \ textobject.obj \ textprop.obj \ time.obj \ + typval.obj \ ui.obj \ undo.obj \ usercmd.obj \ @@ -1005,6 +1007,9 @@ textprop.obj : textprop.c vim.h [.auto]config.h feature.h os_unix.h \ time.obj : time.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h +typval.obj : typval.c vim.h [.auto]config.h feature.h os_unix.h \ + ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h beval.h \ + [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h ui.obj : ui.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h diff --git a/src/Makefile b/src/Makefile index 9b50eca6d9..c4bce687dc 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1686,6 +1686,7 @@ BASIC_SRC = \ textobject.c \ textprop.c \ time.c \ + typval.c \ ui.c \ undo.c \ usercmd.c \ @@ -1830,6 +1831,7 @@ OBJ_COMMON = \ objects/textobject.o \ objects/textprop.o \ objects/time.o \ + objects/typval.o \ objects/ui.o \ objects/undo.o \ objects/usercmd.o \ @@ -2006,6 +2008,7 @@ PRO_AUTO = \ textobject.pro \ textprop.pro \ time.pro \ + typval.pro \ ui.pro \ undo.pro \ usercmd.pro \ @@ -3496,6 +3499,9 @@ objects/textprop.o: textprop.c objects/time.o: time.c $(CCC) -o $@ time.c +objects/typval.o: typval.c + $(CCC) -o $@ typval.c + objects/ui.o: ui.c $(CCC) -o $@ ui.c @@ -4098,6 +4104,10 @@ objects/time.o: time.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h +objects/typval.o: typval.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h objects/ui.o: ui.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ diff --git a/src/README.md b/src/README.md index 624bd6a829..6cc0704727 100644 --- a/src/README.md +++ b/src/README.md @@ -84,6 +84,7 @@ textformat.c | text formatting textobject.c | text objects textprop.c | text properties time.c | time and timer functions +typval.c | vim script type/value functions undo.c | undo and redo usercmd.c | user defined commands userfunc.c | user defined functions diff --git a/src/eval.c b/src/eval.c index 87b7644251..6f89030a60 100644 --- a/src/eval.c +++ b/src/eval.c @@ -21,9 +21,6 @@ #endif static char *e_dictrange = N_("E719: Cannot use [:] with a Dictionary"); -#ifdef FEAT_FLOAT -static char *e_float_as_string = N_("E806: using Float as a String"); -#endif #define NAMESPACE_CHAR (char_u *)"abglstvw" @@ -58,7 +55,6 @@ static int eval7_leader(typval_T *rettv, char_u *start_leader, char_u **end_lead static int free_unref_items(int copyID); static char_u *make_expanded_name(char_u *in_start, char_u *expr_start, char_u *expr_end, char_u *in_end); -static int tv_check_lock(typval_T *tv, char_u *name, int use_gettext); /* * Return "n1" divided by "n2", taking care of dividing by zero. @@ -3304,403 +3300,6 @@ eval_index( } /* - * Get an option value. - * "arg" points to the '&' or '+' before the option name. - * "arg" is advanced to character after the option name. - * Return OK or FAIL. - */ - int -get_option_tv( - char_u **arg, - typval_T *rettv, // when NULL, only check if option exists - int evaluate) -{ - char_u *option_end; - long numval; - char_u *stringval; - int opt_type; - int c; - int working = (**arg == '+'); // has("+option") - int ret = OK; - int opt_flags; - - /* - * Isolate the option name and find its value. - */ - option_end = find_option_end(arg, &opt_flags); - if (option_end == NULL) - { - if (rettv != NULL) - semsg(_("E112: Option name missing: %s"), *arg); - return FAIL; - } - - if (!evaluate) - { - *arg = option_end; - return OK; - } - - c = *option_end; - *option_end = NUL; - opt_type = get_option_value(*arg, &numval, - rettv == NULL ? NULL : &stringval, opt_flags); - - if (opt_type == -3) // invalid name - { - if (rettv != NULL) - semsg(_(e_unknown_option), *arg); - ret = FAIL; - } - else if (rettv != NULL) - { - if (opt_type == -2) // hidden string option - { - rettv->v_type = VAR_STRING; - rettv->vval.v_string = NULL; - } - else if (opt_type == -1) // hidden number option - { - rettv->v_type = VAR_NUMBER; - rettv->vval.v_number = 0; - } - else if (opt_type == 1) // number option - { - rettv->v_type = VAR_NUMBER; - rettv->vval.v_number = numval; - } - else // string option - { - rettv->v_type = VAR_STRING; - rettv->vval.v_string = stringval; - } - } - else if (working && (opt_type == -2 || opt_type == -1)) - ret = FAIL; - - *option_end = c; // put back for error messages - *arg = option_end; - - return ret; -} - -/* - * Allocate a variable for a number constant. Also deals with "0z" for blob. - * Return OK or FAIL. - */ - int -get_number_tv( - char_u **arg, - typval_T *rettv, - int evaluate, - int want_string UNUSED) -{ - int len; -#ifdef FEAT_FLOAT - char_u *p; - int get_float = FALSE; - - // We accept a float when the format matches - // "[0-9]\+\.[0-9]\+\([eE][+-]\?[0-9]\+\)\?". This is very - // strict to avoid backwards compatibility problems. - // With script version 2 and later the leading digit can be - // omitted. - // Don't look for a float after the "." operator, so that - // ":let vers = 1.2.3" doesn't fail. - if (**arg == '.') - p = *arg; - else - p = skipdigits(*arg + 1); - if (!want_string && p[0] == '.' && vim_isdigit(p[1])) - { - get_float = TRUE; - p = skipdigits(p + 2); - if (*p == 'e' || *p == 'E') - { - ++p; - if (*p == '-' || *p == '+') - ++p; - if (!vim_isdigit(*p)) - get_float = FALSE; - else - p = skipdigits(p + 1); - } - if (ASCII_ISALPHA(*p) || *p == '.') - get_float = FALSE; - } - if (get_float) - { - float_T f; - - *arg += string2float(*arg, &f); - if (evaluate) - { - rettv->v_type = VAR_FLOAT; - rettv->vval.v_float = f; - } - } - else -#endif - if (**arg == '0' && ((*arg)[1] == 'z' || (*arg)[1] == 'Z')) - { - char_u *bp; - blob_T *blob = NULL; // init for gcc - - // Blob constant: 0z0123456789abcdef - if (evaluate) - blob = blob_alloc(); - for (bp = *arg + 2; vim_isxdigit(bp[0]); bp += 2) - { - if (!vim_isxdigit(bp[1])) - { - if (blob != NULL) - { - emsg(_("E973: Blob literal should have an even number of hex characters")); - ga_clear(&blob->bv_ga); - VIM_CLEAR(blob); - } - return FAIL; - } - if (blob != NULL) - ga_append(&blob->bv_ga, - (hex2nr(*bp) << 4) + hex2nr(*(bp+1))); - if (bp[2] == '.' && vim_isxdigit(bp[3])) - ++bp; - } - if (blob != NULL) - rettv_blob_set(rettv, blob); - *arg = bp; - } - else - { - varnumber_T n; - - // decimal, hex or octal number - vim_str2nr(*arg, NULL, &len, current_sctx.sc_version >= 4 - ? STR2NR_NO_OCT + STR2NR_QUOTE - : STR2NR_ALL, &n, NULL, 0, TRUE); - if (len == 0) - { - semsg(_(e_invexpr2), *arg); - return FAIL; - } - *arg += len; - if (evaluate) - { - rettv->v_type = VAR_NUMBER; - rettv->vval.v_number = n; - } - } - return OK; -} - -/* - * Allocate a variable for a string constant. - * Return OK or FAIL. - */ - int -get_string_tv(char_u **arg, typval_T *rettv, int evaluate) -{ - char_u *p; - char_u *name; - int extra = 0; - int len; - - /* - * Find the end of the string, skipping backslashed characters. - */ - for (p = *arg + 1; *p != NUL && *p != '"'; MB_PTR_ADV(p)) - { - if (*p == '\\' && p[1] != NUL) - { - ++p; - // A "\<x>" form occupies at least 4 characters, and produces up - // to 21 characters (3 * 6 for the char and 3 for a modifier): - // reserve space for 18 extra. - // Each byte in the char could be encoded as K_SPECIAL K_EXTRA x. - if (*p == '<') - extra += 18; - } - } - - if (*p != '"') - { - semsg(_("E114: Missing quote: %s"), *arg); - return FAIL; - } - - // If only parsing, set *arg and return here - if (!evaluate) - { - *arg = p + 1; - return OK; - } - - /* - * Copy the string into allocated memory, handling backslashed - * characters. - */ - len = (int)(p - *arg + extra); - name = alloc(len); - if (name == NULL) - return FAIL; - rettv->v_type = VAR_STRING; - rettv->vval.v_string = name; - - for (p = *arg + 1; *p != NUL && *p != '"'; ) - { - if (*p == '\\') - { - switch (*++p) - { - case 'b': *name++ = BS; ++p; break; - case 'e': *name++ = ESC; ++p; break; - case 'f': *name++ = FF; ++p; break; - case 'n': *name++ = NL; ++p; break; - case 'r': *name++ = CAR; ++p; break; - case 't': *name++ = TAB; ++p; break; - - case 'X': // hex: "\x1", "\x12" - case 'x': - case 'u': // Unicode: "\u0023" - case 'U': - if (vim_isxdigit(p[1])) - { - int n, nr; - int c = toupper(*p); - - if (c == 'X') - n = 2; - else if (*p == 'u') - n = 4; - else - n = 8; - nr = 0; - while (--n >= 0 && vim_isxdigit(p[1])) - { - ++p; - nr = (nr << 4) + hex2nr(*p); - } - ++p; - // For "\u" store the number according to - // 'encoding'. - if (c != 'X') - name += (*mb_char2bytes)(nr, name); - else - *name++ = nr; - } - break; - - // octal: "\1", "\12", "\123" - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': *name = *p++ - '0'; - if (*p >= '0' && *p <= '7') - { - *name = (*name << 3) + *p++ - '0'; - if (*p >= '0' && *p <= '7') - *name = (*name << 3) + *p++ - '0'; - } - ++name; - break; - - // Special key, e.g.: "\<C-W>" - case '<': extra = trans_special(&p, name, TRUE, TRUE, - TRUE, NULL); - if (extra != 0) - { - name += extra; - if (name >= rettv->vval.v_string + len) - iemsg("get_string_tv() used more space than allocated"); - break; - } - // FALLTHROUGH - - default: MB_COPY_CHAR(p, name); - break; - } - } - else - MB_COPY_CHAR(p, name); - - } - *name = NUL; - if (*p != NUL) // just in case - ++p; - *arg = p; - - return OK; -} - -/* - * Allocate a variable for a 'str''ing' constant. - * Return OK or FAIL. - */ - int -get_lit_string_tv(char_u **arg, typval_T *rettv, int evaluate) -{ - char_u *p; - char_u *str; - int reduce = 0; - - /* - * Find the end of the string, skipping ''. - */ - for (p = *arg + 1; *p != NUL; MB_PTR_ADV(p)) - { - if (*p == '\'') - { - if (p[1] != '\'') - break; - ++reduce; - ++p; - } - } - - if (*p != '\'') - { - semsg(_("E115: Missing quote: %s"), *arg); - return FAIL; - } - - // If only parsing return after setting "*arg" - if (!evaluate) - { - *arg = p + 1; - return OK; - } - - /* - * Copy the string into allocated memory, handling '' to ' reduction. - */ - str = alloc((p - *arg) - reduce); - if (str == NULL) - return FAIL; - rettv->v_type = VAR_STRING; - rettv->vval.v_string = str; - - for (p = *arg + 1; *p != NUL; ) - { - if (*p == '\'') - { - if (p[1] != '\'') - break; - ++p; - } - MB_COPY_CHAR(p, str); - } - *str = NUL; - *arg = p + 1; - - return OK; -} - -/* * Return the function name of partial "pt". */ char_u * @@ -3761,164 +3360,6 @@ partial_unref(partial_T *pt) partial_free(pt); } -static int tv_equal_recurse_limit; - - static int -func_equal( - typval_T *tv1, - typval_T *tv2, - int ic) // ignore case -{ - char_u *s1, *s2; - dict_T *d1, *d2; - int a1, a2; - int i; - - // empty and NULL function name considered the same - s1 = tv1->v_type == VAR_FUNC ? tv1->vval.v_string - : partial_name(tv1->vval.v_partial); - if (s1 != NULL && *s1 == NUL) - s1 = NULL; - s2 = tv2->v_type == VAR_FUNC ? tv2->vval.v_string - : partial_name(tv2->vval.v_partial); - if (s2 != NULL && *s2 == NUL) - s2 = NULL; - if (s1 == NULL || s2 == NULL) - { - if (s1 != s2) - return FALSE; - } - else if (STRCMP(s1, s2) != 0) - return FALSE; - - // empty dict and NULL dict is different - d1 = tv1->v_type == VAR_FUNC ? NULL : tv1->vval.v_partial->pt_dict; - d2 = tv2->v_type == VAR_FUNC ? NULL : tv2->vval.v_partial->pt_dict; - if (d1 == NULL || d2 == NULL) - { - if (d1 != d2) - return FALSE; - } - else if (!dict_equal(d1, d2, ic, TRUE)) - return FALSE; - - // empty list and no list considered the same - a1 = tv1->v_type == VAR_FUNC ? 0 : tv1->vval.v_partial->pt_argc; - a2 = tv2->v_type == VAR_FUNC ? 0 : tv2->vval.v_partial->pt_argc; - if (a1 != a2) - return FALSE; - for (i = 0; i < a1; ++i) - if (!tv_equal(tv1->vval.v_partial->pt_argv + i, - tv2->vval.v_partial->pt_argv + i, ic, TRUE)) - return FALSE; - - return TRUE; -} - -/* - * Return TRUE if "tv1" and "tv2" have the same value. - * Compares the items just like "==" would compare them, but strings and - * numbers are different. Floats and numbers are also different. - */ - int -tv_equal( - typval_T *tv1, - typval_T *tv2, - int ic, // ignore case - int recursive) // TRUE when used recursively -{ - char_u buf1[NUMBUFLEN], buf2[NUMBUFLEN]; - char_u *s1, *s2; - static int recursive_cnt = 0; // catch recursive loops - int r; - - // Catch lists and dicts that have an endless loop by limiting - // recursiveness to a limit. We guess they are equal then. - // A fixed limit has the problem of still taking an awful long time. - // Reduce the limit every time running into it. That should work fine for - // deeply linked structures that are not recursively linked and catch - // recursiveness quickly. - if (!recursive) - tv_equal_recurse_limit = 1000; - if (recursive_cnt >= tv_equal_recurse_limit) - { - --tv_equal_recurse_limit; - return TRUE; - } - - // For VAR_FUNC and VAR_PARTIAL compare the function name, bound dict and - // arguments. - if ((tv1->v_type == VAR_FUNC - || (tv1->v_type == VAR_PARTIAL && tv1->vval.v_partial != NULL)) - && (tv2->v_type == VAR_FUNC - || (tv2->v_type == VAR_PARTIAL && tv2->vval.v_partial != NULL))) - { - ++recursive_cnt; - r = func_equal(tv1, tv2, ic); - --recursive_cnt; - return r; - } - - if (tv1->v_type != tv2->v_type) - return FALSE; - - switch (tv1->v_type) - { - case VAR_LIST: - ++recursive_cnt; - r = list_equal(tv1->vval.v_list, tv2->vval.v_list, ic, TRUE); - --recursive_cnt; - return r; - - case VAR_DICT: - ++recursive_cnt; - r = dict_equal(tv1->vval.v_dict, tv2->vval.v_dict, ic, TRUE); - --recursive_cnt; - return r; - - case VAR_BLOB: - return blob_equal(tv1->vval.v_blob, tv2->vval.v_blob); - - case VAR_NUMBER: - case VAR_BOOL: - case VAR_SPECIAL: - return tv1->vval.v_number == tv2->vval.v_number; - - case VAR_STRING: - s1 = tv_get_string_buf(tv1, buf1); - s2 = tv_get_string_buf(tv2, buf2); - return ((ic ? MB_STRICMP(s1, s2) : STRCMP(s1, s2)) == 0); - - case VAR_FLOAT: -#ifdef FEAT_FLOAT - return tv1->vval.v_float == tv2->vval.v_float; -#endif - case VAR_JOB: -#ifdef FEAT_JOB_CHANNEL - return tv1->vval.v_job == tv2->vval.v_job; -#endif - case VAR_CHANNEL: -#ifdef FEAT_JOB_CHANNEL - return tv1->vval.v_channel == tv2->vval.v_channel; -#endif - - case VAR_PARTIAL: - return tv1->vval.v_partial == tv2->vval.v_partial; - - case VAR_FUNC: - return tv1->vval.v_string == tv2->vval.v_string; - - case VAR_UNKNOWN: - case VAR_ANY: - case VAR_VOID: - break; - } - - // VAR_UNKNOWN can be the result of a invalid expression, let's say it - // does not equal anything, not even itself. - return FALSE; -} - /* * Return the next (unique) copy ID. * Used for serializing nested structures. @@ -4694,23 +4135,6 @@ echo_string( } /* - * Return a string with the string representation of a variable. - * If the memory is allocated "tofree" is set to it, otherwise NULL. - * "numbuf" is used for a number. - * Puts quotes around strings, so that they can be parsed back by eval(). - * May return NULL. - */ - char_u * -tv2string( - typval_T *tv, - char_u **tofree, - char_u *numbuf, - int copyID) -{ - return echo_string_core(tv, tofree, numbuf, copyID, FALSE, TRUE, FALSE); -} - -/* * Return string "str" in ' quotes, doubling ' characters. * If "str" is NULL an empty string is assumed. * If "function" is TRUE make it function('string'). @@ -4792,57 +4216,6 @@ string2float( #endif /* - * Get the value of an environment variable. - * "arg" is pointing to the '$'. It is advanced to after the name. - * If the environment variable was not set, silently assume it is empty. - * Return FAIL if the name is invalid. - */ - int -get_env_tv(char_u **arg, typval_T *rettv, int evaluate) -{ - char_u *string = NULL; - int len; - int cc; - char_u *name; - int mustfree = FALSE; - - ++*arg; - name = *arg; - len = get_env_len(arg); - if (evaluate) - { - if (len == 0) - return FAIL; // invalid empty name - - cc = name[len]; - name[len] = NUL; - // first try vim_getenv(), fast for normal environment vars - string = vim_getenv(name, &mustfree); - if (string != NULL && *string != NUL) - { - if (!mustfree) - string = vim_strsave(string); - } - else - { - if (mustfree) - vim_free(string); - - // next try expanding things like $VIM and ${HOME} - string = expand_env_save(name - 1); - if (string != NULL && *string == '$') - VIM_CLEAR(string); - } - name[len] = cc; - - rettv->v_type = VAR_STRING; - rettv->vval.v_string = string; - } - - return OK; -} - -/* * Translate a String variable into a position. * Returns NULL when there is an error. */ @@ -5424,558 +4797,6 @@ handle_subscript( } /* - * Allocate memory for a variable type-value, and make it empty (0 or NULL - * value). - */ - typval_T * -alloc_tv(void) -{ - return ALLOC_CLEAR_ONE(typval_T); -} - -/* - * Allocate memory for a variable type-value, and assign a string to it. - * The string "s" must have been allocated, it is consumed. - * Return NULL for out of memory, the variable otherwise. - */ - typval_T * -alloc_string_tv(char_u *s) -{ - typval_T *rettv; - - rettv = alloc_tv(); - if (rettv != NULL) - { - rettv->v_type = VAR_STRING; - rettv->vval.v_string = s; - } - else - vim_free(s); - return rettv; -} - -/* - * Free the memory for a variable type-value. - */ - void -free_tv(typval_T *varp) -{ - if (varp != NULL) - { - switch (varp->v_type) - { - case VAR_FUNC: - func_unref(varp->vval.v_string); - // FALLTHROUGH - case VAR_STRING: - vim_free(varp->vval.v_string); - break; - case VAR_PARTIAL: - partial_unref(varp->vval.v_partial); - break; - case VAR_BLOB: - blob_unref(varp->vval.v_blob); - break; - case VAR_LIST: - list_unref(varp->vval.v_list); - break; - case VAR_DICT: - dict_unref(varp->vval.v_dict); - break; - case VAR_JOB: -#ifdef FEAT_JOB_CHANNEL - job_unref(varp->vval.v_job); - break; -#endif - case VAR_CHANNEL: -#ifdef FEAT_JOB_CHANNEL - channel_unref(varp->vval.v_channel); - break; -#endif - case VAR_NUMBER: - case VAR_FLOAT: - case VAR_ANY: - case VAR_UNKNOWN: - case VAR_VOID: - case VAR_BOOL: - case VAR_SPECIAL: - break; - } - vim_free(varp); - } -} - -/* - * Free the memory for a variable value and set the value to NULL or 0. - */ - void -clear_tv(typval_T *varp) -{ - if (varp != NULL) - { - switch (varp->v_type) - { - case VAR_FUNC: - func_unref(varp->vval.v_string); - // FALLTHROUGH - case VAR_STRING: - VIM_CLEAR(varp->vval.v_string); - break; - case VAR_PARTIAL: - partial_unref(varp->vval.v_partial); - varp->vval.v_partial = NULL; - break; - case VAR_BLOB: - blob_unref(varp->vval.v_blob); - varp->vval.v_blob = NULL; - break; - case VAR_LIST: - list_unref(varp->vval.v_list); - varp->vval.v_list = NULL; - break; - case VAR_DICT: - dict_unref(varp->vval.v_dict); - varp->vval.v_dict = NULL; - break; - case VAR_NUMBER: - case VAR_BOOL: - case VAR_SPECIAL: - varp->vval.v_number = 0; - break; - case VAR_FLOAT: -#ifdef FEAT_FLOAT - varp->vval.v_float = 0.0; - break; -#endif - case VAR_JOB: -#ifdef FEAT_JOB_CHANNEL - job_unref(varp->vval.v_job); - varp->vval.v_job = NULL; -#endif - break; - case VAR_CHANNEL: -#ifdef FEAT_JOB_CHANNEL - channel_unref(varp->vval.v_channel); - varp->vval.v_channel = NULL; -#endif - case VAR_UNKNOWN: - case VAR_ANY: - case VAR_VOID: - break; - } - varp->v_lock = 0; - } -} - -/* - * Set the value of a variable to NULL without freeing items. - */ - void -init_tv(typval_T *varp) -{ - if (varp != NULL) - CLEAR_POINTER(varp); -} - -/* - * Get the number value of a variable. - * If it is a String variable, uses vim_str2nr(). - * For incompatible types, return 0. - * tv_get_number_chk() is similar to tv_get_number(), but informs the - * caller of incompatible types: it sets *denote to TRUE if "denote" - * is not NULL or returns -1 otherwise. - */ - varnumber_T -tv_get_number(typval_T *varp) -{ - int error = FALSE; - - return tv_get_number_chk(varp, &error); // return 0L on error -} - - varnumber_T -tv_get_number_chk(typval_T *varp, int *denote) -{ - varnumber_T n = 0L; - - switch (varp->v_type) - { - case VAR_NUMBER: - return varp->vval.v_number; - case VAR_FLOAT: -#ifdef FEAT_FLOAT - emsg(_("E805: Using a Float as a Number")); - break; -#endif - case VAR_FUNC: - case VAR_PARTIAL: - emsg(_("E703: Using a Funcref as a Number")); - break; - case VAR_STRING: - if (varp->vval.v_string != NULL) - vim_str2nr(varp->vval.v_string, NULL, NULL, - STR2NR_ALL, &n, NULL, 0, FALSE); - return n; - case VAR_LIST: - emsg(_("E745: Using a List as a Number")); - break; - case VAR_DICT: - emsg(_("E728: Using a Dictionary as a Number")); - break; - case VAR_BOOL: - case VAR_SPECIAL: - return varp->vval.v_number == VVAL_TRUE ? 1 : 0; - case VAR_JOB: -#ifdef FEAT_JOB_CHANNEL - emsg(_("E910: Using a Job as a Number")); - break; -#endif - case VAR_CHANNEL: -#ifdef FEAT_JOB_CHANNEL - emsg(_("E913: Using a Channel as a Number")); - break; -#endif - case VAR_BLOB: - emsg(_("E974: Using a Blob as a Number")); - break; - case VAR_UNKNOWN: - case VAR_ANY: - case VAR_VOID: - internal_error_no_abort("tv_get_number(UNKNOWN)"); - break; - } - if (denote == NULL) // useful for values that must be unsigned - n = -1; - else - *denote = TRUE; - return n; -} - -#ifdef FEAT_FLOAT - float_T -tv_get_float(typval_T *varp) -{ - switch (varp->v_type) - { - case VAR_NUMBER: - return (float_T)(varp->vval.v_number); - case VAR_FLOAT: - return varp->vval.v_float; - case VAR_FUNC: - case VAR_PARTIAL: - emsg(_("E891: Using a Funcref as a Float")); - break; - case VAR_STRING: - emsg(_("E892: Using a String as a Float")); - break; - case VAR_LIST: - emsg(_("E893: Using a List as a Float")); - break; - case VAR_DICT: - emsg(_("E894: Using a Dictionary as a Float")); - break; - case VAR_BOOL: - emsg(_("E362: Using a boolean value as a Float")); - break; - case VAR_SPECIAL: - emsg(_("E907: Using a special value as a Float")); - break; - case VAR_JOB: -# ifdef FEAT_JOB_CHANNEL - emsg(_("E911: Using a Job as a Float")); - break; -# endif - case VAR_CHANNEL: -# ifdef FEAT_JOB_CHANNEL - emsg(_("E914: Using a Channel as a Float")); - break; -# endif - case VAR_BLOB: - emsg(_("E975: Using a Blob as a Float")); - break; - case VAR_UNKNOWN: |