Rearrange files (#49)

This PR makes the following changes to our file structure
- collapse `dsl/progs` -> `progs`
- rename `progs/nwc` -> `progs/non_work_conserving`
- combine `progs/now` and `progs/soon` -> `progs/work_conserving`
- rename `dsl_lang` -> `dsl`

All other parts of the diff are cascading effects of these changes.

.github/workflows/format.yml

@@ -22,10 +22,10 @@ jobs:
         with:
           ocaml-compiler: 5
       - name: Install ocamlformat
-        working-directory: dsl_lang
+        working-directory: dsl
         run: opam install ocamlformat
       - name: Check format 
-        working-directory: dsl_lang
+        working-directory: dsl
         run: | 
           [ $(opam exec -- dune fmt 2> >(wc -c)) -eq 0 ]
 

.github/workflows/test.yml

@@ -22,11 +22,11 @@ jobs:
         with:
           ocaml-compiler: 5
       - name: Install dependencies
-        working-directory: dsl_lang
+        working-directory: dsl
         run: | 
           opam install . --deps-only
       - name: DSL tests
-        working-directory: dsl_lang
+        working-directory: dsl
         run: |
           opam exec -- dune build
           opam exec -- dune test

.gitignore

@@ -21,7 +21,7 @@
 *.cmxa
 
 # ocamlbuild working directory
-dsl_lang/_build/
+dsl/_build/
 
 # ocamlbuild targets
 *.byte

dsl_lang/bin/dune → dsl/bin/dune

@@ -1,4 +1,4 @@
 (executable
- (public_name dsl_lang)
+ (public_name dsl)
  (name main)
  (libraries dsl_core))

dsl_lang/dune-project → dsl/dune-project

@@ -1,6 +1,6 @@
 (lang dune 3.16)
 
-(name dsl_lang)
+(name dsl)
 
 (generate_opam_files true)
 
@@ -24,7 +24,7 @@
 (using menhir 3.0)
 
 (package
- (name dsl_lang)
+ (name dsl)
  (synopsis "DSL for Programmable Packet Scheduling")
  (description "TBD")
  (depends ocaml dune ounit2 menhir))

dsl_lang/lib/eval.ml → dsl/lib/eval.ml

@@ -2,7 +2,6 @@ open Ast
 
 exception UnboundVariable of var
 exception UndeclaredClass of clss
-exception IllformedExpression of string
 
 (* A function to look up the binding for a variable in a store.
    `lookup s x` returns `s(x)` or raises `UnboundVariable x` if `x` is not defined on `s`. *)

dsl/test/well_formed.ml

@@ -0,0 +1,65 @@
+open Dsl_core.Parse
+open Dsl_core.Util
+open Dsl_core.Eval
+open OUnit2
+
+let path_prefix = "../../../../progs/"
+
+let parse (filename : string) =
+  path_prefix ^ filename |> parse_file |> eval |> string_of_policy
+
+let make_test (name : string) (filename : string) (val_str : string) =
+  name >:: fun _ -> assert_equal val_str (parse filename) ~printer:Fun.id
+
+let make_error_test (name : string) (filename : string) (exn : exn) =
+  name >:: fun _ -> assert_raises exn (fun () -> parse filename)
+
+(* The test suite for our interpreter. *)
+
+let tests =
+  [
+    make_test "single class policy" "work_conserving/drop_a_class.sched" "A";
+    make_test "fifo sugar 1 class" "work_conserving/fifo_1_class_sugar.sched"
+      "A";
+    make_test "fifo 1 class" "work_conserving/fifo_1_class.sched" "A";
+    make_test "fifo of 3" "work_conserving/fifo_n_classes.sched" "fifo[A, B, C]";
+    make_test "rr of 1" "work_conserving/rr_1_class.sched" "rr[A]";
+    make_test "rr of 2" "work_conserving/rr_2_classes.sched" "rr[A, B]";
+    make_test "multiple assignments" "work_conserving/rr_hier_merge_sugar.sched"
+      "rr[fifo[BX, BY], rr[RP, RT]]";
+    make_test "2 assignments w/ substitutions" "work_conserving/rr_hier.sched"
+      "rr[B, rr[RP, RT]]";
+    make_test "3 classes with substitutions"
+      "work_conserving/rr_n_class_hier.sched"
+      "rr[A, B, rr[rr[CU, CV], rr[CW, CX]]]";
+    make_test "rr of 3" "work_conserving/rr_n_classes.sched" "rr[A, B, C]";
+    make_test "rr and strict substitutions"
+      "work_conserving/rr_strict_n_classes_hier.sched"
+      "strict[A, B, rr[rr[CU, CV], strict[CW, CX]]]";
+    make_test "strict of 3" "work_conserving/strict_n_classes.sched"
+      "strict[A, B, C]";
+    make_test "leaky bucket of 2" "non_work_conserving/leaky_2_classes.sched"
+      "leaky[[A, B], width = 5, buffer = 10]";
+    make_test "token bucket of 2 round robins"
+      "non_work_conserving/token_2_rr_children.sched"
+      "token[[rr[A, B], rr[C, D]], width = 20, time = 50]";
+    make_test "stop and go with 3 classes"
+      "non_work_conserving/sg_3_classes.sched"
+      "stopandgo[[stopandgo[[A, B], width = 10], stopandgo[[C], width = 10]], \
+       width = 5]";
+    make_test "rcsp for 4 classes" "non_work_conserving/rcsp_4_classes.sched"
+      "rcsp[A, B, C, D]";
+  ]
+
+let error_tests =
+  [
+    make_error_test "undeclared class" "incorrect/undeclared_classes.sched"
+      (UndeclaredClass "Z");
+    make_error_test "unbound variable" "incorrect/unbound_var.sched"
+      (UnboundVariable "policy");
+    make_error_test "unbound var in middle of list of assignments"
+      "incorrect/unbound_var_hier.sched" (UnboundVariable "r_polic");
+  ]
+
+let suite = "suite" >::: tests @ error_tests
+let () = run_test_tt_main suite