summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2>2012-11-10 21:14:47 +0000
committerjoost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2>2012-11-10 21:14:47 +0000
commit3a74f94cde6c55c9858072a57a0bea0d0a6c8728 (patch)
tree67f141f7dca775583f8abf6168de7a7fa06f3eb9
parentfbd20b9f9e9322e2157fac361415c40f130f3d82 (diff)
downloadfpc-3a74f94cde6c55c9858072a57a0bea0d0a6c8728.tar.gz
* Attribute definition should be before generic keyword
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/joost@22970 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r--classattributes/compiler/pdecl.pas6
1 files changed, 3 insertions, 3 deletions
diff --git a/classattributes/compiler/pdecl.pas b/classattributes/compiler/pdecl.pas
index 72e6f50b9d..e9619e19a5 100644
--- a/classattributes/compiler/pdecl.pas
+++ b/classattributes/compiler/pdecl.pas
@@ -478,15 +478,15 @@ implementation
generictypelist:=nil;
generictokenbuf:=nil;
- { fpc generic declaration? }
- isgeneric:=not(m_delphi in current_settings.modeswitches) and try_to_consume(_GENERIC);
-
{ class attribute definitions? }
while token=_LECKKLAMMER do
begin
parse_rttiattributes(current_rtticlassattributesdef);
end;
+ { fpc generic declaration? }
+ isgeneric:=not(m_delphi in current_settings.modeswitches) and try_to_consume(_GENERIC);
+
typename:=pattern;
orgtypename:=orgpattern;
consume(_ID);