Author: bapt (ports committer)
Date: Mon Nov 28 12:29:16 2011
New Revision: 228060
URL: http://svn.freebsd.org/changeset/base/228060
Log:
upgrade gperf to the last GPLv2 version (3.0.3)
Reviewed by: cognet
Approved by: cognet
Added:
head/contrib/gperf/configure.ac
head/contrib/gperf/doc/configure.ac
head/contrib/gperf/lib/configure.ac
head/contrib/gperf/lib/getline.cc
head/contrib/gperf/lib/getline.h
head/contrib/gperf/src/config.h_vms
head/contrib/gperf/src/configure.ac
head/contrib/gperf/src/input.cc
head/contrib/gperf/src/input.h
head/contrib/gperf/src/keyword-list.cc
head/contrib/gperf/src/keyword-list.h
head/contrib/gperf/src/keyword-list.icc
head/contrib/gperf/src/keyword.cc
head/contrib/gperf/src/keyword.h
head/contrib/gperf/src/keyword.icc
head/contrib/gperf/src/output.cc
head/contrib/gperf/src/output.h
head/contrib/gperf/src/positions.cc
head/contrib/gperf/src/positions.h
head/contrib/gperf/src/positions.icc
head/contrib/gperf/src/search.cc
head/contrib/gperf/src/search.h
Deleted:
head/contrib/gperf/acconfig.h
head/contrib/gperf/configure.in
head/contrib/gperf/doc/configure.in
head/contrib/gperf/doc/gperf.texi
head/contrib/gperf/doc/gpl.texinfo
head/contrib/gperf/doc/texinfo.tex
head/contrib/gperf/lib/configure.in
head/contrib/gperf/src/configure.in
head/contrib/gperf/src/gen-perf.cc
head/contrib/gperf/src/gen-perf.h
head/contrib/gperf/src/iterator.cc
head/contrib/gperf/src/iterator.h
head/contrib/gperf/src/key-list.cc
head/contrib/gperf/src/key-list.h
head/contrib/gperf/src/list-node.cc
head/contrib/gperf/src/list-node.h
head/contrib/gperf/src/new.cc
head/contrib/gperf/src/read-line.cc
head/contrib/gperf/src/read-line.h
head/contrib/gperf/src/read-line.icc
head/contrib/gperf/src/trace.cc
head/contrib/gperf/src/trace.h
head/contrib/gperf/src/vectors.cc
head/contrib/gperf/src/vectors.h
head/contrib/gperf/tests/
Modified:
head/contrib/gperf/AUTHORS
head/contrib/gperf/COPYING
head/contrib/gperf/ChangeLog
head/contrib/gperf/FREEBSD-Xlist
head/contrib/gperf/INSTALL
head/contrib/gperf/Makefile.devel
head/contrib/gperf/Makefile.in
head/contrib/gperf/NEWS
head/contrib/gperf/README
head/contrib/gperf/aclocal.m4
head/contrib/gperf/configure
head/contrib/gperf/doc/Makefile.in
head/contrib/gperf/doc/configure
head/contrib/gperf/doc/gperf.1
head/contrib/gperf/doc/help2man
head/contrib/gperf/lib/Makefile.in
head/contrib/gperf/lib/configure
head/contrib/gperf/lib/hash.cc
head/contrib/gperf/lib/hash.h
head/contrib/gperf/src/Makefile.in
head/contrib/gperf/src/bool-array.cc
head/contrib/gperf/src/bool-array.h
head/contrib/gperf/src/bool-array.icc
head/contrib/gperf/src/config.h.in
head/contrib/gperf/src/configure
head/contrib/gperf/src/hash-table.cc
head/contrib/gperf/src/hash-table.h
head/contrib/gperf/src/main.cc
head/contrib/gperf/src/options.cc
head/contrib/gperf/src/options.h
head/contrib/gperf/src/options.icc
head/contrib/gperf/src/version.cc
head/contrib/gperf/src/version.h
head/gnu/usr.bin/gperf/Makefile
head/gnu/usr.bin/gperf/config.h
Modified: head/contrib/gperf/AUTHORS
==============================================================================
--- head/contrib/gperf/AUTHORS Mon Nov 28 11:14:32 2011 (r228059)
+++ head/contrib/gperf/AUTHORS Mon Nov 28 12:29:16 2011 (r228060)
@@ -1,2 +1,2 @@
Douglas C. Schmidt <schm...@ics.uci.edu>
-Bruno Haible <hai...@clisp.cons.org>
+Bruno Haible <br...@clisp.org>
Modified: head/contrib/gperf/COPYING
==============================================================================
--- head/contrib/gperf/COPYING Mon Nov 28 11:14:32 2011 (r228059)
+++ head/contrib/gperf/COPYING Mon Nov 28 12:29:16 2011 (r228060)
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301,
USA.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Modified: head/contrib/gperf/ChangeLog
==============================================================================
--- head/contrib/gperf/ChangeLog Mon Nov 28 11:14:32 2011
(r228059)
+++ head/contrib/gperf/ChangeLog Mon Nov 28 12:29:16 2011
(r228060)
@@ -1,3 +1,1646 @@
+2007-04-30 Brendan Kehoe <bren...@zen.org>
+
+ * gperf-3.0.3 released.
+ * src/version.cc: Bump to 3.0.3.
+ * tests/*.exp: Bump to 3.0.3 in header.
+ * doc/gperf.1: Regenerate with gperf 3.0.3.
+
+2007-04-06 Bruno Haible <br...@clisp.org>
+
+ Improve support for mingw.
+ * tests/Makefile.in (check-c, check-ada, check-modula3, check-pascal,
+ check-lang-utf8, check-lang-ucs2): Remove '\r' from output before diff.
+ (POSTPROCESS_FOR_MINGW): New variable.
+ (check-test): Use it to postprocess output before diff.
+
+2007-04-04 Bruno Haible <br...@clisp.org>
+
+ Support for newer GNU standards.
+ * doc/configure.ac (mandir): Remove assignment.
+ * doc/Makefile.in (datarootdir): New variable.
+ (docdir, dvidir, psdir, pdfdir, htmldir): Use value determined by
+ autoconf.
+ * configure.ac: Require autoconf >= 2.60.
+ * doc/configure.ac: Likewise.
+ * lib/configure.ac: Likewise.
+ * src/configure.ac: Likewise.
+ * tests/configure.ac: Likewise.
+ * configure: Regenerated with autoconf-2.61.
+ * doc/configure: Likewise.
+ * lib/configure: Likewise.
+ * src/configure: Likewise.
+ * tests/configure: Likewise.
+ * src/config.h.in: Likewise.
+ * src/config.h.msvc: Likewise.
+ * src/config.h_vms: Likewise.
+
+2007-04-04 Bruno Haible <br...@clisp.org>
+
+ * doc/Makefile.in (MAKEINFO): Disable also the LC_MESSAGES and LC_ALL
+ environment variables.
+
+2007-04-04 Bruno Haible <br...@clisp.org>
+
+ * configure.ac: Renamed from configure.in.
+ * doc/configure.ac: Renamed from doc/configure.in.
+ * lib/configure.ac: Renamed from lib/configure.in.
+ * src/configure.ac: Renamed from src/configure.in.
+ * tests/configure.ac: Renamed from tests/configure.in.
+ * Makefile.devel: Update.
+ * INSTALL: Update.
+
+2007-03-31 Bruno Haible <br...@clisp.org>
+
+ * tests/test.c (in_word_set): New declaration.
+ * tests/test2.c (in_word_set): Likewise.
+
+2007-03-31 Bruno Haible <br...@clisp.org>
+
+ * src/options.cc (Options::parse_options): Bump copyright year.
+
+2007-03-31 Bruno Haible <br...@clisp.org>
+
+ * doc/gperf.texi: Fix typo.
+
+2007-03-31 Bruno Haible <br...@clisp.org>
+
+ Change generated code after the meaning of __inline is changed in
+ GCC 4.3.
+ * src/output.cc (Output::output_lookup_function): Emit an inline
+ marker that also works with gcc-4.3 in c99 or gnu99 mode.
+ * tests/c-parse.exp, tests/charsets.exp, tests/chill.exp,
+ tests/cplusplus.exp, tests/gpc.exp, tests/incomplete.exp,
+ tests/java.exp, tests/languages.exp, tests/modula2.exp,
+ tests/objc.exp, tests/permut2.exp, tests/permut3.exp,
+ tests/permutc2.exp, tests/test-4.exp: Update.
+ Reported by Bruce Korb <bruce.k...@gmail.com>.
+
+2006-06-29 Brendan Kehoe <bren...@zen.org>
+
+ * gperf-3.0.2 released.
+
+ * doc/Makefile.in (all): No longer depend on dvi.
+
+2006-01-22 Brendan Kehoe <bren...@zen.org>
+
+ * doc/gperf.texi: Update copyright to be 1989-2006.
+ (UPDATED): Change to 22 January 2006.
+ * doc/gperf.1 (TH): Fix date.
+ * configure.in: Update copyright years.
+ * configure: Regenerate.
+ * src/Makefile.in: Update copyright years.
+
+ * doc/gperf.{dvi,ps,pdf}: Regenerated by manually invoking tex
+ instead of trying to use texi2dvi, whose run of etex ends up
+ actually always running pdfetex, thus always recreating gperf.pdf.
+
+2006-01-13 Brendan Kehoe <bren...@zen.org>
+
+ * NEWS: Add note about #line directive fix.
+ * doc/gperf.1: Regenerate with Makefile.devel.
+
+ * doc/gperf.texi (UPDATED): Correct to be today.
+ * doc: Regenerated by doing make in a configured tree.
+ Requires makeinfo, texi2dvi, texi2pdf, and texi2html.
+
+ * configure.in: Add AC_OBJEXT and AC_EXEEXT.
+ * lib/Makefile.in (OBJEXT): Define for subst.
+ (OBJECTS): Use $(OBJEXT) instead of '.o'.
+ * src/Makefile.in: Make dependencies use $(OBJEXT).
+ (OBJEXT, EXEEXT): Define for subst.
+ (TARGETPROG): Add $(EXEEXT).
+ (OBJECTS): Use $(OBJEXT) instead of '.o'.
+ (clean): Remove *.$(OBJEXT) instead of *.o.
+
+2006-01-13 Bruno Haible <br...@clisp.org>
+
+ Fix #line directives for filenames containing backslashes.
+ * src/output.cc (output_line_directive): New function.
+ (output_keyword_entry, Output::output): Use it.
+ Reported by Alexander <alexander...@gmail.com>.
+
+ * src/options.cc (Options::parse_options): Update years in --version
+ output.
+
+2005-08-29 Brendan Kehoe <bren...@zen.org>
+
+ * src/keyword.cc: Tweak comment to avoid nesting.
+
+2005-08-27 Bruno Haible <br...@clisp.org>
+
+ Fix missing ranlib detection when cross-compiling.
+ * aclocal.m4 (CL_PROG_RANLIB): Remove macro.
+ * lib/configure.in: Use AC_PROG_RANLIB instead of CL_PROG_RANLIB.
+
+2005-07-30 Bruno Haible <br...@clisp.org>
+
+ * src/version.cc: Bump version number to 3.0.2.
+ * doc/gperf.texi: Likewise.
+ * tests/c-parse.exp, tests/charsets.exp, tests/chill.exp,
+ tests/cplusplus.exp, tests/gpc.exp, tests/incomplete.exp,
+ tests/java.exp, tests/languages.exp, tests/modula2.exp,
+ tests/objc.exp, tests/permut2.exp, tests/permut3.exp,
+ tests/permutc2.exp, tests/test-4.exp: Update.
+
+2005-07-30 Bruno Haible <br...@clisp.org>
+
+ * src/positions.h: Add forward declarations of friend classes.
+ Needed for compilation with g++ 4.0.
+
+2004-08-22 Bruno Haible <br...@clisp.org>
+
+ * tests/Makefile.in (check-lang-syntax): Add test for the
+ --length-table-name option.
+ * tests/test-6.exp: Update.
+
+2004-08-21 Bruce Lilly <bli...@erols.com>
+
+ * src/input.cc (Input::read_input): Accept length-table-name
+ declaration.
+ * src/options.h (Options::get_lengthtable_name,
+ Options::set_lengthtable_name): New declarations.
+ (Options): Add field _lengthtable_name.
+ * src/options.icc (Options::get_lengthtable_name): New inline method.
+ * src/options.cc (DEFAULT_LENGTHTABLE_NAME): New constant.
+ (Options::long_usage): Document --length-table-name option.
+ (Options::Options): Initialize _lengthtable_name field.
+ (Options::~Options): Update.
+ (Options::set_lengthtable_name): New method.
+ (long_options): Add option --length-table-name.
+ (Options::parse_options): Implement --length-table-name option.
+ * src/output.cc (Output::output_keylength_table, output_switch_case,
+ Output::output_lookup_function_body): Use option.get_lengthtable_name.
+ * doc/gperf.texi (Gperf Declarations): Document %define
+ length-table-name.
+ (Output Details): Document --length-table-name option.
+
+2003-06-12 Bruno Haible <br...@clisp.org>
+
+ * gperf-3.0.1 released.
+
+ * src/version.cc: Bump version number to 3.0.1.
+ * doc/gperf.texi: Likewise.
+ * tests/c-parse.exp, tests/charsets.exp, tests/chill.exp,
+ tests/cplusplus.exp, tests/gpc.exp, tests/incomplete.exp,
+ tests/java.exp, tests/languages.exp, tests/modula2.exp,
+ tests/objc.exp, tests/permut2.exp, tests/permut3.exp,
+ tests/permutc2.exp, tests/test-4.exp: Update.
+
+2003-05-31 Bruno Haible <br...@clisp.org>
+
+ * doc/gperf.texi (User-supplied Struct): Mention the possibility of an
+ abbreviated struct declaration.
+ * src/input.cc (Input::read_input): Support struct declarations of the
+ form "struct foo;".
+ * tests/incomplete.gperf: New file.
+ * tests/incomplete.exp: New file.
+ * tests/Makefile.in (check-test): Check incomplete.gperf too.
+ Reported by Rob Leslie <r...@mars.org>.
+
+2003-05-20 Bruno Haible <br...@clisp.org>
+
+ * doc/Makefile.in (gperf.ps): Don't use $< in a target rule.
+
+2003-05-27 Bruno Haible <br...@clisp.org>
+
+ * Makefile.vms (CC): Correct value.
+ (getopt.obj, getopt1.obj, getline.obj, hash.obj): Don't set
+ HAVE_CONFIG_H.
+
+2003-05-17 Bruno Haible <br...@clisp.org>
+
+ * Makefile.msvc (DEBUGFLAGS): New variable.
+ (gperf.exe): Use it, and MFLAGS too.
+
+2003-05-08 Bruno Haible <br...@clisp.org>
+
+ * gperf-3.0 released.
+
+2003-05-07 Bruno Haible <br...@clisp.org>
+
+ * src/version.cc: Bump version number to 3.0.
+ * doc/gperf.texi: Likewise.
+ * tests/c-parse.exp, tests/charsets.exp, tests/chill.exp,
+ tests/cplusplus.exp, tests/gpc.exp, tests/java.exp,
+ tests/languages.exp, tests/modula2.exp, tests/objc.exp,
+ tests/permut2.exp, tests/permut3.exp, tests/permutc2.exp,
+ tests/test-4.exp: Update.
+
+ * src/configure.in: Fix AC_INIT argument.
+
+ * Makefile.devel (configure, lib/configure, src/configure,
+ tests/configure, doc/configure): Use the newest autoconf.
+ (src/config.h.in): Use the newest autoheader.
+
+2003-05-03 Bruno Haible <br...@clisp.org>
+
+ * doc/gperf.texi: Use two spaces as sentence separator, as recommended
+ by the texinfo manual.
+
+2003-04-12 Bruno Haible <br...@clisp.org>
+
+ * doc/configure.in (mandir): Change default value.
+ * doc/Makefile.in (docdir): Use datadir instead of prefix.
+ * Makefile.msvc (datadir): New variable.
+ (mandir, docdir): Use it instead of prefix.
+ (install, installdirs): Update.
+ * Makefile.vms (datadir): New variable.
+ (mandir, docdir): Use it instead of prefix.
+ (install, installdirs): Update.
+
+2003-04-12 Bruno Haible <br...@clisp.org>
+
+ * README.vms: New file.
+ * Makefile.vms: New file.
+ * Makefile.devel (src/config.h_vms): New rule.
+ (all): Depend on it.
+
+2003-03-19 Bruno Haible <br...@clisp.org>
+
+ * src/input.cc (Input::read_input): Ignore comments at the beginning
+ of the declarations section.
+ * doc/gperf.texi (Controls for GNU indent): New section.
+ Reported by Bruce Lilly <bli...@erols.com>.
+
+2003-03-19 Bruno Haible <br...@clisp.org>
+
+ * src/output.cc (Output::output_hash_function): Avoid lint warning if
+ not all arguments of the hash function are used. Avoid lint warning
+ for fallthrough in switch.
+ * tests/c-parse.exp, tests/charsets.exp, tests/chill.exp,
+ tests/cplusplus.exp, tests/java.exp, tests/languages.exp,
+ tests/modula2.exp, tests/objc.exp: All /*FALLTHROUGH*/ to expected
+ output.
+ Reported by Bruce Lilly <bli...@erols.com>.
+
+2003-03-01 Bruno Haible <br...@clisp.org>
+
+ * src/options.h (Options::set_initializer_suffix): New declaration.
+ * src/options.cc (Options::set_initializer_suffix): New method.
+ * src/input.cc (Input::read_input): Recognize %define
+ initializer-suffix.
+ * doc/gperf.texi (Gperf Declarations): Document %define
+ initializer-suffix.
+ * NEWS: Update.
+
+2003-02-26 Bruno Haible <br...@clisp.org>
+
+ * Makefile.msvc: New file.
+ * README.woe32: New file.
+ * Makefile.devel (all): Depend on src/config.h.msvc.
+ (src/config.h.msvc): New rule.
+
+2003-01-07 Bruno Haible <br...@clisp.org>
+
+ * src/input.h (Input::_charset_dependent): New field.
+ * src/input.cc (Input::read_input): Also set _charset_dependent.
+ * src/main.cc (main): Pass _charset_dependent from Input to Output.
+ * src/output.h (Output::Output): Add charset_dependent argument.
+ (Output::_charset_dependent): New field.
+ * src/output.cc (Output::Output): Add charset_dependent argument.
+ (Output::output): Provoke a compilation error if the execution
+ character set doesn't match the expectations.
+ * tests/c-parse.exp, tests/charsets.exp, tests/chill.exp,
+ tests/cplusplus.exp, tests/gpc.exp, tests/java.exp,
+ tests/languages.exp, tests/modula2.exp, tests/objc.exp,
+ tests/permut2.exp, tests/permut3.exp, tests/permutc2.exp,
+ tests/test-4.exp: Update.
+
+ * src/options.cc (Options::long_usage): Change bug report address to
+ <bug-gnu-gp...@gnu.org>.
+ * tests/test-6.exp: Update.
+
+ * src/output.cc (USE_DOWNCASE_TABLE): New macro.
+ (output_upperlower_table): New function.
+ (output_upperlower_strcmp, output_upperlower_strncmp,
+ output_upperlower_memcmp): Emit gperf_downcase array accesses.
+ (Output::output): Call output_upperlower_table.
+ * tests/permutc2.exp: Update.
+
+ * src/keyword-list.icc (KeywordExt_List::rest): Use a portable cast.
+ (Only in GCC a cast of an lvalue is an lvalue.)
+
+2003-01-01 Bruno Haible <br...@clisp.org>
+
+ * src/options.cc (Options::parse_options): Update copyright year.
+
+ * doc/gperf.texi (@author): Add me.
+
+ * src/options.h (NULLSTRINGS): New enum value.
+ (Options::get_stringpool_name, Options::set_stringpool_name): New
+ method declarations.
+ (Options::_stringpool_name): New field.
+ * src/options.icc (Options::get_stringpool_name): New method.
+ * src/options.cc (DEFAULT_STRINGPOOL_NAME): New variable.
+ (Options::long_usage): Document -Q and --null-strings.
+ (Options::Options): Initialize _stringpool_name.
+ (Options::~Options): Output _stringpool_name, NULLSTRINGS values too.
+ (Options::set_stringpool_name): New method.
+ (long_options): Add options --string-pool-name, --null-strings.
+ (Options::parse_options): Implement options -P, -Q and --null-strings.
+ * src/input.cc (Input::read_input): Recognize declarations %pic,
+ %define string-pool-name, %null-strings.
+ * src/output.h (Output::output_string_pool,
+ Output::output_lookup_pools): New method declarations.
+ (Output::_wordlist_eltype): New field.
+ * src/output.cc (Output::output_keylength_table): Trivial
+ simplification.
+ (Output::output_string_pool): New method.
+ (output_keyword_entry): Add stringpool_index argument. For SHAREDLIB,
+ use struct offsets.
+ (output_keyword_blank_entries): For SHAREDLIB, use -1 instead of "".
+ (Output::output_keyword_table): Use _wordlist_eltype instead of
+ _struct_tag. Compute stringpool_index for output_keyword_entry.
+ (Output::output_lookup_pools): New method.
+ (Output::output_lookup_function_body): Use _wordlist_eltype instead of
+ _struct_tag. For SHAREDLIB, use "+ stringpool" to convert offsets to
+ strings. Use "o >= 0" to test for nonempty table entry.
+ (Output::output_lookup_function): Call output_lookup_pools.
+ (Output::output): Initialize _wordlist_eltype. Call
+ output_lookup_pools.
+ * tests/jstest4.gperf: New file.
+ * tests/test-6.exp: Update.
+ * tests/Makefile.in (check-lang-syntax): Drop test of -p. Add tests of
+ -P and -Q.
+ * doc/gperf.texi (User-supplied Struct): Mention that first field has
+ to be of type 'int' if -P is given.
+ (Gperf Declarations): Document %pic, %define string-pool-name,
+ %null-strings.
+ (Output Details): Update description of option -P. Document options -Q
+ and --null-strings.
+
+ * tests/Makefile.in (check-link-c, check-ada, check-pascal,
+ check-test): Omit option -p.
+ * tests/c-parse.exp: Regenerated.
+ * tests/chill.exp: Regenerated.
+ * tests/cplusplus.exp: Regenerated.
+ * tests/gpc.exp: Regenerated.
+ * tests/java.exp: Regenerated.
+ * tests/objc.exp: Regenerated.
+ * tests/test-4.exp: Regenerated.
+
+ * src/output.cc (Output::output_lookup_function_body): Omit the
+ multicompare code section and its variables when it is not used.
+ * tests/chill.exp: Regenerated.
+
+ * src/output.c (Output_Compare::output_firstchar_comparison): New
+ method.
+ (Output_Compare_Strcmp::output_comparison,
+ Output_Compare_Strncmp::output_comparison,
+ Output_Compare_Memcmp::output_comparison): Use it.
+ * tests/permutc2.exp: Update.
+
+ * tests/smtp.gperf: New file, based on a contribution by Bruce Lilly.
+ * tests/Makefile.in (check-smtp): New rule.
+ (check): Depend on it.
+ (clean): Update.
+
+2002-12-12 Bruno Haible <br...@clisp.org>
+
+ * src/search.h (Search::init_selchars_tuple,
+ Search::count_duplicates_tuple): Add alpha_unify argument.
+ (Search::count_duplicates_tuple): New method declaration.
+ * src/search.cc (Search::init_selchars_tuple,
+ Search::count_duplicates_tuple): Add alpha_unify argument.
+ (Search::find_positions): Update.
+ (Search::count_duplicates_tuple): New method.
+ (Search::count_duplicates_multiset): Free temp alpha_unify vector.
+ (Search::find_alpha_inc): Call count_duplicates_tuple.
+
+ * src/configure.in: Add test for stack-allocated variable-size arrays.
+ * src/config.h.in: Regenerated.
+ * src/search.cc: Include config.h.
+ (DYNAMIC_ARRAY, FREE_DYNAMIC_ARRAY): New macros.
+ (Search::find_alpha_inc, Search::count_possible_collisions,
+ Search::find_asso_values): Use them.
+ * src/Makefile.in (search.o): Depend on config.h.
+
+ * src/search.h (Search::keyword_list_length, Search::max_key_length,
+ Search::get_max_keysig_size, Search::prepare): Remove declarations.
+ (Search::prepare): Renamed from Search::preprepare.
+ (Search::_max_selchars_length): New field.
+ * src/search.cc (Search::prepare): Renamed from Search::preprepare.
+ (Search::prepare_asso_values): Merged with old Search::prepare.
+ Initialize _max_selchars_length.
+ (Search::keyword_list_length): Remove function. Use _list_len instead.
+ (Search::max_key_length): Remove function. Use _max_key_len instead.
+ (Search::get_max_keysig_size): Remove function. Use
+ _max_selchars_length instead.
+ (Search::count_possible_collisions, Search::find_asso_values): Update.
+ (Search::find_good_asso_values): Call just prepare_asso_values.
+ (Search::~Search): Update.
+
+ * src/output.h (Output::output_asso_values_ref): New declaration.
+ * src/output.cc (char_to_index): Remove variable.
+ (Output::output_asso_values_ref): New function.
+ (Output::output_hash_function): Use it.
+ (Output::output): Update.
+
+ * src/positions.h (Positions::is_useall, Positions::set_useall,
+ Positions::iterator, Positions::reviterator): New method declarations.
+ (Positions::_useall): New field.
+ (PositionIterator): Make constructor private. Add a constructor and a
+ copy constructor.
+ (PositionIterator::remaining): New declaration.
+ (PositionReverseIterator): Make constructor private. Add a constructor
+ and a copy constructor.
+ (PositionReverseIterator::remaining): New declaration.
+ (PositionReverseIterator::_minindex): New field.
+ * src/positions.icc (Positions::Positions): Initialize _useall.
+ (Positions::operator=): Likewise.
+ (Positions::is_useall, Positions::set_useall): New methods.
+ (Positions::sort): Do nothing if _useall is set.
+ (Positions::iterator, Positions::reviterator): New methods.
+ (PositionIterator::PositionIterator): New constructor.
+ (PositionIterator::remaining): New method.
+ (PositionReverseIterator::PositionReverseIterator): New constructor.
+ (PositionReverseIterator::next): Use _minindex as bound.
+ (PositionReverseIterator::remaining): New method.
+ * src/positions.cc (Positions::add, Positions::remove): Reset the
+ useall flag.
+ (Positions::print): Handle the useall case.
+ * src/options.h (ALLCHARS): Remove.
+ * src/options.cc (Options::~Options): Update.
+ (Options::parse_options): Use Positions::set_useall().
+ * src/keyword.h (KeywordExt::init_selchars_tuple,
+ KeywordExt::init_selchars_multiset, KeywordExt::init_selchars_low):
+ Remove use_all_chars argument.
+ * src/keyword.cc (KeywordExt::init_selchars_low): Remove use_all_chars
+ argument. Tell the position iterator to stop at _allchars_length.
+ Remove special case code for -k'*'.
+ (KeywordExt::init_selchars_tuple, KeywordExt::init_selchars_multiset):
+ Remove use_all_chars argument.
+ * src/search.h (Search::init_selchars_tuple): Remove use_all_chars
+ argument.
+ (Search::init_selchars_multiset): Likewise.
+ * src/search.cc (Search::init_selchars_tuple): Remove use_all_chars
+ argument.
+ (Search::count_duplicates_tuple, Search::find_positions): Update.
+ (Search::compute_alpha_unify): Remove special case code for -k'*'.
+ (Search::init_selchars_multiset): Remove use_all_chars argument.
+ (Search::count_duplicates_multiset): Update.
+ (Search::find_alpha_inc): Remove special case code for -k'*'.
+ (Search::prepare): Update.
+ (Search::get_max_keysig_size): Update.
+ * src/output.cc (Output::output_hash_function): Remove special case
+ code for -k'*'.
+ * tests/chill.exp: Regenerated.
+
+2002-12-11 Bruno Haible <br...@clisp.org>
+
+ Change the positions to be 0-based, instead of 1-based.
+ * src/positions.h (Positions::LASTCHAR): Set to -1.
+ (Positions::MAX_SIZE): New constant.
+ (Positions::pointer): Change return type.
+ (Positions::_positions): Change element type.
+ (PositionIterator::EOS, PositionReverseIterator::EOS): Set to -2.
+ * src/positions.icc (Positions::pointer): Change return type.
+ (Positions::sort): Update.
+ * src/positions.cc (Positions::contains, Positions::add,
+ Positions::remove): Update.
+ (Positions::print): Update. Fix off-by-one bug.
+ * src/options.cc (Options::~Options): Update.
+ (Options::parse_options): Set BAD_VALUE to -3. Update.
+ * src/keyword.cc (KeywordExt::init_selchars_low): Update.
+ * src/search.cc (Search::find_positions, Search::compute_alpha_unify,
+ Search::find_alpha_inc): Update.
+ * src/output.cc (Output::output_hash_function): Update. Don't emit
+ a 'case' statement right after 'default:'.
+ * tests/c-parse.exp: Regenerated.
+ * tests/charsets.exp: Regenerated.
+ * tests/cplusplus.exp: Regenerated.
+ * tests/java.exp: Regenerated.
+ * tests/languages.exp: Regenerated.
+ * tests/modula2.exp: Regenerated.
+ * tests/objc.exp: Regenerated.
+
+2002-12-10 Bruno Haible <br...@clisp.org>
+
+ * src/options.h: Reorder enum values.
+ (Options::short_usage, Options::long_usage): Make static.
+ * src/options.cc (Options::short_usage); No longer print a monster
+ usage line.
+ (Options::print_options): Improve output of options like
+ --key-positions=1,2,$.
+ (Options::~Options): Update.
+
+ * src/options.h (UPPERLOWER): New enum value.
+ * src/options.cc (Options::long_usage): Document option --ignore-case.
+ (Options::~Options): Update.
+ (long_options): Add option --ignore-case.
+ (Options::parse_options): Handle option --ignore-case.
+ * src/input.cc (Input::read_input): Recognize option %ignore-case.
+ * src/keyword.h (KeywordExt::init_selchars_tuple,
+ KeywordExt::init_selchars_multiset, KeywordExt::init_selchars_low):
+ Add alpha_unify argument.
+ * src/keyword.cc (KeywordExt::init_selchars_low): Add alpha_unify
+ argument.
+ (KeywordExt::init_selchars_tuple): Add alpha_unify argument.
+ (KeywordExt::init_selchars_multiset): Add alpha_unify argument.
+ * src/search.h (Search::compute_alpha_size,
+ Search::compute_alpha_unify): New declarations.
+ (Search::init_selchars_multiset): Add alpha_unify argument.
+ (Search::_alpha_unify): New field.
+ * src/search.cc (Search::compute_alpha_size,
+ Search::compute_alpha_unify): New functions.
+ (Search::init_selchars_tuple): Update.
+ (Search::find_positions): Temporarily set _alpha_unify. Perform a
+ case insensitive comparison if needed.
+ (Search::init_selchars_multiset): Add alpha_unify argument.
+ (Search::count_duplicates_multiset): Call compute_alpha_unify.
+ (Search::find_alpha_inc): Temporarily set _alpha_unify. At the end,
+ set _alpha_size and _alpha_unify.
+ (Search::prepare): Update. Don't compute _alpga_size here.
+ (Search::optimize): Propagate unified asso_values.
+ (Search::~Search) Delete _alpha_unify.
+ * src/output.cc (output_upperlower_strcmp, output_upperlower_strncmp,
+ output_upperlower_memcmp): New functions.
+ (Output_Compare_Strcmp::output_comparison,
+ Output_Compare_Strncmp::output_comparison,
+ Output_Compare_Memcmp::output_comparison): Use the case-insensitive
+ comparison function if --ignore-case was given.
+ (Output::output): Emit the auxiliary case-insensitive comparison
+ function if needed.
+ * tests/permutc2.gperf, tests/permutc2.exp: New files.
+ * tests/Makefile.in (check-test): Also check permutc2.gperf.
+ * tests/test-6.exp: Update.
+ * doc/gperf.texi (Gperf Declarations): Document %ignore-case.
+ (Input Details): Document option --ignore-case.
+ * NEWS: Update.
+
+ * src/search.cc (Search::optimize): Fill unused asso_values[] entries
+ with a large value.
+ * src/output.h (Output::Output): Remove occurrences argument.
+ (Output::_occurrences): Remove field.
+ * src/output.cc (Output::Output): Remove occurrences argument.
+ (Output::output_hash_function): Ignore _occurrences.
+ * src/main.cc (main): Don't pass the _occurrences to Output.
+
+ * src/search.cc (Search::preprepare): Exit if keywords contain
+ out-of-range characters.
+
+ * src/search.cc (for): Define so as to avoid errors with old compilers.
+
+ * src/options.h (SHAREDLIB): New enum value.
+ * src/options.cc (Options::short_usage): Mention option -P.
+ (Options::long_usage): Document option -P.
+ (long_options): Add option --pic.
+ (Options::parse_options): Handle option -P/--pic.
+ * src/output.cc (output_keyword_blank_entries): When SHAREDLIB is
+ specified, emit NULL pointers instead of "".
+ (Output::output_lookup_function_body): When SHAREDLIB is specified
+ and SWITCH and DUP and not specified, test the table entry against
+ NULL before the string comparison.
+ * tests/test-6.exp: Update.
+ * doc/gperf.texi (Output Details): Document option -P.
+ * NEWS: Update.
+ Suggested by Ulrich Drepper.
+
+2002-12-08 Bruno Haible <br...@clisp.org>
+
+ * tests/permut2.gperf, tests/permut2.exp: New files.
+ * tests/permut3.gperf, tests/permut3.exp: New files.
+ * tests/charsets.gperf: New file, from Bruce Lilly.
+ * tests/charsets.exp: New file.
+ * tests/languages.gperf: New file, from Bruce Lilly.
+ * tests/languages.exp: New file.
+ * Makefile.in (check-test): Test them all.
+
+ Completely new asso_values search algorithm.
+ * src/search.h (Search::compute_occurrence, Search::clear_determined,
+ Search::set_determined, Search::already_determined, Search::reorder):
+ Remove functions.
+ (Search::init_asso_values, Search::sort_by_occurrence,
+ Search::compute_occurrence, Search::sort_by_occurrence,
+ Search::has_collisions, Search::collision_prior_to): Remove functions.
+ (Search::compute_partition, Search::count_possible_collisions,
+ Search::unchanged_partition): New method declarations.
+ (Search::_determined): Remove field.
+ * src/search.cc (Search::prepare): Don't initialize _determined.
+ (Search::compute_occurrence, greater_by_occurrence,
+ Search::clear_determined, Search::set_determined,
+ Search::already_determined, Search::reorder): Remove functions.
+ (Search::init_asso_values, compute_disjoint_union,
+ Search::sort_by_occurrence, Search::compute_occurrence,
+ Search::sort_by_occurrence, Search::has_collisions,
+ Search::collision_prior_to): Remove functions.
+ (StackEntry): Remove class.
+ (EquivalenceClass, Step): New classes.
+ (equals, Search::compute_partition, delete_partition,
+ Search::count_possible_collisions, Search::unchanged_partition): New
+ functions.
+ (Search::find_asso_values): Completely rewritten.
+ (Search::find_good_asso_values): Don't call reorder().
+ (Search::~Search): Don't free _determined.
+ * src/keyword.h (KeywordExt::_occurrence): Remove field.
+ * src/options.h (ORDER, FAST, OPT_CHOICE): Remove enum values.
+ (Options::_iterations): Remove field.
+ * src/options.icc (Options::get_iterations): Remove method.
+ * src/options.cc (Options::long_usage): Remove mention of -f and -o.
+ (Options::Options): Don't initialize _iterations.
+ (Options::~Options): Update.
+ (Options::parse_options): Do nothing for options -f, -o, -O.
+ * doc/gperf.texi: (Contributors): Update.
+ (Algorithmic Details): Remove options -f and -o. Update description
+ of option -s.
+ * tests/c-parse.exp, tests/chill.exp, tests/cplusplus.exp,
+ tests/gpc.exp, tests/java.exp, tests/modula2.exp, tests/objc.exp,
+ tests/test-4.exp): Regenerated, smaller than before.
+ * tests/test-6.exp: Update.
+ * NEWS: Update.
+
+2002-12-08 Bruno Haible <br...@clisp.org>
+
+ * src/search.h (Search::_alpha_size): Change type to 'unsigned int'.
+ (Search::_asso_value_max): Likewise.
+ * src/search.cc (Search::prepare_asso_values): Update.
+ (Search::init_asso_values): Update.
+ (Search::~Search): Update.
+ * src/output.h (Output::Output): Change alpha_size type to
+ 'unsigned int'.
+ (Output::_alpha_size): Change type to 'unsigned int'.
+ * src/output.cc (Output::Output): Change alpha_size type to
+ 'unsigned int'.
+ (Output::output_hash_function): Update.
+
+2002-12-07 Bruno Haible <br...@clisp.org>
+
+ * src/options.h (OPT_CHOICE): New enum value.
+ * src/options.cc (Options::~Options): Update.
+ (long_options): New option --optimized-collision-resolution.
+ (Options::parse_options): Accept option -O.
+ * src/search.h (Search::sort_by_occurrence): Change argument to
+ 'unsigned int'.
+ (Search::compute_occurrence, Search::sort_by_occurrence): New method
+ declarations.
+ * src/search.cc (Search::sort_by_occurrence): Change argument to
+ 'unsigned int'.
+ (Search::compute_occurrence, Search::sort_by_occurrence): New methods.
+ (Search::find_asso_values): Implement OPT_CHOICE. More debugging
+ output.
+
+ * src/search.cc (Search::prepare_asso_values) [DEBUG]: Also print
+ the keyword list in order.
+ (Search::find_asso_values) [DEBUG]: Upon failure, print the union_set.
+
+ * src/options.h (Options::get_size_multiple): Change return type to
+ float.
+ (Options::_size_multiple): Change type to float.
+ * src/options.icc (Options::get_size_multiple): Change return type to
+ float.
+ * src/options.cc (Options::long_usage): Update description of option
+ -s.
+ (Options::~Options): Update.
+ (Options::parse_options): For option -s, accept a fraction.
+ * src/search.cc (Search::prepare_asso_values): Use get_size_multiple
+ as it is.
+ * tests/test-6.exp: Update.
+ * doc/gperf.texi (Algorithmic Details): Update description of option
+ -s.
+
+2002-12-04 Bruno Haible <br...@clisp.org>
+
+ Improve debugging output.
+ * src/hash-table.h (Hash_Table::dump): New method.
+ * src/hash-table.cc (Hash_Table::dump): New method, extracted from
+ destructor.
+ (Hash_Table::~Hash_Table): No longer print the contents.
+ * src/positions.h (PositionReverseIterator): New class.
+ * src/positions.icc (PositionReverseIterator::PositionReverseIterator,
+ PositionReverseIterator::next): New methods.
+ * src/search.cc (Search::find_positions): If debugging, print the
+ result.
+ (Search::find_alpha_inc): If debugging, print the result.
+ (Search::prepare): Explicitly dump the hash table's contents here.
+
+ Portability fixes.
+ * src/positions.h (Positions::LASTCHAR, Positions::MAX_KEY_POS,
+ PositionIterator::EOS): Define as compile-time constants using enum.
+ * src/bool-array.cc (Bool_Array::~Bool_Array): Remove const qualifier
+ of pointer to be deleted.
+ * src/input.cc (Input::~Input): Likewise.
+ * src/keyword.cc (KeywordExt::delete_selchars): Likewise.
+ * src/main.cc (main): Likewise.
+ * src/hash-table.cc (Hash_Table::~Hash_Table): Limit scope of 'for'
+ variables.
+ * src/search.cc (Search::prepare_asso_values): Use a static_cast to
+ convert from time_t to long. This is possible because ISO C 99 says
+ time_t is a numeric type.
+
+2002-11-20 Bruno Haible <br...@clisp.org>
+
+ * src/search.cc (Search::find_asso_values): Avoid gcc warnings about
+ uninitialized variables.
+
+ Implement backtracking.
+ * src/search.h (Search::has_collisions): Renamed from
+ Search::less_collisions. Return a boolean.
+ * src/search.cc (Search::has_collisions): Renamed from
+ Search::less_collisions. Return a boolean.
+ (StackEntry): Remove field _collisions_so_far.
+ (Search::find_asso_values): Backtrack when encountering an unresolved
+ collision. Assume collisions_so_far is always zero.
+ (Search::optimize): Exit if there are accidental duplicates at the end.
+ * src/output.cc (Output::num_hash_values): Simply return the list
+ length.
+ (Output::output_keylength_table): Remove handling of accidental
+ duplicates.
+ (Output::output_keyword_table, Output::output_lookup_array): Likewise.
+ (output_switch_case, output_switches): Likewise.
+ * doc/gperf.texi (Algorithmic Details): Adjust description of options
+ -D, -f, -o, -r.
+ (Bugs): Remove note about missing backtracking.
+ (Projects): Likewise.
+
+2002-11-19 Bruno Haible <br...@clisp.org>
+
+ Prepare for backtracking.
+ * src/search.h (Search::try_asso_value, Search::change_some_asso_value):
+ Remove declarations.
+ (Search::less_collisions, Search::collision_prior_to): New declarations.
+ (Search::_fewest_collisions, Search::_union_set, Search::_num_done):
+ Remove fields.
+ * src/search.cc (Search::prepare_asso_values): Don't initialize
+ _union_set.
+ (Search::try_asso_value, Search::change_some_asso_value): Remove
+ methods.
+ (Search::less_collisions, Search::collision_prior_to): New methods.
+ (StackEntry): New class.
+ (Search::find_asso_values): Reorganized to use pseudo-recursion.
+ (Search::~Search): Don't free _union_set.
+
+ * src/search.h (Search::find_good_asso_values): New declaration.
+ * src/search.cc: Add comments about the basic structure of the
+ algorithm.
+ (Search::find_positions): Move the option[POSITIONS] test to here.
+ (Search::find_good_asso_values): New method, extracted from
+ Search::optimize.
+ (Search::optimize): Remove option[POSITIONS] test. Call
+ find_good_asso_values.
+
+2002-11-17 Bruno Haible <br...@clisp.org>
+
+ * src/options.cc (Options::parse_options): Include copyright notice
+ and authors in --version output.
+
+ Avoid artificial duplicates.
+ * src/keyword.h (KeywordExt::init_selchars_tuple): New declaration.
+ (KeywordExt::init_selchars_multiset): Renamed from
+ KeywordExt::init_selchars.
+ (KeywordExt::init_selchars_low): New declaration.
+ * src/keyword.cc (KeywordExt::init_selchars_low): Renamed from
+ KeywordExt::init_selchars. Add alpha_inc argument. Remove sorting.
+ (KeywordExt::init_selchars_tuple): New method.
+ (KeywordExt::init_selchars_multiset): New method, replaces
+ KeywordExt::init_selchars.
+ * src/search.h (Search::init_selchars_tuple): Renamed from
+ Search::init_selchars.
+ (Search::count_duplicates_tuple): Renamed from Search::count_duplicates.
+ (Search::init_selchars_multiset, Search::count_duplicates_multiset,
+ Search::find_alpha_inc): New declarations.
+ (Search::_alpha_inc): New field.
+ (Search::_alpha_size, Search::_occurrences, Search::_asso_values,
+ Search::_determined): Make non-const.
+ * src/search.cc (Search::Search): Don't initialize _key_positions,
+ _alpha_size, _occurrences, _asso_values, _determined here.
+ (Search::init_selchars_tuple): Renamed from Search::init_selchars.
+ (Search::count_duplicates_tuple): Renamed from Search::count_duplicates.
+ (Search::find_positions): Update.
+ (Search::init_selchars_multiset, Search::count_duplicates_multiset,
+ Search::find_alpha_inc): New methods.
+ (Search::prepare): Move preprepare, find_positions calls away.
+ Initialize _alpha_size, _occurrences, _asso_values, _determined here.
+ (Search::optimize): Call preprepare, find_positions here. Initialize
+ _key_positions here.
+ (Search::~Search): Deallocate _alpha_inc.
+ * src/output.cc (Output::Output): Add alpha_inc argument.
+ (Output::output_hash_function): Use _alpha_inc.
+ * src/output.h (Output::Output): Add alpha_inc argument.
+ (Output::_alpha_inc): New field.
+ * src/main.cc (main): Pass _alpha_inc from Search to Output.
+ * tests/chill.exp: Update.
+ * doc/gperf.texi (Algorithmic Details): Remove description of
+ artificial duplicates.
+
+ * src/keyword.h (KeywordExt::_selchars): Change type to
+ 'const unsigned int *'.
+ * src/keyword.cc (sort_char_set): Change argument type to
+ 'unsigned int *'.
+ (KeywordExt::init_selchars): Update.
+ * src/search.h (Search::sort_by_occurrence): Change argument type to
+ 'unsigned int *'.
+ (Search::try_asso_value): Change argument type to 'unsigned int'.
+ (Search::_union_set): Change type to 'unsigned int *'.
+ * src/search.cc (Search::prepare, Search::compute_occurrence,
+ Search::set_determined, Search::already_determined,
+ Search::prepare_asso_values, Search::compute_hash): Update.
+ (compute_disjoint_union): Change argument types to 'unsigned int *'.
+ (Search::sort_by_occurrence): Likewise.
+ (Search::try_asso_value): Change argument type to 'unsigned int'.
+ (Search::change_some_asso_value, Search::~Search): Update.
+ * src/hash-table.cc (Hash_Table::~Hash_Table, Hash_Table::equal,
+ Hash_Table::insert): Update.
+
+ * src/positions.h: New file, extracted from options.h.
+ * src/positions.icc: New file, extracted from options.icc.
+ * src/positions.cc: New file, extracted from options.cc.
+ * src/options.h: Include positions.h. Move classes Positions and
+ PositionsIterator away.
+ * src/options.icc: Move classes Positions and PositionsIterator away.
+ * src/options.cc: Move class Positions away.
+ * src/keyword.cc: Include positions.h instead of options.h.
+ * src/output.h: Include positions.h instead of options.h.
+ * src/search.h: Include positions.h instead of options.h.
+ * src/Makefile.in (OBJECTS): Add positions.o.
+ (POSITIONS_H): New variable.
+ (OPTIONS_H, SEARCH_H, OUTPUT_H, keyword.o): Use it.
+ (positions.o): New rule.
+
+ * src/options.h (POSITIONS): New enum value.
+ (Positions::Positions): New copy constructor.
+ (Positions::operator=, Positions::contains, Position::add,
+ Positions::remove, Positions::print): New method declaration.
+ (Options::get_max_keysig_size): Remove method.
+ * src/options.icc (Positions::Positions): New copy constructor.
+ (Positions::operator=): New method.
+ (Options::get_max_keysig_size): Remove method.
+ * src/options.cc (Options::Options): Initialize _key_positions
+ trivially.
+ (Options::parse_options): Option -k sets POSITIONS.
+ (Positions::contains, Positions::add, Positions::remove,
+ Positions::print): New methods.
+ * src/hash-table.cc (Hash_Table::~Hash_Table): Compute the field
+ width explicitly, instead of using Options::get_max_keysig_size.
+ * src/keyword.h (KeywordExt::init_selchars): Add arguments
+ use_all_chars, positions.
+ (KeywordExt::delete_selchars): New declaration.
+ * src/keyword.cc (KeywordExt::init_selchars): Add arguments
+ use_all_chars, positions. Remove error message if there are no key
+ positions.
+ (KeywordExt::delete_selchars): New method.
+ * src/search.h: Include options.h.
+ (Search::preprepare, Search::init_selchars, Search::delete_selchars,
+ Search::count_duplicates, Search::find_positions): New declarations.
+ (Search::_key_positions): New field.
+ * src/search.cc (Search::Search): Initialize _key_positions.
+ (Search::preprepare, Search::init_selchars, Search::delete_selchars,
+ Search::count_duplicates, Search::find_positions): New functions.
+ (Search::prepare): Call preprepare and find_positions. Tweak error
+ message.
+ (Search::get_max_keysig_size): Use _key_positions instead of
+ option.get_key_positions().
+ (Search::optimize): Tweak error message.
+ * src/output.h: Include options.h.
+ (Output::Output): Add Positions argument.
+ (Output::_key_positions): New field.
+ * src/output.cc (Output::Output): Add Positions argument.
+ (Output::output_hash_function): Omit the table if there are no
+ positions at all. Use _key_positions instead of
+ option.get_key_positions().
+ (Output::output): Output the computed positions as a comment.
+ * src/main.cc (main): Pass the Positions from Searcher to Output.
+ * src/Makefile.in (SEARCH_H, OUTPUT_H): Include OPTIONS_H.
+ * tests/Makefile.in (check-test): Pass key positions explicitly.
+ * tests/gpc.exp: Update.
+ * tests/test-4.exp: Update.
+ * doc/gperf.texi (Algorithmic Details): Mention that -k is not needed
+ usually.
+
+2002-11-16 Bruno Haible <br...@clisp.org>
+
+ * src/options.h (Options::get_slot_name): Renamed from
+ Options::get_key_name.
+ (Options::set, Options::set_language, Options::set_total_switches,
+ Options::set_function_name, Options::set_slot_name,
+ Options::set_class_name, Options::set_hash_name,
+ Options::set_wordlist_name, Options::set_delimiters): New method
+ declarations.
+ (Options::_language): New field.
+ (Options::_slot_name): Renamed from Options::_key_name.
+ * src/options.icc (Options::set): New method.
+ (Options::get_slot_name): Renamed from Options::get_key_name.
+ * src/options.cc (DEFAULT_FUNCTION_NAME): Renamed from DEFAULT_NAME.
+ (DEFAULT_SLOT_NAME): Renamed from DEFAULT_NAME.
+ (Options::Options): Initialize _language. Update.
+ (Options::~Options): Update.
+ (Options::set_language, Options::set_total_switches,
+ Options::set_function_name, Options::set_slot_name,
+ Options::set_class_name, Options::set_hash_name,
+ Options::set_wordlist_name, Options::set_delimiters): New methods.
+ (Options::parse_options): Call set_language. Update.
+ * src/input.cc (is_declaration, is_declaration_with_arg,
+ is_define_declaration): New functions.
+ (Input::read_input): Accept %DECL declarations.
+ * src/output.cc (Output::output_lookup_function_body): Update.
+ * doc/gperf.texi (Declarations): Add new subnodes.
+ (User-supplied Struct, Gperf Declarations, C Code Inclusion): New
+ nodes.
+ (Keywords, Output Format, Binary Strings, Options): Mention %
+ declarations as being equivalent to the command line options.
+
+ * src/options.cc (Options::long_usage): Rename options -H, -N, -l, -G.
+ (long_options): Add --hash-function-name, --lookup-function-name,
+ --compare-lengths.
+ * doc/gperf.texi (Output Details): Rename options -H, -N, -l, -G.
+ * tests/test-6.exp: Update.
+
+ * src/options.cc (DEFAULT_DELIMITERS): Remove newline.
+ * src/options.cc (Options::long_usage): Change default --delimiters.
+ * doc/gperf.texi (Input Details): Likewise.
+ * tests/test-6.exp: Update.
+
+ * doc/gperf.texi: Move description of option -l from section
+ Algorithmic Details to section Output Details.
+ * src/options.cc (Options::long_usage): Likewise.
+ * tests/test-6.exp: Update.
+
+2002-11-12 Bruno Haible <br...@clisp.org>
+
+ * src/options.h (Output::get_output_file_name): New method.
+ (Output::_output_file_name): New field.
+ * src/options.icc (Options::get_output_file_name): New method.
+ * src/options.cc (Options::long_usage): Document option --output-file.
+ (Options::Options): Initialize _output_file_name.
+ (long_options): Add --output-file.
+ (Options::parse_options): Handle it.
+ * src/main.cc (main): Open the output file if given by name.
+ * doc/gperf.texi (Output File): New section.
+ * tests/test-6.exp: Update.
+
+2002-11-10 Bruno Haible <br...@clisp.org>
+
+ * src/input.cc (pretty_input_file_name): New function.
+ (read_input): Use it in all error and warning messages.
+
+ * src/keyword.h (Keyword::_lineno): New field.
+ * src/input.h (Input::_struct_decl_lineno): New field.
+ * src/input.cc (Input::read_input): Set _struct_decl_lineno. Fill
+ each keyword's _lineno field.
+ * src/main.cc (main): Pass _struct_decl_lineno from Input to Output.
+ * src/output.h (Output::Output) Add struct_decl_lineno argument.
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
