mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-18 07:15:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix the code to add extra initialization functions to library/mer_std.init.

Browse Source 
Estimated hours taken: 1.5
Branches: main

Fix the code to add extra initialization functions to library/mer_std.init.

compiler/options.m:
doc/user_guide.texi:
compiler/compile_target_code.m:
	Rename the `--make-init-file-command' as `--extra-init-command'.
	This should now only generated the extra entries in the `.init'
	file, not the whole file.

scripts/Mmake.vars.in:
compiler/modules.m:
	Allow $(EXTRA_INIT_COMMAND) as the Mmake equivalent
	of `--extra-init-command'. Append the output of
	$(EXTRA_INIT_COMMAND) to the `.init' file.

library/Mmakefile:
	Set EXTRA_INIT_COMMAND rather than overriding the
	libmer_std.init rule.
This commit is contained in:
Simon Taylor
2002-07-29 07:51:07 +00:00
parent 7d346aea14
commit 7de0228bcc
6 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
compiler/compile_target_code.m
View File

@@ -639,16 +639,6 @@ assemble(ErrorStream, PIC, ModuleName, Succeeded) -->
%-----------------------------------------------------------------------------%
make_init_file(ErrorStream, MainModuleName, AllModules, Succeeded) -->
globals__io_lookup_maybe_string_option(make_init_file_command,
MaybeInitFileCommand),
(
{ MaybeInitFileCommand = yes(InitFileCommand0) },
{ InitFileCommand = substitute_user_command(InitFileCommand0,
MainModuleName, AllModules) },
invoke_shell_command(ErrorStream, verbose_commands,
InitFileCommand, Succeeded)
;
{ MaybeInitFileCommand = no },
module_name_to_file_name(MainModuleName, ".init.tmp",
yes, TmpInitFileName),
io__open_output(TmpInitFileName, InitFileRes),
@@ -674,10 +664,25 @@ make_init_file(ErrorStream, MainModuleName, AllModules, Succeeded) -->
[]
)
), AllModules),
globals__io_lookup_maybe_string_option(extra_init_command,
MaybeInitFileCommand),
(
{ MaybeInitFileCommand = yes(InitFileCommand0) },
{ InitFileCommand = substitute_user_command(
InitFileCommand0, MainModuleName,
AllModules) },
invoke_shell_command(InitFileStream, verbose_commands,
InitFileCommand, Succeeded0)
;
{ MaybeInitFileCommand = no },
{ Succeeded0 = yes }
),
io__close_output(InitFileStream),
module_name_to_file_name(MainModuleName, ".init",
yes, InitFileName),
update_interface(InitFileName, Succeeded)
update_interface(InitFileName, Succeeded1),
{ Succeeded = Succeeded0 `and` Succeeded1 }
;
{ InitFileRes = error(Error) },
io__progname_base("mercury_compile", ProgName),
@@ -689,8 +694,7 @@ make_init_file(ErrorStream, MainModuleName, AllModules, Succeeded) -->
io__write_string(ErrorStream, io__error_message(Error)),
io__nl(ErrorStream),
{ Succeeded = no }
)
).
).
%-----------------------------------------------------------------------------%