Browse Source

* Fix 3.2.2 compilation of pas2js

Michaël Van Canneyt 2 weeks ago
parent
commit
7a24c2e720
2 changed files with 24 additions and 0 deletions
  1. 8 0
      packages/fcl-passrc/src/pasresolver.pp
  2. 16 0
      packages/pastojs/src/fppas2js.pp

+ 8 - 0
packages/fcl-passrc/src/pasresolver.pp

@@ -4349,13 +4349,21 @@ begin
   if Index>=0 then
     begin
     // insert LIFO - last in, first out
+    {$IFDEF VER3_2}
+    OldItem:=TPasIdentifier(FItems.List^[Index].Data);
+    {$ELSE}
     OldItem:=TPasIdentifier(FItems.List[Index].Data);
+    {$ENDIF}
     {$IFDEF VerbosePasResolver}
     if lowercase(OldItem.Identifier)<>LoName then
       raise Exception.Create('20160925183438');
     {$ENDIF}
     Item.NextSameIdentifier:=OldItem;
+    {$IFDEF VER3_2}
+    FItems.List^[Index].Data:=Item;
+    {$ELSE}
     FItems.List[Index].Data:=Item;
+    {$ENDIF}
     end
   else
     begin

+ 16 - 0
packages/pastojs/src/fppas2js.pp

@@ -2751,13 +2751,21 @@ begin
   if Index>=0 then
     begin
     // insert LIFO - last in, first out
+    {$IFDEF VER3_2}
+    OldItem:=TPasIdentifier(FElevatedLocals.List^[Index].Data);
+    {$ELSE}
     OldItem:=TPasIdentifier(FElevatedLocals.List[Index].Data);
+    {$ENDIF}
     {$IFDEF VerbosePasResolver}
     if lowercase(OldItem.Identifier)<>LoName then
       raise Exception.Create('20160925183438');
     {$ENDIF}
     Item.NextSameIdentifier:=OldItem;
+    {$IFDEF VER3_2}
+    FElevatedLocals.List^[Index].Data:=Item;
+    {$ELSE}
     FElevatedLocals.List[Index].Data:=Item;
+    {$ENDIF}
     end
   else
     begin
@@ -3325,13 +3333,21 @@ begin
   if Index>=0 then
     begin
     // insert LIFO - last in, first out
+    {$IFDEF VER3_2}
+    OldItem:=TPasIdentifier(FExternalNames.List^[Index].Data);
+    {$ELSE}
     OldItem:=TPasIdentifier(FExternalNames.List[Index].Data);
+    {$ENDIF}
     {$IFDEF VerbosePasResolver}
     if OldItem.Identifier<>aName then
       raise Exception.Create('20170322235429');
     {$ENDIF}
     Item.NextSameIdentifier:=OldItem;
+    {$IFDEF VER3_2}
+    FExternalNames.List^[Index].Data:=Item;
+    {$ELSE}
     FExternalNames.List[Index].Data:=Item;
+    {$ENDIF}
     end
   else
     FExternalNames.Add(aName, Item);