style: clean up the scanner and parser

[Akim Demaille]

commit 45aa2bb7e00ab689525896d5700cb6646183ef9b
Author: Akim Demaille <address@hidden>
Date:   Sat Nov 10 12:55:27 2018 +0100

    style: clean up the scanner and parser
    
    * src/scan-gram.l: Formatting changes.
    Add "missing" assertion for symmetry.
    * src/parse-gram.y: Formatting changes.

diff --git a/src/parse-gram.y b/src/parse-gram.y
index 1962835e..9c84853f 100644
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -585,9 +585,9 @@ rules_or_grammar_declaration:
   rules
 | grammar_declaration ";"
 | error ";"
-    {
-      yyerrok;
-    }
+  {
+    yyerrok;
+  }
 ;
 
 rules:
diff --git a/src/scan-gram.l b/src/scan-gram.l
index 2fb05253..8998c60a 100644
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -591,10 +591,11 @@ eqopt    ([[:space:]]*=)?
 <SC_ESCAPED_STRING,SC_ESCAPED_CHARACTER>
 {
   \\[0-7]{1,3} {
+    verify (UCHAR_MAX < ULONG_MAX);
     unsigned long c = strtoul (yytext + 1, NULL, 8);
     if (!c || UCHAR_MAX < c)
       complain (loc, complaint, _("invalid number after \\-escape: %s"),
-                   yytext+1);
+                yytext+1);
     else
       obstack_1grow (&obstack_for_string, c);
   }
@@ -604,7 +605,7 @@ eqopt    ([[:space:]]*=)?
     unsigned long c = strtoul (yytext + 2, NULL, 16);
     if (!c || UCHAR_MAX < c)
       complain (loc, complaint, _("invalid number after \\-escape: %s"),
-                   yytext+1);
+                yytext+1);
     else
       obstack_1grow (&obstack_for_string, c);
   }
@@ -624,7 +625,7 @@ eqopt    ([[:space:]]*=)?
     int c = convert_ucn_to_byte (yytext);
     if (c <= 0)
       complain (loc, complaint, _("invalid number after \\-escape: %s"),
-                   yytext+1);
+                yytext+1);
     else
       obstack_1grow (&obstack_for_string, c);
   }
@@ -636,7 +637,7 @@ eqopt    ([[:space:]]*=)?
     else
       p = quotearg_style_mem (escape_quoting_style, p, 1);
     complain (loc, complaint, _("invalid character after \\-escape: %s"),
-                 p);
+              p);
   }
 }
 
@@ -853,7 +854,7 @@ scan_integer (char const *number, int base, location loc)
   if (INT_MAX < num)
     {
       complain (&loc, complaint, _("integer out of range: %s"),
-                   quote (number));
+                quote (number));
       num = INT_MAX;
     }