* Fix bug #27032, order of operations when parsing a.b[c]

git-svn-id: trunk@33297 -

packages/fcl-passrc/src/pparser.pp

@@ -1320,29 +1320,49 @@ begin
   if x.Kind<>pekSet then NextToken;
 
   try
-    if x.Kind=pekIdent then begin
+    if x.Kind=pekIdent then
+      begin
+      while CurToken in [tkDot] do
+        begin
+        NextToken;
+        if CurToken=tkIdentifier then
+          begin
+          b:=TBinaryExpr.Create(AParent,x, TPrimitiveExpr.Create(AParent,pekIdent, CurTokenText), eopSubIdent);
+          NextToken;
+          end
+        else
+          begin
+          UngetToken;
+          ParseExc(SParserExpectedIdentifier);
+          end;
+        x:=b;
+        end;
       while CurToken in [tkBraceOpen, tkSquaredBraceOpen, tkCaret] do
         case CurToken of
-          tkBraceOpen: begin
+          tkBraceOpen:
+            begin
             prm:=ParseParams(AParent,pekFuncParams);
             if not Assigned(prm) then Exit;
             prm.Value:=x;
             x:=prm;
-          end;
-          tkSquaredBraceOpen: begin
+            end;
+          tkSquaredBraceOpen:
+            begin
             prm:=ParseParams(AParent,pekArrayParams);
             if not Assigned(prm) then Exit;
             prm.Value:=x;
             x:=prm;
-          end;
-          tkCaret: begin
+            end;
+          tkCaret:
+            begin
             u:=TUnaryExpr.Create(AParent,x, TokenToExprOp(CurToken));
             x:=u;
             NextToken;
-          end;
+            end;
         end;
-
-      if CurToken in [tkDot, tkas] then begin
+      // Needed for TSDOBaseDataObjectClass(Self.ClassType).Create
+      if CurToken in [tkdot,tkas] then
+        begin
         optk:=CurToken;
         NextToken;
         b:=TBinaryExpr.Create(AParent,x, ParseExpIdent(AParent), TokenToExprOp(optk));

packages/fcl-passrc/tests/tcexprparser.pas

@@ -86,6 +86,7 @@ type
     Procedure TestBinaryLargerThanEqual;
     procedure TestBinaryFullIdent;
     Procedure TestArrayElement;
+    Procedure TestArrayElementrecord;
     Procedure TestArrayElement2Dims;
     Procedure TestFunctionCall;
     Procedure TestFunctionCall2args;
@@ -119,6 +120,7 @@ type
     Procedure TestPrecedenceMultiplyDiv;
     Procedure TestPrecedenceDivMultiply;
     Procedure TestTypeCast;
+    procedure TestTypeCast2;
     Procedure TestCreate;
   end;
 
@@ -200,6 +202,23 @@ begin
   AssertExpression('Simple identifier',p.params[0],pekNumber,'1');
 end;
 
+procedure TTestExpressions.TestArrayElementrecord;
+
+Var
+  P : TParamsExpr;
+  B : TBinaryExpr;
+begin
+  DeclareVar('record a : array[1..2] of integer; end ','b');
+  ParseExpression('b.a[1]');
+  P:=TParamsExpr(AssertExpression('Simple identifier',theExpr,pekArrayParams,TParamsExpr));
+  B:=AssertExpression('Name of array',P.Value,pekBinary,TBInaryExpr) as TBInaryExpr;
+  AssertEquals('name is Subident',eopSubIdent,B.Opcode);
+  AssertExpression('Name of array',B.Left,pekIdent,'b');
+  AssertExpression('Name of array',B.Right,pekIdent,'a');
+  AssertEquals('One dimension',1,Length(p.params));
+  AssertExpression('Simple identifier',p.params[0],pekNumber,'1');
+end;
+
 procedure TTestExpressions.TestArrayElement2Dims;
 Var
   P : TParamsExpr;
@@ -471,6 +490,12 @@ begin
   ParseExpression('TSDOBaseDataObjectClass(Self.ClassType).Create');
 end;
 
+procedure TTestExpressions.TestTypeCast2;
+begin
+  DeclareVar('TSDOBaseDataObjectClass');
+  ParseExpression('TSDOBaseDataObjectClass(Self.ClassType).Create.D');
+end;
+
 procedure TTestExpressions.TestCreate;
 begin
   DeclareVar('ESDOSerializationException');