Browse Source

* Attribute definition should be before generic keyword

git-svn-id: branches/joost/classattributes@22970 -
joost 13 years ago
parent
commit
5585d1bc15
1 changed files with 3 additions and 3 deletions
  1. 3 3
      compiler/pdecl.pas

+ 3 - 3
compiler/pdecl.pas

@@ -478,15 +478,15 @@ implementation
            generictypelist:=nil;
            generictypelist:=nil;
            generictokenbuf:=nil;
            generictokenbuf:=nil;
 
 
-           { fpc generic declaration? }
-           isgeneric:=not(m_delphi in current_settings.modeswitches) and try_to_consume(_GENERIC);
-
            { class attribute definitions? }
            { class attribute definitions? }
            while token=_LECKKLAMMER do
            while token=_LECKKLAMMER do
              begin
              begin
                parse_rttiattributes(current_rtticlassattributesdef);
                parse_rttiattributes(current_rtticlassattributesdef);
              end;
              end;
 
 
+           { fpc generic declaration? }
+           isgeneric:=not(m_delphi in current_settings.modeswitches) and try_to_consume(_GENERIC);
+
            typename:=pattern;
            typename:=pattern;
            orgtypename:=orgpattern;
            orgtypename:=orgpattern;
            consume(_ID);
            consume(_ID);