Parser: factor tag and shorthand list context

Author: panglesd

src/parser/syntax.ml

@@ -576,11 +576,12 @@ let _check_subset : stopped_implicitly -> Token.t = fun t -> (t :> Token.t)
    - The type of token that the block parser stops at. See discussion above. *)
 type ('block, 'stops_at_which_tokens) context =
   | Top_level : (Ast.block_element, stops_at_delimiters) context
-  | In_shorthand_list : (Ast.nestable_block_element, stopped_implicitly) context
+  | In_implicitely_ended :
+      [ `Tag | `Shorthand_list ]
+      -> (Ast.nestable_block_element, stopped_implicitly) context
   | In_explicit_list : (Ast.nestable_block_element, stops_at_delimiters) context
   | In_table_cell : (Ast.nestable_block_element, stops_at_delimiters) context
   | In_code_results : (Ast.nestable_block_element, code_stop) context
-  | In_tag : (Ast.nestable_block_element, stopped_implicitly) context
 
 (* This is a no-op. It is needed to prove to the type system that nestable block
    elements are acceptable block elements in all contexts. *)
@@ -592,11 +593,10 @@ let accepted_in_all_contexts :
  fun context block ->
   match context with
   | Top_level -> (block :> Ast.block_element)
-  | In_shorthand_list -> block
+  | In_implicitely_ended (`Tag | `Shorthand_list) -> block
   | In_explicit_list -> block
   | In_table_cell -> block
   | In_code_results -> block
-  | In_tag -> block
 
 (* Converts a tag to a series of words. This is used in error recovery, when a
    tag cannot be generated. *)
@@ -672,9 +672,9 @@ let rec block_element_list :
     | { value = `End; _ } as next_token -> (
         match context with
         | Top_level -> (List.rev acc, next_token, where_in_line)
-        | In_shorthand_list -> (List.rev acc, next_token, where_in_line)
+        | In_implicitely_ended (`Tag | `Shorthand_list) ->
+            (List.rev acc, next_token, where_in_line)
         | In_explicit_list -> (List.rev acc, next_token, where_in_line)
-        | In_tag -> (List.rev acc, next_token, where_in_line)
         | In_table_cell -> (List.rev acc, next_token, where_in_line)
         | In_code_results -> (List.rev acc, next_token, where_in_line))
     | { value = `Right_brace; _ } as next_token -> (
@@ -683,10 +683,10 @@ let rec block_element_list :
            possible values of [context]. *)
         match context with
         | Top_level -> (List.rev acc, next_token, where_in_line)
-        | In_shorthand_list -> (List.rev acc, next_token, where_in_line)
+        | In_implicitely_ended (`Tag | `Shorthand_list) ->
+            (List.rev acc, next_token, where_in_line)
         | In_explicit_list -> (List.rev acc, next_token, where_in_line)
         | In_table_cell -> (List.rev acc, next_token, where_in_line)
-        | In_tag -> (List.rev acc, next_token, where_in_line)
         | In_code_results ->
             junk input;
             consume_block_elements where_in_line acc)
@@ -710,8 +710,8 @@ let rec block_element_list :
         (* Blank lines terminate shorthand lists ([- foo]) and tags. They also
            terminate paragraphs, but the paragraph parser is aware of that
            internally. *)
-        | In_shorthand_list -> (List.rev acc, next_token, where_in_line)
-        | In_tag -> (List.rev acc, next_token, where_in_line)
+        | In_implicitely_ended (`Tag | `Shorthand_list) ->
+            (List.rev acc, next_token, where_in_line)
         (* Otherwise, blank lines are pretty much like single newlines. *)
         | _ ->
             junk input;
@@ -778,15 +778,11 @@ let rec block_element_list :
         (* If a tag starts at the beginning of a line, it terminates the preceding
            tag and/or the current shorthand list. In this case, return to the
            caller, and let the caller decide how to interpret the tag token. *)
-        | In_shorthand_list ->
+        | In_implicitely_ended (`Tag | `Shorthand_list) ->
             if where_in_line = `At_start_of_line then
               (List.rev acc, next_token, where_in_line)
             else recover_when_not_at_top_level context
         | In_table_cell -> recover_when_not_at_top_level context
-        | In_tag ->
-            if where_in_line = `At_start_of_line then
-              (List.rev acc, next_token, where_in_line)
-            else recover_when_not_at_top_level context
         | In_code_results -> recover_when_not_at_top_level context
         (* If this is the top-level call to [block_element_list], parse the
            tag. *)
@@ -823,7 +819,8 @@ let rec block_element_list :
                 consume_block_elements `After_text (tag :: acc)
             | (`Deprecated | `Return) as tag ->
                 let content, _stream_head, where_in_line =
-                  block_element_list In_tag ~parent_markup:token input
+                  block_element_list (In_implicitely_ended `Tag)
+                    ~parent_markup:token input
                 in
                 let tag =
                   match tag with
@@ -837,7 +834,8 @@ let rec block_element_list :
                 consume_block_elements where_in_line (tag :: acc)
             | (`Param _ | `Raise _ | `Before _) as tag ->
                 let content, _stream_head, where_in_line =
-                  block_element_list In_tag ~parent_markup:token input
+                  block_element_list (In_implicitely_ended `Tag)
+                    ~parent_markup:token input
                 in
                 let tag =
                   match tag with
@@ -852,7 +850,8 @@ let rec block_element_list :
                 consume_block_elements where_in_line (tag :: acc)
             | `See (kind, target) ->
                 let content, _next_token, where_in_line =
-                  block_element_list In_tag ~parent_markup:token input
+                  block_element_list (In_implicitely_ended `Tag)
+                    ~parent_markup:token input
                 in
                 let location =
                   location :: List.map Loc.location content |> Loc.span
@@ -1024,7 +1023,8 @@ let rec block_element_list :
         | _ -> ());
 
         match context with
-        | In_shorthand_list -> (List.rev acc, next_token, where_in_line)
+        | In_implicitely_ended `Shorthand_list ->
+            (List.rev acc, next_token, where_in_line)
         | _ ->
             let items, where_in_line =
               shorthand_list_items next_token where_in_line input
@@ -1060,16 +1060,12 @@ let rec block_element_list :
         in
 
         match context with
-        | In_shorthand_list ->
+        | In_implicitely_ended (`Tag | `Shorthand_list) ->
             if where_in_line = `At_start_of_line then
               (List.rev acc, next_token, where_in_line)
             else recover_when_not_at_top_level context
         | In_explicit_list -> recover_when_not_at_top_level context
         | In_table_cell -> recover_when_not_at_top_level context
-        | In_tag ->
-            if where_in_line = `At_start_of_line then
-              (List.rev acc, next_token, where_in_line)
-            else recover_when_not_at_top_level context
         | In_code_results -> recover_when_not_at_top_level context
         | Top_level ->
             if where_in_line <> `At_start_of_line then
@@ -1175,11 +1171,11 @@ let rec block_element_list :
   let where_in_line =
     match context with
     | Top_level -> `At_start_of_line
-    | In_shorthand_list -> `After_shorthand_bullet
+    | In_implicitely_ended `Shorthand_list -> `After_shorthand_bullet
     | In_explicit_list -> `After_explicit_list_bullet
     | In_table_cell -> `After_table_cell
     | In_code_results -> `After_tag
-    | In_tag -> `After_tag
+    | In_implicitely_ended `Tag -> `After_tag
   in
 
   consume_block_elements where_in_line []
@@ -1219,7 +1215,8 @@ and shorthand_list_items :
           junk input;
 
           let content, stream_head, where_in_line =
-            block_element_list In_shorthand_list ~parent_markup:bullet input
+            block_element_list (In_implicitely_ended `Shorthand_list)
+              ~parent_markup:bullet input
           in
           if content = [] then
             Parse_error.should_not_be_empty ~what:(Token.describe bullet)