aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--regcomp.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2296b34f54..b6b32eaeea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 15 09:50:21 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * regcomp.c (print_indent_tree): fix double printing of ENCLOSE_OPTION
+ children bug. patched by Suraj Kurapati. [ruby-core:40964]
+
Tue Nov 15 01:53:48 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
* test/ruby/test_io.rb (test_fcntl_dupfd): fix test error on
diff --git a/regcomp.c b/regcomp.c
index 7c29fb5203..ae8c793e76 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -6281,7 +6281,6 @@ print_indent_tree(FILE* f, Node* node, int indent)
switch (NENCLOSE(node)->type) {
case ENCLOSE_OPTION:
fprintf(f, "option:%d\n", NENCLOSE(node)->option);
- print_indent_tree(f, NENCLOSE(node)->target, indent + add);
break;
case ENCLOSE_MEMORY:
fprintf(f, "memory:%d", NENCLOSE(node)->regnum);