From e1a843cc69712a5a1941c89dbb8bdbdf727898c9 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sat, 8 Dec 2018 08:05:00 +0100 Subject: [PATCH] d: fix double definition of YYSemanticType * data/lalr1.d: When moving to b4_user_union_members, it also defines b4_tag_seen_flag, so we had two definitions. --- data/lalr1.d | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/data/lalr1.d b/data/lalr1.d index 04b48e0e..2055884e 100644 --- a/data/lalr1.d +++ b/data/lalr1.d @@ -226,11 +226,10 @@ private immutable bool yy_location_is_class = true; ]]))m4_ifdef([b4_user_union_members], [private union YYSemanticType { b4_user_union_members -}; - -]m4_if(b4_tag_seen_flag, 0, -[[private alias int YYSemanticType;]])) -b4_token_enums(b4_tokens)[ +};], +[m4_if(b4_tag_seen_flag, 0, +[[private alias int YYSemanticType;]])])[ +]b4_token_enums(b4_tokens)[ ]b4_public_if([public ])dnl b4_abstract_if([abstract ])dnl b4_final_if([final ])dnl