scanner.c (preprocessor_line): Accept preprocessor lines without file names.

2004-10-04  Erik Schnetter  <schnetter@aei.mpg.de>

	* scanner.c (preprocessor_line): Accept preprocessor lines without
	file names.  Check file names for closing quotes.  Handle escaped
	quotes in file names.

From-SVN: r88514

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f99c54f989cb4ca6e9e1963a6f3fe19b6728db18..d1bc71d73c01cc1a2173772b944393ae850d6abc 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-04  Erik Schnetter  <schnetter@aei.mpg.de>
+
+       * scanner.c (preprocessor_line): Accept preprocessor lines without
+       file names.  Check file names for closing quotes.  Handle escaped
+       quotes in file names.
+
 2004-10-04  Tobias Schlueter  <tobias.schlueter@physik.uni-muenchen.de>
        Paul Brook  <paul@codesourcery.com>
 

diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index 3c6ca19abd9df36e09c01d342757db76d62d3977..734afa04d9f6d36a9dcae21f97f4dfa4cf1c0c92 100644 (file)
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -834,6 +834,7 @@ preprocessor_line (char *c)
   int i, line;
   char *filename;
   gfc_file *f;
+  int escaped;
 
   c++;
   while (*c == ' ' || *c == '\t')
@@ -844,19 +845,46 @@ preprocessor_line (char *c)
 
   line = atoi (c);
 
+  /* Set new line number.  */
+  current_file->line = line;
+
   c = strchr (c, ' '); 
   if (c == NULL)
-    /* Something we don't understand has happened.  */
+    /* No file name given.  */
+    return;
+
+
+
+  /* Skip spaces.  */
+  while (*c == ' ' || *c == '\t')
+    c++;
+
+  /* Skip quote.  */
+  if (*c != '"')
     goto bad_cpp_line;
-  c += 2;     /* Skip space and quote.  */
+  ++c;
+
   filename = c;
 
-  c = strchr (c, '"'); /* Make filename end at quote.  */
-  if (c == NULL)
+  /* Make filename end at quote.  */
+  escaped = false;
+  while (*c && ! (! escaped && *c == '"'))
+    {
+      if (escaped)
+        escaped = false;
+      else
+        escaped = *c == '\\';
+      ++c;
+    }
+
+  if (! *c)
     /* Preprocessor line has no closing quote.  */
     goto bad_cpp_line;
+
   *c++ = '\0';
 
+
+
   /* Get flags.  */
   
   flag[1] = flag[2] = flag[3] = flag[4] = flag[5] = false;
@@ -888,8 +916,6 @@ preprocessor_line (char *c)
       current_file = current_file->up;
     }
   
-  current_file->line = line;
-  
   /* The name of the file can be a temporary file produced by
      cpp. Replace the name if it is different.  */
   
@@ -903,7 +929,7 @@ preprocessor_line (char *c)
   return;
 
  bad_cpp_line:
-  gfc_warning_now ("%s:%d: Unknown preprocessor directive", 
+  gfc_warning_now ("%s:%d: Illegal preprocessor directive", 
                   current_file->filename, current_file->line);
   current_file->line++;
 }