summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorcremno <[email protected]>2014-01-09 14:48:42 +0100
committercremno <[email protected]>2014-01-30 23:16:46 +0100
commitd90f52f55221601616670e5d9c4d3b3164e2b7da (patch)
tree9c9a73d873ebc7a41d5d8368ea70801fe21f5bdf
parenta68a51702876b9c520c21a15bdf03ea91e0439f0 (diff)
downloadmruby-d90f52f55221601616670e5d9c4d3b3164e2b7da.tar.gz
mruby-d90f52f55221601616670e5d9c4d3b3164e2b7da.zip
etc.c: small cleanup (delete unused functions)
mrb_data_object_alloc: unnecessary cast mrb_lastline_get: mruby doesn't support $_, weird and unused code mrb_exec_recursive: see 4e46abb86914b36e70b5f3ad0826d0b648e9b4ef mrb_block_proc: unused, doesn't really do anything (or needs to be rewritten) mrb_obj_to_sym: actually use id (and MSVC detected unreachable code)
-rw-r--r--include/mruby.h1
-rw-r--r--src/etc.c45
2 files changed, 2 insertions, 44 deletions
diff --git a/include/mruby.h b/include/mruby.h
index 3a08afde2..25080703e 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -366,7 +366,6 @@ void mrb_define_alias(mrb_state *mrb, struct RClass *klass, const char *name1, c
const char *mrb_class_name(mrb_state *mrb, struct RClass* klass);
void mrb_define_global_const(mrb_state *mrb, const char *name, mrb_value val);
-mrb_value mrb_block_proc(void);
mrb_value mrb_attr_get(mrb_state *mrb, mrb_value obj, mrb_sym id);
mrb_bool mrb_respond_to(mrb_state *mrb, mrb_value obj, mrb_sym mid);
diff --git a/src/etc.c b/src/etc.c
index 8d19a1eab..cf7547c2d 100644
--- a/src/etc.c
+++ b/src/etc.c
@@ -16,7 +16,7 @@ mrb_data_object_alloc(mrb_state *mrb, struct RClass *klass, void *ptr, const mrb
data = (struct RData*)mrb_obj_alloc(mrb, MRB_TT_DATA, klass);
data->data = ptr;
- data->type = (mrb_data_type*) type;
+ data->type = type;
return data;
}
@@ -62,34 +62,6 @@ mrb_data_get_ptr(mrb_state *mrb, mrb_value obj, const mrb_data_type *type)
return DATA_PTR(obj);
}
-mrb_value
-mrb_lastline_get(mrb_state *mrb)
-{
- mrb_value *argv;
- int argc;
-
- mrb_get_args(mrb, "*", &argv, &argc);
- if (argc < 1) {
- return mrb_nil_value();
- }
- else
- {
- return argv[0];
- }
-}
-
-/* ------------------------------------------------ */
-/*
- * Calls func(obj, arg, recursive), where recursive is non-zero if the
- * current method is called recursively on obj
- */
-
-mrb_value
-mrb_exec_recursive(mrb_state *mrb, mrb_value (*func) (mrb_state *, mrb_value, mrb_value, int), mrb_value obj, void *arg)
-{
- return func(mrb, obj, *(mrb_value*)arg, 0);
-}
-
mrb_sym
mrb_obj_to_sym(mrb_state *mrb, mrb_value name)
{
@@ -109,24 +81,11 @@ mrb_obj_to_sym(mrb_state *mrb, mrb_value name)
name = mrb_str_intern(mrb, name);
/* fall through */
case MRB_TT_SYMBOL:
- return mrb_symbol(name);
+ id = mrb_symbol(name);
}
return id;
}
-/*
- * call-seq:
- * proc { |...| block } -> a_proc
- *
- * Equivalent to <code>Proc.new</code>.
- */
-
-mrb_value
-mrb_block_proc(void)
-{
- return mrb_nil_value();
-}
-
static mrb_int
float_id(mrb_float f)
{