tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some issues in Pascal/Delphi function list parser 

Fix #12851, close #12852
This commit is contained in:
Andreas Heim 2023-01-26 15:46:25 +01:00 committed by Don Ho
parent 62a23a8dc7
commit 5014edfacc
3 changed files with 81 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
PowerEditor/Test/FunctionList/pascal/unitTest
View File

@ -7,6 +7,8 @@ uses
System.SysUtils, System.Types, System.Classes;
{ Free function 1, declaration }
function FreeFunc1(const Param: integer): integer;
@ -130,17 +132,18 @@ type
// -----------------------------------------------------------------------------
// Free routines
// Free routines declarations
// -----------------------------------------------------------------------------
procedure FreeProc1(AParam: integer);
function FreeFunc2(const AParam: string): integer;
function FreeFunc2(const AParam: string): integer; inline;
procedure FreeProc2(AParam: integer);
{function UnusedFreeFunc1(ANum: double): cardinal;}
procedure FreeProc3(AParam: integer);
procedure FreeProc3(AParam: integer); overload; inline;
procedure FreeProc3(AParam: string); overload; inline;
(*
function UnusedFreeFunc2(ANum: double): cardinal;
@ -154,15 +157,30 @@ implementation
{R *.dfm}
type
// -----------------------------------------------------------------------------
// Internal classes
// -----------------------------------------------------------------------------
TInternalClass = class(TObject)
public
function Init(Cnt: integer): boolean;
procedure SetValue(Cnt: integer);
end;
// -----------------------------------------------------------------------------
// Free routines
// -----------------------------------------------------------------------------
{ Free function 3, forward declaration}
function FreeFunc3(const Param: integer): integer; forward;
{ Free function 1 }
{ Free function 1, definition }
function FreeFunc1(const Param: integer): integer;
begin
@ -173,7 +191,7 @@ end;
{ Free procedure 1 }
{ Free procedure 1, definition }
procedure FreeProc1(AParam: integer);
begin
@ -182,7 +200,7 @@ end;
{ Free function 2 }
{ Free function 2, definition }
function FreeFunc2(const AParam: string): integer;
begin
@ -195,7 +213,7 @@ end;
{
// Unused free function 1
// Unused free function 1, definition
function UnusedFreeFunc1(ANum: double): cardinal;
begin
@ -207,7 +225,7 @@ end;
{ Free procedure 2 }
{ Free procedure 2, definition }
procedure FreeProc2(AParam: integer);
begin
// Do something
@ -216,7 +234,7 @@ end;
(*
// Unused free function 2
// Unused free function 2, definition
function UnusedFreeFunc2(ANum: double): cardinal;
begin
@ -227,7 +245,7 @@ end;
{ Unused free function 3 }
{ Unused free function 3, definition }
function UnusedFreeFunc3(ANum: double): cardinal;
begin
@ -239,7 +257,7 @@ end;
{ Free procedure 3 }
{ Free procedure 3 (overloaded), definition }
procedure FreeProc3(AParam: integer);
begin
@ -248,6 +266,15 @@ end;
procedure FreeProc3(AParam: string);
begin
//
end;
{ Free procedure 4, forward declaration}
procedure FreeProc4(const Param: integer); forward;
@ -338,7 +365,7 @@ end;
// Free routines
// -----------------------------------------------------------------------------
{ Free function 3 with internal procedure }
{ Free function 3 with internal procedure, definition }
function FreeFunc3(const Param: integer): integer;
@ -355,7 +382,7 @@ end;
{ Free procedure 4 with internal function }
{ Free procedure 4 with internal function, definition }
procedure FreeProc4(const Param: integer);
@ -372,7 +399,7 @@ end;
{ Free procedure 5 with internal procedure preceeded by a comment }
{ Free procedure 5 with internal procedure preceeded by a comment, declaration & definition }
procedure FreeProc5;
@ -388,6 +415,15 @@ end;
{ Free procedure 6 (inline), declaration & definition }
procedure FreeProc6; inline;
begin
//
end;
// -----------------------------------------------------------------------------
// TGenericClass<T>
// -----------------------------------------------------------------------------
@ -462,6 +498,23 @@ end;
// -----------------------------------------------------------------------------
// TInternalClass
// -----------------------------------------------------------------------------
function TInternalClass.Init(Cnt: integer): boolean;
begin
Result := true;
end;
procedure TInternalClass.SetValue(Cnt: integer);
begin
//
end;
// -----------------------------------------------------------------------------
// TEnumHelper
// -----------------------------------------------------------------------------

2
PowerEditor/Test/FunctionList/pascal/unitTest.expected.result
View File

@ -1 +1 @@
{"leaves":["FreeFunc1","FreeProc1","FreeFunc2","FreeProc2","FreeProc3","FreeFunc3","InternalProc1","FreeProc4","InternalFunc1","FreeProc5","InternalProc2"],"nodes":[{"leaves":["Create","Destroy","Init","DeInit","ToType<X>","SetValue","Convert<X>"],"name":"TStdClass"},{"leaves":["Create","Destroy","CopyTo"],"name":"TStdClass.TStdInternalClass"},{"leaves":["Create","Destroy","Init<I>","DeInit","SetValue"],"name":"TGenericClass<T>"},{"leaves":["Create","Destroy","CopyTo<J>"],"name":"TGenericClass<T>.TGenericInternalClass<I, K>"},{"leaves":["ToString","FromString"],"name":"TEnumHelper"},{"leaves":["AsString","FromString"],"name":"TStdClassHelper"}],"root":"unitTest"}
{"leaves":["FreeFunc1","FreeProc1","FreeFunc2","FreeProc2","FreeProc3","FreeProc3","FreeFunc3","InternalProc1","FreeProc4","InternalFunc1","FreeProc5","InternalProc2","FreeProc6"],"nodes":[{"leaves":["Create","Destroy","Init","DeInit","ToType<X>","SetValue","Convert<X>"],"name":"TStdClass"},{"leaves":["Create","Destroy","CopyTo"],"name":"TStdClass.TStdInternalClass"},{"leaves":["Create","Destroy","Init<I>","DeInit","SetValue"],"name":"TGenericClass<T>"},{"leaves":["Create","Destroy","CopyTo<J>"],"name":"TGenericClass<T>.TGenericInternalClass<I, K>"},{"leaves":["Init","SetValue"],"name":"TInternalClass"},{"leaves":["ToString","FromString"],"name":"TEnumHelper"},{"leaves":["AsString","FromString"],"name":"TStdClassHelper"}],"root":"unitTest"}

15
PowerEditor/installer/functionList/pascal.xml
View File

@ -151,13 +151,24 @@
)
)
(?:\s*OVERLOAD\s*;)? # function/procedure overloading
(?:\s*(?:REGISTER|PASCAL|CDECL|STDCALL|SAFECALL)\s*;)? # calling convention
(?:\s*INLINE\s*;)? # function/procedure inlining
(?:\s*(?:REGISTER|PASCAL|CDECL|STDCALL|SAFECALL|WINAPI)\s*;)? # calling convention
(?: # external function from object file
(?:\s*(?:VARARGS)\s*;) # variadic C function with cdecl calling convention
| (?:\s*(?:EXTERNAL)\s+[^;]+;) # or normal function
)?
(?!
(?:\s*FORWARD\s*;) # prevent matching forward declarations in implementation section of unit
(?:\s*FORWARD\s*;) # prevent matching forward declarations in implementation section of unit
)
(?= # only match function/procedure definitions
(?:\s*
(?: # optional comment
(?s:\x7B.*?\x7D) # multi line comment 1st variant
| (?s:\x28\x2A.*?\x2A\x29) # or multi line comment 2nd variant
| (?-s:\x2F{2}.*$) # or single line comment
)
)*
\s*(?:CONST|TYPE|VAR|LABEL|BEGIN|(?R))\s* # declaration block
)
"
>