Lexer readability of Math Kind

Signed-off-by: Sacha Ayoun <[email protected]>

Author: giltho

src/lexer.mll

@@ -27,7 +27,13 @@ let unescape_word : string -> string = fun s ->
     scan_word 0;
     Buffer.contents buffer
 
-let math_constr inline x = if inline then `Math_span x else `Math_block x
+type math_kind =
+  Inline | Block
+
+let math_constr kind x =
+  match kind with 
+  | Inline -> `Math_span x
+  | Block -> `Math_block x
 
 (* This is used for code and verbatim blocks. It can be done with a regular
    expression, but the regexp gets quite ugly, so a function is easier to
@@ -322,10 +328,10 @@ rule token input = parse
     { emit input (`Begin_style `Subscript) }
 
   | "{math" space_char
-    { math false (Buffer.create 1024) 0 (Lexing.lexeme_start lexbuf) input lexbuf }
+    { math Block (Buffer.create 1024) 0 (Lexing.lexeme_start lexbuf) input lexbuf }
 
   | "{m" horizontal_space
-    { math true (Buffer.create 1024) 0 (Lexing.lexeme_start lexbuf) input lexbuf }
+    { math Inline (Buffer.create 1024) 0 (Lexing.lexeme_start lexbuf) input lexbuf }
 
 
   | "{!modules:" ([^ '}']* as modules) '}'
@@ -546,49 +552,46 @@ and code_span buffer nesting_level start_offset input = parse
     { Buffer.add_char buffer c;
       code_span buffer nesting_level start_offset input lexbuf }
 
-and math inline buffer nesting_level start_offset input = parse
+and math kind buffer nesting_level start_offset input = parse
   | '}'
     { if nesting_level == 0 then
-        emit input (math_constr inline (Buffer.contents buffer)) ~start_offset
+        emit input (math_constr kind (Buffer.contents buffer)) ~start_offset
       else begin
         Buffer.add_char buffer '}';
-        math inline buffer (nesting_level - 1) start_offset input lexbuf
+        math kind buffer (nesting_level - 1) start_offset input lexbuf
       end
       }
   | '{'
     { Buffer.add_char buffer '{';
-      math inline buffer (nesting_level + 1) start_offset input lexbuf }
+      math kind buffer (nesting_level + 1) start_offset input lexbuf }
   | ("\\{" | "\\}") as s
     { Buffer.add_string buffer s;
-      math inline buffer nesting_level start_offset input lexbuf }
+      math kind buffer nesting_level start_offset input lexbuf }
   | (newline) as s
     {
-      if inline then
-        begin
-          warning
-            input
-            (Parse_error.not_allowed
-              ~what:(Token.describe (`Blank_line "\n"))
-              ~in_what:(Token.describe (math_constr inline "")));
-          Buffer.add_char buffer '\n';
-          math inline buffer nesting_level start_offset input lexbuf
-        end
-      else
-        begin
-          Buffer.add_string buffer s;
-          math inline buffer nesting_level start_offset input lexbuf
-        end
+      match kind with
+      | Inline ->
+        warning
+          input
+          (Parse_error.not_allowed
+            ~what:(Token.describe (`Blank_line "\n"))
+            ~in_what:(Token.describe (math_constr kind "")));
+        Buffer.add_char buffer '\n';
+        math kind buffer nesting_level start_offset input lexbuf
+      | Block ->
+        Buffer.add_string buffer s;
+        math kind buffer nesting_level start_offset input lexbuf
     }
   | eof
     { warning
         input
         (Parse_error.not_allowed
           ~what:(Token.describe `End)
-          ~in_what:(Token.describe (math_constr inline "")));
-      emit input (math_constr inline (Buffer.contents buffer)) ~start_offset }
+          ~in_what:(Token.describe (math_constr kind "")));
+      emit input (math_constr kind (Buffer.contents buffer)) ~start_offset }
   | _ as c
     { Buffer.add_char buffer c;
-      math inline buffer nesting_level start_offset input lexbuf }
+      math kind buffer nesting_level start_offset input lexbuf }
 
 and verbatim buffer last_false_terminator start_offset input = parse
   | (space_char as c) "v}"