summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-05 02:10:29 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-05 02:10:29 +0000
commitd71c745b40a0cd49622cca57a93364edafb6409c (patch)
treedb768f140ffa388e238e264e3d217370fda9769e
parentcbdac1eaf69e52d353e85951f6667b6332abcff7 (diff)
iseq.c: remove unused rb_iseq_new_with_bopt
* iseq.c (prepare_iseq_build): remove unused block_opt param (rb_iseq_new_with_bopt_and_opt): remove (rb_iseq_new_with_opt): inline removed function (rb_iseq_new_with_bopt): remove (iseq_load): adjust prepare_iseq_build call [Feature #10565] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--iseq.c36
2 files changed, 19 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index 169638abe5..f83304f551 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Dec 5 11:09:54 2014 Eric Wong <e@80x24.org>
+
+ * iseq.c (prepare_iseq_build): remove unused block_opt param
+ (rb_iseq_new_with_bopt_and_opt): remove
+ (rb_iseq_new_with_opt): inline removed function
+ (rb_iseq_new_with_bopt): remove
+ (iseq_load): adjust prepare_iseq_build call
+ [Feature #10565]
+
Fri Dec 5 09:46:05 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_yylex): fix lex_state after tLABEL_END, should
diff --git a/iseq.c b/iseq.c
index d31076a32f..8f84f88c14 100644
--- a/iseq.c
+++ b/iseq.c
@@ -267,7 +267,7 @@ rb_iseq_add_mark_object(rb_iseq_t *iseq, VALUE obj)
static VALUE
prepare_iseq_build(rb_iseq_t *iseq,
VALUE name, VALUE path, VALUE absolute_path, VALUE first_lineno,
- VALUE parent, enum iseq_type type, VALUE block_opt,
+ VALUE parent, enum iseq_type type,
const rb_compile_option_t *option)
{
iseq->type = type;
@@ -431,42 +431,26 @@ rb_iseq_new_main(NODE *node, VALUE path, VALUE absolute_path)
parent, ISEQ_TYPE_MAIN, &COMPILE_OPTION_DEFAULT);
}
-static VALUE
-rb_iseq_new_with_bopt_and_opt(NODE *node, VALUE name, VALUE path, VALUE absolute_path, VALUE first_lineno,
- VALUE parent, enum iseq_type type, VALUE bopt,
- const rb_compile_option_t *option)
+VALUE
+rb_iseq_new_with_opt(NODE *node, VALUE name, VALUE path, VALUE absolute_path,
+ VALUE first_lineno, VALUE parent, enum iseq_type type,
+ const rb_compile_option_t *option)
{
+ /* TODO: argument check */
rb_iseq_t *iseq;
VALUE self = iseq_alloc(rb_cISeq);
GetISeqPtr(self, iseq);
iseq->self = self;
- prepare_iseq_build(iseq, name, path, absolute_path, first_lineno, parent, type, bopt, option);
+ prepare_iseq_build(iseq, name, path, absolute_path, first_lineno, parent,
+ type, option);
+
rb_iseq_compile_node(self, node);
cleanup_iseq_build(iseq);
return self;
}
-VALUE
-rb_iseq_new_with_opt(NODE *node, VALUE name, VALUE path, VALUE absolute_path, VALUE first_lineno,
- VALUE parent, enum iseq_type type,
- const rb_compile_option_t *option)
-{
- /* TODO: argument check */
- return rb_iseq_new_with_bopt_and_opt(node, name, path, absolute_path, first_lineno, parent, type,
- Qfalse, option);
-}
-
-VALUE
-rb_iseq_new_with_bopt(NODE *node, VALUE name, VALUE path, VALUE absolute_path, VALUE first_lineno,
- VALUE parent, enum iseq_type type, VALUE bopt)
-{
- /* TODO: argument check */
- return rb_iseq_new_with_bopt_and_opt(node, name, path, absolute_path, first_lineno, parent, type,
- bopt, &COMPILE_OPTION_DEFAULT);
-}
-
#define CHECK_ARRAY(v) rb_convert_type((v), T_ARRAY, "Array", "to_ary")
#define CHECK_HASH(v) rb_convert_type((v), T_HASH, "Hash", "to_hash")
#define CHECK_STRING(v) rb_convert_type((v), T_STRING, "String", "to_str")
@@ -556,7 +540,7 @@ iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt)
make_compile_option(&option, opt);
prepare_iseq_build(iseq, name, path, absolute_path, first_lineno,
- parent, (enum iseq_type)iseq_type, 0, &option);
+ parent, (enum iseq_type)iseq_type, &option);
rb_iseq_build_from_ary(iseq, misc, locals, params, exception, body);