Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lustre-v6
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
verimag
synchrone
lustre-v6
Commits
a71bfc89
Commit
a71bfc89
authored
10 years ago
by
Erwan Jahier
Browse files
Options
Downloads
Patches
Plain Diff
SocExec: The previous change broke the handling of arrow in SocExec. Now it seems to work.
parent
f8ce6918
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/socExecEvalPredef.ml
+2
-2
2 additions, 2 deletions
src/socExecEvalPredef.ml
test/lus2lic.sum
+2
-2
2 additions, 2 deletions
test/lus2lic.sum
test/lus2lic.time
+1
-1
1 addition, 1 deletion
test/lus2lic.time
with
5 additions
and
5 deletions
src/socExecEvalPredef.ml
+
2
−
2
View file @
a71bfc89
(* Time-stamp: <modified the 19/06/2014 (at 1
4:16
) by Erwan Jahier> *)
(* Time-stamp: <modified the 19/06/2014 (at 1
5:02
) by Erwan Jahier> *)
open
SocExecValue
open
SocExecValue
open
Data
open
Data
...
@@ -318,7 +318,7 @@ let lustre_current ctx =
...
@@ -318,7 +318,7 @@ let lustre_current ctx =
let
lustre_arrow
ctx
=
let
lustre_arrow
ctx
=
let
(
vn
,
vv
)
=
let
(
vn
,
vv
)
=
match
([
get_val
"x"
ctx
;
get_val
"y"
ctx
;
match
([
get_val
"x"
ctx
;
get_val
"y"
ctx
;
get_val
"_memory"
{
ctx
with
cpath
=
List
.
tl
ctx
.
cpath
}])
get_val
"_memory"
{
ctx
with
cpath
=
ctx
.
cpath
}])
with
with
|
[
v1
;
v2
;
fs
]
->
"z"
::
ctx
.
cpath
,
if
fs
=
B
false
then
v2
else
v1
|
[
v1
;
v2
;
fs
]
->
"z"
::
ctx
.
cpath
,
if
fs
=
B
false
then
v2
else
v1
|
_
->
assert
false
|
_
->
assert
false
...
...
This diff is collapsed.
Click to expand it.
test/lus2lic.sum
+
2
−
2
View file @
a71bfc89
Test Run By jahier on Thu Jun 19 1
4:32:33
2014
Test Run By jahier on Thu Jun 19 1
5:25:21
2014
Native configuration is i686-pc-linux-gnu
Native configuration is i686-pc-linux-gnu
=== lus2lic tests ===
=== lus2lic tests ===
...
@@ -1483,5 +1483,5 @@ XPASS: Test bad programs (semantics): lus2lic {-o /tmp/bug.lic should_fail/seman
...
@@ -1483,5 +1483,5 @@ XPASS: Test bad programs (semantics): lus2lic {-o /tmp/bug.lic should_fail/seman
# of unexpected failures 149
# of unexpected failures 149
# of unexpected successes 21
# of unexpected successes 21
# of expected failures 37
# of expected failures 37
testcase ./lus2lic.tests/non-reg.exp completed in 13
0
seconds
testcase ./lus2lic.tests/non-reg.exp completed in 13
7
seconds
testcase ./lus2lic.tests/progression.exp completed in 0 seconds
testcase ./lus2lic.tests/progression.exp completed in 0 seconds
This diff is collapsed.
Click to expand it.
test/lus2lic.time
+
1
−
1
View file @
a71bfc89
testcase ./lus2lic.tests/non-reg.exp completed in 13
0
seconds
testcase ./lus2lic.tests/non-reg.exp completed in 13
7
seconds
testcase ./lus2lic.tests/progression.exp completed in 0 seconds
testcase ./lus2lic.tests/progression.exp completed in 0 seconds
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment