diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | lib/irb/ruby-lex.rb | 2 | ||||
| -rw-r--r-- | process.c | 4 | ||||
| -rw-r--r-- | re.c | 76 |
4 files changed, 61 insertions, 31 deletions
@@ -1,3 +1,13 @@ +Sat Jul 17 14:18:11 2004 Yukihiro Matsumoto <matz@ruby-lang.org> + + * re.c (rb_reg_match_m): add optional second argugment "pos" to + specify match start point. [ruby-core:03203] + +Sat Jul 17 13:13:32 2004 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/irb/ruby-lex.rb (RubyLex::identify_string): %s string do not + process expression interpolation. [ruby-talk:106691] + Sat Jul 17 05:26:27 2004 Dave Thomas <dave@pragprog.com> * lib/rdoc/diagram.rb: Incorporate Micheal Neumann's diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index 6b445a32b9..5a1ede7e3f 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -973,7 +973,7 @@ class RubyLex while ch = getc if @quoted == ch and nest == 0 break - elsif @ltype != "'" && @ltype != "]" and ch == "#" + elsif @ltype != "'" && @ltype != "]" && @ltype != ":" and ch == "#" subtype = true elsif ch == '\\' #' read_escape @@ -1490,6 +1490,10 @@ rb_f_exit_bang(argc, argv, obj) return Qnil; /* not reached */ } +#if defined(sun) +#define signal(a,b) sigset(a,b) +#endif + void rb_syswait(pid) int pid; @@ -1491,36 +1491,34 @@ rb_reg_equal(re1, re2) return Qfalse; } - -/* - * call-seq: - * rxp.match(str) => matchdata or nil - * - * Returns a <code>MatchData</code> object describing the match, or - * <code>nil</code> if there was no match. This is equivalent to retrieving the - * value of the special variable <code>$~</code> following a normal match. - * - * /(.)(.)(.)/.match("abc")[2] #=> "b" - */ - -VALUE -rb_reg_match(re, str) +static VALUE +rb_reg_match_pos(re, str, pos) VALUE re, str; + long pos; { - long start; - - if (NIL_P(str)) { - rb_backref_set(Qnil); - return Qnil; - } StringValue(str); - start = rb_reg_search(re, str, 0, 0); - if (start < 0) { + if (pos != 0) { + if (pos < 0) { + pos += RSTRING(str)->len; + if (pos < 0) { + return Qnil; + } + } + pos = rb_reg_adjust_startpos(re, str, pos, 0); + } + pos = rb_reg_search(re, str, pos, 0); + if (pos < 0) { return Qnil; } - return LONG2FIX(start); + return LONG2FIX(pos); } +VALUE +rb_reg_match(re, str) + VALUE re, str; +{ + return rb_reg_match_pos(re, str, 0); +} /* * call-seq: @@ -1595,22 +1593,40 @@ rb_reg_match2(re) /* * call-seq: - * rxp.match(str) => matchdata or nil + * rxp.match(str) => matchdata or nil + * rxp.match(str,pos) => matchdata or nil * * Returns a <code>MatchData</code> object describing the match, or * <code>nil</code> if there was no match. This is equivalent to retrieving the * value of the special variable <code>$~</code> following a normal match. - * + * If the second parameter is present, it specifies the position in the string + * to begin the search. + * * /(.)(.)(.)/.match("abc")[2] #=> "b" + * /(.)(.)/.match("abc", 1)[2] #=> "c" */ static VALUE -rb_reg_match_m(re, str) - VALUE re, str; +rb_reg_match_m(argc, argv, re) + int argc; + VALUE *argv; + VALUE re; { - VALUE result = rb_reg_match(re, str); + VALUE result, str, initpos; + long pos; - if (NIL_P(result)) return Qnil; + if (rb_scan_args(argc, argv, "11", &str, &initpos) == 2) { + pos = NUM2LONG(initpos); + } + else { + pos = 0; + } + + result = rb_reg_match_pos(re, str, pos); + if (NIL_P(result)) { + rb_backref_set(Qnil); + return Qnil; + } result = rb_backref_get(); rb_match_busy(result); return result; @@ -2267,7 +2283,7 @@ Init_Regexp() rb_define_method(rb_cRegexp, "=~", rb_reg_match, 1); rb_define_method(rb_cRegexp, "===", rb_reg_eqq, 1); rb_define_method(rb_cRegexp, "~", rb_reg_match2, 0); - rb_define_method(rb_cRegexp, "match", rb_reg_match_m, 1); + rb_define_method(rb_cRegexp, "match", rb_reg_match_m, -1); rb_define_method(rb_cRegexp, "to_s", rb_reg_to_s, 0); rb_define_method(rb_cRegexp, "inspect", rb_reg_inspect, 0); rb_define_method(rb_cRegexp, "source", rb_reg_source, 0); |