paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-18 22:49:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

* check unit name when expected unitname > 8 chars

Browse Source
This commit is contained in:
peter 2003-12-12 19:42:21 +00:00
parent bce5a1e252
commit 83abfdc39d
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
compiler/pmodules.pas
View File

@ -809,7 +809,7 @@ implementation
pu : tused_unit; pu : tused_unit;
{$endif GDB} {$endif GDB}
store_crc,store_interface_crc : cardinal; store_crc,store_interface_crc : cardinal;
s2 : ^string; {Saves stack space} s1,s2 : ^string; {Saves stack space}
force_init_final : boolean; force_init_final : boolean;
pd : tprocdef; pd : tprocdef;
begin begin
@ -824,6 +824,8 @@ implementation
while assigned(main_file.next) do while assigned(main_file.next) do
main_file := main_file.next; main_file := main_file.next;
new(s1);
s1^:=current_module.modulename^;
current_module.SetFileName(main_file.path^+main_file.name^,true); current_module.SetFileName(main_file.path^+main_file.name^,true);
current_module.SetModuleName(orgpattern); current_module.SetModuleName(orgpattern);
@ -831,13 +833,25 @@ implementation
new(s2); new(s2);
s2^:=upper(SplitName(main_file.name^)); s2^:=upper(SplitName(main_file.name^));
if (cs_check_unit_name in aktglobalswitches) and if (cs_check_unit_name in aktglobalswitches) and
not((current_module.modulename^=s2^) or (
((length(current_module.modulename^)>8) and not(
(copy(current_module.modulename^,1,8)=s2^))) then (current_module.modulename^=s2^) or
(
(length(current_module.modulename^)>8) and
(copy(current_module.modulename^,1,8)=s2^)
)
)
or
(
(length(s1^)>8) and
(s1^<>current_module.modulename^)
)
) then
Message1(unit_e_illegal_unit_name,current_module.realmodulename^); Message1(unit_e_illegal_unit_name,current_module.realmodulename^);
if (current_module.modulename^='SYSTEM') then if (current_module.modulename^='SYSTEM') then
include(aktmoduleswitches,cs_compilesystem); include(aktmoduleswitches,cs_compilesystem);
dispose(s2); dispose(s2);
dispose(s1);
end; end;
consume(_ID); consume(_ID);
@ -1425,7 +1439,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.134 2003-12-08 22:33:43 peter Revision 1.135 2003-12-12 19:42:21 peter
* check unit name when expected unitname > 8 chars
Revision 1.134 2003/12/08 22:33:43 peter
* don't allow duplicate uses * don't allow duplicate uses
* fix wrong circular dependency * fix wrong circular dependency