X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/85f0b29e6d2d1c8a49df9f378e2979c043a47827..93549bcd43da0b9d0b756876008bd388828e5a08:/data/lalr1.cc?ds=inline

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 57922578..6e299d5d 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -120,10 +120,6 @@ m4_pushdef([b4_copyright_years],
 m4_define([b4_parser_class_name],
           [b4_percent_define_get([[parser_class_name]])])
 
-# The header is mandatory.
-b4_defines_if([],
-              [b4_fatal([b4_skeleton[: using %%defines is mandatory]])])
-
 b4_locations_if([b4_percent_define_ifdef([[location_type]], [],
   [# Backward compatibility.
    m4_define([b4_location_constructors])
@@ -141,17 +137,20 @@ m4_define([b4_shared_declarations],
 # include <stdexcept>
 # include <string>
 # include <iostream>
+
+]b4_YYDEBUG_define[
+
 # include "stack.hh"
 ]b4_locations_if([b4_percent_define_ifdef([[location_type]], [],
-                                          [[# include "location.hh"]])])[
+    [b4_defines_if([[# include "location.hh"]])])])[
 
-]b4_variant_if([b4_namespace_open
-b4_variant_define
-b4_namespace_close])[
+]b4_namespace_open[
 
-]b4_YYDEBUG_define[
+]b4_locations_if([b4_percent_define_ifdef([[location_type]], [],
+  [b4_defines_if([], [b4_position_define
+b4_location_define])])])[
 
-]b4_namespace_open[
+]b4_variant_if([b4_variant_define])[
 
   /// A Bison parser.
   class ]b4_parser_class_name[