From: Akim Demaille <akim@lrde.epita.fr>
Date: Fri, 8 Feb 2013 14:25:18 +0000 (+0100)
Subject: c++: api.token.constructor requires api.value.type=variant
X-Git-Tag: v2.7.90~105
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/1dce289a0070373300f399b2230c0dbdf366e729?hp=66c209cf435b5bfc5cf982d8df9cc3ef05b4546b

c++: api.token.constructor requires api.value.type=variant

Eventually it should also support "union".

* data/glr.cc: Move this check to...
* data/c++.m4: here, as lalr1.cc is affected too.
---

diff --git a/data/c++.m4 b/data/c++.m4
index b034a4a6..a63cbce4 100644
--- a/data/c++.m4
+++ b/data/c++.m4
@@ -520,3 +520,13 @@ m4_define([b4_yylloc_default_define],
     while (/*CONSTCOND*/ false)
 # endif
 ]])
+
+## -------- ##
+## Checks.  ##
+## -------- ##
+
+b4_token_ctor_if([b4_variant_if([],
+  [b4_fatal_at(b4_percent_define_get_loc(api.token.constructor),
+               [cannot use '%s' without '%s'],
+               [%define api.token.constructor],
+               [%define api.value.type variant]))])])
diff --git a/data/glr.cc b/data/glr.cc
index 0afceeac..0164eda6 100644
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -43,12 +43,6 @@
 #   user must initialize the first positions (in particular the
 #   filename member).
 
-b4_token_ctor_if([b4_variant_if([],
-  [b4_fatal_at(b4_percent_define_get_loc(api.token.constructor),
-               [cannot use '%s' without '%s'],
-               [%define api.token.constructor],
-               [%define api.value.type variant]))])])
-
 # We require a pure interface.
 m4_define([b4_pure_flag],      [1])