summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ext/ripper/lib/ripper/core.rb4
-rw-r--r--parse.y2
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 02288aba48..bef59e3008 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Apr 14 19:05:06 2005 Minero Aoki <aamine@loveruby.net>
+
+ * parse.y [ripper] (regexp): dispatch regexp option.
+ [ruby-Bugs:1688]
+
+ * ext/ripper/lib/core.rb: regenerated (interface changed).
+
Thu Apr 14 18:59:43 2005 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (remove_file): ignore exceptions caused by
diff --git a/ext/ripper/lib/ripper/core.rb b/ext/ripper/lib/ripper/core.rb
index e936783698..b362d30d20 100644
--- a/ext/ripper/lib/ripper/core.rb
+++ b/ext/ripper/lib/ripper/core.rb
@@ -97,7 +97,7 @@ class Ripper
:qwords_add => 2,
:qwords_new => 0,
:redo => 0,
- :regexp_literal => 1,
+ :regexp_literal => 2,
:rescue => 4,
:rescue_mod => 2,
:restparam => 1,
@@ -525,7 +525,7 @@ class Ripper
nil
end
- def on_regexp_literal(a)
+ def on_regexp_literal(a, b)
a
end
diff --git a/parse.y b/parse.y
index 21faacd0e0..45c3e648e9 100644
--- a/parse.y
+++ b/parse.y
@@ -3551,7 +3551,7 @@ regexp : tREGEXP_BEG xstring_contents tREGEXP_END
}
$$ = node;
/*%
- $$ = dispatch1(regexp_literal, $2);
+ $$ = dispatch2(regexp_literal, $2, $3);
%*/
}
;