From 15a5e8665fd2deb408faad36d85084c3a5f04ee5 Mon Sep 17 00:00:00 2001
From: Laurent Zhu <laurent.zhu@epita.fr>
Date: Sat, 5 Jan 2019 13:55:48 +0100
Subject: [PATCH] bison: no longer fuse the similar case clauses

* build-aux/bin/bison++.in: Don't use fuse-switch.
* build-aux/bin/fuse-switch: Die when you did wrong.
---
 build-aux/bin/bison++.in  | 10 +++++-----
 build-aux/bin/fuse-switch |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/build-aux/bin/bison++.in b/build-aux/bin/bison++.in
index 733750b..d443b5c 100755
--- a/build-aux/bin/bison++.in
+++ b/build-aux/bin/bison++.in
@@ -119,11 +119,11 @@ s/[ \t]+$//;
 '  "$file"
 
   # Fuse the switches of the parser.
-  case $file in
-    (*.cc) $fuse_switch $file
-          # diff -uw $file.bak $file || true
-          ;;
-  esac
+  # case $file in
+  #  (*.cc) $fuse_switch $file
+  #         diff -uw $file.bak $file || true
+  #        ;;
+  # esac
 }
 
 # compile_xml_file XML XSL OUT-EXT
diff --git a/build-aux/bin/fuse-switch b/build-aux/bin/fuse-switch
index 0d48d41..99ef045 100755
--- a/build-aux/bin/fuse-switch
+++ b/build-aux/bin/fuse-switch
@@ -137,6 +137,9 @@ sub fuse($$)
               $_ = '';
             }
         }
+      die "still in switch"
+        if $in_switch;
+
       print $out $_;
     }
   die "could not insert $pre_case"
-- 
GitLab