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 b034a4a629e66bb33f5d980e26d982b5917544c0..a63cbce48b38b8331802744447c6782e434a9d6c 100644 (file)
--- a/data/c++.m4
+++ b/data/c++.m4
@@ -520,3 +520,13 @@ m4_define([b4_yylloc_default_define],
     while (/*CONSTCOND*/ false)
 # endif
 ]])
     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 0afceeac00c9bcadd956a61a52ae8eb264354621..0164eda6b439c5ddde10e82bac75b6342f4c32c9 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -43,12 +43,6 @@
 #   user must initialize the first positions (in particular the
 #   filename member).
 
 #   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])
 
 # We require a pure interface.
 m4_define([b4_pure_flag],      [1])