 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.406 2020/10/28 01:51:36 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.407 2020/10/28 01:58:37 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -107,27 +107,27 @@
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
 #ifndef MAP_COPY
 #define MAP_COPY MAP_PRIVATE
 #endif
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.406 2020/10/28 01:51:36 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.407 2020/10/28 01:58:37 rillig Exp $");
 /* types and constants */
 /*
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
     char *fname;		/* name of file */
     Boolean fromForLoop;	/* simulated .include by the .for loop */
     int lineno;			/* current line number in file */
     int first_lineno;		/* line number of start of text */
     unsigned int cond_depth;	/* 'if' nesting when file opened */
     Boolean depending;		/* state of doing_depend on EOF */
 @@ -205,27 +205,27 @@ static GNodeList *targets;
 #ifdef CLEANUP
 /* All shell commands for all targets, in no particular order and possibly
  * with duplicates.  Kept in a separate list since the commands from .USE or
  * .USEBEFORE nodes are shared with other GNodes, thereby giving up the
  * easily understandable ownership over the allocated strings. */
 static StringList *targCmds;
 #endif
 /*
  * Predecessor node for handling .ORDER. Initialized to NULL when .ORDER
  * seen, then set to each successive source on the line.
  */
-static GNode *predecessor;
+static GNode *order_pred;
 /* parser state */
 /* number of fatal errors */
 static int fatals = 0;
 /*
  * Variables for doing includes
  */
 /* current file being read */
 static IFile *curFile;
 @@ -909,40 +909,40 @@ ParseDoSrcMain(const char *src)
+}
 static void
 ParseDoSrcOrder(const char *src)
+{
     GNode *gn;
     /*
      * Create proper predecessor/successor links between the previous
      * source and the current one.
      */
     gn = Targ_GetNode(src);
     if (doing_depend)
 	ParseMark(gn);
-    if (predecessor != NULL) {
+    if (order_pred != NULL) {
-	Lst_Append(predecessor->order_succ, gn);
+	Lst_Append(order_pred->order_succ, gn);
-	Lst_Append(gn->order_pred, predecessor);
+	Lst_Append(gn->order_pred, order_pred);
 	if (DEBUG(PARSE)) {
 	    debug_printf("# %s: added Order dependency %s - %s\n",
-			 __func__, predecessor->name, gn->name);
+			 __func__, order_pred->name, gn->name);
-	    Targ_PrintNode(predecessor, 0);
+	    Targ_PrintNode(order_pred, 0);
 	    Targ_PrintNode(gn, 0);
+	}
+    }
     /*
      * The current source now becomes the predecessor for the next one.
      */
-    predecessor = gn;
+    order_pred = gn;
+}
 static void
 ParseDoSrcOther(const char *src, GNodeType tOp, ParseSpecial specType)
+{
     GNode *gn;
     /*
      * If the source is not an attribute, we need to find/create
      * a node for it. After that we can apply any operator to it
      * from a special target or link it to its parents, as
      * appropriate.
+     *
 @@ -1138,27 +1138,27 @@ ParseDoDependencyTargetSpecial(ParseSpec
 	DEFAULT = gn;
 	break;
+    }
     case SP_DELETE_ON_ERROR:
 	deleteOnError = TRUE;
 	break;
     case SP_NOTPARALLEL:
 	opts.maxJobs = 1;
 	break;
     case SP_SINGLESHELL:
 	opts.compatMake = TRUE;
 	break;
     case SP_ORDER:
-	predecessor = NULL;
+	order_pred = NULL;
 	break;
     default:
 	break;
+    }
+}
 /*
  * .PATH<suffix> has to be handled specially.
  * Call on the suffix module to give us a path to modify.
  */
 static Boolean
 ParseDoDependencyTargetPath(const char *line, SearchPathList **inout_paths)
+{