diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-12-23 09:44:00 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-12-23 09:44:00 +0900 |
| commit | 7990bb7fa7ea9a0438aa8d06a76a60c39451b692 (patch) | |
| tree | 46ab4c39e6784ac4bb6efbe4af28bfd6653d5f8c /mrbgems/mruby-compiler/core | |
| parent | 100f0e6759be8e439e586acf01032d2b8b96c6bd (diff) | |
| parent | 06f90a3b45fa4f241bbc43e91287aa9a127dc8c3 (diff) | |
| download | mruby-7990bb7fa7ea9a0438aa8d06a76a60c39451b692.tar.gz mruby-7990bb7fa7ea9a0438aa8d06a76a60c39451b692.zip | |
Merge pull request #3913 from llothar/master
Make source compilable with C++17
Diffstat (limited to 'mrbgems/mruby-compiler/core')
| -rw-r--r-- | mrbgems/mruby-compiler/core/lex.def | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mrbgems/mruby-compiler/core/lex.def b/mrbgems/mruby-compiler/core/lex.def index 58e302965..2ff266481 100644 --- a/mrbgems/mruby-compiler/core/lex.def +++ b/mrbgems/mruby-compiler/core/lex.def @@ -52,7 +52,7 @@ inline #endif #endif static unsigned int -hash (register const char *str, register unsigned int len) +hash (const char *str, unsigned int len) { static const unsigned char asso_values[] = { @@ -83,7 +83,7 @@ hash (register const char *str, register unsigned int len) 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51 }; - register int hval = len; + int hval = len; switch (hval) { @@ -105,7 +105,7 @@ __attribute__ ((__gnu_inline__)) #endif #endif const struct kwtable * -mrb_reserved_word (register const char *str, register unsigned int len) +mrb_reserved_word (const char *str, unsigned int len) { static const struct kwtable wordlist[] = { @@ -196,11 +196,11 @@ mrb_reserved_word (register const char *str, register unsigned int len) if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) { - register int key = hash (str, len); + int key = hash (str, len); if (key <= MAX_HASH_VALUE && key >= 0) { - register const char *s = wordlist[key].name; + const char *s = wordlist[key].name; if (*str == *s && !strcmp (str + 1, s + 1)) return &wordlist[key]; @@ -209,4 +209,3 @@ mrb_reserved_word (register const char *str, register unsigned int len) return 0; } #line 50 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords" - |