Skip to content
Snippets Groups Projects
Commit d173d10b authored by erwan's avatar erwan
Browse files

Do not raise an internal error (assert false) when a var is missing.

Indeed, it is not lutils fault when it occurs.
parent 52d447c3
No related branches found
No related tags found
No related merge requests found
OASISFormat: 0.4 OASISFormat: 0.4
Name: lutils Name: lutils
Version: 1.14 Version: 1.15
Authors: Erwan Jahier Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr Maintainers: erwan.jahier@imag.fr
License: GPL-3 License: GPL-3
......
\newcommand{\version}{1.14} \newcommand{\version}{1.15}
\newcommand{\sha}{e9db055} \newcommand{\sha}{52d447c}
\newcommand{\versionname}{none} \newcommand{\versionname}{none}
\newcommand{\versiondate}{22-06-17} \newcommand{\versiondate}{04-10-17}
# OASIS_START # OASIS_START
# DO NOT EDIT (digest: bd2a3dd8b4c274b4d60cc3825abe018b) # DO NOT EDIT (digest: e0feb154a7aab6533276454ea556bfc0)
version = "1.14" version = "1.15"
description = "shared by Verimag/synchronous tools (lustre, lutin, rdbg)." description = "shared by Verimag/synchronous tools (lustre, lutin, rdbg)."
requires = "unix str camlp4 num" requires = "unix str camlp4 num"
archive(byte) = "lutils.cma" archive(byte) = "lutils.cma"
......
let str="1.14" let str="1.15"
let sha="e9db055" let sha="52d447c"
(* Time-stamp: <modified the 23/03/2017 (at 16:00) by Erwan Jahier> *) (* Time-stamp: <modified the 22/09/2017 (at 10:12) by Erwan Jahier> *)
(*----------------------------------------------------------------------- (*-----------------------------------------------------------------------
** This file may only be copied under the terms of the GNU Library General ** This file may only be copied under the terms of the GNU Library General
** Public License ** Public License
...@@ -179,16 +179,18 @@ and (parse_rif_stream : ...@@ -179,16 +179,18 @@ and (parse_rif_stream :
parse_rif_stream label ic oc parse_rif_stream label ic oc
vntl (get_stream debug label ic oc) tbl pragma vntl (get_stream debug label ic oc) tbl pragma
) )
| (LocalGenlex.Kwd ("ERROR"|"Error"|"error"))::_ ->
print_string ("#ERROR value read. bye! ("^str^")\n");
flush stdout;
raise Bye
| (LocalGenlex.Kwd ("#"))::(LocalGenlex.Kwd ("ERROR"|"Error"|"end"))::_ -> | (LocalGenlex.Kwd ("#"))::(LocalGenlex.Kwd ("ERROR"|"Error"|"end"))::_ ->
print_string (str^"\n"); raise Bye print_string ("#ERROR value read. bye! ("^str^")\n");
flush stdout;
raise Bye
| (LocalGenlex.Kwd ("#"))::_ -> | (LocalGenlex.Kwd ("#"))::_ ->
Stream.junk stream ; Stream.junk stream ;
(* prerr_endline (">>>" ^str); print the ignored string on stderr *) (* prerr_endline (">>>" ^str); print the ignored string on stderr *)
parse_rif_stream label ic oc vntl (get_stream debug label ic oc) tbl pragma parse_rif_stream label ic oc vntl (get_stream debug label ic oc) tbl pragma
| (LocalGenlex.Kwd ("ERROR"|"Error"|"error"))::_ ->
print_string ("#ERROR value read. bye! ("^str^")\n");
flush stdout;
raise Bye
| (LocalGenlex.Kwd ("q"))::_ -> print_string "# bye!\n"; raise Bye | (LocalGenlex.Kwd ("q"))::_ -> print_string "# bye!\n"; raise Bye
| (LocalGenlex.Kwd ("#@"))::_ -> | (LocalGenlex.Kwd ("#@"))::_ ->
(* Beginning of multi-line comment. Note that here, (* Beginning of multi-line comment. Note that here,
...@@ -360,10 +362,10 @@ let (write_outputs : out_channel -> (float -> string) -> vntl -> subst list -> u ...@@ -360,10 +362,10 @@ let (write_outputs : out_channel -> (float -> string) -> vntl -> subst list -> u
acc^ (try Data.val_to_string s2f (List.assoc vn sl) acc^ (try Data.val_to_string s2f (List.assoc vn sl)
with with
| Not_found -> | Not_found ->
print_string ("*** " ^ vn ^ " not found in "); Printf.eprintf ("\n*** RifIO: %s not found in %s \n") vn
print_string (String.concat "," (List.map (fun (n,_) -> n) sl)); (String.concat "," (List.map (fun (n,_) -> n) sl));
flush stdout; flush stderr;
assert false "nil"
) ^ " " ) ^ " "
) )
"" ""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment