summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-06-07 02:50:43 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-06-07 02:50:43 +0000
commit4e66acff840358012086fe00c7b2c950d3e14531 (patch)
treecc7218acfd7ab6760869ae45f1f32db5d05e9a67
parentcbd8c520432c56734f5eeb1d7821e96f6a76b646 (diff)
downloadATCD-4e66acff840358012086fe00c7b2c950d3e14531.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog-98b3
-rw-r--r--apps/gperf/src/Options.cpp2
-rw-r--r--apps/gperf/tests/c-parse.gperf2
-rw-r--r--apps/gperf/tests/gplus.gperf2
-rw-r--r--apps/gperf/tests/test-3.exp4
-rw-r--r--apps/gperf/tests/test-4.exp2
-rw-r--r--apps/gperf/tests/test-5.exp2
-rw-r--r--apps/gperf/tests/test-6.exp9
8 files changed, 16 insertions, 10 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b
index 678b968f76b..6c140377870 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,5 +1,8 @@
Sat Jun 6 18:34:24 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+ * apps/gperf/src/Options.cpp (operator): Changed ACE_OS::exit()
+ to ACE_OS::_exit() so we'll leave no trace...
+
* apps/gperf/src/Key_List.cpp (output_switch): Fixed another bug
where strcmp() should be generated instead of strncmp().
diff --git a/apps/gperf/src/Options.cpp b/apps/gperf/src/Options.cpp
index 8246552a41f..3856e63ea4c 100644
--- a/apps/gperf/src/Options.cpp
+++ b/apps/gperf/src/Options.cpp
@@ -351,7 +351,7 @@ Options::operator() (int argc, char *argv[])
DEFAULT_JUMP_VALUE,
MAX_KEY_POS - 1);
Options::usage ();
- ACE_OS::exit (1);
+ ACE_OS::_exit (1);
}
case 'H': // Sets the name for the hash function.
{
diff --git a/apps/gperf/tests/c-parse.gperf b/apps/gperf/tests/c-parse.gperf
index feef59babb0..d1b8ba6c0ea 100644
--- a/apps/gperf/tests/c-parse.gperf
+++ b/apps/gperf/tests/c-parse.gperf
@@ -1,5 +1,5 @@
%{
-/* Command-line: gperf -p -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */
+/* Command-line: gperf -p -j1 -i 1 -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */
%}
struct resword { char *name; short token; enum rid rid; };
%%
diff --git a/apps/gperf/tests/gplus.gperf b/apps/gperf/tests/gplus.gperf
index 4a93315be52..2a2e37f9b26 100644
--- a/apps/gperf/tests/gplus.gperf
+++ b/apps/gperf/tests/gplus.gperf
@@ -1,5 +1,5 @@
%{
-/* Command-line: gperf -p -j1 -g -o -t -N is_reserved_word -k1,4,$ gplus.gperf */
+/* Command-line: gperf -p -j1 -o -t -N is_reserved_word -k1,4,$ gplus.gperf */
%}
struct resword { char *name; short token; enum rid rid;};
%%
diff --git a/apps/gperf/tests/test-3.exp b/apps/gperf/tests/test-3.exp
index e8ca49cd19e..687815a91dd 100644
--- a/apps/gperf/tests/test-3.exp
+++ b/apps/gperf/tests/test-3.exp
@@ -1,6 +1,6 @@
/* C code produced by gperf version 2.6 (GNU C++ version) */
-/* Command-line: ../src/gperf -p -j 1 -g -o -a -C -g -t -k1,4,$ */
-/* Command-line: gperf -p -j1 -g -o -t -N is_reserved_word -k1,4,$ gplus.gperf */
+/* Command-line: ../src/gperf -p -j 1 -o -a -C -g -t -k1,4,$ */
+/* Command-line: gperf -p -j1 -o -t -N is_reserved_word -k1,4,$ gplus.gperf */
#include <string.h>
struct resword { char *name; short token; enum rid rid;};
diff --git a/apps/gperf/tests/test-4.exp b/apps/gperf/tests/test-4.exp
index 39c2d218f2a..bf3925163f8 100644
--- a/apps/gperf/tests/test-4.exp
+++ b/apps/gperf/tests/test-4.exp
@@ -1,6 +1,6 @@
/* C code produced by gperf version 2.6 (GNU C++ version) */
/* Command-line: ../src/gperf -D -p -t */
-/* Command-line: gperf -p -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */
+/* Command-line: gperf -p -j1 -i 1 -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */
#include <string.h>
struct resword { char *name; short token; enum rid rid; };
diff --git a/apps/gperf/tests/test-5.exp b/apps/gperf/tests/test-5.exp
index a0dd7ee8686..b3889f5441f 100644
--- a/apps/gperf/tests/test-5.exp
+++ b/apps/gperf/tests/test-5.exp
@@ -1,5 +1,5 @@
/* C code produced by gperf version 2.6 (GNU C++ version) */
-/* Command-line: ../src/gperf -a -g -o -j1 -t -p -N is_reserved_word */
+/* Command-line: ../src/gperf -g -o -j1 -t -p -N is_reserved_word */
/* ISO Pascal 7185 reserved words.
*
* For GNU Pascal compiler (GPC) by jtv@hut.fi
diff --git a/apps/gperf/tests/test-6.exp b/apps/gperf/tests/test-6.exp
index eba6e3cac9a..380fcf32a30 100644
--- a/apps/gperf/tests/test-6.exp
+++ b/apps/gperf/tests/test-6.exp
@@ -12,8 +12,7 @@
running time at the cost of minimizing generated table-size.
The numeric argument represents the number of times to iterate when
resolving a collision. `0' means ``iterate by the number of keywords.''
--g Assume a GNU compiler, e.g., g++ or gcc. This makes all generated
- routines use the ``inline'' keyword to remove cost of function calls.
+-g Make generated routines use ``inline'' to remove function overhead.
-G Generate the static table of keywords as a static global variable,
rather than hiding it inside of the lookup function (which is the
default behavior).
@@ -21,6 +20,8 @@
-H Allow user to specify name of generated hash function. Default
is `hash'.
-i Provide an initial value for the associate values array. Default is 0.
+-I Generate comparison code using case insensitive string comparison, e.g.,
+ strncasecmp or strcasecmp.
Setting this value larger helps inflate the size of the final table.
-j Affects the ``jump value,'' i.e., how far to advance the associated
character value upon collisions. Must be an odd number, default is 5.
@@ -40,6 +41,8 @@
name is `in_word_set.'
-o Reorders input keys by frequency of occurrence of the key sets.
This should decrease the search time dramatically.
+-O Optimize the generated lookup function by assuming that all input keywords
+ are members of the keyset from the keyfile.
-p Changes the return value of the generated function ``in_word_set''
from its default boolean value (i.e., 0 or 1), to type ``pointer
to wordlist array'' This is most useful when the -t option, allowing
@@ -70,5 +73,5 @@
-v Prints out the current version number
-Z Allow user to specify name of generated C++ class. Default
name is `Perfect_Hash.'
-Usage: ../src/gperf [-acCdDef[num]gGhH<hashname>i<init>jk<keys>K<keyname>lL<language>nN<function name>oprs<size>S<switches>tTvZ<class name>].
+Usage: ../src/gperf [-acCdDef[num]gGhH<hashname>i<init>Ijk<keys>K<keyname>lL<language>nN<function name>oOprs<size>S<switches>tTvZ<class name>].
(type ../src/gperf -h for help)