From 97c2c1d6f323d6d38dda4820c00ca8ca8f5b6940 Mon Sep 17 00:00:00 2001
From: Adrian Negreanu <groleo@gmail.com>
Date: Wed, 21 Sep 2016 13:31:14 +0300
Subject: bison: use %declarations instead of command line options.

---
 src/CMakeLists.txt | 3 +--
 src/constexp.y     | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3661491..1d6d217 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -118,8 +118,7 @@ FLEX_TARGET(constexp       constexp.l       ${GENERATED_SRC}/constexp.cpp
 FLEX_TARGET(xmlcode        xmlcode.l        ${GENERATED_SRC}/xmlcode.cpp        COMPILE_FLAGS "${LEX_FLAGS}")
 FLEX_TARGET(configimpl     configimpl.l     ${GENERATED_SRC}/configimpl.cpp     COMPILE_FLAGS "${LEX_FLAGS}")
 
-BISON_TARGET(vhdlparser    vhdlparser.y     ${GENERATED_SRC}/vhdlparser.cpp     COMPILE_FLAGS "${YACC_FLAGS} -l -p vhdlscannerYY")
-BISON_TARGET(constexp      constexp.y       ${GENERATED_SRC}/ce_parse.cpp       COMPILE_FLAGS "${YACC_FLAGS} -l -p constexpYY")
+BISON_TARGET(constexp      constexp.y       ${GENERATED_SRC}/ce_parse.cpp       COMPILE_FLAGS "${YACC_FLAGS}")
 
 add_library(doxycfg STATIC
     ${GENERATED_SRC}/lang_cfg.h
diff --git a/src/constexp.y b/src/constexp.y
index c63fa5e..cada993 100644
--- a/src/constexp.y
+++ b/src/constexp.y
@@ -42,6 +42,9 @@ int constexpYYlex();
 
 %}
 
+%no-lines
+%name-prefix "constexpYY"
+
 %token TOK_QUESTIONMARK
 %token TOK_COLON
 %token TOK_OR
-- 
cgit v0.12