Skip to content

Commit cd27f96

Browse files
committed
Normalize nomenclature: marker row vs. delimiter row
The code for the table extension used the term 'marker row', but the spec calls it 'delimiter row'. This change normalizes the terminology so that it's consistent.
1 parent 57d5e09 commit cd27f96

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

extensions/table.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ static cmark_node *try_opening_table_header(cmark_syntax_extension *self,
257257
unsigned char *input, int len) {
258258
cmark_node *table_header;
259259
table_row *header_row = NULL;
260-
table_row *marker_row = NULL;
260+
table_row *delimiter_row = NULL;
261261
node_table_row *ntr;
262262
const char *parent_string;
263263
uint16_t i;
@@ -270,16 +270,16 @@ static cmark_node *try_opening_table_header(cmark_syntax_extension *self,
270270
return parent_container;
271271
}
272272

273-
// Since scan_table_start was successful, we must have a marker row.
274-
marker_row = row_from_string(self, parser,
275-
input + cmark_parser_get_first_nonspace(parser),
276-
len - cmark_parser_get_first_nonspace(parser));
273+
// Since scan_table_start was successful, we must have a delimiter row.
274+
delimiter_row = row_from_string(
275+
self, parser, input + cmark_parser_get_first_nonspace(parser),
276+
len - cmark_parser_get_first_nonspace(parser));
277277
// assert may be optimized out, don't rely on it for security boundaries
278-
if (!marker_row) {
278+
if (!delimiter_row) {
279279
return parent_container;
280280
}
281-
282-
assert(marker_row);
281+
282+
assert(delimiter_row);
283283

284284
cmark_arena_push();
285285

@@ -289,31 +289,31 @@ static cmark_node *try_opening_table_header(cmark_syntax_extension *self,
289289
parent_string = cmark_node_get_string_content(parent_container);
290290
header_row = row_from_string(self, parser, (unsigned char *)parent_string,
291291
(int)strlen(parent_string));
292-
if (!header_row || header_row->n_columns != marker_row->n_columns) {
293-
free_table_row(parser->mem, marker_row);
292+
if (!header_row || header_row->n_columns != delimiter_row->n_columns) {
293+
free_table_row(parser->mem, delimiter_row);
294294
free_table_row(parser->mem, header_row);
295295
cmark_arena_pop();
296296
parent_container->flags |= CMARK_NODE__TABLE_VISITED;
297297
return parent_container;
298298
}
299299

300300
if (cmark_arena_pop()) {
301-
marker_row = row_from_string(
301+
delimiter_row = row_from_string(
302302
self, parser, input + cmark_parser_get_first_nonspace(parser),
303303
len - cmark_parser_get_first_nonspace(parser));
304304
header_row = row_from_string(self, parser, (unsigned char *)parent_string,
305305
(int)strlen(parent_string));
306306
// row_from_string can return NULL, add additional check to ensure n_columns match
307-
if (!marker_row || !header_row || header_row->n_columns != marker_row->n_columns) {
308-
free_table_row(parser->mem, marker_row);
307+
if (!delimiter_row || !header_row || header_row->n_columns != delimiter_row->n_columns) {
308+
free_table_row(parser->mem, delimiter_row);
309309
free_table_row(parser->mem, header_row);
310310
return parent_container;
311311
}
312312
}
313313

314314
if (!cmark_node_set_type(parent_container, CMARK_NODE_TABLE)) {
315315
free_table_row(parser->mem, header_row);
316-
free_table_row(parser->mem, marker_row);
316+
free_table_row(parser->mem, delimiter_row);
317317
return parent_container;
318318
}
319319

@@ -326,12 +326,12 @@ static cmark_node *try_opening_table_header(cmark_syntax_extension *self,
326326
parent_container->as.opaque = parser->mem->calloc(1, sizeof(node_table));
327327
set_n_table_columns(parent_container, header_row->n_columns);
328328

329-
// allocate alignments based on marker_row->n_columns
330-
// since we populate the alignments array based on marker_row->cells
329+
// allocate alignments based on delimiter_row->n_columns
330+
// since we populate the alignments array based on delimiter_row->cells
331331
uint8_t *alignments =
332-
(uint8_t *)parser->mem->calloc(marker_row->n_columns, sizeof(uint8_t));
333-
for (i = 0; i < marker_row->n_columns; ++i) {
334-
node_cell *node = &marker_row->cells[i];
332+
(uint8_t *)parser->mem->calloc(delimiter_row->n_columns, sizeof(uint8_t));
333+
for (i = 0; i < delimiter_row->n_columns; ++i) {
334+
node_cell *node = &delimiter_row->cells[i];
335335
bool left = node->buf->ptr[0] == ':', right = node->buf->ptr[node->buf->size - 1] == ':';
336336

337337
if (left && right)
@@ -371,7 +371,7 @@ static cmark_node *try_opening_table_header(cmark_syntax_extension *self,
371371
(int)strlen((char *)input) - 1 - cmark_parser_get_offset(parser), false);
372372

373373
free_table_row(parser->mem, header_row);
374-
free_table_row(parser->mem, marker_row);
374+
free_table_row(parser->mem, delimiter_row);
375375
return parent_container;
376376
}
377377

test/extensions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ fff | ggg | hhh | iii | jjj
208208

209209
### Table cell count mismatches
210210

211-
The header and marker row must match.
211+
The header and delimiter row must match.
212212

213213
```````````````````````````````` example
214214
| a | b | c |

0 commit comments

Comments
 (0)