Jelajahi Sumber

* Make name a little clearer in operator parsing

git-svn-id: trunk@45396 -
michael 5 tahun lalu
induk
melakukan
e928f402fc
1 mengubah file dengan 6 tambahan dan 6 penghapusan
  1. 6 6
      packages/fcl-passrc/src/pparser.pp

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

@@ -6511,14 +6511,14 @@ var
   end;
 
 var
-  N,Name: String;
+  OperatorTypeName,Name: String;
   PC : TPTreeElement;
   Ot : TOperatorType;
   IsTokenBased , ok: Boolean;
   j, i: Integer;
 
 begin
-  N:='';
+  OperatorTypeName:='';
   NameParts:=nil;
   Result:=nil;
   ok:=false;
@@ -6535,13 +6535,13 @@ begin
       else
         begin
         OT:=TPasOperator.NameToOperatorType(CurTokenString);
-        N:=CurTokenString;
+        OperatorTypeName:=CurTokenString;
         // Case Class operator TMyRecord.+
         if (OT=otUnknown) then
           begin
           NextToken;
           if CurToken<>tkDot then
-            ParseExc(nErrUnknownOperatorType,SErrUnknownOperatorType,[N]);
+            ParseExc(nErrUnknownOperatorType,SErrUnknownOperatorType,[OperatorTypeName]);
           NextToken;
           IsTokenBased:=CurToken<>tkIdentifier;
           if IsTokenBased then
@@ -6553,8 +6553,8 @@ begin
       if (ot=otUnknown) then
         ParseExc(nErrUnknownOperatorType,SErrUnknownOperatorType,[CurTokenString]);
       Name:=OperatorNames[Ot];
-      if N<>'' then
-        Name:=N+'.'+Name;
+      if OperatorTypeName<>'' then
+        Name:=OperatorTypeName+'.'+Name;
       NamePos:=CurTokenPos;
       end;
     ptAnonymousProcedure,ptAnonymousFunction: