Преглед изворни кода

* allow nested procedures and functions in generic routines (and get rid of an untranslated error message :P )

git-svn-id: trunk@35148 -
svenbarth пре 8 година
родитељ
комит
109dff8b56
1 измењених фајлова са 1 додато и 4 уклоњено
  1. 1 4
      compiler/psub.pas

+ 1 - 4
compiler/psub.pas

@@ -2044,10 +2044,7 @@ implementation
           for accessing locals in the parent procedure (PFV) }
           for accessing locals in the parent procedure (PFV) }
         if current_procinfo.has_nestedprocs then
         if current_procinfo.has_nestedprocs then
           begin
           begin
-            if (df_generic in current_procinfo.procdef.defoptions) then
-              Comment(V_Error,'Generic methods cannot have nested procedures')
-            else
-             if (po_inline in current_procinfo.procdef.procoptions) then
+            if (po_inline in current_procinfo.procdef.procoptions) then
               begin
               begin
                 Message1(parser_h_not_supported_for_inline,'nested procedures');
                 Message1(parser_h_not_supported_for_inline,'nested procedures');
                 Message(parser_h_inlining_disabled);
                 Message(parser_h_inlining_disabled);