Commit e105f6e8 authored by John van Groningen's avatar John van Groningen

pass record ProjectCompilerOptions to functions makeCompilerOptionsArguments and compiler_arguments

parent c8f5b526
......@@ -84,7 +84,7 @@ Compile
out_file_name = out_file_path temp_dir 0
errors_file_name = errors_file_path temp_dir 0
# cocl_arguments = compiler_arguments out_file_name errors_file_name compileOrCheckSyntax path paths write_module_times project_compiler_options.pco_memory_profiling project_compiler_options.pco_time_profiling project_compiler_options.pco_link_dynamic co
# cocl_arguments = compiler_arguments out_file_name errors_file_name compileOrCheckSyntax path paths write_module_times project_compiler_options co
cocl_arguments = add_options_string_to_args 0 options2 cocl_arguments
cocl_arguments = add_options_string_to_args 0 options1 cocl_arguments
......@@ -130,7 +130,7 @@ CompilePersistent cocl write_module_times errwin typewin compileOrCheckSyntax md
out_file_name = out_file_path temp_dir 0
errors_file_name = errors_file_path temp_dir 0
# args = makeCompilerOptionsArguments compileOrCheckSyntax write_module_times project_compiler_options.pco_memory_profiling project_compiler_options.pco_time_profiling project_compiler_options.pco_link_dynamic co
# args = makeCompilerOptionsArguments compileOrCheckSyntax write_module_times project_compiler_options co
# args_string = concat_args args+++
" "+++mdn.mdn_name+++
" -P "+++"\""+++concatenate_paths paths+++"\""+++
......@@ -189,7 +189,7 @@ CompileStartCommand cocl write_module_times errwin compileOrCheckSyntax path
out_file_name = out_file_path temp_dir slot
errors_file_name = errors_file_path temp_dir slot
# args = makeCompilerOptionsArguments compileOrCheckSyntax write_module_times project_compiler_options.pco_memory_profiling project_compiler_options.pco_time_profiling project_compiler_options.pco_link_dynamic co
# args = makeCompilerOptionsArguments compileOrCheckSyntax write_module_times project_compiler_options co
# args_string = concat_args args+++
" "+++path+++
" -P "+++concatenate_paths paths+++
......@@ -770,18 +770,18 @@ add_options_string_to_args i s args
= skip_to_space_or_tab (i+1) s
= i
compiler_arguments :: !String !String !CompileOrCheckSyntax !Pathname !(List Pathname) !Bool !Bool !Bool !Bool !CompilerOptions -> [String]
compiler_arguments :: !String !String !CompileOrCheckSyntax !Pathname !(List Pathname) !Bool !ProjectCompilerOptions !CompilerOptions -> [String]
compiler_arguments out_file_name errors_file_name compileOrCheckSyntax path paths
write_module_times projectHeapProfiling projectTimeProfiling projectEagerOrDynamic co
# args = makeCompilerOptionsArguments compileOrCheckSyntax write_module_times projectHeapProfiling projectTimeProfiling projectEagerOrDynamic co
write_module_times project_compiler_options co
# args = makeCompilerOptionsArguments compileOrCheckSyntax write_module_times project_compiler_options co
= args ++ [path,"-P",concatenate_paths paths,"-RE",errors_file_name,"-RO",out_file_name];
concat_args [] = ""
concat_args [arg] = arg
concat_args [arg:args] = arg+++" "+++concat_args args
makeCompilerOptionsArguments :: !CompileOrCheckSyntax !Bool !Bool !Bool !Bool !CompilerOptions -> [String]
makeCompilerOptionsArguments compileOrCheckSyntax write_module_times projectMemoryProfiling projectTimeProfiling projectEagerOrDynamic
makeCompilerOptionsArguments :: !CompileOrCheckSyntax !Bool !ProjectCompilerOptions !CompilerOptions -> [String]
makeCompilerOptionsArguments compileOrCheckSyntax write_module_times {pco_memory_profiling,pco_time_profiling,pco_link_dynamic}
{neverMemoryProfile,neverTimeProfile,sa,gw,gc,listTypes,attr,reuseUniqueNodes,fusion}
= write_module_times_arg ++ checksyntax ++ timeProfileSwitch ++ memoryProfileSwitch ++ dynamicLinkSwitch
++ strictness ++ warnings ++ comments ++ listtypes ++ show_attr ++ reuse ++ fusion_arg
......@@ -791,16 +791,16 @@ where
= ["-wmt"]
= []
memoryProfileSwitch
| (not neverMemoryProfile && projectMemoryProfiling)
|| projectEagerOrDynamic
| (not neverMemoryProfile && pco_memory_profiling)
|| pco_link_dynamic
= ["-desc"]
= []
timeProfileSwitch
| not neverTimeProfile && projectTimeProfiling
| not neverTimeProfile && pco_time_profiling
= ["-pt"]
= []
dynamicLinkSwitch
| projectEagerOrDynamic
| pco_link_dynamic
= ["-exl","-dynamics"]
= []
strictness
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment