Changeset 501 for vendor/gnumake/current/read.c

Timestamp:

Sep 15, 2006, 4:30:32 AM (19 years ago)

Author:

bird

Message:

Load make-3.81/ into vendor/gnumake/current.

File:

• vendor/gnumake/current/read.c (modified) (37 diffs)

vendor/gnumake/current/read.c

@@ -1 +1 @@
 /* Reading and parsing of makefiles for GNU Make.
 Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-2002 Free Software Foundation, Inc.
+1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+Foundation, Inc.
 This file is part of GNU Make.
 
-GNU Make is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Make is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Make; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+GNU Make is free software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2, or (at your option) any later version.
+
+GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+GNU Make; see the file COPYING.  If not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
 #include "make.h"
@@ -144 +142 @@
 static enum make_word_type get_next_mword PARAMS ((char *buffer, char *delim,
                         char **startp, unsigned int *length));
+static void remove_comments PARAMS ((char *line));
+static char *find_char_unquote PARAMS ((char *string, int stop1,
+                                        int stop2, int blank, int ignorevars));
 
 
@@ -187 +188 @@
         if (*p != '\0')
           *p++ = '\0';
-        name = xstrdup (name);
-        if (eval_makefile (name,
-                           RM_NO_DEFAULT_GOAL|RM_INCLUDED|RM_DONTCARE) < 2)
-          free (name);
+        eval_makefile (name, RM_NO_DEFAULT_GOAL|RM_INCLUDED|RM_DONTCARE);
       }
 
@@ -252 +250 @@
           for (p = default_makefiles; *p != 0; ++p)
             {
-              struct dep *d = (struct dep *) xmalloc (sizeof (struct dep));
-              d->name = 0;
+              struct dep *d = alloc_dep ();
               d->file = enter_file (*p);
               d->file->dontcare = 1;
-              d->ignore_mtime = 0;
-              d->need_2nd_expansion = 0;
               /* Tell update_goal_chain to bail out as soon as this file is
                  made, and main not to die if we can't make this file.  */
@@ -311 +306 @@
   struct ebuffer ebuf;
   const struct floc *curfile;
+  char *expanded = 0;
+  char *included = 0;
   int makefile_errno;
   int r;
 
-  ebuf.floc.filenm = filename;
+  ebuf.floc.filenm = strcache_add (filename);
   ebuf.floc.lineno = 1;
 
@@ -337 +334 @@
   if (!(flags & RM_NO_TILDE) && filename[0] == '~')
     {
-      char *expanded = tilde_expand (filename);
+      expanded = tilde_expand (filename);
       if (expanded != 0)
         filename = expanded;
@@ -354 +351 @@
       for (i = 0; include_directories[i] != 0; ++i)
         {
-          char *name = concat (include_directories[i], "/", filename);
-          ebuf.fp = fopen (name, "r");
-          if (ebuf.fp == 0)
-            free (name);
-          else
+          included = concat (include_directories[i], "/", filename);
+          ebuf.fp = fopen (included, "r");
+          if (ebuf.fp)
             {
-              filename = name;
+              filename = included;
               break;
             }
-        }
+          free (included);
+        }
+      /* If we're not using it, we already freed it above.  */
+      if (filename != included)
+        included = 0;
     }
 
   /* Add FILENAME to the chain of read makefiles.  */
-  deps = (struct dep *) xmalloc (sizeof (struct dep));
+  deps = alloc_dep ();
   deps->next = read_makefiles;
   read_makefiles = deps;
-  deps->name = 0;
   deps->file = lookup_file (filename);
   if (deps->file == 0)
     deps->file = enter_file (xstrdup (filename));
-  if (filename != ebuf.floc.filenm)
-    free (filename);
   filename = deps->file->name;
   deps->changed = flags;
-  deps->ignore_mtime = 0;
-  deps->need_2nd_expansion = 0;
   if (flags & RM_DONTCARE)
     deps->file->dontcare = 1;
+
+  if (expanded)
+    free (expanded);
+  if (included)
+    free (included);
 
   /* If the makefile can't be found at all, give up entirely.  */
@@ -802 +801 @@
 
           p = allocated_variable_expand (p2);
+
+          /* If no filenames, it's a no-op.  */
           if (*p == '\0')
-            {
-              error (fstart,
-                     _("no file name for `%sinclude'"), noerror ? "-" : "");
-              continue;
-            }
+            {
+              free (p);
+              continue;
+            }
 
           /* Parse the list of file names.  */
@@ -837 +837 @@
               r = eval_makefile (name, (RM_INCLUDED | RM_NO_TILDE
                                         | (noerror ? RM_DONTCARE : 0)));
-              if (!r)
-                {
-                  if (!noerror)
-                    error (fstart, "%s: %s", name, strerror (errno));
-                  free (name);
-                }
+              if (!r && !noerror)
+                error (fstart, "%s: %s", name, strerror (errno));
+              free (name);
             }
 
@@ -887 +884 @@
         /* Search the line for an unquoted ; that is not after an
            unquoted #.  */
-        cmdleft = find_char_unquote (line, ';', '#', 0);
+        cmdleft = find_char_unquote (line, ';', '#', 0, 1);
         if (cmdleft != 0 && *cmdleft == '#')
           {
@@ -934 +931 @@
               {
                 /* Look for a semicolon in the expanded line.  */
-                cmdleft = find_char_unquote (p2, ';', 0, 0);
+                cmdleft = find_char_unquote (p2, ';', 0, 0, 0);
 
                 if (cmdleft != 0)
@@ -961 +958 @@
               }
 
-            colonp = find_char_unquote(p2, ':', 0, 0);
+            colonp = find_char_unquote(p2, ':', 0, 0, 0);
 #ifdef HAVE_DOS_PATHS
             /* The drive spec brain-damage strikes again...  */
@@ -970 +967 @@
                    colonp > p2 && isalpha ((unsigned char)colonp[-1]) &&
                    (colonp == p2 + 1 || strchr (" \t(", colonp[-2]) != 0))
-              colonp = find_char_unquote(colonp + 1, ':', 0, 0);
+              colonp = find_char_unquote(colonp + 1, ':', 0, 0, 0);
 #endif
             if (colonp != 0)
@@ -1084 +1081 @@
         /* This is a normal target, _not_ a target-specific variable.
            Unquote any = in the dependency list.  */
-        find_char_unquote (lb_next, '=', 0, 0);
+        find_char_unquote (lb_next, '=', 0, 0, 0);
 
         /* We have some targets, so don't ignore the following commands.  */
@@ -1099 +1096 @@
             if (cmdleft == 0)
               {
-                cmdleft = find_char_unquote (p2, ';', 0, 0);
+                cmdleft = find_char_unquote (p2, ';', 0, 0, 0);
                 if (cmdleft != 0)
                   *(cmdleft++) = '\0';
@@ -1164 +1161 @@
             if (pattern_percent == 0)
               fatal (fstart, _("target pattern contains no `%%'"));
-            free((char *)target);
+            free ((char *)target);
           }
         else
@@ -1176 +1173 @@
         if (beg <= end && *beg != '\0')
           {
-            char *top;
-            const char *fromp = beg;
-
-            /* Make a copy of the dependency string.  Note if we find '$'.  */
-            deps = (struct dep*) xmalloc (sizeof (struct dep));
-            deps->next = 0;
-            deps->name = top = (char *) xmalloc (end - beg + 2);
-            deps->need_2nd_expansion = 0;
-            while (fromp <= end)
-              {
-                if (*fromp == '$')
-                  deps->need_2nd_expansion = 1;
-                *(top++) = *(fromp++);
-              }
-            *top = '\0';
-            deps->file = 0;
+            /* Put all the prerequisites here; they'll be parsed later.  */
+            deps = alloc_dep ();
+            deps->name = savestring (beg, end - beg + 1);
           }
         else
@@ -1318 +1302 @@
 
 
+/* Remove comments from LINE.
+   This is done by copying the text at LINE onto itself.  */
+
+static void
+remove_comments (char *line)
+{
+  char *comment;
+
+  comment = find_char_unquote (line, '#', 0, 0, 0);
+
+  if (comment != 0)
+    /* Cut off the line at the #.  */
+    *comment = '\0';
+}
+
 /* Execute a `define' directive.
    The first line has already been read, and NAME is the name of
@@ -1838 +1837 @@
       v->origin = origin;
       v->per_target = 1;
-      if (exported)
-        v->export = v_export;
+      v->export = exported ? v_export : v_default;
 
       /* If it's not an override, check to see if there was a command-line
@@ -1912 +1910 @@
       char *name = filenames->name;
       struct file *f;
-      struct dep *d;
-      struct dep *this;
+      struct dep *this = 0;
       char *implicit_percent;
 
@@ -1919 +1916 @@
       free (filenames);
 
-      /* Check for .POSIX.  We used to do this in snap_deps() but that's not
-         good enough: it doesn't happen until after the makefile is read,
-         which means we cannot use its value during parsing.  */
+      /* Check for special targets.  Do it here instead of, say, snap_deps()
+         so that we can immediately use the value.  */
 
       if (streq (name, ".POSIX"))
         posix_pedantic = 1;
+      else if (streq (name, ".SECONDEXPANSION"))
+        second_expansion = 1;
 
       implicit_percent = find_percent (name);
@@ -1959 +1957 @@
         }
 
-      /* If there are multiple filenames, copy the chain DEPS
-         for all but the last one.  It is not safe for the same deps
-         to go in more than one place in the database.  */
-      this = nextf != 0 ? copy_dep_chain (deps) : deps;
-
-      if (pattern != 0)
-        {
-          /* If this is an extended static rule:
-             `targets: target%pattern: dep%pattern; cmds',
-             translate each dependency pattern into a plain filename
-             using the target pattern and this target's name.  */
-          if (!pattern_matches (pattern, pattern_percent, name))
-            {
-              /* Give a warning if the rule is meaningless.  */
-              error (flocp,
-                     _("target `%s' doesn't match the target pattern"), name);
-              this = 0;
-            }
-          else
-            /* We use subst_expand to do the work of translating % to $* in
-               the dependency line.  */
-
-            if (this != 0 && find_percent (this->name) != 0)
-              {
-                char *o;
-                char *buffer = variable_expand ("");
-
-                o = subst_expand (buffer, this->name, "%", "$*", 1, 2, 0);
-
-                free (this->name);
-                this->name = savestring (buffer, o - buffer);
-                this->need_2nd_expansion = 1;
-              }
-        }
+      /* If this is a static pattern rule:
+         `targets: target%pattern: dep%pattern; cmds',
+         make sure the pattern matches this target name.  */
+      if (pattern && !pattern_matches (pattern, pattern_percent, name))
+        error (flocp, _("target `%s' doesn't match the target pattern"), name);
+      else if (deps)
+        {
+          /* If there are multiple filenames, copy the chain DEPS for all but
+             the last one.  It is not safe for the same deps to go in more
+             than one place in the database.  */
+          this = nextf != 0 ? copy_dep_chain (deps) : deps;
+          this->need_2nd_expansion = (second_expansion
+                                      && strchr (this->name, '$'));
+        }
 
       if (!two_colon)
@@ -2032 +2010 @@
             f->cmds = cmds;
 
-          /* Defining .SUFFIXES with no dependencies
-             clears out the list of suffixes.  */
+          /* Defining .SUFFIXES with no dependencies clears out the list of
+             suffixes.  */
           if (f == suffix_file && this == 0)
             {
-              d = f->deps;
-              while (d != 0)
-                {
-                  struct dep *nextd = d->next;
-                  free (d->name);
-                  free ((char *)d);
-                  d = nextd;
-                }
+              free_dep_chain (f->deps);
               f->deps = 0;
             }
@@ -2058 +2029 @@
 
                   if (cmds != 0)
-                    {
-                      /* This is the rule with commands, so put its deps
-                         last. The rationale behind this is that $< expands
-                         to the first dep in the chain, and commands use $<
-                         expecting to get the dep that rule specifies.
-                         However the second expansion algorithm reverses
-                         the order thus we need to make it last here.  */
-
-                      (*d_ptr)->next = this;
-                    }
+                    /* This is the rule with commands, so put its deps
+                       last. The rationale behind this is that $< expands to
+                       the first dep in the chain, and commands use $<
+                       expecting to get the dep that rule specifies.  However
+                       the second expansion algorithm reverses the order thus
+                       we need to make it last here.  */
+                    (*d_ptr)->next = this;
                   else
                     {
                       /* This is the rule without commands. Put its
-                         dependencies at the end but before dependencies
-                         from the rule with commands (if any). This way
-                         everything appears in makefile order.  */
+                         dependencies at the end but before dependencies from
+                         the rule with commands (if any). This way everything
+                         appears in makefile order.  */
 
                       if (f->cmds != 0)
@@ -2103 +2071 @@
                 f->updating = 1;
             }
-
-          /* If this is a static pattern rule, set the file's stem to
-             the part of its name that matched the `%' in the pattern,
-             so you can use $* in the commands.  */
-          if (pattern != 0)
-            {
-              static char *percent = "%";
-              char *buffer = variable_expand ("");
-              char *o = patsubst_expand (buffer, name, pattern, percent,
-                                         pattern_percent+1, percent+1);
-              f->stem = savestring (buffer, o - buffer);
-            }
         }
       else
         {
-          /* Double-colon.  Make a new record
-             even if the file already has one.  */
+          /* Double-colon.  Make a new record even if there already is one.  */
           f = lookup_file (name);
+
           /* Check for both : and :: rules.  Check is_target so
              we don't lose on default suffix rules or makefiles.  */
@@ -2127 +2083 @@
                    _("target file `%s' has both : and :: entries"), f->name);
           f = enter_file (name);
-          /* If there was an existing entry and it was a double-colon
-             entry, enter_file will have returned a new one, making it the
-             prev pointer of the old one, and setting its double_colon
-             pointer to the first one.  */
+          /* If there was an existing entry and it was a double-colon entry,
+             enter_file will have returned a new one, making it the prev
+             pointer of the old one, and setting its double_colon pointer to
+             the first one.  */
           if (f->double_colon == 0)
-            /* This is the first entry for this name, so we must
-               set its double_colon pointer to itself.  */
+            /* This is the first entry for this name, so we must set its
+               double_colon pointer to itself.  */
             f->double_colon = f;
           f->is_target = 1;
@@ -2140 +2096 @@
         }
 
+      /* If this is a static pattern rule, set the stem to the part of its
+         name that matched the `%' in the pattern, so you can use $* in the
+         commands.  */
+      if (pattern)
+        {
+          static char *percent = "%";
+          char *buffer = variable_expand ("");
+          char *o = patsubst_expand (buffer, name, pattern, percent,
+                                     pattern_percent+1, percent+1);
+          f->stem = savestring (buffer, o - buffer);
+          if (this)
+            {
+              this->staticpattern = 1;
+              this->stem = xstrdup (f->stem);
+            }
+        }
+
       /* Free name if not needed further.  */
       if (f != 0 && name != f->name
@@ -2149 +2122 @@
 
       /* If this target is a default target, update DEFAULT_GOAL_FILE.  */
-      if (strcmp (*default_goal_name, name) == 0
+      if (streq (*default_goal_name, name)
           && (default_goal_file == 0
-              || strcmp (default_goal_file->name, name) != 0))
+              || ! streq (default_goal_file->name, name)))
         default_goal_file = f;
     }
@@ -2159 +2132 @@
       targets[target_idx] = 0;
       target_percents[target_idx] = 0;
+      if (deps)
+        deps->need_2nd_expansion = second_expansion;
       create_pattern_rule (targets, target_percents, two_colon, deps, cmds, 1);
       free ((char *) target_percents);
@@ -2169 +2144 @@
    Quoting backslashes are removed from STRING by compacting it into
    itself.  Returns a pointer to the first unquoted STOPCHAR if there is
-   one, or nil if there are none.  */
-
-char *
-find_char_unquote (char *string, int stop1, int stop2, int blank)
+   one, or nil if there are none.  STOPCHARs inside variable references are
+   ignored if IGNOREVARS is true.
+
+   STOPCHAR _cannot_ be '$' if IGNOREVARS is true.  */
+
+static char *
+find_char_unquote (char *string, int stop1, int stop2, int blank,
+                   int ignorevars)
 {
   unsigned int string_len = 0;
   register char *p = string;
 
+  if (ignorevars)
+    ignorevars = '$';
+
   while (1)
     {
       if (stop2 && blank)
-        while (*p != '\0' && *p != stop1 && *p != stop2
+        while (*p != '\0' && *p != ignorevars && *p != stop1 && *p != stop2
                && ! isblank ((unsigned char) *p))
           ++p;
       else if (stop2)
-        while (*p != '\0' && *p != stop1 && *p != stop2)
+        while (*p != '\0' && *p != ignorevars && *p != stop1 && *p != stop2)
           ++p;
       else if (blank)
-        while (*p != '\0' && *p != stop1
+        while (*p != '\0' && *p != ignorevars && *p != stop1
                && ! isblank ((unsigned char) *p))
           ++p;
       else
-        while (*p != '\0' && *p != stop1)
+        while (*p != '\0' && *p != ignorevars && *p != stop1)
           ++p;
 
       if (*p == '\0')
         break;
+
+      /* If we stopped due to a variable reference, skip over its contents.  */
+      if (*p == ignorevars)
+        {
+          char openparen = p[1];
+
+          p += 2;
+
+          /* Skip the contents of a non-quoted, multi-char variable ref.  */
+          if (openparen == '(' || openparen == '{')
+            {
+              unsigned int pcount = 1;
+              char closeparen = (openparen == '(' ? ')' : '}');
+
+              while (*p)
+                {
+                  if (*p == openparen)
+                    ++pcount;
+                  else if (*p == closeparen)
+                    if (--pcount == 0)
+                      {
+                        ++p;
+                        break;
+                      }
+                  ++p;
+                }
+            }
+
+          /* Skipped the variable reference: look for STOPCHARS again.  */
+          continue;
+        }
 
       if (p > string && p[-1] == '\\')
@@ -2232 +2245 @@
 find_percent (char *pattern)
 {
-  return find_char_unquote (pattern, '%', 0, 0);
+  return find_char_unquote (pattern, '%', 0, 0, 0);
 }
 
@@ -2252 +2265 @@
 parse_file_seq (char **stringp, int stopchar, unsigned int size, int strip)
 {
-  register struct nameseq *new = 0;
-  register struct nameseq *new1, *lastnew1;
-  register char *p = *stringp;
+  struct nameseq *new = 0;
+  struct nameseq *new1, *lastnew1;
+  char *p = *stringp;
   char *q;
   char *name;
@@ -2275 +2288 @@
       /* Yes, find end of next name.  */
       q = p;
-      p = find_char_unquote (q, stopchar, VMS_COMMA, 1);
+      p = find_char_unquote (q, stopchar, VMS_COMMA, 1, 0);
 #ifdef VMS
         /* convert comma separated list to space separated */
@@ -2286 +2299 @@
                || isspace ((unsigned char)p[-1])))
       {
-        p = find_char_unquote (p+1, stopchar, VMS_COMMA, 1);
+        p = find_char_unquote (p+1, stopchar, VMS_COMMA, 1, 0);
       }
 #endif
@@ -2297 +2310 @@
       while (p != 0 && !isspace ((unsigned char)*p) &&
              (p[1] == '\\' || p[1] == '/') && isalpha ((unsigned char)p[-1]))
-        p = find_char_unquote (p + 1, stopchar, VMS_COMMA, 1);
+        p = find_char_unquote (p + 1, stopchar, VMS_COMMA, 1, 0);
 #endif
       if (p == 0)
@@ -2907 +2920 @@
   dirs[idx] = 0;
 
-  /* Now compute the maximum length of any name in it.  */
+  /* Now compute the maximum length of any name in it. Also add each
+     dir to the .INCLUDE_DIRS variable.  */
 
   max_incl_len = 0;
@@ -2920 +2934 @@
       if (len > max_incl_len)
         max_incl_len = len;
+
+      /* Append to .INCLUDE_DIRS.   */
+      do_variable_definition (NILF, ".INCLUDE_DIRS", dirs[i],
+                              o_default, f_append, 0);
     }