Mercurial > vim

comparison src/vim9type.c @ 21789:f84625b961a8 v8.2.1444

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1444: error messages are spread out and names can be confusing Commit: https://github.com/vim/vim/commit/bc4c505166dc82911553206bb0c2133c6ac94aa1 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Aug 13 22:47:35 2020 +0200 patch 8.2.1444: error messages are spread out and names can be confusing Problem: Error messages are spread out and names can be confusing. Solution: Start moving error messages to a separate file and use clear names.
author Bram Moolenaar <Bram@vim.org>
date Thu, 13 Aug 2020 23:00:04 +0200
parents 571832713efa
children e591b448a670
comparison
equal deleted inserted replaced
21788:acd6c7f8b633 21789:f84625b961a8
460 int prev_called_emsg = called_emsg; 460 int prev_called_emsg = called_emsg;
461 461
462 if (**arg != '<') 462 if (**arg != '<')
463 { 463 {
464 if (*skipwhite(*arg) == '<') 464 if (*skipwhite(*arg) == '<')
465 semsg(_(e_no_white_before), "<"); 465 semsg(_(e_no_white_space_allowed_before), "<");
466 else 466 else
467 emsg(_("E1008: Missing <type>")); 467 emsg(_("E1008: Missing <type>"));
468 return type; 468 return type;
469 } 469 }
470 *arg = skipwhite(*arg + 1); 470 *arg = skipwhite(*arg + 1);
589 if (flags & TTFLAG_VARARGS) 589 if (flags & TTFLAG_VARARGS)
590 break; 590 break;
591 591
592 if (*p != ',' && *skipwhite(p) == ',') 592 if (*p != ',' && *skipwhite(p) == ',')
593 { 593 {
594 semsg(_(e_no_white_before), ","); 594 semsg(_(e_no_white_space_allowed_before), ",");
595 return &t_any; 595 return &t_any;
596 } 596 }
597 if (*p == ',') 597 if (*p == ',')
598 { 598 {
599 ++p; 599 ++p;
600 if (!VIM_ISWHITE(*p)) 600 if (!VIM_ISWHITE(*p))
601 { 601 {
602 semsg(_(e_white_after), ","); 602 semsg(_(e_white_space_required_after), ",");
603 return &t_any; 603 return &t_any;
604 } 604 }
605 } 605 }
606 p = skipwhite(p); 606 p = skipwhite(p);
607 if (argcount == MAX_FUNC_ARGS) 607 if (argcount == MAX_FUNC_ARGS)
622 if (**arg == ':') 622 if (**arg == ':')
623 { 623 {
624 // parse return type 624 // parse return type
625 ++*arg; 625 ++*arg;
626 if (!VIM_ISWHITE(**arg)) 626 if (!VIM_ISWHITE(**arg))
627 semsg(_(e_white_after), ":"); 627 semsg(_(e_white_space_required_after), ":");
628 *arg = skipwhite(*arg); 628 *arg = skipwhite(*arg);
629 ret_type = parse_type(arg, type_gap); 629 ret_type = parse_type(arg, type_gap);
630 } 630 }
631 if (flags == 0 && first_optional == -1 && argcount <= 0) 631 if (flags == 0 && first_optional == -1 && argcount <= 0)
632 type = get_func_type(ret_type, argcount, type_gap); 632 type = get_func_type(ret_type, argcount, type_gap);