Browse Source

fcl-passrc: fixed indentation

git-svn-id: trunk@38184 -
Mattias Gaertner 7 years ago
parent
commit
2556ea5161
2 changed files with 33 additions and 32 deletions
  1. 2 1
      packages/fcl-passrc/src/pastree.pp
  2. 31 31
      packages/fcl-passrc/src/pparser.pp

+ 2 - 1
packages/fcl-passrc/src/pastree.pp

@@ -668,6 +668,7 @@ type
   end;
 
   TPasGenericTemplateType = Class(TPasType);
+
   TPasObjKind = (
     okObject, okClass, okInterface, okGeneric,
     // okSpecialize removed in FPC 3.1.1
@@ -926,7 +927,7 @@ type
                         pmExport, pmOverload, pmMessage, pmReintroduce,
                         pmInline,pmAssembler, pmPublic,
                         pmCompilerProc,pmExternal,pmForward, pmDispId, 
-                        pmNoReturn, pmfar, pmFinal);
+                        pmNoReturn, pmFar, pmFinal);
   TProcedureModifiers = Set of TProcedureModifier;
   TProcedureMessageType = (pmtNone,pmtInteger,pmtString);
                         

+ 31 - 31
packages/fcl-passrc/src/pparser.pp

@@ -3212,41 +3212,41 @@ begin
             Case CurToken of
               tkObject,
               tkClass :
-                 begin
-                 ClassEl := TPasClassType(CreateElement(TPasClassType,
-                   TypeName, Declarations, NamePos));
-                 ClassEl.SetGenericTemplates(List);
-                 NextToken;
-                 DoParseClassType(ClassEl);
-                 Declarations.Declarations.Add(ClassEl);
-                 Declarations.Classes.Add(ClassEl);
-                 CheckHint(classel,True);
-                 Engine.FinishScope(stTypeDef,ClassEl);
-                 end;
-              tkRecord:
                 begin
-                RecordEl := TPasRecordType(CreateElement(TPasRecordType,
+                ClassEl := TPasClassType(CreateElement(TPasClassType,
                   TypeName, Declarations, NamePos));
-                RecordEl.SetGenericTemplates(List);
+                ClassEl.SetGenericTemplates(List);
                 NextToken;
-                ParseRecordFieldList(RecordEl,tkend,true);
-                Declarations.Declarations.Add(RecordEl);
-                Declarations.Classes.Add(RecordEl);
-                CheckHint(RecordEl,True);
-                Engine.FinishScope(stTypeDef,RecordEl);
+                DoParseClassType(ClassEl);
+                Declarations.Declarations.Add(ClassEl);
+                Declarations.Classes.Add(ClassEl);
+                CheckHint(classel,True);
+                Engine.FinishScope(stTypeDef,ClassEl);
                 end;
-              tkArray:
-                 begin
-                 if List.Count<>1 then
-                   ParseExc(nParserGenericArray1Element,sParserGenericArray1Element);
-                 ArrEl:=TPasArrayType(ParseArrayType(Declarations,NamePos,TypeName,pmNone));
-                 CheckHint(ArrEl,True);
-                 ArrEl.ElType.Release;
-                 ArrEl.ElType:=TPasGenericTemplateType(List[0]);
-                 Declarations.Declarations.Add(ArrEl);
-                 Declarations.Types.Add(ArrEl);
-                 Engine.FinishScope(stTypeDef,ArrEl);
-                 end;
+             tkRecord:
+               begin
+               RecordEl := TPasRecordType(CreateElement(TPasRecordType,
+                 TypeName, Declarations, NamePos));
+               RecordEl.SetGenericTemplates(List);
+               NextToken;
+               ParseRecordFieldList(RecordEl,tkend,true);
+               Declarations.Declarations.Add(RecordEl);
+               Declarations.Classes.Add(RecordEl);
+               CheckHint(RecordEl,True);
+               Engine.FinishScope(stTypeDef,RecordEl);
+               end;
+             tkArray:
+               begin
+               if List.Count<>1 then
+                 ParseExc(nParserGenericArray1Element,sParserGenericArray1Element);
+               ArrEl:=TPasArrayType(ParseArrayType(Declarations,NamePos,TypeName,pmNone));
+               CheckHint(ArrEl,True);
+               ArrEl.ElType.Release;
+               ArrEl.ElType:=TPasGenericTemplateType(List[0]);
+               Declarations.Declarations.Add(ArrEl);
+               Declarations.Types.Add(ArrEl);
+               Engine.FinishScope(stTypeDef,ArrEl);
+               end;
             else
               ParseExc(nParserGenericClassOrArray,SParserGenericClassOrArray);
             end;