From f341957fe57f9ee1f492bf89cf95685eac9ef1f2 Mon Sep 17 00:00:00 2001 From: skandhas Date: Thu, 20 Dec 2012 22:13:08 +0800 Subject: mrb_mod_cvar_get --- src/class.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'src/class.c') diff --git a/src/class.c b/src/class.c index 339920b6e..d46b63f2b 100644 --- a/src/class.c +++ b/src/class.c @@ -1444,6 +1444,33 @@ mrb_sym_value(mrb_state *mrb, mrb_value val) return mrb_symbol(val); } +/* 15.2.2.4.17 */ +/* + * call-seq: + * mod.class_variable_get(symbol) -> obj + * + * Returns the value of the given class variable (or throws a + * NameError exception). The @@ part of the + * variable name should be included for regular class variables + * + * class Fred + * @@foo = 99 + * end + * Fred.class_variable_get(:@@foo) #=> 99 + */ + +static mrb_value +mrb_mod_cvar_get(mrb_state *mrb, mrb_value mod) +{ + mrb_value sym; + mrb_sym id; + mrb_get_args(mrb, "o", &sym); + + id = mrb_sym_value(mrb,sym); + check_cvar_name(mrb, id); + return mrb_cv_get(mrb, mod, id); +} + static void check_const_name(mrb_state *mrb, mrb_sym id) { @@ -1545,6 +1572,7 @@ mrb_init_class(mrb_state *mrb) mrb_define_method(mrb, cls, "superclass", mrb_class_superclass, ARGS_NONE()); /* 15.2.3.3.4 */ mrb_define_method(mrb, cls, "new", mrb_instance_new, ARGS_ANY()); /* 15.2.3.3.3 */ mrb_define_method(mrb, cls, "inherited", mrb_bob_init, ARGS_REQ(1)); + mrb_define_method(mrb, mod, "class_variable_get", mrb_mod_cvar_get, ARGS_REQ(1)); /* 15.2.2.4.17 */ mrb_define_method(mrb, mod, "extend_object", mrb_mod_extend_object, ARGS_REQ(1)); /* 15.2.2.4.25 */ mrb_define_method(mrb, mod, "extended", mrb_bob_init, ARGS_REQ(1)); /* 15.2.2.4.26 */ mrb_define_method(mrb, mod, "include", mrb_mod_include, ARGS_ANY()); /* 15.2.2.4.27 */ -- cgit v1.2.3 From 2ca47bba8f509337f3b3fb22ad6c8bac46e542ac Mon Sep 17 00:00:00 2001 From: skandhas Date: Thu, 20 Dec 2012 22:17:36 +0800 Subject: add check_cv_name --- src/class.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/class.c') diff --git a/src/class.c b/src/class.c index d46b63f2b..19a697bc8 100644 --- a/src/class.c +++ b/src/class.c @@ -1444,6 +1444,18 @@ mrb_sym_value(mrb_state *mrb, mrb_value val) return mrb_symbol(val); } +static void +check_cv_name(mrb_state *mrb, mrb_sym id) +{ + const char *s; + int len; + + s = mrb_sym2name_len(mrb, id, &len); + if (len < 3 || !(s[0] == '@' && s[1] == '@')) { + mrb_name_error(mrb, id, "`%s' is not allowed as a class variable name", s); + } +} + /* 15.2.2.4.17 */ /* * call-seq: @@ -1467,7 +1479,7 @@ mrb_mod_cvar_get(mrb_state *mrb, mrb_value mod) mrb_get_args(mrb, "o", &sym); id = mrb_sym_value(mrb,sym); - check_cvar_name(mrb, id); + check_cv_name(mrb, id); return mrb_cv_get(mrb, mod, id); } -- cgit v1.2.3