From 6f30b9fcabfacb2811cba6df20a49b90f44201a1 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 28 Dec 2014 16:59:28 -0800 Subject: Rename cmark_node_type_string -> cmark_node_get_type_string. And export in cmark.h public header. Also, use lowercase names, not uppercase. --- src/cmark.h | 7 +++++++ src/node.c | 42 +++++++++++++++++++++--------------------- src/node.h | 3 --- 3 files changed, 28 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/cmark.h b/src/cmark.h index 1dab0dd..732b244 100644 --- a/src/cmark.h +++ b/src/cmark.h @@ -198,6 +198,13 @@ cmark_iter_get_node(cmark_iter *iter); CMARK_EXPORT cmark_node_type cmark_node_get_type(cmark_node *node); +/** Like 'cmark_node_get_type', but returns a string representation + of the type, or `""`. + */ +CMARK_EXPORT +const char* +cmark_node_get_type_string(cmark_node *node); + /** Returns the string contents of 'node', or NULL if none. */ CMARK_EXPORT const char* diff --git a/src/node.c b/src/node.c index 36dc0bc..201fcf1 100644 --- a/src/node.c +++ b/src/node.c @@ -87,32 +87,32 @@ cmark_node_get_type(cmark_node *node) } const char* -cmark_node_type_string(cmark_node *node) +cmark_node_get_type_string(cmark_node *node) { if (node == NULL) { return "NONE"; } switch (node->type) { - case CMARK_NODE_NONE: return "NONE"; - case CMARK_NODE_DOCUMENT: return "DOCUMENT"; - case CMARK_NODE_BLOCK_QUOTE: return "BLOCK_QUOTE"; - case CMARK_NODE_LIST: return "LIST"; - case CMARK_NODE_LIST_ITEM: return "LIST_ITEM"; - case CMARK_NODE_CODE_BLOCK: return "CODE_BLOCK"; - case CMARK_NODE_HTML: return "HTML"; - case CMARK_NODE_PARAGRAPH: return "PARAGRAPH"; - case CMARK_NODE_HEADER: return "HEADER"; - case CMARK_NODE_HRULE: return "HRULE"; - case CMARK_NODE_TEXT: return "TEXT"; - case CMARK_NODE_SOFTBREAK: return "SOFTBREAK"; - case CMARK_NODE_LINEBREAK: return "LINEBREAK"; - case CMARK_NODE_CODE: return "CODE"; - case CMARK_NODE_INLINE_HTML: return "INLINE_HTML"; - case CMARK_NODE_EMPH: return "EMPH"; - case CMARK_NODE_STRONG: return "STRONG"; - case CMARK_NODE_LINK: return "LINK"; - case CMARK_NODE_IMAGE: return "IMAGE"; + case CMARK_NODE_NONE: return "none"; + case CMARK_NODE_DOCUMENT: return "document"; + case CMARK_NODE_BLOCK_QUOTE: return "block_quote"; + case CMARK_NODE_LIST: return "list"; + case CMARK_NODE_LIST_ITEM: return "list_item"; + case CMARK_NODE_CODE_BLOCK: return "code_block"; + case CMARK_NODE_HTML: return "html"; + case CMARK_NODE_PARAGRAPH: return "paragraph"; + case CMARK_NODE_HEADER: return "header"; + case CMARK_NODE_HRULE: return "hrule"; + case CMARK_NODE_TEXT: return "text"; + case CMARK_NODE_SOFTBREAK: return "softbreak"; + case CMARK_NODE_LINEBREAK: return "linebreak"; + case CMARK_NODE_CODE: return "code"; + case CMARK_NODE_INLINE_HTML: return "inline_html"; + case CMARK_NODE_EMPH: return "emph"; + case CMARK_NODE_STRONG: return "strong"; + case CMARK_NODE_LINK: return "link"; + case CMARK_NODE_IMAGE: return "image"; } return ""; @@ -708,7 +708,7 @@ S_print_error(FILE *out, cmark_node *node, const char *elem) return; } fprintf(out, "Invalid '%s' in node type %s at %d:%d\n", elem, - cmark_node_type_string(node), node->start_line, + cmark_node_get_type_string(node), node->start_line, node->start_column); } diff --git a/src/node.h b/src/node.h index 77b5698..fb3b667 100644 --- a/src/node.h +++ b/src/node.h @@ -66,9 +66,6 @@ struct cmark_node { } as; }; -const char* -cmark_node_type_string(cmark_node *node); - CMARK_EXPORT int cmark_node_check(cmark_node *node, FILE *out); -- cgit v1.2.3