Mercurial > vim

comparison src/vim9type.c @ 21821:0deb6f96a5a3 v8.2.1460

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1460: error messages are spread out Commit: https://github.com/vim/vim/commit/451c2e3536a3cb77d07faf3cb2b834512e174351 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 15 16:33:28 2020 +0200 patch 8.2.1460: error messages are spread out Problem: Error messages are spread out. Solution: Move more messages into errors.h.
author Bram Moolenaar <Bram@vim.org>
date Sat, 15 Aug 2020 16:45:04 +0200
parents e591b448a670
children a211bca98bc3
comparison
equal deleted inserted replaced
21820:5ab859e4430b 21821:0deb6f96a5a3
321 void 321 void
322 type_mismatch(type_T *expected, type_T *actual) 322 type_mismatch(type_T *expected, type_T *actual)
323 { 323 {
324 char *tofree1, *tofree2; 324 char *tofree1, *tofree2;
325 325
326 semsg(_("E1013: type mismatch, expected %s but got %s"), 326 semsg(_(e_type_mismatch_expected_str_but_got_str),
327 type_name(expected, &tofree1), type_name(actual, &tofree2)); 327 type_name(expected, &tofree1), type_name(actual, &tofree2));
328 vim_free(tofree1); 328 vim_free(tofree1);
329 vim_free(tofree2); 329 vim_free(tofree2);
330 } 330 }
331 331
332 void 332 void
333 arg_type_mismatch(type_T *expected, type_T *actual, int argidx) 333 arg_type_mismatch(type_T *expected, type_T *actual, int argidx)
334 { 334 {
335 char *tofree1, *tofree2; 335 char *tofree1, *tofree2;
336 336
337 semsg(_("E1013: argument %d: type mismatch, expected %s but got %s"), 337 semsg(_(e_argument_nr_type_mismatch_expected_str_but_got_str),
338 argidx, 338 argidx,
339 type_name(expected, &tofree1), type_name(actual, &tofree2)); 339 type_name(expected, &tofree1), type_name(actual, &tofree2));
340 vim_free(tofree1); 340 vim_free(tofree1);
341 vim_free(tofree2); 341 vim_free(tofree2);
342 } 342 }
471 if (**arg != '<') 471 if (**arg != '<')
472 { 472 {
473 if (*skipwhite(*arg) == '<') 473 if (*skipwhite(*arg) == '<')
474 semsg(_(e_no_white_space_allowed_before), "<"); 474 semsg(_(e_no_white_space_allowed_before), "<");
475 else 475 else
476 emsg(_("E1008: Missing <type>")); 476 emsg(_(e_missing_type));
477 return type; 477 return type;
478 } 478 }
479 *arg = skipwhite(*arg + 1); 479 *arg = skipwhite(*arg + 1);
480 480
481 member_type = parse_type(arg, type_gap); 481 member_type = parse_type(arg, type_gap);
482 482
483 *arg = skipwhite(*arg); 483 *arg = skipwhite(*arg);
484 if (**arg != '>' && called_emsg == prev_called_emsg) 484 if (**arg != '>' && called_emsg == prev_called_emsg)
485 { 485 {
486 emsg(_("E1009: Missing > after type")); 486 emsg(_(e_missing_gt_after_type));
487 return type; 487 return type;
488 } 488 }
489 ++*arg; 489 ++*arg;
490 490
491 if (type->tt_type == VAR_LIST) 491 if (type->tt_type == VAR_LIST)
548 { 548 {
549 #ifdef FEAT_FLOAT 549 #ifdef FEAT_FLOAT
550 *arg += len; 550 *arg += len;
551 return &t_float; 551 return &t_float;
552 #else 552 #else
553 emsg(_("E1076: This Vim is not compiled with float support")); 553 emsg(_(e_this_vim_is_not_compiled_with_float_support));
554 return &t_any; 554 return &t_any;
555 #endif 555 #endif
556 } 556 }
557 if (len == 4 && STRNCMP(*arg, "func", len) == 0) 557 if (len == 4 && STRNCMP(*arg, "func", len) == 0)
558 { 558 {
586 flags |= TTFLAG_VARARGS; 586 flags |= TTFLAG_VARARGS;
587 p += 3; 587 p += 3;
588 } 588 }
589 else if (first_optional != -1) 589 else if (first_optional != -1)
590 { 590 {
591 emsg(_("E1007: mandatory argument after optional argument")); 591 emsg(_(e_mandatory_argument_after_optional_argument));
592 return &t_any; 592 return &t_any;
593 } 593 }
594 594
595 arg_type[argcount++] = parse_type(&p, type_gap); 595 arg_type[argcount++] = parse_type(&p, type_gap);
596 596
613 } 613 }
614 } 614 }
615 p = skipwhite(p); 615 p = skipwhite(p);
616 if (argcount == MAX_FUNC_ARGS) 616 if (argcount == MAX_FUNC_ARGS)
617 { 617 {
618 emsg(_("E740: Too many argument types")); 618 emsg(_(e_too_many_argument_types));
619 return &t_any; 619 return &t_any;
620 } 620 }
621 } 621 }
622 622
623 p = skipwhite(p); 623 p = skipwhite(p);
693 return &t_void; 693 return &t_void;
694 } 694 }
695 break; 695 break;
696 } 696 }
697 697
698 semsg(_("E1010: Type not recognized: %s"), *arg); 698 semsg(_(e_type_not_recognized_str), *arg);
699 return &t_any; 699 return &t_any;
700 } 700 }
701 701
702 /* 702 /*
703 * Check if "type1" and "type2" are exactly the same. 703 * Check if "type1" and "type2" are exactly the same.