[RENAME PLUGIN] Builtin -> Instantiate

src/plugins/builtin/tests/string/oracle/memset_value.res.oracle → src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle

 [kernel] Parsing tests/string/memset_value.c (with preprocessing)
-[builtin] tests/string/memset_value.c:26: Warning: Ignore call: not well typed
-[builtin] tests/string/memset_value.c:27: Warning: Ignore call: not well typed
-[builtin] tests/string/memset_value.c:31: Warning: Ignore call: not well typed
-[builtin] tests/string/memset_value.c:32: Warning: Ignore call: not well typed
-[builtin] tests/string/memset_value.c:36: Warning: Ignore call: not well typed
-[builtin] tests/string/memset_value.c:37: Warning: Ignore call: not well typed
-[builtin] tests/string/memset_value.c:41: Warning: Ignore call: not well typed
-[builtin] tests/string/memset_value.c:42: Warning: Ignore call: not well typed
-[builtin] tests/string/memset_value.c:46: Warning: Ignore call: not well typed
-[builtin] tests/string/memset_value.c:47: Warning: Ignore call: not well typed
-[builtin] tests/string/memset_value.c:51: Warning: Ignore call: not well typed
-[builtin] tests/string/memset_value.c:52: Warning: Ignore call: not well typed
+[instantiate] tests/string/memset_value.c:26: Warning: 
+  Ignore call: not well typed
+[instantiate] tests/string/memset_value.c:27: Warning: 
+  Ignore call: not well typed
+[instantiate] tests/string/memset_value.c:31: Warning: 
+  Ignore call: not well typed
+[instantiate] tests/string/memset_value.c:32: Warning: 
+  Ignore call: not well typed
+[instantiate] tests/string/memset_value.c:36: Warning: 
+  Ignore call: not well typed
+[instantiate] tests/string/memset_value.c:37: Warning: 
+  Ignore call: not well typed
+[instantiate] tests/string/memset_value.c:41: Warning: 
+  Ignore call: not well typed
+[instantiate] tests/string/memset_value.c:42: Warning: 
+  Ignore call: not well typed
+[instantiate] tests/string/memset_value.c:46: Warning: 
+  Ignore call: not well typed
+[instantiate] tests/string/memset_value.c:47: Warning: 
+  Ignore call: not well typed
+[instantiate] tests/string/memset_value.c:51: Warning: 
+  Ignore call: not well typed
+[instantiate] tests/string/memset_value.c:52: Warning: 
+  Ignore call: not well typed
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"

src/plugins/instantiate/tests/string/test_config

+OPT: @PTEST_FILE@ -instantiate -print -check -then -ocode @PTEST_DIR@/result/@PTEST_NAME@.c -print -then -no-instantiate @PTEST_DIR@/result/@PTEST_NAME@.c @PTEST_FILE@ -ocode="" -print
\ No newline at end of file

src/plugins/builtin/transform.ml → src/plugins/instantiate/transform.ml

@@ -21,24 +21,24 @@
 (**************************************************************************)
 
 open Cil_types
-open Builtin_builder
+open Instantiator_builder
 
-let base : (string, (module Builtin)) Hashtbl.t = Hashtbl.create 17
+let base : (string, (module Instantiator)) Hashtbl.t = Hashtbl.create 17
 
 let register (module G: Generator_sig) =
-  let module Builtin = Make_builtin(G) in
-  Hashtbl.add base G.function_name (module Builtin)
+  let module Instantiator = Make_instantiator(G) in
+  Hashtbl.add base G.function_name (module Instantiator)
 
 let mark_as_computed () =
-  let mark_as_computed _ builtin =
-    let module B = (val builtin: Builtin) in B.mark_as_computed ()
+  let mark_as_computed _ instantiator =
+    let module I = (val instantiator: Instantiator) in I.mark_as_computed ()
   in
   Hashtbl.iter mark_as_computed base
 
 let get_kfs () =
-  let get_kfs _ builtin =
-    let module B = (val builtin: Builtin) in
-    let res = B.get_kfs () in
+  let get_kfs _ instantiator =
+    let module I = (val instantiator: Instantiator) in
+    let res = I.get_kfs () in
     res
   in
   Hashtbl.fold (fun k v l -> (get_kfs k v) @ l) base []
@@ -48,8 +48,8 @@ module VISet = Cil_datatype.Varinfo.Hptset
 class transformer = object(self)
   inherit Visitor.frama_c_inplace
 
-  val introduced_builtins = ref VISet.empty
-  val used_builtin_last_kf = Queue.create ()
+  val introduced_instantiators = ref VISet.empty
+  val used_instantiator_last_kf = Queue.create ()
 
   method! vfile _ =
     let post f =
@@ -64,13 +64,13 @@ class transformer = object(self)
     let post g =
       let loc = Cil.CurrentLoc.get() in
       let folding l fd =
-        if VISet.mem fd.svar !introduced_builtins then l
+        if VISet.mem fd.svar !introduced_instantiators then l
         else begin
-          introduced_builtins := VISet.add fd.svar !introduced_builtins ;
+          introduced_instantiators := VISet.add fd.svar !introduced_instantiators ;
           GFun (fd, loc) :: l
         end
       in
-      Queue.fold folding g used_builtin_last_kf
+      Queue.fold folding g used_instantiator_last_kf
     in
     Cil.DoChildrenPost post
 
@@ -81,20 +81,20 @@ class transformer = object(self)
     else
       Cil.SkipChildren
 
-  method private find_enabled_builtin fct =
-    let builtin = Hashtbl.find base fct.vname in
-    let module B = (val builtin: Builtin) in
-    if not (B.Enabled.get ()) then raise Not_found ;
-    builtin
+  method private find_enabled_instantiator fct =
+    let instantiator = Hashtbl.find base fct.vname in
+    let module I = (val instantiator: Instantiator) in
+    if not (I.Enabled.get ()) then raise Not_found ;
+    instantiator
 
   method private replace_call (lval, fct, args) =
     try
-      let module B = (val (self#find_enabled_builtin fct): Builtin) in
-      if B.well_typed_call lval args then
-        let key = B.key_from_call lval args in
-        let fundec = B.get_override key in
-        let new_args = B.retype_args key args in
-        Queue.add fundec used_builtin_last_kf ;
+      let module I = (val (self#find_enabled_instantiator fct): Instantiator) in
+      if I.well_typed_call lval args then
+        let key = I.key_from_call lval args in
+        let fundec = I.get_override key in
+        let new_args = I.retype_args key args in
+        Queue.add fundec used_instantiator_last_kf ;
         (fundec.svar), new_args
       else begin
         Options.warning ~current:true "Ignore call: not well typed" ;

src/plugins/builtin/transform.mli → src/plugins/instantiate/transform.mli

@@ -22,14 +22,13 @@
 
 (** Module for AST transformation *)
 
-(** Registers a new [Builtin] to the visitor from the [Generator_sig] module
-    of this builtin. Each new builtin function generator should call this
-    globally.
+(** Registers a new [Instantiator] to the visitor from the [Generator_sig]
+    module. Each new instantiator generator should call this globally.
 *)
-val register: (module Builtin_builder.Generator_sig) -> unit
+val register: (module Instantiator_builder.Generator_sig) -> unit
 
 (** In all selected functions of the given file, for all function call, if there
-    exists a builtin module for this function, and the call is well-typed,
+    exists a instantiator module for this function, and the call is well-typed,
     replaces it with a call to the generated override function and inserted the
     generated function in the AST.
 *)