paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-02-25 05:28:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fcl-passrc: added include file and append specializations at end of declarations in front of unfinished elements

Browse Source 
git-svn-id: trunk@45862 -
This commit is contained in:
Mattias Gaertner 2020-07-26 12:01:37 +00:00
parent fad9fb738c
commit dc54c1297a
3 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -3842,6 +3842,7 @@ packages/fcl-passrc/examples/pasrewrite.pp svneol=native#text/plain
packages/fcl-passrc/examples/test_parser.pp svneol=native#text/plain
packages/fcl-passrc/examples/testunit1.pp svneol=native#text/plain
packages/fcl-passrc/fpmake.pp svneol=native#text/plain
packages/fcl-passrc/src/fcl-passrc.inc svneol=native#text/plain
packages/fcl-passrc/src/pasresolveeval.pas svneol=native#text/plain
packages/fcl-passrc/src/pasresolver.pp svneol=native#text/plain
packages/fcl-passrc/src/passrcutil.pp svneol=native#text/plain

12
packages/fcl-passrc/src/fcl-passrc.inc Normal file
View File

@ -0,0 +1,12 @@
{$mode objfpc}{$H+}
{$inline on}
{$ifdef fpc}
{$define UsePChar}
{$define HasInt64}
{$endif}
{$IF FPC_FULLVERSION>30100}
{$warn 6058 off} // cannot inline
{$ENDIF}

51
packages/fcl-passrc/src/pasresolver.pp
View File

@ -306,13 +306,7 @@ Notes:
}
unit PasResolver;
{$mode objfpc}{$H+}
{$inline on}
{$ifdef fpc}
{$define UsePChar}
{$define HasInt64}
{$endif}
{$i fcl-passrc.inc}
{$IFOPT Q+}{$DEFINE OverflowCheckOn}{$ENDIF}
{$IFOPT R+}{$DEFINE RangeCheckOn}{$ENDIF}
@ -16398,8 +16392,18 @@ var
procedure InsertBehind(List: TFPList);
var
Last: TPasElement;
i: Integer;
i, LastIndex: Integer;
LastScope: TPasGenericScope;
begin
// insert in front of currently parsed elements
// beware: specializing an element can create other specialized elements
// add behind last specialized element of this GenericEl
// for example: A = class(B<C<D>>)
// =>
// D
// C<D>
// B<C<D>>
// A
Last:=GenericEl;
if SpecializedItems<>nil then
begin
@ -16407,15 +16411,32 @@ var
if i>=0 then
Last:=TPRSpecializedItem(SpecializedItems[i]).SpecializedEl;
end;
i:=List.IndexOf(Last);
if i<0 then
LastIndex:=List.IndexOf(Last);
if LastIndex<0 then
RaiseNotYetImplemented(20200725093218,El);
i:=List.Count-1;
while i>LastIndex do
begin
{$IF defined(VerbosePasResolver) or defined(VerbosePas2JS)}
writeln('InsertBehind Generic=',GetObjName(GenericEl),' Last=',GetObjName(Last));
//for i:=0 to List.Count-1 do writeln(' ',GetObjName(TObject(List[i])));
{$ENDIF}
i:=List.Count-1;
Last:=TPasElement(List[i]);
if not (Last is TPasGenericType) then break;
if (Last.CustomData<>nil) then
begin
LastScope:=Last.CustomData as TPasGenericScope;
if LastScope.GenericStep>=psgsInterfaceParsed then
break;
end;
// type is still parsed => insert in front
dec(i);
end;
//if i<0 then
// begin
// {$IF defined(VerbosePasResolver) or defined(VerbosePas2JS)}
// writeln('InsertBehind Generic=',GetObjName(GenericEl),' Last=',GetObjName(Last));
// //for i:=0 to List.Count-1 do writeln(' ',GetObjName(TObject(List[i])));
// {$ENDIF}
// i:=List.Count-1;
// end;
List.Insert(i+1,NewEl);
end;