From: erg <devnull@localhost>
Date: Fri, 8 Apr 2005 20:45:34 +0000 (+0000)
Subject: Update with new lefty, fixing many bugs and supporting new features
X-Git-Tag: LAST_LIBGRAPH~32^2~7707
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9864fe68eb5542f75dd55fcab8d97b3972fefd15;p=graphviz

Update with new lefty, fixing many bugs and supporting new features
---

diff --git a/cmd/lefty/dot2l/dotlex.c b/cmd/lefty/dot2l/dotlex.c
index 582318085..4f2cad82b 100644
--- a/cmd/lefty/dot2l/dotlex.c
+++ b/cmd/lefty/dot2l/dotlex.c
@@ -31,223 +31,225 @@ static int In_comment;
 static int Comment_start;
 int Line_number;
 
-static char *lex_gets(void);
-static int lex_token(char *);
-static void error_context(void);
-static char *skip_wscomments(char *);
-static char *scan_token(char *);
-static char *scan_num(char *);
-static char *quoted_string(char *);
-
-void lex_begin(int ioi)
-{
+static char *lex_gets (int);
+static int lex_token (char *);
+static void error_context (void);
+static char *skip_wscomments (char *);
+static char *scan_token (char *);
+static char *scan_num (char *);
+static char *quoted_string (char *);
+static char *html_string (char *);
+
+void lex_begin (int ioi) {
     Lexer_fd = ioi;
     LexPtr = NULL;
 }
 
-int myyylex(void)
-{				/* for debugging */
-    int rv = myyylex();
+int myyylex (void) {        /* for debugging */
+    int rv = myyylex ();
 
-    fprintf(stderr, "returning %d\n", rv);
+    fprintf (stderr, "returning %d\n", rv);
     if (rv == T_id)
-	fprintf(stderr, "string val is %s\n", yylval.s);
+        fprintf (stderr, "string val is %s\n", yylval.s);
     return rv;
 }
 
-int yylex(void)
-{
+int yylex (void) {
     int token;
     char *p;
 
     /* if the parser has accepted a graph, reset and return EOF */
     if (yaccdone) {
-	yaccdone = FALSE;
-	return EOF;
+        yaccdone = FALSE;
+        return EOF;
     }
 
     /* get a nonempty lex buffer */
     do {
-	if ((LexPtr == NULL) || (LexPtr[0] == '\0'))
-	    if ((LexPtr = lex_gets()) == NULL) {
-		if (In_comment)
-		    fprintf(stderr,
-			    "warning, nonterminated comment in line %d\n",
-			    Comment_start);
-		return EOF;
-	    }
-	LexPtr = skip_wscomments(LexPtr);
+        if ((LexPtr == NULL) || (LexPtr[0] == '\0'))
+            if ((LexPtr = lex_gets (0)) == NULL) {
+                if (In_comment)
+                    fprintf (
+                        stderr,
+                        "warning, nonterminated comment in line %d\n",
+                        Comment_start
+                    );
+                return EOF;
+            }
+        LexPtr = skip_wscomments (LexPtr);
     } while (LexPtr[0] == '\0');
 
     /* scan quoted strings */
     if (LexPtr[0] == '\"') {
-	LexPtr = quoted_string(LexPtr);
-	yylval.s = (char *) strdup(LexBuf);
-	return T_id;
+        LexPtr = quoted_string (LexPtr);
+        yylval.s = (char *) strdup (LexBuf);
+        return T_id;
+    }
+
+    /* scan html strings */
+    if (LexPtr[0] == '<') {
+        LexPtr = html_string (LexPtr);
+        yylval.s = (char *) strdup (LexBuf);
+        return T_id;
     }
 
     /* scan edge operator */
-    if (etype && (strncmp(LexPtr, etype, strlen(etype)) == 0)) {
-	LexPtr += strlen(etype);
-	return T_edgeop;
+    if (etype && (strncmp (LexPtr, etype, strlen (etype)) == 0)) {
+        LexPtr += strlen (etype);
+        return T_edgeop;
     }
 
     /* scan numbers */
-    if ((p = scan_num(LexPtr))) {
-	LexPtr = p;
-	yylval.s = strdup(LexBuf);
-	return T_id;
-    } else {
-	if (ispunct(LexPtr[0]) && (LexPtr[0] != '_'))
-	    return *LexPtr++;
-	else
-	    LexPtr = scan_token(LexPtr);
+    if ((p = scan_num (LexPtr))) {
+        LexPtr = p;
+        yylval.s =  strdup (LexBuf);
+        return T_id;
+    }
+    else {
+        if (ispunct (LexPtr[0]) && (LexPtr[0] != '_'))
+            return *LexPtr++;
+        else
+            LexPtr = scan_token (LexPtr);
     }
 
     /* scan other tokens */
-    token = lex_token(LexBuf);
+    token = lex_token (LexBuf);
     if (token == -1) {
-	yylval.s = strdup(LexBuf);
-	token = T_id;
+        yylval.s = strdup (LexBuf);
+        token = T_id;
     }
     return token;
 }
 
-void yyerror(const char *fmt, ...)
-{
-    va_list args;
+void
+yyerror (char *fmt, char *s) {
     if (Syntax_errors++)
-	return;
-    fprintf(stderr, "graph parser: ");
-    va_start(args, fmt);
-    vfprintf(stderr, fmt, args);
-    va_end(args);
-    fprintf(stderr, " near line %d\n", Line_number);
-    error_context();
+        return;
+    fprintf (stderr, "graph parser: ");
+    fprintf (stderr, fmt, s);
+    fprintf (stderr, " near line %d\n", Line_number);
+    error_context ();
 }
 
-static char *lex_gets(void)
-{
+static char *lex_gets (int curlen) {
     char *clp;
-    int len, curlen;
+    int len;
 
-    curlen = 0;
     do {
-	/* off by one so we can back up in LineBuf */
-	if (IOreadline(Lexer_fd,
-		       LexBuf + curlen + 1, LEXBUFSIZE - curlen - 1) == -1)
-	    break;
-	clp = LexBuf + curlen + 1;
-	len = strlen(clp);
-	clp[len++] = '\n';
-	clp[len] = 0;
-
-	if (clp == LexBuf + 1 && clp[0] == '#') {
-	    /* comment line or cpp line sync */
-	    if (sscanf(clp + 1, "%d", &Line_number) == 0)
-		Line_number++;
-	    len = 0;
-	    clp[len] = 0;
-	    continue;
-	}
-
-	Line_number++;
-	if ((len = strlen(clp)) > 1) {
-	    if (clp[len - 2] == '\\') {
-		len = len - 2;
-		clp[len] = '\0';
-	    }
-	}
-	curlen += len;
+        /* off by one so we can back up in LineBuf */
+        if (IOreadline (
+            Lexer_fd, LexBuf + curlen + 1, LEXBUFSIZE - curlen - 1
+        ) == -1)
+            break;
+        clp = LexBuf + curlen + 1;
+        len = strlen (clp);
+        clp[len++] = '\n';
+        clp[len] = 0;
+
+        if (clp == LexBuf + 1 && clp[0] == '#') {
+            /* comment line or cpp line sync */
+            if (sscanf (clp+1, "%d", &Line_number) == 0)
+                Line_number++;
+            len = 0;
+            clp[len] = 0;
+            continue;
+        }
+
+        Line_number++;
+        if ((len = strlen (clp)) > 1) {
+            if (clp[len - 2] == '\\') {
+                len = len - 2;
+                clp[len] = '\0';
+            }
+        }
+        curlen += len;
     } while (clp[len - 1] != '\n');
 
     if (curlen > 0)
-	return LexBuf + 1;
+        return LexBuf + 1;
     else
-	return NULL;
+        return NULL;
 }
 
-static int lex_token(char *p)
-{
-    TFA_Init();
+static int lex_token (char *p) {
+    TFA_Init ();
     while (*p)
-	TFA_Advance(*p++);
-    return TFA_Definition();
+        TFA_Advance (*p++);
+    return
+        TFA_Definition ();
 }
 
-static void error_context(void)
-{
+static void error_context (void) {
     char *p, *q;
 
     if (LexPtr == NULL)
-	return;
-    fprintf(stderr, "context: ");
-    for (p = LexPtr - 1; (p > LexBuf) && (isspace(*p) == FALSE); p--);
+        return;
+    fprintf (stderr, "context: ");
+    for (p = LexPtr - 1; (p > LexBuf) && (isspace (*p) == FALSE); p--)
+        ;
     for (q = LexBuf; q < p; q++)
-	fputc(*q, stderr);
-    fputs(" >>> ", stderr);
+        fputc (*q, stderr);
+    fputs (" >>> ", stderr);
     for (; q < LexPtr; q++)
-	fputc(*q, stderr);
-    fputs(" <<< ", stderr);
-    fputs(LexPtr, stderr);
+        fputc (*q, stderr);
+    fputs (" <<< ", stderr);
+    fputs (LexPtr, stderr);
 }
 
 /* i wrote this and it still frightens me */
 /* skip white space and comments in p */
-static char *skip_wscomments(char *p)
-{
+static char *skip_wscomments (char *p) {
     do {
-	while (isspace(*p))
-	    p++;
-	while (In_comment && p[0]) {
-	    while (p[0] && (p[0] != '*'))
-		p++;
-	    if (p[0]) {
-		if (p[1] == '/') {
-		    In_comment = FALSE;
-		    p += 2;
-		    break;
-		} else
-		    p++;
-	    }
-	}
-	if (p[0] == '/') {
-	    if (p[1] == '/')
-		while (*p)
-		    p++;	/* skip to end of line */
-	    else {
-		if (p[1] == '*') {
-		    In_comment = TRUE;
-		    Comment_start = Line_number;
-		    p += 2;
-		    continue;
-		} else
-		    break;	/* return a slash */
-	    }
-	} else {
-	    if (!isspace(*p))
-		break;
-	}
+        while (isspace (*p))
+            p++;
+        while (In_comment && p[0]) {
+            while (p[0] && (p[0] != '*'))
+                p++;
+            if (p[0]) {
+                if (p[1] == '/') {
+                    In_comment = FALSE;
+                    p += 2;
+                    break;
+                } else
+                    p++;
+            }
+        }
+        if (p[0] == '/') {
+            if (p[1] == '/')
+                while (*p)
+                    p++;    /* skip to end of line */
+            else {
+                if (p[1] == '*') {
+                    In_comment = TRUE;
+                    Comment_start = Line_number;
+                    p += 2;
+                    continue;
+                }
+                else
+                    break;    /* return a slash */
+            }
+        } else {
+            if (!isspace (*p))
+                break;
+        }
     } while (p[0]);
     return p;
 }
 
 /* scan an unquoted token and return the position after its terminator */
-static char *scan_token(char *p)
-{
+static char *scan_token (char *p) {
     char *q;
 
     q = LexBuf;
     if (p == '\0')
-	return NULL;
-    while (isalnum(*p) || (*p == '_'))
-	*q++ = *p++;
+        return NULL;
+    while (isalnum (*p) || (*p == '_'))
+        *q++ = *p++;
     *q = '\0';
     return p;
 }
 
-static char *scan_num(char *p)
-{
+static char *scan_num (char *p) {
     char *q, *z;
     int saw_rp = FALSE;
     int saw_digit = FALSE;
@@ -255,54 +257,90 @@ static char *scan_num(char *p)
     z = p;
     q = LexBuf;
     if (*z == '-')
-	*q++ = *z++;
+        *q++ = *z++;
     if (*z == '.') {
-	saw_rp = TRUE;
-	*q++ = *z++;
+        saw_rp = TRUE;
+        *q++ = *z++;
     }
-    while (isdigit(*z)) {
-	saw_digit = TRUE;
-	*q++ = *z++;
+    while (isdigit (*z)) {
+        saw_digit = TRUE;
+        *q++ = *z++;
     }
     if ((*z == '.') && (saw_rp == FALSE)) {
-	saw_rp = TRUE;
-	*q++ = *z++;
-	while (isdigit(*z)) {
-	    saw_digit = TRUE;
-	    *q++ = *z++;
-	}
+        saw_rp = TRUE;
+        *q++ = *z++;
+        while (isdigit (*z)) {
+            saw_digit = TRUE;
+            *q++ = *z++;
+        }
     }
     *q = '\0';
-    if (saw_digit && *z && (isalpha(*z)))
-	yyerror("badly formed number %s", LexBuf);
+    if (saw_digit && *z && (isalpha (*z)))
+        yyerror ("badly formed number %s", LexBuf);
 
     if (saw_digit == FALSE)
-	z = NULL;
+        z = NULL;
     return z;
 }
 
 /* scan a quoted string and return the position after its terminator */
-static char *quoted_string(char *p)
-{
+static char *quoted_string (char *p) {
     char quote, *q;
 
     quote = *p++;
     q = LexBuf;
     while ((*p) && (*p != quote)) {
-	if (*p == '\\') {
-	    if (*(p + 1) == quote)
-		p++;
-	    else {
-		if (*(p + 1) == '\\')
-		    *q++ = *p++;
-	    }
-	}
-	*q++ = *p++;
+        if (*p == '\\') {
+            if (*(p+1) == quote)
+                p++;
+            else {
+                if (*(p+1) == '\\')
+                    *q++ = *p++;
+            }
+        }
+        *q++ = *p++;
     }
     if (*p == '\0')
-	yyerror("string ran past end of line", "");
+        yyerror ("string ran past end of line", "");
     else
-	p++;
+        p++;
     *q = 0;
     return p;
 }
+
+/* scan a html string and return the position after its terminator */
+static char *html_string (char *p) {
+    char *q;
+    int bal;
+
+    p++;
+    bal = 1;
+    q = LexBuf;
+    *q++ = '>';
+    while (*p && *p != '<' && *p != '>')
+        p++;
+    for (;;) {
+        while (*p) {
+            if (*p == '<')
+                bal++;
+            else if (*p == '>') {
+                bal--;
+                if (bal == 0) {
+                    *q++ = '<';
+                    *q = 0;
+                    return p + 1;
+                }
+            }
+            *q++ = *p++;
+        }
+        if ((LexPtr = lex_gets (p - LexBuf - 1)) == NULL) {
+            fprintf (
+                stderr,
+                "warning, nonterminated html label in line %d\n",
+                Line_number
+            );
+            return NULL;
+        }
+    }
+    return NULL;
+}