From 33d4cd49003dd0b3d3b21eca09e86d8ef25ec0c2 Mon Sep 17 00:00:00 2001 From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr> Date: Thu, 22 Feb 2018 15:52:28 +0100 Subject: [PATCH] An ugly msg was printed in rpesence of -2c when no node was set. --- _oasis | 2 +- lv6-ref-man/lv6-ref-man.pdf | Bin 324101 -> 324096 bytes src/lv6version.ml | 2 +- src/main.ml | 8 ++++---- src/soc2c.ml | 7 +++++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/_oasis b/_oasis index a666c10a..dfe188a5 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: lustre-v6 -Version: 1.730 +Version: 1.731 Synopsis: The Lustre V6 Verimag compiler Description: This package contains: - lus2lic: the (current) name of the compiler (and interpreter via -exec) diff --git a/lv6-ref-man/lv6-ref-man.pdf b/lv6-ref-man/lv6-ref-man.pdf index f4ca2c8ea1530e81eb77d4d36ba6cafbaf967bde..594c50d734d8149fceb68abc4a1b8047f4ca8762 100644 GIT binary patch delta 3649 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 Z@1Cew;4eGc_&10WzaCUo)ym;C^gn!hfxG|! delta 3675 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 diff --git a/src/lv6version.ml b/src/lv6version.ml index 377fcf93..06ad2fc4 100644 --- a/src/lv6version.ml +++ b/src/lv6version.ml @@ -2,6 +2,6 @@ let tool = "lus2lic" let branch = "master" let commit = "" -let sha_1 = "803db8564c42740d0cd58620c374a5189235c61d" +let sha_1 = "6710f70f1ebdb1ad0bea5026e2901aa63fe799d5" let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")") let maintainer = "erwan.jahier@univ-grenoble-alpes.fr" diff --git a/src/main.ml b/src/main.ml index 5f499bfa..e40244ae 100644 --- a/src/main.ml +++ b/src/main.ml @@ -1,4 +1,4 @@ -(* Time-stamp: <modified the 22/09/2017 (at 10:09) by Erwan Jahier> *) +(* Time-stamp: <modified the 22/02/2018 (at 15:50) by Erwan Jahier> *) open Lv6Verbose open AstV6 @@ -89,7 +89,7 @@ let (gen_autotest_files : LicPrg.t -> Lv6Id.idref option -> Lv6MainArgs.t -> uni let main_node = Lv6Id.to_idref name in let nk = (Lic.node_key_of_idref main_node) in if LicPrg.node_exists lic_prg nk then ( - output_string stdout ("WARNING: No main node is specified. I'll try with " + output_string stdout ("WARNING: No main node is specified: will use " ^ name ^"\n"); flush stdout; let msk, zesoc = Lic2soc.f lic_prg nk in @@ -278,7 +278,7 @@ let main () = ( let name = find_a_node opt in let nk = (Lic.node_key_of_idref (Lv6Id.to_idref name)) in if LicPrg.node_exists lic_prg nk then ( - print_string ("WARNING: No main node is specified. I'll try with "^name^"\n"); + print_string ("WARNING: No main node is specified: will use "^name^"\n"); flush stdout; profile_info "Start compiling to soc...\n"; let msk,zesoc = Lic2soc.f lic_prg nk in @@ -352,7 +352,7 @@ let main () = ( (* exit 1 *) (* ) *) - close_out opt.oc + if opt.outfile <> "" then close_out opt.oc );; main(); diff --git a/src/soc2c.ml b/src/soc2c.ml index 33bc891f..adfecb88 100644 --- a/src/soc2c.ml +++ b/src/soc2c.ml @@ -1,4 +1,4 @@ -(* Time-stamp: <modified the 10/07/2017 (at 13:12) by Erwan Jahier> *) +(* Time-stamp: <modified the 22/02/2018 (at 15:48) by Erwan Jahier> *) (* let put (os: out_channel) (fmt:('a, unit, string, unit) format4) : 'a = *) @@ -971,7 +971,10 @@ typedef float _float; Printf.printf "%s has been generated.\n" hfile; Printf.printf "%s has been generated.\n" cfile; flush stdout; - let node = args.Lv6MainArgs.main_node in + let node = + if args.Lv6MainArgs.main_node <> "" then args.Lv6MainArgs.main_node else + Filename.basename (Filename.chop_extension (List.hd args.Lv6MainArgs.infiles)) + in let execfile = if args.Lv6MainArgs.outfile = "" then (node^".exec") else args.Lv6MainArgs.outfile in -- GitLab