summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2016-04-24 01:52:15 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2016-04-24 02:34:34 +0900
commitd1389fa3c173fcb934bf0dc1f0a51083ae9e782f (patch)
tree015ba2051d7112013f8d9e7b98e366cf69582a71
parent5bf9d8439841978b6dbad381fb8f62ea61887acc (diff)
downloadjson-d1389fa3c173fcb934bf0dc1f0a51083ae9e782f.tar.gz
Use enum
Use `enum` instead of `static const int` to get rid of unused-const-variable warnings.
-rw-r--r--Rakefile1
-rw-r--r--ext/json/ext/parser/parser.c56
2 files changed, 29 insertions, 28 deletions
diff --git a/Rakefile b/Rakefile
index 4aa311e..4448d2e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -361,6 +361,7 @@ else
sh "ragel -x parser.rl | #{RAGEL_CODEGEN} -G2"
end
src = File.read("parser.c").gsub(/[ \t]+$/, '')
+ src.gsub!(/^static const int (JSON_.*=.*);$/, 'enum {\1};')
File.open("parser.c", "w") {|f| f.print src}
end
end
diff --git a/ext/json/ext/parser/parser.c b/ext/json/ext/parser/parser.c
index c63a462..35014b0 100644
--- a/ext/json/ext/parser/parser.c
+++ b/ext/json/ext/parser/parser.c
@@ -89,11 +89,11 @@ static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
#line 92 "parser.c"
-static const int JSON_object_start = 1;
-static const int JSON_object_first_final = 27;
-static const int JSON_object_error = 0;
+enum {JSON_object_start = 1};
+enum {JSON_object_first_final = 27};
+enum {JSON_object_error = 0};
-static const int JSON_object_en_main = 1;
+enum {JSON_object_en_main = 1};
#line 151 "parser.rl"
@@ -467,11 +467,11 @@ case 26:
#line 470 "parser.c"
-static const int JSON_value_start = 1;
-static const int JSON_value_first_final = 29;
-static const int JSON_value_error = 0;
+enum {JSON_value_start = 1};
+enum {JSON_value_first_final = 29};
+enum {JSON_value_error = 0};
-static const int JSON_value_en_main = 1;
+enum {JSON_value_en_main = 1};
#line 271 "parser.rl"
@@ -865,11 +865,11 @@ case 28:
#line 868 "parser.c"
-static const int JSON_integer_start = 1;
-static const int JSON_integer_first_final = 3;
-static const int JSON_integer_error = 0;
+enum {JSON_integer_start = 1};
+enum {JSON_integer_first_final = 3};
+enum {JSON_integer_error = 0};
-static const int JSON_integer_en_main = 1;
+enum {JSON_integer_en_main = 1};
#line 295 "parser.rl"
@@ -964,11 +964,11 @@ case 5:
#line 967 "parser.c"
-static const int JSON_float_start = 1;
-static const int JSON_float_first_final = 8;
-static const int JSON_float_error = 0;
+enum {JSON_float_start = 1};
+enum {JSON_float_first_final = 8};
+enum {JSON_float_error = 0};
-static const int JSON_float_en_main = 1;
+enum {JSON_float_en_main = 1};
#line 329 "parser.rl"
@@ -1130,11 +1130,11 @@ case 7:
#line 1133 "parser.c"
-static const int JSON_array_start = 1;
-static const int JSON_array_first_final = 17;
-static const int JSON_array_error = 0;
+enum {JSON_array_start = 1};
+enum {JSON_array_first_final = 17};
+enum {JSON_array_error = 0};
-static const int JSON_array_en_main = 1;
+enum {JSON_array_en_main = 1};
#line 381 "parser.rl"
@@ -1462,11 +1462,11 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
#line 1465 "parser.c"
-static const int JSON_string_start = 1;
-static const int JSON_string_first_final = 8;
-static const int JSON_string_error = 0;
+enum {JSON_string_start = 1};
+enum {JSON_string_first_final = 8};
+enum {JSON_string_error = 0};
-static const int JSON_string_en_main = 1;
+enum {JSON_string_en_main = 1};
#line 494 "parser.rl"
@@ -1785,11 +1785,11 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
#line 1788 "parser.c"
-static const int JSON_start = 1;
-static const int JSON_first_final = 10;
-static const int JSON_error = 0;
+enum {JSON_start = 1};
+enum {JSON_first_final = 10};
+enum {JSON_error = 0};
-static const int JSON_en_main = 1;
+enum {JSON_en_main = 1};
#line 696 "parser.rl"