Sun Mar 14 20:12:16 2021 UTC ()

make: separate parsing and evaluating for modifier '::='

No functional change.


(rillig)

diff -r1.880 -r1.881 src/usr.bin/make/var.c

--- src/usr.bin/make/var.c 2021/03/14 20:09:26	1.880
+++ src/usr.bin/make/var.c 2021/03/14 20:12:16	1.881

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.880 2021/03/14 20:09:26 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.881 2021/03/14 20:12:16 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.
 @@ -130,27 +130,27 @@
 #include <regex.h>
 #endif
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "metachar.h"
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.880 2021/03/14 20:09:26 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.881 2021/03/14 20:12:16 rillig Exp $");
 typedef enum VarFlags {
 	VFL_NONE	= 0,
 	/*
 	 * The variable's value is currently being used by Var_Parse or
 	 * Var_Subst.  This marker is used to avoid endless recursion.
 	 */
 	VFL_IN_USE	= 1 << 0,
 	/*
 	 * The variable comes from the environment.
 	 * These variables are not registered in any GNode, therefore they
 @@ -3362,69 +3362,67 @@ ApplyModifier_IfElse(const char **pp, Ap
  *			it was not already set.
  *	  ::+=<str>	Appends <str> to variable.
  *	  ::!=<cmd>	Assigns output of <cmd> as the new value of
  *			variable.
  */
 static ApplyModifierResult
 ApplyModifier_Assign(const char **pp, ApplyModifiersState *st)
+{
 	Expr *expr = st->expr;
 	GNode *scope;
 	char *val;
 	VarParseResult res;
 	/* TODO: separate parsing from evaluating */
 	const char *mod = *pp;
 	const char *op = mod + 1;
 	if (op[0] == '=')
 		goto ok;
 	if ((op[0] == '!' || op[0] == '+' || op[0] == '?') && op[1] == '=')
 		goto ok;
 	return AMR_UNKNOWN;	/* "::<unrecognised>" */
 ok:
 	if (expr->var->name.str[0] == '\0') {
 		*pp = mod + 1;
 		return AMR_BAD;
+	}
 	scope = expr->scope;	/* scope where v belongs */
 	if (expr->defined == DEF_REGULAR && expr->scope != SCOPE_GLOBAL) {
 		Var *gv = VarFind(expr->var->name.str, expr->scope, FALSE);
 		if (gv == NULL)
 			scope = SCOPE_GLOBAL;
 		else
 			VarFreeEnv(gv);
 	switch (op[0]) {
 	case '+':
 	case '?':
 	case '!':
 		*pp = mod + 3;
 		break;
 	default:
 		*pp = mod + 2;
 		break;
+	}
 	res = ParseModifierPart(pp, st->endc, expr->eflags, st, &val);
 	if (res != VPR_OK)
 		return AMR_CLEANUP;
 	(*pp)--;		/* Go back to the st->endc. */
 	scope = expr->scope;	/* scope where v belongs */
 	if (expr->defined == DEF_REGULAR && expr->scope != SCOPE_GLOBAL) {
 		Var *gv = VarFind(expr->var->name.str, expr->scope, FALSE);
 		if (gv == NULL)
 			scope = SCOPE_GLOBAL;
 		else
 			VarFreeEnv(gv);
+	}
 	/* XXX: Expanding the variable name at this point sounds wrong. */
 	if (expr->eflags & VARE_WANTRES) {
 		switch (op[0]) {
 		case '+':
 			Var_AppendExpand(scope, expr->var->name.str, val);
 			break;
 		case '!': {
 			const char *errfmt;
 			char *cmd_output = Cmd_Exec(val, &errfmt);
 			if (errfmt != NULL)
 				Error(errfmt, val);
 			else
 				Var_SetExpand(scope,