compiler: implement delphi generic syntax for delphi mode

git-svn-id: trunk@16705 -

.gitattributes

@@ -9417,6 +9417,7 @@ tests/test/tgeneric24.pp svneol=native#text/pascal
 tests/test/tgeneric25.pp svneol=native#text/pascal
 tests/test/tgeneric26.pp svneol=native#text/pascal
 tests/test/tgeneric27.pp svneol=native#text/pascal
+tests/test/tgeneric28.pp svneol=native#text/pascal
 tests/test/tgeneric3.pp svneol=native#text/plain
 tests/test/tgeneric4.pp svneol=native#text/plain
 tests/test/tgeneric5.pp svneol=native#text/plain

compiler/pdecl.pas

@@ -389,13 +389,17 @@ implementation
            generictypelist:=nil;
            generictokenbuf:=nil;
 
-           { generic declaration? }
-           isgeneric:=try_to_consume(_GENERIC);
+           { fpc generic declaration? }
+           isgeneric:=not(m_delphi in current_settings.modeswitches) and try_to_consume(_GENERIC);
 
            typename:=pattern;
            orgtypename:=orgpattern;
            consume(_ID);
 
+           { delphi generic declaration? }
+           if (m_delphi in current_settings.modeswitches) then
+             isgeneric:=token=_LSHARPBRACKET;
+
            { Generic type declaration? }
            if isgeneric then
              begin

compiler/ptype.pas

@@ -929,9 +929,8 @@ implementation
                    structdef:=tabstractrecorddef(structdef.owner.defowner);
                  end;
              end;
-           { Generate a specialization? }
-           if try_to_consume(_SPECIALIZE) then
-             dospecialize:=true;
+           { Generate a specialization in FPC mode? }
+           dospecialize:=not(m_delphi in current_settings.modeswitches) and try_to_consume(_SPECIALIZE);
            { we can't accept a equal in type }
            pt1:=comp_expr(false,true);
            if not dospecialize and
@@ -987,6 +986,9 @@ implementation
                if (pt1.nodetype=typen) then
                  begin
                    def:=ttypenode(pt1).resultdef;
+                   { Delphi mode specialization? }
+                   if (m_delphi in current_settings.modeswitches) then
+                     dospecialize:=token=_LSHARPBRACKET;
                    if dospecialize then
                      generate_specialization(def)
                    else

tests/test/tgeneric28.pp

@@ -0,0 +1,24 @@
+{ %norun }
+program tgeneric28;
+{$mode delphi}
+
+// check delphi generic syntax
+
+type
+  TGenericClass<T> = class
+    F: T;
+  end;
+
+  TGenericRecord<T> = record
+    F: T;
+  end;
+
+  TGenericArray<T> = array of T;
+
+var
+  ClassSpecialize: TGenericClass<Integer>;
+  RecordSpecialize: TGenericRecord<Integer>;
+  ArraySpecialize: TGenericArray<Integer>;
+begin
+end.
+