From 75db37c56432014bf21bf92e817c65e2eb327a21 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sun, 19 May 2019 11:16:20 +0200 Subject: [PATCH] fix: use copiable, not copyable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by Hans Åberg. http://lists.gnu.org/archive/html/bug-bison/2019-05/msg00017.html * data/skeletons/lalr1.cc, doc/bison.texi: here. --- data/skeletons/lalr1.cc | 2 +- doc/bison.texi | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/data/skeletons/lalr1.cc b/data/skeletons/lalr1.cc index ef5d76f5..522e5471 100644 --- a/data/skeletons/lalr1.cc +++ b/data/skeletons/lalr1.cc @@ -218,7 +218,7 @@ m4_define([b4_shared_declarations], ]b4_token_constructor_define[ private: - /// This class is not copyable. + /// This class is not copiable. ]b4_parser_class[ (const ]b4_parser_class[&); ]b4_parser_class[& operator= (const ]b4_parser_class[&); diff --git a/doc/bison.texi b/doc/bison.texi index d5913e8f..b200c5f7 100644 --- a/doc/bison.texi +++ b/doc/bison.texi @@ -11568,7 +11568,7 @@ Instead of using the built-in types you may use the @code{%define} variable The requirements over your @var{LocationType} are: @itemize @item -it must be copyable; +it must be copiable; @item in order to compute the (default) value of @code{@@$} in a reduction, the @@ -11578,7 +11578,7 @@ parser basically runs @@$.end = @@@var{N}.end; // The location of last right-hand side symbol. @end example @noindent -so there must be copyable @code{begin} and @code{end} members; +so there must be copiable @code{begin} and @code{end} members; @item alternatively you may redefine the computation of the default location, in @@ -14473,7 +14473,7 @@ London, Department of Computer Science, TR-00-12 (December 2000). @c LocalWords: YYENABLE bindtextdomain Makefile DEFS CPPFLAGS DBISON DeRemer @c LocalWords: autoreconf Pennello multisets nondeterminism Generalised baz ACM @c LocalWords: redeclare automata Dparse localedir datadir XSLT midrule Wno -@c LocalWords: multitable headitem hh basename Doxygen fno filename +@c LocalWords: multitable headitem hh basename Doxygen fno filename gdef @c LocalWords: doxygen ival sval deftypemethod deallocate pos deftypemethodx @c LocalWords: Ctor defcv defcvx arg accessors arithmetics CPP ifndef CALCXX @c LocalWords: lexer's calcxx bool LPAREN RPAREN deallocation cerrno climits @@ -14494,14 +14494,17 @@ London, Department of Computer Science, TR-00-12 (December 2000). @c LocalWords: errorVerbose subtype subtypes Wmidrule midrule's src rvalues @c LocalWords: automove evolutions Wother Wconflicts PNG lookaheads Acc sep @c LocalWords: xsltproc XSL xsl xhtml html num Wprecedence Werror fcaret gv -@c LocalWords: fdiagnostics setlocale nullptr ast srcdir copyable iff drv +@c LocalWords: fdiagnostics setlocale nullptr ast srcdir iff drv rgbWarning @c LocalWords: deftypefunx pragma Wnull dereference Wdocumentation elif ish @c LocalWords: Wdeprecated Wregister noinput yyloc yypos PODs sstream Wsign @c LocalWords: typename emplace Wconversion Wshorten yacchack reentrancy -@c LocalWords: Relocatability exprs fixit Wyacc parseable fixits ffixit +@c LocalWords: Relocatability exprs fixit Wyacc parseable fixits ffixit svg @c LocalWords: DNDEBUG cstring Wzero workalike POPL workalikes byacc UCB @c LocalWords: Penello's Penello Byson Byson's Corbett's CSD TOPLAS PDP -@c LocalWords: Beazley's goyacc ocamlyacc SIGACT SIGPLAN +@c LocalWords: Beazley's goyacc ocamlyacc SIGACT SIGPLAN colorWarning +@c LocalWords: setcolor rgbError colorError rgbNotice colorNotice derror +@c LocalWords: colorOff maincolor inlineraw darkviolet darkcyan dwarning +@c LocalWords: dnotice copiable @c Local Variables: @c ispell-dictionary: "american"