summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-01-20 17:47:07 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2015-01-20 17:47:07 -0800
commit84d48648f0a203befd666aa0c7dad32fa1a22710 (patch)
tree63dd5f72e5ca537df9e5841b51b91ed93ed82b5a
parent3f4d605546fc82a3cdce8056790f1bb140a62903 (diff)
parent4b5e43c4fa9e18b7a281063a98fbef0def5a1cbe (diff)
Merge pull request #289 from nwellnhof/user_data
Add field for user data to node
-rw-r--r--man/man3/cmark.321
-rw-r--r--src/cmark.h17
-rw-r--r--src/iterator.c6
-rw-r--r--src/node.c18
-rw-r--r--src/node.h2
5 files changed, 63 insertions, 1 deletions
diff --git a/man/man3/cmark.3 b/man/man3/cmark.3
index 5df89c3..f889521 100644
--- a/man/man3/cmark.3
+++ b/man/man3/cmark.3
@@ -1,4 +1,4 @@
-.TH cmark 3 "January 11, 2015" "LOCAL" "Library Functions Manual"
+.TH cmark 3 "January 20, 2015" "LOCAL" "Library Functions Manual"
.SH
NAME
.PP
@@ -172,6 +172,12 @@ Returns the current node.
Returns the current event type.
.PP
+\fIcmark_node*\f[] \fBcmark_iter_get_root\f[](\fIcmark_iter *iter\f[])
+
+.PP
+Returns the root node.
+
+.PP
\fIvoid\f[] \fBcmark_iter_reset\f[](\fIcmark_iter *iter\f[], \fIcmark_node *current\f[], \fIcmark_event_type event_type\f[])
.PP
@@ -183,6 +189,19 @@ descendant of the root node or the root node itself.
Accessors
.PP
+\fIvoid*\f[] \fBcmark_node_get_user_data\f[](\fIcmark_node *node\f[])
+
+.PP
+Returns the user data of \f[I]node\f[]\&.
+
+.PP
+\fIint\f[] \fBcmark_node_set_user_data\f[](\fIcmark_node *node\f[], \fIvoid *user_data\f[])
+
+.PP
+Sets arbitrary user data for \f[I]node\f[]\&. Returns 1 on success,
+0 on failure.
+
+.PP
\fIcmark_node_type\f[] \fBcmark_node_get_type\f[](\fIcmark_node *node\f[])
.PP
diff --git a/src/cmark.h b/src/cmark.h
index 04ca6d7..8177fa8 100644
--- a/src/cmark.h
+++ b/src/cmark.h
@@ -213,6 +213,12 @@ CMARK_EXPORT
cmark_event_type
cmark_iter_get_event_type(cmark_iter *iter);
+/** Returns the root node.
+ */
+CMARK_EXPORT
+cmark_node*
+cmark_iter_get_root(cmark_iter *iter);
+
/** Resets the iterator so that the current node is 'current' and
* the event type is 'event_type'. The new current node must be a
* descendant of the root node or the root node itself.
@@ -226,6 +232,17 @@ cmark_iter_reset(cmark_iter *iter, cmark_node *current,
* ## Accessors
*/
+/** Returns the user data of 'node'.
+ */
+CMARK_EXPORT void*
+cmark_node_get_user_data(cmark_node *node);
+
+/** Sets arbitrary user data for 'node'. Returns 1 on success,
+ * 0 on failure.
+ */
+CMARK_EXPORT int
+cmark_node_set_user_data(cmark_node *node, void *user_data);
+
/** Returns the type of 'node', or `CMARK_NODE_NONE` on error.
*/
CMARK_EXPORT cmark_node_type
diff --git a/src/iterator.c b/src/iterator.c
index 4daec2d..eb7b49c 100644
--- a/src/iterator.c
+++ b/src/iterator.c
@@ -108,6 +108,12 @@ cmark_iter_get_event_type(cmark_iter *iter)
return iter->cur.ev_type;
}
+cmark_node*
+cmark_iter_get_root(cmark_iter *iter)
+{
+ return iter->root;
+}
+
void cmark_consolidate_text_nodes(cmark_node *root)
{
diff --git a/src/node.c b/src/node.c
index 3785a27..675eb19 100644
--- a/src/node.c
+++ b/src/node.c
@@ -189,6 +189,24 @@ cmark_node_last_child(cmark_node *node)
}
}
+void*
+cmark_node_get_user_data(cmark_node *node) {
+ if (node == NULL) {
+ return NULL;
+ } else {
+ return node->user_data;
+ }
+}
+
+int
+cmark_node_set_user_data(cmark_node *node, void *user_data) {
+ if (node == NULL) {
+ return 0;
+ }
+ node->user_data = user_data;
+ return 1;
+}
+
static char*
S_strdup(const char *str)
{
diff --git a/src/node.h b/src/node.h
index c0c43d3..74eddd4 100644
--- a/src/node.h
+++ b/src/node.h
@@ -49,6 +49,8 @@ struct cmark_node {
struct cmark_node *first_child;
struct cmark_node *last_child;
+ void *user_data;
+
int start_line;
int start_column;
int end_line;