From 03a13ce793b88015626a7e636c356262ae885e34 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim.demaille@gmail.com>
Date: Wed, 17 Oct 2018 17:39:41 +0200
Subject: [PATCH] reader: recognize C++ even when it's not lalr1.cc or glr.cc

* src/reader.c (grammar_rule_check_and_complete): If a user uses her
own skeleton but sets the language to C++, recognize it as C++.
---
 src/reader.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/reader.c b/src/reader.c
index c546404f..d073d4ed 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -307,10 +307,10 @@ grammar_rule_check_and_complete (symbol_list *r)
           else
             {
               /* Install the default action only for C++.  */
-              bool is_cxx =
-                skeleton
-                ? STREQ (skeleton, "glr.cc") || STREQ (skeleton, "lalr1.cc")
-                : STREQ (language->language, "c++");
+              const bool is_cxx =
+                STREQ (language->language, "c++")
+                || (skeleton && (STREQ (skeleton, "glr.cc")
+                                 || STREQ (skeleton, "lalr1.cc")));
               if (is_cxx)
                 {
                   code_props_rule_action_init (&r->action_props, "{ $$ = $1; }",