fixed the messy state of messages after recent custom attributes merge. fixed a typo, fixed double definition of message 3350, restored a message that was removed but still used, so the build passes at least.

git-svn-id: trunk@42412 -

compiler/msg/errore.msg

@@ -146,7 +146,7 @@ general_t_unitscope=01027_T_Using unit scope: $1
 #
 # Scanner
 #
-# 02105 is the last used one
+# 02106 is the last used one
 #
 % \section{Scanner messages.}
 % This section lists the messages that the scanner emits. The scanner takes
@@ -432,11 +432,13 @@ scan_w_setpeosversion_not_support=02103_W_SETPEOSVERSION is not supported by the
 scan_w_setpesubsysversion_not_support=02104_W_SETPESUBSYSVERSION is not supported by the target OS
 % The \var{\{\$SETPESUBSYSVERSION\}} directive is not supported by the target OS.
 scan_n_changecputype=02105_N_Changed CPU type to be consistent with specified controller
+scan_e_unresolved_attribute=02106_E_Unresolved custom attribute: "$1".
+% A custom attribute is defined, but there is no identifier to bind it to.
 % \end{description}
 #
 # Parser
 #
-# 03350 is the last used one
+# 03351 is the last used one
 #
 % \section{Parser messages}
 % This section lists all parser messages. The parser takes care of the
@@ -1583,8 +1585,6 @@ parser_w_operator_overloaded_hidden_3=03347_W_Operator overload hidden by intern
 parser_e_threadvar_must_be_class=03348_E_Thread variables inside classes or records must be class variables
 % A \var{threadvar} section inside a class or record was started without it being prefixed by \var{class}.
 parser_e_only_static_members_via_object_type=03349_E_Only static methods and static variables can be referenced through an object type
-parser_e_unbound_attribute=03350_E_Unbound custom attribute: "$1".
-% A custom attribute is defined, but there is no identifier to bind it to.
 % This error occurs in a situation like the following:
 % \begin{verbatim}
 % Type
@@ -1596,10 +1596,12 @@ parser_e_unbound_attribute=03350_E_Unbound custom attribute: "$1".
 %   TObj.test;
 % \end{verbatim}
 % \var{test} is not a static method and hence cannot be called through a type, but only using an instance.
-parse_e_callthrough_varargs=03350_E_Cannot redeclare C-style variadic function "$1" as external on this platform; make its first declaration already external
+parser_e_callthrough_varargs=03350_E_Cannot redeclare C-style variadic function "$1" as external on this platform; make its first declaration already external
 % If a function is declared normally in the interface or as a forward declaration, and then later as external, the compiler
 % must generate a stub that calls the external function. Due to code generation limitations, this cannot be done on some
 % platforms. Even on platforms where it is supported, this is quite inefficient.
+parser_e_unbound_attribute=03351_E_Unbound custom attribute: "$1".
+% A custom attribute is defined, but there is no identifier to bind it to.
 %
 % \end{description}
 %

compiler/msgidx.inc

@@ -129,6 +129,7 @@ const
   scan_w_setpeosversion_not_support=02103;
   scan_w_setpesubsysversion_not_support=02104;
   scan_n_changecputype=02105;
+  scan_e_unresolved_attribute=02106;
   parser_e_syntax_error=03000;
   parser_e_dont_nest_interrupt=03004;
   parser_w_proc_directive_ignored=03005;
@@ -460,7 +461,7 @@ const
   parser_w_operator_overloaded_hidden_3=03347;
   parser_e_threadvar_must_be_class=03348;
   parser_e_only_static_members_via_object_type=03349;
-  parse_e_callthrough_varargs=03350;
+  parser_e_callthrough_varargs=03350;
   parser_e_unbound_attribute=03351;
   type_e_mismatch=04000;
   type_e_incompatible_types=04001;
@@ -1112,9 +1113,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 83464;
+  MsgTxtSize = 83507;
 
   MsgIdxMax : array[1..20] of longint=(
-    28,106,352,126,99,61,142,34,221,68,
+    28,107,352,126,99,61,142,34,221,68,
     62,20,30,1,1,1,1,1,1,1
   );

compiler/psub.pas

@@ -2555,7 +2555,7 @@ implementation
                        even if we could, e.g. LLVM cannot call through to something
                        else in that case) }
                      if is_c_variadic(pd) then
-                       Message1(parse_e_callthrough_varargs,pd.fullprocname(false));
+                       Message1(parser_e_callthrough_varargs,pd.fullprocname(false));
                      call_through_new_name(pd,proc_get_importname(pd));
                    end
                  else