nestlevel count per file

diff --git a/lang/cem/cemcom/domacro.c b/lang/cem/cemcom/domacro.c
index b788cbe..5be23aa 100644 (file)
--- 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 740e27b..21bdd9d 100644 (file)
--- 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 ff27923..70f3358 100644 (file)
--- 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 a909e72..3a81a93 100644 (file)
--- 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