Address review comments

18 files changed, 20 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index dbc78f9f..4ecc2a3e 100644
--- a/Makefile
+++ b/Makefile
@@ -101,8 +101,9 @@ test-all: test-no_nested_borrows test-paper \
 
 .PHONY: clean-generated
 clean-generated:
-	# We can't put this line in `tests/Makefile` otherwise it will detect itself :D
-	grep -lR 'THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS' tests | xargs rm
+	# We can't put this line in `tests/Makefile` otherwise it will detect itself.
+	# FIXME: generation of hol4 files is deactivated so we don't delete those.
+	grep -lR 'THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS' tests | grep -v '^tests/hol4' | xargs rm
 
 # Verify the F* files generated by the translation
 .PHONY: verify
diff --git a/tests/hol4/betree/betreeMain_FunsScript.sml b/tests/hol4/betree/betreeMain_FunsScript.sml
index ae3c4de2..bd16c16c 100644
--- a/tests/hol4/betree/betreeMain_FunsScript.sml
+++ b/tests/hol4/betree/betreeMain_FunsScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [betree_main]: function definitions *)
 open primitivesLib divDefLib
 open betreeMain_TypesTheory betreeMain_OpaqueTheory
diff --git a/tests/hol4/betree/betreeMain_OpaqueScript.sml b/tests/hol4/betree/betreeMain_OpaqueScript.sml
index 04a547e1..1d16db4c 100644
--- a/tests/hol4/betree/betreeMain_OpaqueScript.sml
+++ b/tests/hol4/betree/betreeMain_OpaqueScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [betree_main]: external function declarations *)
 open primitivesLib divDefLib
 open betreeMain_TypesTheory
diff --git a/tests/hol4/betree/betreeMain_TypesScript.sml b/tests/hol4/betree/betreeMain_TypesScript.sml
index 685df462..779f6abb 100644
--- a/tests/hol4/betree/betreeMain_TypesScript.sml
+++ b/tests/hol4/betree/betreeMain_TypesScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [betree_main]: type definitions *)
 open primitivesLib divDefLib
 
diff --git a/tests/hol4/hashmap/hashmap_FunsScript.sml b/tests/hol4/hashmap/hashmap_FunsScript.sml
index 6678de4b..682c5760 100644
--- a/tests/hol4/hashmap/hashmap_FunsScript.sml
+++ b/tests/hol4/hashmap/hashmap_FunsScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [hashmap]: function definitions *)
 open primitivesLib divDefLib
 open hashmap_TypesTheory
diff --git a/tests/hol4/hashmap/hashmap_TypesScript.sml b/tests/hol4/hashmap/hashmap_TypesScript.sml
index 6b91bdde..a0865956 100644
--- a/tests/hol4/hashmap/hashmap_TypesScript.sml
+++ b/tests/hol4/hashmap/hashmap_TypesScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [hashmap]: type definitions *)
 open primitivesLib divDefLib
 
diff --git a/tests/hol4/hashmap_on_disk/hashmapMain_FunsScript.sml b/tests/hol4/hashmap_on_disk/hashmapMain_FunsScript.sml
index 153f7cd9..c1e30aa6 100644
--- a/tests/hol4/hashmap_on_disk/hashmapMain_FunsScript.sml
+++ b/tests/hol4/hashmap_on_disk/hashmapMain_FunsScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [hashmap_main]: function definitions *)
 open primitivesLib divDefLib
 open hashmapMain_TypesTheory hashmapMain_OpaqueTheory
diff --git a/tests/hol4/hashmap_on_disk/hashmapMain_OpaqueScript.sml b/tests/hol4/hashmap_on_disk/hashmapMain_OpaqueScript.sml
index 4e3c01c0..f7221d92 100644
--- a/tests/hol4/hashmap_on_disk/hashmapMain_OpaqueScript.sml
+++ b/tests/hol4/hashmap_on_disk/hashmapMain_OpaqueScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [hashmap_main]: external function declarations *)
 open primitivesLib divDefLib
 open hashmapMain_TypesTheory
diff --git a/tests/hol4/hashmap_on_disk/hashmapMain_TypesScript.sml b/tests/hol4/hashmap_on_disk/hashmapMain_TypesScript.sml
index 14ba1890..3f8ca9b9 100644
--- a/tests/hol4/hashmap_on_disk/hashmapMain_TypesScript.sml
+++ b/tests/hol4/hashmap_on_disk/hashmapMain_TypesScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [hashmap_main]: type definitions *)
 open primitivesLib divDefLib
 
diff --git a/tests/hol4/misc-constants/constantsScript.sml b/tests/hol4/misc-constants/constantsScript.sml
index 20228a38..40a319c6 100644
--- a/tests/hol4/misc-constants/constantsScript.sml
+++ b/tests/hol4/misc-constants/constantsScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [constants] *)
 open primitivesLib divDefLib
 
diff --git a/tests/hol4/misc-external/external_FunsScript.sml b/tests/hol4/misc-external/external_FunsScript.sml
index 65433aff..f3692ee2 100644
--- a/tests/hol4/misc-external/external_FunsScript.sml
+++ b/tests/hol4/misc-external/external_FunsScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [external]: function definitions *)
 open primitivesLib divDefLib
 open external_TypesTheory external_OpaqueTheory
diff --git a/tests/hol4/misc-external/external_OpaqueScript.sml b/tests/hol4/misc-external/external_OpaqueScript.sml
index e5faf97c..b5a6d91d 100644
--- a/tests/hol4/misc-external/external_OpaqueScript.sml
+++ b/tests/hol4/misc-external/external_OpaqueScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [external]: external function declarations *)
 open primitivesLib divDefLib
 open external_TypesTheory
diff --git a/tests/hol4/misc-external/external_TypesScript.sml b/tests/hol4/misc-external/external_TypesScript.sml
index 207eea8d..d290c3f6 100644
--- a/tests/hol4/misc-external/external_TypesScript.sml
+++ b/tests/hol4/misc-external/external_TypesScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [external]: type definitions *)
 open primitivesLib divDefLib
 
diff --git a/tests/hol4/misc-loops/loops_FunsScript.sml b/tests/hol4/misc-loops/loops_FunsScript.sml
index 6bb079a9..65cf77d4 100644
--- a/tests/hol4/misc-loops/loops_FunsScript.sml
+++ b/tests/hol4/misc-loops/loops_FunsScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [loops]: function definitions *)
 open primitivesLib divDefLib
 open loops_TypesTheory
diff --git a/tests/hol4/misc-loops/loops_TypesScript.sml b/tests/hol4/misc-loops/loops_TypesScript.sml
index aec26414..e3e5b8d1 100644
--- a/tests/hol4/misc-loops/loops_TypesScript.sml
+++ b/tests/hol4/misc-loops/loops_TypesScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [loops]: type definitions *)
 open primitivesLib divDefLib
 
diff --git a/tests/hol4/misc-no_nested_borrows/noNestedBorrowsScript.sml b/tests/hol4/misc-no_nested_borrows/noNestedBorrowsScript.sml
index 85a9bd8b..1b2d6121 100644
--- a/tests/hol4/misc-no_nested_borrows/noNestedBorrowsScript.sml
+++ b/tests/hol4/misc-no_nested_borrows/noNestedBorrowsScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [no_nested_borrows] *)
 open primitivesLib divDefLib
 
diff --git a/tests/hol4/misc-paper/paperScript.sml b/tests/hol4/misc-paper/paperScript.sml
index 71e9b6d1..3ac5b6ca 100644
--- a/tests/hol4/misc-paper/paperScript.sml
+++ b/tests/hol4/misc-paper/paperScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [paper] *)
 open primitivesLib divDefLib
 
diff --git a/tests/hol4/misc-polonius_list/poloniusListScript.sml b/tests/hol4/misc-polonius_list/poloniusListScript.sml
index d5b6422c..06876ed4 100644
--- a/tests/hol4/misc-polonius_list/poloniusListScript.sml
+++ b/tests/hol4/misc-polonius_list/poloniusListScript.sml
@@ -1,3 +1,4 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
 (** [polonius_list] *)
 open primitivesLib divDefLib