* Fix bug ID #31801, empty class var section

git-svn-id: trunk@36186 -

packages/fcl-passrc/src/pparser.pp

@@ -5293,10 +5293,12 @@ Type
 Var
   CurVisibility : TPasMemberVisibility;
   CurSection : TSectionType;
+  haveClass : Boolean;
 
 begin
   CurSection:=stNone;
   CurVisibility := visDefault;
+  HaveClass:=False;
   while (CurToken<>tkEnd) do
     begin
     case CurToken of
@@ -5311,7 +5313,8 @@ begin
           CurSection:=stNone
         else
           begin
-          SaveComments;
+          if not haveClass then
+            SaveComments;
           Case CurSection of
           stType:
             ParseClassLocalTypes(AType,CurVisibility);
@@ -5322,7 +5325,8 @@ begin
             begin
             if (AType.ObjKind in [okInterface,okDispInterface]) then
               ParseExc(nParserNoFieldsAllowed,SParserNoFieldsAllowed);
-            ParseClassFields(AType,CurVisibility,false);
+            ParseClassFields(AType,CurVisibility,HaveClass);
+            HaveClass:=False;
             end;
           else
             Raise Exception.Create('Internal error 201704251415');
@@ -5331,37 +5335,27 @@ begin
       tkProcedure,tkFunction,tkConstructor,tkDestructor:
         begin
         curSection:=stNone;
-        SaveComments;
+        if not haveClass then
+          SaveComments;
         if (Curtoken in [tkConstructor,tkDestructor]) and (AType.ObjKind in [okInterface,okDispInterface,okRecordHelper]) then
           ParseExc(nParserNoConstructorAllowed,SParserNoConstructorAllowed);
-        ProcessMethod(AType,False,CurVisibility);
+        ProcessMethod(AType,HaveClass,CurVisibility);
+        haveClass:=False;
         end;
       tkclass:
         begin
+        SaveComments;
+        HaveClass:=True;
         curSection:=stNone;
-         SaveComments;
-         NextToken;
-         if CurToken in [tkConstructor,tkDestructor,tkProcedure,tkFunction] then
-           ProcessMethod(AType,True,CurVisibility)
-         else if CurToken = tkVar then
-           begin
-           ExpectToken(tkIdentifier);
-           ParseClassFields(AType,CurVisibility,true);
-           end
-         else if CurToken=tkProperty then
-           begin
-           ExpectToken(tkIdentifier);
-           AType.Members.Add(ParseProperty(AType,CurtokenString,CurVisibility,true));
-           end
-         else
-           ParseExc(nParserTypeSyntaxError,SParserTypeSyntaxError)
         end;
       tkProperty:
         begin
         curSection:=stNone;
-        SaveComments;
+        if not haveClass then
+          SaveComments;
         ExpectIdentifier;
-        AType.Members.Add(ParseProperty(AType,CurtokenString,CurVisibility,false));
+        AType.Members.Add(ParseProperty(AType,CurtokenString,CurVisibility,HaveClass));
+        HaveClass:=False;
         end
     else
       CheckToken(tkIdentifier);

packages/fcl-passrc/tests/tcclasstype.pas

@@ -85,6 +85,7 @@ type
     Procedure TestTwoVarFieldsB;
     procedure TestNoVarFields;
     procedure TestVarClassFunction;
+    procedure TestClassVarClassFunction;
     Procedure TestTwoFieldsVisibility;
     Procedure TestConstProtectedEnd;
     Procedure TestTypeProtectedEnd;
@@ -717,6 +718,19 @@ begin
   AssertVisibility(visPublic,Members[0]);
 end;
 
+procedure TTestClassType.TestClassVarClassFunction;
+begin
+  StartVisibility(visPublic);
+  FDecl.Add('class var');
+  AddMember('class Function b : integer');
+  ParseClass;
+  AssertEquals('member count',1,TheClass.members.Count);
+  AssertNotNull('Have function',Members[0]);
+  AssertMemberName('b',Members[0]);
+  AssertMemberType(TPasClassFunction,Members[0]);
+  AssertVisibility(visPublic,Members[0]);
+end;
+
 procedure TTestClassType.TestTwoFieldsVisibility;
 begin
   StartVisibility(visPublic);