Skip to content

Commit e3bfc46

Browse files
gpetiotjonludlam
gpetiot
authored and
jonludlam
committed
Renaming data->grid in tests, data is a kind of a cell
1 parent 6403717 commit e3bfc46

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎test/test.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ module Ast_to_sexp = struct
8686
|> fun items -> List items
8787
in
8888
List [ Atom kind; Atom weight; items ]
89-
| `Table ((data, align), s) ->
89+
| `Table ((grid, align), s) ->
9090
let syntax = function `Light -> "light" | `Heavy -> "heavy" in
9191
let kind = function `Header -> "header" | `Data -> "data" in
9292
let map name x f = List [ Atom name; List (List.map f x) ] in
@@ -99,7 +99,7 @@ module Ast_to_sexp = struct
9999
[
100100
Atom "table";
101101
List [ Atom "syntax"; Atom (syntax s) ];
102-
( map "data" data @@ fun row ->
102+
( map "grid" grid @@ fun row ->
103103
map "row" row @@ fun (cell, k) ->
104104
map (kind k) cell @@ at.at (nestable_block_element at) );
105105
alignment;

‎test/test_tables.ml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let%expect_test _ =
1010
{|
1111
((output
1212
(((f.ml (1 0) (1 8))
13-
(table (syntax heavy) (data ()) (align "no alignment")))))
13+
(table (syntax heavy) (grid ()) (align "no alignment")))))
1414
(warnings ())) |}]
1515

1616
let empty_row =
@@ -19,7 +19,7 @@ let%expect_test _ =
1919
{|
2020
((output
2121
(((f.ml (1 0) (1 14))
22-
(table (syntax heavy) (data ((row ()))) (align "no alignment")))))
22+
(table (syntax heavy) (grid ((row ()))) (align "no alignment")))))
2323
(warnings ()))|}]
2424

2525
let no_header =
@@ -28,7 +28,7 @@ let%expect_test _ =
2828
{|
2929
((output
3030
(((f.ml (1 0) (1 17))
31-
(table (syntax heavy) (data ((row ((data ()))))) (align "no alignment")))))
31+
(table (syntax heavy) (grid ((row ((data ()))))) (align "no alignment")))))
3232
(warnings ())) |}]
3333

3434
let no_data =
@@ -37,7 +37,7 @@ let%expect_test _ =
3737
{|
3838
((output
3939
(((f.ml (1 0) (1 17))
40-
(table (syntax heavy) (data ((row ((header ())))))
40+
(table (syntax heavy) (grid ((row ((header ())))))
4141
(align "no alignment")))))
4242
(warnings ())) |}]
4343

@@ -47,7 +47,7 @@ let%expect_test _ =
4747
{|
4848
((output
4949
(((f.ml (1 0) (1 22))
50-
(table (syntax heavy) (data ()) (align "no alignment")))))
50+
(table (syntax heavy) (grid ()) (align "no alignment")))))
5151
(warnings
5252
( "File \"f.ml\", line 1, characters 7-13:\
5353
\n'absurd' is not allowed in '{table ...}' (table).\
@@ -62,7 +62,7 @@ let%expect_test _ =
6262
{|
6363
((output
6464
(((f.ml (1 0) (1 27))
65-
(table (syntax heavy) (data ((row ()))) (align "no alignment")))))
65+
(table (syntax heavy) (grid ((row ()))) (align "no alignment")))))
6666
(warnings
6767
( "File \"f.ml\", line 1, characters 11-17:\
6868
\n'absurd' is not allowed in '{tr ...}' (table row).\
@@ -78,7 +78,7 @@ let%expect_test _ =
7878
((output
7979
(((f.ml (1 0) (1 37))
8080
(table (syntax heavy)
81-
(data ((row ((header ()))) (row ((header ()))) (row ((data ())))))
81+
(grid ((row ((header ()))) (row ((header ()))) (row ((data ())))))
8282
(align "no alignment")))))
8383
(warnings ())) |}]
8484

@@ -118,7 +118,7 @@ let%expect_test _ =
118118
((output
119119
(((f.ml (2 8) (28 9))
120120
(table (syntax heavy)
121-
(data
121+
(grid
122122
((row
123123
((header
124124
(((f.ml (4 16) (4 19))
@@ -137,7 +137,7 @@ let%expect_test _ =
137137
(italic (((f.ml (8 32) (8 35)) (word ddd))))))))))
138138
(data
139139
(((f.ml (11 15) (11 32))
140-
(table (syntax heavy) (data ((row ((data ())))))
140+
(table (syntax heavy) (grid ((row ((data ())))))
141141
(align "no alignment")))))))
142142
(row
143143
((data
@@ -152,7 +152,7 @@ let%expect_test _ =
152152
(data
153153
(((f.ml (21 14) (25 15))
154154
(table (syntax light)
155-
(data
155+
(grid
156156
((row
157157
((header
158158
(((f.ml (22 17) (22 18))
@@ -187,7 +187,7 @@ let%expect_test _ =
187187
{|
188188
((output
189189
(((f.ml (1 0) (1 4))
190-
(table (syntax light) (data ()) (align "no alignment")))))
190+
(table (syntax light) (grid ()) (align "no alignment")))))
191191
(warnings ())) |}]
192192

193193
let simple =
@@ -201,7 +201,7 @@ let%expect_test _ =
201201
((output
202202
(((f.ml (2 8) (4 9))
203203
(table (syntax light)
204-
(data
204+
(grid
205205
((row
206206
((data
207207
(((f.ml (3 12) (3 13))
@@ -222,7 +222,7 @@ let%expect_test _ =
222222
((output
223223
(((f.ml (2 8) (5 9))
224224
(table (syntax light)
225-
(data
225+
(grid
226226
((row
227227
((data
228228
(((f.ml (3 11) (3 12))
@@ -251,7 +251,7 @@ let%expect_test _ =
251251
((output
252252
(((f.ml (2 6) (4 7))
253253
(table (syntax light)
254-
(data
254+
(grid
255255
((row
256256
((data
257257
(((f.ml (3 11) (3 13))
@@ -274,7 +274,7 @@ let%expect_test _ =
274274
((output
275275
(((f.ml (2 6) (5 7))
276276
(table (syntax light)
277-
(data
277+
(grid
278278
((row
279279
((data
280280
(((f.ml (4 9) (4 10)) (paragraph (((f.ml (4 9) (4 10)) (word x)))))))
@@ -296,7 +296,7 @@ let%expect_test _ =
296296
((output
297297
(((f.ml (2 6) (5 7))
298298
(table (syntax light)
299-
(data
299+
(grid
300300
((row
301301
((data
302302
(((f.ml (3 9) (3 10)) (paragraph (((f.ml (3 9) (3 10)) (word x)))))))
@@ -322,7 +322,7 @@ let%expect_test _ =
322322
{|
323323
((output
324324
(((f.ml (2 6) (4 7))
325-
(table (syntax light) (data ()) (align (default default))))))
325+
(table (syntax light) (grid ()) (align (default default))))))
326326
(warnings ())) |}]
327327

328328
let no_data =
@@ -337,7 +337,7 @@ let%expect_test _ =
337337
((output
338338
(((f.ml (2 6) (5 7))
339339
(table (syntax light)
340-
(data
340+
(grid
341341
((row
342342
((header
343343
(((f.ml (3 9) (3 10)) (paragraph (((f.ml (3 9) (3 10)) (word x)))))))
@@ -360,7 +360,7 @@ let%expect_test _ =
360360
((output
361361
(((f.ml (2 6) (5 7))
362362
(table (syntax light)
363-
(data
363+
(grid
364364
((row
365365
((header
366366
(((f.ml (3 9) (3 10)) (paragraph (((f.ml (3 9) (3 10)) (word a)))))))
@@ -390,7 +390,7 @@ let%expect_test _ =
390390
((output
391391
(((f.ml (2 6) (6 7))
392392
(table (syntax light)
393-
(data
393+
(grid
394394
((row
395395
((header
396396
(((f.ml (3 8) (3 9)) (paragraph (((f.ml (3 8) (3 9)) (word a)))))))
@@ -436,7 +436,7 @@ let%expect_test _ =
436436
((output
437437
(((f.ml (2 6) (10 7))
438438
(table (syntax light)
439-
(data
439+
(grid
440440
((row
441441
((header
442442
(((f.ml (4 9) (4 10)) (paragraph (((f.ml (4 9) (4 10)) (word a)))))))
@@ -477,7 +477,7 @@ let%expect_test _ =
477477
((output
478478
(((f.ml (2 6) (5 7))
479479
(table (syntax light)
480-
(data
480+
(grid
481481
((row
482482
((header
483483
(((f.ml (3 9) (3 14))
@@ -521,7 +521,7 @@ let%expect_test _ =
521521
((output
522522
(((f.ml (2 6) (6 7))
523523
(table (syntax light)
524-
(data
524+
(grid
525525
((row
526526
((header
527527
(((f.ml (2 11) (2 13))
@@ -562,7 +562,7 @@ let%expect_test _ =
562562
((output
563563
(((f.ml (2 7) (5 8))
564564
(table (syntax light)
565-
(data
565+
(grid
566566
((row
567567
((header
568568
(((f.ml (3 11) (3 12))
@@ -597,7 +597,7 @@ let%expect_test _ =
597597
((output
598598
(((f.ml (2 6) (10 7))
599599
(table (syntax light)
600-
(data
600+
(grid
601601
((row
602602
((header ())
603603
(header
@@ -654,7 +654,7 @@ let%expect_test _ =
654654
((output
655655
(((f.ml (2 11) (5 12))
656656
(table (syntax light)
657-
(data
657+
(grid
658658
((row
659659
((header ())
660660
(header
@@ -679,7 +679,7 @@ let%expect_test _ =
679679
((output
680680
(((f.ml (2 11) (6 12))
681681
(table (syntax light)
682-
(data
682+
(grid
683683
((row
684684
((header
685685
(((f.ml (4 13) (4 14))
@@ -706,7 +706,7 @@ let%expect_test _ =
706706
((output
707707
(((f.ml (2 6) (6 7))
708708
(table (syntax light)
709-
(data
709+
(grid
710710
((row
711711
((header
712712
(((f.ml (3 9) (3 10)) (paragraph (((f.ml (3 9) (3 10)) (word x)))))))
@@ -739,7 +739,7 @@ let%expect_test _ =
739739
((output
740740
(((f.ml (2 6) (6 7))
741741
(table (syntax light)
742-
(data
742+
(grid
743743
((row
744744
((header
745745
(((f.ml (3 9) (3 10)) (paragraph (((f.ml (3 9) (3 10)) (word x)))))))
@@ -775,7 +775,7 @@ let%expect_test _ =
775775
((output
776776
(((f.ml (2 8) (5 9))
777777
(table (syntax light)
778-
(data
778+
(grid
779779
((row
780780
((header
781781
(((f.ml (3 8) (3 10))
@@ -789,7 +789,7 @@ let%expect_test _ =
789789
(align (default default default))))
790790
((f.ml (7 8) (10 9))
791791
(table (syntax light)
792-
(data
792+
(grid
793793
((row
794794
((header
795795
(((f.ml (8 9) (8 11))
@@ -803,7 +803,7 @@ let%expect_test _ =
803803
(align (default default default))))
804804
((f.ml (12 8) (15 9))
805805
(table (syntax light)
806-
(data
806+
(grid
807807
((row
808808
((header
809809
(((f.ml (13 9) (13 11))

0 commit comments

Comments
 (0)