Module Name: src
Committed By: rillig
Date: Fri Dec 31 00:18:06 UTC 2021
Modified Files:
src/usr.bin/make: main.c nonints.h parse.c
Log Message:
make: unexport types VarAssignOp and VarAssign
These types are only needed in the parsing module.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.562 -r1.563 src/usr.bin/make/main.c
cvs rdiff -u -r1.226 -r1.227 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.604 -r1.605 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.562 src/usr.bin/make/main.c:1.563
--- src/usr.bin/make/main.c:1.562 Tue Dec 28 21:56:13 2021
+++ src/usr.bin/make/main.c Fri Dec 31 00:18:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.562 2021/12/28 21:56:13 rillig Exp $ */
+/* $NetBSD: main.c,v 1.563 2021/12/31 00:18:06 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.562 2021/12/28 21:56:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.563 2021/12/31 00:18:06 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -641,10 +641,7 @@ rearg:
* on the end of the "create" list.
*/
for (; argc > 1; argv++, argc--) {
- VarAssign var;
- if (Parse_IsVar(argv[1], &var)) {
- Parse_Var(&var, SCOPE_CMDLINE);
- } else {
+ if (!Parse_VarAssign(argv[1], false, SCOPE_CMDLINE)) {
if (argv[1][0] == '\0')
Punt("illegal (null) argument.");
if (argv[1][0] == '-' && !dashDash)
Index: src/usr.bin/make/nonints.h
diff -u src/usr.bin/make/nonints.h:1.226 src/usr.bin/make/nonints.h:1.227
--- src/usr.bin/make/nonints.h:1.226 Fri Dec 31 00:01:02 2021
+++ src/usr.bin/make/nonints.h Fri Dec 31 00:18:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.226 2021/12/31 00:01:02 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.227 2021/12/31 00:18:06 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -141,25 +141,10 @@ const char *cached_realpath(const char *
void Parse_Init(void);
void Parse_End(void);
-typedef enum VarAssignOp {
- VAR_NORMAL, /* = */
- VAR_APPEND, /* += */
- VAR_DEFAULT, /* ?= */
- VAR_SUBST, /* := */
- VAR_SHELL /* != or :sh= */
-} VarAssignOp;
-
-typedef struct VarAssign {
- char *varname; /* unexpanded */
- VarAssignOp op;
- const char *value; /* unexpanded */
-} VarAssign;
-
typedef char *(*ReadMoreProc)(void *, size_t *);
void Parse_Error(ParseErrorLevel, const char *, ...) MAKE_ATTR_PRINTFLIKE(2, 3);
-bool Parse_IsVar(const char *, VarAssign *out_var) MAKE_ATTR_USE;
-void Parse_Var(VarAssign *, GNode *);
+bool Parse_VarAssign(const char *, bool, GNode *) MAKE_ATTR_USE;
void Parse_AddIncludeDir(const char *);
void Parse_File(const char *, int);
void Parse_PushInput(const char *, int, int, ReadMoreProc, void *);
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.604 src/usr.bin/make/parse.c:1.605
--- src/usr.bin/make/parse.c:1.604 Wed Dec 29 05:01:35 2021
+++ src/usr.bin/make/parse.c Fri Dec 31 00:18:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.604 2021/12/29 05:01:35 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.605 2021/12/31 00:18:06 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.604 2021/12/29 05:01:35 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.605 2021/12/31 00:18:06 rillig Exp $");
/* types and constants */
@@ -1625,6 +1625,20 @@ out:
Lst_Free(paths);
}
+typedef enum VarAssignOp {
+ VAR_NORMAL, /* = */
+ VAR_APPEND, /* += */
+ VAR_DEFAULT, /* ?= */
+ VAR_SUBST, /* := */
+ VAR_SHELL /* != or :sh= */
+} VarAssignOp;
+
+typedef struct VarAssign {
+ char *varname; /* unexpanded */
+ VarAssignOp op;
+ const char *value; /* unexpanded */
+} VarAssign;
+
typedef struct VarAssignParsed {
const char *nameStart; /* unexpanded */
const char *nameEnd; /* before operator adjustment */
@@ -1693,7 +1707,7 @@ AdjustVarassignOp(const VarAssignParsed
*
* Used for both lines in a file and command line arguments.
*/
-bool
+static bool
Parse_IsVar(const char *p, VarAssign *out_var)
{
VarAssignParsed pvar;
@@ -1891,7 +1905,7 @@ VarAssignSpecial(const char *name, const
}
/* Perform the variable assignment in the given scope. */
-void
+static void
Parse_Var(VarAssign *var, GNode *scope)
{
FStr avalue; /* actual value (maybe expanded) */
@@ -2925,16 +2939,16 @@ ParseDirective(char *line)
return true;
}
-static bool
-ParseVarassign(const char *line)
+bool
+Parse_VarAssign(const char *line, bool finishDependencyGroup, GNode *scope)
{
VarAssign var;
if (!Parse_IsVar(line, &var))
return false;
-
- FinishDependencyGroup();
- Parse_Var(&var, SCOPE_GLOBAL);
+ if (finishDependencyGroup)
+ FinishDependencyGroup();
+ Parse_Var(&var, scope);
return true;
}
@@ -3072,7 +3086,7 @@ ParseLine(char *line)
}
#endif
- if (ParseVarassign(line))
+ if (Parse_VarAssign(line, true, SCOPE_GLOBAL))
return;
FinishDependencyGroup();
