summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--parse.y8
2 files changed, 5 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index c67e702ab3..0894237eb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 3 21:04:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (dyna_in_block): inline using macro.
+
Tue Oct 3 02:31:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (splat_value): use "to_splat" instead of "to_ary" to
diff --git a/parse.y b/parse.y
index cb3bbdc29b..c0bdcfdbcd 100644
--- a/parse.y
+++ b/parse.y
@@ -317,7 +317,7 @@ static struct RVarmap *dyna_push_gen(struct parser_params*);
static void dyna_pop_gen(struct parser_params*, struct RVarmap*);
#define dyna_pop(vars) dyna_pop_gen(parser, vars)
static int dyna_in_block_gen(struct parser_params*);
-#define dyna_in_block() dyna_in_block_gen(parser)
+#define dyna_in_block() (lvtbl->dlev > 0)
static NODE *dyna_init_gen(struct parser_params*, NODE*, struct RVarmap *);
#define dyna_init(node, pre) dyna_init_gen(parser, node, pre)
static void dyna_var_gen(struct parser_params*,ID);
@@ -8139,12 +8139,6 @@ dyna_pop_gen(struct parser_params *parser, struct RVarmap* vars)
ruby_dyna_vars = vars;
}
-static int
-dyna_in_block_gen(struct parser_params *parser)
-{
- return (lvtbl->dlev > 0);
-}
-
static NODE *
dyna_init_gen(struct parser_params *parser, NODE *node, struct RVarmap *pre)
{