*** empty log message ***

diff --git a/Makefile b/Makefile
index 0233ecc3c7e55f80170883a0bfe28094e6200eb1..e95a785a1d7dc8897540e19e55b3d8d634482f2f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,15 @@ VERSION       = 1.1.0
 
 CFLAGS += -W -Wall -Wno-unused-parameter -g 
 
-LNS    = macro.ln mdoc.ln mdocml.ln hash.ln strings.ln xstd.ln argv.ln validate.ln prologue.ln action.ln
+LNS    = macro.ln mdoc.ln mdocml.ln hash.ln strings.ln xstd.ln argv.ln validate.ln action.ln
 
 LLNS   = llib-llibmdoc.ln llib-lmdocml.ln
 
 LIBS   = libmdoc.a
 
-OBJS   = macro.o mdoc.o mdocml.o hash.o strings.o xstd.o argv.o validate.o prologue.o action.o
+OBJS   = macro.o mdoc.o mdocml.o hash.o strings.o xstd.o argv.o validate.o action.o
 
-SRCS   = macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c validate.c prologue.c action.c
+SRCS   = macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c validate.c action.c
 
 HEADS  = mdoc.h
 
@@ -28,8 +28,8 @@ mdocml:       mdocml.o libmdoc.a
 clean:
        rm -f $(CLEAN)
 
-llib-llibmdoc.ln: macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln validate.ln prologue.ln action.ln
-       $(LINT) $(LINTFLAGS) -Clibmdoc mdoc.ln macro.ln hash.ln strings.ln xstd.ln argv.ln validate.ln prologue.ln action.ln
+llib-llibmdoc.ln: macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln validate.ln action.ln
+       $(LINT) $(LINTFLAGS) -Clibmdoc mdoc.ln macro.ln hash.ln strings.ln xstd.ln argv.ln validate.ln action.ln
 
 llib-lmdocml.ln: mdocml.ln llib-llibmdoc.ln
        $(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln llib-llibmdoc.ln
@@ -66,16 +66,12 @@ validate.ln: validate.c private.h
 
 validate.o: validate.c private.h
 
-prologue.ln: prologue.c private.h
-
-prologue.o: prologue.c private.h
-
 action.ln: action.c private.h
 
 action.o: action.c private.h
 
 private.h: mdoc.h
 
-libmdoc.a: macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o prologue.o action.o
-       $(AR) rs $@ macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o prologue.o action.o
+libmdoc.a: macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o action.o
+       $(AR) rs $@ macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o action.o
 

diff --git a/action.c b/action.c
index 81d38ba179c37a836a2fa3b3b7c23b659bd1362a..92bd23d1d79c26d2cbacb2594df05e2dc35d3a62 100644 (file)
--- a/action.c
+++ b/action.c
@@ -1,4 +1,4 @@
-/* $Id: action.c,v 1.3 2009/01/07 15:53:00 kristaps Exp $ */
+/* $Id: action.c,v 1.4 2009/01/08 15:05:50 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -21,129 +21,134 @@
 
 #include "private.h"
 
-typedef int    (*a_act)(struct mdoc *, int, int);
+typedef int    (*a_pre)(struct mdoc *, struct mdoc_node *);
+typedef int    (*a_post)(struct mdoc *);
 
 
 struct actions {
-       a_act    action;
+       a_pre    pre;
+       a_post   post;
 };
 
 
-static int      action_sh(struct mdoc *, int, int);
+static int      post_sh(struct mdoc *);
+static int      post_os(struct mdoc *);
+static int      post_dt(struct mdoc *);
+static int      post_dd(struct mdoc *);
 
 
 const  struct actions mdoc_actions[MDOC_MAX] = {
-       { NULL }, /* \" */
-       { NULL }, /* Dd */ 
-       { NULL }, /* Dt */ 
-       { NULL }, /* Os */ 
-       { action_sh }, /* Sh */ 
-       { NULL }, /* Ss */ 
-       { NULL }, /* Pp */ 
-       { NULL }, /* D1 */
-       { NULL }, /* Dl */
-       { NULL }, /* Bd */ 
-       { NULL }, /* Ed */
-       { NULL }, /* Bl */ 
-       { NULL }, /* El */
-       { NULL }, /* It */
-       { NULL }, /* Ad */ 
-       { NULL }, /* An */
-       { NULL }, /* Ar */
-       { NULL }, /* Cd */
-       { NULL }, /* Cm */
-       { NULL }, /* Dv */ 
-       { NULL }, /* Er */ 
-       { NULL }, /* Ev */ 
-       { NULL }, /* Ex */
-       { NULL }, /* Fa */ 
-       { NULL }, /* Fd */ 
-       { NULL }, /* Fl */
-       { NULL }, /* Fn */ 
-       { NULL }, /* Ft */ 
-       { NULL }, /* Ic */ 
-       { NULL }, /* In */ 
-       { NULL }, /* Li */
-       { NULL }, /* Nd */ 
-       { NULL }, /* Nm */ 
-       { NULL }, /* Op */
-       { NULL }, /* Ot */
-       { NULL }, /* Pa */
-       { NULL }, /* Rv */
-       { NULL }, /* St */
-       { NULL }, /* Va */
-       { NULL }, /* Vt */ 
-       { NULL }, /* Xr */
-       { NULL }, /* %A */
-       { NULL }, /* %B */
-       { NULL }, /* %D */
-       { NULL }, /* %I */
-       { NULL }, /* %J */
-       { NULL }, /* %N */
-       { NULL }, /* %O */
-       { NULL }, /* %P */
-       { NULL }, /* %R */
-       { NULL }, /* %T */
-       { NULL }, /* %V */
-       { NULL }, /* Ac */
-       { NULL }, /* Ao */
-       { NULL }, /* Aq */
-       { NULL }, /* At */ 
-       { NULL }, /* Bc */
-       { NULL }, /* Bf */ 
-       { NULL }, /* Bo */
-       { NULL }, /* Bq */
-       { NULL }, /* Bsx */
-       { NULL }, /* Bx */
-       { NULL }, /* Db */
-       { NULL }, /* Dc */
-       { NULL }, /* Do */
-       { NULL }, /* Dq */
-       { NULL }, /* Ec */
-       { NULL }, /* Ef */
-       { NULL }, /* Em */ 
-       { NULL }, /* Eo */
-       { NULL }, /* Fx */
-       { NULL }, /* Ms */
-       { NULL }, /* No */
-       { NULL }, /* Ns */
-       { NULL }, /* Nx */
-       { NULL }, /* Ox */
-       { NULL }, /* Pc */
-       { NULL }, /* Pf */
-       { NULL }, /* Po */
-       { NULL }, /* Pq */
-       { NULL }, /* Qc */
-       { NULL }, /* Ql */
-       { NULL }, /* Qo */
-       { NULL }, /* Qq */
-       { NULL }, /* Re */
-       { NULL }, /* Rs */
-       { NULL }, /* Sc */
-       { NULL }, /* So */
-       { NULL }, /* Sq */
-       { NULL }, /* Sm */
-       { NULL }, /* Sx */
-       { NULL }, /* Sy */
-       { NULL }, /* Tn */
-       { NULL }, /* Ux */
-       { NULL }, /* Xc */
-       { NULL }, /* Xo */
-       { NULL }, /* Fo */ 
-       { NULL }, /* Fc */ 
-       { NULL }, /* Oo */
-       { NULL }, /* Oc */
-       { NULL }, /* Bk */
-       { NULL }, /* Ek */
-       { NULL }, /* Bt */
-       { NULL }, /* Hf */
-       { NULL }, /* Fr */
-       { NULL }, /* Ud */
+       { NULL, NULL }, /* \" */
+       { NULL, post_dd }, /* Dd */ 
+       { NULL, post_dt }, /* Dt */ 
+       { NULL, post_os }, /* Os */ 
+       { NULL, post_sh }, /* Sh */ 
+       { NULL, NULL }, /* Ss */ 
+       { NULL, NULL }, /* Pp */ 
+       { NULL, NULL }, /* D1 */
+       { NULL, NULL }, /* Dl */
+       { NULL, NULL }, /* Bd */ 
+       { NULL, NULL }, /* Ed */
+       { NULL, NULL }, /* Bl */ 
+       { NULL, NULL }, /* El */
+       { NULL, NULL }, /* It */
+       { NULL, NULL }, /* Ad */ 
+       { NULL, NULL }, /* An */
+       { NULL, NULL }, /* Ar */
+       { NULL, NULL }, /* Cd */
+       { NULL, NULL }, /* Cm */
+       { NULL, NULL }, /* Dv */ 
+       { NULL, NULL }, /* Er */ 
+       { NULL, NULL }, /* Ev */ 
+       { NULL, NULL }, /* Ex */
+       { NULL, NULL }, /* Fa */ 
+       { NULL, NULL }, /* Fd */ 
+       { NULL, NULL }, /* Fl */
+       { NULL, NULL }, /* Fn */ 
+       { NULL, NULL }, /* Ft */ 
+       { NULL, NULL }, /* Ic */ 
+       { NULL, NULL }, /* In */ 
+       { NULL, NULL }, /* Li */
+       { NULL, NULL }, /* Nd */ 
+       { NULL, NULL }, /* Nm */ 
+       { NULL, NULL }, /* Op */
+       { NULL, NULL }, /* Ot */
+       { NULL, NULL }, /* Pa */
+       { NULL, NULL }, /* Rv */
+       { NULL, NULL }, /* St */
+       { NULL, NULL }, /* Va */
+       { NULL, NULL }, /* Vt */ 
+       { NULL, NULL }, /* Xr */
+       { NULL, NULL }, /* %A */
+       { NULL, NULL }, /* %B */
+       { NULL, NULL }, /* %D */
+       { NULL, NULL }, /* %I */
+       { NULL, NULL }, /* %J */
+       { NULL, NULL }, /* %N */
+       { NULL, NULL }, /* %O */
+       { NULL, NULL }, /* %P */
+       { NULL, NULL }, /* %R */
+       { NULL, NULL }, /* %T */
+       { NULL, NULL }, /* %V */
+       { NULL, NULL }, /* Ac */
+       { NULL, NULL }, /* Ao */
+       { NULL, NULL }, /* Aq */
+       { NULL, NULL }, /* At */ 
+       { NULL, NULL }, /* Bc */
+       { NULL, NULL }, /* Bf */ 
+       { NULL, NULL }, /* Bo */
+       { NULL, NULL }, /* Bq */
+       { NULL, NULL }, /* Bsx */
+       { NULL, NULL }, /* Bx */
+       { NULL, NULL }, /* Db */
+       { NULL, NULL }, /* Dc */
+       { NULL, NULL }, /* Do */
+       { NULL, NULL }, /* Dq */
+       { NULL, NULL }, /* Ec */
+       { NULL, NULL }, /* Ef */
+       { NULL, NULL }, /* Em */ 
+       { NULL, NULL }, /* Eo */
+       { NULL, NULL }, /* Fx */
+       { NULL, NULL }, /* Ms */
+       { NULL, NULL }, /* No */
+       { NULL, NULL }, /* Ns */
+       { NULL, NULL }, /* Nx */
+       { NULL, NULL }, /* Ox */
+       { NULL, NULL }, /* Pc */
+       { NULL, NULL }, /* Pf */
+       { NULL, NULL }, /* Po */
+       { NULL, NULL }, /* Pq */
+       { NULL, NULL }, /* Qc */
+       { NULL, NULL }, /* Ql */
+       { NULL, NULL }, /* Qo */
+       { NULL, NULL }, /* Qq */
+       { NULL, NULL }, /* Re */
+       { NULL, NULL }, /* Rs */
+       { NULL, NULL }, /* Sc */
+       { NULL, NULL }, /* So */
+       { NULL, NULL }, /* Sq */
+       { NULL, NULL }, /* Sm */
+       { NULL, NULL }, /* Sx */
+       { NULL, NULL }, /* Sy */
+       { NULL, NULL }, /* Tn */
+       { NULL, NULL }, /* Ux */
+       { NULL, NULL }, /* Xc */
+       { NULL, NULL }, /* Xo */
+       { NULL, NULL }, /* Fo */ 
+       { NULL, NULL }, /* Fc */ 
+       { NULL, NULL }, /* Oo */
+       { NULL, NULL }, /* Oc */
+       { NULL, NULL }, /* Bk */
+       { NULL, NULL }, /* Ek */
+       { NULL, NULL }, /* Bt */
+       { NULL, NULL }, /* Hf */
+       { NULL, NULL }, /* Fr */
+       { NULL, NULL }, /* Ud */
 };
 
 
 static int
-action_sh(struct mdoc *mdoc, int tok, int pos)
+post_sh(struct mdoc *mdoc)
 {
        enum mdoc_sec     sec;
        int               i;
@@ -152,6 +157,8 @@ action_sh(struct mdoc *mdoc, int tok, int pos)
 
        if (MDOC_HEAD != mdoc->last->type)
                return(1);
+       
+       assert(MDOC_Sh == mdoc->last->data.head.tok);
 
        n = mdoc->last->child;
        assert(n);
@@ -172,8 +179,192 @@ action_sh(struct mdoc *mdoc, int tok, int pos)
 }
 
 
+static int
+post_dt(struct mdoc *mdoc)
+{
+#if 0
+       int               lastarg, j;
+       char             *args[MDOC_LINEARG_MAX];
+
+       if (SEC_PROLOGUE != mdoc->sec_lastn)
+               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE));
+       if (0 == mdoc->meta.date)
+               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO));
+       if (mdoc->meta.title[0])
+               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP));
+
+       j = -1;
+       lastarg = ppos;
+
+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_EOLN):
+               if (mdoc->meta.title)
+                       return(1);
+               if ( ! mdoc_warn(mdoc, tok, ppos, WARN_ARGS_GE1))
+                       return(0);
+               (void)xstrlcpy(mdoc->meta.title, 
+                               "UNTITLED", META_TITLE_SZ);
+               return(1);
+       case (ARGS_ERROR):
+               return(0);
+       default:
+               break;
+       }
+
+       if (0 == j) {
+               if (xstrlcpy(mdoc->meta.title, args[0], META_TITLE_SZ))
+                       goto again;
+               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
+
+       } else if (1 == j) {
+               mdoc->meta.msec = mdoc_atomsec(args[1]);
+               if (MSEC_DEFAULT != mdoc->meta.msec)
+                       goto again;
+               return(mdoc_err(mdoc, tok, -1, ERR_SYNTAX_ARGFORM));
+
+       } else if (2 == j) {
+               mdoc->meta.vol = mdoc_atovol(args[2]);
+               if (VOL_DEFAULT != mdoc->meta.vol)
+                       goto again;
+               mdoc->meta.arch = mdoc_atoarch(args[2]);
+               if (ARCH_DEFAULT != mdoc->meta.arch)
+                       goto again;
+               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
+       }
+
+       return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+#endif
+       return(1);
+}
+
+
+static int
+post_os(struct mdoc *mdoc)
+{
+#if 0
+       int               lastarg, j;
+       char             *args[MDOC_LINEARG_MAX];
+
+       /* FIXME: if we use `Os' again... ? */
+
+       if (SEC_PROLOGUE != mdoc->sec_lastn)
+               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE));
+       if (0 == mdoc->meta.title[0])
+               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO));
+       if (mdoc->meta.os[0])
+               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP));
+
+       j = -1;
+       lastarg = ppos;
+
+again:
+       if (j == MDOC_LINEARG_MAX)
+               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+
+       lastarg = *pos;
+
+       switch (mdoc_args(mdoc, tok, pos, buf, 
+                               ARGS_QUOTED, &args[++j])) {
+       case (ARGS_EOLN):
+               mdoc->sec_lastn = mdoc->sec_last = SEC_BODY;
+               return(1);
+       case (ARGS_ERROR):
+               return(0);
+       default:
+               break;
+       }
+       
+       if ( ! xstrlcat(mdoc->meta.os, args[j], sizeof(mdoc->meta.os)))
+               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
+       if ( ! xstrlcat(mdoc->meta.os, " ", sizeof(mdoc->meta.os)))
+               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
+
+       goto again;
+       /* NOTREACHED */
+#endif
+       return(1);
+}
+
+
+static int
+post_dd(struct mdoc *mdoc)
+{
+#if 0
+       int               lastarg, j;
+       char             *args[MDOC_LINEARG_MAX], date[64];
+
+       if (SEC_PROLOGUE != mdoc->sec_lastn)
+               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE));
+       if (mdoc->meta.title[0])
+               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO));
+       if (mdoc->meta.date)
+               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP));
+
+       j = -1;
+       date[0] = 0;
+       lastarg = ppos;
+
+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_EOLN):
+               if (mdoc->meta.date)
+                       return(1);
+               mdoc->meta.date = mdoc_atotime(date);
+               if (mdoc->meta.date)
+                       return(1);
+               return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGFORM));
+       case (ARGS_ERROR):
+               return(0);
+       default:
+               break;
+       }
+       
+       if (MDOC_MAX != mdoc_find(mdoc, args[j]) && ! mdoc_warn
+                       (mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
+               return(0);
+       
+       if (0 == j) {
+               if (xstrcmp("$Mdocdate: January 8 2009 $", args[j])) {
+                       mdoc->meta.date = time(NULL);
+                       goto again;
+               } else if (xstrcmp("$Mdocdate:", args[j])) 
+                       goto again;
+       } else if (4 == j)
+               if ( ! xstrcmp("$", args[j]))
+                       goto again;
+
+       if ( ! xstrlcat(date, args[j], sizeof(date)))
+               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
+       if ( ! xstrlcat(date, " ", sizeof(date)))
+               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
+
+       goto again;
+       /* NOTREACHED */
+#endif
+       return(1);
+}
+
+
 int
-mdoc_action(struct mdoc *mdoc, int pos)
+mdoc_action_pre(struct mdoc *mdoc, struct mdoc_node *node)
+{
+
+       return(1);
+}
+
+
+int
+mdoc_action_post(struct mdoc *mdoc)
 {
        int              t;
 
@@ -194,9 +385,8 @@ mdoc_action(struct mdoc *mdoc, int pos)
                return(1);
        }
 
-       if (NULL == mdoc_actions[t].action)
+       if (NULL == mdoc_actions[t].post)
                return(1);
        /* TODO: MDOC_Nm... ? */
-       return((*mdoc_actions[t].action)(mdoc, t, pos));
+       return((*mdoc_actions[t].post)(mdoc));
 }
-

diff --git a/mdoc.c b/mdoc.c
index 5bf5929a21cc467706abb5a17b6300dfae91671f..9052cbed16e4418045224cc1eb836b0787da3a0b 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc.c,v 1.23 2009/01/08 14:55:59 kristaps Exp $ */
+/* $Id: mdoc.c,v 1.24 2009/01/08 15:05:50 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -85,9 +85,9 @@ const char *const __mdoc_argnames[MDOC_ARG_MAX] = {
 
 const  struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { NULL, 0 }, /* \" */
-       { macro_prologue, MDOC_PROLOGUE }, /* Dd */
-       { macro_prologue, MDOC_PROLOGUE }, /* Dt */
-       { macro_prologue, MDOC_PROLOGUE }, /* Os */
+       { macro_constant, MDOC_PROLOGUE }, /* Dd */
+       { macro_constant, MDOC_PROLOGUE }, /* Dt */
+       { macro_constant, MDOC_PROLOGUE }, /* Os */
        { macro_scoped, 0 }, /* Sh */
        { macro_scoped, 0 }, /* Ss */ 
        { macro_text, 0 }, /* Pp */ 

diff --git a/mdocml.3 b/mdocml.3
new file mode 100644 (file)
index 0000000..2a34ea6
--- /dev/null
+++ b/mdocml.3
@@ -0,0 +1 @@
+TODO.

diff --git a/prologue.c b/prologue.c
deleted file mode 100644 (file)
index 8fd053c..0000000
--- a/prologue.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* $Id: prologue.c,v 1.5 2009/01/07 15:57:14 kristaps Exp $ */
-/*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-#include <assert.h>
-#include <stdlib.h>
-#ifdef __linux__
-#include <time.h>
-#endif
-
-#include "private.h"
-
-/* FIXME: deprecate into actions.c! */
-
-static int              prologue_dt(MACRO_PROT_ARGS);
-static int              prologue_dd(MACRO_PROT_ARGS);
-static int              prologue_os(MACRO_PROT_ARGS);
-
-static int
-prologue_dt(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_NPROLOGUE));
-       if (0 == mdoc->meta.date)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO));
-       if (mdoc->meta.title[0])
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP));
-
-       j = -1;
-       lastarg = ppos;
-
-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_EOLN):
-               if (mdoc->meta.title)
-                       return(1);
-               if ( ! mdoc_warn(mdoc, tok, ppos, WARN_ARGS_GE1))
-                       return(0);
-               (void)xstrlcpy(mdoc->meta.title, 
-                               "UNTITLED", META_TITLE_SZ);
-               return(1);
-       case (ARGS_ERROR):
-               return(0);
-       default:
-               break;
-       }
-
-       if (0 == j) {
-               if (xstrlcpy(mdoc->meta.title, args[0], META_TITLE_SZ))
-                       goto again;
-               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
-
-       } else if (1 == j) {
-               mdoc->meta.msec = mdoc_atomsec(args[1]);
-               if (MSEC_DEFAULT != mdoc->meta.msec)
-                       goto again;
-               return(mdoc_err(mdoc, tok, -1, ERR_SYNTAX_ARGFORM));
-
-       } else if (2 == j) {
-               mdoc->meta.vol = mdoc_atovol(args[2]);
-               if (VOL_DEFAULT != mdoc->meta.vol)
-                       goto again;
-               mdoc->meta.arch = mdoc_atoarch(args[2]);
-               if (ARCH_DEFAULT != mdoc->meta.arch)
-                       goto again;
-               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
-       }
-
-       return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
-}
-
-
-static int
-prologue_os(MACRO_PROT_ARGS)
-{
-       int               lastarg, j;
-       char             *args[MDOC_LINEARG_MAX];
-
-       /* FIXME: if we use `Os' again... ? */
-
-       if (SEC_PROLOGUE != mdoc->sec_lastn)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE));
-       if (0 == mdoc->meta.title[0])
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO));
-       if (mdoc->meta.os[0])
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP));
-
-       j = -1;
-       lastarg = ppos;
-
-again:
-       if (j == MDOC_LINEARG_MAX)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
-
-       lastarg = *pos;
-
-       switch (mdoc_args(mdoc, tok, pos, buf, 
-                               ARGS_QUOTED, &args[++j])) {
-       case (ARGS_EOLN):
-               mdoc->sec_lastn = mdoc->sec_last = SEC_BODY;
-               return(1);
-       case (ARGS_ERROR):
-               return(0);
-       default:
-               break;
-       }
-       
-       if ( ! xstrlcat(mdoc->meta.os, args[j], sizeof(mdoc->meta.os)))
-               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
-       if ( ! xstrlcat(mdoc->meta.os, " ", sizeof(mdoc->meta.os)))
-               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
-
-       goto again;
-       /* NOTREACHED */
-}
-
-
-static int
-prologue_dd(MACRO_PROT_ARGS)
-{
-       int               lastarg, j;
-       char             *args[MDOC_LINEARG_MAX], date[64];
-
-       if (SEC_PROLOGUE != mdoc->sec_lastn)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE));
-       if (mdoc->meta.title[0])
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO));
-       if (mdoc->meta.date)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP));
-
-       j = -1;
-       date[0] = 0;
-       lastarg = ppos;
-
-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_EOLN):
-               if (mdoc->meta.date)
-                       return(1);
-               mdoc->meta.date = mdoc_atotime(date);
-               if (mdoc->meta.date)
-                       return(1);
-               return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGFORM));
-       case (ARGS_ERROR):
-               return(0);
-       default:
-               break;
-       }
-       
-       if (MDOC_MAX != mdoc_find(mdoc, args[j]) && ! mdoc_warn
-                       (mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
-               return(0);
-       
-       if (0 == j) {
-               if (xstrcmp("$Mdocdate: January 7 2009 $", args[j])) {
-                       mdoc->meta.date = time(NULL);
-                       goto again;
-               } else if (xstrcmp("$Mdocdate:", args[j])) 
-                       goto again;
-       } else if (4 == j)
-               if ( ! xstrcmp("$", args[j]))
-                       goto again;
-
-       if ( ! xstrlcat(date, args[j], sizeof(date)))
-               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
-       if ( ! xstrlcat(date, " ", sizeof(date)))
-               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
-
-       goto again;
-       /* NOTREACHED */
-}
-
-
-int
-macro_prologue(MACRO_PROT_ARGS)
-{
-
-       switch (tok) {
-       case (MDOC_Dt):
-               return(prologue_dt(mdoc, tok, line, ppos, pos, buf));
-       case (MDOC_Dd):
-               return(prologue_dd(mdoc, tok, line, ppos, pos, buf));
-       case (MDOC_Os):
-               return(prologue_os(mdoc, tok, line, ppos, pos, buf));
-       default:
-               break;
-       }
-
-       abort();
-       /* NOTREACHED */
-}
-

diff --git a/validate.c b/validate.c
index a5cc6024a8be109fa72d00ddb9773b7a548e85a9..a9d787c116bb88a64a855573fa7688d46f38338d 100644 (file)
--- a/validate.c
+++ b/validate.c
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.18 2009/01/08 14:55:59 kristaps Exp $ */
+/* $Id: validate.c,v 1.19 2009/01/08 15:05:50 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -44,9 +44,9 @@ static v_post posts_sh[] = { post_headchild_err_ge1,
 
 const  struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL }, /* \" */
-       { NULL, NULL }, /* Dd */ /* TODO */
-       { NULL, NULL }, /* Dt */ /* TODO */
-       { NULL, NULL }, /* Os */ /* TODO */
+       { NULL, NULL }, /* Dd */ /* TODO: pre: ordering, repetition */
+       { NULL, NULL }, /* Dt */ /* TODO ... */
+       { NULL, NULL }, /* Os */ /* TODO ... */
        { pre_sh, posts_sh }, /* Sh */ /* FIXME: preceding Pp. */
        { NULL, NULL }, /* Ss */ /* FIXME: preceding Pp. */
        { NULL, NULL }, /* Pp */