Simplify alignment

Author: gpetiot

src/ast.ml

@@ -33,7 +33,7 @@ type inline_element =
 type 'a cell = 'a with_location list
 type 'a row = 'a cell list
 type 'a grid = 'a row list
-type 'a abstract_table = 'a row * 'a grid * alignment option list
+type 'a abstract_table = 'a row * 'a grid * alignment list
 
 type nestable_block_element =
   [ `Paragraph of inline_element with_location list

src/compat.ml

@@ -7,6 +7,8 @@ module Option = struct
     | None -> failwith "Option.value_exn None"
     | Some x -> x
 
+  let value ~default = function None -> default | Some x -> x
+
   let join_list l =
     if List.for_all is_some l then Some (List.map value_exn l) else None
 end

src/compat.mli

@@ -5,6 +5,7 @@ module Option : sig
   val is_some : 'a option -> bool
   (** [is_some o] is [true] if and only if [o] is [Some o]. *)
 
+  val value : default:'a -> 'a option -> 'a
   val join_list : 'a option list -> 'a list option
 end
 

src/syntax.ml

@@ -40,22 +40,24 @@ let peek input =
 
 module Table = struct
   module Light_syntax = struct
+    let default_align = `Center
+
     let valid_align = function
       | [ { Loc.value = `Word w; _ } ] -> (
           match String.length w with
-          | 0 -> Some None
+          | 0 -> Some default_align
           | 1 -> (
               match w with
-              | "-" -> Some None
-              | ":" -> Some (Some `Center)
+              | "-" -> Some default_align
+              | ":" -> Some `Center
               | _ -> None)
           | len ->
               if String.for_all (Char.equal '-') (String.sub w 1 (len - 2)) then
                 match (String.get w 0, String.get w (len - 1)) with
-                | ':', ':' -> Some (Some `Center)
-                | ':', '-' -> Some (Some `Left)
-                | '-', ':' -> Some (Some `Right)
-                | '-', '-' -> Some None
+                | ':', ':' -> Some `Center
+                | ':', '-' -> Some `Left
+                | '-', ':' -> Some `Right
+                | '-', '-' -> Some default_align
                 | _ -> None
               else None)
       | _ -> None
@@ -90,8 +92,7 @@ module Table = struct
     let valid_header_row row =
       List.map
         (function
-          | `Header (Some x), y -> Some (Some x, y)
-          | `Header None, y -> Some (None, y)
+          | `Header align, x -> Some (Option.value align ~default:`Center, x)
           | `Data, _ -> None)
         row
       |> Option.join_list

test/test.ml

@@ -97,9 +97,7 @@ module Ast_to_sexp = struct
                 map "cell" cell @@ at.at (f at) );
               ( map "data" data @@ fun row ->
                 map "row" row @@ fun cell -> map "cell" cell @@ at.at (f at) );
-              (map "align" align @@ function
-               | Some a -> alignment a
-               | None -> Atom "none");
+              map "align" align @@ alignment;
             ]
         in
         match t with

test/test_tables.ml

@@ -37,7 +37,7 @@ let%expect_test _ =
         {|
         ((output
           (((f.ml (1 0) (1 17))
-            (table (syntax heavy) (header ((cell ()))) (data ()) (align (none))))))
+            (table (syntax heavy) (header ((cell ()))) (data ()) (align (center))))))
          (warnings ())) |}]
 
     let multiple_headers =
@@ -47,7 +47,7 @@ let%expect_test _ =
         ((output
           (((f.ml (1 0) (1 37))
             (table (syntax heavy) (header ((cell ())))
-             (data ((row ((cell ()))) (row ((cell ()))))) (align (none))))))
+             (data ((row ((cell ()))) (row ((cell ()))))) (align (center))))))
          (warnings ())) |}]
 
     let complex_table =
@@ -129,8 +129,8 @@ let%expect_test _ =
                         ((cell (((f.ml (24 17) (24 18)) (word 1))))
                          (cell (((f.ml (24 21) (24 22)) (word 2))))
                          (cell (((f.ml (24 25) (24 26)) (word 3))))))))
-                     (align (none none none))))))))))
-             (align (none none))))))
+                     (align (center center center))))))))))
+             (align (center center))))))
          (warnings ())) |}]
 
     let align =
@@ -243,7 +243,7 @@ let%expect_test _ =
               ((row
                 ((cell (((f.ml (4 9) (4 10)) (word x))))
                  (cell (((f.ml (4 13) (4 14)) (word y))))))))
-             (align (none none))))))
+             (align (center center))))))
          (warnings ())) |}]
 
     let no_align =
@@ -278,7 +278,7 @@ let%expect_test _ =
         {|
         ((output
           (((f.ml (2 6) (4 7))
-            (table (syntax light) (header ()) (data ()) (align (none none))))))
+            (table (syntax light) (header ()) (data ()) (align (center center))))))
          (warnings ())) |}]
 
     let no_data =
@@ -296,7 +296,7 @@ let%expect_test _ =
                (header
                 ((cell (((f.ml (3 9) (3 10)) (word x))))
                  (cell (((f.ml (3 13) (3 14)) (word y))))))
-               (data ()) (align (none none))))))
+               (data ()) (align (center center))))))
            (warnings ())) |}]
 
     let alignment =
@@ -317,7 +317,7 @@ let%expect_test _ =
                (cell (((f.ml (3 13) (3 14)) (word b))))
                (cell (((f.ml (3 17) (3 18)) (word c))))
                (cell (((f.ml (3 21) (3 22)) (word d))))))
-             (data ()) (align (none left right center))))))
+             (data ()) (align (center left right center))))))
          (warnings ())) |}]
 
     let no_bars =
@@ -345,7 +345,7 @@ let%expect_test _ =
                    (cell (((f.ml (5 12) (5 13)) (word b))))
                    (cell (((f.ml (5 16) (5 17)) (word c))))
                    (cell (((f.ml (5 20) (5 21)) (word d))))))))
-               (align (none left right center))))))
+               (align (center left right center))))))
            (warnings ())) |}]
 
     let light_table_new_lines =
@@ -377,7 +377,7 @@ let%expect_test _ =
                    (cell (((f.ml (8 13) (8 14)) (word b))))
                    (cell (((f.ml (8 17) (8 18)) (word c))))
                    (cell (((f.ml (8 21) (8 22)) (word d))))))))
-               (align (none none none none))))))
+               (align (center center center center))))))
            (warnings ())) |}]
 
     let light_table_markup =
@@ -406,7 +406,7 @@ let%expect_test _ =
                  (cell
                   (((f.ml (3 60) (3 65)) (bold (((f.ml (3 63) (3 64)) (word d)))))
                    ((f.ml (3 66) (3 71)) (code_span foo))))))
-               (data ()) (align (none none none none))))))
+               (data ()) (align (center center center center))))))
            (warnings ())) |}]
 
     let no_space =
@@ -427,7 +427,7 @@ let%expect_test _ =
                (cell (((f.ml (3 15) (3 16)) (word b))))
                (cell (((f.ml (3 18) (3 19)) (word c))))
                (cell (((f.ml (3 21) (3 22)) (word d))))))
-             (data ()) (align (none right left center))))))
+             (data ()) (align (center right left center))))))
          (warnings ())) |}]
 
     let multiple_headers =
@@ -484,7 +484,7 @@ let%expect_test _ =
           (((f.ml (2 11) (5 12))
             (table (syntax light)
              (header ((cell ()) (cell (((f.ml (3 23) (3 24)) (word b)))))) (data ())
-             (align (none none))))))
+             (align (center center))))))
          (warnings
           ( "File \"f.ml\", line 3, characters 13-20:\
            \n'{[...]}' (code block) is not allowed in '{t ...}' (table)."))) |}]
@@ -506,7 +506,7 @@ let%expect_test _ =
              (header
               ((cell (((f.ml (4 13) (4 14)) (word a))))
                (cell (((f.ml (4 17) (4 18)) (word b))))))
-             (data ()) (align (none none))))))
+             (data ()) (align (center center))))))
          (warnings
           ( "File \"f.ml\", line 3, characters 11-18:\
            \n'{[...]}' (code block) is not allowed in '{t ...}' (table)."))) |}]