Handle C99/m4 #line directives as well.

diff --git a/lib/agraph/scan.l b/lib/agraph/scan.l
index bd462f9fce26455cbd2d1dc1c27df1363aa08137..e17e4936856231ea9c0ef8e322c0631115980028 100644 (file)
--- a/lib/agraph/scan.l
+++ b/lib/agraph/scan.l
@@ -108,10 +108,12 @@ storeFileName (char* fname, int len)
  */
 static void ppDirective ()
 {
-    int cnt, lineno;
+    int r, cnt, lineno;
     char buf[2];
-    int r = sscanf(yytext + 1, "%d %1[\"]%n", &lineno, buf, &cnt);
+    char* s = yytext + 1;  /* skip initial # */
 
+    if (strncmp(s, "line", 4) == 0) s += 4;
+    r = sscanf(s, "%d %1[\"]%n", &lineno, buf, &cnt);
     if (r > 0) { /* got line number */ 
        line_num = lineno - 1;
        if (r > 1) { /* saw quote */

diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l
index a9cf107e1ca30c65626ffc532011af591a286b70..895872783acf0f38b7983741a78bef913ec1a08c 100644 (file)
--- a/lib/cgraph/scan.l
+++ b/lib/cgraph/scan.l
@@ -104,14 +104,16 @@ storeFileName (char* fname, int len)
  */
 static void ppDirective ()
 {
-    int cnt, lineno;
+    int r, cnt, lineno;
     char buf[2];
-    int r = sscanf(yytext + 1, "%d %1[\"]%n", &lineno, buf, &cnt);
+    char* s = yytext + 1;  /* skip initial # */
 
+    if (strncmp(s, "line", 4) == 0) s += 4;
+    r = sscanf(s, "%d %1[\"]%n", &lineno, buf, &cnt);
     if (r > 0) { /* got line number */ 
        line_num = lineno - 1;
        if (r > 1) { /* saw quote */
-           char* p = yytext + 1 + cnt;
+           char* p = s + cnt;
            char* e = p;
            while (*e && (*e != '"')) e++; 
            if (e != p) {

diff --git a/lib/graph/lexer.c b/lib/graph/lexer.c
index f1ba84e14de5d52ec181a04fe572ec57359a9233..79a49767a4990712410f1c309d864e72a12dad7d 100644 (file)
--- a/lib/graph/lexer.c
+++ b/lib/graph/lexer.c
@@ -262,14 +262,17 @@ static char *lex_gets(void)
        if (clp[len - 1] == '\n') {     /* have physical line */
            if ((clp[0] == '#') && (curlen == 0)) {
                /* comment line or cpp line sync */
-               int cnt;
+               int r, cnt;
                char buf[2];
-               int r = sscanf(clp + 1, "%d %1[\"]%n", &Line_number, buf, &cnt);
+                char* s = clp + 1;
+
+               if (strncmp(s, "line", 4) == 0) s += 4;
+               r = sscanf(s, "%d %1[\"]%n", &Line_number, buf, &cnt);
                if (r <= 0) Line_number++;
                else { /* got line number */ 
                    Line_number--;
                    if (r > 1) { /* saw quote */
-                       char* p = clp + 1 + cnt;
+                       char* p = s + cnt;
                        char* e = p;
                        while (*e && (*e != '"')) e++; 
                        if (e != p) {