Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make make: in parse-only mode, do not update the exp...



details:   https://anonhg.NetBSD.org/src/rev/b9e31a771381
branches:  trunk
changeset: 953643:b9e31a771381
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Mar 14 20:09:26 2021 +0000

description:
make: in parse-only mode, do not update the expression value in ':sh'

No functional change outside debug mode.  The other variable modifiers
behave in the same way.

diffstat:

 usr.bin/make/var.c |  13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diffs (34 lines):

diff -r 228a2ae1e6bb -r b9e31a771381 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Mar 14 20:03:56 2021 +0000
+++ b/usr.bin/make/var.c        Sun Mar 14 20:09:26 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.879 2021/03/14 20:03:56 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.880 2021/03/14 20:09:26 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
 #include "metachar.h"
 
 /*     "@(#)var.c      8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.879 2021/03/14 20:03:56 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.880 2021/03/14 20:09:26 rillig Exp $");
 
 typedef enum VarFlags {
        VFL_NONE        = 0,
@@ -3586,15 +3586,6 @@
                if (errfmt != NULL)
                        Error(errfmt, expr->value.str);
                Expr_SetValueOwn(expr, output);
-       } else {
-               /*
-                * TODO: Check whether returning ":sh" would be
-                *  more consistent with the other modifiers.
-                *
-                * TODO: Add a unit test demonstrating that the
-                *  actual value of this expression has any effect.
-                */
-               Expr_SetValueRefer(expr, "");
        }
 
        return AMR_OK;



Home | Main Index | Thread Index | Old Index