Переглянути джерело

* get rid of the scanner message for attributes for real this time (sometimes I *really* hate Git -.-)

git-svn-id: trunk@42413 -
svenbarth 6 роки тому
батько
коміт
04a50733ad
4 змінених файлів з 422 додано та 421 видалено
  1. 1 3
      compiler/msg/errore.msg
  2. 2 3
      compiler/msgidx.inc
  3. 418 414
      compiler/msgtxt.inc
  4. 1 1
      compiler/pdecobj.pas

+ 1 - 3
compiler/msg/errore.msg

@@ -146,7 +146,7 @@ general_t_unitscope=01027_T_Using unit scope: $1
 #
 #
 # Scanner
 # Scanner
 #
 #
-# 02106 is the last used one
+# 02105 is the last used one
 #
 #
 % \section{Scanner messages.}
 % \section{Scanner messages.}
 % This section lists the messages that the scanner emits. The scanner takes
 % This section lists the messages that the scanner emits. The scanner takes
@@ -432,8 +432,6 @@ 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
 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.
 % 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_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}
 % \end{description}
 #
 #
 # Parser
 # Parser

+ 2 - 3
compiler/msgidx.inc

@@ -129,7 +129,6 @@ const
   scan_w_setpeosversion_not_support=02103;
   scan_w_setpeosversion_not_support=02103;
   scan_w_setpesubsysversion_not_support=02104;
   scan_w_setpesubsysversion_not_support=02104;
   scan_n_changecputype=02105;
   scan_n_changecputype=02105;
-  scan_e_unresolved_attribute=02106;
   parser_e_syntax_error=03000;
   parser_e_syntax_error=03000;
   parser_e_dont_nest_interrupt=03004;
   parser_e_dont_nest_interrupt=03004;
   parser_w_proc_directive_ignored=03005;
   parser_w_proc_directive_ignored=03005;
@@ -1113,9 +1112,9 @@ const
   option_info=11024;
   option_info=11024;
   option_help_pages=11025;
   option_help_pages=11025;
 
 
-  MsgTxtSize = 83507;
+  MsgTxtSize = 83464;
 
 
   MsgIdxMax : array[1..20] of longint=(
   MsgIdxMax : array[1..20] of longint=(
-    28,107,352,126,99,61,142,34,221,68,
+    28,106,352,126,99,61,142,34,221,68,
     62,20,30,1,1,1,1,1,1,1
     62,20,30,1,1,1,1,1,1,1
   );
   );

Різницю між файлами не показано, бо вона завелика
+ 418 - 414
compiler/msgtxt.inc


+ 1 - 1
compiler/pdecobj.pas

@@ -1143,7 +1143,7 @@ implementation
       procedure check_unbound_attributes;
       procedure check_unbound_attributes;
         begin
         begin
           if assigned(rtti_attrs_def) and (rtti_attrs_def.get_attribute_count>0) then
           if assigned(rtti_attrs_def) and (rtti_attrs_def.get_attribute_count>0) then
-            Message1(scan_e_unresolved_attribute,trtti_attribute(rtti_attrs_def.rtti_attributes[0]).typesym.prettyname);
+            Message1(parser_e_unbound_attribute,trtti_attribute(rtti_attrs_def.rtti_attributes[0]).typesym.prettyname);
           rtti_attrs_def.free;
           rtti_attrs_def.free;
           rtti_attrs_def:=nil;
           rtti_attrs_def:=nil;
         end;
         end;

Деякі файли не було показано, через те що забагато файлів було змінено