Implement GoblintCil module manually

sim642 · sim642 · commit 4a268c281af9 · 2022-07-26T17:41:14.000+03:00
diff --git a/src/ext/dataslicing/dataslicing.ml b/src/ext/dataslicing/dataslicing.ml
@@ -34,7 +34,6 @@
 
  *)
 open GoblintCil
-open Cil
 open Feature
 module E = Errormsg
 
diff --git a/src/ext/liveness/liveness.ml b/src/ext/liveness/liveness.ml
@@ -6,7 +6,6 @@
 
  *)
 open GoblintCil
-open Cil
 open Feature
 open Pretty
 
diff --git a/src/ext/liveness/usedef.ml b/src/ext/liveness/usedef.ml
@@ -1,5 +1,4 @@
 open GoblintCil
-open Cil
 
 module E = Errormsg
 
diff --git a/src/ext/makecfg/makeCFG.ml b/src/ext/makecfg/makeCFG.ml
@@ -1,6 +1,5 @@
 (* See copyright notice at the end of the file *)
 open GoblintCil
-open Cil
 open Feature
 
 (*****************************************************************************
diff --git a/src/ext/pta/olf.ml b/src/ext/pta/olf.ml
@@ -47,8 +47,6 @@ exception ReachedTop   (* raised if top (from an undefined function)
                           flows to a c_absloc during the flow step *)
 exception UnknownLocation
 
-open Cil
-
 module U = Uref
 module S = Setp
 module H = Hashtbl
diff --git a/src/ext/pta/ptranal.ml b/src/ext/pta/ptranal.ml
@@ -36,7 +36,6 @@ open GoblintCil
 exception Bad_return
 
 
-open Cil
 open Feature
 
 module H = Hashtbl
diff --git a/src/ext/syntacticsearch/funcDatatype.ml b/src/ext/syntacticsearch/funcDatatype.ml
@@ -1,5 +1,4 @@
 open GoblintCil
-open Cil
 
 (* Finds definition of a user-defined type *)
 let find_def name file =
diff --git a/src/ext/syntacticsearch/funcFunction.ml b/src/ext/syntacticsearch/funcFunction.ml
@@ -1,5 +1,4 @@
 open GoblintCil
-open Cil
 open Cabs2cil
 
 let is_equal_funname_funid varinfo name id =
diff --git a/src/ext/syntacticsearch/funcVar.ml b/src/ext/syntacticsearch/funcVar.ml
@@ -1,5 +1,4 @@
 open GoblintCil
-open Cil
 open Cabs2cil
 
 (* Helper functions *)
diff --git a/src/ext/syntacticsearch/queryMapping.ml b/src/ext/syntacticsearch/queryMapping.ml
@@ -1,5 +1,4 @@
 open GoblintCil
-open Cil
 open CodeQuery
 
 (* Default output if the input-query is not supported *)
diff --git a/src/ext/syntacticsearch/resultPrinter.ml b/src/ext/syntacticsearch/resultPrinter.ml
@@ -1,6 +1,5 @@
 open GoblintCil
 open CodeQuery
-open Cil
 open Feature
 
 let rec contains list elem =
diff --git a/src/ext/zrapp/availexps.ml b/src/ext/zrapp/availexps.ml
@@ -3,7 +3,6 @@
    variable ids to expressions as opposed to a set of
    expressions *)
 open GoblintCil
-open Cil
 open Pretty
 open Expcompare
 open Liveness
diff --git a/src/ext/zrapp/availexpslv.ml b/src/ext/zrapp/availexpslv.ml
@@ -3,7 +3,6 @@
    lvalues to expressions as opposed to a set of
    expressions *)
 open GoblintCil
-open Cil
 open Pretty
 open Expcompare
 open Liveness
diff --git a/src/ext/zrapp/deadcodeelim.ml b/src/ext/zrapp/deadcodeelim.ml
@@ -1,7 +1,6 @@
 (* Eliminate assignment instructions whose results are not
    used *)
 open GoblintCil
-open Cil
 open Expcompare
 open Liveness
 
diff --git a/src/ext/zrapp/reachingdefs.ml b/src/ext/zrapp/reachingdefs.ml
@@ -16,7 +16,6 @@
 
  *)
 open GoblintCil
-open Cil
 open Pretty
 open Liveness
 
diff --git a/src/ext/zrapp/rmciltmps.ml b/src/ext/zrapp/rmciltmps.ml
@@ -2,7 +2,6 @@
    temporary variables. Some can be removed immediately,
    others must wait until pretty printing *)
 open GoblintCil
-open Cil
 open Cilint
 open Liveness
 module E = Errormsg
diff --git a/src/ext/zrapp/zrapp.ml b/src/ext/zrapp/zrapp.ml
@@ -1,7 +1,6 @@
 open GoblintCil
 open Escape
 open Pretty
-open Cil
 open Feature
 open Liveness
 
diff --git a/src/goblintCil.ml b/src/goblintCil.ml
@@ -0,0 +1,45 @@
+include Cil
+(** @inline *)
+
+(** {1 CIL modules} *)
+
+module Cfg = Cfg
+module Check = Check
+module Cil = Cil
+module Cilint = Cilint
+module Cillower = Cillower (* ? *)
+module Ciloptions = Ciloptions (* ? *)
+module Ciltools = Ciltools
+module Cilutil = Cilutil
+module Dataflow = Dataflow
+module Dominators = Dominators
+module Escape = Escape
+module Expcompare = Expcompare
+module Feature = Feature
+module Formatcil = Formatcil
+module Machdep = Machdep
+module Machdepenv = Machdepenv
+module Mergecil = Mergecil
+module Rmtmps = Rmtmps
+
+(** {1 FrontC modules} *)
+
+module Cabs = Cabs
+module Cabs2cil = Cabs2cil
+module Cabshelper = Cabshelper
+module Cabsvisit = Cabsvisit
+module Frontc = Frontc
+module Lexerhack = Lexerhack (* ? *)
+module Patch = Patch
+module Whitetrack = Whitetrack
+
+(** {1 Utility modules} *)
+
+module Alpha = Alpha
+module Errormsg = Errormsg
+module GrowArray = GrowArray (* needed for zrapp *)
+module Inthash = Inthash (* needed for liveness, syntacticsearch *)
+module Pretty = Pretty
+module Stats = Stats
+module Trace = Trace
+module Util = Util
diff --git a/test/small1/longBlock.ml b/test/small1/longBlock.ml
@@ -1,5 +1,4 @@
 open GoblintCil
-open Cil
 
 ;;
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`open GoblintCil`
`2`		`-open Cil`
`3`	`2`
`4`	`3`	`module E = Errormsg`
`5`	`4`