Make the structure for handling the input stack local to the parse

module. The only module accessing it (the current line number) was the
condition module, so pass the current line number as a function argument.
Centralize the pushing of new input sources into one function
ParsePushInput() and rename the function handling the popping from ParseEOF()
to ParsePopInput(). Make the entire thing a little bit clearer, by holding
the current input source in the top element of the stack instead of
using extra variables for this. Use a type-safe intrusive list for the
input stack.

1 files changed, 0 insertions, 3 deletions

diff --git a/usr.bin/make/globals.h b/usr.bin/make/globals.h
index c0b5050..8b87ba3 100644
--- a/usr.bin/make/globals.h
+++ b/usr.bin/make/globals.h
@@ -51,7 +51,6 @@
 #include "sprite.h"
 
 struct GNode;
-struct IFile;
 struct Path;
 
 /*
@@ -63,8 +62,6 @@ extern Lst create;
 /* The list of directories to search when looking for targets */
 extern struct Path dirSearchPath;
 
-extern struct IFile curFile;	/* current makefile */
-
 /* The list of directories to search when looking for includes */
 extern struct Path parseIncPath;