Merge remote-tracking branch 'origin/master' into nik_gamma_sig

FStarLang · Oct 16, 2024 · 33a823b · 33a823b
2 parents 2390f47 + 33499bc
commit 33a823b
Show file tree

Hide file tree

Showing 2 changed files with 119 additions and 63 deletions.
diff --git a/ocaml/fstar-lib/generated/FStarC_ToSyntax_ToSyntax.ml b/ocaml/fstar-lib/generated/FStarC_ToSyntax_ToSyntax.ml
diff --git a/src/tosyntax/FStarC.ToSyntax.ToSyntax.fst b/src/tosyntax/FStarC.ToSyntax.ToSyntax.fst
@@ -3740,19 +3740,30 @@ and desugar_decl_core env (d_attrs:list S.term) (d:decl) : (env_t & sigelts) =
     env, []
 
   | Friend lid ->
-    if Env.iface env
-    then raise_error d Errors.Fatal_FriendInterface
-                      "'friend' declarations are not allowed in interfaces"
-    else if not (FStarC.Parser.Dep.module_has_interface (Env.dep_graph env) (Env.current_module env))
-    then raise_error d Errors.Fatal_FriendInterface
-                      "'friend' declarations are not allowed in modules that lack interfaces"
-    else if not (FStarC.Parser.Dep.module_has_interface (Env.dep_graph env) lid)
-    then raise_error d Errors.Fatal_FriendInterface
-                      "'friend' declarations cannot refer to modules that lack interfaces"
-    else if not (FStarC.Parser.Dep.deps_has_implementation (Env.dep_graph env) lid)
-    then raise_error d Errors.Fatal_FriendInterface
-                      "'friend' module has not been loaded; recompute dependences (C-c C-r) if in interactive mode"
-    else env, []
+    (* Several checks to accept a friend declaration. *)
+    let open FStarC.Errors in
+    let open FStarC.Pprint in
+    let open FStarC.Class.PP in
+    if Env.iface env then
+      raise_error d Errors.Fatal_FriendInterface [
+        text "'friend' declarations are not allowed in interfaces.";
+      ];
+    if not (FStarC.Parser.Dep.module_has_interface (Env.dep_graph env) (Env.current_module env)) then
+      raise_error d Errors.Fatal_FriendInterface [
+        text "'friend' declarations are not allowed in modules that lack interfaces.";
+        text "Suggestion: add an interface for module" ^/^ pp (Env.current_module env);
+      ];
+    if not (FStarC.Parser.Dep.deps_has_implementation (Env.dep_graph env) lid) then
+      raise_error d Errors.Fatal_FriendInterface [
+        text "'friend' module" ^/^ pp lid ^/^ text "not found";
+        text "Suggestion: recompute dependences (C-c C-r) if in interactive mode.";
+      ];
+    if not (FStarC.Parser.Dep.module_has_interface (Env.dep_graph env) lid) then
+      raise_error d Errors.Fatal_FriendInterface [
+        text "'friend' declarations cannot refer to modules that lack interfaces.";
+        text "Suggestion: add an interfce for module" ^/^ pp lid;
+      ];
+    env, []
 
   | Include (lid, restriction) ->
     let env = Env.push_include env lid restriction in