From fc89106792a125933b180e6905eec529160811d3 Mon Sep 17 00:00:00 2001 From: skandhas Date: Mon, 3 Dec 2012 13:55:23 +0800 Subject: add function:check_const_name --- src/class.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src') diff --git a/src/class.c b/src/class.c index 618a6d1f6..09ca3eb7f 100644 --- a/src/class.c +++ b/src/class.c @@ -7,6 +7,7 @@ #include "mruby.h" #include #include +#include #include "mruby/class.h" #include "mruby/proc.h" #include "mruby/string.h" @@ -1442,6 +1443,18 @@ mrb_sym_value(mrb_state *mrb, mrb_value val) return mrb_symbol(val); } +static void +check_const_name(mrb_state *mrb, mrb_sym id) +{ + const char *s; + int len; + + s = mrb_sym2name_len(mrb, id, &len); + if (len < 1 || !ISUPPER(*s)) { + mrb_name_error(mrb, id, "wrong constant name %s", s); + } +} + mrb_value mrb_mod_const_defined(mrb_state *mrb, mrb_value mod) { -- cgit v1.2.3 From b3bb54a21aae34c1bb17d615873b7f7deeaf94d8 Mon Sep 17 00:00:00 2001 From: skandhas Date: Mon, 3 Dec 2012 14:04:03 +0800 Subject: add check_const_name for Module#const_defined? --- src/class.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/class.c b/src/class.c index 09ca3eb7f..d9431769c 100644 --- a/src/class.c +++ b/src/class.c @@ -1460,6 +1460,8 @@ mrb_mod_const_defined(mrb_state *mrb, mrb_value mod) { mrb_value sym; mrb_get_args(mrb, "o", &sym); + + check_const_name(mrb, mrb_sym_value(mrb,sym)); if(mrb_const_defined(mrb, mod, mrb_sym_value(mrb, sym))) { return mrb_true_value(); } -- cgit v1.2.3 From 78808bf5e3983453a65d3742d817cd2889678e3e Mon Sep 17 00:00:00 2001 From: skandhas Date: Mon, 3 Dec 2012 14:09:06 +0800 Subject: add check_const_name for Module#const_get --- src/class.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/class.c b/src/class.c index d9431769c..30de9553c 100644 --- a/src/class.c +++ b/src/class.c @@ -1473,6 +1473,8 @@ mrb_mod_const_get(mrb_state *mrb, mrb_value mod) { mrb_value sym; mrb_get_args(mrb, "o", &sym); + + check_const_name(mrb, mrb_sym_value(mrb,sym)); return mrb_const_get(mrb, mod, mrb_sym_value(mrb, sym)); } -- cgit v1.2.3 From 4bfece436e70aeb11c873edbc784688bab049c1a Mon Sep 17 00:00:00 2001 From: skandhas Date: Mon, 3 Dec 2012 14:15:37 +0800 Subject: add check_const_name for Module#const_set --- src/class.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/class.c b/src/class.c index 30de9553c..dcd0ae492 100644 --- a/src/class.c +++ b/src/class.c @@ -1483,6 +1483,8 @@ mrb_mod_const_set(mrb_state *mrb, mrb_value mod) { mrb_value sym, value; mrb_get_args(mrb, "oo", &sym, &value); + + check_const_name(mrb, mrb_sym_value(mrb,sym)); mrb_const_set(mrb, mod, mrb_sym_value(mrb, sym), value); return value; } -- cgit v1.2.3