Refactor, no functional change: Remove the parse point from struct buf.

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index 6c558817d3ee26a5099c11bb30b761bf001018b5..2207023147aee8d34977d5bf86b2cb8d036153b7 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.94 2014/10/28 17:36:19 schwarze Exp $ */
+/*     $Id: read.c,v 1.95 2014/11/01 04:08:43 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -68,7 +68,7 @@ struct        mparse {
 
 static void      choose_parser(struct mparse *);
 static void      resize_buf(struct buf *, size_t);
 
 static void      choose_parser(struct mparse *);
 static void      resize_buf(struct buf *, size_t);

-static void      mparse_buf_r(struct mparse *, struct buf, int);
+static void      mparse_buf_r(struct mparse *, struct buf, size_t, int);

 static int       read_whole_file(struct mparse *, const char *, int,
                                struct buf *, int *);
 static void      mparse_end(struct mparse *);
 static int       read_whole_file(struct mparse *, const char *, int,
                                struct buf *, int *);
 static void      mparse_end(struct mparse *);


@@ -303,27 +303,29 @@ choose_parser(struct mparse *curp)
 }
 
 /*
 }
 
 /*

- * Main parse routine for an opened file.  This is called for each
- * opened file and simply loops around the full input file, possibly
- * nesting (i.e., with `so').
+ * Main parse routine for a buffer.
+ * It assumes encoding and line numbering are already set up.
+ * It can recurse directly (for invocations of user-defined
+ * macros, inline equations, and input line traps)
+ * and indirectly (for .so file inclusion).

  */
 static void
  */
 static void

-mparse_buf_r(struct mparse *curp, struct buf blk, int start)
+mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)

 {
        const struct tbl_span   *span;
        struct buf       ln;
 {
        const struct tbl_span   *span;
        struct buf       ln;

+       size_t           pos; /* byte number in the ln buffer */

        enum rofferr     rr;
        enum rofferr     rr;

-       int              i, of, rc;
-       int              pos; /* byte number in the ln buffer */
+       int              of, rc;

        int              lnn; /* line number in the real file */
        unsigned char    c;
 
        int              lnn; /* line number in the real file */
        unsigned char    c;
 

-       memset(&ln, 0, sizeof(struct buf));
+       memset(&ln, 0, sizeof(ln));

 
        lnn = curp->line;
        pos = 0;
 
 
        lnn = curp->line;
        pos = 0;
 

-       for (i = blk.offs; i < (int)blk.sz; ) {
+       while (i < blk.sz) {

                if (0 == pos && '\0' == blk.buf[i])
                        break;
 
                if (0 == pos && '\0' == blk.buf[i])
                        break;
 


@@ -333,13 +335,11 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
 
                        if (lnn < 3 &&
                            curp->filenc & MPARSE_UTF8 &&
 
                        if (lnn < 3 &&
                            curp->filenc & MPARSE_UTF8 &&

-                           curp->filenc & MPARSE_LATIN1) {
-                               blk.offs = i;
-                               curp->filenc = preconv_cue(&blk);
-                       }
+                           curp->filenc & MPARSE_LATIN1)
+                               curp->filenc = preconv_cue(&blk, i);

                }
 
                }
 

-               while (i < (int)blk.sz && (start || '\0' != blk.buf[i])) {
+               while (i < blk.sz && (start || blk.buf[i] != '\0')) {

 
                        /*
                         * When finding an unescaped newline character,
 
                        /*
                         * When finding an unescaped newline character,


@@ -347,7 +347,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
                         * Skip a preceding carriage return, if any.
                         */
 
                         * Skip a preceding carriage return, if any.
                         */
 

-                       if ('\r' == blk.buf[i] && i + 1 < (int)blk.sz &&
+                       if ('\r' == blk.buf[i] && i + 1 < blk.sz &&

                            '\n' == blk.buf[i + 1])
                                ++i;
                        if ('\n' == blk.buf[i]) {
                            '\n' == blk.buf[i + 1])
                                ++i;
                        if ('\n' == blk.buf[i]) {


@@ -361,7 +361,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
                         * case of 11 bytes: "\\[u10ffff]\0"
                         */
 
                         * case of 11 bytes: "\\[u10ffff]\0"
                         */
 

-                       if (pos + 11 > (int)ln.sz)
+                       if (pos + 11 > ln.sz)

                                resize_buf(&ln, 256);
 
                        /*
                                resize_buf(&ln, 256);
 
                        /*


@@ -370,13 +370,8 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
 
                        c = blk.buf[i];
                        if (c & 0x80) {
 
                        c = blk.buf[i];
                        if (c & 0x80) {

-                               blk.offs = i;
-                               ln.offs = pos;
-                               if (curp->filenc && preconv_encode(
-                                   &blk, &ln, &curp->filenc)) {
-                                       pos = ln.offs;
-                                       i = blk.offs;
-                               } else {
+                               if ( ! (curp->filenc && preconv_encode(
+                                   &blk, &i, &ln, &pos, &curp->filenc))) {

                                        mandoc_vmsg(MANDOCERR_BADCHAR,
                                            curp, curp->line, pos,
                                            "0x%x", c);
                                        mandoc_vmsg(MANDOCERR_BADCHAR,
                                            curp, curp->line, pos,
                                            "0x%x", c);


@@ -400,7 +395,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
 
                        /* Trailing backslash = a plain char. */
 
 
                        /* Trailing backslash = a plain char. */
 

-                       if ('\\' != blk.buf[i] || i + 1 == (int)blk.sz) {
+                       if (blk.buf[i] != '\\' || i + 1 == blk.sz) {

                                ln.buf[pos++] = blk.buf[i++];
                                continue;
                        }
                                ln.buf[pos++] = blk.buf[i++];
                                continue;
                        }


@@ -412,7 +407,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
                         * skip that one as well.
                         */
 
                         * skip that one as well.
                         */
 

-                       if ('\r' == blk.buf[i + 1] && i + 2 < (int)blk.sz &&
+                       if ('\r' == blk.buf[i + 1] && i + 2 < blk.sz &&

                            '\n' == blk.buf[i + 2])
                                ++i;
                        if ('\n' == blk.buf[i + 1]) {
                            '\n' == blk.buf[i + 2])
                                ++i;
                        if ('\n' == blk.buf[i + 1]) {


@@ -424,7 +419,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
                        if ('"' == blk.buf[i + 1] || '#' == blk.buf[i + 1]) {
                                i += 2;
                                /* Comment, skip to end of line */
                        if ('"' == blk.buf[i + 1] || '#' == blk.buf[i + 1]) {
                                i += 2;
                                /* Comment, skip to end of line */

-                               for (; i < (int)blk.sz; ++i) {
+                               for (; i < blk.sz; ++i) {

                                        if ('\n' == blk.buf[i]) {
                                                ++i;
                                                ++lnn;
                                        if ('\n' == blk.buf[i]) {
                                                ++i;
                                                ++lnn;


@@ -461,7 +456,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
                        ln.buf[pos++] = blk.buf[i++];
                }
 
                        ln.buf[pos++] = blk.buf[i++];
                }
 

-               if (pos >= (int)ln.sz)
+               if (pos >= ln.sz)

                        resize_buf(&ln, 256);
 
                ln.buf[pos] = '\0';
                        resize_buf(&ln, 256);
 
                ln.buf[pos] = '\0';


@@ -504,14 +499,14 @@ rerun:
                switch (rr) {
                case ROFF_REPARSE:
                        if (REPARSE_LIMIT >= ++curp->reparse_count)
                switch (rr) {
                case ROFF_REPARSE:
                        if (REPARSE_LIMIT >= ++curp->reparse_count)

-                               mparse_buf_r(curp, ln, 0);
+                               mparse_buf_r(curp, ln, of, 0);

                        else
                                mandoc_msg(MANDOCERR_ROFFLOOP, curp,
                                    curp->line, pos, NULL);
                        pos = 0;
                        continue;
                case ROFF_APPEND:
                        else
                                mandoc_msg(MANDOCERR_ROFFLOOP, curp,
                                    curp->line, pos, NULL);
                        pos = 0;
                        continue;
                case ROFF_APPEND:

-                       pos = (int)strlen(ln.buf);
+                       pos = strlen(ln.buf);

                        continue;
                case ROFF_RERUN:
                        goto rerun;
                        continue;
                case ROFF_RERUN:
                        goto rerun;


@@ -522,8 +517,8 @@ rerun:
                        assert(MANDOCLEVEL_FATAL <= curp->file_status);
                        break;
                case ROFF_SO:
                        assert(MANDOCLEVEL_FATAL <= curp->file_status);
                        break;
                case ROFF_SO:

-                       if (0 == (MPARSE_SO & curp->options) &&
-                           (i >= (int)blk.sz || '\0' == blk.buf[i])) {
+                       if ( ! (curp->options & MPARSE_SO) &&
+                           (i >= blk.sz || blk.buf[i] == '\0')) {

                                curp->sodest = mandoc_strdup(ln.buf + of);
                                free(ln.buf);
                                return;
                                curp->sodest = mandoc_strdup(ln.buf + of);
                                free(ln.buf);
                                return;


@@ -650,7 +645,6 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
                        return(0);
                }
                *with_mmap = 1;
                        return(0);
                }
                *with_mmap = 1;

-               fb->offs = 0;

                fb->sz = (size_t)st.st_size;
                fb->buf = mmap(NULL, fb->sz, PROT_READ, MAP_SHARED, fd, 0);
                if (fb->buf != MAP_FAILED)
                fb->sz = (size_t)st.st_size;
                fb->buf = mmap(NULL, fb->sz, PROT_READ, MAP_SHARED, fd, 0);
                if (fb->buf != MAP_FAILED)


@@ -682,7 +676,6 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
                ssz = read(fd, fb->buf + (int)off, fb->sz - off);
                if (ssz == 0) {
                        fb->sz = off;
                ssz = read(fd, fb->buf + (int)off, fb->sz - off);
                if (ssz == 0) {
                        fb->sz = off;

-                       fb->offs = 0;

                        return(1);
                }
                if (ssz == -1) {
                        return(1);
                }
                if (ssz == -1) {


@@ -739,6 +732,7 @@ mparse_parse_buffer(struct mparse *curp, struct buf blk, const char *file)
 {
        struct buf      *svprimary;
        const char      *svfile;
 {
        struct buf      *svprimary;
        const char      *svfile;

+       size_t           offset;

        static int       recursion_depth;
 
        if (64 < recursion_depth) {
        static int       recursion_depth;
 
        if (64 < recursion_depth) {


@@ -759,11 +753,12 @@ mparse_parse_buffer(struct mparse *curp, struct buf blk, const char *file)
            (unsigned char)blk.buf[0] == 0xef &&
            (unsigned char)blk.buf[1] == 0xbb &&
            (unsigned char)blk.buf[2] == 0xbf) {
            (unsigned char)blk.buf[0] == 0xef &&
            (unsigned char)blk.buf[1] == 0xbb &&
            (unsigned char)blk.buf[2] == 0xbf) {

-               blk.offs = 3;
+               offset = 3;

                curp->filenc &= ~MPARSE_LATIN1;
                curp->filenc &= ~MPARSE_LATIN1;

-       }
+       } else
+               offset = 0;

 
 

-       mparse_buf_r(curp, blk, 1);
+       mparse_buf_r(curp, blk, offset, 1);

 
        if (0 == --recursion_depth && MANDOCLEVEL_FATAL > curp->file_status)
                mparse_end(curp);
 
        if (0 == --recursion_depth && MANDOCLEVEL_FATAL > curp->file_status)
                mparse_end(curp);


@@ -780,7 +775,6 @@ mparse_readmem(struct mparse *curp, const void *buf, size_t len,
 
        blk.buf = UNCONST(buf);
        blk.sz = len;
 
        blk.buf = UNCONST(buf);
        blk.sz = len;

-       blk.offs = 0;

 
        mparse_parse_buffer(curp, blk, file);
        return(curp->file_status);
 
        mparse_parse_buffer(curp, blk, file);
        return(curp->file_status);