Re: C++17 skeleton with move semantics and std::variant

[Frank Heckenbach]

Hans Åberg wrote:

> Not that the patch is not for files with 'c++17-' in them.

Exactly. For the c++1[17] files, I provided the patched ones in my
original archive. But location.cc is used otherwise unchanged, so it
needs to be patched separately (didn't want to call it
location-c++17.cc as there's really nothing C++17 about it).

> This one is better. I got:
> $ patch < ../patch-c++.txt
> patching file stack.hh
> Hunk #1 FAILED at 130.
> Hunk #2 FAILED at 146.
> 2 out of 2 hunks FAILED -- saving rejects to file stack.hh.rej
> can't find file to patch at input line 33
> Perhaps you should have used the -p or --strip option?
> The text leading up to this was:
> --------------------------
> |--- location.cc
> |+++ location.cc
> --------------------------
> File to patch: 

You should apply the patch in /usr/share/bison (or your respective
Bison data directory), not in your build directory (where a stack.hh
exists, but is different, being generated from the stack.hh
template, so the patch fails; and location.cc won't exist, instead
position.hh and location.hh are generated from it).

So, try this:

cd /usr/share/bison
sudo patch < /path/to/extra-header-prefix.diff
cd /your/source/dir
rm -f stack.hh position.hh location.hh
make clean
make

Regards,
Frank