Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 6095ca23 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 0.100 Fri, 04 Oct 2002 14:21:28 +0200 by jahier

Parent-Version:      0.99
Version-Log:

source/gen_stubs:
   Make sure we are in the rigth directory we calling lus2ec and ec2c.

Project-Description: Lurette
parent 3797df71
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
(TAGS 9825 1007379917 21_TAGS 1.6) (TAGS 9825 1007379917 21_TAGS 1.6)
(test/giro/onlyroll.lus 18298 1031732392 c/7_onlyroll.l 1.1) (test/giro/onlyroll.lus 18298 1031732392 c/7_onlyroll.l 1.1)
(source/parse_env.mli 1025 1027066799 40_parse_env. 1.9) (source/parse_env.mli 1025 1027066799 40_parse_env. 1.9)
(source/gen_stubs.ml 34420 1033397911 24_generate_l 1.36) (source/gen_stubs.ml 34560 1033734088 24_generate_l 1.37)
(OcamlMakefile 22581 1033397911 17_OcamlMakef 1.42) (OcamlMakefile 22581 1033397911 17_OcamlMakef 1.42)
(source/command_line.ml 4625 1031053030 b/20_command_li 1.8) (source/command_line.ml 4625 1031053030 b/20_command_li 1.8)
(make_lurette 1303 1032940601 27_make_luret 1.16) (make_lurette 1303 1032940601 27_make_luret 1.16)
......
;; -*- Prcs -*- ;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3) (Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette") (Project-Description "Lurette")
(Project-Version lurette 0 99) (Project-Version lurette 0 100)
(Parent-Version lurette 0 98) (Parent-Version lurette 0 99)
(Version-Log " (Version-Log "
source/solver.ml:
source/rnumsolver.mli,.ml:
source/constraint.ml,.mli:
Split the Constraint.t type into t and ineq where
inequalities are in ineq. The rational is that most
operations on constaint.t are actually done on ineq.
This change therefore avoid pattern like
<<_ -> assert false>> and let the type checher check
that sort of things.
source/gen_stubs:
Make sure we are in the rigth directory we calling lus2ec and ec2c.
") ")
(New-Version-Log "" (New-Version-Log ""
) )
(Checkin-Time "Fri, 04 Oct 2002 13:49:58 +0200") (Checkin-Time "Fri, 04 Oct 2002 14:21:28 +0200")
(Checkin-Login jahier) (Checkin-Login jahier)
(Populate-Ignore ()) (Populate-Ignore ())
(Project-Keywords) (Project-Keywords)
...@@ -85,7 +77,7 @@ source/constraint.ml,.mli: ...@@ -85,7 +77,7 @@ source/constraint.ml,.mli:
(source/gne.ml (lurette/b/37_gne.ml 1.4 644)) (source/gne.ml (lurette/b/37_gne.ml 1.4 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.11 644)) (source/lurettetop.ml (lurette/c/1_lurettetop 1.11 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.36 644)) (source/gen_stubs.ml (lurette/24_generate_l 1.37 644))
(source/control.mli (lurette/c/3_control.ml 1.2 644)) (source/control.mli (lurette/c/3_control.ml 1.2 644))
(source/control.ml (lurette/c/4_control.ml 1.3 644)) (source/control.ml (lurette/c/4_control.ml 1.3 644))
......
...@@ -946,10 +946,13 @@ let compile_lustre_program_if_needed lustre_prog = ...@@ -946,10 +946,13 @@ let compile_lustre_program_if_needed lustre_prog =
".h exist(s), so I try to compile " ^ lustre_prog ^ ".h exist(s), so I try to compile " ^ lustre_prog ^
".lus with the lus2ec and ec2c...\n"); ".lus with the lus2ec and ec2c...\n");
let lustre_node = Filename.basename lustre_prog in let lustre_node = Filename.basename lustre_prog in
let cmd = ("lus2ec " ^ lustre_prog ^ ".lus " ^ lustre_node) let prog_dir = Filename.dirname lustre_prog in
and cmd2 = ("ec2c " ^ lustre_prog ^ ".ec") let save_dir = Sys.getcwd () in
let cmd = ("lus2ec " ^ lustre_prog ^ ".lus " ^ lustre_node ^ "\n")
and cmd2 = ("ec2c " ^ lustre_prog ^ ".ec \n")
in in
output_string stderr (cmd ^ "\n"); Sys.chdir prog_dir;
output_string stderr cmd;
if if
((Sys.command cmd) <> 0) ((Sys.command cmd) <> 0)
then then
...@@ -962,8 +965,8 @@ let compile_lustre_program_if_needed lustre_prog = ...@@ -962,8 +965,8 @@ let compile_lustre_program_if_needed lustre_prog =
) )
else else
( (
output_string stderr " ... ok\n"; output_string stderr " ... lus2ec: ok\n";
output_string stderr (cmd2 ^ "\n"); output_string stderr cmd2;
if if
((Sys.command cmd2) <> 0) ((Sys.command cmd2) <> 0)
then then
...@@ -973,9 +976,10 @@ let compile_lustre_program_if_needed lustre_prog = ...@@ -973,9 +976,10 @@ let compile_lustre_program_if_needed lustre_prog =
exit 2 exit 2
) )
else else
output_string stderr " ... ok\n"; output_string stderr " ... ec2c: ok\n";
flush stderr flush stderr
) );
Sys.chdir save_dir;
) )
......
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