Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
verimag
synchrone
lutin
Commits
d51c32a5
Commit
d51c32a5
authored
Jul 01, 2011
by
Erwan Jahier
Browse files
Use the -exe mode by default + try to display more useful source level info with -vl 1.
nb : -exe no longer exist. use -old to get the old algo.
parent
112f5ba1
Changes
52
Hide whitespace changes
Inline
Side-by-side
Makefile.version
View file @
d51c32a5
...
...
@@ -28,5 +28,5 @@ gen_version:
echo
"let sha=
\"
$(SHA)
\"
"
>>
source
/common/version.ml
;
\
rm
-f
version.tex
;
\
date
+VERSION_DATE
=
%d-%m-%y
>
version.tex
;
\
echo
"
\\
newcommand{
\\
version}{
$(VERSION)
}"
>
doc/version.tex
;
\
echo
"
\\
newcommand{
\\
versiondate}{
`
date
+%d-%m-%y
`
}"
>>
doc/version.tex
echo
"
\\
\
n
ewcommand{
\\
\
v
ersion}{
$(VERSION)
}"
>
doc/version.tex
;
\
echo
"
\\
\
n
ewcommand{
\\
\
v
ersiondate}{
`
date
+%d-%m-%y
`
}"
>>
doc/version.tex
doc/lurette-man/lurette-man.tex
View file @
d51c32a5
...
...
@@ -729,7 +729,8 @@ It is the first part of the RIF (see~\ref{rif}) file name used to
\subsection
{
Test Coverage
}
\label
{
coverage
}
\input
{
coverage
}
XXX
%\input{coverage}
%--------------------------------------------------------------------
%--------------------------------------------------------------------
...
...
examples/lucky/external_code/Makefile
View file @
d51c32a5
...
...
@@ -13,7 +13,6 @@ MAIN=foo
#settings for Linux (and other posix systems ?)
DLEXT
=
so
EXE
=
LD
=
gcc
CC
=
gcc
MKDLLFLAGS
=
LFLAGS
=
...
...
@@ -24,8 +23,7 @@ SOFLAGS=-shared
ifeq
($(HOSTTYPE),win32)
DLEXT
=
dll
EXE
=
.exe
LD
=
gcc
-DWIN32
-mno-cygwin
CC
=
gcc
-DWIN32
-mno-cygwin
CC
=
$(GCC)
MKDLLFLAGS
=
-Wl
,--out-implib,
$(OBJDIR)
/
$(MAIN)
.a
LFLAGS
=
-lm
LD_ARCH
=
-DWIN32
...
...
examples/luckyDraw/c/essai.out.exp
View file @
d51c32a5
Constraint:
(if
(x + y) >= 0
then
(x + y) >= 3
else
(x - y) <= 3)
(if (x + y) >= 0
then (x + y) >= 3
else (x - y) <= 3)
Variables:
x : int
y : int
...
...
examples/lutin/external_code/Makefile
View file @
d51c32a5
...
...
@@ -74,7 +74,7 @@ test1: clean $(OBJDIR)/$(MAIN).$(DLEXT)
[
!
-s
test1.res
]
&&
make clean
test2
:
echo
"1.0 1.0"
| ../../../
$(HOSTTYPE)
/bin/lutin
-exe
-l
1
-L
libm.so polar.lut
-m
cartesian
\
echo
"1.0 1.0"
| ../../../
$(HOSTTYPE)
/bin/lutin
-l
1
-L
libm.so polar.lut
-m
cartesian
\
-seed
1 |
grep
-v
" Version"
>
test2.rif
rm
-f
test2.res
&&
diff
-u
-i
-B
test2.rif.exp test2.rif
>
test2.res
||
true
cat
test2.res
...
...
examples/lutin/external_code/test1.rif.exp
View file @
d51c32a5
...
...
@@ -21,5 +21,4 @@
#outs 26.98 0.59 3
#step 10
#outs 24.66 -0.89 6
#end
#end. Max step number reached.
examples/lutin/external_code/test2.rif.exp
View file @
d51c32a5
...
...
@@ -3,4 +3,4 @@
#outputs "x":real "y":real
#step 1
1.0 1.0 #outs 0.54 0.84
#
Simulation reached max steps
.
#
end. Max step number reached
.
examples/lutin/lustre/call_foo.lus
View file @
d51c32a5
-- Time-stamp: <modified the 0
7/12/2006 (at 16:06
) by Erwan Jahier>
-- Time-stamp: <modified the 0
1/07/2011 (at 08:55
) by Erwan Jahier>
function
foo
(
x
:
int
;
y
:
bool
;
z
:
real
)
returns
(
a
:
int
;
b
:
bool
;
c
:
real
);
node
call_foo
(
dummy
:
int
)
returns
(
a
:
int
;
b
:
bool
;
c
:
real
);
returns
(
a
:
int
;
b
:
bool
;
c
:
real
);
let
a
,
b
,
c
=
foo
(
1
->
pre
a
,
true
->
pre
b
,
10
.
0
->
pre
c
);
a
,
b
,
c
=
foo
(
1
->
pre
a
,
true
->
pre
b
,
10
.
0
->
pre
c
);
tel
;
examples/lutin/test_ok/,testexe/auto01-n0.rif.ref
View file @
d51c32a5
...
...
@@ -8,4 +8,4 @@
#step 3
#outs 233203708 -233548293 253529173 -67693723 125709337
#step 4
# Simulation ended normally
.
#
end.
Simulation ended normally
)
examples/lutin/test_ok/,testexe/auto01-n1.rif.ref
View file @
d51c32a5
...
...
@@ -201,4 +201,4 @@
#outs f
#step 100
#outs f
#
Simulation reached max steps
.
#
end. Max step number reached
.
examples/lutin/test_ok/,testexe/auto01-n2.rif.ref
View file @
d51c32a5
...
...
@@ -8,4 +8,4 @@
#step 3
#outs t f t f t
#step 4
# Simulation ended normally
.
#
end.
Simulation ended normally
)
examples/lutin/test_ok/,testexe/auto01-n3.rif.ref
View file @
d51c32a5
...
...
@@ -8,4 +8,4 @@
#step 3
#outs f f f t t
#step 4
# Simulation ended normally
.
#
end.
Simulation ended normally
)
examples/lutin/test_ok/,testexe/auto02-main.rif.ref
View file @
d51c32a5
...
...
@@ -8,4 +8,4 @@
#step 3
#outs f f f f f t
#step 4
# Simulation ended normally
.
#
end.
Simulation ended normally
)
examples/lutin/test_ok/,testexe/catch-main.rif.ref
View file @
d51c32a5
...
...
@@ -8,4 +8,4 @@
#step 3
#outs f t f t
#step 4
# Simulation ended normally
.
#
end.
Simulation ended normally
)
examples/lutin/test_ok/,testexe/catch-main2.rif.ref
View file @
d51c32a5
...
...
@@ -201,4 +201,4 @@
#outs t t f t
#step 100
#outs t f f t
#
Simulation reached max steps
.
#
end. Max step number reached
.
examples/lutin/test_ok/,testexe/expand-n1.rif.ref
View file @
d51c32a5
...
...
@@ -2,4 +2,4 @@
#inputs "a":bool "b":bool
#outputs "c":bool
#step 1
0 1# Simulation ended normally
.
0 1#
end.
Simulation ended normally
)
examples/lutin/test_ok/,testexe/expand-n2.rif.ref
View file @
d51c32a5
...
...
@@ -201,4 +201,4 @@
1 #outs -216064049.79 245752499.29
#step 100
0 #outs -154860140.76 185511794.53
#
Simulation reached max steps
.
#
end. Max step number reached
.
examples/lutin/test_ok/,testexe/expand-n3.rif.ref
View file @
d51c32a5
...
...
@@ -201,4 +201,4 @@
1 #outs 88919792.36 -133379548.17
#step 100
0 #outs 40379766.63 -60569464.57
#
Simulation reached max steps
.
#
end. Max step number reached
.
examples/lutin/test_ok/,testexe/expand-n4.rif.ref
View file @
d51c32a5
...
...
@@ -201,4 +201,4 @@
1 #outs t t t
#step 100
0 #outs f t f
#
Simulation reached max steps
.
#
end. Max step number reached
.
examples/lutin/test_ok/,testexe/expand-n5.rif.ref
View file @
d51c32a5
...
...
@@ -201,4 +201,4 @@
#outs t t f t
#step 100
#outs t f f t
#
Simulation reached max steps
.
#
end. Max step number reached
.
Prev
1
2
3
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment