# HG changeset patch
# User jwe
# Date 1101930885 0
# Node ID 7830f271a53f3796e1e77fe56631f0ceb5cb759c
# Parent  7497a16d90f951b40ddc1227ba9be1c26bff7580
[project @ 2004-12-01 19:54:45 by jwe]

diff -r 7497a16d90f9 -r 7830f271a53f src/ChangeLog
--- a/src/ChangeLog	Mon Nov 22 05:38:37 2004 +0000
+++ b/src/ChangeLog	Wed Dec 01 19:54:45 2004 +0000
@@ -1,3 +1,11 @@
+2004-11-30  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (oct-gperf.h): Use -L C++ instead of -L ANSI_C.
+	Use -Z octave_kw_hash option, delete -H and -N options.
+	* lex.l (is_keyword_token): Use octave_kw_hash::in_word_set
+	instead of octave_kw_lookup.
+	(is_keyword): Likewise.
+
 2004-11-22  John W. Eaton  <jwe@octave.org>
 
 	* pt-arg-list.cc (tree_argument_list::convert_to_const_vector):
diff -r 7497a16d90f9 -r 7830f271a53f src/Makefile.in
--- a/src/Makefile.in	Mon Nov 22 05:38:37 2004 +0000
+++ b/src/Makefile.in	Wed Dec 01 19:54:45 2004 +0000
@@ -520,8 +520,7 @@
 
 oct-gperf.h: octave.gperf
 	@echo "making $@ from $<"
-	@$(GPERF) -t -C -D -E -G -L ANSI-C \
-               -H octave_kw_hash -N octave_kw_lookup \
+	@$(GPERF) -t -C -D -E -G -L C++ -Z octave_kw_hash \
 	  $< | $(SED) 's,lookup\[,gperf_lookup[,' > $@-t
 	@$(top_srcdir)/move-if-change $@-t $@
 
diff -r 7497a16d90f9 -r 7830f271a53f src/lex.l
--- a/src/lex.l	Mon Nov 22 05:38:37 2004 +0000
+++ b/src/lex.l	Wed Dec 01 19:54:45 2004 +0000
@@ -1213,7 +1213,7 @@
 
   int len = s.length ();
 
-  const octave_kw *kw = octave_kw_lookup (s.c_str (), len);
+  const octave_kw *kw = octave_kw_hash::in_word_set (s.c_str (), len);
 
   if (kw)
     {
@@ -2688,7 +2688,7 @@
 bool
 is_keyword (const std::string& s)
 {
-  return octave_kw_lookup (s.c_str (), s.length ()) != 0;
+  return octave_kw_hash::in_word_set (s.c_str (), s.length ()) != 0;
 }
 
 DEFCMD (iskeyword, args, ,
diff -r 7497a16d90f9 -r 7830f271a53f src/octave.gperf
--- a/src/octave.gperf	Mon Nov 22 05:38:37 2004 +0000
+++ b/src/octave.gperf	Wed Dec 01 19:54:45 2004 +0000
@@ -41,6 +41,7 @@
 };
 
 %}
+
 struct octave_kw { const char *name; int tok; octave_kw_id kw_id; };
 %%
 all_va_args, ALL_VA_ARGS, all_va_args_kw