Allow the checking of definition modules

diff --git a/lang/m2/comp/Version.c b/lang/m2/comp/Version.c
index 1f37d6d..ae1bb5d 100644 (file)
--- a/lang/m2/comp/Version.c
+++ b/lang/m2/comp/Version.c
@@ -1 +1 @@
-static char Version[] = "ACK Modula-2 compiler Version 0.30";
+static char Version[] = "ACK Modula-2 compiler Version 0.31";

diff --git a/lang/m2/comp/options.c b/lang/m2/comp/options.c
index 4f5b742..8290a18 100644 (file)
--- a/lang/m2/comp/options.c
+++ b/lang/m2/comp/options.c
@@ -71,7 +71,7 @@ DoOption(text)
                                }
                        }
                }
-               else warning_classes = 0;
+               else warning_classes = W_ALWAYS;
                break;
 
        case 'W':
@@ -94,7 +94,7 @@ DoOption(text)
                                }
                        }
                }
-               else warning_classes = W_OLDFASHIONED|W_STRICT|W_ORDINARY;
+               else warning_classes = W_ALL;
                break;
 
        case 'M': {     /* maximum identifier length */

diff --git a/lang/m2/comp/program.g b/lang/m2/comp/program.g
index 31fbf66..0f4672c 100644 (file)
--- a/lang/m2/comp/program.g
+++ b/lang/m2/comp/program.g
@@ -137,7 +137,7 @@ DefinitionModule
                          df->df_flags |= ForeignFlag;
                          if (!Defined) Defined = df;
                          CurrentScope->sc_definedby = df;
-                         if (df->df_idf != DefId) {
+                         if (DefId && df->df_idf != DefId) {
                                error("DEFINITION MODULE name is \"%s\", not \"%s\"",
                                        df->df_idf->id_text, DefId->id_text);
                          }
@@ -239,8 +239,12 @@ ProgramModule
 ;
 
 Module:
-       DEFINITION
-                               { fatal("Compiling a definition module"); }
+                               { error("Compiling a definition module");
+                                 open_scope(CLOSEDSCOPE);
+                                 state = DEFINITION;
+                               }
+       DefinitionModule
+                               { close_scope(SC_CHKFORW); }
 |      %default
        [
                IMPLEMENTATION  { state = IMPLEMENTATION; }

diff --git a/lang/m2/comp/warning.h b/lang/m2/comp/warning.h
index 0486bca..a577191 100644 (file)
--- a/lang/m2/comp/warning.h
+++ b/lang/m2/comp/warning.h
@@ -20,10 +20,11 @@
 #define        W_ORDINARY      1
 #define W_STRICT       2
 #define W_OLDFASHIONED 4
+#define W_ALWAYS       010     /* always given */
 
-#define W_ALL          (W_ORDINARY|W_STRICT|W_OLDFASHIONED)
+#define W_ALL          (W_ORDINARY|W_STRICT|W_OLDFASHIONED|W_ALWAYS)
 
-#define W_INITIAL      (W_ORDINARY | W_OLDFASHIONED)
+#define W_INITIAL      (W_ORDINARY | W_OLDFASHIONED | W_ALWAYS)
 
 /* The bit mask itself: */
 extern int     warning_classes;