From 37bf9fae01d8455acc7c9835c30955da0ae6019b Mon Sep 17 00:00:00 2001 From: Rangi <35663410+Rangi42@users.noreply.github.com> Date: Sat, 14 Jun 2025 17:01:16 -0400 Subject: [PATCH] Only define `parse.lac` for Bison 3.5 or greater (#1702) --- src/CMakeLists.txt | 4 ++-- src/bison.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index de822051..7f1f51c9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,10 +9,10 @@ set(common_src ) find_package(BISON 3.0.0 REQUIRED) -set(BISON_FLAGS "-Wall -Dparse.lac=full -Dlr.type=ielr") +set(BISON_FLAGS "-Wall -Dlr.type=ielr") # Set some optimization flags on versions that support them if(BISON_VERSION VERSION_GREATER_EQUAL "3.5") - set(BISON_FLAGS "${BISON_FLAGS} -Dapi.token.raw=true") + set(BISON_FLAGS "${BISON_FLAGS} -Dparse.lac=full -Dapi.token.raw=true") endif() if(BISON_VERSION VERSION_GREATER_EQUAL "3.6") set(BISON_FLAGS "${BISON_FLAGS} -Dparse.error=detailed") diff --git a/src/bison.sh b/src/bison.sh index 3a18d076..0e58c0cd 100755 --- a/src/bison.sh +++ b/src/bison.sh @@ -12,11 +12,11 @@ if [ "$BISON_MAJOR" -lt 3 ]; then exit 1 fi -BISON_FLAGS="-Wall -Dparse.lac=full -Dlr.type=ielr" +BISON_FLAGS="-Wall -Dlr.type=ielr" # Set some optimization flags on versions that support them if [ "$BISON_MAJOR" -ge 4 ] || [ "$BISON_MAJOR" -eq 3 ] && [ "$BISON_MINOR" -ge 5 ]; then - BISON_FLAGS="$BISON_FLAGS -Dapi.token.raw=true" + BISON_FLAGS="$BISON_FLAGS -Dparse.lac=full -Dapi.token.raw=true" fi if [ "$BISON_MAJOR" -ge 4 ] || [ "$BISON_MAJOR" -eq 3 ] && [ "$BISON_MINOR" -ge 6 ]; then BISON_FLAGS="$BISON_FLAGS -Dparse.error=detailed"