Commit f59bc4de authored by Erwan Jahier's avatar Erwan Jahier
Browse files

Quite a lot of changes in lurettetop:

  - Add support to handle several oracles.
  - Add a info command
  - Don't create a tmp dir in the direct mode.
  - Do not overwrite rif file, unless --overwrite-output is used
  - Add a ec_exe mode for rp that les one plus aby rif based exec to bu plugged.
  - Clean all tables to make sure that lutin result are reproductible when not
    quitting lurettetop (was not necessary in the old mode...).
  nb : this has broken some of the non-reg test.
  - and more...

Some improvements in the Lutin manual.
parent 12c1681d
......@@ -17,7 +17,7 @@ PREFIX =$(LURETTE_PATH)
AR=ar
AS=as
OCAMLC=$(shell which ocamlc)
SYNCHRONE_DIR=/usr/local/www/DIST-TOOLS/SYNCHRONE
SYNCHRONE_DIR=/import/www/DIST-TOOLS/SYNCHRONE
SYNCHRONE_LURETTE_DIR=$(SYNCHRONE_DIR)/lurette/
#INCDIRS = $(PREFIX)/$(HOSTTYPE)/lib
#LIBDIRS = $(PREFIX)/$(HOSTTYPE)/lib
......
......@@ -11,7 +11,7 @@ $(objdir)/lurette-start.ps $(objdir)/lurette-try.ps \
$(objdir)/obj-code-gen.ps $(objdir)/components-diagram.ps \
$(objdir)/heater_sensors.ps
ALLTEX=sensors.tex wearing_sensors.tex heater_control.tex heater_control_env.tex touch.tex
ALLTEX=sensors.tex wearing_sensors.tex heater_control.tex heater_control_env.tex touch.tex
all : $(objdir) pdf
make re
......
......@@ -722,6 +722,15 @@ It is the first part of the RIF (see~\ref{rif}) file name used to
test length.
%---------------------------------------------------------------------
%---------------------------------------------------------------------
\newpage
\subsection{Test Coverage}
\label{coverage}
\input{coverage}
%--------------------------------------------------------------------
%--------------------------------------------------------------------
\newpage
......@@ -1000,7 +1009,7 @@ explicitely specify the full path of tools that are used by Lurette.
\label{heater-control-lus}
% \begin{figure}[htb]
\begin{small}
\begin{small}
\begin{example}
\input{heater_control}
\end{example}
......@@ -1129,7 +1138,7 @@ the synchronous Verimag tools for writing and reading sequences of
input and output data vectors. We recall in this section what this format
looks like.
\paragraph{Data.} A RIF file is essentially a sequence of data values separated
\paragraph{Data.} A RIF file is a sequence of data values separated
by spaces, newlines, horizontal tabulations, carriage returns, line
feed and form feeds. A data value can be either an integer, a
floating-point or a Boolean ({\tt t}, {\tt T}, or {\tt 1} stands for
......@@ -1156,23 +1165,27 @@ notation):
\begin{itemize}
\item \kwd{@\#inputs} (\nt{var name} \term{:} \nt{var type})+ \kwd{\#@}, to
\item \kwd{@\#inputs} (\nt{var name} \term{:} \nt{var type})+ \kwd{\#@}
or
\item \kwd{\#inputs} (\nt{var name} \term{:} \nt{var type})+
to
declare the list of input variable names and types;
\item \kwd{@\#outputs} (\nt{var name} \term{:} \nt{var type})+ \kwd{\#@},
\item \kwd{@\#outputs} (\nt{var name} \term{:} \nt{var type})+ \kwd{\#@}
or
\item \kwd{\#outputs} (\nt{var name} \term{:} \nt{var type})+
to declare the list of output variable names and types;
\item \kwd{@\#locals} (\nt{var name} \term{:} \nt{var type})+ \kwd{\#@}, to
declare the list of local variable names and types;
\item \kwd{@\#locals} (\nt{var name} \term{:} \nt{var type})+ \kwd{\#@}
or
\item \kwd{\#locs} to indicate that the following data correspond to local variables;
to declare the list of local variable names and types;
\item \kwd{\#outs}, to indicate that the following data correspond to output variables;
\item \kwd{\#locs} to indicate that the following data correspond to local variables;
\item \kwd{\#step } \term{int}, to indicate that a new step is
starting, and that the following data correspond to input variables.
......
......@@ -559,7 +559,7 @@ declare in the combinator profile that it is a reference using the
\begin{example}
\begin{program}
\key{let} foo(pt: real \key{ref}) \key{returns} (t: real) = \\
\key{node} foo(pt: real \key{ref}) \key{returns} (t: real) = \\
\> \key{if} \key{pre} pt < pt \key{then} pt < t \key{else} t < pt
\end{program}
\end{example}
......
......@@ -94,8 +94,8 @@ utest1:
test2: clean foo-sock$(EXE)
$(CALLVIASOCKET) "$(LUTIN) foo.lut" &
./foo-sock$(EXE) > test2.rif
./foo-sock$(EXE) > test2.rif &
$(CALLVIASOCKET) "$(LUTIN) foo.lut"
rm -f test2.res && diff -B -u -i test2.rif.exp test2.rif > test2.res || true
cat test2.res
[ ! -s test2.res ] && make clean
......
......@@ -2,5 +2,5 @@
#inputs "r":real "alpha":real
#outputs "x":real "y":real
#step 1
1.0 1.0 #outs0.54 0.84
1.0 1.0 #outs 0.54 0.84
# Simulation reached max steps.
......@@ -6,6 +6,6 @@
#step 2
#outs t t f t t
#step 3
#outs t f f t t
#outs f f f t t
#step 4
# Simulation ended normally.
......@@ -4,8 +4,8 @@
#step 1
#outs t t t t f t
#step 2
#outs t t t t t f
#outs f t f t t t
#step 3
#outs t t t f f t
#outs f f f t t t
#step 4
# Simulation ended normally.
......@@ -4,8 +4,8 @@
#step 1
#outs t t t t
#step 2
#outs f t t t
#outs t t t t
#step 3
#outs t t f t
#outs f t f t
#step 4
# Simulation ended normally.
......@@ -6,7 +6,7 @@
#step 2
#outs t t t t
#step 3
#outs t f f t
#outs t t f f
#step 4
#outs t t f t
#step 5
......@@ -14,15 +14,15 @@
#step 6
#outs t f f f
#step 7
#outs t f f t
#outs t t f f
#step 8
#outs t f f t
#outs t t f f
#step 9
#outs t f f f
#step 10
#outs t f f t
#outs t t f f
#step 11
#outs t f f t
#outs t t f f
#step 12
#outs t t f t
#step 13
......@@ -48,73 +48,73 @@
#step 23
#outs t t t t
#step 24
#outs t t t f
#outs t f t t
#step 25
#outs t t t f
#outs t f t t
#step 26
#outs t t t f
#step 27
#outs t f t t
#step 27
#outs t t t f
#step 28
#outs t t f t
#step 29
#outs t t f f
#outs t f f t
#step 30
#outs t f t t
#outs t t t f
#step 31
#outs t f f f
#step 32
#outs t t t t
#step 33
#outs t f t t
#outs t t t f
#step 34
#outs t f f f
#step 35
#outs t f f t
#outs t t f f
#step 36
#outs t f t t
#outs t t t f
#step 37
#outs t f t f
#step 38
#outs t f t t
#outs t t t f
#step 39
#outs t t t t
#step 40
#outs t f f t
#outs t t f f
#step 41
#outs t t t t
#step 42
#outs t t f t
#step 43
#outs t t t f
#outs t f t t
#step 44
#outs t f t f
#step 45
#outs t t f f
#outs t f f t
#step 46
#outs t f t t
#outs t t t f
#step 47
#outs t f f f
#step 48
#outs t f f t
#outs t t f f
#step 49
#outs t t f t
#step 50
#outs t f f t
#outs t t f f
#step 51
#outs t f t f
#step 52
#outs t t f f
#outs t f f t
#step 53
#outs t f t t
#outs t t t f
#step 54
#outs t f f t
#outs t t f f
#step 55
#outs t t f t
#step 56
#outs t f t t
#outs t t t f
#step 57
#outs t t f f
#outs t f f t
#step 58
#outs t t f t
#step 59
......@@ -124,33 +124,33 @@
#step 61
#outs t f t f
#step 62
#outs t t f f
#outs t f f t
#step 63
#outs t t t f
#outs t f t t
#step 64
#outs t t t f
#outs t f t t
#step 65
#outs t t t f
#outs t f t t
#step 66
#outs t t f t
#step 67
#outs t t f t
#step 68
#outs t f t t
#outs t t t f
#step 69
#outs t t t t
#step 70
#outs t f f t
#outs t t f f
#step 71
#outs t t f t
#step 72
#outs t t t f
#outs t f t t
#step 73
#outs t f f f
#step 74
#outs t f t f
#step 75
#outs t f f t
#outs t t f f
#step 76
#outs t f t f
#step 77
......@@ -160,25 +160,25 @@
#step 79
#outs t f f f
#step 80
#outs t t f f
#outs t f f t
#step 81
#outs t f f f
#step 82
#outs t t f t
#step 83
#outs t t f f
#outs t f f t
#step 84
#outs t f t t
#outs t t t f
#step 85
#outs t t f f
#outs t f f t
#step 86
#outs t t f f
#outs t f f t
#step 87
#outs t t t f
#outs t f t t
#step 88
#outs t f f f
#step 89
#outs t t t f
#outs t f t t
#step 90
#outs t f f f
#step 91
......@@ -188,18 +188,18 @@
#step 93
#outs t f f f
#step 94
#outs t f t t
#outs t t t f
#step 95
#outs t f t t
#step 96
#outs t t t f
#step 96
#outs t f t t
#step 97
#outs t t f f
#outs t f f t
#step 98
#outs t f t t
#step 99
#outs t t t f
#step 99
#outs t f t t
#step 100
#outs t t f f
#outs t f f t
#end
......@@ -4,202 +4,202 @@
#step 1
1 #outs t t t
#step 2
0 #outs t f t
0 #outs t t f
#step 3
1 #outs t t t
#step 4
1 #outs f t f
1 #outs f f t
#step 5
0 #outs t t t
#step 6
0 #outs f f f
#step 7
1 #outs f t t
1 #outs t t t
#step 8
1 #outs f t f
1 #outs f f t
#step 9
0 #outs t f t
0 #outs t t f
#step 10
1 #outs f f t
1 #outs f t f
#step 11
1 #outs t f t
1 #outs f t f
#step 12
1 #outs f f t
#step 13
0 #outs f f t
0 #outs t f f
#step 14
0 #outs f f f
#step 15
1 #outs t f t
#step 16
1 #outs t t f
#step 16
1 #outs f t t
#step 17
0 #outs t t t
#step 18
1 #outs f t f
1 #outs f f t
#step 19
1 #outs f t f
1 #outs f f t
#step 20
0 #outs f f f
#step 21
0 #outs f t t
0 #outs t f t
#step 22
1 #outs f f t
1 #outs t f t
#step 23
1 #outs t t t
#step 24
0 #outs t t f
0 #outs f t t
#step 25
1 #outs f f t
#step 26
1 #outs f t f
#step 27
1 #outs f f t
#step 27
1 #outs t f t
#step 28
0 #outs t t f
0 #outs f t t
#step 29
0 #outs t t t
#step 30
1 #outs t f t
1 #outs t t f
#step 31
0 #outs t t t
#step 32
1 #outs t t t
1 #outs t t f
#step 33
0 #outs f t f
0 #outs f f t
#step 34
1 #outs t t t
#step 35
1 #outs f t f
1 #outs f f t
#step 36
0 #outs f t t
0 #outs t f t
#step 37
1 #outs t t t
#step 38
0 #outs f t t
0 #outs t f t
#step 39
1 #outs f f t
1 #outs t f t
#step 40
1 #outs f t t
1 #outs t f t
#step 41
0 #outs f f f
#step 42
1 #outs f f t
1 #outs t t f
#step 43
1 #outs t t t
#step 44
1 #outs f t t
1 #outs t t t
#step 45
0 #outs f f f
#step 46
1 #outs f t f
1 #outs f f t
#step 47
1 #outs t t t
1 #outs t t f
#step 48
0 #outs f t t
0 #outs t f t
#step 49
0 #outs t f f
0 #outs f t f
#step 50
1 #outs t t f
1 #outs f t t
#step 51
1 #outs t t t
#step 52
0 #outs t t t
#step 53
1 #outs f f t
1 #outs t t f
#step 54
1 #outs f t t
1 #outs t t t
#step 55
0 #outs t t f
0 #outs f t t
#step 56
1 #outs t t f
1 #outs f t t
#step 57
1 #outs t t f
1 #outs f t t
#step 58
0 #outs t f f
0 #outs f t f
#step 59
0 #outs f t t
0 #outs t f t
#step 60
1 #outs t f t
1 #outs f t f
#step 61
1 #outs t f t
1 #outs t t f
#step 62
0 #outs t t f
0 #outs f t t
#step 63
1 #outs f t t
1 #outs t t f
#step 64
1 #outs f t f
1 #outs f f t
#step 65
1 #outs t t t
#step 66
0 #outs f f f
#step 67
0 #outs t f t
0 #outs t t f
#step 68
1 #outs f f t
1 #outs t f t
#step 69
0 #outs t t f
0 #outs f t t
#step 70
1 #outs f f t
1 #outs f t f
#step 71
0 #outs t t f
0 #outs f t t
#step 72
1 #outs f t f
1 #outs f t t
#step 73
1 #outs t t t
#step 74
1 #outs f t f
1 #outs f t t
#step 75
1 #outs t t f
1 #outs f t t
#step 76
0 #outs t f f
0 #outs f t f
#step 77
0 #outs f t t
0 #outs t f t
#step 78
1 #outs f f t
#step 79
0 #outs f f f
#step 80
1 #outs t t f
1 #outs f t t
#step 81
0 #outs t f f
0 #outs f t f
#step 82
1 #outs t t t
#step 83
1 #outs f f t
#step 84
0 #outs t f t
0 #outs t t f
#step 85
0 #outs f t f
0 #outs f f t
#step 86
1 #outs t t t
#step 87
1 #outs f t f
1 #outs f f t
#step 88
0 #outs t t f
0 #outs f t t
#step 89
1 #outs f t t
1 #outs t f t
#step 90
1 #outs f t f
1 #outs f f t
#step 91
1 #outs t t t
#step 92
0 #outs t t t
#step 93
0 #outs f f t
0 #outs t f f
#step 94
1 #outs f f t
1 #outs t f t
#step 95
0 #outs t f t
0 #outs t t f
#step 96