Fix top-comment computation before a stop-comment

The code for collecting alerts and attaching them to the toplevel unit
is messing with stop-comments.

Author: Julow

src/loader/doc_attr.ml

@@ -92,6 +92,7 @@ let parse_attribute : Parsetree.attribute -> parsed_attribute option =
       | Some p -> Some (`Text p)
       | None -> None)
   | "doc" | "ocaml.doc" -> (
+      (* We don't expect a stop-comment here. *)
       match load_payload attr_payload with
       | Some p -> Some (`Doc p)
       | None -> None)
@@ -211,8 +212,9 @@ let extract_top_comment internal_tags ~classify parent items =
             let p = match p with Some (p, _) -> Some p | None -> None in
             let attr_loc = read_location attr_loc in
             `Alert (Location_.at attr_loc (`Tag (`Alert (name, p))))
-        | Some (`Stop _) | None -> `Skip)
-    | Some `Open -> `Skip
+        | Some (`Stop _) -> `Return (* Stop at stop-comments. *)
+        | None -> `Skip (* Skip unrecognized attributes. *))
+    | Some `Open -> `Skip (* Skip open statements *)
     | None -> `Return
   in
   let rec extract_tail_alerts acc = function

test/generators/html/Stop-P.html

@@ -12,6 +12,14 @@
   </nav>
   <header class="odoc-preamble">
    <h1>Module <code><span>Stop.P</span></code></h1><p>Doc.</p>
-  </header><div class="odoc-content"></div>
+  </header>
+  <div class="odoc-content">
+   <div class="odoc-spec">
+    <div class="spec value anchored" id="val-bar">
+     <a href="#val-bar" class="anchor"></a>
+     <code><span><span class="keyword">val</span> bar : int</span></code>
+    </div>
+   </div>
+  </div>
  </body>
 </html>

test/generators/latex/Stop.tex

@@ -20,7 +20,8 @@ \section{Module \ocamlinlinecode{Stop}}\label{module-Stop}%
 \ocamlcodefragment{\ocamltag{keyword}{end}}\\
 The top-comment computation must not mess with stop comments.
 
-\label{module-Stop-module-P}\ocamlcodefragment{\ocamltag{keyword}{module} \hyperref[module-Stop-module-P]{\ocamlinlinecode{P}}}\ocamlcodefragment{ : \ocamltag{keyword}{sig}}\begin{ocamlindent}\end{ocamlindent}%
+\label{module-Stop-module-P}\ocamlcodefragment{\ocamltag{keyword}{module} \hyperref[module-Stop-module-P]{\ocamlinlinecode{P}}}\ocamlcodefragment{ : \ocamltag{keyword}{sig}}\begin{ocamlindent}\label{module-Stop-module-P-val-bar}\ocamlcodefragment{\ocamltag{keyword}{val} bar : int}\\
+\end{ocamlindent}%
 \ocamlcodefragment{\ocamltag{keyword}{end}}\begin{ocamlindent}Doc.\end{ocamlindent}%
 \medbreak
 

test/generators/man/Stop.P.3o

@@ -14,4 +14,4 @@ Doc\.
 .SH Documentation
 .sp 
 .nf 
-
+\f[CB]val\fR bar : int