diff --git a/src/Makefile b/src/Makefile index c82e185748413fe220f67632c7136fd9bd3d77c3..c5c435803fee43660681e5152d8c83753abd583f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -79,7 +79,14 @@ test: $(RESULT) utest: $(RESULT) cd test; make utest +diff: + cd ..; make diff +cia: + cd ..; make cia + +ci: + cd ..; make ci # Specific rule (version) diff --git a/src/TODO b/src/TODO index 6a993f39e8f6382c1d3c0958830ff46927eb3a21..48dac996fc3e3048a9e48d7eb44c742560bcd627 100644 --- a/src/TODO +++ b/src/TODO @@ -96,9 +96,6 @@ lazycompiler.ml: *** facile -* bug dans main.ml: le program principal ne peut pas s'appeller "main" à cause -du (stupide) test que je fais dans set_infile... - * Verifier que les test de map_red couvre les cas tordus. * BUG dans test/should_work/NONREG/Int.lus diff --git a/src/global.ml b/src/global.ml index 3ea23a967a2014146b2dcb9f25c9cb1d2f6d4783..aa7a9019f4b6c8b685ab38ed281ef2cd0f521661 100644 --- a/src/global.ml +++ b/src/global.ml @@ -1,4 +1,4 @@ -(** Time-stamp: <modified the 30/01/2008 (at 16:18) by Erwan Jahier> *) +(** Time-stamp: <modified the 20/05/2008 (at 12:07) by Erwan Jahier> *) (** Some global variables *) @@ -14,7 +14,7 @@ let _lus2lic_ARGS = { outfile = "" ; infiles = [] ; current_file = ""; - main_node = "main"; + main_node = ""; compile_all_items = false } diff --git a/src/main.ml b/src/main.ml index 19225bc56c6c93050a128e937879c57dc5aa1cc6..d26d9b75dd7c007a637a5b3d7eb2802658d5af4a 100644 --- a/src/main.ml +++ b/src/main.ml @@ -1,4 +1,4 @@ -(** Time-stamp: <modified the 20/05/2008 (at 12:04) by Erwan Jahier> *) +(** Time-stamp: <modified the 20/05/2008 (at 12:08) by Erwan Jahier> *) (** Here follows a description of the different modules used by this lus2lic compiler. @@ -62,7 +62,7 @@ let print_version = function (x: unit) -> ( ) let rec set_infile = function (x:string) -> ( - if ( _lus2lic_ARGS.main_node = "main" ) then ( + if ( _lus2lic_ARGS.main_node = "" ) then ( (* default node name = file name *) try _lus2lic_ARGS.main_node <- Filename.chop_extension (Filename.basename x) @@ -74,10 +74,10 @@ let rec set_infile = function (x:string) -> ( ) and arg_list = [ - ( "-version", Arg.Unit(function x -> print_version () ; exit 0), + ( "-version", Arg.Unit(fun x -> print_version () ; exit 0), " print the current version then exit" ); - ( "-o", Arg.String(function x -> _lus2lic_ARGS.outfile <- x), + ( "-o", Arg.String(fun x -> _lus2lic_ARGS.outfile <- x), " <file name> set the output file name" ); ( "-n", Arg.String(fun x -> _lus2lic_ARGS.main_node <- x), @@ -88,10 +88,10 @@ and arg_list = [ " compile all items of the program" ); - ( "-v", Arg.Unit (function vl -> Verbose.set_level 1 ), + ( "-v", Arg.Unit (fun vl -> Verbose.set_level 1 ), " set verbose mode on (i.e., verbose level = 1)" ); - ( "-vl", Arg.Int(function vl -> Verbose.set_level vl ), + ( "-vl", Arg.Int(fun vl -> Verbose.set_level vl ), " <int> set verbose level" ) ]