From: ceriel <none@none>
Date: Mon, 10 Aug 1987 11:17:20 +0000 (+0000)
Subject: nestlevel count per file
X-Git-Tag: release-5-5~3918
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=e5af61151ee5dba3fd870a21bdaa4cd08ca8a630;p=ack.git

nestlevel count per file
---

diff --git a/lang/cem/cemcom/domacro.c b/lang/cem/cemcom/domacro.c
index b788cbead..5be23aa35 100644
--- a/lang/cem/cemcom/domacro.c
+++ b/lang/cem/cemcom/domacro.c
@@ -31,7 +31,6 @@ IMPORT char *getwdir();
 PRIVATE char ifstack[IFDEPTH];	/* if-stack: the content of an entry is	*/
 				/* 1 if a corresponding ELSE has been	*/
 				/* encountered.				*/
-int nestlevel = -1;		/* initially no nesting level.		*/
 
 PRIVATE struct idf *
 GetIdentifier()
@@ -250,6 +249,7 @@ do_include()
 			File_Inserted = 1;
 			FileName = result;
 			LineNumber = 0;
+			nestlevel = -1;
 		}
 	}
 }
diff --git a/lang/cem/cemcom/file_info.h b/lang/cem/cemcom/file_info.h
index 740e27b5c..21bdd9db1 100644
--- a/lang/cem/cemcom/file_info.h
+++ b/lang/cem/cemcom/file_info.h
@@ -7,10 +7,12 @@
 
 struct file_info {
 	unsigned int	fil_lino;
+	int		fil_nestlevel;
 	char		*fil_name;
 	char		*fil_wdir;
 };
 
+#define nestlevel	finfo.fil_nestlevel
 #define LineNumber	finfo.fil_lino
 #define FileName	finfo.fil_name
 #define WorkingDir	finfo.fil_wdir
diff --git a/lang/cem/cemcom/input.c b/lang/cem/cemcom/input.c
index ff2792335..70f335815 100644
--- a/lang/cem/cemcom/input.c
+++ b/lang/cem/cemcom/input.c
@@ -53,7 +53,6 @@ AtEoIT()
 AtEoIF()
 {
 #ifndef NOPP
-	extern int nestlevel;
 
 	if (nestlevel != -1) lexwarning("missing #endif");
 	else
diff --git a/lang/cem/cemcom/main.c b/lang/cem/cemcom/main.c
index a909e7265..3a81a931c 100644
--- a/lang/cem/cemcom/main.c
+++ b/lang/cem/cemcom/main.c
@@ -171,6 +171,7 @@ compile(argc, argv)
 	File_Inserted = 1;
 	init();
 	LineNumber = 0;
+	nestlevel = -1;
 #ifndef NOPP
 	WorkingDir = getwdir(source);
 #endif NOPP