Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frama-c
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
pub
frama-c
Commits
b30ae45b
Commit
b30ae45b
authored
13 years ago
by
Julien Signoles
Browse files
Options
Downloads
Patches
Plain Diff
[e-acsl] fix one more bug with merging of environment
parent
2c4dbe28
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/plugins/e-acsl/tests/e-acsl-runtime/test_config
+1
-1
1 addition, 1 deletion
src/plugins/e-acsl/tests/e-acsl-runtime/test_config
src/plugins/e-acsl/visit.ml
+3
-3
3 additions, 3 deletions
src/plugins/e-acsl/visit.ml
with
4 additions
and
4 deletions
src/plugins/e-acsl/tests/e-acsl-runtime/test_config
+
1
−
1
View file @
b30ae45b
STDOPT: +"-e-acsl-project p" +"-then-on p" +"-print" +"-val"
STDOPT: +"-e-acsl-project p" +"-then-on p"
+"-check"
+"-print" +"-val"
This diff is collapsed.
Click to expand it.
src/plugins/e-acsl/visit.ml
+
3
−
3
View file @
b30ae45b
...
@@ -329,7 +329,7 @@ let convert_behaviors only_behaviors env behaviors =
...
@@ -329,7 +329,7 @@ let convert_behaviors only_behaviors env behaviors =
in
in
Env
.
close_block_option
pre_env
,
Env
.
close_block_option
pre_env
,
Env
.
close_block_option
post_env
,
Env
.
close_block_option
post_env
,
Env
.
merge_function_vars
~
from
:
p
re
_env
p
ost
_env
Env
.
merge_function_vars
~
from
:
p
ost
_env
p
re
_env
let
convert_spec
only_behaviors
env
spec
=
let
convert_spec
only_behaviors
env
spec
=
if
spec
.
spec_variant
<>
None
then
Misc
.
not_yet
"variant clause"
;
if
spec
.
spec_variant
<>
None
then
Misc
.
not_yet
"variant clause"
;
...
@@ -350,10 +350,10 @@ let convert_annotation env annot =
...
@@ -350,10 +350,10 @@ let convert_annotation env annot =
if
l
<>
[]
then
Misc
.
not_yet
"assertions applied only on some behaviors"
;
if
l
<>
[]
then
Misc
.
not_yet
"assertions applied only on some behaviors"
;
convert_named_predicate
env
p
,
None
convert_named_predicate
env
p
,
None
|
AStmtSpec
(
only_behaviors
,
spec
)
->
|
AStmtSpec
(
only_behaviors
,
spec
)
->
let
pre_block
,
post_block
,
post
_env
=
let
pre_block
,
post_block
,
new
_env
=
convert_spec
only_behaviors
env
spec
convert_spec
only_behaviors
env
spec
in
in
let
env
=
Env
.
merge_function_vars
~
from
:
post
_env
env
in
let
env
=
Env
.
merge_function_vars
~
from
:
new
_env
env
in
let
env
=
match
pre_block
with
let
env
=
match
pre_block
with
|
None
->
env
|
None
->
env
|
Some
b
->
Env
.
add_stmt
env
(
mkStmt
~
valid_sid
:
true
(
Block
b
))
|
Some
b
->
Env
.
add_stmt
env
(
mkStmt
~
valid_sid
:
true
(
Block
b
))
...
...
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