Rename ocamlyacc's -e option --strict.

Author: yallop

Makefile.shared

@@ -29,7 +29,7 @@ COMPFLAGS=-strict-sequence -principal -absname -w +a-4-9-41-42-44-45-48 -warn-er
           -bin-annot -safe-string -strict-formats $(INCLUDES)
 LINKFLAGS=
 
-YACCFLAGS=-v -e
+YACCFLAGS=-v --strict
 CAMLLEX=$(CAMLRUN) boot/ocamllex
 CAMLDEP=$(CAMLRUN) tools/ocamldep
 DEPFLAGS=$(INCLUDES)

yacc/error.c

@@ -317,7 +317,7 @@ void polymorphic_entry_point(char *s)
 void forbidden_conflicts(void)
 {
     fprintf(stderr,
-            "%s: the grammar has conflicts, but -e was specified\n",
+            "%s: the grammar has conflicts, but --strict was specified\n",
             myname);
     done(1);
 }

yacc/main.c

@@ -161,7 +161,7 @@ void set_signals(void)
 
 void usage(void)
 {
-    fprintf(stderr, "usage: %s [-v] [-e] [-q] [-b file_prefix] filename\n",
+    fprintf(stderr, "usage: %s [-v] [--strict] [-q] [-b file_prefix] filename\n",
             myname);
     exit(1);
 }
@@ -185,6 +185,10 @@ void getargs(int argc, char **argv)
             return;
 
         case '-':
+            if (!strcmp (argv[i], "--strict")){
+              eflag = 1;
+              goto end_of_option;
+            }
             ++i;
             goto no_more_options;
 
@@ -214,10 +218,6 @@ void getargs(int argc, char **argv)
                 usage();
             continue;
 
-        case 'e':
-            eflag = 1;
-            continue;
-
         default:
             usage();
         }