diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-02 23:08:26 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-02 23:08:26 +0000 |
| commit | b907c6e925d82ad2903acd77edcf97635a7c6515 (patch) | |
| tree | 91ab17c496a1c303478997817bb01521e9acf922 | |
| parent | b147b5a3b8f6c5cac5444f6b75152ec8b69af4fb (diff) | |
keywords: make name singed
* defs/keywords (kwtable::name): turn into singed int, as gperf
fills invalid slots with -1.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | defs/keywords | 2 | ||||
| -rw-r--r-- | defs/lex.c.src | 2 | ||||
| -rw-r--r-- | lex.c.blt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index ba64e24e7c..5a7d0a70fb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -328,7 +328,7 @@ lex.c: defs/keywords else \ [ $(Q) ] && echo generating $@ || set -x; \ gperf -C -P -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? \ - | sed 's/(int)(long)&((\(struct stringpool_t\) *\*)0)->\(stringpool_[a-z0-9]*\)/offsetof(\1, \2)/g' \ + | sed 's/(long)&((\(struct stringpool_t\) *\*)0)->\(stringpool_[a-z0-9]*\)/offsetof(\1, \2)/g' \ > $@.tmp && \ $(MV) $@.tmp $@ && \ $(CP) $? $(srcdir)/defs/lex.c.src && \ diff --git a/defs/keywords b/defs/keywords index 0a53909c1e..20044a420c 100644 --- a/defs/keywords +++ b/defs/keywords @@ -1,5 +1,5 @@ %{ -struct kwtable {unsigned int name, id[2], state;}; +struct kwtable {int name, id[2], state;}; const struct kwtable *rb_reserved_word(const char *, unsigned int); #ifndef RIPPER static const struct kwtable *reserved_word(const char *, unsigned int); diff --git a/defs/lex.c.src b/defs/lex.c.src index 0a53909c1e..20044a420c 100644 --- a/defs/lex.c.src +++ b/defs/lex.c.src @@ -1,5 +1,5 @@ %{ -struct kwtable {unsigned int name, id[2], state;}; +struct kwtable {int name, id[2], state;}; const struct kwtable *rb_reserved_word(const char *, unsigned int); #ifndef RIPPER static const struct kwtable *reserved_word(const char *, unsigned int); @@ -30,7 +30,7 @@ error "gperf generated tables don't work with this execution character set. Plea #line 1 "defs/keywords" -struct kwtable {unsigned int name, id[2], state;}; +struct kwtable {int name, id[2], state;}; const struct kwtable *rb_reserved_word(const char *, unsigned int); #ifndef RIPPER static const struct kwtable *reserved_word(const char *, unsigned int); |