@@ -1,5 +1,5 @@
11#include "hexml.h"
2−#include <stdlib.h>
2+#include <malloc.h>
33#include <string.h>
44#include <assert.h>
55#include <ctype.h>
@@ -10,18 +10,18 @@ typedef int bool;
1010/////////////////////////////////////////////////////////////////////
1111// TYPES
1212
13−static inline int end(str s) { return s.start + s.length; }
13+int static inline end(str s) { return s.start + s.length; }
1414
15−static inline str start_length(int32_t start, int32_t length)
15+str static inline start_length(int32_t start, int32_t length)
1616{
17− assert(start >= 0 && length >= 0);
17+ if (start < 0 || length < 0) assert(0);
1818 str res;
1919 res.start = start;
2020 res.length = length;
2121 return res;
2222}
2323
24−static inline str start_end(int32_t start, int32_t end)
24+str static inline start_end(int32_t start, int32_t end)
2525{
2626 return start_length(start, end - start);
2727}
@@ -40,7 +40,7 @@ typedef struct
4040 // have a cursor at the end, which is stack scoped, so children write out, then I do
4141 // when you commit, you copy over from end to front
4242
43− // nodes
43+ // nodes
4444 int size;
4545 int used_front; // front entries, stored for good
4646 int used_back; // back entries, stack based, copied into front
@@ -51,11 +51,11 @@ typedef struct
5151
5252struct document
5353{
54− const char* body; // pointer to initial argument, not owned by us
54+ char* body; // pointer to initial argument, not owned by us
5555
5656 // things only used while parsing
57− const char* cursor; // pointer to where we are in body
58− const char* end; // pointer to one past the last char
57+ char* cursor; // pointer to where we are in body
58+ char* end; // pointer to one past the last char
5959 // if cursor is > end we have gone past the end
6060
6161 char* error_message;
@@ -63,8 +63,8 @@ struct document
6363 attr_buffer attrs;
6464};
6565
66−static inline int doc_length(const document* d) { return (int) (d->end - d->body); }
67−static inline int doc_position(const document* d) { return (int) (d->cursor - d->body); }
66+int static inline doc_length(document* d) { return d->end - d->body; }
67+int static inline doc_position(document* d) { return d->cursor - d->body; }
6868
6969
7070/////////////////////////////////////////////////////////////////////
@@ -72,45 +72,49 @@ static inline int doc_position(const document* d) { return (int) (d->cursor - d-
7272
7373typedef struct
7474{
75− const document* d;
75+ document* d;
7676 char* buffer;
7777 int length;
7878 int cursor;
7979} render;
8080
81−static inline void render_char(render* r, char c)
81+void static inline render_char(render* r, char c)
8282{
8383 if (r->cursor < r->length)
8484 r->buffer[r->cursor] = c;
8585 r->cursor++;
8686}
8787
88−static inline void bound(int idx, int mn, int mx)
88+void static inline bound(char* msg, int index, int mn, int mx)
8989{
90− assert(idx >= mn && idx <= mx);
90+ if (index < mn || index > mx)
91+ {
92+ //printf("Bounds checking failed %s, got %i, which should be in %i:%i\n", msg, index, mn, mx);
93+ assert(0);
94+ }
9195}
9296
93−static inline void bound_str(str s, int mn, int mx)
97+void static inline bound_str(char* msg, str s, int mn, int mx)
9498{
95− assert(s.length >= 0);
96− bound(s.start, mn, mx);
97− bound(end(s), mn, mx);
99+ if (s.length < 0) assert(0);
100+ bound(msg, s.start, mn, mx);
101+ bound(msg, end(s), mn, mx);
98102}
99103
100−static void render_str(render* r, str s)
104+void render_str(render* r, str s)
101105{
102− bound_str(s, 0, doc_length(r->d));
106+ bound_str("render_str", s, 0, doc_length(r->d));
103107 for (int i = 0; i < s.length; i++)
104108 render_char(r, r->d->body[s.start + i]);
105109}
106110
107−static void render_tag(render* r, const node* n);
111+void render_tag(render* r, node* n);
108112
109−static void render_content(render* r, const node* n)
113+void render_content(render* r, node* n)
110114{
111− bound_str(n->inner, 0, doc_length(r->d));
112− bound_str(n->nodes, 0, r->d->nodes.used_front);
113− bound_str(n->attrs, 0, r->d->attrs.used);
115+ bound_str("render_conent inner", n->inner, 0, doc_length(r->d));
116+ bound_str("render_conent nodes", n->nodes, 0, r->d->nodes.used_front);
117+ bound_str("render_conent attrs", n->attrs, 0, r->d->attrs.used);
114118
115119 int done = n->inner.start;
116120 for (int i = 0; i < n->nodes.length; i++)
@@ -123,7 +127,7 @@ static void render_content(render* r, const node* n)
123127 render_str(r, start_end(done, end(n->inner)));
124128}
125129
126−static void render_tag(render* r, const node* n)
130+void render_tag(render* r, node* n)
127131{
128132 render_char(r, '<');
129133 render_str(r, n->name);
@@ -145,18 +149,14 @@ static void render_tag(render* r, const node* n)
145149 render_char(r, '>');
146150}
147151
148−int hexml_node_render(const document* d, const node* n, char* buffer, int length)
152+int document_render(document* d, char* buffer, int length)
149153{
150154 render r;
151155 r.d = d;
152156 r.buffer = buffer;
153157 r.length = length;
154158 r.cursor = 0;
155− // The root node (and only the root node) has an empty length, so just render its innards
156− if (n->name.length == 0)
157− render_content(&r, n);
158− else
159− render_tag(&r, n);
159+ render_content(&r, document_node(d));
160160 return r.cursor;
161161}
162162
@@ -164,10 +164,10 @@ int hexml_node_render(const document* d, const node* n, char* buffer, int length
164164/////////////////////////////////////////////////////////////////////
165165// NOT THE PARSER
166166
167−char* hexml_document_error(const document* d){return d->error_message;}
168−node* hexml_document_node(const document* d){return &d->nodes.nodes[0];}
167+char* document_error(document* d){return d->error_message;}
168+node* document_node(document* d){return &d->nodes.nodes[0];}
169169
170−void hexml_document_free(document* d)
170+void document_free(document* d)
171171{
172172 free(d->error_message);
173173 free(d->nodes.alloc);
@@ -175,24 +175,25 @@ void hexml_document_free(document* d)
175175 free(d);
176176}
177177
178−node* hexml_node_children(const document* d, const node* n, int* res)
178+node* node_children(document* d, node* n, int* res)
179179{
180180 *res = n->nodes.length;
181181 return &d->nodes.nodes[n->nodes.start];
182182}
183183
184−attr* hexml_node_attributes(const document* d, const node* n, int* res)
184+attr* node_attributes(document* d, node* n, int* res)
185185{
186186 *res = n->attrs.length;
187187 return &d->attrs.attrs[n->attrs.start];
188188}
189189
190190
191−attr* hexml_node_attribute(const document* d, const node* n, const char* s, int slen)
191+attr* node_attributeBy(document* d, node* n, char* s, int slen)
192192{
193− if (slen == -1) slen = (int) strlen(s);
194− const int limit = end(n->attrs);
195− for (int i = n->attrs.start; i < limit; i++)
193+ if (slen == -1) slen = strlen(s);
194+ int i = n->attrs.start;
195+ int limit = end(n->attrs);
196+ for (i = n->attrs.start; i < limit; i++)
196197 {
197198 attr* r = &d->attrs.attrs[i];
198199 if (r->name.length == slen && memcmp(s, &d->body[r->name.start], slen) == 0)
@@ -202,11 +203,11 @@ attr* hexml_node_attribute(const document* d, const node* n, const char* s, int
202203}
203204
204205// Search for given strings within a node
205−node* hexml_node_child(const document* d, const node* parent, const node* prev, const char* s, int slen)
206+node* node_childBy(document* d, node* parent, node* prev, char* s, int slen)
206207{
207− if (slen == -1) slen = (int) strlen(s);
208− int i = prev == NULL ? parent->nodes.start : (int) (prev + 1 - d->nodes.nodes);
209− const int limit = end(parent->nodes);
208+ if (slen == -1) slen = strlen(s);
209+ int i = prev == NULL ? parent->nodes.start : prev + 1 - d->nodes.nodes;
210+ int limit = end(parent->nodes);
210211 for (; i < limit; i++)
211212 {
212213 node* r = &d->nodes.nodes[i];
@@ -220,49 +221,49 @@ node* hexml_node_child(const document* d, const node* parent, const node* prev,
220221/////////////////////////////////////////////////////////////////////
221222// PARSE TABLE
222223
223−static const char tag_name1 = 0x1;
224−static const char tag_name = 0x2;
225−static const char tag_space = 0x4;
224+const char tag_name1 = 0x1;
225+const char tag_name = 0x2;
226+const char tag_space = 0x4;
226227
227−static char parse_table[256];
228+char parse_table[256];
228229
229−static void init_parse_table()
230+void init_parse_table()
230231{
231232 static bool done = 0;
232233 if (done) return;
233234 for (int i = 0; i < 256; i++)
234235 {
235236 bool name1 = i == ':' || i == '_' || (i >= 'a' && i <= 'z') || (i >= 'A' && i <= 'Z');
236− bool name = name1 || i == '-' || i == '.' || (i >= '0' && i <= '9');
237+ bool name = name1 || i == '-' || (i >= '0' && i <= '9');
237238 bool space = i == ' ' || i == '\t' || i == '\r' || i == '\n';
238239 parse_table[i] = (name1 ? tag_name1 : 0) | (name ? tag_name : 0) | (space ? tag_space : 0);
239240 }
240241 done = 1;
241242}
242243
243−static inline bool is(char c, char tag) { return parse_table[(unsigned char) c] & tag; }
244−static inline bool is_name1(char c) { return is(c, tag_name1); }
245−static inline bool is_name(char c) { return is(c, tag_name); }
246−static inline bool is_space(char c) { return is(c, tag_space); }
244+bool static inline is(char c, char tag) { return parse_table[c] & tag; }
245+bool static inline is_name1(char c) { return is(c, tag_name1); }
246+bool static inline is_name(char c) { return is(c, tag_name); }
247+bool static inline is_space(char c) { return is(c, tag_space); }
247248
248249
249250/////////////////////////////////////////////////////////////////////
250251// PARSER COMBINATORS
251252
252−static inline char peek_at(const document* d, int i) { return d->cursor[i]; }
253−static inline char peek(const document* d) { return peek_at(d, 0); }
254−static inline void skip(document* d, int i) { d->cursor += i; }
255−static inline char get(document* d) { char c = peek(d); skip(d, 1); return c; }
253+char static inline peekAt(document* d, int i) { return d->cursor[i]; }
254+void static inline skip(document* d, int i) { d->cursor += i; }
255+char static inline peek(document* d) { return peekAt(d, 0); }
256+char static inline get(document* d) { char c = peek(d); skip(d, 1); return c; }
256257
257258// Remove whitespace characters from the cursor while they are still whitespace
258−static inline void trim(document* d)
259+void static inline trim(document* d)
259260{
260261 while (is_space(peek(d)))
261262 skip(d, 1);
262263}
263264
264265// Find this character form the cursor onwards, if true adjust the cursor to that char, otherwise leave it at the end
265−static bool find(document* d, char c)
266+bool find(document* d, char c)
266267{
267268 char* x = memchr(d->cursor, c, d->end - d->cursor);
268269 if (x == NULL)
@@ -281,47 +282,37 @@ static bool find(document* d, char c)
281282/////////////////////////////////////////////////////////////////////
282283// PARSING CODE
283284
284−static inline void node_alloc(node_buffer* b, int ask)
285+void static inline node_alloc(node_buffer* b, int ask)
285286{
286287 int space = b->size - b->used_back - b->used_front;
287288 if (space >= ask) return;
288− int size2 = (b->size + 1000 + ask) * 2;
289− node* buf2 = malloc(size2 * sizeof(node));
290− assert(buf2);
291− memcpy(buf2, b->nodes, b->used_front * sizeof(node));
292− memcpy(&buf2[size2 - b->used_back], &b->nodes[b->size - b->used_back], b->used_back * sizeof(node));
293− free(b->alloc);
294− b->size = size2;
295− b->nodes = buf2;
296− b->alloc = buf2;
289+ assert(0);
297290}
298291
299−static inline void attr_alloc(attr_buffer* b, int ask)
292+void static inline attr_alloc(attr_buffer* b, int ask)
300293{
301294 int space = b->size - b->used;
302295 if (space >= ask) return;
303296 int size2 = (b->size + 1000 + ask) * 2;
304297 attr* buf2 = malloc(size2 * sizeof(attr));
305− assert(buf2);
306298 memcpy(buf2, b->attrs, b->used * sizeof(attr));
307299 free(b->alloc);
308− b->size = size2;
309300 b->attrs = buf2;
310301 b->alloc = buf2;
311302}
312303
313−static void set_error(document* d, const char* msg)
304+void set_error(document* d, char* msg)
314305{
315306 if (d->error_message != NULL) return; // keep the first error message
316307 d->error_message = malloc(strlen(msg)+1);
317− assert(d->error_message);
318308 strcpy(d->error_message, msg);
319309}
320310
321311// you now expect a name, perhaps preceeded by whitespace
322312// the name may be empty
323−static inline str parse_name(document* d)
313+str static inline parse_name(document* d)
324314{
315+ trim(d);
325316 int start = doc_position(d);
326317 if (!is_name1(peek(d)))
327318 return start_length(start, 0);
@@ -331,14 +322,10 @@ static inline str parse_name(document* d)
331322 return start_end(start, doc_position(d));
332323}
333324
334−static inline str parse_attrval(document* d)
325+str static inline parse_attrval(document* d)
335326{
336327 trim(d);
337− if (peek(d) != '=')
338− {
339− set_error(d, "Expected = in attribute, but missing");
340− return start_length(0, 0);
341− }
328+ if (peek(d) != '=') return start_length(0,0);
342329 skip(d, 1);
343330 trim(d);
344331 char c = peek(d);
@@ -355,22 +342,19 @@ static inline str parse_attrval(document* d)
355342 return start_end(start, doc_position(d) - 1);
356343 }
357344 else
358− {
359− set_error(d, "Invalid attribute");
360− return start_length(0, 0);
361− }
345+ return parse_name(d);
362346}
363347
364348
365349
366350// seen a tag name, now looking for attributes terminated by >
367351// puts the attributes it finds in the attribute buffer
368−static inline str parse_attributes(document* d)
352+str static inline parse_attributes(document* d)
369353{
370− int start = d->attrs.used;
371− while (d->error_message == NULL)
354+ str res;
355+ res.start = d->attrs.used;
356+ for (int i = 0; ; i++)
372357 {
373− trim(d);
374358 str name = parse_name(d);
375359 if (name.length == 0) break;
376360 attr_alloc(&d->attrs, 1);
@@ -378,39 +362,34 @@ static inline str parse_attributes(document* d)
378362 d->attrs.attrs[d->attrs.used].value = parse_attrval(d);
379363 d->attrs.used++;
380364 }
381− return start_end(start, d->attrs.used);
365+ res.length = d->attrs.used - res.start;
366+ return res;
382367}
383368
384−static str parse_content(document* d);
369+str parse_content(document* d);
385370
386371
387372// Add a new entry into tag, am at a '<'
388−static inline void parse_tag(document* d)
373+void static inline parse_tag(document* d)
389374{
390375 node_alloc(&d->nodes, 1);
391376 d->nodes.used_back++;
392− node* me = &d->nodes.nodes[d->nodes.size - d->nodes.used_back];
377+ int me = d->nodes.size - d->nodes.used_back;
393378
394− me->outer.start = doc_position(d);
379+ d->nodes.nodes[me].outer.start = doc_position(d);
395380 char c = get(d);
396381 assert(c == '<');
397382 if (peek(d) == '?') skip(d, 1);
398− me->name = parse_name(d);
399− if (me->name.length == 0)
400− {
401− set_error(d, "Missing tag name");
402− return;
403− }
404− me->attrs = parse_attributes(d);
405− if (d->error_message != NULL) return;
383+ d->nodes.nodes[me].name = parse_name(d);
384+ d->nodes.nodes[me].attrs = parse_attributes(d);
406385
407− c = peek(d);
408− if ((c == '/' || c == '?') && peek_at(d, 1) == '>')
386+ c = get(d);
387+ if ((c == '/' || c == '?') && peek(d) == '>')
409388 {
410− skip(d, 2);
411− me->nodes = start_length(0, 0);
412− me->outer.length = start_end(me->outer.start, doc_position(d)).length;
413− me->inner = start_length(doc_position(d), 0);
389+ skip(d, 1);
390+ d->nodes.nodes[me].nodes = start_length(0, 0);
391+ d->nodes.nodes[me].outer.length = start_end(d->nodes.nodes[me].outer.start, doc_position(d)).length;
392+ d->nodes.nodes[me].inner = start_length(doc_position(d), 0);
414393 return;
415394 }
416395 else if (c != '>')
@@ -418,28 +397,23 @@ static inline void parse_tag(document* d)
418397 set_error(d, "Gunk at the end of the tag");
419398 return;
420399 }
421− else
422− skip(d, 1);
423− me->inner.start = doc_position(d);
424− str content = parse_content(d);
425−
426− // parse_content may have allocated more nodes, so recompute me
427− me = &d->nodes.nodes[d->nodes.size - d->nodes.used_back];
428− me->nodes = content;
429− me->inner.length = start_end(me->inner.start, doc_position(d)).length;
400+ d->nodes.nodes[me].inner.start = doc_position(d);
401+ d->nodes.nodes[me].nodes = parse_content(d);
402+ d->nodes.nodes[me].inner.length = start_end(d->nodes.nodes[me].inner.start, doc_position(d)).length;
430403
431404 if (d->error_message != NULL) return;
432− if (peek(d) == '<' && peek_at(d, 1) == '/')
405+ if (peek(d) == '<' && peekAt(d, 1) == '/')
433406 {
434407 skip(d, 2);
435− if (d->end - d->cursor >= me->name.length &&
436− memcmp(d->cursor, &d->body[me->name.start], me->name.length) == 0)
408+ trim(d);
409+ if (d->end - d->cursor >= d->nodes.nodes[me].name.length &&
410+ memcmp(d->cursor, &d->body[d->nodes.nodes[me].name.start], d->nodes.nodes[me].name.length) == 0)
437411 {
438− skip(d, me->name.length);
412+ skip(d, d->nodes.nodes[me].name.length);
439413 trim(d);
440414 if (get(d) == '>')
441415 {
442− me->outer.length = start_end(me->outer.start, doc_position(d)).length;
416+ d->nodes.nodes[me].outer.length = start_end(d->nodes.nodes[me].outer.start, doc_position(d)).length;
443417 return;
444418 }
445419 }
@@ -451,7 +425,7 @@ static inline void parse_tag(document* d)
451425
452426// Parser until </, return the index of your node children
453427// Not inline as it is recursive
454−static str parse_content(document* d)
428+str parse_content(document* d)
455429{
456430 int before = d->nodes.used_back;
457431 while (d->error_message == NULL)
@@ -461,33 +435,11 @@ static str parse_content(document* d)
461435 {
462436 break;
463437 }
464− else if (peek_at(d, 1) == '/')
438+ if (peekAt(d, 1) == '/')
465439 {
466440 // have found a </
467441 break;
468442 }
469− else if (peek_at(d, 1) == '!' && peek_at(d, 2) == '-' && peek_at(d, 3) == '-')
470− {
471− skip(d, 3);
472− // you can't reuse the two '-' characters for the closing as well
473− if (peek_at(d, 0) == '\0' || peek_at(d, 1) == '\0')
474− {
475− set_error(d, "Didn't get a closing comment");
476− return start_end(0, 0);
477− }
478− skip(d, 2);
479− for (;;)
480− {
481− if (!find(d, '>'))
482− {
483− set_error(d, "Didn't get a closing comment");
484− return start_end(0, 0);
485− }
486− skip(d, 1);
487− if (peek_at(d, -3) == '-' && peek_at(d, -2) == '-')
488− break;
489− }
490− }
491443 else
492444 {
493445 parse_tag(d);
@@ -503,23 +455,20 @@ static str parse_content(document* d)
503455 return res;
504456}
505457
506−// Based on looking at ~50Kb XML documents, they seem to have ~700 attributes
507−// and ~300 nodes, so size appropriately to cope with that.
508458typedef struct
509459{
510460 document document;
511461 attr attrs[1000];
512− node nodes[500];
462+ node nodes[1000];
513463} buffer;
514464
515−document* hexml_document_parse(const char* s, int slen)
465+document* document_parse(char* s, int slen)
516466{
517− if (slen == -1) slen = (int) strlen(s);
467+ if (slen == -1) slen = strlen(s);
518468 assert(s[slen] == 0);
519469 init_parse_table();
520470
521471 buffer* buf = malloc(sizeof(buffer));
522− assert(buf);
523472 document* d = &buf->document;
524473 d->body = s;
525474 d->cursor = s;
@@ -529,7 +478,7 @@ document* hexml_document_parse(const char* s, int slen)
529478 d->attrs.used = 0;
530479 d->attrs.attrs = buf->attrs;
531480 d->attrs.alloc = NULL;
532− d->nodes.size = 500;
481+ d->nodes.size = 1000;
533482 d->nodes.used_back = 0;
534483 d->nodes.used_front = 1;
535484 d->nodes.nodes = buf->nodes;
@@ -539,13 +488,11 @@ document* hexml_document_parse(const char* s, int slen)
539488 d->nodes.nodes[0].outer = start_length(0, slen);
540489 d->nodes.nodes[0].inner = start_length(0, slen);
541490 d->nodes.nodes[0].attrs = start_length(0, 0);
491+ d->nodes.nodes[0].nodes = parse_content(d);
542492
543− // Introduce an intermediate result, otherwise behaviour is undefined
544− // because there is no guaranteed ordering between LHS and RHS evaluation
545− str content = parse_content(d);
546− d->nodes.nodes[0].nodes = content;
547−
548− if (d->cursor < d->end)
493+ if (d->cursor < d->end && d->error_message == NULL)
494+ {
549495 set_error(d, "Trailing junk at the end of the document");
496+ }
550497 return d;
551498}