improve SQL style: avoid "SELECT *", be explicit in what columns we want;

[mandoc.git] / eqn.c

diff --git a/eqn.c b/eqn.c
index da085fa19b3991ca3965203e4047bd399e88b87d..12b00e5168eb6d12dd93dac4789d8350c77f576c 100644 (file)
--- a/eqn.c
+++ b/eqn.c
@@ -1,4 +1,4 @@
-/*     $Id: eqn.c,v 1.36 2011/07/23 18:41:18 kristaps Exp $ */
+/*     $Id: eqn.c,v 1.41 2014/04/20 19:40:13 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -26,6 +26,7 @@
 #include <time.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 #include "libroff.h"
 
@@ -137,12 +138,11 @@ struct    eqnsym {
        const char      *sym;
 };
 
-
 static enum eqn_rest    eqn_box(struct eqn_node *, struct eqn_box *);
-static struct eqn_box  *eqn_box_alloc(struct eqn_node *, 
+static struct eqn_box  *eqn_box_alloc(struct eqn_node *,
                                struct eqn_box *);
 static void             eqn_box_free(struct eqn_box *);
-static struct eqn_def  *eqn_def_find(struct eqn_node *, 
+static struct eqn_def  *eqn_def_find(struct eqn_node *,
                                const char *, size_t);
 static int              eqn_do_gfont(struct eqn_node *);
 static int              eqn_do_gsize(struct eqn_node *);
@@ -156,7 +156,7 @@ static      enum eqn_rest    eqn_list(struct eqn_node *, struct eqn_box *);
 static enum eqn_rest    eqn_matrix(struct eqn_node *, struct eqn_box *);
 static const char      *eqn_nexttok(struct eqn_node *, size_t *);
 static const char      *eqn_nextrawtok(struct eqn_node *, size_t *);
-static const char      *eqn_next(struct eqn_node *, 
+static const char      *eqn_next(struct eqn_node *,
                                char, size_t *, int);
 static void             eqn_rewind(struct eqn_node *);
 
@@ -205,9 +205,11 @@ static     const struct eqnstr eqnposs[EQNPOS__MAX] = {
 
 static const struct eqnstr eqnpiles[EQNPILE__MAX] = {
        { "", 0 }, /* EQNPILE_NONE */
+       { "pile", 4 }, /* EQNPILE_PILE */
        { "cpile", 5 }, /* EQNPILE_CPILE */
        { "rpile", 5 }, /* EQNPILE_RPILE */
        { "lpile", 5 }, /* EQNPILE_LPILE */
+       { "col", 3 }, /* EQNPILE_COL */
        { "ccol", 4 }, /* EQNPILE_CCOL */
        { "rcol", 4 }, /* EQNPILE_RCOL */
        { "lcol", 4 }, /* EQNPILE_LCOL */
@@ -275,9 +277,9 @@ static      const struct eqnsym eqnsyms[EQNSYM__MAX] = {
        { { ">=", 2 }, ">=" }, /* EQNSYM_moreequal */
 };
 
-/* ARGSUSED */
+
 enum rofferr
-eqn_read(struct eqn_node **epp, int ln, 
+eqn_read(struct eqn_node **epp, int ln,
                const char *p, int pos, int *offs)
 {
        size_t           sz;
@@ -292,12 +294,11 @@ eqn_read(struct eqn_node **epp, int ln,
         */
 
        if (0 == strncmp(p, ".EN", 3)) {
-               er = eqn_end(ep);
-               *epp = NULL;
+               er = eqn_end(epp);
                p += 3;
                while (' ' == *p || '\t' == *p)
                        p++;
-               if ('\0' == *p) 
+               if ('\0' == *p)
                        return(er);
                mandoc_msg(MANDOCERR_ARGSLOST, ep->parse, ln, pos, NULL);
                return(er);
@@ -331,7 +332,7 @@ eqn_alloc(const char *name, int pos, int line, struct mparse *parse)
 
        p = mandoc_calloc(1, sizeof(struct eqn_node));
 
-       if ('\0' != *name) {
+       if (name && '\0' != *name) {
                sz = strlen(name);
                assert(sz);
                do {
@@ -350,11 +351,15 @@ eqn_alloc(const char *name, int pos, int line, struct mparse *parse)
 }
 
 enum rofferr
-eqn_end(struct eqn_node *ep)
+eqn_end(struct eqn_node **epp)
 {
+       struct eqn_node *ep;
        struct eqn_box  *root;
        enum eqn_rest    c;
 
+       ep = *epp;
+       *epp = NULL;
+
        ep->eqn.root = mandoc_calloc(1, sizeof(struct eqn_box));
 
        root = ep->eqn.root;
@@ -408,11 +413,11 @@ eqn_matrix(struct eqn_node *ep, struct eqn_box *last)
 
        while (EQN_OK == (c = eqn_box(ep, bp)))
                switch (bp->last->pile) {
-               case (EQNPILE_LCOL):
+               case EQNPILE_LCOL:
                        /* FALLTHROUGH */
-               case (EQNPILE_CCOL):
+               case EQNPILE_CCOL:
                        /* FALLTHROUGH */
-               case (EQNPILE_RCOL):
+               case EQNPILE_RCOL:
                        continue;
                default:
                        EQN_MSG(MANDOCERR_EQNSYNT, ep);
@@ -507,9 +512,8 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last)
        for (i = 0; i < (int)EQN__MAX; i++) {
                if ( ! EQNSTREQ(&eqnparts[i].str, start, sz))
                        continue;
-               return((*eqnparts[i].fp)(ep) ? 
-                               EQN_OK : EQN_ERR);
-       } 
+               return((*eqnparts[i].fp)(ep) ? EQN_OK : EQN_ERR);
+       }
 
        if (STRNEQ(start, sz, "{", 1)) {
                if (EQN_DESCOPE != (c = eqn_eqn(ep, last))) {
@@ -524,7 +528,7 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last)
                        return(EQN_OK);
                EQN_MSG(MANDOCERR_EQNBADSCOPE, ep);
                return(EQN_ERR);
-       } 
+       }
 
        for (i = 0; i < (int)EQNPILE__MAX; i++) {
                if ( ! EQNSTREQ(&eqnpiles[i], start, sz))
@@ -570,7 +574,7 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last)
                if (NULL == last->last) {
                        EQN_MSG(MANDOCERR_EQNSYNT, ep);
                        return(EQN_ERR);
-               } 
+               }
                last->last->pos = (enum eqn_post)i;
                if (EQN_EOF == (c = eqn_box(ep, last))) {
                        EQN_MSG(MANDOCERR_EQNEOF, ep);
@@ -585,7 +589,7 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last)
                if (NULL == last->last) {
                        EQN_MSG(MANDOCERR_EQNSYNT, ep);
                        return(EQN_ERR);
-               } 
+               }
                last->last->mark = (enum eqn_markt)i;
                if (EQN_EOF == (c = eqn_box(ep, last))) {
                        EQN_MSG(MANDOCERR_EQNEOF, ep);
@@ -624,7 +628,7 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last)
        for (i = 0; i < (int)EQNSYM__MAX; i++)
                if (EQNSTREQ(&eqnsyms[i].str, start, sz)) {
                        sym[63] = '\0';
-                       snprintf(sym, 62, "\\[%s]", eqnsyms[i].sym);
+                       (void)snprintf(sym, 62, "\\[%s]", eqnsyms[i].sym);
                        bp->text = mandoc_strdup(sym);
                        return(EQN_OK);
                }
@@ -757,9 +761,9 @@ again:
                if (q)
                        ep->cur++;
                while (' ' == ep->data[(int)ep->cur] ||
-                               '\t' == ep->data[(int)ep->cur] ||
-                               '^' == ep->data[(int)ep->cur] ||
-                               '~' == ep->data[(int)ep->cur])
+                   '\t' == ep->data[(int)ep->cur] ||
+                   '^' == ep->data[(int)ep->cur] ||
+                   '~' == ep->data[(int)ep->cur])
                        ep->cur++;
        } else {
                if (q)
@@ -785,8 +789,8 @@ again:
                }
 
                diff = def->valsz - *sz;
-               memmove(start + *sz + diff, start + *sz, 
-                               (strlen(start) - *sz) + 1);
+               memmove(start + *sz + diff, start + *sz,
+                   (strlen(start) - *sz) + 1);
                memcpy(start, def->val, def->valsz);
                goto again;
        }
@@ -847,8 +851,8 @@ eqn_do_define(struct eqn_node *ep)
                return(0);
        }
 
-       /* 
-        * Search for a key that already exists. 
+       /*
+        * Search for a key that already exists.
         * Create a new key if none is found.
         */
 
@@ -860,15 +864,14 @@ eqn_do_define(struct eqn_node *ep)
 
                if (i == (int)ep->defsz) {
                        ep->defsz++;
-                       ep->defs = mandoc_realloc
-                               (ep->defs, ep->defsz * 
-                                sizeof(struct eqn_def));
+                       ep->defs = mandoc_realloc(ep->defs,
+                           ep->defsz * sizeof(struct eqn_def));
                        ep->defs[i].key = ep->defs[i].val = NULL;
                }
 
                ep->defs[i].keysz = sz;
-               ep->defs[i].key = mandoc_realloc
-                       (ep->defs[i].key, sz + 1);
+               ep->defs[i].key = mandoc_realloc(
+                   ep->defs[i].key, sz + 1);
 
                memcpy(ep->defs[i].key, start, sz);
                ep->defs[i].key[(int)sz] = '\0';
@@ -896,7 +899,7 @@ eqn_do_gfont(struct eqn_node *ep)
        if (NULL == eqn_nextrawtok(ep, NULL)) {
                EQN_MSG(MANDOCERR_EQNEOF, ep);
                return(0);
-       } 
+       }
        return(1);
 }
 
@@ -909,7 +912,7 @@ eqn_do_gsize(struct eqn_node *ep)
        if (NULL == (start = eqn_nextrawtok(ep, &sz))) {
                EQN_MSG(MANDOCERR_EQNEOF, ep);
                return(0);
-       } 
+       }
        ep->gsize = mandoc_strntoi(start, sz, 10);
        return(1);
 }
@@ -935,9 +938,9 @@ eqn_def_find(struct eqn_node *ep, const char *key, size_t sz)
 {
        int              i;
 
-       for (i = 0; i < (int)ep->defsz; i++) 
-               if (ep->defs[i].keysz && STRNEQ(ep->defs[i].key, 
-                                       ep->defs[i].keysz, key, sz))
+       for (i = 0; i < (int)ep->defsz; i++)
+               if (ep->defs[i].keysz && STRNEQ(ep->defs[i].key,
+                   ep->defs[i].keysz, key, sz))
                        return(&ep->defs[i]);
 
        return(NULL);