]> git.cameronkatri.com Git - mandoc.git/blobdiff - macro.c
More macros.
[mandoc.git] / macro.c
diff --git a/macro.c b/macro.c
index 12dd1cc4fba0574bb5765f38d35f966b0c38487a..317756681a1be6d70f1f8b8b4f37e7bc8e3da569 100644 (file)
--- a/macro.c
+++ b/macro.c
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.8 2008/12/28 21:25:09 kristaps Exp $ */
+/* $Id: macro.c,v 1.11 2008/12/29 18:08:44 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#ifdef __linux__
+#include <time.h>
+#endif
 
 #include "private.h"
 
+/* FIXME: maxlineargs should be per LINE, no per TOKEN. */
+
 #define        _CC(p)  ((const char **)p)
 
 static int       scope_rewind_exp(struct mdoc *, int, int, int);
 static int       scope_rewind_imp(struct mdoc *, int, int);
 static int       append_text(struct mdoc *, int, 
                        int, int, char *[]);
+static int       append_const(struct mdoc *, int, int, int, char *[]);
 static int       append_scoped(struct mdoc *, int, int, int, 
                        const char *[], int, const struct mdoc_arg *);
 static int       append_delims(struct mdoc *, int, int *, char *);
@@ -154,7 +160,9 @@ append_scoped(struct mdoc *mdoc, int tok, int pos,
        
        case (MDOC_Bd):
                assert(mdoc->last);
-               for (node = mdoc->last->parent; node; node = node->parent) {
+               node = mdoc->last->parent; 
+               /* LINTED */
+               for ( ; node; node = node->parent) {
                        if (node->type != MDOC_BLOCK)
                                continue;
                        if (node->data.block.tok != MDOC_Bd)
@@ -179,6 +187,72 @@ append_scoped(struct mdoc *mdoc, int tok, int pos,
 }
 
 
+static int
+append_const(struct mdoc *mdoc, int tok, 
+               int pos, int sz, char *args[])
+{
+
+       switch (tok) {
+        /* ======= ADD MORE MACRO CHECKS BELOW. ======= */
+       case (MDOC_At):
+               /* This needs special handling. */
+               if (0 == sz)
+                       break;
+               else if (sz > 2)
+                       return(mdoc_err(mdoc, tok, pos, ERR_ARGS_LE2));
+
+               if (ATT_DEFAULT != mdoc_atoatt(args[0])) {
+                       mdoc_elem_alloc(mdoc, pos, tok, 0, 
+                                       NULL, 1, _CC(&args[0]));
+               } else {
+                       mdoc_elem_alloc(mdoc, pos, tok, 
+                                       0, NULL, 0, NULL);
+                       if (mdoc_isdelim(args[0]))
+                               return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_NOPUNCT));
+                       mdoc_word_alloc(mdoc, pos, args[0]);
+               }
+
+               if (1 == sz)
+                       return(1);
+               if (mdoc_isdelim(args[1]))
+                       return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_NOPUNCT));
+               mdoc_word_alloc(mdoc, pos, args[1]);
+               return(1);
+
+       case (MDOC_Bx):
+               /* FALLTHROUGH */
+       case (MDOC_Bsx):
+               /* FALLTHROUGH */
+       case (MDOC_Os):
+               /* FALLTHROUGH */
+       case (MDOC_Fx):
+               /* FALLTHROUGH */
+       case (MDOC_Nx):
+               assert(sz <= 1);
+               break;
+
+       case (MDOC_Ux):
+               assert(0 == sz);
+               break;
+
+       case (MDOC_Bt):
+               /* FALLTHROUGH */
+       case (MDOC_Ud):
+               if (0 == sz)
+                       break;
+               return(mdoc_err(mdoc, tok, pos, ERR_ARGS_EQ0));
+
+        /* ======= ADD MORE MACRO CHECKS ABOVE. ======= */
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+
+       mdoc_elem_alloc(mdoc, pos, tok, 0, NULL, (size_t)sz, _CC(args));
+       return(1);
+}
+
+
 static int
 append_text(struct mdoc *mdoc, int tok, 
                int pos, int sz, char *args[])
@@ -516,7 +590,7 @@ again:
                return(0);
        
        if (0 == j) {
-               if (xstrcmp("$Mdocdate: December 28 2008 $", args[j])) {
+               if (xstrcmp("$Mdocdate: December 29 2008 $", args[j])) {
                        mdoc->meta.date = time(NULL);
                        goto again;
                } else if (xstrcmp("$Mdocdate:", args[j])) 
@@ -791,6 +865,11 @@ again:
 }
 
 
+/* 
+ * Partial-line scope is identical to line scope (macro_scoped_line())
+ * except that trailing punctuation is appended to the BLOCK, instead of
+ * contained within the HEAD.
+ */
 int
 macro_scoped_pline(MACRO_PROT_ARGS)
 {
@@ -803,6 +882,10 @@ macro_scoped_pline(MACRO_PROT_ARGS)
        /* Token pre-processing.  */
 
        switch (tok) {
+       case (MDOC_Ql):
+               if ( ! mdoc_warn(mdoc, tok, ppos, WARN_COMPAT_TROFF))
+                       return(0);
+               break;
        default:
                break;
        }
@@ -858,3 +941,138 @@ again:
        /* NOTREACHED */
 }
 
+
+/*
+ * A delimited-constant macro is similar to a general text macro: the
+ * macro is followed by a 0 or 1 arguments (possibly-unspecified) then
+ * terminating punctuation, other words, or another callable macro.
+ */
+int
+macro_constant_delimited(MACRO_PROT_ARGS)
+{
+       int               lastarg, flushed, c, maxargs;
+       char             *p, *pp;
+
+       if (SEC_PROLOGUE == mdoc->sec_lastn)
+               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+
+       /* Process line parameters. */
+
+       lastarg = ppos;
+       flushed = 0;
+
+       /* Token pre-processing. */
+
+       switch (tok) {
+       case (MDOC_Ux):
+               maxargs = 0;
+               break;
+       default:
+               maxargs = 1;
+               break;
+       }
+
+again:
+       lastarg = *pos;
+
+       switch (mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p)) {
+       case (ARGS_ERROR):
+               return(0);
+       case (ARGS_WORD):
+               break;
+       case (ARGS_PUNCT):
+               if ( ! flushed && ! append_const(mdoc, tok, ppos, 0, &p))
+                       return(0);
+               if (ppos > 1)
+                       return(1);
+               return(append_delims(mdoc, tok, pos, buf));
+       case (ARGS_EOLN):
+               if (flushed)
+                       return(1);
+               return(append_const(mdoc, tok, ppos, 0, &p));
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+
+       /* Accepts no arguments: flush out symbol and continue. */
+
+       if (0 == maxargs) {
+               pp = p;
+               if ( ! append_const(mdoc, tok, ppos, 0, &p))
+                       return(0);
+               p = pp;
+               flushed = 1;
+       }
+
+       if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
+               if ( ! flushed && ! append_const(mdoc, tok, ppos, 0, &p))
+                       return(0);
+               if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+                       return(0);
+               if (ppos > 1)
+                       return(1);
+               return(append_delims(mdoc, tok, pos, buf));
+       }
+
+       /* 
+        * We only accept one argument; subsequent tokens are considered
+        * as literal words (until a macro).
+        */
+
+       if ( ! flushed && ! mdoc_isdelim(p)) {
+              if ( ! append_const(mdoc, tok, ppos, 1, &p))
+                       return(0);
+               flushed = 1;
+               goto again;
+       } else if ( ! flushed) {
+               pp = p;
+               if ( ! append_const(mdoc, tok, ppos, 0, &p))
+                       return(0);
+               p = pp;
+               flushed = 1;
+       }
+
+       mdoc_word_alloc(mdoc, lastarg, p);
+       goto again;
+       /* NOTREACHED */
+}
+
+
+int
+macro_constant(MACRO_PROT_ARGS)
+{
+       int               lastarg, j;
+       char             *args[MDOC_LINEARG_MAX];
+
+       if (SEC_PROLOGUE == mdoc->sec_lastn)
+               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+
+       j = 0;
+
+again:
+       if (j == MDOC_LINEARG_MAX)
+               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+
+       lastarg = *pos;
+
+       switch (mdoc_args(mdoc, tok, pos, buf, 0, &args[j])) {
+       case (ARGS_ERROR):
+               return(0);
+       case (ARGS_WORD):
+               break;
+       case (ARGS_EOLN):
+               return(append_const(mdoc, tok, ppos, j, args));
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+
+       if (MDOC_MAX != mdoc_find(mdoc, args[j])) 
+               if ( ! mdoc_warn(mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
+                       return(0);
+
+       j++;
+       goto again;
+       /* NOTREACHED */
+}