*** empty log message ***

[mandoc.git] / libmdocml.c

diff --git a/libmdocml.c b/libmdocml.c
index 32245afb29144308b82e52a193497806538bb192..f419c1f55a17628445283de868d3b962c81e35d4 100644 (file)
--- a/libmdocml.c
+++ b/libmdocml.c
@@ -1,4 +1,4 @@
-/* $Id: libmdocml.c,v 1.5 2008/11/23 16:53:18 kristaps Exp $ */
+/* $Id: libmdocml.c,v 1.18 2008/12/03 14:39:59 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -17,6 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
+#include <ctype.h>
 #include <fcntl.h>
 #include <err.h>
 #include <stdio.h>
@@ -27,12 +28,13 @@
 #include "libmdocml.h"
 #include "private.h"
 
-#define        BUFFER_LINE      BUFSIZ
+#define        BUFFER_LINE      BUFSIZ /* Default line-buffer size. */
 
 static int      md_run_enter(const struct md_args *, 
                        struct md_mbuf *, struct md_rbuf *, void *);
 static int      md_run_leave(const struct md_args *, struct md_mbuf *,
                        struct md_rbuf *, int, void *);
+
 static ssize_t  md_buf_fill(struct md_rbuf *);
 static int      md_buf_flush(struct md_mbuf *);
 
@@ -54,8 +56,7 @@ md_buf_fill(struct md_rbuf *in)
 }
 
 
-static int
-md_buf_flush(struct md_mbuf *buf)
+static int md_buf_flush(struct md_mbuf *buf)
 {
        ssize_t          sz;
 
@@ -84,6 +85,8 @@ md_buf_flush(struct md_mbuf *buf)
 int
 md_buf_putchar(struct md_mbuf *buf, char c)
 {
+
+       assert(buf);
        return(md_buf_puts(buf, &c, 1));
 }
 
@@ -91,6 +94,8 @@ md_buf_putchar(struct md_mbuf *buf, char c)
 int
 md_buf_putstring(struct md_mbuf *buf, const char *p)
 {
+
+       assert(buf);
        return(md_buf_puts(buf, p, strlen(p)));
 }
 
@@ -134,18 +139,18 @@ md_run_leave(const struct md_args *args, struct md_mbuf *mbuf,
 
        /* Run exiters. */
        switch (args->type) {
-       case (MD_HTML4_STRICT):
-               if ( ! md_exit_html4_strict(args, mbuf, rbuf, data))
-                       return(-1);
-               break;
-       case (MD_DUMMY):
+       case (MD_HTML):
+               if ( ! md_exit_html(data, -1 == c ? 0 : 1))
+                       c = -1;
                break;
        default:
-               abort();
+               if ( ! md_exit_xml(data, -1 == c ? 0 : 1))
+                       c = -1;
+               break;
        }
 
        /* Make final flush of buffer. */
-       if ( ! md_buf_flush(mbuf))
+       if (-1 != c && ! md_buf_flush(mbuf))
                return(-1);
 
        return(c);
@@ -167,49 +172,53 @@ md_run_enter(const struct md_args *args, struct md_mbuf *mbuf,
 
        /* Function ptrs to line-parsers. */
        switch (args->type) {
-       case (MD_HTML4_STRICT):
-               fp = md_line_html4_strict;
-               break;
-       case (MD_DUMMY):
-               fp = md_line_dummy;
+       case (MD_HTML):
+               fp = md_line_html;
                break;
        default:
-               abort();
+               fp = md_line_xml;
+               break;
        }
 
-       /* LINTED */
-       for (pos = 0; ; ) {
-               if (-1 == (sz = md_buf_fill(rbuf)))
-                       return(md_run_leave(args, mbuf, rbuf, -1, p));
-               else if (0 == sz)
-                       break;
-
-               for (i = 0; i < sz; i++) {
-                       if ('\n' == rbuf->buf[i]) {
-                               if ( ! (*fp)(args, mbuf, rbuf, line, pos, p))
-                                       return(md_run_leave(args, mbuf, rbuf,
-                                                               -1, p));
-                               rbuf->line++;
-                               pos = 0;
-                               continue;
-                       }
+       pos = 0;
 
+again:
+       if (-1 == (sz = md_buf_fill(rbuf))) {
+               return(md_run_leave(args, mbuf, rbuf, -1, p));
+       } else if (0 == sz && 0 != pos) {
+               warnx("%s: no newline at end of file", rbuf->name);
+               return(md_run_leave(args, mbuf, rbuf, -1, p));
+       } else if (0 == sz)
+               return(md_run_leave(args, mbuf, rbuf, 0, p));
+
+       for (i = 0; i < sz; i++) {
+               /*
+               if ( ! isascii(rbuf->buf[i])) {
+                       warnx("%s: non-ascii char (line %zu, col %zu)",
+                                       rbuf->name, rbuf->line, pos);
+                       return(md_run_leave(args, mbuf, rbuf, -1, p));
+               }
+               */
+               if ('\n' != rbuf->buf[i]) {
                        if (pos < BUFFER_LINE) {
                                /* LINTED */
                                line[pos++] = rbuf->buf[i];
                                continue;
                        }
-
                        warnx("%s: line %zu too long",
                                        rbuf->name, rbuf->line);
                        return(md_run_leave(args, mbuf, rbuf, -1, p));
                }
-       }
 
-       if (0 != pos && ! (*fp)(args, mbuf, rbuf, line, pos, p))
-               return(md_run_leave(args, mbuf, rbuf, -1, p));
+               line[(int)pos] = 0;
+               if ( ! (*fp)(p, line))
+                       return(md_run_leave(args, mbuf, rbuf, -1, p));
+               rbuf->line++;
+               pos = 0;
+       }
 
-       return(md_run_leave(args, mbuf, rbuf, 0, p));
+       goto again;
+       /* NOTREACHED */
 }
 
 
@@ -230,19 +239,15 @@ md_run(const struct md_args *args,
 
        mbuf.pos = 0;
        rbuf.line = 1;
-       data = NULL;
 
        /* Run initialisers. */
        switch (args->type) {
-       case (MD_HTML4_STRICT):
-               if ( ! md_init_html4_strict
-                               (args, &mbuf, &rbuf, &data))
-                       return(-1);
-               break;
-       case (MD_DUMMY):
+       case (MD_HTML):
+               data = md_init_html(args, &mbuf, &rbuf);
                break;
        default:
-               abort();
+               data = md_init_xml(args, &mbuf, &rbuf);
+               break;
        }
 
        /* Go into mainline. */