diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-15 14:42:43 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-15 14:42:43 +0000 |
commit | 7c4306e6e9c3c4a255f4ad20134c1832dbe45ba2 (patch) | |
tree | 9dc0a268704c41c9ce7bd4fe7ce90b45321e4135 | |
parent | a9419fbd4fe597a9ef41621d16664a659544ed76 (diff) |
gperf.sed: static declarations
* tool/gperf.sed: comment out arguments part only, to keep the
following declarations static. [Feature #13883]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | defs/keywords | 2 | ||||
-rw-r--r-- | defs/lex.c.src | 2 | ||||
-rw-r--r-- | enc/jis/props.h.blt | 2 | ||||
-rw-r--r-- | enc/jis/props.kwd | 2 | ||||
-rw-r--r-- | enc/jis/props.src | 2 | ||||
-rw-r--r-- | ext/io/console/win32_vk.inc | 2 | ||||
-rw-r--r-- | ext/io/console/win32_vk.list | 2 | ||||
-rw-r--r-- | lex.c.blt | 2 | ||||
-rw-r--r-- | tool/gperf.sed | 4 |
9 files changed, 10 insertions, 10 deletions
diff --git a/defs/keywords b/defs/keywords index cc5622e056..7f5422faef 100644 --- a/defs/keywords +++ b/defs/keywords @@ -2,7 +2,7 @@ struct kwtable {int name, id[2], state;}; const struct kwtable *rb_reserved_word(const char *, unsigned int); #ifndef RIPPER -/*!ANSI*/static const struct kwtable *reserved_word(const char *, unsigned int); +static const struct kwtable *reserved_word(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/); #define rb_reserved_word(str, len) reserved_word(str, len) %} diff --git a/defs/lex.c.src b/defs/lex.c.src index cc5622e056..7f5422faef 100644 --- a/defs/lex.c.src +++ b/defs/lex.c.src @@ -2,7 +2,7 @@ struct kwtable {int name, id[2], state;}; const struct kwtable *rb_reserved_word(const char *, unsigned int); #ifndef RIPPER -/*!ANSI*/static const struct kwtable *reserved_word(const char *, unsigned int); +static const struct kwtable *reserved_word(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/); #define rb_reserved_word(str, len) reserved_word(str, len) %} diff --git a/enc/jis/props.h.blt b/enc/jis/props.h.blt index df4850133c..54aa94f8bc 100644 --- a/enc/jis/props.h.blt +++ b/enc/jis/props.h.blt @@ -69,7 +69,7 @@ struct enc_property { unsigned char ctype; }; -/*static const struct enc_property *onig_jis_property(const char *str, unsigned int len);*/ +static const struct enc_property *onig_jis_property(/*const char *str, unsigned int len*/); #line 43 "enc/jis/props.kwd" struct enc_property; diff --git a/enc/jis/props.kwd b/enc/jis/props.kwd index eaeeccda37..659cf0aff4 100644 --- a/enc/jis/props.kwd +++ b/enc/jis/props.kwd @@ -37,7 +37,7 @@ struct enc_property { unsigned char ctype; }; -/*!ANSI*/static const struct enc_property *onig_jis_property(const char *str, unsigned int len); +static const struct enc_property *onig_jis_property(/*!ANSI{*/const char *str, unsigned int len/*}!ANSI*/); %} struct enc_property; diff --git a/enc/jis/props.src b/enc/jis/props.src index eaeeccda37..659cf0aff4 100644 --- a/enc/jis/props.src +++ b/enc/jis/props.src @@ -37,7 +37,7 @@ struct enc_property { unsigned char ctype; }; -/*!ANSI*/static const struct enc_property *onig_jis_property(const char *str, unsigned int len); +static const struct enc_property *onig_jis_property(/*!ANSI{*/const char *str, unsigned int len/*}!ANSI*/); %} struct enc_property; diff --git a/ext/io/console/win32_vk.inc b/ext/io/console/win32_vk.inc index ab09cd67d2..cbec7bef15 100644 --- a/ext/io/console/win32_vk.inc +++ b/ext/io/console/win32_vk.inc @@ -513,7 +513,7 @@ #line 1 "win32_vk.list" struct vktable {short ofs; unsigned short vk;}; -/*static const struct vktable *console_win32_vk(const char *, unsigned int);*/ +static const struct vktable *console_win32_vk(/*const char *, unsigned int*/); #line 5 "win32_vk.list" struct vktable; /* maximum key range = 245, duplicates = 0 */ diff --git a/ext/io/console/win32_vk.list b/ext/io/console/win32_vk.list index f1d3581c3c..7909a4d1f0 100644 --- a/ext/io/console/win32_vk.list +++ b/ext/io/console/win32_vk.list @@ -1,6 +1,6 @@ %{ struct vktable {short ofs; unsigned short vk;}; -/*!ANSI*/static const struct vktable *console_win32_vk(const char *, unsigned int); +static const struct vktable *console_win32_vk(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/); %} struct vktable %% @@ -34,7 +34,7 @@ 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);*/ +static const struct kwtable *reserved_word(/*const char *, unsigned int*/); #define rb_reserved_word(str, len) reserved_word(str, len) #line 9 "defs/keywords" struct kwtable; diff --git a/tool/gperf.sed b/tool/gperf.sed index ed2196fee4..6b3e1980be 100644 --- a/tool/gperf.sed +++ b/tool/gperf.sed @@ -3,9 +3,9 @@ s/.*/ANSI:offset:/ x } -/^\/\*!ANSI\*\//{ +/\/\*!ANSI{\*\//{ G - s/^\/\*!ANSI\*\/\(.*\)\nANSI:.*/\/\*\1\*\// + s/\/\*!ANSI{\*\/\(.*\)\/\*}!ANSI\*\/\(.*\)\nANSI:.*/\/\*\1\*\/\2/ } s/(int)([a-z_]*)&((struct \([a-zA-Z_0-9][a-zA-Z_0-9]*\)_t *\*)0)->\1_str\([1-9][0-9]*\),/gperf_offsetof(\1, \2),/g /^#line/{ |