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

fix indenting (after the merge of namespaces branch)

Browse Source 
git-svn-id: trunk@18920 -
This commit is contained in:
paul 2011-08-31 08:10:31 +00:00
parent 0a3ac5a89d
commit 3c5d642685
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
compiler/pmodules.pas
View File

@ -1098,46 +1098,46 @@ implementation
unitname:=orgpattern; unitname:=orgpattern;
consume(_ID); consume(_ID);
while token=_POINT do while token=_POINT do
begin begin
consume(_POINT); consume(_POINT);
unitname:=unitname+'.'+orgpattern; unitname:=unitname+'.'+orgpattern;
consume(_ID); consume(_ID);
end; end;
{ create filenames and unit name } { create filenames and unit name }
main_file := current_scanner.inputfile; main_file := current_scanner.inputfile;
while assigned(main_file.next) do while assigned(main_file.next) do
main_file := main_file.next; main_file := main_file.next;
new(s1); new(s1);
s1^:=current_module.modulename^; 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(unitname); current_module.SetModuleName(unitname);
{ check for system unit } { check for system unit }
new(s2); new(s2);
s2^:=upper(ChangeFileExt(ExtractFileName(main_file.name^),'')); s2^:=upper(ChangeFileExt(ExtractFileName(main_file.name^),''));
unitname8:=copy(current_module.modulename^,1,8); unitname8:=copy(current_module.modulename^,1,8);
if (cs_check_unit_name in current_settings.globalswitches) and if (cs_check_unit_name in current_settings.globalswitches) and
( (
not( not(
(current_module.modulename^=s2^) or (current_module.modulename^=s2^) or
(
(length(current_module.modulename^)>8) and
(unitname8=s2^)
)
)
or
( (
(length(s1^)>8) and (length(current_module.modulename^)>8) and
(s1^<>current_module.modulename^) (unitname8=s2^)
) )
) then )
Message1(unit_e_illegal_unit_name,current_module.realmodulename^); or
if (current_module.modulename^='SYSTEM') then (
include(current_settings.moduleswitches,cs_compilesystem); (length(s1^)>8) and
dispose(s2); (s1^<>current_module.modulename^)
dispose(s1); )
) then
Message1(unit_e_illegal_unit_name,current_module.realmodulename^);
if (current_module.modulename^='SYSTEM') then
include(current_settings.moduleswitches,cs_compilesystem);
dispose(s2);
dispose(s1);
if (target_info.system in systems_unit_program_exports) then if (target_info.system in systems_unit_program_exports) then
exportlib.preparelib(current_module.realmodulename^); exportlib.preparelib(current_module.realmodulename^);
@ -1869,7 +1869,7 @@ implementation
if token=_ID then if token=_ID then
begin begin
module_name:=pattern; module_name:=pattern;
consume(_ID); consume(_ID);
while token=_POINT do while token=_POINT do
begin begin
consume(_POINT); consume(_POINT);