Browse Source

* changed temporary type_e_anonymous_function_unsupported message into an
inline comment, because using a high message number wastes space in
the messages array

git-svn-id: trunk@30666 -

Jonas Maebe 10 years ago
parent
commit
3684e7665d
4 changed files with 374 additions and 380 deletions
  1. 0 4
      compiler/msg/errore.msg
  2. 2 3
      compiler/msgidx.inc
  3. 370 372
      compiler/msgtxt.inc
  4. 2 1
      compiler/pdecl.pas

+ 0 - 4
compiler/msg/errore.msg

@@ -1974,10 +1974,6 @@ type_w_instance_abstract_class=04122_W_Creating an instance of abstract class "$
 type_e_function_reference_kind=04123_E_Subroutine references cannot be declared as "of object" or "is nested", they can always refer to any kind of subroutine
 % Subroutine references can refer to any kind of subroutine and hence do not
 % require specialisation for methods or nested subroutines.
-type_e_anonymous_function_unsupported=04999_E_Function references are not yet supported, only blocks (add "cdecl;" at the end)
-% Remove this error message once Delphi-style anonymous are implemented. It has
-% number 4999 so as not to result in a gap in the error message numbering once
-% it's removed.
 % \end{description}
 #
 # Symtable

+ 2 - 3
compiler/msgidx.inc

@@ -556,7 +556,6 @@ const
   type_e_procedure_must_be_far=04121;
   type_w_instance_abstract_class=04122;
   type_e_function_reference_kind=04123;
-  type_e_anonymous_function_unsupported=04999;
   sym_e_id_not_found=05000;
   sym_f_internal_error_in_symtablestack=05001;
   sym_e_duplicate_id=05002;
@@ -1009,9 +1008,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 75431;
+  MsgTxtSize = 75342;
 
   MsgIdxMax : array[1..20] of longint=(
-    26,99,341,1000,96,58,126,30,202,64,
+    26,99,341,124,96,58,126,30,202,64,
     58,20,1,1,1,1,1,1,1,1
   );

File diff suppressed because it is too large
+ 370 - 372
compiler/msgtxt.inc


+ 2 - 1
compiler/pdecl.pas

@@ -817,7 +817,8 @@ implementation
                                  end
                                else
                                  { a regular anonymous function type: not yet supported }
-                                 cgmessage(type_e_anonymous_function_unsupported);
+                                 { the }
+                                 Comment(V_Error,'Function references are not yet supported, only C blocks (add "cdecl;" at the end)');
                              end
                          end;
                        handle_calling_convention(tprocvardef(hdef));

Some files were not shown because too many files changed in this diff