Skip to content

Commit f8dd3e0

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 ef1cfcb commit f8dd3e0

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

extensions/table.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ static cmark_node *try_opening_table_header(cmark_syntax_extension *self,
235235
unsigned char *input, int len) {
236236
cmark_node *table_header;
237237
table_row *header_row = NULL;
238-
table_row *marker_row = NULL;
238+
table_row *delimiter_row = NULL;
239239
node_table_row *ntr;
240240
const char *parent_string;
241241
uint16_t i;
@@ -244,16 +244,16 @@ static cmark_node *try_opening_table_header(cmark_syntax_extension *self,
244244
return parent_container;
245245
}
246246

247-
// Since scan_table_start was successful, we must have a marker row.
248-
marker_row = row_from_string(self, parser,
249-
input + cmark_parser_get_first_nonspace(parser),
250-
len - cmark_parser_get_first_nonspace(parser));
247+
// Since scan_table_start was successful, we must have a delimiter row.
248+
delimiter_row = row_from_string(
249+
self, parser, input + cmark_parser_get_first_nonspace(parser),
250+
len - cmark_parser_get_first_nonspace(parser));
251251
// assert may be optimized out, don't rely on it for security boundaries
252-
if (!marker_row) {
252+
if (!delimiter_row) {
253253
return parent_container;
254254
}
255-
256-
assert(marker_row);
255+
256+
assert(delimiter_row);
257257

258258
cmark_arena_push();
259259

@@ -263,30 +263,30 @@ static cmark_node *try_opening_table_header(cmark_syntax_extension *self,
263263
parent_string = cmark_node_get_string_content(parent_container);
264264
header_row = row_from_string(self, parser, (unsigned char *)parent_string,
265265
(int)strlen(parent_string));
266-
if (!header_row || header_row->n_columns != marker_row->n_columns) {
267-
free_table_row(parser->mem, marker_row);
266+
if (!header_row || header_row->n_columns != delimiter_row->n_columns) {
267+
free_table_row(parser->mem, delimiter_row);
268268
free_table_row(parser->mem, header_row);
269269
cmark_arena_pop();
270270
return parent_container;
271271
}
272272

273273
if (cmark_arena_pop()) {
274-
marker_row = row_from_string(
274+
delimiter_row = row_from_string(
275275
self, parser, input + cmark_parser_get_first_nonspace(parser),
276276
len - cmark_parser_get_first_nonspace(parser));
277277
header_row = row_from_string(self, parser, (unsigned char *)parent_string,
278278
(int)strlen(parent_string));
279279
// row_from_string can return NULL, add additional check to ensure n_columns match
280-
if (!marker_row || !header_row || header_row->n_columns != marker_row->n_columns) {
281-
free_table_row(parser->mem, marker_row);
280+
if (!delimiter_row || !header_row || header_row->n_columns != delimiter_row->n_columns) {
281+
free_table_row(parser->mem, delimiter_row);
282282
free_table_row(parser->mem, header_row);
283283
return parent_container;
284284
}
285285
}
286286

287287
if (!cmark_node_set_type(parent_container, CMARK_NODE_TABLE)) {
288288
free_table_row(parser->mem, header_row);
289-
free_table_row(parser->mem, marker_row);
289+
free_table_row(parser->mem, delimiter_row);
290290
return parent_container;
291291
}
292292

@@ -299,11 +299,11 @@ static cmark_node *try_opening_table_header(cmark_syntax_extension *self,
299299
parent_container->as.opaque = parser->mem->calloc(1, sizeof(node_table));
300300
set_n_table_columns(parent_container, header_row->n_columns);
301301

302-
// allocate alignments based on marker_row->n_columns
303-
// since we populate the alignments array based on marker_row->cells
302+
// allocate alignments based on delimiter_row->n_columns
303+
// since we populate the alignments array based on delimiter_row->cells
304304
uint8_t *alignments =
305-
(uint8_t *)parser->mem->calloc(marker_row->n_columns, sizeof(uint8_t));
306-
cmark_llist *it = marker_row->cells;
305+
(uint8_t *)parser->mem->calloc(delimiter_row->n_columns, sizeof(uint8_t));
306+
cmark_llist *it = delimiter_row->cells;
307307
for (i = 0; it; it = it->next, ++i) {
308308
node_cell *node = (node_cell *)it->data;
309309
bool left = node->buf->ptr[0] == ':', right = node->buf->ptr[node->buf->size - 1] == ':';
@@ -347,7 +347,7 @@ static cmark_node *try_opening_table_header(cmark_syntax_extension *self,
347347
(int)strlen((char *)input) - 1 - cmark_parser_get_offset(parser), false);
348348

349349
free_table_row(parser->mem, header_row);
350-
free_table_row(parser->mem, marker_row);
350+
free_table_row(parser->mem, delimiter_row);
351351
return parent_container;
352352
}
353353

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)