WIP: fix compilation

build-aux/bin/bison++.in

@@ -123,13 +123,6 @@ s{yystack_\[yylen - 1\]\.location}
 # Kill trailing blanks.
 s/[ \t]+$//;
 '  "$file"
-
-  # Fuse the switches of the parser.
-  case $file in
-    (*.cc) $fuse_switch $file
-          # diff -uw $file.bak $file || true
-          ;;
-  esac
 }
 
 # compile_xml_file XML XSL OUT-EXT
@@ -223,7 +216,6 @@ if ! $BISON --version >/dev/null 2>&1; then
 fi
 
 
-fuse_switch='@abs_srcdir@/fuse-switch'
 move_if_change='@abs_srcdir@/move-if-change --color'
 verbose=false
 

build-aux/bin/fuse-switch

-#! /usr/bin/perl -w
-
-# This script *tries* to fuse consecutive "switches" that have the
-# same body.
-#
-# Usage: $0 FILES
-#
-# Leaves a copy of the input files as FILE.bak.
-
-
-use strict;
-
-my $case_re = '^\s*(case\b.*|default)\s*:';
-
-# Return the block of code with all the ignored parts removed.
-sub code ($)
-{
-  local ($_) = @_;
-#  print STDERR "CODE IN: $_";
-  s,//.*,,gm;
-  s,/\*.*?.*\*/,,gm;
-  s/#line .*//gm;
-#  print STDERR "CODE OUT: $_";
-  return $_;
-}
-
-# Compare two case blocks against equality, ignoring the case label.
-sub case_eq($$)
-{
-  my ($b1, $b2) = @_;
-  return case_body(code($b1)) eq case_body(code($b2));
-}
-
-# Return the line which contains the "case" this block of code.
-sub case_label($)
-{
-  my ($case) = @_;
-  my $res = '';
-  for my $line (split "\n", $case)
-    {
-      # We put no space at the end of '//-' not to introduce trailing
-      # spaces.
-      $res .= ($line !~ /$case_re/ && '//-') . $line . "\n"
-    }
-  return $res;
-}
-
-# Return the case-block without its case line.
-sub case_body($)
-{
-  local ($_) = @_;
-# print STDERR "BODY IN: $_";
-  s/^.*$case_re.*\n//mg;
-#  print STDERR "BODY OUT: $_";
-  return $_;
-}
-
-
-sub fuse($$)
-{
-  my ($input, $output) = @_;
-  use IO::File;
-
-  my $in = new IO::File($input) or die;
-  my $out = new IO::File(">$output") or die;
-
-  # Something before the next $case.
-  my $pre_case = '';
-  # The body of the case: from case/default to the next break;
-  # There must be no break inside.
-  my $case = '';
-  my $previous_case = '';
-
-  # Whether we are in the switch {}.
-  my $in_switch = 0;
-
-  while ($_ = $in->getline)
-    {
-#      print STDERR "\$_ = $_";
-      if (!$in_switch)
-        {
-          if (/^\s*switch\b/)
-            {
-              $in_switch = 1;
-            }
-        }
-      elsif (/#define YYCASE_/)
-        {
-          # If we're in a switch but see this macro, keep the switch as is
-          # altogether
-          # Usually at this point $pre_case contains the openning '{' of the
-          # switch
-          $_ = $pre_case . $_;
-          $pre_case = '';
-          $in_switch = 0;
-        }
-      else
-        {
-          # in switch.
-          #
-          # The "default: break" one a single line is output by
-          # bison's lalr1.cc..
-          if (m/$case_re/ .. m/^\s*(?:default:\s*)?break/)
-            {
-              # Register the current case.
-              $case .= $_;
-              if (/break/)
-                {
-                  if (case_eq($previous_case, $case))
-                    {
-#                      print STDERR "== {{$previous_case}} {{$case}}\n";
-                      $_ = case_label ($previous_case);
-                    }
-                  else
-                    {
-                      # The previous case is needed.
-#                      print STDERR "!= {{$previous_case}} {{$case}}\n";
-                      $_ = $previous_case;
-                    }
-                  $previous_case = $case;
-                  $case = "";
-                  $_ .= $pre_case;
-                  $pre_case = '';
-                }
-              else
-                {
-                  # Print nothing.
-                  $_ = "";
-                }
-            }
-          elsif (m/}/)
-            {
-              # The closing brace of the switch.
-              $_ = $previous_case . $pre_case . $_;
-              $pre_case = '';
-              $previous_case = '';
-              $in_switch = 0;
-            }
-          else
-            {
-              # Something in a switch, but not in a case.  Keep it,
-              # and output it before the forth coming output.  Don't
-              # put it in $case though, as it would be commented out,
-              # which might be wrong (e.g., pragmas, or cpp
-              # directives).
-              $pre_case .= $_;
-              $_ = '';
-            }
-        }
-      print $out $_;
-    }
-  die "could not insert $pre_case"
-    if $pre_case;
-}
-
-use File::Copy;
-for my $file (@ARGV)
-{
-  copy ($file, "$file.bak") or die;
-  fuse("$file.bak", "$file");
-}
-
-### Setup "GNU" style for perl-mode and cperl-mode.
-## Local Variables:
-## perl-indent-level: 2
-## perl-continued-statement-offset: 2
-## perl-continued-brace-offset: 0
-## perl-brace-offset: 0
-## perl-brace-imaginary-offset: 0
-## perl-label-offset: -2
-## cperl-indent-level: 2
-## cperl-brace-offset: 0
-## cperl-continued-brace-offset: 0
-## cperl-label-offset: -2
-## cperl-extra-newline-before-brace: t
-## cperl-merge-trailing-else: nil
-## cperl-continued-statement-offset: 2
-## End:

lib/vcsn/rat/parse.yy

@@ -122,7 +122,7 @@
   @$ = driver_.location_;
 }
 
-%printer { yyo << '"' << $$ << '"'; } <std::string> <symbol>;
+%printer { yyo << '"' << $$ << '"'; } <std::string>;
 %printer
 {
   yyo << '[';