Mercurial > hg > octave-jordi
changeset 5088:7830f271a53f
[project @ 2004-12-01 19:54:45 by jwe]
| author | jwe |
|---|---|
| date | Wed, 01 Dec 2004 19:54:45 +0000 |
| parents | 7497a16d90f9 |
| children | 3db2b2762491 |
| files | src/ChangeLog src/Makefile.in src/lex.l src/octave.gperf |
| diffstat | 4 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -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):
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -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 $@
--- a/src/lex.l +++ b/src/lex.l @@ -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, ,