Re-structure files

cucapra · Aug 5, 2024 · 4973ac5 · 4973ac5
1 parent e7fa42e
commit 4973ac5
Show file tree

Hide file tree

Showing 32 changed files with 16 additions and 16 deletions.
diff --git a/dsl/bin/dune b/dsl/bin/dune
diff --git a/dsl/bin/main.ml b/dsl/bin/main.ml
diff --git a/dsl/lib/ast.ml → dsl/frontend/ast.ml b/dsl/lib/ast.ml → dsl/frontend/ast.ml
diff --git a/dsl/lib/dune → dsl/frontend/dune b/dsl/lib/dune → dsl/frontend/dune
@@ -1,6 +1,6 @@
 (library
- (name dsl_core)
- (libraries core_kernel.fheap))
+ (name Frontend)
+ (public_name dsl.frontend))
 
 (menhir
  (modules parser))

diff --git a/dsl/lib/lexer.mll → dsl/frontend/lexer.mll b/dsl/lib/lexer.mll → dsl/frontend/lexer.mll
diff --git a/dsl/lib/parse.ml → dsl/frontend/parse.ml b/dsl/lib/parse.ml → dsl/frontend/parse.ml
diff --git a/dsl/lib/parse.mli → dsl/frontend/parse.mli b/dsl/lib/parse.mli → dsl/frontend/parse.mli
diff --git a/dsl/lib/parser.mly → dsl/frontend/parser.mly b/dsl/lib/parser.mly → dsl/frontend/parser.mly
diff --git a/dsl/lib/policy.ml → dsl/frontend/policy.ml b/dsl/lib/policy.ml → dsl/frontend/policy.ml
diff --git a/dsl/lib/policy.mli → dsl/frontend/policy.mli b/dsl/lib/policy.mli → dsl/frontend/policy.mli
diff --git a/dsl/lib/control.ml → dsl/simulate/control.ml b/dsl/lib/control.ml → dsl/simulate/control.ml
@@ -14,7 +14,7 @@ let rec addr_to_string = function
   | Cons (i, addr) -> Printf.sprintf "%d ∙ %s" i (addr_to_string addr)
 
 let init_state p =
-  let rec init_state_aux (p : Policy.t) addr s =
+  let rec init_state_aux (p : Frontend.Policy.t) addr s =
     let join plst addr s =
       let f (i, s) p = (i + 1, init_state_aux p (Cons (i, addr)) s) in
       match List.fold_left f (0, s) plst with _, s' -> s'
@@ -46,7 +46,7 @@ let init_state p =
   init_state_aux p Eps (State.create 10)
 
 let route_pkt_opt p pkt =
-  let rec route_pkt_opt_aux (p : Policy.t) pt pkt =
+  let rec route_pkt_opt_aux (p : Frontend.Policy.t) pt pkt =
     match p with
     | Class c -> if Packet.flow pkt = c then Some (List.rev pt) else None
     | Fifo plst | RoundRobin plst | Strict plst ->
@@ -57,7 +57,7 @@ let route_pkt_opt p pkt =
   route_pkt_opt_aux p [] pkt
 
 let z_in p s pkt =
-  let rec z_in_aux (p : Policy.t) rank_less_path addr s pkt =
+  let rec z_in_aux (p : Frontend.Policy.t) rank_less_path addr s pkt =
     let prefix = addr_to_string addr in
 
     match (p, rank_less_path) with
@@ -104,7 +104,7 @@ let z_in p s pkt =
   | None -> raise (RoutingError pkt)
 
 let z_out p s pkt =
-  let rec z_out_aux (p : Policy.t) rank_less_path addr s pkt =
+  let rec z_out_aux (p : Frontend.Policy.t) rank_less_path addr s pkt =
     let prefix = addr_to_string addr in
 
     match (p, rank_less_path) with

diff --git a/dsl/lib/control.mli → dsl/simulate/control.mli b/dsl/lib/control.mli → dsl/simulate/control.mli
@@ -5,4 +5,4 @@ type t = {
   z_out : State.t -> Packet.t -> State.t;
 }
 
-val of_policy : Policy.t -> t
+val of_policy : Frontend.Policy.t -> t
diff --git a/dsl/simulate/dune b/dsl/simulate/dune
@@ -0,0 +1,4 @@
+(library
+ (name Simulate)
+ (public_name dsl.sim)
+ (libraries dsl.frontend core_kernel.fheap))
diff --git a/dsl/lib/packet.ml → dsl/simulate/packet.ml b/dsl/lib/packet.ml → dsl/simulate/packet.ml
diff --git a/dsl/lib/packet.mli → dsl/simulate/packet.mli b/dsl/lib/packet.mli → dsl/simulate/packet.mli
@@ -1,5 +1,5 @@
 type t
 
-val flow : t -> Ast.clss
+val flow : t -> Frontend.Ast.clss
 val time : t -> Time.t
 val len : t -> float
diff --git a/dsl/lib/path.ml → dsl/simulate/path.ml b/dsl/lib/path.ml → dsl/simulate/path.ml
diff --git a/dsl/lib/path.mli → dsl/simulate/path.mli b/dsl/lib/path.mli → dsl/simulate/path.mli
diff --git a/dsl/lib/pieo.ml → dsl/simulate/pieo.ml b/dsl/lib/pieo.ml → dsl/simulate/pieo.ml
diff --git a/dsl/lib/pieo.mli → dsl/simulate/pieo.mli b/dsl/lib/pieo.mli → dsl/simulate/pieo.mli
diff --git a/dsl/lib/pieotree.ml → dsl/simulate/pieotree.ml b/dsl/lib/pieotree.ml → dsl/simulate/pieotree.ml
diff --git a/dsl/lib/pieotree.mli → dsl/simulate/pieotree.mli b/dsl/lib/pieotree.mli → dsl/simulate/pieotree.mli
diff --git a/dsl/lib/rank.ml → dsl/simulate/rank.ml b/dsl/lib/rank.ml → dsl/simulate/rank.ml
diff --git a/dsl/lib/rank.mli → dsl/simulate/rank.mli b/dsl/lib/rank.mli → dsl/simulate/rank.mli
diff --git a/dsl/lib/state.ml → dsl/simulate/state.ml b/dsl/lib/state.ml → dsl/simulate/state.ml
diff --git a/dsl/lib/state.mli → dsl/simulate/state.mli b/dsl/lib/state.mli → dsl/simulate/state.mli
diff --git a/dsl/lib/time.ml → dsl/simulate/time.ml b/dsl/lib/time.ml → dsl/simulate/time.ml
diff --git a/dsl/lib/time.mli → dsl/simulate/time.mli b/dsl/lib/time.mli → dsl/simulate/time.mli
diff --git a/dsl/lib/topo.ml → dsl/simulate/topo.ml b/dsl/lib/topo.ml → dsl/simulate/topo.ml
@@ -1,6 +1,6 @@
 type t = Star | Node of t list
 
-let rec of_policy (p : Policy.t) =
+let rec of_policy (p : Frontend.Policy.t) =
   match p with
   | Class _ -> Star
   | Fifo plst | RoundRobin plst | Strict plst -> Node (List.map of_policy plst)

diff --git a/dsl/lib/topo.mli → dsl/simulate/topo.mli b/dsl/lib/topo.mli → dsl/simulate/topo.mli
@@ -1,6 +1,6 @@
 type t = Star | Node of t list
 
-val of_policy : Policy.t -> t
+val of_policy : Frontend.Policy.t -> t
 val size : t -> int
 
 (* A few topologies to play with. *)

diff --git a/dsl/lib/util.ml → dsl/simulate/util.ml b/dsl/lib/util.ml → dsl/simulate/util.ml
diff --git a/dsl/test/dune b/dsl/test/dune
@@ -1,3 +1,3 @@
 (tests
  (names well_formed)
- (libraries dsl_core ounit2))
+ (libraries dsl.frontend ounit2))
diff --git a/dsl/test/well_formed.ml b/dsl/test/well_formed.ml
@@ -1,4 +1,4 @@
-open Dsl_core
+open Frontend
 open OUnit2
 
 let prefix = "../../../../progs/"