Documentation, more validations, cleaned up actions, added Nm action.

[mandoc.git] / strings.c

diff --git a/strings.c b/strings.c
index 3b10c770324644feea744b42822404d6447415d7..a94eb8014737c6dae2162aea77ba1fed90baebae 100644 (file)
--- a/strings.c
+++ b/strings.c
@@ -1,4 +1,4 @@
-/* $Id: strings.c,v 1.5 2009/01/06 15:49:44 kristaps Exp $ */
+/* $Id: strings.c,v 1.9 2009/01/17 16:15:27 kristaps Exp $ */

 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -36,8 +36,6 @@ mdoc_iscdelim(char p)
 {
 
        switch (p) {
 {
 
        switch (p) {

-       case('{'):
-               /* FALLTHROUGH */

        case('.'):
                /* FALLTHROUGH */
        case(','):
        case('.'):
                /* FALLTHROUGH */
        case(','):


@@ -58,6 +56,8 @@ mdoc_iscdelim(char p)
                /* FALLTHROUGH */
        case(']'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case(']'):
                /* FALLTHROUGH */

+       case('{'):
+               /* FALLTHROUGH */

        case('}'):
                return(1);
        default:
        case('}'):
                return(1);
        default:


@@ -81,47 +81,39 @@ mdoc_isdelim(const char *p)
 
 
 enum mdoc_sec 
 
 
 enum mdoc_sec 

-mdoc_atosec(size_t sz, const char **p)
+mdoc_atosec(const char *p)

 {
 
 {
 

-       assert(sz > 0);
-       if (sz > 2)
-               return(SEC_CUSTOM);
-       if (sz == 2) {
-               if (0 == strcmp(*p, "RETURN") &&
-                               0 == strcmp(*(p + 1), "VALUES"))
-                       return(SEC_RETURN_VALUES);
-               if (0 == strcmp(*p, "SEE") &&
-                               0 == strcmp(*(p + 1), "ALSO"))
-                       return(SEC_SEE_ALSO);
-               return(SEC_CUSTOM);
-       }
-
-       if (0 == strcmp(*p, "NAME"))
+       assert(p);
+       if (0 == strcmp(p, "NAME"))

                return(SEC_NAME);
                return(SEC_NAME);

-       else if (0 == strcmp(*p, "SYNOPSIS"))
+       else if (0 == strcmp(p, "RETURN VALUES"))
+               return(SEC_RETURN_VALUES);
+       else if (0 == strcmp(p, "SEE ALSO"))
+               return(SEC_SEE_ALSO);
+       else if (0 == strcmp(p, "SYNOPSIS"))

                return(SEC_SYNOPSIS);
                return(SEC_SYNOPSIS);

-       else if (0 == strcmp(*p, "DESCRIPTION"))
+       else if (0 == strcmp(p, "DESCRIPTION"))

                return(SEC_DESCRIPTION);
                return(SEC_DESCRIPTION);

-       else if (0 == strcmp(*p, "ENVIRONMENT"))
+       else if (0 == strcmp(p, "ENVIRONMENT"))

                return(SEC_ENVIRONMENT);
                return(SEC_ENVIRONMENT);

-       else if (0 == strcmp(*p, "FILES"))
+       else if (0 == strcmp(p, "FILES"))

                return(SEC_FILES);
                return(SEC_FILES);

-       else if (0 == strcmp(*p, "EXAMPLES"))
+       else if (0 == strcmp(p, "EXAMPLES"))

                return(SEC_EXAMPLES);
                return(SEC_EXAMPLES);

-       else if (0 == strcmp(*p, "DIAGNOSTICS"))
+       else if (0 == strcmp(p, "DIAGNOSTICS"))

                return(SEC_DIAGNOSTICS);
                return(SEC_DIAGNOSTICS);

-       else if (0 == strcmp(*p, "ERRORS"))
+       else if (0 == strcmp(p, "ERRORS"))

                return(SEC_ERRORS);
                return(SEC_ERRORS);

-       else if (0 == strcmp(*p, "STANDARDS"))
+       else if (0 == strcmp(p, "STANDARDS"))

                return(SEC_STANDARDS);
                return(SEC_STANDARDS);

-       else if (0 == strcmp(*p, "HISTORY"))
+       else if (0 == strcmp(p, "HISTORY"))

                return(SEC_HISTORY);
                return(SEC_HISTORY);

-       else if (0 == strcmp(*p, "AUTHORS"))
+       else if (0 == strcmp(p, "AUTHORS"))

                return(SEC_AUTHORS);
                return(SEC_AUTHORS);

-       else if (0 == strcmp(*p, "CAVEATS"))
+       else if (0 == strcmp(p, "CAVEATS"))

                return(SEC_CAVEATS);
                return(SEC_CAVEATS);

-       else if (0 == strcmp(*p, "BUGS"))
+       else if (0 == strcmp(p, "BUGS"))

                return(SEC_BUGS);
 
        return(SEC_CUSTOM);
                return(SEC_BUGS);
 
        return(SEC_CUSTOM);


@@ -135,9 +127,9 @@ mdoc_atotime(const char *p)
 
        (void)memset(&tm, 0, sizeof(struct tm));
 
 
        (void)memset(&tm, 0, sizeof(struct tm));
 

-       if (strptime(p, "%b %d %Y", &tm))
+       if (0 == strptime(p, "%b %d %Y", &tm))

                return(mktime(&tm));
                return(mktime(&tm));

-       if (strptime(p, "%b %d, %Y", &tm))
+       if (0 == strptime(p, "%b %d, %Y", &tm))

                return(mktime(&tm));
 
        return(0);
                return(mktime(&tm));
 
        return(0);


@@ -228,6 +220,8 @@ mdoc_atoarch(const char *p)
                return(ARCH_amiga);
        else if (0 == strcmp(p, "arc"))
                return(ARCH_arc);
                return(ARCH_amiga);
        else if (0 == strcmp(p, "arc"))
                return(ARCH_arc);

+       else if (0 == strcmp(p, "arm"))
+               return(ARCH_arm);

        else if (0 == strcmp(p, "armish"))
                return(ARCH_armish);
        else if (0 == strcmp(p, "aviion"))
        else if (0 == strcmp(p, "armish"))
                return(ARCH_armish);
        else if (0 == strcmp(p, "aviion"))


@@ -307,3 +301,30 @@ mdoc_atoatt(const char *p)
        
        return(ATT_DEFAULT);
 }
        
        return(ATT_DEFAULT);
 }

+
+
+char *
+mdoc_type2a(enum mdoc_type type)
+{
+       switch (type) {
+       case (MDOC_ROOT):
+               return("root");
+       case (MDOC_BLOCK):
+               return("block");
+       case (MDOC_HEAD):
+               return("block-head");
+       case (MDOC_BODY):
+               return("block-body");
+       case (MDOC_TAIL):
+               return("block-tail");
+       case (MDOC_ELEM):
+               return("elem");
+       case (MDOC_TEXT):
+               return("text");
+       default:
+               break;
+       }
+
+       abort();
+       /* NOTREACHED */
+}