From a1a0f62c200857afcd2090b39f1980d34cd638f2 Mon Sep 17 00:00:00 2001
From: Son Ho
Date: Thu, 10 Feb 2022 00:25:47 +0100
Subject: Move the generated files to subdirectories

---
 Makefile                          |  5 +++-
 tests/Hashmap.Clauses.fst         | 59 ---------------------------------------
 tests/hashmap/Hashmap.Clauses.fst | 59 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 60 deletions(-)
 delete mode 100644 tests/Hashmap.Clauses.fst
 create mode 100644 tests/hashmap/Hashmap.Clauses.fst

diff --git a/Makefile b/Makefile
index 3d318ebc..afbdd832 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ DEST_DIR=tests/
 # - insert calls to the normalizer in the translated code to test the
 #   generated unit functions
 TRANS_OPTIONS:=-test-trans-units
+SUBDIR:=
 
 # Build the project and test it
 .PHONY: build-test
@@ -24,7 +25,9 @@ test: build translate-no_nested_borrows translate-hashmap
 
 # Add specific options to some tests
 translate-no_nested_borrows: TRANS_OPTIONS:=$(TRANS_OPTIONS) -test-units -no-split -no-decreases-clauses
+translate-no_nested_borrows: SUBDIR:=misc
 translate-hashmap: TRANS_OPTIONS:=$(TRANS_OPTIONS) -template-clauses
+translate-hashmap: SUBDIR:=hashmap
 
 # Generic rule to extract the CFIM from a rust file
 .PHONY: gen-cfim-%
@@ -34,7 +37,7 @@ gen-cfim-%: build
 # Generic rule to test the translation on a CFIM file
 .PHONY: translate-%
 translate-%: gen-cfim-%
-	dune exec -- src/main.exe $(CHARON_TESTS_DIR)/$*.cfim -dest $(DEST_DIR) $(TRANS_OPTIONS)
+	dune exec -- src/main.exe $(CHARON_TESTS_DIR)/$*.cfim -dest $(DEST_DIR)/$(SUBDIR) $(TRANS_OPTIONS)
 
 .PHONY: doc
 doc:
diff --git a/tests/Hashmap.Clauses.fst b/tests/Hashmap.Clauses.fst
deleted file mode 100644
index ef7793f1..00000000
--- a/tests/Hashmap.Clauses.fst
+++ /dev/null
@@ -1,59 +0,0 @@
-(** [hashmap]: the decreases clauses *)
-module Hashmap.Clauses
-open Primitives
-open FStar.List.Tot
-open Hashmap.Types
-
-#set-options "--z3rlimit 50 --fuel 0 --ifuel 1"
-
-(*** Utilities *)
-
-(*** The clauses *)
-
-(** [hashmap::HashMap::allocate_slots]: decreases clause *)
-unfold
-let hash_map_allocate_slots_decreases (t : Type0) (slots : vec (list_t t))
-  (n : usize) : nat = n
-
-(** [hashmap::HashMap::clear_slots]: decreases clause *)
-unfold
-let hash_map_clear_slots_decreases (t : Type0) (slots : vec (list_t t))
-  (i : usize) : nat =
-  if i < length slots then length slots - i else 0
-
-(** [hashmap::HashMap::insert_in_list]: decreases clause *)
-unfold
-let hash_map_insert_in_list_decreases (t : Type0) (key : usize) (value : t)
-  (ls : list_t t) : list_t t =
-  ls
-
-(** [hashmap::HashMap::move_elements_from_list]: decreases clause *)
-unfold
-let hash_map_move_elements_from_list_decreases (t : Type0)
-  (ntable : hash_map_t t) (ls : list_t t) : list_t t =
-  ls
-
-(** [hashmap::HashMap::move_elements]: decreases clause *)
-unfold
-let hash_map_move_elements_decreases (t : Type0) (ntable : hash_map_t t)
-  (slots : vec (list_t t)) (i : usize) : nat =
-  if i < length slots then length slots - i else 0
-
-(** [hashmap::HashMap::get_in_list]: decreases clause *)
-unfold
-let hash_map_get_in_list_decreases (t : Type0) (key : usize) (ls : list_t t) :
-  list_t t =
-  ls
-
-(** [hashmap::HashMap::get_mut_in_list]: decreases clause *)
-unfold
-let hash_map_get_mut_in_list_decreases (t : Type0) (key : usize)
-  (ls : list_t t) : list_t t =
-  ls
-
-(** [hashmap::HashMap::remove_from_list]: decreases clause *)
-unfold
-let hash_map_remove_from_list_decreases (t : Type0) (key : usize)
-  (ls : list_t t) : list_t t =
-  ls
-
diff --git a/tests/hashmap/Hashmap.Clauses.fst b/tests/hashmap/Hashmap.Clauses.fst
new file mode 100644
index 00000000..ef7793f1
--- /dev/null
+++ b/tests/hashmap/Hashmap.Clauses.fst
@@ -0,0 +1,59 @@
+(** [hashmap]: the decreases clauses *)
+module Hashmap.Clauses
+open Primitives
+open FStar.List.Tot
+open Hashmap.Types
+
+#set-options "--z3rlimit 50 --fuel 0 --ifuel 1"
+
+(*** Utilities *)
+
+(*** The clauses *)
+
+(** [hashmap::HashMap::allocate_slots]: decreases clause *)
+unfold
+let hash_map_allocate_slots_decreases (t : Type0) (slots : vec (list_t t))
+  (n : usize) : nat = n
+
+(** [hashmap::HashMap::clear_slots]: decreases clause *)
+unfold
+let hash_map_clear_slots_decreases (t : Type0) (slots : vec (list_t t))
+  (i : usize) : nat =
+  if i < length slots then length slots - i else 0
+
+(** [hashmap::HashMap::insert_in_list]: decreases clause *)
+unfold
+let hash_map_insert_in_list_decreases (t : Type0) (key : usize) (value : t)
+  (ls : list_t t) : list_t t =
+  ls
+
+(** [hashmap::HashMap::move_elements_from_list]: decreases clause *)
+unfold
+let hash_map_move_elements_from_list_decreases (t : Type0)
+  (ntable : hash_map_t t) (ls : list_t t) : list_t t =
+  ls
+
+(** [hashmap::HashMap::move_elements]: decreases clause *)
+unfold
+let hash_map_move_elements_decreases (t : Type0) (ntable : hash_map_t t)
+  (slots : vec (list_t t)) (i : usize) : nat =
+  if i < length slots then length slots - i else 0
+
+(** [hashmap::HashMap::get_in_list]: decreases clause *)
+unfold
+let hash_map_get_in_list_decreases (t : Type0) (key : usize) (ls : list_t t) :
+  list_t t =
+  ls
+
+(** [hashmap::HashMap::get_mut_in_list]: decreases clause *)
+unfold
+let hash_map_get_mut_in_list_decreases (t : Type0) (key : usize)
+  (ls : list_t t) : list_t t =
+  ls
+
+(** [hashmap::HashMap::remove_from_list]: decreases clause *)
+unfold
+let hash_map_remove_from_list_decreases (t : Type0) (key : usize)
+  (ls : list_t t) : list_t t =
+  ls
+
-- 
cgit v1.2.3