Add support for 1/2, 1/4, and 3/4 (needed by eqn).

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index 1da8f164c510d51c40e4fe0392869e6ca4b5f4a9..ac0e9f50d2f549ab8cbb84fae8f5417a5f5dce9b 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.9 2011/04/03 10:05:37 kristaps Exp $ */
+/*     $Id: read.c,v 1.21 2011/07/21 23:30:39 kristaps Exp $ */

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


@@ -15,8 +15,14 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#include <sys/stat.h>
-#include <sys/mman.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_MMAP
+# include <sys/stat.h>
+# include <sys/mman.h>
+#endif

 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>


@@ -53,7 +59,6 @@ struct        mparse {
        struct man       *man; /* man parser */
        struct mdoc      *mdoc; /* mdoc parser */
        struct roff      *roff; /* roff parser (!NULL) */
        struct man       *man; /* man parser */
        struct mdoc      *mdoc; /* mdoc parser */
        struct roff      *roff; /* roff parser (!NULL) */

-       struct regset     regs; /* roff registers */

        int               reparse_count; /* finite interp. stack */
        mandocmsg         mmsg; /* warning/error message handler */
        void             *arg; /* argument to mmsg */
        int               reparse_count; /* finite interp. stack */
        mandocmsg         mmsg; /* warning/error message handler */
        void             *arg; /* argument to mmsg */


@@ -138,11 +143,23 @@ static    const char * const      mandocerrs[MANDOCERR_MAX] = {
        "tab in non-literal context",
        "end of line whitespace",
        "bad comment style",
        "tab in non-literal context",
        "end of line whitespace",
        "bad comment style",

-       "unknown escape sequence",
+       "bad escape sequence",

        "unterminated quoted string",
        "unterminated quoted string",

+
+       /* related to equations */
+       "unexpected literal in equation",

        
        "generic error",
 
        
        "generic error",
 

+       /* related to equations */
+       "bad equation macro syntax",
+       "too many nested equation defines",
+       "unexpected equation scope closure",
+       "equation scope open on exit",
+       "overlapping equation scopes",
+       "unexpected end of equation",
+       "equation syntax error",
+

        /* related to tables */
        "bad table syntax",
        "bad table option",
        /* related to tables */
        "bad table syntax",
        "bad table option",


@@ -231,13 +248,13 @@ pset(const char *buf, int pos, struct mparse *curp)
        switch (curp->inttype) {
        case (MPARSE_MDOC):
                if (NULL == curp->pmdoc) 
        switch (curp->inttype) {
        case (MPARSE_MDOC):
                if (NULL == curp->pmdoc) 

-                       curp->pmdoc = mdoc_alloc(&curp->regs, curp);
+                       curp->pmdoc = mdoc_alloc(curp->roff, curp);

                assert(curp->pmdoc);
                curp->mdoc = curp->pmdoc;
                return;
        case (MPARSE_MAN):
                if (NULL == curp->pman) 
                assert(curp->pmdoc);
                curp->mdoc = curp->pmdoc;
                return;
        case (MPARSE_MAN):
                if (NULL == curp->pman) 

-                       curp->pman = man_alloc(&curp->regs, curp);
+                       curp->pman = man_alloc(curp->roff, curp);

                assert(curp->pman);
                curp->man = curp->pman;
                return;
                assert(curp->pman);
                curp->man = curp->pman;
                return;


@@ -247,14 +264,14 @@ pset(const char *buf, int pos, struct mparse *curp)
 
        if (pos >= 3 && 0 == memcmp(buf, ".Dd", 3))  {
                if (NULL == curp->pmdoc) 
 
        if (pos >= 3 && 0 == memcmp(buf, ".Dd", 3))  {
                if (NULL == curp->pmdoc) 

-                       curp->pmdoc = mdoc_alloc(&curp->regs, curp);
+                       curp->pmdoc = mdoc_alloc(curp->roff, curp);

                assert(curp->pmdoc);
                curp->mdoc = curp->pmdoc;
                return;
        } 
 
        if (NULL == curp->pman) 
                assert(curp->pmdoc);
                curp->mdoc = curp->pmdoc;
                return;
        } 
 
        if (NULL == curp->pman) 

-               curp->pman = man_alloc(&curp->regs, curp);
+               curp->pman = man_alloc(curp->roff, curp);

        assert(curp->pman);
        curp->man = curp->pman;
 }
        assert(curp->pman);
        curp->man = curp->pman;
 }


@@ -350,7 +367,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
                                continue;
                        }
 
                                continue;
                        }
 

-                       if ('"' == blk.buf[i + 1]) {
+                       if ('"' == blk.buf[i + 1] || '#' == blk.buf[i + 1]) {

                                i += 2;
                                /* Comment, skip to end of line */
                                for (; i < (int)blk.sz; ++i) {
                                i += 2;
                                /* Comment, skip to end of line */
                                for (; i < (int)blk.sz; ++i) {


@@ -441,7 +458,7 @@ rerun:
 
                /*
                 * If input parsers have not been allocated, do so now.
 
                /*
                 * If input parsers have not been allocated, do so now.

-                * We keep these instanced betwen parsers, but set them
+                * We keep these instanced between parsers, but set them

                 * locally per parse routine since we can use different
                 * parsers with each one.
                 */
                 * locally per parse routine since we can use different
                 * parsers with each one.
                 */


@@ -525,19 +542,22 @@ pdesc(struct mparse *curp, const char *file, int fd)
 
        mparse_buf_r(curp, blk, 1);
 
 
        mparse_buf_r(curp, blk, 1);
 

+#ifdef HAVE_MMAP

        if (with_mmap)
                munmap(blk.buf, blk.sz);
        else
        if (with_mmap)
                munmap(blk.buf, blk.sz);
        else

+#endif

                free(blk.buf);
 }
 
 static int
 read_whole_file(const char *file, int fd, struct buf *fb, int *with_mmap)
 {
                free(blk.buf);
 }
 
 static int
 read_whole_file(const char *file, int fd, struct buf *fb, int *with_mmap)
 {

-       struct stat      st;

        size_t           off;
        ssize_t          ssz;
 
        size_t           off;
        ssize_t          ssz;
 

+#ifdef HAVE_MMAP
+       struct stat      st;

        if (-1 == fstat(fd, &st)) {
                perror(file);
                return(0);
        if (-1 == fstat(fd, &st)) {
                perror(file);
                return(0);


@@ -562,6 +582,7 @@ read_whole_file(const char *file, int fd, struct buf *fb, int *with_mmap)
                if (fb->buf != MAP_FAILED)
                        return(1);
        }
                if (fb->buf != MAP_FAILED)
                        return(1);
        }

+#endif

 
        /*
         * If this isn't a regular file (like, say, stdin), then we must
 
        /*
         * If this isn't a regular file (like, say, stdin), then we must


@@ -662,6 +683,8 @@ mparse_alloc(enum mparset inttype, enum mandoclevel wlevel, mandocmsg mmsg, void
 {
        struct mparse   *curp;
 
 {
        struct mparse   *curp;
 

+       assert(wlevel <= MANDOCLEVEL_FATAL);
+

        curp = mandoc_calloc(1, sizeof(struct mparse));
 
        curp->wlevel = wlevel;
        curp = mandoc_calloc(1, sizeof(struct mparse));
 
        curp->wlevel = wlevel;


@@ -669,7 +692,7 @@ mparse_alloc(enum mparset inttype, enum mandoclevel wlevel, mandocmsg mmsg, void
        curp->arg = arg;
        curp->inttype = inttype;
 
        curp->arg = arg;
        curp->inttype = inttype;
 

-       curp->roff = roff_alloc(&curp->regs, curp);
+       curp->roff = roff_alloc(curp);

        return(curp);
 }
 
        return(curp);
 }
 


@@ -677,8 +700,6 @@ void
 mparse_reset(struct mparse *curp)
 {
 
 mparse_reset(struct mparse *curp)
 {
 

-       memset(&curp->regs, 0, sizeof(struct regset));
-

        roff_reset(curp->roff);
 
        if (curp->mdoc)
        roff_reset(curp->roff);
 
        if (curp->mdoc)