dummy libASL to reduce conflicts

bin/asli.ml

@@ -8,6 +8,7 @@
 (** ASL interactive frontend *)
 
 open LibASL
+open LibASL_base
 
 open Asl_ast
 open Value

bin/dune

@@ -5,7 +5,7 @@
  (modes exe byte)
  (modules asli)
  (flags (-cclib -lstdc++))
- (libraries libASL libASL_native linenoise pprint)
+ (libraries asli.libASL linenoise pprint)
  )
 
 (executable
@@ -14,7 +14,7 @@
  (modes exe)
  (modules server)
  (flags (-cclib -lstdc++))
- (libraries libASL libASL_native pprint lwt.unix yojson cohttp-lwt cohttp-lwt-unix))
+ (libraries asli.libASL pprint lwt.unix yojson cohttp-lwt cohttp-lwt-unix))
 
 
 (executable
@@ -23,28 +23,28 @@
  ; (public_name test_asl_lexer)
  (modules testlexer)
  (flags (-cclib -lstdc++))
- (libraries libASL))
+ (libraries asli.libASL))
 
 (executable
  (name processops)
  (modes exe)
  ; (public_name test_asl_lexer)
  (modules processops)
  (flags (-cclib -lstdc++))
- (libraries libASL unix))
+ (libraries asli.libASL unix))
 
 (executable
  (name offline_coverage)
  (public_name asloff-coverage)
  (modes exe)
  (modules offline_coverage)
  (flags (-cclib -lstdc++))
- (libraries libASL libASL_native offlineASL))
+ (libraries asli.libASL offlineASL))
 
 (executable
  (name offline_sem)
  (public_name asloff-sem)
  (modes exe)
  (modules offline_sem)
  (flags (-cclib -lstdc++))
- (libraries libASL libASL_native offlineASL))
+ (libraries asli.libASL offlineASL))

bin/offline_coverage.ml

@@ -1,4 +1,5 @@
 open LibASL
+open LibASL_base
 open Testing
 open Asl_ast
 open Value

bin/offline_sem.ml

@@ -1,4 +1,5 @@
 open LibASL
+open LibASL_base
 open Asl_ast
 open Asl_utils
 

bin/processops.ml

@@ -1,4 +1,5 @@
 open LibASL
+open LibASL_base
 
 module Bindings = Asl_utils.Bindings
 

bin/server.ml

@@ -1,4 +1,5 @@
 open LibASL
+open LibASL_base
 
 
 open Yojson

bin/testlexer.ml

@@ -8,6 +8,7 @@
 (** ASL lexer test harness *)
 
 open LibASL
+open LibASL_base
 
 module Lexer = Lexer
 module TC = Tcheck

libASL/dune

@@ -15,18 +15,17 @@
      (with-stdout-to asl_parser.mly (run cat asl_parser_head.mly asl_parser_tail.mly)))))
 
 (library
- (name libASL_ast)
- (public_name asli.libASL-ast)
+ (name libASL_base)
+ (public_name asli.libASL-base)
  (flags (:standard -w -27))
- (wrapped false)
  (modules asl_ast asl_parser asl_parser_pp asl_utils asl_visitor visitor utils)
  (libraries pprint (re_export zarith)))
 
 (library
  (name libASL)
- (public_name asli.libASL)
+ (public_name asli.libASL-virtual)
  (flags
-  (:standard -w -27 -cclib -lstdc++))
+  (:standard -w -27 -cclib -lstdc++ -open LibASL_base))
  (modules cpu dis elf eval
    lexer lexersupport loadASL monad primops rws symbolic tcheck testing transforms value
    symbolic_lifter decoder_program call_graph req_analysis
@@ -35,5 +34,10 @@
    )
  (preprocessor_deps (alias ../asl_files))
  (preprocess (pps ppx_blob))
- (libraries libASL_support (re_export libASL_ast) str))
+ (libraries libASL_support str))
 
+(library
+ (name libASL_dummy)
+ (public_name asli.libASL)
+ (modules)
+ (libraries (re_export libASL) libASL_native))

libASL/support/dune

@@ -3,5 +3,5 @@
 (library
  (name libASL_support)
  (public_name asli.libASL-support)
- (libraries libASL_ast)
+ (libraries libASL_base)
  (virtual_modules solver))

libASL/support/native/dune

@@ -1,4 +1,5 @@
 (library
  (name libASL_native)
+ (public_name asli.libASL-support-native)
  (implements libASL_support)
- (libraries z3 libASL_ast))
+ (libraries z3 libASL_base))

libASL/support/native/solver.ml

@@ -17,7 +17,8 @@
     we can reason that "F(x) == F(x)" without knowing "F".
  *)
 
-module AST = Asl_ast
+module AST = LibASL_base.Asl_ast
+module Asl_utils = LibASL_base.Asl_utils
 
 let verbose = false
 

libASL/support/solver.mli

@@ -3,4 +3,4 @@
 (****************************************************************)
 
 (** check that bs => cs *)
-val check_constraints : (Asl_ast.expr list) -> (Asl_ast.expr list) -> bool
+val check_constraints : (LibASL_base.Asl_ast.expr list) -> (LibASL_base.Asl_ast.expr list) -> bool

libASL/support/web/dune

@@ -2,4 +2,4 @@
  (name libASL_web)
  (public_name asli.libASL-web)
  (implements libASL_support)
- (libraries libASL_ast zarith_stubs_js))
+ (libraries libASL_base zarith_stubs_js))

libASL/support/web/solver.ml

@@ -1,4 +1,4 @@
 
-module AST = Asl_ast
+module AST = LibASL_base.Asl_ast
 
 let check_constraints (_bs: AST.expr list) (_cs: AST.expr list): bool = true

offlineASL/offline_utils.ml

@@ -1,4 +1,5 @@
 open LibASL
+open LibASL_base
 open Asl_ast
 open Primops
 

tests/test_asl.ml

@@ -6,6 +6,7 @@
  ****************************************************************)
 
 open LibASL
+open LibASL_base
 open Asl_utils
 open AST