[project @ 1998-01-21 17:48:48 by sof]

Removed Haskell-1.2 option (unused), plus new option for warning
about SCC droppage.

diff --git a/ghc/compiler/parser/util.c b/ghc/compiler/parser/util.c
index 7602750..0b8c765 100644 (file)
--- a/ghc/compiler/parser/util.c
+++ b/ghc/compiler/parser/util.c
@@ -14,11 +14,12 @@ tree root;          /* The root of the built syntax tree. */
 list Lnil;
 
 BOOLEAN nonstandardFlag = FALSE;  /* Set if non-std Haskell extensions to be used. */
-BOOLEAN haskell1_2Flag = FALSE;          /* Set if we are compiling for 1.2               */
 BOOLEAN etags = FALSE;           /* Set if we're parsing only to produce tags.    */
 BOOLEAN hashIds = FALSE;         /* Set if Identifiers should be hashed.          */
                                  
 BOOLEAN ignoreSCC = TRUE;         /* Set if we ignore/filter scc expressions.      */
+BOOLEAN warnSCC = FALSE;          /* Set if we want to inform the user what _scc_s are
+                                     being ignored. */
                                  
 /**********************************************************************
 *                                                                     *
@@ -47,18 +48,6 @@ process_args(argc,argv)
        while (keep_munging_option && *++*argv != '\0') {
            switch(**argv) {
 
-           case 'N':
-                   nonstandardFlag = TRUE;
-                   break;
-
-           case '2':
-                   haskell1_2Flag = TRUE;
-                   break;
-
-           case 'S':
-                   ignoreSCC = FALSE;
-                   break;
-
            case 'D':
 #ifdef HSP_DEBUG
                    { extern int yydebug;
@@ -67,15 +56,28 @@ process_args(argc,argv)
 #endif
                    break;
 
+           case 'E':
+                   etags = TRUE;
+                   break;
+
            /* -Hn -- Use Hash Table, Size n (if given) */
            case 'H':
                    hashIds = TRUE;
                    if(*(*argv+1)!= '\0')
                      hash_table_size = atoi(*argv+1);
                    break;
-           case 'E':
-                   etags = TRUE;
+           case 'N':
+                   nonstandardFlag = TRUE;
+                   break;
+
+           case 'S':
+                   ignoreSCC = FALSE;
                    break;
+
+           case 'W':
+                   warnSCC = TRUE;
+                   break;
+
            }
        }
        argc--, argv++;

diff --git a/ghc/compiler/parser/utils.h b/ghc/compiler/parser/utils.h
index 1a682ec..95389ec 100644 (file)
--- a/ghc/compiler/parser/utils.h
+++ b/ghc/compiler/parser/utils.h
@@ -15,6 +15,7 @@ extern BOOLEAN hashIds;
 extern BOOLEAN etags;
                                  
 extern BOOLEAN ignoreSCC;
+extern BOOLEAN warnSCC;
                                  
 extern unsigned hash_table_size;