From fc923ee0a3e3837fdb51c3f8fc6e99d16bdb8f4c Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Wed, 12 Nov 2014 17:40:25 +0100 Subject: Prefix names in buffer.h --- src/cmark.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/cmark.h') diff --git a/src/cmark.h b/src/cmark.h index 5f0d5f7..1ffbcf1 100644 --- a/src/cmark.h +++ b/src/cmark.h @@ -63,7 +63,7 @@ struct FencedCodeData { int fence_length; int fence_offset; unsigned char fence_char; - strbuf info; + cmark_strbuf info; }; struct node_block { @@ -90,7 +90,7 @@ struct node_block { struct node_block* last_child; struct node_block* parent; struct node_block* top; - strbuf string_content; + cmark_strbuf string_content; node_inl* inline_content; union { @@ -116,7 +116,7 @@ node_block *cmark_parse_file(FILE *f); void cmark_free_nodes(node_block *e); void cmark_debug_print(node_block *root); -void cmark_render_html(strbuf *html, node_block *root); +void cmark_render_html(cmark_strbuf *html, node_block *root); unsigned char *cmark_markdown_to_html(unsigned char *text, int len); -- cgit v1.2.3 From e9ba8f064cb61239be6432ec60ab2ced3d9d339f Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Wed, 12 Nov 2014 17:48:03 +0100 Subject: Prefix names in chunk.h --- src/chunk.h | 43 ++++++++++++++++++++++++++++--------------- src/cmark.h | 2 +- src/inlines.h | 6 +++--- src/references.h | 4 ++-- 4 files changed, 34 insertions(+), 21 deletions(-) (limited to 'src/cmark.h') diff --git a/src/chunk.h b/src/chunk.h index 208880a..e4a57b2 100644 --- a/src/chunk.h +++ b/src/chunk.h @@ -11,9 +11,9 @@ typedef struct { const unsigned char *data; int len; int alloc; -} chunk; +} cmark_chunk; -static inline void chunk_free(chunk *c) +static inline void cmark_chunk_free(cmark_chunk *c) { if (c->alloc) free((char *)c->data); @@ -23,7 +23,7 @@ static inline void chunk_free(chunk *c) c->len = 0; } -static inline void chunk_ltrim(chunk *c) +static inline void cmark_chunk_ltrim(cmark_chunk *c) { assert(!c->alloc); @@ -33,7 +33,7 @@ static inline void chunk_ltrim(chunk *c) } } -static inline void chunk_rtrim(chunk *c) +static inline void cmark_chunk_rtrim(cmark_chunk *c) { while (c->len > 0) { if (!isspace(c->data[c->len - 1])) @@ -43,19 +43,19 @@ static inline void chunk_rtrim(chunk *c) } } -static inline void chunk_trim(chunk *c) +static inline void cmark_chunk_trim(cmark_chunk *c) { - chunk_ltrim(c); - chunk_rtrim(c); + cmark_chunk_ltrim(c); + cmark_chunk_rtrim(c); } -static inline int chunk_strchr(chunk *ch, int c, int offset) +static inline int cmark_chunk_strchr(cmark_chunk *ch, int c, int offset) { const unsigned char *p = memchr(ch->data + offset, c, ch->len - offset); return p ? (int)(p - ch->data) : ch->len; } -static inline unsigned char *chunk_to_cstr(chunk *c) +static inline unsigned char *cmark_chunk_to_cstr(cmark_chunk *c) { unsigned char *str; @@ -67,21 +67,21 @@ static inline unsigned char *chunk_to_cstr(chunk *c) return str; } -static inline chunk chunk_literal(const char *data) +static inline cmark_chunk cmark_chunk_literal(const char *data) { - chunk c = {(const unsigned char *)data, data ? strlen(data) : 0, 0}; + cmark_chunk c = {(const unsigned char *)data, data ? strlen(data) : 0, 0}; return c; } -static inline chunk chunk_dup(const chunk *ch, int pos, int len) +static inline cmark_chunk cmark_chunk_dup(const cmark_chunk *ch, int pos, int len) { - chunk c = {ch->data + pos, len, 0}; + cmark_chunk c = {ch->data + pos, len, 0}; return c; } -static inline chunk chunk_buf_detach(cmark_strbuf *buf) +static inline cmark_chunk cmark_chunk_buf_detach(cmark_strbuf *buf) { - chunk c; + cmark_chunk c; c.len = buf->size; c.data = cmark_strbuf_detach(buf); @@ -90,4 +90,17 @@ static inline chunk chunk_buf_detach(cmark_strbuf *buf) return c; } +#ifndef CMARK_NO_SHORT_NAMES + #define chunk cmark_chunk + #define chunk_free cmark_chunk_free + #define chunk_ltrim cmark_chunk_ltrim + #define chunk_rtrim cmark_chunk_rtrim + #define chunk_trim cmark_chunk_trim + #define chunk_strchr cmark_chunk_strchr + #define chunk_to_cstr cmark_chunk_to_cstr + #define chunk_literal cmark_chunk_literal + #define chunk_dup cmark_chunk_dup + #define chunk_buf_detach cmark_chunk_buf_detach +#endif + #endif diff --git a/src/cmark.h b/src/cmark.h index 1ffbcf1..63b60dc 100644 --- a/src/cmark.h +++ b/src/cmark.h @@ -29,7 +29,7 @@ struct node_inl { INL_IMAGE } tag; union { - chunk literal; + cmark_chunk literal; struct node_inl *inlines; struct { struct node_inl *label; diff --git a/src/inlines.h b/src/inlines.h index 623a075..042172f 100644 --- a/src/inlines.h +++ b/src/inlines.h @@ -1,9 +1,9 @@ #ifndef _INLINES_H_ #define _INLINES_H_ -unsigned char *clean_url(chunk *url); -unsigned char *clean_autolink(chunk *url, int is_email); -unsigned char *clean_title(chunk *title); +unsigned char *clean_url(cmark_chunk *url); +unsigned char *clean_autolink(cmark_chunk *url, int is_email); +unsigned char *clean_title(cmark_chunk *title); node_inl* parse_inlines(cmark_strbuf *input, reference_map *refmap); void free_inlines(node_inl* e); diff --git a/src/references.h b/src/references.h index 28937f1..82596ca 100644 --- a/src/references.h +++ b/src/references.h @@ -21,7 +21,7 @@ typedef struct reference_map reference_map; reference_map *reference_map_new(void); void reference_map_free(reference_map *map); -reference* reference_lookup(reference_map *map, chunk *label); -extern void reference_create(reference_map *map, chunk *label, chunk *url, chunk *title); +reference* reference_lookup(reference_map *map, cmark_chunk *label); +extern void reference_create(reference_map *map, cmark_chunk *label, cmark_chunk *url, cmark_chunk *title); #endif -- cgit v1.2.3 From 1d27ae88530582f612b82cb245388a94b300b4ad Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Wed, 12 Nov 2014 18:07:00 +0100 Subject: Prefix names in references.h --- src/cmark.h | 2 +- src/inlines.h | 4 ++-- src/references.h | 29 +++++++++++++++++++---------- 3 files changed, 22 insertions(+), 13 deletions(-) (limited to 'src/cmark.h') diff --git a/src/cmark.h b/src/cmark.h index 63b60dc..f49c162 100644 --- a/src/cmark.h +++ b/src/cmark.h @@ -100,7 +100,7 @@ struct node_block { int level; } header; struct { - reference_map *refmap; + cmark_reference_map *refmap; } document; } as; diff --git a/src/inlines.h b/src/inlines.h index 93a1dc6..bcbf5a6 100644 --- a/src/inlines.h +++ b/src/inlines.h @@ -5,10 +5,10 @@ unsigned char *cmark_clean_url(cmark_chunk *url); unsigned char *cmark_clean_autolink(cmark_chunk *url, int is_email); unsigned char *cmark_clean_title(cmark_chunk *title); -node_inl* cmark_parse_inlines(cmark_strbuf *input, reference_map *refmap); +node_inl* cmark_parse_inlines(cmark_strbuf *input, cmark_reference_map *refmap); void cmark_free_inlines(node_inl* e); -int cmark_parse_reference_inline(cmark_strbuf *input, reference_map *refmap); +int cmark_parse_reference_inline(cmark_strbuf *input, cmark_reference_map *refmap); #ifndef CMARK_NO_SHORT_NAMES #define clean_url cmark_clean_url diff --git a/src/references.h b/src/references.h index 82596ca..1bc187a 100644 --- a/src/references.h +++ b/src/references.h @@ -3,25 +3,34 @@ #define REFMAP_SIZE 16 -struct reference { - struct reference *next; +struct cmark_reference { + struct cmark_reference *next; unsigned char *label; unsigned char *url; unsigned char *title; unsigned int hash; }; -typedef struct reference reference; +typedef struct cmark_reference cmark_reference; -struct reference_map { - reference *table[REFMAP_SIZE]; +struct cmark_reference_map { + cmark_reference *table[REFMAP_SIZE]; }; -typedef struct reference_map reference_map; +typedef struct cmark_reference_map cmark_reference_map; -reference_map *reference_map_new(void); -void reference_map_free(reference_map *map); -reference* reference_lookup(reference_map *map, cmark_chunk *label); -extern void reference_create(reference_map *map, cmark_chunk *label, cmark_chunk *url, cmark_chunk *title); +cmark_reference_map *cmark_reference_map_new(void); +void cmark_reference_map_free(cmark_reference_map *map); +cmark_reference* cmark_reference_lookup(cmark_reference_map *map, cmark_chunk *label); +extern void cmark_reference_create(cmark_reference_map *map, cmark_chunk *label, cmark_chunk *url, cmark_chunk *title); + +#ifndef CMARK_NO_SHORT_NAMES + #define reference cmark_reference + #define reference_map cmark_reference_map + #define reference_map_new cmark_reference_map_new + #define reference_map_free cmark_reference_map_free + #define reference_lookup cmark_reference_lookup + #define reference_create cmark_reference_create +#endif #endif -- cgit v1.2.3 From 6b262ef85ecf7bda5fbe36d102808475e0c5793d Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Wed, 12 Nov 2014 18:19:52 +0100 Subject: Prefix names in cmark.h --- src/cmark.h | 125 ++++++++++++++++++++++++++++++++++++---------------------- src/inlines.h | 4 +- 2 files changed, 80 insertions(+), 49 deletions(-) (limited to 'src/cmark.h') diff --git a/src/cmark.h b/src/cmark.h index f49c162..8b29934 100644 --- a/src/cmark.h +++ b/src/cmark.h @@ -11,39 +11,39 @@ extern "C" { #endif -#define VERSION "0.1" -#define CODE_INDENT 4 +#define CMARK_VERSION "0.1" +#define CMARK_CODE_INDENT 4 -#define MAX_LINK_LABEL_LENGTH 1000 +#define CMARK_MAX_LINK_LABEL_LENGTH 1000 -struct node_inl { +struct cmark_node_inl { enum { - INL_STRING, - INL_SOFTBREAK, - INL_LINEBREAK, - INL_CODE, - INL_RAW_HTML, - INL_EMPH, - INL_STRONG, - INL_LINK, - INL_IMAGE + CMARK_INL_STRING, + CMARK_INL_SOFTBREAK, + CMARK_INL_LINEBREAK, + CMARK_INL_CODE, + CMARK_INL_RAW_HTML, + CMARK_INL_EMPH, + CMARK_INL_STRONG, + CMARK_INL_LINK, + CMARK_INL_IMAGE } tag; union { cmark_chunk literal; - struct node_inl *inlines; + struct cmark_node_inl *inlines; struct { - struct node_inl *label; + struct cmark_node_inl *label; unsigned char *url; unsigned char *title; } linkable; } content; - struct node_inl *next; + struct cmark_node_inl *next; }; -typedef struct node_inl node_inl; +typedef struct cmark_node_inl cmark_node_inl; // Types for blocks -struct ListData { +struct cmark_ListData { enum { bullet, ordered @@ -59,43 +59,43 @@ struct ListData { bool tight; }; -struct FencedCodeData { +struct cmark_FencedCodeData { int fence_length; int fence_offset; unsigned char fence_char; cmark_strbuf info; }; -struct node_block { +struct cmark_node_block { enum { - BLOCK_DOCUMENT, - BLOCK_BQUOTE, - BLOCK_LIST, - BLOCK_LIST_ITEM, - BLOCK_FENCED_CODE, - BLOCK_INDENTED_CODE, - BLOCK_HTML, - BLOCK_PARAGRAPH, - BLOCK_ATX_HEADER, - BLOCK_SETEXT_HEADER, - BLOCK_HRULE, - BLOCK_REFERENCE_DEF + CMARK_BLOCK_DOCUMENT, + CMARK_BLOCK_BQUOTE, + CMARK_BLOCK_LIST, + CMARK_BLOCK_LIST_ITEM, + CMARK_BLOCK_FENCED_CODE, + CMARK_BLOCK_INDENTED_CODE, + CMARK_BLOCK_HTML, + CMARK_BLOCK_PARAGRAPH, + CMARK_BLOCK_ATX_HEADER, + CMARK_BLOCK_SETEXT_HEADER, + CMARK_BLOCK_HRULE, + CMARK_BLOCK_REFERENCE_DEF } tag; int start_line; int start_column; int end_line; bool open; bool last_line_blank; - struct node_block* children; - struct node_block* last_child; - struct node_block* parent; - struct node_block* top; + struct cmark_node_block* children; + struct cmark_node_block* last_child; + struct cmark_node_block* parent; + struct cmark_node_block* top; cmark_strbuf string_content; - node_inl* inline_content; + cmark_node_inl* inline_content; union { - struct ListData list; - struct FencedCodeData code; + struct cmark_ListData list; + struct cmark_FencedCodeData code; struct { int level; } header; @@ -104,22 +104,53 @@ struct node_block { } document; } as; - struct node_block *next; - struct node_block *prev; + struct cmark_node_block *next; + struct cmark_node_block *prev; }; -typedef struct node_block node_block; +typedef struct cmark_node_block cmark_node_block; -node_block *cmark_parse_document(const unsigned char *buffer, size_t len); -node_block *cmark_parse_file(FILE *f); +cmark_node_block *cmark_parse_document(const unsigned char *buffer, size_t len); +cmark_node_block *cmark_parse_file(FILE *f); -void cmark_free_nodes(node_block *e); +void cmark_free_nodes(cmark_node_block *e); -void cmark_debug_print(node_block *root); -void cmark_render_html(cmark_strbuf *html, node_block *root); +void cmark_debug_print(cmark_node_block *root); +void cmark_render_html(cmark_strbuf *html, cmark_node_block *root); unsigned char *cmark_markdown_to_html(unsigned char *text, int len); +#ifndef CMARK_NO_SHORT_NAMES + #define VERSION CMARK_VERSION + #define CODE_INDENT CMARK_CODE_INDENT + #define MAX_LINK_LABEL_LENGTH CMARK_MAX_LINK_LABEL_LENGTH + #define node_inl cmark_node_inl + #define INL_STRING CMARK_INL_STRING + #define INL_SOFTBREAK CMARK_INL_SOFTBREAK + #define INL_LINEBREAK CMARK_INL_LINEBREAK + #define INL_CODE CMARK_INL_CODE + #define INL_RAW_HTML CMARK_INL_RAW_HTML + #define INL_EMPH CMARK_INL_EMPH + #define INL_STRONG CMARK_INL_STRONG + #define INL_LINK CMARK_INL_LINK + #define INL_IMAGE CMARK_INL_IMAGE + #define ListData cmark_ListData + #define FencedCodeData cmark_FencedCodeData + #define node_block cmark_node_block + #define BLOCK_DOCUMENT CMARK_BLOCK_DOCUMENT + #define BLOCK_BQUOTE CMARK_BLOCK_BQUOTE + #define BLOCK_LIST CMARK_BLOCK_LIST + #define BLOCK_LIST_ITEM CMARK_BLOCK_LIST_ITEM + #define BLOCK_FENCED_CODE CMARK_BLOCK_FENCED_CODE + #define BLOCK_INDENTED_CODE CMARK_BLOCK_INDENTED_CODE + #define BLOCK_HTML CMARK_BLOCK_HTML + #define BLOCK_PARAGRAPH CMARK_BLOCK_PARAGRAPH + #define BLOCK_ATX_HEADER CMARK_BLOCK_ATX_HEADER + #define BLOCK_SETEXT_HEADER CMARK_BLOCK_SETEXT_HEADER + #define BLOCK_HRULE CMARK_BLOCK_HRULE + #define BLOCK_REFERENCE_DEF CMARK_BLOCK_REFERENCE_DEF +#endif + #ifdef __cplusplus } #endif diff --git a/src/inlines.h b/src/inlines.h index bcbf5a6..6b3d4d4 100644 --- a/src/inlines.h +++ b/src/inlines.h @@ -5,8 +5,8 @@ unsigned char *cmark_clean_url(cmark_chunk *url); unsigned char *cmark_clean_autolink(cmark_chunk *url, int is_email); unsigned char *cmark_clean_title(cmark_chunk *title); -node_inl* cmark_parse_inlines(cmark_strbuf *input, cmark_reference_map *refmap); -void cmark_free_inlines(node_inl* e); +cmark_node_inl* cmark_parse_inlines(cmark_strbuf *input, cmark_reference_map *refmap); +void cmark_free_inlines(cmark_node_inl* e); int cmark_parse_reference_inline(cmark_strbuf *input, cmark_reference_map *refmap); -- cgit v1.2.3