From 382c3f8b9c468d300049402092a0798a897d0396 Mon Sep 17 00:00:00 2001
From: Boris Yakobowski <boris.yakobowski@cea.fr>
Date: Fri, 23 Nov 2012 13:31:44 +0000
Subject: [PATCH] [E-ACSL] Update for commit 20821
---
src/plugins/e-acsl/env.ml | 5 +----
src/plugins/e-acsl/visit.ml | 6 ++----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/plugins/e-acsl/env.ml b/src/plugins/e-acsl/env.ml
index 15c68138375..ec04f771bd7 100644
--- a/src/plugins/e-acsl/env.ml
+++ b/src/plugins/e-acsl/env.ml
@@ -85,10 +85,7 @@ let empty_local_env =
mpz_tbl = empty_mpz_tbl }
let dummy =
- { visitor =
- new Visitor.generic_frama_c_visitor
- Project_skeleton.dummy
- (Cil.inplace_visit ());
+ { visitor = new Visitor.generic_frama_c_visitor (Cil.inplace_visit ());
annotation_kind = Misc.Assertion;
new_global_vars = [];
global_mpz_tbl = empty_mpz_tbl;
diff --git a/src/plugins/e-acsl/visit.ml b/src/plugins/e-acsl/visit.ml
index 33d01c9e5b9..dd46dbb65d1 100644
--- a/src/plugins/e-acsl/visit.ml
+++ b/src/plugins/e-acsl/visit.ml
@@ -149,8 +149,7 @@ let funspec = ref dft_funspec
class e_acsl_visitor prj generate = object (self)
inherit Visitor.generic_frama_c_visitor
- prj
- ((if generate then Cil.copy_visit else Cil.inplace_visit) ())
+ (if generate then Cil.copy_visit prj else Cil.inplace_visit ())
val mutable main_fct = None
val mutable keep_initializer = None
@@ -395,8 +394,7 @@ you must call function `%s' by yourself"
method private literal_string env e =
let env_ref = ref env in
let o = object
- inherit Cil.genericCilVisitor
- ~prj:(Project.current ()) (Cil.copy_visit ())
+ inherit Cil.genericCilVisitor (Cil.copy_visit (Project.current ()))
method vexpr e = match e.enode with
| Const(CStr s) ->
let _, exp, env =
--
GitLab