2000-05-01 13:42:38 +04:00
|
|
|
/**********************************************************************
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
re.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: Mon Aug 9 18:24:49 JST 1993
|
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-05-01 13:42:38 +04:00
|
|
|
**********************************************************************/
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2007-06-10 07:06:15 +04:00
|
|
|
#include "ruby/ruby.h"
|
|
|
|
#include "ruby/re.h"
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
#include "ruby/encoding.h"
|
2007-12-01 19:56:19 +03:00
|
|
|
#include "ruby/util.h"
|
2005-05-06 03:08:47 +04:00
|
|
|
#include "regint.h"
|
2001-05-16 13:05:54 +04:00
|
|
|
#include <ctype.h>
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-07-20 21:36:36 +04:00
|
|
|
VALUE rb_eRegexpError;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
typedef char onig_errmsg_buffer[ONIG_MAX_ERROR_MESSAGE_LEN];
|
2008-12-16 13:44:36 +03:00
|
|
|
#define errcpy(err, msg) strlcpy((err), (msg), ONIG_MAX_ERROR_MESSAGE_LEN)
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
#define BEG(no) regs->beg[no]
|
|
|
|
#define END(no) regs->end[no]
|
|
|
|
|
|
|
|
#if 'a' == 97 /* it's ascii */
|
1999-08-13 09:45:20 +04:00
|
|
|
static const char casetable[] = {
|
1998-01-16 15:13:05 +03:00
|
|
|
'\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
|
|
|
|
'\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
|
|
|
|
'\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
|
|
|
|
'\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
|
|
|
|
/* ' ' '!' '"' '#' '$' '%' '&' ''' */
|
|
|
|
'\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
|
|
|
|
/* '(' ')' '*' '+' ',' '-' '.' '/' */
|
|
|
|
'\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
|
|
|
|
/* '0' '1' '2' '3' '4' '5' '6' '7' */
|
|
|
|
'\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
|
|
|
|
/* '8' '9' ':' ';' '<' '=' '>' '?' */
|
|
|
|
'\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
|
|
|
|
/* '@' 'A' 'B' 'C' 'D' 'E' 'F' 'G' */
|
|
|
|
'\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
|
|
|
|
/* 'H' 'I' 'J' 'K' 'L' 'M' 'N' 'O' */
|
|
|
|
'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
|
|
|
|
/* 'P' 'Q' 'R' 'S' 'T' 'U' 'V' 'W' */
|
|
|
|
'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
|
|
|
|
/* 'X' 'Y' 'Z' '[' '\' ']' '^' '_' */
|
|
|
|
'\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
|
|
|
|
/* '`' 'a' 'b' 'c' 'd' 'e' 'f' 'g' */
|
|
|
|
'\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
|
|
|
|
/* 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' */
|
|
|
|
'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
|
|
|
|
/* 'p' 'q' 'r' 's' 't' 'u' 'v' 'w' */
|
|
|
|
'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
|
|
|
|
/* 'x' 'y' 'z' '{' '|' '}' '~' */
|
|
|
|
'\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
|
|
|
|
'\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
|
|
|
|
'\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
|
|
|
|
'\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
|
|
|
|
'\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
|
|
|
|
'\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
|
|
|
|
'\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
|
|
|
|
'\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
|
|
|
|
'\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
|
|
|
|
'\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
|
|
|
|
'\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
|
|
|
|
'\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
|
|
|
|
'\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
|
|
|
|
'\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
|
|
|
|
'\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
|
|
|
|
'\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
|
|
|
|
'\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
|
|
|
|
};
|
|
|
|
#else
|
2002-08-21 19:47:54 +04:00
|
|
|
# error >>> "You lose. You will need a translation table for your character set." <<<
|
1998-01-16 15:13:05 +03:00
|
|
|
#endif
|
|
|
|
|
|
|
|
int
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
rb_memcicmp(const void *x, const void *y, long len)
|
2000-06-14 09:30:29 +04:00
|
|
|
{
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
const unsigned char *p1 = x, *p2 = y;
|
2000-06-14 09:30:29 +04:00
|
|
|
int tmp;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-06-14 09:30:29 +04:00
|
|
|
while (len--) {
|
2006-03-26 17:04:13 +04:00
|
|
|
if ((tmp = casetable[(unsigned)*p1++] - casetable[(unsigned)*p2++]))
|
2000-06-14 09:30:29 +04:00
|
|
|
return tmp;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2000-06-14 09:30:29 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-10-06 09:32:37 +04:00
|
|
|
#undef rb_memcmp
|
|
|
|
|
2007-10-04 13:54:53 +04:00
|
|
|
int
|
|
|
|
rb_memcmp(const void *p1, const void *p2, long len)
|
|
|
|
{
|
2007-10-04 13:59:56 +04:00
|
|
|
return memcmp(p1, p2, len);
|
2007-10-04 13:54:53 +04:00
|
|
|
}
|
|
|
|
|
2008-03-17 22:04:29 +03:00
|
|
|
static inline long
|
|
|
|
rb_memsearch_ss(const unsigned char *xs, long m, const unsigned char *ys, long n)
|
2003-02-03 08:34:16 +03:00
|
|
|
{
|
2008-03-17 22:04:29 +03:00
|
|
|
const unsigned char *x = xs, *xe = xs + m;
|
|
|
|
const unsigned char *y = ys, *ye = ys + n;
|
|
|
|
#ifndef VALUE_MAX
|
|
|
|
# if SIZEOF_VALUE == 8
|
|
|
|
# define VALUE_MAX 0xFFFFFFFFFFFFFFFFULL
|
|
|
|
# elif SIZEOF_VALUE == 4
|
|
|
|
# define VALUE_MAX 0xFFFFFFFFUL
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
VALUE hx, hy, mask = VALUE_MAX >> ((SIZEOF_VALUE - m) * CHAR_BIT);
|
2003-02-03 08:34:16 +03:00
|
|
|
|
2008-03-17 22:04:29 +03:00
|
|
|
if (m > SIZEOF_VALUE)
|
|
|
|
rb_bug("!!too long pattern string!!");
|
2003-02-03 08:34:16 +03:00
|
|
|
|
2009-11-26 08:25:08 +03:00
|
|
|
/* Prepare hash value */
|
2008-03-17 22:04:29 +03:00
|
|
|
for (hx = *x++, hy = *y++; x < xe; ++x, ++y) {
|
|
|
|
hx <<= CHAR_BIT;
|
|
|
|
hy <<= CHAR_BIT;
|
|
|
|
hx |= *x;
|
|
|
|
hy |= *y;
|
|
|
|
}
|
|
|
|
/* Searching */
|
|
|
|
while (hx != hy) {
|
|
|
|
if (y == ye)
|
|
|
|
return -1;
|
|
|
|
hy <<= CHAR_BIT;
|
|
|
|
hy |= *y;
|
|
|
|
hy &= mask;
|
|
|
|
y++;
|
|
|
|
}
|
|
|
|
return y - ys - m;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline long
|
|
|
|
rb_memsearch_qs(const unsigned char *xs, long m, const unsigned char *ys, long n)
|
|
|
|
{
|
|
|
|
const unsigned char *x = xs, *xe = xs + m;
|
2008-04-04 18:26:19 +04:00
|
|
|
const unsigned char *y = ys;
|
2008-03-17 22:04:29 +03:00
|
|
|
VALUE i, qstable[256];
|
2003-02-03 08:34:16 +03:00
|
|
|
|
|
|
|
/* Preprocessing */
|
2008-03-17 22:04:29 +03:00
|
|
|
for (i = 0; i < 256; ++i)
|
|
|
|
qstable[i] = m + 1;
|
|
|
|
for (; x < xe; ++x)
|
|
|
|
qstable[*x] = xe - x;
|
|
|
|
/* Searching */
|
2008-04-04 18:26:19 +04:00
|
|
|
for (; y + m <= ys + n; y += *(qstable + y[m])) {
|
2008-03-17 22:04:29 +03:00
|
|
|
if (*xs == *y && memcmp(xs, y, m) == 0)
|
|
|
|
return y - ys;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
2003-02-03 08:34:16 +03:00
|
|
|
|
2008-03-17 22:04:29 +03:00
|
|
|
static inline unsigned int
|
|
|
|
rb_memsearch_qs_utf8_hash(const unsigned char *x)
|
|
|
|
{
|
|
|
|
register const unsigned int mix = 8353;
|
|
|
|
register unsigned int h = *x;
|
|
|
|
if (h < 0xC0) {
|
|
|
|
return h + 256;
|
|
|
|
}
|
|
|
|
else if (h < 0xE0) {
|
|
|
|
h *= mix;
|
|
|
|
h += x[1];
|
2003-02-03 08:34:16 +03:00
|
|
|
}
|
2008-03-17 22:04:29 +03:00
|
|
|
else if (h < 0xF0) {
|
|
|
|
h *= mix;
|
|
|
|
h += x[1];
|
|
|
|
h *= mix;
|
|
|
|
h += x[2];
|
|
|
|
}
|
|
|
|
else if (h < 0xF5) {
|
|
|
|
h *= mix;
|
|
|
|
h += x[1];
|
|
|
|
h *= mix;
|
|
|
|
h += x[2];
|
|
|
|
h *= mix;
|
|
|
|
h += x[3];
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return h + 256;
|
|
|
|
}
|
|
|
|
return (unsigned char)h;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline long
|
|
|
|
rb_memsearch_qs_utf8(const unsigned char *xs, long m, const unsigned char *ys, long n)
|
|
|
|
{
|
|
|
|
const unsigned char *x = xs, *xe = xs + m;
|
2008-04-04 18:26:19 +04:00
|
|
|
const unsigned char *y = ys;
|
2008-03-17 22:04:29 +03:00
|
|
|
VALUE i, qstable[512];
|
|
|
|
|
|
|
|
/* Preprocessing */
|
|
|
|
for (i = 0; i < 512; ++i) {
|
|
|
|
qstable[i] = m + 1;
|
|
|
|
}
|
|
|
|
for (; x < xe; ++x) {
|
|
|
|
qstable[rb_memsearch_qs_utf8_hash(x)] = xe - x;
|
2007-10-04 11:31:50 +04:00
|
|
|
}
|
|
|
|
/* Searching */
|
2008-04-04 18:26:19 +04:00
|
|
|
for (; y + m <= ys + n; y += qstable[rb_memsearch_qs_utf8_hash(y+m)]) {
|
2008-03-17 22:04:29 +03:00
|
|
|
if (*xs == *y && memcmp(xs, y, m) == 0)
|
|
|
|
return y - ys;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
long
|
|
|
|
rb_memsearch(const void *x0, long m, const void *y0, long n, rb_encoding *enc)
|
|
|
|
{
|
|
|
|
const unsigned char *x = x0, *y = y0;
|
|
|
|
|
|
|
|
if (m > n) return -1;
|
|
|
|
else if (m == n) {
|
|
|
|
return memcmp(x0, y0, m) == 0 ? 0 : -1;
|
|
|
|
}
|
|
|
|
else if (m < 1) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else if (m == 1) {
|
|
|
|
const unsigned char *ys = y, *ye = ys + n;
|
|
|
|
for (; y < ye; ++y) {
|
|
|
|
if (*x == *y)
|
|
|
|
return y - ys;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else if (m <= SIZEOF_VALUE) {
|
|
|
|
return rb_memsearch_ss(x0, m, y0, n);
|
|
|
|
}
|
|
|
|
else if (enc == rb_utf8_encoding()){
|
|
|
|
return rb_memsearch_qs_utf8(x0, m, y0, n);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return rb_memsearch_qs(x0, m, y0, n);
|
2003-02-03 08:34:16 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
#define REG_LITERAL FL_USER5
|
2007-12-21 19:39:36 +03:00
|
|
|
#define REG_ENCODING_NONE FL_USER6
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
|
2000-05-22 11:09:55 +04:00
|
|
|
#define KCODE_FIXED FL_USER4
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2007-10-19 11:41:03 +04:00
|
|
|
#define ARG_REG_OPTION_MASK \
|
|
|
|
(ONIG_OPTION_IGNORECASE|ONIG_OPTION_MULTILINE|ONIG_OPTION_EXTEND)
|
|
|
|
#define ARG_ENCODING_FIXED 16
|
2007-12-21 19:39:36 +03:00
|
|
|
#define ARG_ENCODING_NONE 32
|
2007-10-19 11:41:03 +04:00
|
|
|
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
static int
|
|
|
|
char_to_option(int c)
|
|
|
|
{
|
|
|
|
int val;
|
2006-03-26 17:04:13 +04:00
|
|
|
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
switch (c) {
|
|
|
|
case 'i':
|
|
|
|
val = ONIG_OPTION_IGNORECASE;
|
|
|
|
break;
|
|
|
|
case 'x':
|
|
|
|
val = ONIG_OPTION_EXTEND;
|
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
val = ONIG_OPTION_MULTILINE;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
val = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return val;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2007-08-02 18:42:59 +04:00
|
|
|
static char *
|
|
|
|
option_to_str(char str[4], int options)
|
|
|
|
{
|
|
|
|
char *p = str;
|
|
|
|
if (options & ONIG_OPTION_MULTILINE) *p++ = 'm';
|
|
|
|
if (options & ONIG_OPTION_IGNORECASE) *p++ = 'i';
|
|
|
|
if (options & ONIG_OPTION_EXTEND) *p++ = 'x';
|
|
|
|
*p = 0;
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
extern int
|
|
|
|
rb_char_to_option_kcode(int c, int *option, int *kcode)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*option = 0;
|
2006-03-26 17:04:13 +04:00
|
|
|
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
switch (c) {
|
2007-10-19 11:41:03 +04:00
|
|
|
case 'n':
|
2009-09-10 21:07:38 +04:00
|
|
|
*kcode = rb_ascii8bit_encindex();
|
2007-12-21 19:39:36 +03:00
|
|
|
return (*option = ARG_ENCODING_NONE);
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
case 'e':
|
2008-01-14 16:49:29 +03:00
|
|
|
*kcode = rb_enc_find_index("EUC-JP");
|
2007-10-19 11:41:03 +04:00
|
|
|
break;
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
case 's':
|
2008-01-18 03:44:15 +03:00
|
|
|
*kcode = rb_enc_find_index("Windows-31J");
|
2007-10-19 11:41:03 +04:00
|
|
|
break;
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
case 'u':
|
2009-09-10 21:07:38 +04:00
|
|
|
*kcode = rb_utf8_encindex();
|
2007-10-19 11:41:03 +04:00
|
|
|
break;
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
default:
|
2007-10-19 11:41:03 +04:00
|
|
|
*kcode = -1;
|
2007-10-16 09:48:40 +04:00
|
|
|
return (*option = char_to_option(c));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2007-10-19 11:41:03 +04:00
|
|
|
*option = ARG_ENCODING_FIXED;
|
|
|
|
return 1;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2000-05-22 11:09:55 +04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_check(VALUE re)
|
2000-05-22 11:09:55 +04:00
|
|
|
{
|
2008-06-28 16:25:45 +04:00
|
|
|
if (!RREGEXP(re)->ptr || !RREGEXP_SRC(re) || !RREGEXP_SRC_PTR(re)) {
|
2000-05-22 11:09:55 +04:00
|
|
|
rb_raise(rb_eTypeError, "uninitialized Regexp");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-06-05 15:32:05 +04:00
|
|
|
int rb_str_buf_cat_escaped_char(VALUE result, unsigned int c, int unicode_p);
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
static void
|
2010-06-05 15:32:05 +04:00
|
|
|
rb_reg_expr_str(VALUE str, const char *s, long len,
|
|
|
|
rb_encoding *enc, rb_encoding *resenc)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
const char *p, *pend;
|
2000-05-30 08:24:17 +04:00
|
|
|
int need_escape = 0;
|
2007-12-11 06:08:50 +03:00
|
|
|
int c, clen;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
p = s; pend = p + len;
|
2010-06-05 15:32:05 +04:00
|
|
|
if (rb_enc_asciicompat(enc)) {
|
|
|
|
while (p < pend) {
|
|
|
|
c = rb_enc_ascget(p, pend, &clen, enc);
|
|
|
|
if (c == -1) {
|
|
|
|
if (enc == resenc) {
|
|
|
|
p += mbclen(p, pend, enc);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
need_escape = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (c != '/' && rb_enc_isprint(c, enc)) {
|
|
|
|
p += clen;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
need_escape = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
need_escape = 1;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2010-06-05 15:32:05 +04:00
|
|
|
|
2000-05-30 08:24:17 +04:00
|
|
|
if (!need_escape) {
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_cat(str, s, len);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
else {
|
2010-06-05 15:32:05 +04:00
|
|
|
int unicode_p = rb_enc_unicode_p(enc);
|
2004-03-06 01:37:35 +03:00
|
|
|
p = s;
|
1998-01-16 15:13:05 +03:00
|
|
|
while (p<pend) {
|
2007-12-11 10:39:16 +03:00
|
|
|
c = rb_enc_ascget(p, pend, &clen, enc);
|
2007-12-11 06:08:50 +03:00
|
|
|
if (c == '\\' && p+clen < pend) {
|
|
|
|
int n = clen + mbclen(p+clen, pend, enc);
|
2002-09-02 18:04:19 +04:00
|
|
|
rb_str_buf_cat(str, p, n);
|
|
|
|
p += n;
|
2002-06-28 18:42:46 +04:00
|
|
|
continue;
|
|
|
|
}
|
2007-12-08 05:50:43 +03:00
|
|
|
else if (c == '/') {
|
1998-01-16 15:13:05 +03:00
|
|
|
char c = '\\';
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_cat(str, &c, 1);
|
2007-12-11 06:08:50 +03:00
|
|
|
rb_str_buf_cat(str, p, clen);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2007-12-08 05:50:43 +03:00
|
|
|
else if (c == -1) {
|
2010-06-05 15:32:05 +04:00
|
|
|
int l;
|
|
|
|
if (resenc) {
|
|
|
|
unsigned int c = rb_enc_mbc_to_codepoint(p, pend, enc);
|
2010-07-22 11:29:32 +04:00
|
|
|
l = rb_enc_codelen(c, enc);
|
|
|
|
rb_str_buf_cat_escaped_char(str, c, unicode_p);
|
2010-06-05 15:32:05 +04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
l = mbclen(p, pend, enc);
|
|
|
|
rb_str_buf_cat(str, p, l);
|
|
|
|
}
|
2007-12-08 05:50:43 +03:00
|
|
|
p += l;
|
2000-05-30 08:24:17 +04:00
|
|
|
continue;
|
|
|
|
}
|
2007-12-08 05:50:43 +03:00
|
|
|
else if (rb_enc_isprint(c, enc)) {
|
2007-12-11 06:08:50 +03:00
|
|
|
rb_str_buf_cat(str, p, clen);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2007-12-08 05:50:43 +03:00
|
|
|
else if (!rb_enc_isspace(c, enc)) {
|
2000-05-30 08:24:17 +04:00
|
|
|
char b[8];
|
2002-04-24 08:54:16 +04:00
|
|
|
|
* dir.c, dln.c, parse.y, re.c, ruby.c, sprintf.c, strftime.c,
string.c, util.c, variable.c: use strlcpy, memcpy and snprintf
instead of strcpy, strncpy and sprintf.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-17 04:29:17 +03:00
|
|
|
snprintf(b, sizeof(b), "\\x%02X", c);
|
2002-04-24 08:54:16 +04:00
|
|
|
rb_str_buf_cat(str, b, 4);
|
|
|
|
}
|
|
|
|
else {
|
2007-12-11 06:08:50 +03:00
|
|
|
rb_str_buf_cat(str, p, clen);
|
2000-05-30 08:24:17 +04:00
|
|
|
}
|
2007-12-11 06:08:50 +03:00
|
|
|
p += clen;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_desc(const char *s, long len, VALUE re)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2010-06-05 15:32:05 +04:00
|
|
|
rb_encoding *enc = rb_enc_get(re);
|
2001-05-30 13:12:34 +04:00
|
|
|
VALUE str = rb_str_buf_new2("/");
|
2010-06-05 15:32:05 +04:00
|
|
|
rb_encoding *resenc = rb_default_internal_encoding();
|
|
|
|
if (resenc == NULL) resenc = rb_default_external_encoding();
|
|
|
|
|
|
|
|
if (re && rb_enc_asciicompat(enc)) {
|
2008-09-20 03:07:22 +04:00
|
|
|
rb_enc_copy(str, re);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_enc_associate(str, rb_usascii_encoding());
|
|
|
|
}
|
2010-06-05 15:32:05 +04:00
|
|
|
rb_reg_expr_str(str, s, len, enc, resenc);
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_cat2(str, "/");
|
1998-01-16 15:13:05 +03:00
|
|
|
if (re) {
|
2007-08-02 18:42:59 +04:00
|
|
|
char opts[4];
|
2000-05-24 11:36:46 +04:00
|
|
|
rb_reg_check(re);
|
2007-08-02 18:42:59 +04:00
|
|
|
if (*option_to_str(opts, RREGEXP(re)->ptr->options))
|
|
|
|
rb_str_buf_cat2(str, opts);
|
2010-06-05 15:32:05 +04:00
|
|
|
if (RBASIC(re)->flags & REG_ENCODING_NONE)
|
|
|
|
rb_str_buf_cat2(str, "n");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2000-02-23 08:23:12 +03:00
|
|
|
OBJ_INFECT(str, re);
|
1998-01-16 15:13:05 +03:00
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* rxp.source -> str
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Returns the original string of the pattern.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2007-12-09 16:35:38 +03:00
|
|
|
* /ab+c/ix.source #=> "ab+c"
|
|
|
|
*
|
|
|
|
* Note that escape sequences are retained as is.
|
|
|
|
*
|
|
|
|
* /\x20\+/.source #=> "\\x20\\+"
|
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_source(VALUE re)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2000-05-22 11:09:55 +04:00
|
|
|
VALUE str;
|
|
|
|
|
|
|
|
rb_reg_check(re);
|
2008-06-28 16:25:45 +04:00
|
|
|
str = rb_enc_str_new(RREGEXP_SRC_PTR(re),RREGEXP_SRC_LEN(re), rb_enc_get(re));
|
1999-12-01 12:24:48 +03:00
|
|
|
if (OBJ_TAINTED(re)) OBJ_TAINT(str);
|
|
|
|
return str;
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
2003-12-30 19:38:32 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* rxp.inspect -> string
|
2003-12-30 19:38:32 +03:00
|
|
|
*
|
|
|
|
* Produce a nicely formatted string-version of _rxp_. Perhaps surprisingly,
|
|
|
|
* <code>#inspect</code> actually produces the more natural version of
|
|
|
|
* the string than <code>#to_s</code>.
|
|
|
|
*
|
2007-12-09 16:35:38 +03:00
|
|
|
* /ab+c/ix.inspect #=> "/ab+c/ix"
|
|
|
|
*
|
2008-03-09 04:04:46 +03:00
|
|
|
*/
|
2003-12-30 19:38:32 +03:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_inspect(VALUE re)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-08-18 19:56:38 +04:00
|
|
|
if (!RREGEXP(re)->ptr || !RREGEXP_SRC(re) || !RREGEXP_SRC_PTR(re)) {
|
|
|
|
return rb_any_to_s(re);
|
|
|
|
}
|
2008-06-28 16:25:45 +04:00
|
|
|
return rb_reg_desc(RREGEXP_SRC_PTR(re), RREGEXP_SRC_LEN(re), re);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* rxp.to_s -> str
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
* array.c, enum.c, eval.c, file.c, io.c, numeric.c, object.c, prec.c,
process.c, re.c, string.c: typos in RDoc comments. [ruby-core:02783]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-04-14 08:06:52 +04:00
|
|
|
* Returns a string containing the regular expression and its options (using the
|
2007-12-02 18:46:21 +03:00
|
|
|
* <code>(?opts:source)</code> notation. This string can be fed back in to
|
2003-12-26 18:58:28 +03:00
|
|
|
* <code>Regexp::new</code> to a regular expression with the same semantics as
|
|
|
|
* the original. (However, <code>Regexp#==</code> may not return true when
|
|
|
|
* comparing the two, as the source of the regular expression itself may
|
|
|
|
* differ, as the example shows). <code>Regexp#inspect</code> produces a
|
|
|
|
* generally more readable version of <i>rxp</i>.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2007-12-09 16:35:38 +03:00
|
|
|
* r1 = /ab+c/ix #=> /ab+c/ix
|
|
|
|
* s1 = r1.to_s #=> "(?ix-m:ab+c)"
|
|
|
|
* r2 = Regexp.new(s1) #=> /(?ix-m:ab+c)/
|
|
|
|
* r1 == r2 #=> false
|
|
|
|
* r1.source #=> "ab+c"
|
|
|
|
* r2.source #=> "(?ix-m:ab+c)"
|
2003-12-26 18:58:28 +03:00
|
|
|
*/
|
|
|
|
|
2002-04-18 12:04:57 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_to_s(VALUE re)
|
2002-04-18 12:04:57 +04:00
|
|
|
{
|
2006-03-26 17:04:13 +04:00
|
|
|
int options, opt;
|
2005-02-17 17:43:38 +03:00
|
|
|
const int embeddable = ONIG_OPTION_MULTILINE|ONIG_OPTION_IGNORECASE|ONIG_OPTION_EXTEND;
|
2002-04-19 08:14:07 +04:00
|
|
|
long len;
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
const UChar* ptr;
|
2002-04-18 12:04:57 +04:00
|
|
|
VALUE str = rb_str_buf_new2("(?");
|
2007-08-02 18:42:59 +04:00
|
|
|
char optbuf[5];
|
2010-06-05 15:32:05 +04:00
|
|
|
rb_encoding *enc = rb_enc_get(re);
|
2002-04-18 12:04:57 +04:00
|
|
|
|
|
|
|
rb_reg_check(re);
|
|
|
|
|
2007-10-16 09:48:40 +04:00
|
|
|
rb_enc_copy(str, re);
|
2002-04-19 08:14:07 +04:00
|
|
|
options = RREGEXP(re)->ptr->options;
|
2008-06-28 16:25:45 +04:00
|
|
|
ptr = (UChar*)RREGEXP_SRC_PTR(re);
|
|
|
|
len = RREGEXP_SRC_LEN(re);
|
2002-04-24 08:54:16 +04:00
|
|
|
again:
|
|
|
|
if (len >= 4 && ptr[0] == '(' && ptr[1] == '?') {
|
2002-04-19 09:59:45 +04:00
|
|
|
int err = 1;
|
2002-04-19 08:14:07 +04:00
|
|
|
ptr += 2;
|
2002-04-24 08:54:16 +04:00
|
|
|
if ((len -= 2) > 0) {
|
2002-04-19 08:14:07 +04:00
|
|
|
do {
|
2006-03-26 17:04:13 +04:00
|
|
|
opt = char_to_option((int )*ptr);
|
|
|
|
if (opt != 0) {
|
|
|
|
options |= opt;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
break;
|
|
|
|
}
|
2002-04-19 08:14:07 +04:00
|
|
|
++ptr;
|
|
|
|
} while (--len > 0);
|
|
|
|
}
|
|
|
|
if (len > 1 && *ptr == '-') {
|
|
|
|
++ptr;
|
|
|
|
--len;
|
|
|
|
do {
|
2006-03-26 17:04:13 +04:00
|
|
|
opt = char_to_option((int )*ptr);
|
|
|
|
if (opt != 0) {
|
|
|
|
options &= ~opt;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
break;
|
|
|
|
}
|
2002-04-19 08:14:07 +04:00
|
|
|
++ptr;
|
|
|
|
} while (--len > 0);
|
|
|
|
}
|
2002-04-24 08:54:16 +04:00
|
|
|
if (*ptr == ')') {
|
|
|
|
--len;
|
|
|
|
++ptr;
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
if (*ptr == ':' && ptr[len-1] == ')') {
|
|
|
|
Regexp *rp;
|
2010-03-02 00:54:59 +03:00
|
|
|
|
|
|
|
++ptr;
|
|
|
|
len -= 2;
|
|
|
|
err = onig_new(&rp, ptr, ptr + len, ONIG_OPTION_DEFAULT,
|
2010-06-05 15:32:05 +04:00
|
|
|
enc, OnigDefaultSyntax, NULL);
|
2005-02-17 17:43:38 +03:00
|
|
|
onig_free(rp);
|
2002-04-19 08:14:07 +04:00
|
|
|
}
|
2002-04-19 09:59:45 +04:00
|
|
|
if (err) {
|
2002-04-19 08:14:07 +04:00
|
|
|
options = RREGEXP(re)->ptr->options;
|
2008-06-28 16:25:45 +04:00
|
|
|
ptr = (UChar*)RREGEXP_SRC_PTR(re);
|
|
|
|
len = RREGEXP_SRC_LEN(re);
|
2002-04-19 08:14:07 +04:00
|
|
|
}
|
|
|
|
}
|
2002-04-18 12:04:57 +04:00
|
|
|
|
2007-08-02 18:42:59 +04:00
|
|
|
if (*option_to_str(optbuf, options)) rb_str_buf_cat2(str, optbuf);
|
2002-04-19 08:14:07 +04:00
|
|
|
|
|
|
|
if ((options & embeddable) != embeddable) {
|
2007-08-02 18:42:59 +04:00
|
|
|
optbuf[0] = '-';
|
|
|
|
option_to_str(optbuf + 1, ~options);
|
|
|
|
rb_str_buf_cat2(str, optbuf);
|
2002-04-18 12:04:57 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
rb_str_buf_cat2(str, ":");
|
2010-06-05 15:32:05 +04:00
|
|
|
rb_reg_expr_str(str, (char*)ptr, len, enc, NULL);
|
2002-04-18 12:04:57 +04:00
|
|
|
rb_str_buf_cat2(str, ")");
|
2007-10-16 09:48:40 +04:00
|
|
|
rb_enc_copy(str, re);
|
2002-04-18 12:04:57 +04:00
|
|
|
|
|
|
|
OBJ_INFECT(str, re);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static void
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
rb_reg_raise(const char *s, long len, const char *err, VALUE re)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE desc = rb_reg_desc(s, len, re);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
rb_raise(rb_eRegexpError, "%s: %s", err, RSTRING_PTR(desc));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2007-08-25 11:06:47 +04:00
|
|
|
static VALUE
|
2008-01-04 19:30:33 +03:00
|
|
|
rb_enc_reg_error_desc(const char *s, long len, rb_encoding *enc, int options, const char *err)
|
2007-08-25 11:06:47 +04:00
|
|
|
{
|
|
|
|
char opts[6];
|
|
|
|
VALUE desc = rb_str_buf_new2(err);
|
2010-06-05 15:32:05 +04:00
|
|
|
rb_encoding *resenc = rb_default_internal_encoding();
|
|
|
|
if (resenc == NULL) resenc = rb_default_external_encoding();
|
2007-08-25 11:06:47 +04:00
|
|
|
|
2008-01-04 19:30:33 +03:00
|
|
|
rb_enc_associate(desc, enc);
|
2007-08-25 11:06:47 +04:00
|
|
|
rb_str_buf_cat2(desc, ": /");
|
2010-06-05 15:32:05 +04:00
|
|
|
rb_reg_expr_str(desc, s, len, enc, resenc);
|
2007-08-25 11:06:47 +04:00
|
|
|
opts[0] = '/';
|
|
|
|
option_to_str(opts + 1, options);
|
|
|
|
rb_str_buf_cat2(desc, opts);
|
|
|
|
return rb_exc_new3(rb_eRegexpError, desc);
|
|
|
|
}
|
|
|
|
|
2008-01-04 19:30:33 +03:00
|
|
|
static void
|
|
|
|
rb_enc_reg_raise(const char *s, long len, rb_encoding *enc, int options, const char *err)
|
|
|
|
{
|
|
|
|
rb_exc_raise(rb_enc_reg_error_desc(s, len, enc, options, err));
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_reg_error_desc(VALUE str, int options, const char *err)
|
|
|
|
{
|
|
|
|
return rb_enc_reg_error_desc(RSTRING_PTR(str), RSTRING_LEN(str),
|
|
|
|
rb_enc_get(str), options, err);
|
|
|
|
}
|
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
static void
|
2007-08-25 11:06:47 +04:00
|
|
|
rb_reg_raise_str(VALUE str, int options, const char *err)
|
2007-08-18 09:05:36 +04:00
|
|
|
{
|
2007-08-25 11:06:47 +04:00
|
|
|
rb_exc_raise(rb_reg_error_desc(str, options, err));
|
2007-08-18 09:05:36 +04:00
|
|
|
}
|
2003-12-26 18:58:28 +03:00
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* rxp.casefold? -> true or false
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Returns the value of the case-insensitive flag.
|
2007-12-09 16:35:38 +03:00
|
|
|
*
|
|
|
|
* /a/.casefold? #=> false
|
|
|
|
* /a/i.casefold? #=> true
|
|
|
|
* /(?i:a)/.casefold? #=> false
|
2003-12-26 18:58:28 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_casefold_p(VALUE re)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2000-05-22 11:09:55 +04:00
|
|
|
rb_reg_check(re);
|
2005-02-17 17:43:38 +03:00
|
|
|
if (RREGEXP(re)->ptr->options & ONIG_OPTION_IGNORECASE) return Qtrue;
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qfalse;
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* rxp.options -> fixnum
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Returns the set of bits corresponding to the options used when creating this
|
|
|
|
* Regexp (see <code>Regexp::new</code> for details. Note that additional bits
|
|
|
|
* may be set in the returned options: these are used internally by the regular
|
|
|
|
* expression code. These extra bits are ignored if the options are passed to
|
|
|
|
* <code>Regexp::new</code>.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Regexp::IGNORECASE #=> 1
|
|
|
|
* Regexp::EXTENDED #=> 2
|
|
|
|
* Regexp::MULTILINE #=> 4
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2007-12-09 16:35:38 +03:00
|
|
|
* /cat/.options #=> 0
|
|
|
|
* /cat/ix.options #=> 3
|
|
|
|
* Regexp.new('cat', true).options #=> 1
|
|
|
|
* /\xa1\xa2/e.options #=> 16
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* r = /cat/ix
|
|
|
|
* Regexp.new(r.source, r.options) #=> /cat/ix
|
|
|
|
*/
|
|
|
|
|
2001-02-08 12:19:27 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_options_m(VALUE re)
|
2001-02-08 12:19:27 +03:00
|
|
|
{
|
2003-07-25 08:38:42 +04:00
|
|
|
int options = rb_reg_options(re);
|
|
|
|
return INT2NUM(options);
|
2001-02-08 12:19:27 +03:00
|
|
|
}
|
|
|
|
|
2007-12-10 00:44:19 +03:00
|
|
|
static int
|
|
|
|
reg_names_iter(const OnigUChar *name, const OnigUChar *name_end,
|
|
|
|
int back_num, int *back_refs, OnigRegex regex, void *arg)
|
|
|
|
{
|
|
|
|
VALUE ary = (VALUE)arg;
|
|
|
|
rb_ary_push(ary, rb_str_new((const char *)name, name_end-name));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* rxp.names -> [name1, name2, ...]
|
2007-12-10 00:44:19 +03:00
|
|
|
*
|
|
|
|
* Returns a list of names of captures as an array of strings.
|
|
|
|
*
|
|
|
|
* /(?<foo>.)(?<bar>.)(?<baz>.)/.names
|
|
|
|
* #=> ["foo", "bar", "baz"]
|
|
|
|
*
|
|
|
|
* /(?<foo>.)(?<foo>.)/.names
|
|
|
|
* #=> ["foo"]
|
|
|
|
*
|
2008-03-09 04:04:46 +03:00
|
|
|
* /(.)(.)/.names
|
2007-12-10 00:44:19 +03:00
|
|
|
* #=> []
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_reg_names(VALUE re)
|
|
|
|
{
|
|
|
|
VALUE ary = rb_ary_new();
|
2008-06-02 16:45:42 +04:00
|
|
|
rb_reg_check(re);
|
2007-12-10 00:44:19 +03:00
|
|
|
onig_foreach_name(RREGEXP(re)->ptr, reg_names_iter, (void*)ary);
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
reg_named_captures_iter(const OnigUChar *name, const OnigUChar *name_end,
|
|
|
|
int back_num, int *back_refs, OnigRegex regex, void *arg)
|
|
|
|
{
|
|
|
|
VALUE hash = (VALUE)arg;
|
|
|
|
VALUE ary = rb_ary_new2(back_num);
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for(i = 0; i < back_num; i++)
|
|
|
|
rb_ary_store(ary, i, INT2NUM(back_refs[i]));
|
|
|
|
|
|
|
|
rb_hash_aset(hash, rb_str_new((const char*)name, name_end-name),ary);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* rxp.named_captures -> hash
|
2007-12-10 00:44:19 +03:00
|
|
|
*
|
|
|
|
* Returns a hash representing information about named captures of <i>rxp</i>.
|
|
|
|
*
|
|
|
|
* A key of the hash is a name of the named captures.
|
|
|
|
* A value of the hash is an array which is list of indexes of corresponding
|
|
|
|
* named captures.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-12-10 00:44:19 +03:00
|
|
|
* /(?<foo>.)(?<bar>.)/.named_captures
|
|
|
|
* #=> {"foo"=>[1], "bar"=>[2]}
|
|
|
|
*
|
2008-03-09 04:04:46 +03:00
|
|
|
* /(?<foo>.)(?<foo>.)/.named_captures
|
2007-12-10 00:44:19 +03:00
|
|
|
* #=> {"foo"=>[1, 2]}
|
|
|
|
*
|
|
|
|
* If there are no named captures, an empty hash is returned.
|
|
|
|
*
|
2008-03-09 04:04:46 +03:00
|
|
|
* /(.)(.)/.named_captures
|
2007-12-10 00:44:19 +03:00
|
|
|
* #=> {}
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_reg_named_captures(VALUE re)
|
|
|
|
{
|
|
|
|
VALUE hash = rb_hash_new();
|
2008-06-02 16:45:42 +04:00
|
|
|
rb_reg_check(re);
|
2007-12-10 00:44:19 +03:00
|
|
|
onig_foreach_name(RREGEXP(re)->ptr, reg_named_captures_iter, (void*)hash);
|
|
|
|
return hash;
|
|
|
|
}
|
2003-12-26 18:58:28 +03:00
|
|
|
|
2010-04-05 14:57:38 +04:00
|
|
|
static int
|
|
|
|
onig_new_with_source(regex_t** reg, const UChar* pattern, const UChar* pattern_end,
|
|
|
|
OnigOptionType option, OnigEncoding enc, const OnigSyntaxType* syntax,
|
|
|
|
OnigErrorInfo* einfo, const char *sourcefile, int sourceline)
|
|
|
|
{
|
|
|
|
int r;
|
|
|
|
|
|
|
|
*reg = (regex_t* )xmalloc(sizeof(regex_t));
|
|
|
|
if (IS_NULL(*reg)) return ONIGERR_MEMORY;
|
|
|
|
|
|
|
|
r = onig_reg_init(*reg, option, ONIGENC_CASE_FOLD_DEFAULT, enc, syntax);
|
|
|
|
if (r) goto err;
|
|
|
|
|
|
|
|
r = onig_compile(*reg, pattern, pattern_end, einfo, sourcefile, sourceline);
|
|
|
|
if (r) {
|
|
|
|
err:
|
|
|
|
onig_free(*reg);
|
|
|
|
*reg = NULL;
|
|
|
|
}
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static Regexp*
|
2009-08-30 12:00:31 +04:00
|
|
|
make_regexp(const char *s, long len, rb_encoding *enc, int flags, onig_errmsg_buffer err,
|
|
|
|
const char *sourcefile, int sourceline)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
Regexp *rp;
|
2004-03-05 18:40:36 +03:00
|
|
|
int r;
|
2005-02-17 17:43:38 +03:00
|
|
|
OnigErrorInfo einfo;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
/* Handle escaped characters first. */
|
|
|
|
|
|
|
|
/* Build a copy of the string (in dest) with the
|
|
|
|
escaped characters translated, and generate the regex
|
|
|
|
from that.
|
|
|
|
*/
|
|
|
|
|
2010-04-05 14:57:38 +04:00
|
|
|
r = onig_new_with_source(&rp, (UChar*)s, (UChar*)(s + len), flags,
|
|
|
|
enc, OnigDefaultSyntax, &einfo, sourcefile, sourceline);
|
2004-03-05 18:40:36 +03:00
|
|
|
if (r) {
|
2010-03-02 00:54:59 +03:00
|
|
|
onig_error_code_to_str((UChar*)err, r, &einfo);
|
2005-05-23 07:24:28 +04:00
|
|
|
return 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return rp;
|
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Document-class: MatchData
|
|
|
|
*
|
|
|
|
* <code>MatchData</code> is the type of the special variable <code>$~</code>,
|
|
|
|
* and is the type of the object returned by <code>Regexp#match</code> and
|
2007-12-09 16:35:38 +03:00
|
|
|
* <code>Regexp.last_match</code>. It encapsulates all the results of a pattern
|
2003-12-26 18:58:28 +03:00
|
|
|
* match, results normally accessed through the special variables
|
|
|
|
* <code>$&</code>, <code>$'</code>, <code>$`</code>, <code>$1</code>,
|
2007-12-09 16:35:38 +03:00
|
|
|
* <code>$2</code>, and so on.
|
2003-12-26 18:58:28 +03:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2006-07-20 21:36:36 +04:00
|
|
|
VALUE rb_cMatch;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_alloc(VALUE klass)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
NEWOBJ(match, struct RMatch);
|
2002-08-30 12:22:09 +04:00
|
|
|
OBJSETUP(match, klass, T_MATCH);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
match->str = 0;
|
2008-02-16 23:08:35 +03:00
|
|
|
match->rmatch = 0;
|
2006-03-21 16:16:21 +03:00
|
|
|
match->regexp = 0;
|
2008-02-16 23:08:35 +03:00
|
|
|
match->rmatch = ALLOC(struct rmatch);
|
|
|
|
MEMZERO(match->rmatch, struct rmatch, 1);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return (VALUE)match;
|
|
|
|
}
|
|
|
|
|
2008-02-16 23:08:35 +03:00
|
|
|
typedef struct {
|
2009-06-30 06:08:54 +04:00
|
|
|
long byte_pos;
|
|
|
|
long char_pos;
|
2008-02-16 23:08:35 +03:00
|
|
|
} pair_t;
|
|
|
|
|
|
|
|
static int
|
|
|
|
pair_byte_cmp(const void *pair1, const void *pair2)
|
|
|
|
{
|
2009-06-30 06:08:54 +04:00
|
|
|
long diff = ((pair_t*)pair1)->byte_pos - ((pair_t*)pair2)->byte_pos;
|
|
|
|
#if SIZEOF_LONG > SIZEOF_INT
|
|
|
|
return diff ? diff > 0 ? 1 : -1 : 0;
|
|
|
|
#else
|
|
|
|
return (int)diff;
|
|
|
|
#endif
|
2008-02-16 23:08:35 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
update_char_offset(VALUE match)
|
|
|
|
{
|
|
|
|
struct rmatch *rm = RMATCH(match)->rmatch;
|
|
|
|
struct re_registers *regs;
|
2009-09-05 03:49:18 +04:00
|
|
|
int i, num_regs, num_pos;
|
|
|
|
long c;
|
2008-02-16 23:08:35 +03:00
|
|
|
char *s, *p, *q, *e;
|
|
|
|
rb_encoding *enc;
|
|
|
|
pair_t *pairs;
|
|
|
|
|
|
|
|
if (rm->char_offset_updated)
|
|
|
|
return;
|
|
|
|
|
|
|
|
regs = &rm->regs;
|
|
|
|
num_regs = rm->regs.num_regs;
|
|
|
|
|
|
|
|
if (rm->char_offset_num_allocated < num_regs) {
|
|
|
|
REALLOC_N(rm->char_offset, struct rmatch_offset, num_regs);
|
|
|
|
rm->char_offset_num_allocated = num_regs;
|
|
|
|
}
|
|
|
|
|
|
|
|
enc = rb_enc_get(RMATCH(match)->str);
|
|
|
|
if (rb_enc_mbmaxlen(enc) == 1) {
|
|
|
|
for (i = 0; i < num_regs; i++) {
|
|
|
|
rm->char_offset[i].beg = BEG(i);
|
|
|
|
rm->char_offset[i].end = END(i);
|
|
|
|
}
|
|
|
|
rm->char_offset_updated = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
pairs = ALLOCA_N(pair_t, num_regs*2);
|
|
|
|
num_pos = 0;
|
|
|
|
for (i = 0; i < num_regs; i++) {
|
|
|
|
if (BEG(i) < 0)
|
|
|
|
continue;
|
|
|
|
pairs[num_pos++].byte_pos = BEG(i);
|
|
|
|
pairs[num_pos++].byte_pos = END(i);
|
|
|
|
}
|
|
|
|
qsort(pairs, num_pos, sizeof(pair_t), pair_byte_cmp);
|
|
|
|
|
|
|
|
s = p = RSTRING_PTR(RMATCH(match)->str);
|
|
|
|
e = s + RSTRING_LEN(RMATCH(match)->str);
|
|
|
|
c = 0;
|
|
|
|
for (i = 0; i < num_pos; i++) {
|
|
|
|
q = s + pairs[i].byte_pos;
|
|
|
|
c += rb_enc_strlen(p, q, enc);
|
|
|
|
pairs[i].char_pos = c;
|
|
|
|
p = q;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < num_regs; i++) {
|
|
|
|
pair_t key, *found;
|
|
|
|
if (BEG(i) < 0) {
|
|
|
|
rm->char_offset[i].beg = -1;
|
|
|
|
rm->char_offset[i].end = -1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
key.byte_pos = BEG(i);
|
|
|
|
found = bsearch(&key, pairs, num_pos, sizeof(pair_t), pair_byte_cmp);
|
|
|
|
rm->char_offset[i].beg = found->char_pos;
|
|
|
|
|
|
|
|
key.byte_pos = END(i);
|
|
|
|
found = bsearch(&key, pairs, num_pos, sizeof(pair_t), pair_byte_cmp);
|
|
|
|
rm->char_offset[i].end = found->char_pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
rm->char_offset_updated = 1;
|
|
|
|
}
|
|
|
|
|
2008-06-02 16:45:42 +04:00
|
|
|
static void
|
|
|
|
match_check(VALUE match)
|
|
|
|
{
|
|
|
|
if (!RMATCH(match)->regexp) {
|
|
|
|
rb_raise(rb_eTypeError, "uninitialized Match");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-01-18 17:16:47 +03:00
|
|
|
/* :nodoc: */
|
1998-01-16 15:19:22 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_init_copy(VALUE obj, VALUE orig)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2008-02-16 23:08:35 +03:00
|
|
|
struct rmatch *rm;
|
|
|
|
|
2002-08-30 12:22:09 +04:00
|
|
|
if (obj == orig) return obj;
|
1998-01-16 15:19:22 +03:00
|
|
|
|
2002-08-30 12:22:09 +04:00
|
|
|
if (!rb_obj_is_instance_of(orig, rb_obj_class(obj))) {
|
|
|
|
rb_raise(rb_eTypeError, "wrong argument class");
|
|
|
|
}
|
|
|
|
RMATCH(obj)->str = RMATCH(orig)->str;
|
2008-02-16 23:08:35 +03:00
|
|
|
RMATCH(obj)->regexp = RMATCH(orig)->regexp;
|
|
|
|
|
|
|
|
rm = RMATCH(obj)->rmatch;
|
|
|
|
onig_region_copy(&rm->regs, RMATCH_REGS(orig));
|
|
|
|
|
|
|
|
if (!RMATCH(orig)->rmatch->char_offset_updated) {
|
|
|
|
rm->char_offset_updated = 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (rm->char_offset_num_allocated < rm->regs.num_regs) {
|
|
|
|
REALLOC_N(rm->char_offset, struct rmatch_offset, rm->regs.num_regs);
|
|
|
|
rm->char_offset_num_allocated = rm->regs.num_regs;
|
|
|
|
}
|
|
|
|
MEMCPY(rm->char_offset, RMATCH(orig)->rmatch->char_offset,
|
|
|
|
struct rmatch_offset, rm->regs.num_regs);
|
|
|
|
rm->char_offset_updated = 1;
|
|
|
|
}
|
2002-08-27 12:31:08 +04:00
|
|
|
|
2002-08-30 12:22:09 +04:00
|
|
|
return obj;
|
2002-08-27 12:31:08 +04:00
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
2007-12-10 00:44:19 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.regexp -> regexp
|
2007-12-10 00:44:19 +03:00
|
|
|
*
|
|
|
|
* Returns the regexp.
|
|
|
|
*
|
|
|
|
* m = /a.*b/.match("abc")
|
|
|
|
* m.regexp #=> /a.*b/
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
match_regexp(VALUE match)
|
|
|
|
{
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
2007-12-10 00:44:19 +03:00
|
|
|
return RMATCH(match)->regexp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.names -> [name1, name2, ...]
|
2007-12-10 00:44:19 +03:00
|
|
|
*
|
|
|
|
* Returns a list of names of captures as an array of strings.
|
|
|
|
* It is same as mtch.regexp.names.
|
|
|
|
*
|
|
|
|
* /(?<foo>.)(?<bar>.)(?<baz>.)/.match("hoge").names
|
|
|
|
* #=> ["foo", "bar", "baz"]
|
|
|
|
*
|
|
|
|
* m = /(?<x>.)(?<y>.)?/.match("a") #=> #<MatchData "a" x:"a" y:nil>
|
|
|
|
* m.names #=> ["x", "y"]
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
match_names(VALUE match)
|
|
|
|
{
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
2007-12-10 00:44:19 +03:00
|
|
|
return rb_reg_names(RMATCH(match)->regexp);
|
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.length -> integer
|
|
|
|
* mtch.size -> integer
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Returns the number of elements in the match array.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* m = /(.)(.)(\d+)(\d)/.match("THX1138.")
|
|
|
|
* m.length #=> 5
|
|
|
|
* m.size #=> 5
|
|
|
|
*/
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_size(VALUE match)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
2008-02-16 23:08:35 +03:00
|
|
|
return INT2FIX(RMATCH_REGS(match)->num_regs);
|
2007-11-23 05:10:44 +03:00
|
|
|
}
|
|
|
|
|
2007-12-09 10:12:44 +03:00
|
|
|
static int
|
|
|
|
match_backref_number(VALUE match, VALUE backref)
|
|
|
|
{
|
|
|
|
const char *name;
|
|
|
|
int num;
|
|
|
|
|
2008-02-16 23:08:35 +03:00
|
|
|
struct re_registers *regs = RMATCH_REGS(match);
|
2007-12-09 10:12:44 +03:00
|
|
|
VALUE regexp = RMATCH(match)->regexp;
|
|
|
|
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
2007-12-09 10:12:44 +03:00
|
|
|
switch(TYPE(backref)) {
|
|
|
|
default:
|
|
|
|
return NUM2INT(backref);
|
|
|
|
|
|
|
|
case T_SYMBOL:
|
|
|
|
name = rb_id2name(SYM2ID(backref));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case T_STRING:
|
|
|
|
name = StringValueCStr(backref);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
num = onig_name_to_backref_number(RREGEXP(regexp)->ptr,
|
|
|
|
(const unsigned char*)name,
|
|
|
|
(const unsigned char*)name + strlen(name),
|
|
|
|
regs);
|
|
|
|
|
|
|
|
if (num < 1) {
|
|
|
|
rb_raise(rb_eIndexError, "undefined group name reference: %s", name);
|
|
|
|
}
|
|
|
|
|
|
|
|
return num;
|
|
|
|
}
|
|
|
|
|
2009-03-14 21:04:21 +03:00
|
|
|
int
|
|
|
|
rb_reg_backref_number(VALUE match, VALUE backref)
|
|
|
|
{
|
|
|
|
return match_backref_number(match, backref);
|
|
|
|
}
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.offset(n) -> array
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Returns a two-element array containing the beginning and ending offsets of
|
|
|
|
* the <em>n</em>th match.
|
2007-12-09 16:35:38 +03:00
|
|
|
* <em>n</em> can be a string or symbol to reference a named capture.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* m = /(.)(.)(\d+)(\d)/.match("THX1138.")
|
2007-12-09 16:35:38 +03:00
|
|
|
* m.offset(0) #=> [1, 7]
|
|
|
|
* m.offset(4) #=> [6, 7]
|
2007-12-09 10:35:54 +03:00
|
|
|
*
|
|
|
|
* m = /(?<foo>.)(.)(?<bar>.)/.match("hoge")
|
|
|
|
* p m.offset(:foo) #=> [0, 1]
|
|
|
|
* p m.offset(:bar) #=> [2, 3]
|
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
*/
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_offset(VALUE match, VALUE n)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2007-12-09 10:12:44 +03:00
|
|
|
int i = match_backref_number(match, n);
|
2008-02-16 23:08:35 +03:00
|
|
|
struct re_registers *regs = RMATCH_REGS(match);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
2008-02-16 23:08:35 +03:00
|
|
|
if (i < 0 || regs->num_regs <= i)
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_raise(rb_eIndexError, "index %d out of matches", i);
|
|
|
|
|
2008-02-16 23:08:35 +03:00
|
|
|
if (BEG(i) < 0)
|
1999-08-13 09:45:20 +04:00
|
|
|
return rb_assoc_new(Qnil, Qnil);
|
|
|
|
|
2008-02-16 23:08:35 +03:00
|
|
|
update_char_offset(match);
|
|
|
|
return rb_assoc_new(INT2FIX(RMATCH(match)->rmatch->char_offset[i].beg),
|
|
|
|
INT2FIX(RMATCH(match)->rmatch->char_offset[i].end));
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.begin(n) -> integer
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Returns the offset of the start of the <em>n</em>th element of the match
|
|
|
|
* array in the string.
|
2007-12-09 16:35:38 +03:00
|
|
|
* <em>n</em> can be a string or symbol to reference a named capture.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* m = /(.)(.)(\d+)(\d)/.match("THX1138.")
|
2007-12-09 16:35:38 +03:00
|
|
|
* m.begin(0) #=> 1
|
|
|
|
* m.begin(2) #=> 2
|
2007-12-09 10:35:54 +03:00
|
|
|
*
|
|
|
|
* m = /(?<foo>.)(.)(?<bar>.)/.match("hoge")
|
|
|
|
* p m.begin(:foo) #=> 0
|
|
|
|
* p m.begin(:bar) #=> 2
|
2003-12-26 18:58:28 +03:00
|
|
|
*/
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_begin(VALUE match, VALUE n)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2007-12-09 10:12:44 +03:00
|
|
|
int i = match_backref_number(match, n);
|
2008-02-16 23:08:35 +03:00
|
|
|
struct re_registers *regs = RMATCH_REGS(match);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
2008-02-16 23:08:35 +03:00
|
|
|
if (i < 0 || regs->num_regs <= i)
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_raise(rb_eIndexError, "index %d out of matches", i);
|
|
|
|
|
2008-02-16 23:08:35 +03:00
|
|
|
if (BEG(i) < 0)
|
1999-08-13 09:45:20 +04:00
|
|
|
return Qnil;
|
|
|
|
|
2008-02-16 23:08:35 +03:00
|
|
|
update_char_offset(match);
|
|
|
|
return INT2FIX(RMATCH(match)->rmatch->char_offset[i].beg);
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.end(n) -> integer
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Returns the offset of the character immediately following the end of the
|
|
|
|
* <em>n</em>th element of the match array in the string.
|
2007-12-09 16:35:38 +03:00
|
|
|
* <em>n</em> can be a string or symbol to reference a named capture.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* m = /(.)(.)(\d+)(\d)/.match("THX1138.")
|
2007-12-09 16:35:38 +03:00
|
|
|
* m.end(0) #=> 7
|
|
|
|
* m.end(2) #=> 3
|
2007-12-09 10:35:54 +03:00
|
|
|
*
|
|
|
|
* m = /(?<foo>.)(.)(?<bar>.)/.match("hoge")
|
|
|
|
* p m.end(:foo) #=> 1
|
|
|
|
* p m.end(:bar) #=> 3
|
2003-12-26 18:58:28 +03:00
|
|
|
*/
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_end(VALUE match, VALUE n)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2007-12-09 10:12:44 +03:00
|
|
|
int i = match_backref_number(match, n);
|
2008-02-16 23:08:35 +03:00
|
|
|
struct re_registers *regs = RMATCH_REGS(match);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
2008-02-16 23:08:35 +03:00
|
|
|
if (i < 0 || regs->num_regs <= i)
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_raise(rb_eIndexError, "index %d out of matches", i);
|
|
|
|
|
2008-02-16 23:08:35 +03:00
|
|
|
if (BEG(i) < 0)
|
1999-08-13 09:45:20 +04:00
|
|
|
return Qnil;
|
|
|
|
|
2008-02-16 23:08:35 +03:00
|
|
|
update_char_offset(match);
|
|
|
|
return INT2FIX(RMATCH(match)->rmatch->char_offset[i].end);
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
#define MATCH_BUSY FL_USER2
|
|
|
|
|
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_match_busy(VALUE match)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2000-02-08 11:54:01 +03:00
|
|
|
FL_SET(match, MATCH_BUSY);
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
2007-12-09 14:57:06 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* rxp.fixed_encoding? -> true or false
|
2007-12-09 14:57:06 +03:00
|
|
|
*
|
2007-12-09 16:35:38 +03:00
|
|
|
* Returns false if rxp is applicable to
|
|
|
|
* a string with any ASCII compatible encoding.
|
|
|
|
* Returns true otherwise.
|
2007-12-09 14:57:06 +03:00
|
|
|
*
|
|
|
|
* r = /a/
|
|
|
|
* r.fixed_encoding? #=> false
|
|
|
|
* r =~ "\u{6666} a" #=> 2
|
|
|
|
* r =~ "\xa1\xa2 a".force_encoding("euc-jp") #=> 2
|
2007-12-09 16:35:38 +03:00
|
|
|
* r =~ "abc".force_encoding("euc-jp") #=> 0
|
2007-12-09 14:57:06 +03:00
|
|
|
*
|
|
|
|
* r = /a/u
|
|
|
|
* r.fixed_encoding? #=> true
|
2008-03-09 04:04:46 +03:00
|
|
|
* r.encoding #=> #<Encoding:UTF-8>
|
2007-12-09 14:57:06 +03:00
|
|
|
* r =~ "\u{6666} a" #=> 2
|
2008-03-09 04:04:46 +03:00
|
|
|
* r =~ "\xa1\xa2".force_encoding("euc-jp") #=> ArgumentError
|
2007-12-09 16:35:38 +03:00
|
|
|
* r =~ "abc".force_encoding("euc-jp") #=> 0
|
2007-12-09 14:57:06 +03:00
|
|
|
*
|
|
|
|
* r = /\u{6666}/
|
|
|
|
* r.fixed_encoding? #=> true
|
2008-03-09 04:04:46 +03:00
|
|
|
* r.encoding #=> #<Encoding:UTF-8>
|
2007-12-09 14:57:06 +03:00
|
|
|
* r =~ "\u{6666} a" #=> 0
|
2008-03-09 04:04:46 +03:00
|
|
|
* r =~ "\xa1\xa2".force_encoding("euc-jp") #=> ArgumentError
|
2007-12-09 16:35:38 +03:00
|
|
|
* r =~ "abc".force_encoding("euc-jp") #=> nil
|
2007-12-09 14:57:06 +03:00
|
|
|
*/
|
|
|
|
|
2007-11-26 05:27:59 +03:00
|
|
|
static VALUE
|
|
|
|
rb_reg_fixed_encoding_p(VALUE re)
|
|
|
|
{
|
2008-01-24 12:15:03 +03:00
|
|
|
if (FL_TEST(re, KCODE_FIXED))
|
2007-11-26 05:27:59 +03:00
|
|
|
return Qtrue;
|
|
|
|
else
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
2007-12-01 19:56:19 +03:00
|
|
|
static VALUE
|
|
|
|
rb_reg_preprocess(const char *p, const char *end, rb_encoding *enc,
|
|
|
|
rb_encoding **fixed_enc, onig_errmsg_buffer err);
|
|
|
|
|
2008-04-14 19:47:51 +04:00
|
|
|
|
2008-05-15 14:45:58 +04:00
|
|
|
static void
|
|
|
|
reg_enc_error(VALUE re, VALUE str)
|
|
|
|
{
|
2008-12-11 07:40:08 +03:00
|
|
|
rb_raise(rb_eEncCompatError,
|
2008-05-15 14:45:58 +04:00
|
|
|
"incompatible encoding regexp match (%s regexp with %s string)",
|
2009-07-18 19:00:50 +04:00
|
|
|
rb_enc_name(rb_enc_get(re)),
|
2008-05-15 14:45:58 +04:00
|
|
|
rb_enc_name(rb_enc_get(str)));
|
|
|
|
}
|
|
|
|
|
2008-04-14 19:47:51 +04:00
|
|
|
static rb_encoding*
|
|
|
|
rb_reg_prepare_enc(VALUE re, VALUE str, int warn)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-04-14 19:47:51 +04:00
|
|
|
rb_encoding *enc = 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-01-04 08:01:58 +03:00
|
|
|
if (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) {
|
|
|
|
rb_raise(rb_eArgError,
|
2008-12-11 07:40:08 +03:00
|
|
|
"invalid byte sequence in %s",
|
2008-01-04 08:01:58 +03:00
|
|
|
rb_enc_name(rb_enc_get(str)));
|
|
|
|
}
|
|
|
|
|
2000-05-22 11:09:55 +04:00
|
|
|
rb_reg_check(re);
|
2008-05-15 14:45:58 +04:00
|
|
|
enc = rb_enc_get(str);
|
|
|
|
if (!rb_enc_str_asciicompat_p(str)) {
|
|
|
|
if (RREGEXP(re)->ptr->enc != enc) {
|
|
|
|
reg_enc_error(re, str);
|
|
|
|
}
|
2007-11-23 09:30:26 +03:00
|
|
|
}
|
2008-05-15 14:45:58 +04:00
|
|
|
else if (rb_reg_fixed_encoding_p(re)) {
|
|
|
|
if (RREGEXP(re)->ptr->enc != enc &&
|
|
|
|
(!rb_enc_asciicompat(RREGEXP(re)->ptr->enc) ||
|
|
|
|
rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT)) {
|
|
|
|
reg_enc_error(re, str);
|
2008-04-14 19:47:51 +04:00
|
|
|
}
|
2008-05-15 14:45:58 +04:00
|
|
|
enc = RREGEXP(re)->ptr->enc;
|
|
|
|
}
|
|
|
|
if (warn && (RBASIC(re)->flags & REG_ENCODING_NONE) &&
|
|
|
|
enc != rb_ascii8bit_encoding() &&
|
|
|
|
rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT) {
|
|
|
|
rb_warn("regexp match /.../n against to %s string",
|
|
|
|
rb_enc_name(enc));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2008-05-15 14:45:58 +04:00
|
|
|
return enc;
|
2008-04-14 19:47:51 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-05-12 10:09:53 +04:00
|
|
|
regex_t *
|
|
|
|
rb_reg_prepare_re(VALUE re, VALUE str)
|
2008-04-14 19:47:51 +04:00
|
|
|
{
|
|
|
|
regex_t *reg = RREGEXP(re)->ptr;
|
|
|
|
onig_errmsg_buffer err = "";
|
|
|
|
int r;
|
|
|
|
OnigErrorInfo einfo;
|
2008-04-22 17:49:43 +04:00
|
|
|
const char *pattern;
|
2008-04-14 19:47:51 +04:00
|
|
|
VALUE unescaped;
|
|
|
|
rb_encoding *fixed_enc = 0;
|
2008-05-12 10:09:53 +04:00
|
|
|
rb_encoding *enc = rb_reg_prepare_enc(re, str, 1);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-04-14 19:47:51 +04:00
|
|
|
if (reg->enc == enc) return reg;
|
2005-02-17 17:43:38 +03:00
|
|
|
|
2008-04-14 19:47:51 +04:00
|
|
|
rb_reg_check(re);
|
|
|
|
reg = RREGEXP(re)->ptr;
|
2008-06-28 16:25:45 +04:00
|
|
|
pattern = RREGEXP_SRC_PTR(re);
|
2007-12-01 19:56:19 +03:00
|
|
|
|
2008-04-14 19:47:51 +04:00
|
|
|
unescaped = rb_reg_preprocess(
|
2008-06-28 16:25:45 +04:00
|
|
|
pattern, pattern + RREGEXP_SRC_LEN(re), enc,
|
2008-04-14 19:47:51 +04:00
|
|
|
&fixed_enc, err);
|
2008-01-23 07:40:43 +03:00
|
|
|
|
2008-04-14 19:47:51 +04:00
|
|
|
if (unescaped == Qnil) {
|
|
|
|
rb_raise(rb_eArgError, "regexp preprocess failed: %s", err);
|
|
|
|
}
|
2006-05-15 16:39:25 +04:00
|
|
|
|
2008-04-14 19:47:51 +04:00
|
|
|
r = onig_new(®, (UChar* )RSTRING_PTR(unescaped),
|
|
|
|
(UChar* )(RSTRING_PTR(unescaped) + RSTRING_LEN(unescaped)),
|
|
|
|
reg->options, enc,
|
|
|
|
OnigDefaultSyntax, &einfo);
|
|
|
|
if (r) {
|
|
|
|
onig_error_code_to_str((UChar*)err, r, &einfo);
|
2008-06-28 16:25:45 +04:00
|
|
|
rb_reg_raise(pattern, RREGEXP_SRC_LEN(re), err, re);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2008-04-14 19:47:51 +04:00
|
|
|
|
|
|
|
RB_GC_GUARD(unescaped);
|
|
|
|
return reg;
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-06-30 06:08:54 +04:00
|
|
|
long
|
|
|
|
rb_reg_adjust_startpos(VALUE re, VALUE str, long pos, int reverse)
|
1999-12-14 09:50:43 +03:00
|
|
|
{
|
2009-06-30 06:08:54 +04:00
|
|
|
long range;
|
2008-04-14 19:47:51 +04:00
|
|
|
rb_encoding *enc;
|
2005-02-17 17:43:38 +03:00
|
|
|
UChar *p, *string;
|
1999-12-14 09:50:43 +03:00
|
|
|
|
2008-04-14 19:47:51 +04:00
|
|
|
enc = rb_reg_prepare_enc(re, str, 0);
|
1999-12-14 09:50:43 +03:00
|
|
|
|
|
|
|
if (reverse) {
|
|
|
|
range = -pos;
|
|
|
|
}
|
|
|
|
else {
|
2006-08-31 14:47:44 +04:00
|
|
|
range = RSTRING_LEN(str) - pos;
|
1999-12-14 09:50:43 +03:00
|
|
|
}
|
2005-02-17 17:43:38 +03:00
|
|
|
|
2006-08-31 14:47:44 +04:00
|
|
|
if (pos > 0 && ONIGENC_MBC_MAXLEN(enc) != 1 && pos < RSTRING_LEN(str)) {
|
|
|
|
string = (UChar*)RSTRING_PTR(str);
|
2005-02-17 17:43:38 +03:00
|
|
|
|
|
|
|
if (range > 0) {
|
2008-09-13 20:40:31 +04:00
|
|
|
p = onigenc_get_right_adjust_char_head(enc, string, string + pos, string + RSTRING_LEN(str));
|
2005-02-17 17:43:38 +03:00
|
|
|
}
|
|
|
|
else {
|
2008-09-13 23:23:52 +04:00
|
|
|
p = ONIGENC_LEFT_ADJUST_CHAR_HEAD(enc, string, string + pos, string + RSTRING_LEN(str));
|
2005-02-17 17:43:38 +03:00
|
|
|
}
|
|
|
|
return p - string;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pos;
|
1999-12-14 09:50:43 +03:00
|
|
|
}
|
|
|
|
|
2009-06-30 06:08:54 +04:00
|
|
|
long
|
|
|
|
rb_reg_search(VALUE re, VALUE str, long pos, int reverse)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2009-06-30 06:08:54 +04:00
|
|
|
long result;
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE match;
|
2008-06-07 16:38:03 +04:00
|
|
|
struct re_registers regi, *regs = ®i;
|
2008-01-04 04:24:12 +03:00
|
|
|
char *range = RSTRING_PTR(str);
|
2008-06-28 16:25:45 +04:00
|
|
|
regex_t *reg;
|
|
|
|
int tmpreg;
|
1998-01-16 15:19:22 +03:00
|
|
|
|
2006-08-31 14:47:44 +04:00
|
|
|
if (pos > RSTRING_LEN(str) || pos < 0) {
|
2002-03-19 12:03:11 +03:00
|
|
|
rb_backref_set(Qnil);
|
|
|
|
return -1;
|
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
|
2008-05-12 10:09:53 +04:00
|
|
|
reg = rb_reg_prepare_re(re, str);
|
2008-06-28 16:25:45 +04:00
|
|
|
tmpreg = reg != RREGEXP(re)->ptr;
|
|
|
|
if (!tmpreg) RREGEXP(re)->usecnt++;
|
1998-01-16 15:19:22 +03:00
|
|
|
|
2008-05-19 12:25:03 +04:00
|
|
|
match = rb_backref_get();
|
|
|
|
if (!NIL_P(match)) {
|
|
|
|
if (FL_TEST(match, MATCH_BUSY)) {
|
|
|
|
match = Qnil;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
regs = RMATCH_REGS(match);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (NIL_P(match)) {
|
|
|
|
MEMZERO(regs, struct re_registers, 1);
|
|
|
|
}
|
2008-01-04 04:24:12 +03:00
|
|
|
if (!reverse) {
|
|
|
|
range += RSTRING_LEN(str);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2008-04-14 19:47:51 +04:00
|
|
|
result = onig_search(reg,
|
2008-01-04 04:24:12 +03:00
|
|
|
(UChar*)(RSTRING_PTR(str)),
|
|
|
|
((UChar*)(RSTRING_PTR(str)) + RSTRING_LEN(str)),
|
|
|
|
((UChar*)(RSTRING_PTR(str)) + pos),
|
|
|
|
((UChar*)range),
|
2008-05-19 12:25:03 +04:00
|
|
|
regs, ONIG_OPTION_NONE);
|
2008-06-28 16:25:45 +04:00
|
|
|
if (!tmpreg) RREGEXP(re)->usecnt--;
|
|
|
|
if (tmpreg) {
|
|
|
|
if (RREGEXP(re)->usecnt) {
|
2008-04-14 19:47:51 +04:00
|
|
|
onig_free(reg);
|
|
|
|
}
|
|
|
|
else {
|
2008-06-28 16:25:45 +04:00
|
|
|
onig_free(RREGEXP(re)->ptr);
|
2008-04-14 19:47:51 +04:00
|
|
|
RREGEXP(re)->ptr = reg;
|
|
|
|
}
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
if (result < 0) {
|
2008-05-19 12:25:03 +04:00
|
|
|
if (regs == ®i)
|
|
|
|
onig_region_free(regs, 0);
|
2004-09-24 09:53:43 +04:00
|
|
|
if (result == ONIG_MISMATCH) {
|
|
|
|
rb_backref_set(Qnil);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
else {
|
2008-01-14 07:51:10 +03:00
|
|
|
onig_errmsg_buffer err = "";
|
2009-06-30 06:08:54 +04:00
|
|
|
onig_error_code_to_str((UChar*)err, (int)result);
|
2008-06-28 16:25:45 +04:00
|
|
|
rb_reg_raise(RREGEXP_SRC_PTR(re), RREGEXP_SRC_LEN(re), err, 0);
|
2004-09-24 09:53:43 +04:00
|
|
|
}
|
2000-02-08 11:54:01 +03:00
|
|
|
}
|
|
|
|
|
2008-05-19 12:25:03 +04:00
|
|
|
if (NIL_P(match)) {
|
2002-09-02 18:04:19 +04:00
|
|
|
match = match_alloc(rb_cMatch);
|
2008-05-19 12:25:03 +04:00
|
|
|
onig_region_copy(RMATCH_REGS(match), regs);
|
|
|
|
onig_region_free(regs, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2002-01-04 17:15:33 +03:00
|
|
|
else {
|
2004-03-06 01:37:35 +03:00
|
|
|
if (rb_safe_level() >= 3)
|
2002-01-04 17:15:33 +03:00
|
|
|
OBJ_TAINT(match);
|
|
|
|
else
|
|
|
|
FL_UNSET(match, FL_TAINT);
|
|
|
|
}
|
|
|
|
|
2000-02-08 11:54:01 +03:00
|
|
|
RMATCH(match)->str = rb_str_new4(str);
|
2006-03-21 16:16:21 +03:00
|
|
|
RMATCH(match)->regexp = re;
|
2008-02-16 23:08:35 +03:00
|
|
|
RMATCH(match)->rmatch->char_offset_updated = 0;
|
2000-02-08 11:54:01 +03:00
|
|
|
rb_backref_set(match);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-05-22 11:09:55 +04:00
|
|
|
OBJ_INFECT(match, re);
|
2000-01-05 07:41:21 +03:00
|
|
|
OBJ_INFECT(match, str);
|
2007-11-23 05:10:44 +03:00
|
|
|
|
2007-12-10 07:50:35 +03:00
|
|
|
return result;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_nth_defined(int nth, VALUE match)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-02-16 23:08:35 +03:00
|
|
|
struct re_registers *regs;
|
1998-01-16 15:13:05 +03:00
|
|
|
if (NIL_P(match)) return Qnil;
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
2008-02-16 23:08:35 +03:00
|
|
|
regs = RMATCH_REGS(match);
|
|
|
|
if (nth >= regs->num_regs) {
|
2001-10-03 11:19:19 +04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
if (nth < 0) {
|
2008-02-16 23:08:35 +03:00
|
|
|
nth += regs->num_regs;
|
2001-10-03 11:19:19 +04:00
|
|
|
if (nth <= 0) return Qnil;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2008-02-16 23:08:35 +03:00
|
|
|
if (BEG(nth) == -1) return Qfalse;
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_nth_match(int nth, VALUE match)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-01-05 07:41:21 +03:00
|
|
|
VALUE str;
|
2002-08-28 12:05:23 +04:00
|
|
|
long start, end, len;
|
2008-02-16 23:08:35 +03:00
|
|
|
struct re_registers *regs;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
if (NIL_P(match)) return Qnil;
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
2008-02-16 23:08:35 +03:00
|
|
|
regs = RMATCH_REGS(match);
|
|
|
|
if (nth >= regs->num_regs) {
|
1998-01-16 15:13:05 +03:00
|
|
|
return Qnil;
|
|
|
|
}
|
2001-10-03 11:19:19 +04:00
|
|
|
if (nth < 0) {
|
2008-02-16 23:08:35 +03:00
|
|
|
nth += regs->num_regs;
|
2001-10-03 11:19:19 +04:00
|
|
|
if (nth <= 0) return Qnil;
|
|
|
|
}
|
2008-02-16 23:08:35 +03:00
|
|
|
start = BEG(nth);
|
1998-01-16 15:13:05 +03:00
|
|
|
if (start == -1) return Qnil;
|
2008-02-16 23:08:35 +03:00
|
|
|
end = END(nth);
|
1998-01-16 15:13:05 +03:00
|
|
|
len = end - start;
|
2007-08-28 10:45:32 +04:00
|
|
|
str = rb_str_subseq(RMATCH(match)->str, start, len);
|
2002-12-17 15:15:45 +03:00
|
|
|
OBJ_INFECT(str, match);
|
2000-01-05 07:41:21 +03:00
|
|
|
return str;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_last_match(VALUE match)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_reg_nth_match(0, match);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.pre_match -> str
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Returns the portion of the original string before the current match.
|
|
|
|
* Equivalent to the special variable <code>$`</code>.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* m = /(.)(.)(\d+)(\d)/.match("THX1138.")
|
|
|
|
* m.pre_match #=> "T"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_match_pre(VALUE match)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-10-02 08:31:23 +04:00
|
|
|
VALUE str;
|
2008-02-16 23:08:35 +03:00
|
|
|
struct re_registers *regs;
|
2001-10-02 08:31:23 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
if (NIL_P(match)) return Qnil;
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
2008-02-16 23:08:35 +03:00
|
|
|
regs = RMATCH_REGS(match);
|
|
|
|
if (BEG(0) == -1) return Qnil;
|
|
|
|
str = rb_str_subseq(RMATCH(match)->str, 0, BEG(0));
|
2001-10-02 08:31:23 +04:00
|
|
|
if (OBJ_TAINTED(match)) OBJ_TAINT(str);
|
|
|
|
return str;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.post_match -> str
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Returns the portion of the original string after the current match.
|
|
|
|
* Equivalent to the special variable <code>$'</code>.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* m = /(.)(.)(\d+)(\d)/.match("THX1138: The Movie")
|
|
|
|
* m.post_match #=> ": The Movie"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_match_post(VALUE match)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-10-02 08:31:23 +04:00
|
|
|
VALUE str;
|
2002-12-19 18:21:01 +03:00
|
|
|
long pos;
|
2008-02-16 23:08:35 +03:00
|
|
|
struct re_registers *regs;
|
2001-10-02 08:31:23 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
if (NIL_P(match)) return Qnil;
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
2008-02-16 23:08:35 +03:00
|
|
|
regs = RMATCH_REGS(match);
|
|
|
|
if (BEG(0) == -1) return Qnil;
|
2002-12-19 18:21:01 +03:00
|
|
|
str = RMATCH(match)->str;
|
2008-02-16 23:08:35 +03:00
|
|
|
pos = END(0);
|
2007-08-28 10:45:32 +04:00
|
|
|
str = rb_str_subseq(str, pos, RSTRING_LEN(str) - pos);
|
2001-10-02 08:31:23 +04:00
|
|
|
if (OBJ_TAINTED(match)) OBJ_TAINT(str);
|
|
|
|
return str;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_match_last(VALUE match)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
int i;
|
2008-02-16 23:08:35 +03:00
|
|
|
struct re_registers *regs;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
if (NIL_P(match)) return Qnil;
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
2008-02-16 23:08:35 +03:00
|
|
|
regs = RMATCH_REGS(match);
|
|
|
|
if (BEG(0) == -1) return Qnil;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-02-16 23:08:35 +03:00
|
|
|
for (i=regs->num_regs-1; BEG(i) == -1 && i > 0; i--)
|
1998-01-16 15:13:05 +03:00
|
|
|
;
|
|
|
|
if (i == 0) return Qnil;
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_reg_nth_match(i, match);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
last_match_getter(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_reg_last_match(rb_backref_get());
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
prematch_getter(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_reg_match_pre(rb_backref_get());
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
postmatch_getter(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_reg_match_post(rb_backref_get());
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
last_paren_match_getter(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_reg_match_last(rb_backref_get());
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_array(VALUE match, int start)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-02-03 08:20:27 +03:00
|
|
|
struct re_registers *regs;
|
|
|
|
VALUE ary;
|
|
|
|
VALUE target;
|
1998-01-16 15:13:05 +03:00
|
|
|
int i;
|
2001-12-21 12:23:28 +03:00
|
|
|
int taint = OBJ_TAINTED(match);
|
2004-03-06 01:37:35 +03:00
|
|
|
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
2009-02-03 08:20:27 +03:00
|
|
|
regs = RMATCH_REGS(match);
|
|
|
|
ary = rb_ary_new2(regs->num_regs);
|
|
|
|
target = RMATCH(match)->str;
|
|
|
|
|
2003-07-03 15:02:53 +04:00
|
|
|
for (i=start; i<regs->num_regs; i++) {
|
2001-12-21 12:23:28 +03:00
|
|
|
if (regs->beg[i] == -1) {
|
|
|
|
rb_ary_push(ary, Qnil);
|
2002-05-01 13:41:50 +04:00
|
|
|
}
|
|
|
|
else {
|
2007-08-28 10:45:32 +04:00
|
|
|
VALUE str = rb_str_subseq(target, regs->beg[i], regs->end[i]-regs->beg[i]);
|
2001-12-21 12:23:28 +03:00
|
|
|
if (taint) OBJ_TAINT(str);
|
|
|
|
rb_ary_push(ary, str);
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/* [MG]:FIXME: I put parens around the /.../.match() in the first line of the
|
|
|
|
second example to prevent the '*' followed by a '/' from ending the
|
|
|
|
comment. */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.to_a -> anArray
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Returns the array of matches.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* m = /(.)(.)(\d+)(\d)/.match("THX1138.")
|
|
|
|
* m.to_a #=> ["HX1138", "H", "X", "113", "8"]
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
* array.c, enum.c, eval.c, file.c, io.c, numeric.c, object.c, prec.c,
process.c, re.c, string.c: typos in RDoc comments. [ruby-core:02783]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-04-14 08:06:52 +04:00
|
|
|
* Because <code>to_a</code> is called when expanding
|
2003-12-26 18:58:28 +03:00
|
|
|
* <code>*</code><em>variable</em>, there's a useful assignment
|
|
|
|
* shortcut for extracting matched fields. This is slightly slower than
|
|
|
|
* accessing the fields directly (as an intermediate array is
|
|
|
|
* generated).
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* all,f1,f2,f3 = *(/(.)(.)(\d+)(\d)/.match("THX1138."))
|
|
|
|
* all #=> "HX1138"
|
|
|
|
* f1 #=> "H"
|
|
|
|
* f2 #=> "X"
|
|
|
|
* f3 #=> "113"
|
|
|
|
*/
|
|
|
|
|
2003-07-03 15:02:53 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_to_a(VALUE match)
|
2003-07-03 15:02:53 +04:00
|
|
|
{
|
|
|
|
return match_array(match, 0);
|
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.captures -> array
|
2003-12-26 18:58:28 +03:00
|
|
|
*
|
|
|
|
* Returns the array of captures; equivalent to <code>mtch.to_a[1..-1]</code>.
|
|
|
|
*
|
|
|
|
* f1,f2,f3,f4 = /(.)(.)(\d+)(\d)/.match("THX1138.").captures
|
|
|
|
* f1 #=> "H"
|
|
|
|
* f2 #=> "X"
|
|
|
|
* f3 #=> "113"
|
|
|
|
* f4 #=> "8"
|
|
|
|
*/
|
2003-07-03 15:02:53 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_captures(VALUE match)
|
2003-07-03 15:02:53 +04:00
|
|
|
{
|
|
|
|
return match_array(match, 1);
|
|
|
|
}
|
|
|
|
|
2006-03-22 18:03:40 +03:00
|
|
|
static int
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name, const char* name_end)
|
2006-03-22 18:03:40 +03:00
|
|
|
{
|
2008-06-02 16:45:42 +04:00
|
|
|
int num;
|
2006-03-22 18:03:40 +03:00
|
|
|
|
2008-06-02 16:45:42 +04:00
|
|
|
num = onig_name_to_backref_number(RREGEXP(regexp)->ptr,
|
|
|
|
(const unsigned char* )name, (const unsigned char* )name_end, regs);
|
|
|
|
if (num >= 1) {
|
|
|
|
return num;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
VALUE s = rb_str_new(name, (long )(name_end - name));
|
|
|
|
rb_raise(rb_eIndexError, "undefined group name reference: %s",
|
|
|
|
StringValuePtr(s));
|
|
|
|
}
|
2006-03-22 18:03:40 +03:00
|
|
|
}
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch[i] -> str or nil
|
|
|
|
* mtch[start, length] -> array
|
|
|
|
* mtch[range] -> array
|
|
|
|
* mtch[name] -> str or nil
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Match Reference---<code>MatchData</code> acts as an array, and may be
|
|
|
|
* accessed using the normal array indexing techniques. <i>mtch</i>[0] is
|
|
|
|
* equivalent to the special variable <code>$&</code>, and returns the entire
|
|
|
|
* matched string. <i>mtch</i>[1], <i>mtch</i>[2], and so on return the values
|
|
|
|
* of the matched backreferences (portions of the pattern between parentheses).
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* m = /(.)(.)(\d+)(\d)/.match("THX1138.")
|
2007-12-09 16:35:38 +03:00
|
|
|
* m #=> #<MatchData "HX1138" 1:"H" 2:"X" 3:"113" 4:"8">
|
2003-12-26 18:58:28 +03:00
|
|
|
* m[0] #=> "HX1138"
|
|
|
|
* m[1, 2] #=> ["H", "X"]
|
|
|
|
* m[1..3] #=> ["H", "X", "113"]
|
|
|
|
* m[-3, 2] #=> ["X", "113"]
|
2006-03-24 15:14:18 +03:00
|
|
|
*
|
|
|
|
* m = /(?<foo>a+)b/.match("ccaaab")
|
2007-12-09 16:35:38 +03:00
|
|
|
* m #=> #<MatchData "aaab" foo:"aaa">
|
2006-03-24 15:14:18 +03:00
|
|
|
* m["foo"] #=> "aaa"
|
|
|
|
* m[:foo] #=> "aaa"
|
2003-12-26 18:58:28 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_aref(int argc, VALUE *argv, VALUE match)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
|
|
|
VALUE idx, rest;
|
|
|
|
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
1998-01-16 15:19:22 +03:00
|
|
|
rb_scan_args(argc, argv, "11", &idx, &rest);
|
|
|
|
|
2006-03-21 16:16:21 +03:00
|
|
|
if (NIL_P(rest)) {
|
2010-02-13 22:31:42 +03:00
|
|
|
if (FIXNUM_P(idx)) {
|
|
|
|
if (FIX2INT(idx) >= 0) {
|
|
|
|
return rb_reg_nth_match(FIX2INT(idx), match);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
const char *p;
|
|
|
|
int num;
|
|
|
|
|
|
|
|
switch (TYPE(idx)) {
|
|
|
|
case T_SYMBOL:
|
|
|
|
p = rb_id2name(SYM2ID(idx));
|
|
|
|
goto name_to_backref;
|
|
|
|
break;
|
|
|
|
case T_STRING:
|
|
|
|
p = StringValuePtr(idx);
|
|
|
|
|
|
|
|
name_to_backref:
|
|
|
|
num = name_to_backref_number(RMATCH_REGS(match),
|
|
|
|
RMATCH(match)->regexp, p, p + strlen(p));
|
|
|
|
return rb_reg_nth_match(num, match);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
2006-03-21 16:16:21 +03:00
|
|
|
|
|
|
|
return rb_ary_aref(argc, argv, match_to_a(match));
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
2003-07-03 15:02:53 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_entry(VALUE match, long n)
|
2003-07-03 15:02:53 +04:00
|
|
|
{
|
2009-06-30 06:08:54 +04:00
|
|
|
/* n should not exceed num_regs */
|
|
|
|
return rb_reg_nth_match((int)n, match);
|
2003-07-03 15:02:53 +04:00
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2007-10-12 18:35:26 +04:00
|
|
|
*
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.values_at([index]*) -> array
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Uses each <i>index</i> to access the matching values, returning an array of
|
|
|
|
* the corresponding matches.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* m = /(.)(.)(\d+)(\d)/.match("THX1138: The Movie")
|
|
|
|
* m.to_a #=> ["HX1138", "H", "X", "113", "8"]
|
2007-10-12 18:35:26 +04:00
|
|
|
* m.values_at(0, 2, -2) #=> ["HX1138", "X", "113"]
|
2003-12-26 18:58:28 +03:00
|
|
|
*/
|
|
|
|
|
2001-12-11 06:48:08 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_values_at(int argc, VALUE *argv, VALUE match)
|
2001-12-11 06:48:08 +03:00
|
|
|
{
|
2009-02-03 08:20:27 +03:00
|
|
|
struct re_registers *regs;
|
|
|
|
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
2009-02-03 08:20:27 +03:00
|
|
|
regs = RMATCH_REGS(match);
|
2008-02-16 23:08:35 +03:00
|
|
|
return rb_get_values_at(match, regs->num_regs, argc, argv, match_entry);
|
2001-12-11 06:48:08 +03:00
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.to_s -> str
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Returns the entire matched string.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* m = /(.)(.)(\d+)(\d)/.match("THX1138.")
|
|
|
|
* m.to_s #=> "HX1138"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_to_s(VALUE match)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE str = rb_reg_last_match(match);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
1999-12-01 12:24:48 +03:00
|
|
|
if (NIL_P(str)) str = rb_str_new(0,0);
|
|
|
|
if (OBJ_TAINTED(match)) OBJ_TAINT(str);
|
2000-01-05 07:41:21 +03:00
|
|
|
if (OBJ_TAINTED(RMATCH(match)->str)) OBJ_TAINT(str);
|
1998-01-16 15:13:05 +03:00
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.string -> str
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Returns a frozen copy of the string passed in to <code>match</code>.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* m = /(.)(.)(\d+)(\d)/.match("THX1138.")
|
|
|
|
* m.string #=> "THX1138."
|
|
|
|
*/
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_string(VALUE match)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2008-06-02 16:45:42 +04:00
|
|
|
match_check(match);
|
1999-10-15 12:52:18 +04:00
|
|
|
return RMATCH(match)->str; /* str is frozen */
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
2007-12-09 10:12:44 +03:00
|
|
|
struct backref_name_tag {
|
|
|
|
const UChar *name;
|
|
|
|
long len;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
|
|
|
match_inspect_name_iter(const OnigUChar *name, const OnigUChar *name_end,
|
|
|
|
int back_num, int *back_refs, OnigRegex regex, void *arg0)
|
|
|
|
{
|
|
|
|
struct backref_name_tag *arg = (struct backref_name_tag *)arg0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < back_num; i++) {
|
|
|
|
arg[back_refs[i]].name = name;
|
|
|
|
arg[back_refs[i]].len = name_end - name;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-12-02 17:42:05 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.inspect -> str
|
2007-12-02 17:42:05 +03:00
|
|
|
*
|
|
|
|
* Returns a printable version of <i>mtch</i>.
|
|
|
|
*
|
2007-12-09 10:35:54 +03:00
|
|
|
* puts /.$/.match("foo").inspect
|
2007-12-02 17:42:05 +03:00
|
|
|
* #=> #<MatchData "o">
|
|
|
|
*
|
2007-12-09 10:35:54 +03:00
|
|
|
* puts /(.)(.)(.)/.match("foo").inspect
|
|
|
|
* #=> #<MatchData "foo" 1:"f" 2:"o" 3:"o">
|
|
|
|
*
|
2007-12-09 16:35:38 +03:00
|
|
|
* puts /(.)(.)?(.)/.match("fo").inspect
|
|
|
|
* #=> #<MatchData "fo" 1:"f" 2:nil 3:"o">
|
|
|
|
*
|
2007-12-09 10:35:54 +03:00
|
|
|
* puts /(?<foo>.)(?<bar>.)(?<baz>.)/.match("hoge").inspect
|
|
|
|
* #=> #<MatchData "hog" foo:"h" bar:"o" baz:"g">
|
|
|
|
*
|
2007-12-02 17:42:05 +03:00
|
|
|
*/
|
|
|
|
|
2007-06-23 12:26:08 +04:00
|
|
|
static VALUE
|
|
|
|
match_inspect(VALUE match)
|
|
|
|
{
|
2008-05-31 13:28:20 +04:00
|
|
|
const char *cname = rb_obj_classname(match);
|
2007-06-23 12:26:08 +04:00
|
|
|
VALUE str;
|
|
|
|
int i;
|
2008-02-16 23:08:35 +03:00
|
|
|
struct re_registers *regs = RMATCH_REGS(match);
|
|
|
|
int num_regs = regs->num_regs;
|
2007-12-09 10:12:44 +03:00
|
|
|
struct backref_name_tag *names;
|
2007-12-10 00:44:19 +03:00
|
|
|
VALUE regexp = RMATCH(match)->regexp;
|
2007-12-09 10:12:44 +03:00
|
|
|
|
2008-02-16 14:13:47 +03:00
|
|
|
if (regexp == 0) {
|
|
|
|
return rb_sprintf("#<%s:%p>", cname, (void*)match);
|
|
|
|
}
|
|
|
|
|
2007-12-09 10:12:44 +03:00
|
|
|
names = ALLOCA_N(struct backref_name_tag, num_regs);
|
|
|
|
MEMZERO(names, struct backref_name_tag, num_regs);
|
|
|
|
|
2007-12-10 00:44:19 +03:00
|
|
|
onig_foreach_name(RREGEXP(regexp)->ptr,
|
2007-12-09 10:12:44 +03:00
|
|
|
match_inspect_name_iter, names);
|
2007-06-23 12:26:08 +04:00
|
|
|
|
|
|
|
str = rb_str_buf_new2("#<");
|
|
|
|
rb_str_buf_cat2(str, cname);
|
|
|
|
|
2007-12-09 10:12:44 +03:00
|
|
|
for (i = 0; i < num_regs; i++) {
|
2007-06-23 12:26:08 +04:00
|
|
|
VALUE v;
|
|
|
|
rb_str_buf_cat2(str, " ");
|
2007-12-09 10:12:44 +03:00
|
|
|
if (0 < i) {
|
|
|
|
if (names[i].name)
|
|
|
|
rb_str_buf_cat(str, (const char *)names[i].name, names[i].len);
|
|
|
|
else {
|
* compile.c (insn_data_to_s_detail), file.c (rb_stat_inspect),
iseq.c (ruby_iseq_disasm_insn, ruby_iseq_disasm),
process.c (pst_message), re.c (match_inspect): use rb_str_catf.
* dir.c (dir_inspect), iseq.c (iseq_inspect, insn_operand_intern): use
rb_sprintf.
* error.c (rb_name_error, rb_raise, rb_loaderror, rb_fatal): use
rb_vsprintf.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-07-22 12:53:34 +04:00
|
|
|
rb_str_catf(str, "%d", i);
|
2007-12-09 10:12:44 +03:00
|
|
|
}
|
|
|
|
rb_str_buf_cat2(str, ":");
|
|
|
|
}
|
2007-06-23 12:26:08 +04:00
|
|
|
v = rb_reg_nth_match(i, match);
|
|
|
|
if (v == Qnil)
|
|
|
|
rb_str_buf_cat2(str, "nil");
|
|
|
|
else
|
|
|
|
rb_str_buf_append(str, rb_str_inspect(v));
|
|
|
|
}
|
|
|
|
rb_str_buf_cat2(str, ">");
|
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE rb_cRegexp;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2007-12-01 19:56:19 +03:00
|
|
|
static int
|
|
|
|
read_escaped_byte(const char **pp, const char *end, onig_errmsg_buffer err)
|
|
|
|
{
|
|
|
|
const char *p = *pp;
|
|
|
|
int code;
|
|
|
|
int meta_prefix = 0, ctrl_prefix = 0;
|
2009-03-14 12:25:20 +03:00
|
|
|
size_t len;
|
2007-12-01 19:56:19 +03:00
|
|
|
int retbyte;
|
|
|
|
|
|
|
|
retbyte = -1;
|
|
|
|
if (p == end || *p++ != '\\') {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "too short escaped multibyte character");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
again:
|
|
|
|
if (p == end) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "too short escape sequence");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
switch (*p++) {
|
|
|
|
case '\\': code = '\\'; break;
|
|
|
|
case 'n': code = '\n'; break;
|
|
|
|
case 't': code = '\t'; break;
|
|
|
|
case 'r': code = '\r'; break;
|
|
|
|
case 'f': code = '\f'; break;
|
|
|
|
case 'v': code = '\013'; break;
|
|
|
|
case 'a': code = '\007'; break;
|
|
|
|
case 'e': code = '\033'; break;
|
|
|
|
|
|
|
|
/* \OOO */
|
|
|
|
case '0': case '1': case '2': case '3':
|
|
|
|
case '4': case '5': case '6': case '7':
|
|
|
|
p--;
|
2009-06-30 06:08:54 +04:00
|
|
|
code = scan_oct(p, end < p+3 ? end-p : 3, &len);
|
2007-12-01 19:56:19 +03:00
|
|
|
p += len;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'x': /* \xHH */
|
2009-06-30 06:08:54 +04:00
|
|
|
code = scan_hex(p, end < p+2 ? end-p : 2, &len);
|
2007-12-01 19:56:19 +03:00
|
|
|
if (len < 1) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "invalid hex escape");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
p += len;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'M': /* \M-X, \M-\C-X, \M-\cX */
|
|
|
|
if (meta_prefix) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "duplicate meta escape");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
meta_prefix = 1;
|
|
|
|
if (p+1 < end && *p++ == '-' && (*p & 0x80) == 0) {
|
|
|
|
if (*p == '\\') {
|
|
|
|
p++;
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
code = *p++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "too short meta escape");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
case 'C': /* \C-X, \C-\M-X */
|
|
|
|
if (p == end || *p++ != '-') {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "too short control escape");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
case 'c': /* \cX, \c\M-X */
|
|
|
|
if (ctrl_prefix) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "duplicate control escape");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
ctrl_prefix = 1;
|
|
|
|
if (p < end && (*p & 0x80) == 0) {
|
|
|
|
if (*p == '\\') {
|
|
|
|
p++;
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
code = *p++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "too short control escape");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
default:
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "unexpected escape sequence");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (code < 0 || 0xff < code) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "invalid escape code");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ctrl_prefix)
|
|
|
|
code &= 0x1f;
|
|
|
|
if (meta_prefix)
|
|
|
|
code |= 0x80;
|
|
|
|
|
|
|
|
*pp = p;
|
|
|
|
return code;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
unescape_escaped_nonascii(const char **pp, const char *end, rb_encoding *enc,
|
|
|
|
VALUE buf, rb_encoding **encp, onig_errmsg_buffer err)
|
|
|
|
{
|
|
|
|
const char *p = *pp;
|
|
|
|
int chmaxlen = rb_enc_mbmaxlen(enc);
|
|
|
|
char *chbuf = ALLOCA_N(char, chmaxlen);
|
|
|
|
int chlen = 0;
|
|
|
|
int byte;
|
2007-12-08 05:50:43 +03:00
|
|
|
int l;
|
2007-12-01 19:56:19 +03:00
|
|
|
|
|
|
|
memset(chbuf, 0, chmaxlen);
|
|
|
|
|
|
|
|
byte = read_escaped_byte(&p, end, err);
|
|
|
|
if (byte == -1) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
chbuf[chlen++] = byte;
|
2007-12-08 05:50:43 +03:00
|
|
|
while (chlen < chmaxlen &&
|
2008-01-27 17:27:07 +03:00
|
|
|
MBCLEN_NEEDMORE_P(rb_enc_precise_mbclen(chbuf, chbuf+chlen, enc))) {
|
2007-12-01 19:56:19 +03:00
|
|
|
byte = read_escaped_byte(&p, end, err);
|
|
|
|
if (byte == -1) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
chbuf[chlen++] = byte;
|
|
|
|
}
|
|
|
|
|
2007-12-08 05:50:43 +03:00
|
|
|
l = rb_enc_precise_mbclen(chbuf, chbuf+chlen, enc);
|
2008-01-27 17:27:07 +03:00
|
|
|
if (MBCLEN_INVALID_P(l)) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "invalid multibyte escape");
|
2008-10-22 08:27:32 +04:00
|
|
|
return -1;
|
2007-12-01 19:56:19 +03:00
|
|
|
}
|
|
|
|
if (1 < chlen || (chbuf[0] & 0x80)) {
|
|
|
|
rb_str_buf_cat(buf, chbuf, chlen);
|
|
|
|
|
|
|
|
if (*encp == 0)
|
|
|
|
*encp = enc;
|
|
|
|
else if (*encp != enc) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "escaped non ASCII character in UTF-8 regexp");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
char escbuf[5];
|
2007-12-12 17:30:54 +03:00
|
|
|
snprintf(escbuf, sizeof(escbuf), "\\x%02X", chbuf[0]&0xff);
|
2007-12-01 19:56:19 +03:00
|
|
|
rb_str_buf_cat(buf, escbuf, 4);
|
|
|
|
}
|
|
|
|
*pp = p;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-12-09 06:50:11 +03:00
|
|
|
static int
|
|
|
|
check_unicode_range(unsigned long code, onig_errmsg_buffer err)
|
|
|
|
{
|
|
|
|
if ((0xd800 <= code && code <= 0xdfff) || /* Surrogates */
|
|
|
|
0x10ffff < code) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "invalid Unicode range");
|
2007-12-09 06:50:11 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-12-01 19:56:19 +03:00
|
|
|
static int
|
|
|
|
append_utf8(unsigned long uv,
|
|
|
|
VALUE buf, rb_encoding **encp, onig_errmsg_buffer err)
|
|
|
|
{
|
2007-12-09 06:50:11 +03:00
|
|
|
if (check_unicode_range(uv, err) != 0)
|
|
|
|
return -1;
|
2007-12-01 19:56:19 +03:00
|
|
|
if (uv < 0x80) {
|
|
|
|
char escbuf[5];
|
2007-12-12 17:30:54 +03:00
|
|
|
snprintf(escbuf, sizeof(escbuf), "\\x%02X", (int)uv);
|
2007-12-01 19:56:19 +03:00
|
|
|
rb_str_buf_cat(buf, escbuf, 4);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
int len;
|
|
|
|
char utf8buf[6];
|
|
|
|
len = rb_uv_to_utf8(utf8buf, uv);
|
|
|
|
rb_str_buf_cat(buf, utf8buf, len);
|
|
|
|
|
|
|
|
if (*encp == 0)
|
2007-12-21 10:07:21 +03:00
|
|
|
*encp = rb_utf8_encoding();
|
|
|
|
else if (*encp != rb_utf8_encoding()) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "UTF-8 character in non UTF-8 regexp");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
unescape_unicode_list(const char **pp, const char *end,
|
|
|
|
VALUE buf, rb_encoding **encp, onig_errmsg_buffer err)
|
|
|
|
{
|
|
|
|
const char *p = *pp;
|
|
|
|
int has_unicode = 0;
|
|
|
|
unsigned long code;
|
2009-03-14 12:25:20 +03:00
|
|
|
size_t len;
|
2007-12-01 19:56:19 +03:00
|
|
|
|
|
|
|
while (p < end && ISSPACE(*p)) p++;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
code = ruby_scan_hex(p, end-p, &len);
|
|
|
|
if (len == 0)
|
|
|
|
break;
|
|
|
|
if (6 < len) { /* max 10FFFF */
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "invalid Unicode range");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
p += len;
|
|
|
|
if (append_utf8(code, buf, encp, err) != 0)
|
|
|
|
return -1;
|
|
|
|
has_unicode = 1;
|
|
|
|
|
|
|
|
while (p < end && ISSPACE(*p)) p++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (has_unicode == 0) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "invalid Unicode list");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
*pp = p;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
unescape_unicode_bmp(const char **pp, const char *end,
|
|
|
|
VALUE buf, rb_encoding **encp, onig_errmsg_buffer err)
|
|
|
|
{
|
|
|
|
const char *p = *pp;
|
2009-03-14 12:25:20 +03:00
|
|
|
size_t len;
|
2007-12-01 19:56:19 +03:00
|
|
|
unsigned long code;
|
|
|
|
|
|
|
|
if (end < p+4) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "invalid Unicode escape");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
code = ruby_scan_hex(p, 4, &len);
|
|
|
|
if (len != 4) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "invalid Unicode escape");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (append_utf8(code, buf, encp, err) != 0)
|
|
|
|
return -1;
|
|
|
|
*pp = p + 4;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
unescape_nonascii(const char *p, const char *end, rb_encoding *enc,
|
2008-07-05 03:50:33 +04:00
|
|
|
VALUE buf, rb_encoding **encp, int *has_property,
|
|
|
|
onig_errmsg_buffer err)
|
2007-12-01 19:56:19 +03:00
|
|
|
{
|
|
|
|
char c;
|
|
|
|
char smallbuf[2];
|
|
|
|
|
|
|
|
while (p < end) {
|
2007-12-08 05:50:43 +03:00
|
|
|
int chlen = rb_enc_precise_mbclen(p, end, enc);
|
2008-01-27 17:27:07 +03:00
|
|
|
if (!MBCLEN_CHARFOUND_P(chlen)) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "invalid multibyte character");
|
2007-12-08 05:50:43 +03:00
|
|
|
return -1;
|
|
|
|
}
|
2008-01-27 17:27:07 +03:00
|
|
|
chlen = MBCLEN_CHARFOUND_LEN(chlen);
|
2007-12-01 19:56:19 +03:00
|
|
|
if (1 < chlen || (*p & 0x80)) {
|
|
|
|
rb_str_buf_cat(buf, p, chlen);
|
|
|
|
p += chlen;
|
|
|
|
if (*encp == 0)
|
|
|
|
*encp = enc;
|
|
|
|
else if (*encp != enc) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "non ASCII character in UTF-8 regexp");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (c = *p++) {
|
|
|
|
case '\\':
|
|
|
|
if (p == end) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "too short escape sequence");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
switch (c = *p++) {
|
|
|
|
case '1': case '2': case '3':
|
|
|
|
case '4': case '5': case '6': case '7': /* \O, \OO, \OOO or backref */
|
|
|
|
{
|
2009-03-14 12:25:20 +03:00
|
|
|
size_t octlen;
|
2007-12-01 19:56:19 +03:00
|
|
|
if (ruby_scan_oct(p-1, end-(p-1), &octlen) <= 0177) {
|
|
|
|
/* backref or 7bit octal.
|
|
|
|
no need to unescape anyway.
|
|
|
|
re-escaping may break backref */
|
|
|
|
goto escape_asis;
|
|
|
|
}
|
|
|
|
}
|
2009-02-22 17:23:33 +03:00
|
|
|
/* xxx: How about more than 199 subexpressions? */
|
2007-12-01 19:56:19 +03:00
|
|
|
|
|
|
|
case '0': /* \0, \0O, \0OO */
|
|
|
|
|
|
|
|
case 'x': /* \xHH */
|
|
|
|
case 'c': /* \cX, \c\M-X */
|
|
|
|
case 'C': /* \C-X, \C-\M-X */
|
|
|
|
case 'M': /* \M-X, \M-\C-X, \M-\cX */
|
|
|
|
p = p-2;
|
|
|
|
if (unescape_escaped_nonascii(&p, end, enc, buf, encp, err) != 0)
|
|
|
|
return -1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'u':
|
|
|
|
if (p == end) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "too short escape sequence");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (*p == '{') {
|
|
|
|
/* \u{H HH HHH HHHH HHHHH HHHHHH ...} */
|
|
|
|
p++;
|
|
|
|
if (unescape_unicode_list(&p, end, buf, encp, err) != 0)
|
|
|
|
return -1;
|
|
|
|
if (p == end || *p++ != '}') {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "invalid Unicode list");
|
2007-12-01 19:56:19 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* \uHHHH */
|
|
|
|
if (unescape_unicode_bmp(&p, end, buf, encp, err) != 0)
|
|
|
|
return -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2008-07-05 03:33:04 +04:00
|
|
|
case 'p': /* \p{Hiragana} */
|
2010-06-01 18:20:59 +04:00
|
|
|
case 'P':
|
2008-07-05 03:33:04 +04:00
|
|
|
if (!*encp) {
|
2008-07-05 03:50:33 +04:00
|
|
|
*has_property = 1;
|
2008-07-05 03:33:04 +04:00
|
|
|
}
|
|
|
|
goto escape_asis;
|
|
|
|
|
2007-12-01 19:56:19 +03:00
|
|
|
default: /* \n, \\, \d, \9, etc. */
|
|
|
|
escape_asis:
|
|
|
|
smallbuf[0] = '\\';
|
|
|
|
smallbuf[1] = c;
|
|
|
|
rb_str_buf_cat(buf, smallbuf, 2);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
rb_str_buf_cat(buf, &c, 1);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_reg_preprocess(const char *p, const char *end, rb_encoding *enc,
|
|
|
|
rb_encoding **fixed_enc, onig_errmsg_buffer err)
|
|
|
|
{
|
|
|
|
VALUE buf;
|
2008-07-05 03:50:33 +04:00
|
|
|
int has_property = 0;
|
2007-12-01 19:56:19 +03:00
|
|
|
|
|
|
|
buf = rb_str_buf_new(0);
|
|
|
|
|
2008-01-27 00:01:52 +03:00
|
|
|
if (rb_enc_asciicompat(enc))
|
|
|
|
*fixed_enc = 0;
|
|
|
|
else {
|
|
|
|
*fixed_enc = enc;
|
|
|
|
rb_enc_associate(buf, enc);
|
|
|
|
}
|
|
|
|
|
2008-07-05 03:50:33 +04:00
|
|
|
if (unescape_nonascii(p, end, enc, buf, fixed_enc, &has_property, err) != 0)
|
2007-12-01 19:56:19 +03:00
|
|
|
return Qnil;
|
|
|
|
|
2008-07-05 03:50:33 +04:00
|
|
|
if (has_property && !*fixed_enc) {
|
|
|
|
*fixed_enc = enc;
|
|
|
|
}
|
|
|
|
|
2008-01-07 07:55:26 +03:00
|
|
|
if (*fixed_enc) {
|
2007-12-01 19:56:19 +03:00
|
|
|
rb_enc_associate(buf, *fixed_enc);
|
|
|
|
}
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
2007-12-08 10:21:05 +03:00
|
|
|
VALUE
|
|
|
|
rb_reg_check_preprocess(VALUE str)
|
|
|
|
{
|
|
|
|
rb_encoding *fixed_enc = 0;
|
2008-01-14 07:51:10 +03:00
|
|
|
onig_errmsg_buffer err = "";
|
2007-12-08 10:21:05 +03:00
|
|
|
VALUE buf;
|
|
|
|
char *p, *end;
|
|
|
|
rb_encoding *enc;
|
|
|
|
|
|
|
|
StringValue(str);
|
|
|
|
p = RSTRING_PTR(str);
|
|
|
|
end = p + RSTRING_LEN(str);
|
|
|
|
enc = rb_enc_get(str);
|
|
|
|
|
|
|
|
buf = rb_reg_preprocess(p, end, enc, &fixed_enc, err);
|
|
|
|
RB_GC_GUARD(str);
|
|
|
|
|
|
|
|
if (buf == Qnil) {
|
|
|
|
return rb_reg_error_desc(str, 0, err);
|
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2007-12-01 19:56:19 +03:00
|
|
|
static VALUE
|
2009-08-05 05:38:36 +04:00
|
|
|
rb_reg_preprocess_dregexp(VALUE ary, int options)
|
2007-12-01 19:56:19 +03:00
|
|
|
{
|
2008-01-29 11:03:51 +03:00
|
|
|
rb_encoding *fixed_enc = 0;
|
2008-02-14 06:34:12 +03:00
|
|
|
rb_encoding *regexp_enc = 0;
|
2008-01-29 11:03:51 +03:00
|
|
|
onig_errmsg_buffer err = "";
|
|
|
|
int i;
|
|
|
|
VALUE result = 0;
|
2009-08-05 05:38:36 +04:00
|
|
|
rb_encoding *ascii8bit = rb_ascii8bit_encoding();
|
2007-12-01 19:56:19 +03:00
|
|
|
|
2008-09-08 13:14:59 +04:00
|
|
|
if (RARRAY_LEN(ary) == 0) {
|
2008-01-29 11:03:51 +03:00
|
|
|
rb_raise(rb_eArgError, "no arguments given");
|
|
|
|
}
|
2007-12-01 19:56:19 +03:00
|
|
|
|
2008-09-08 13:14:59 +04:00
|
|
|
for (i = 0; i < RARRAY_LEN(ary); i++) {
|
|
|
|
VALUE str = RARRAY_PTR(ary)[i];
|
2008-01-29 11:03:51 +03:00
|
|
|
VALUE buf;
|
|
|
|
char *p, *end;
|
2008-02-14 06:34:12 +03:00
|
|
|
rb_encoding *src_enc;
|
2007-12-01 19:56:19 +03:00
|
|
|
|
2009-08-05 05:38:36 +04:00
|
|
|
src_enc = rb_enc_get(str);
|
|
|
|
if (options & ARG_ENCODING_NONE &&
|
2009-08-27 10:10:30 +04:00
|
|
|
src_enc != ascii8bit) {
|
|
|
|
if (rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT)
|
|
|
|
rb_raise(rb_eRegexpError, "/.../n has a non escaped non ASCII character in non ASCII-8BIT script");
|
|
|
|
else
|
|
|
|
src_enc = ascii8bit;
|
2009-08-05 05:38:36 +04:00
|
|
|
}
|
|
|
|
|
2008-01-29 11:03:51 +03:00
|
|
|
StringValue(str);
|
|
|
|
p = RSTRING_PTR(str);
|
|
|
|
end = p + RSTRING_LEN(str);
|
|
|
|
|
2008-02-14 06:34:12 +03:00
|
|
|
buf = rb_reg_preprocess(p, end, src_enc, &fixed_enc, err);
|
2008-01-29 11:03:51 +03:00
|
|
|
|
|
|
|
if (buf == Qnil)
|
|
|
|
rb_raise(rb_eArgError, "%s", err);
|
|
|
|
|
2008-02-14 06:34:12 +03:00
|
|
|
if (fixed_enc != 0) {
|
|
|
|
if (regexp_enc != 0 && regexp_enc != fixed_enc) {
|
2009-08-14 13:05:44 +04:00
|
|
|
rb_raise(rb_eRegexpError, "encoding mismatch in dynamic regexp : %s and %s",
|
2008-02-14 06:34:12 +03:00
|
|
|
rb_enc_name(regexp_enc), rb_enc_name(fixed_enc));
|
2008-01-29 11:03:51 +03:00
|
|
|
}
|
2008-02-14 06:34:12 +03:00
|
|
|
regexp_enc = fixed_enc;
|
2008-01-29 11:03:51 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!result)
|
2008-02-14 06:34:12 +03:00
|
|
|
result = rb_str_new3(str);
|
2008-01-29 11:03:51 +03:00
|
|
|
else
|
2008-02-14 06:34:12 +03:00
|
|
|
rb_str_buf_append(result, str);
|
|
|
|
}
|
|
|
|
if (regexp_enc) {
|
|
|
|
rb_enc_associate(result, regexp_enc);
|
2008-01-29 11:03:51 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
2007-12-01 19:56:19 +03:00
|
|
|
}
|
|
|
|
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
static int
|
2009-06-30 06:08:54 +04:00
|
|
|
rb_reg_initialize(VALUE obj, const char *s, long len, rb_encoding *enc,
|
2009-08-30 12:00:31 +04:00
|
|
|
int options, onig_errmsg_buffer err,
|
|
|
|
const char *sourcefile, int sourceline)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-05-22 11:09:55 +04:00
|
|
|
struct RRegexp *re = RREGEXP(obj);
|
2007-12-01 19:56:19 +03:00
|
|
|
VALUE unescaped;
|
|
|
|
rb_encoding *fixed_enc = 0;
|
2007-12-23 02:47:18 +03:00
|
|
|
rb_encoding *a_enc = rb_ascii8bit_encoding();
|
2000-05-22 11:09:55 +04:00
|
|
|
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
if (!OBJ_UNTRUSTED(obj) && rb_safe_level() >= 4)
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
rb_raise(rb_eSecurityError, "Insecure: can't modify regexp");
|
|
|
|
rb_check_frozen(obj);
|
|
|
|
if (FL_TEST(obj, REG_LITERAL))
|
|
|
|
rb_raise(rb_eSecurityError, "can't modify literal regexp");
|
2008-06-28 16:25:45 +04:00
|
|
|
if (re->ptr)
|
|
|
|
rb_raise(rb_eTypeError, "already initialized regexp");
|
1999-01-20 07:59:39 +03:00
|
|
|
re->ptr = 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-12-10 05:29:05 +03:00
|
|
|
if (rb_enc_dummy_p(enc)) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "can't make regexp with dummy encoding");
|
2008-12-10 05:29:05 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2007-12-01 19:56:19 +03:00
|
|
|
unescaped = rb_reg_preprocess(s, s+len, enc, &fixed_enc, err);
|
|
|
|
if (unescaped == Qnil)
|
|
|
|
return -1;
|
|
|
|
|
2007-12-13 19:09:53 +03:00
|
|
|
if (fixed_enc) {
|
2007-12-21 19:39:36 +03:00
|
|
|
if ((fixed_enc != enc && (options & ARG_ENCODING_FIXED)) ||
|
2007-12-21 21:55:30 +03:00
|
|
|
(fixed_enc != a_enc && (options & ARG_ENCODING_NONE))) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "incompatible character encoding");
|
2007-12-13 19:09:53 +03:00
|
|
|
return -1;
|
|
|
|
}
|
2007-12-21 21:55:30 +03:00
|
|
|
if (fixed_enc != a_enc) {
|
2007-12-13 19:09:53 +03:00
|
|
|
options |= ARG_ENCODING_FIXED;
|
|
|
|
enc = fixed_enc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (!(options & ARG_ENCODING_FIXED)) {
|
2008-01-24 10:56:12 +03:00
|
|
|
enc = rb_usascii_encoding();
|
2007-11-23 09:30:26 +03:00
|
|
|
}
|
2007-12-21 19:39:36 +03:00
|
|
|
|
2007-10-19 11:41:03 +04:00
|
|
|
rb_enc_associate((VALUE)re, enc);
|
2007-12-01 19:56:19 +03:00
|
|
|
if ((options & ARG_ENCODING_FIXED) || fixed_enc) {
|
2007-10-16 09:48:40 +04:00
|
|
|
re->basic.flags |= KCODE_FIXED;
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
}
|
2007-12-21 19:39:36 +03:00
|
|
|
if (options & ARG_ENCODING_NONE) {
|
|
|
|
re->basic.flags |= REG_ENCODING_NONE;
|
|
|
|
}
|
2009-02-22 17:23:33 +03:00
|
|
|
|
2007-12-01 19:56:19 +03:00
|
|
|
re->ptr = make_regexp(RSTRING_PTR(unescaped), RSTRING_LEN(unescaped), enc,
|
2009-08-30 12:00:31 +04:00
|
|
|
options & ARG_REG_OPTION_MASK, err,
|
|
|
|
sourcefile, sourceline);
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
if (!re->ptr) return -1;
|
2008-06-28 16:25:45 +04:00
|
|
|
re->src = rb_enc_str_new(s, len, enc);
|
|
|
|
OBJ_FREEZE(re->src);
|
2007-12-01 19:56:19 +03:00
|
|
|
RB_GC_GUARD(unescaped);
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
return 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
static int
|
2009-08-30 12:00:31 +04:00
|
|
|
rb_reg_initialize_str(VALUE obj, VALUE str, int options, onig_errmsg_buffer err,
|
|
|
|
const char *sourcefile, int sourceline)
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
{
|
2008-01-05 19:39:38 +03:00
|
|
|
int ret;
|
|
|
|
rb_encoding *enc = rb_enc_get(str);
|
2008-01-06 15:15:48 +03:00
|
|
|
if (options & ARG_ENCODING_NONE) {
|
|
|
|
rb_encoding *ascii8bit = rb_ascii8bit_encoding();
|
|
|
|
if (enc != ascii8bit) {
|
|
|
|
if (rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT) {
|
2008-12-16 13:44:36 +03:00
|
|
|
errcpy(err, "/.../n has a non escaped non ASCII character in non ASCII-8BIT script");
|
2008-01-06 15:15:48 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
enc = ascii8bit;
|
|
|
|
}
|
|
|
|
}
|
2008-01-05 19:39:38 +03:00
|
|
|
ret = rb_reg_initialize(obj, RSTRING_PTR(str), RSTRING_LEN(str), enc,
|
2009-08-30 12:00:31 +04:00
|
|
|
options, err, sourcefile, sourceline);
|
2008-01-05 19:39:38 +03:00
|
|
|
RB_GC_GUARD(str);
|
|
|
|
return ret;
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
}
|
|
|
|
|
2001-10-05 10:30:42 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_s_alloc(VALUE klass)
|
2001-10-05 10:30:42 +04:00
|
|
|
{
|
|
|
|
NEWOBJ(re, struct RRegexp);
|
|
|
|
OBJSETUP(re, klass, T_REGEXP);
|
|
|
|
|
|
|
|
re->ptr = 0;
|
2008-06-28 16:25:45 +04:00
|
|
|
re->src = 0;
|
|
|
|
re->usecnt = 0;
|
2001-10-05 10:30:42 +04:00
|
|
|
|
|
|
|
return (VALUE)re;
|
|
|
|
}
|
|
|
|
|
2010-02-13 22:45:35 +03:00
|
|
|
VALUE
|
|
|
|
rb_reg_alloc(void)
|
|
|
|
{
|
|
|
|
return rb_reg_s_alloc(rb_cRegexp);
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
2008-01-04 19:30:33 +03:00
|
|
|
rb_reg_new_str(VALUE s, int options)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2010-02-13 22:45:35 +03:00
|
|
|
return rb_reg_init_str(rb_reg_alloc(), s, options);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_reg_init_str(VALUE re, VALUE s, int options)
|
|
|
|
{
|
2008-01-14 07:51:10 +03:00
|
|
|
onig_errmsg_buffer err = "";
|
2000-05-22 11:09:55 +04:00
|
|
|
|
2009-08-30 12:00:31 +04:00
|
|
|
if (rb_reg_initialize_str(re, s, options, err, NULL, 0) != 0) {
|
2007-08-25 11:06:47 +04:00
|
|
|
rb_reg_raise_str(s, options, err);
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
return re;
|
2004-09-24 09:53:43 +04:00
|
|
|
}
|
|
|
|
|
2008-01-29 11:03:51 +03:00
|
|
|
VALUE
|
|
|
|
rb_reg_new_ary(VALUE ary, int opt)
|
|
|
|
{
|
2009-08-05 05:38:36 +04:00
|
|
|
return rb_reg_new_str(rb_reg_preprocess_dregexp(ary, opt), opt);
|
2008-01-29 11:03:51 +03:00
|
|
|
}
|
|
|
|
|
2008-01-04 19:30:33 +03:00
|
|
|
VALUE
|
|
|
|
rb_enc_reg_new(const char *s, long len, rb_encoding *enc, int options)
|
|
|
|
{
|
2010-02-13 22:45:35 +03:00
|
|
|
VALUE re = rb_reg_alloc();
|
2008-01-14 07:51:10 +03:00
|
|
|
onig_errmsg_buffer err = "";
|
2008-01-04 19:30:33 +03:00
|
|
|
|
2009-08-30 12:00:31 +04:00
|
|
|
if (rb_reg_initialize(re, s, len, enc, options, err, NULL, 0) != 0) {
|
2008-01-04 19:30:33 +03:00
|
|
|
rb_enc_reg_raise(s, len, enc, options, err);
|
|
|
|
}
|
|
|
|
|
|
|
|
return re;
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_reg_new(const char *s, long len, int options)
|
|
|
|
{
|
|
|
|
return rb_enc_reg_new(s, len, rb_ascii8bit_encoding(), options);
|
|
|
|
}
|
|
|
|
|
2004-09-24 09:53:43 +04:00
|
|
|
VALUE
|
2009-08-30 12:00:31 +04:00
|
|
|
rb_reg_compile(VALUE str, int options, const char *sourcefile, int sourceline)
|
2004-09-24 09:53:43 +04:00
|
|
|
{
|
2010-02-13 22:45:35 +03:00
|
|
|
VALUE re = rb_reg_alloc();
|
2008-01-14 07:51:10 +03:00
|
|
|
onig_errmsg_buffer err = "";
|
2004-09-24 09:53:43 +04:00
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
if (!str) str = rb_str_new(0,0);
|
2009-08-30 12:00:31 +04:00
|
|
|
if (rb_reg_initialize_str(re, str, options, err, sourcefile, sourceline) != 0) {
|
2007-08-25 11:06:47 +04:00
|
|
|
rb_set_errinfo(rb_reg_error_desc(str, options, err));
|
|
|
|
return Qnil;
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
}
|
|
|
|
FL_SET(re, REG_LITERAL);
|
|
|
|
return re;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE reg_cache;
|
|
|
|
|
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_regcomp(VALUE str)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2006-09-18 10:33:03 +04:00
|
|
|
volatile VALUE save_str = str;
|
2008-06-28 16:25:45 +04:00
|
|
|
if (reg_cache && RREGEXP_SRC_LEN(reg_cache) == RSTRING_LEN(str)
|
2007-10-16 09:48:40 +04:00
|
|
|
&& ENCODING_GET(reg_cache) == ENCODING_GET(str)
|
2008-06-28 16:25:45 +04:00
|
|
|
&& memcmp(RREGEXP_SRC_PTR(reg_cache), RSTRING_PTR(str), RSTRING_LEN(str)) == 0)
|
1998-01-16 15:13:05 +03:00
|
|
|
return reg_cache;
|
|
|
|
|
2008-01-04 19:30:33 +03:00
|
|
|
return reg_cache = rb_reg_new_str(save_str, 0);
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
2009-09-08 17:10:04 +04:00
|
|
|
static st_index_t reg_hash(VALUE re);
|
2003-12-30 19:38:32 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* rxp.hash -> fixnum
|
2003-12-30 19:38:32 +03:00
|
|
|
*
|
|
|
|
* Produce a hash based on the text and options of this regular expression.
|
|
|
|
*/
|
|
|
|
|
2002-12-12 12:17:32 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_hash(VALUE re)
|
2002-12-12 12:17:32 +03:00
|
|
|
{
|
2009-09-08 17:11:32 +04:00
|
|
|
st_index_t hashval = reg_hash(re);
|
2009-09-08 17:10:04 +04:00
|
|
|
return LONG2FIX(hashval);
|
|
|
|
}
|
|
|
|
|
|
|
|
static st_index_t
|
|
|
|
reg_hash(VALUE re)
|
|
|
|
{
|
|
|
|
st_index_t hashval;
|
2002-12-12 12:17:32 +03:00
|
|
|
|
|
|
|
rb_reg_check(re);
|
|
|
|
hashval = RREGEXP(re)->ptr->options;
|
2009-09-08 17:10:04 +04:00
|
|
|
hashval = rb_hash_uint(hashval, rb_memhash(RREGEXP_SRC_PTR(re), RREGEXP_SRC_LEN(re)));
|
|
|
|
return rb_hash_end(hashval);
|
2002-12-12 12:17:32 +03:00
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* rxp == other_rxp -> true or false
|
|
|
|
* rxp.eql?(other_rxp) -> true or false
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Equality---Two regexps are equal if their patterns are identical, they have
|
|
|
|
* the same character set code, and their <code>casefold?</code> values are the
|
|
|
|
* same.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* /abc/ == /abc/x #=> false
|
|
|
|
* /abc/ == /abc/i #=> false
|
2007-12-09 16:35:38 +03:00
|
|
|
* /abc/ == /abc/n #=> false
|
2003-12-26 18:58:28 +03:00
|
|
|
* /abc/u == /abc/n #=> false
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_equal(VALUE re1, VALUE re2)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
if (re1 == re2) return Qtrue;
|
|
|
|
if (TYPE(re2) != T_REGEXP) return Qfalse;
|
2000-05-22 11:09:55 +04:00
|
|
|
rb_reg_check(re1); rb_reg_check(re2);
|
2007-12-09 16:35:38 +03:00
|
|
|
if (FL_TEST(re1, KCODE_FIXED) != FL_TEST(re2, KCODE_FIXED)) return Qfalse;
|
2007-10-16 09:48:40 +04:00
|
|
|
if (RREGEXP(re1)->ptr->options != RREGEXP(re2)->ptr->options) return Qfalse;
|
2008-06-28 16:25:45 +04:00
|
|
|
if (RREGEXP_SRC_LEN(re1) != RREGEXP_SRC_LEN(re2)) return Qfalse;
|
2007-10-16 09:48:40 +04:00
|
|
|
if (ENCODING_GET(re1) != ENCODING_GET(re2)) return Qfalse;
|
2008-06-28 16:25:45 +04:00
|
|
|
if (memcmp(RREGEXP_SRC_PTR(re1), RREGEXP_SRC_PTR(re2), RREGEXP_SRC_LEN(re1)) == 0) {
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qtrue;
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2009-09-05 03:51:44 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch.hash -> integer
|
2009-09-05 03:51:44 +04:00
|
|
|
*
|
|
|
|
* Produce a hash based on the target string, regexp and matched
|
|
|
|
* positions of this matchdata.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
match_hash(VALUE match)
|
|
|
|
{
|
|
|
|
const struct re_registers *regs;
|
2009-09-08 17:10:04 +04:00
|
|
|
st_index_t hashval = rb_hash_start(rb_str_hash(RMATCH(match)->str));
|
2009-09-05 03:51:44 +04:00
|
|
|
|
2009-09-08 17:10:04 +04:00
|
|
|
rb_hash_uint(hashval, reg_hash(RMATCH(match)->regexp));
|
2009-09-05 03:51:44 +04:00
|
|
|
regs = RMATCH_REGS(match);
|
|
|
|
hashval = rb_hash_uint(hashval, regs->num_regs);
|
|
|
|
hashval = rb_hash_uint(hashval, rb_memhash(regs->beg, regs->num_regs * sizeof(*regs->beg)));
|
|
|
|
hashval = rb_hash_uint(hashval, rb_memhash(regs->end, regs->num_regs * sizeof(*regs->end)));
|
|
|
|
hashval = rb_hash_end(hashval);
|
|
|
|
return LONG2FIX(hashval);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* mtch == mtch2 -> true or false
|
2009-09-05 03:51:44 +04:00
|
|
|
*
|
|
|
|
* Equality---Two matchdata are equal if their target strings,
|
|
|
|
* patterns, and matched positions are identical.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
match_equal(VALUE match1, VALUE match2)
|
|
|
|
{
|
|
|
|
const struct re_registers *regs1, *regs2;
|
|
|
|
if (match1 == match2) return Qtrue;
|
|
|
|
if (TYPE(match2) != T_MATCH) return Qfalse;
|
|
|
|
if (!rb_str_equal(RMATCH(match1)->str, RMATCH(match2)->str)) return Qfalse;
|
|
|
|
if (!rb_reg_equal(RMATCH(match1)->regexp, RMATCH(match2)->regexp)) return Qfalse;
|
|
|
|
regs1 = RMATCH_REGS(match1);
|
|
|
|
regs2 = RMATCH_REGS(match2);
|
|
|
|
if (regs1->num_regs != regs2->num_regs) return Qfalse;
|
|
|
|
if (memcmp(regs1->beg, regs2->beg, regs1->num_regs * sizeof(*regs1->beg))) return Qfalse;
|
|
|
|
if (memcmp(regs1->end, regs2->end, regs1->num_regs * sizeof(*regs1->end))) return Qfalse;
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2007-02-14 07:57:25 +03:00
|
|
|
static VALUE
|
|
|
|
reg_operand(VALUE s, int check)
|
|
|
|
{
|
|
|
|
if (SYMBOL_P(s)) {
|
|
|
|
return rb_sym_to_s(s);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
VALUE tmp = rb_check_string_type(s);
|
|
|
|
if (check && NIL_P(tmp)) {
|
|
|
|
rb_raise(rb_eTypeError, "can't convert %s to String",
|
|
|
|
rb_obj_classname(s));
|
|
|
|
}
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-12-10 07:50:35 +03:00
|
|
|
static long
|
2007-12-10 13:03:48 +03:00
|
|
|
reg_match_pos(VALUE re, VALUE *strp, long pos)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2007-12-10 13:03:48 +03:00
|
|
|
VALUE str = *strp;
|
|
|
|
|
2004-07-17 12:02:20 +04:00
|
|
|
if (NIL_P(str)) {
|
|
|
|
rb_backref_set(Qnil);
|
2007-12-10 07:50:35 +03:00
|
|
|
return -1;
|
2004-07-17 12:02:20 +04:00
|
|
|
}
|
2009-09-05 03:49:18 +04:00
|
|
|
*strp = str = reg_operand(str, TRUE);
|
2004-07-17 10:28:10 +04:00
|
|
|
if (pos != 0) {
|
|
|
|
if (pos < 0) {
|
2007-12-19 20:02:29 +03:00
|
|
|
VALUE l = rb_str_length(str);
|
|
|
|
pos += NUM2INT(l);
|
2004-07-17 10:28:10 +04:00
|
|
|
if (pos < 0) {
|
2007-12-10 07:50:35 +03:00
|
|
|
return pos;
|
2004-07-17 10:28:10 +04:00
|
|
|
}
|
|
|
|
}
|
2009-06-30 13:06:48 +04:00
|
|
|
pos = rb_str_offset(str, pos);
|
2004-07-17 10:28:10 +04:00
|
|
|
}
|
2007-12-10 07:50:35 +03:00
|
|
|
return rb_reg_search(re, str, pos, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-10-20 05:38:04 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* rxp =~ str -> integer or nil
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2004-10-20 05:38:04 +04:00
|
|
|
* Match---Matches <i>rxp</i> against <i>str</i>.
|
|
|
|
*
|
|
|
|
* /at/ =~ "input data" #=> 7
|
2007-12-09 16:35:38 +03:00
|
|
|
* /ax/ =~ "input data" #=> nil
|
2007-12-18 14:26:24 +03:00
|
|
|
*
|
|
|
|
* If <code>=~</code> is used with a regexp literal with named captures,
|
|
|
|
* captured strings (or nil) is assigned to local variables named by
|
|
|
|
* the capture names.
|
|
|
|
*
|
|
|
|
* /(?<lhs>\w+)\s*=\s*(?<rhs>\w+)/ =~ " x = y "
|
|
|
|
* p lhs #=> "x"
|
|
|
|
* p rhs #=> "y"
|
|
|
|
*
|
|
|
|
* If it is not matched, nil is assigned for the variables.
|
|
|
|
*
|
2009-02-22 17:23:33 +03:00
|
|
|
* /(?<lhs>\w+)\s*=\s*(?<rhs>\w+)/ =~ " x = "
|
2007-12-18 14:26:24 +03:00
|
|
|
* p lhs #=> nil
|
|
|
|
* p rhs #=> nil
|
|
|
|
*
|
|
|
|
* This assignment is implemented in the Ruby parser.
|
2008-10-11 13:56:07 +04:00
|
|
|
* The parser detects 'regexp-literal =~ expression' for the assignment.
|
|
|
|
* The regexp must be a literal without interpolation and placed at left hand side.
|
|
|
|
*
|
2007-12-18 14:26:24 +03:00
|
|
|
* The assignment is not occur if the regexp is not a literal.
|
|
|
|
*
|
|
|
|
* re = /(?<lhs>\w+)\s*=\s*(?<rhs>\w+)/
|
2008-10-11 13:56:07 +04:00
|
|
|
* re =~ " x = y "
|
2007-12-18 14:26:24 +03:00
|
|
|
* p lhs # undefined local variable
|
|
|
|
* p rhs # undefined local variable
|
|
|
|
*
|
|
|
|
* A regexp interpolation, <code>#{}</code>, also disables
|
|
|
|
* the assignment.
|
|
|
|
*
|
|
|
|
* rhs_pat = /(?<rhs>\w+)/
|
|
|
|
* /(?<lhs>\w+)\s*=\s*#{rhs_pat}/ =~ "x = y"
|
|
|
|
* p lhs # undefined local variable
|
|
|
|
*
|
2008-10-11 13:56:07 +04:00
|
|
|
* The assignment is not occur if the regexp is placed at right hand side.
|
|
|
|
*
|
|
|
|
* " x = y " =~ /(?<lhs>\w+)\s*=\s*(?<rhs>\w+)/
|
|
|
|
* p lhs, rhs # undefined local variable
|
|
|
|
*
|
2004-10-20 05:38:04 +04:00
|
|
|
*/
|
|
|
|
|
2004-07-17 10:28:10 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_match(VALUE re, VALUE str)
|
2004-07-17 10:28:10 +04:00
|
|
|
{
|
2007-12-10 13:03:48 +03:00
|
|
|
long pos = reg_match_pos(re, &str, 0);
|
2007-12-10 07:50:35 +03:00
|
|
|
if (pos < 0) return Qnil;
|
|
|
|
pos = rb_str_sublen(str, pos);
|
|
|
|
return LONG2FIX(pos);
|
2004-07-17 10:28:10 +04:00
|
|
|
}
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* rxp === str -> true or false
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Case Equality---Synonym for <code>Regexp#=~</code> used in case statements.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* a = "HELLO"
|
|
|
|
* case a
|
2004-12-06 18:31:26 +03:00
|
|
|
* when /^[a-z]*$/; print "Lower case\n"
|
|
|
|
* when /^[A-Z]*$/; print "Upper case\n"
|
2003-12-26 18:58:28 +03:00
|
|
|
* else; print "Mixed case\n"
|
|
|
|
* end
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* <em>produces:</em>
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Upper case
|
|
|
|
*/
|
|
|
|
|
2002-12-19 12:20:20 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_eqq(VALUE re, VALUE str)
|
2002-12-19 12:20:20 +03:00
|
|
|
{
|
|
|
|
long start;
|
|
|
|
|
2009-09-05 03:49:18 +04:00
|
|
|
str = reg_operand(str, FALSE);
|
2007-02-14 07:57:25 +03:00
|
|
|
if (NIL_P(str)) {
|
|
|
|
rb_backref_set(Qnil);
|
|
|
|
return Qfalse;
|
2002-12-19 12:20:20 +03:00
|
|
|
}
|
|
|
|
start = rb_reg_search(re, str, 0, 0);
|
|
|
|
if (start < 0) {
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* ~ rxp -> integer or nil
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Match---Matches <i>rxp</i> against the contents of <code>$_</code>.
|
|
|
|
* Equivalent to <code><i>rxp</i> =~ $_</code>.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* $_ = "input data"
|
|
|
|
* ~ /at/ #=> 7
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_match2(VALUE re)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2002-08-28 12:05:23 +04:00
|
|
|
long start;
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE line = rb_lastline_get();
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2002-03-14 09:23:46 +03:00
|
|
|
if (TYPE(line) != T_STRING) {
|
|
|
|
rb_backref_set(Qnil);
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qnil;
|
2002-03-14 09:23:46 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
start = rb_reg_search(re, line, 0, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
if (start < 0) {
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qnil;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2007-12-10 07:50:35 +03:00
|
|
|
start = rb_str_sublen(line, start);
|
2002-08-28 12:05:23 +04:00
|
|
|
return LONG2FIX(start);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* rxp.match(str) -> matchdata or nil
|
|
|
|
* rxp.match(str,pos) -> matchdata or nil
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* 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.
|
2004-07-17 10:28:10 +04:00
|
|
|
* If the second parameter is present, it specifies the position in the string
|
|
|
|
* to begin the search.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* /(.)(.)(.)/.match("abc")[2] #=> "b"
|
2004-07-17 10:28:10 +04:00
|
|
|
* /(.)(.)/.match("abc", 1)[2] #=> "c"
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-09-20 21:14:01 +04:00
|
|
|
* If a block is given, invoke the block with MatchData if match succeed, so
|
|
|
|
* that you can write
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-09-20 21:14:01 +04:00
|
|
|
* pat.match(str) {|m| ...}
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-09-20 21:14:01 +04:00
|
|
|
* instead of
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-09-20 21:14:01 +04:00
|
|
|
* if m = pat.match(str)
|
|
|
|
* ...
|
|
|
|
* end
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-12-31 08:52:59 +03:00
|
|
|
* The return value is a value from block execution in this case.
|
2003-12-26 18:58:28 +03:00
|
|
|
*/
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_match_m(int argc, VALUE *argv, VALUE re)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2004-07-17 10:28:10 +04:00
|
|
|
VALUE result, str, initpos;
|
|
|
|
long pos;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2004-07-17 10:28:10 +04:00
|
|
|
if (rb_scan_args(argc, argv, "11", &str, &initpos) == 2) {
|
|
|
|
pos = NUM2LONG(initpos);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
pos = 0;
|
|
|
|
}
|
|
|
|
|
2007-12-10 13:03:48 +03:00
|
|
|
pos = reg_match_pos(re, &str, pos);
|
2007-12-10 07:50:35 +03:00
|
|
|
if (pos < 0) {
|
2004-07-17 10:28:10 +04:00
|
|
|
rb_backref_set(Qnil);
|
|
|
|
return Qnil;
|
|
|
|
}
|
2000-07-14 11:18:58 +04:00
|
|
|
result = rb_backref_get();
|
|
|
|
rb_match_busy(result);
|
2007-09-20 21:14:01 +04:00
|
|
|
if (!NIL_P(result) && rb_block_given_p()) {
|
|
|
|
return rb_yield(result);
|
|
|
|
}
|
2000-07-14 11:18:58 +04:00
|
|
|
return result;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
2003-12-30 19:38:32 +03:00
|
|
|
/*
|
|
|
|
* Document-method: compile
|
|
|
|
*
|
|
|
|
* Synonym for <code>Regexp.new</code>
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:46 +04:00
|
|
|
* Regexp.new(string, [options [, lang]]) -> regexp
|
2010-05-18 01:07:33 +04:00
|
|
|
* Regexp.new(regexp) -> regexp
|
2010-05-18 01:07:46 +04:00
|
|
|
* Regexp.compile(string, [options [, lang]]) -> regexp
|
2010-05-18 01:07:33 +04:00
|
|
|
* Regexp.compile(regexp) -> regexp
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Constructs a new regular expression from <i>pattern</i>, which can be either
|
|
|
|
* a <code>String</code> or a <code>Regexp</code> (in which case that regexp's
|
|
|
|
* options are propagated, and new options may not be specified (a change as of
|
|
|
|
* Ruby 1.8). If <i>options</i> is a <code>Fixnum</code>, it should be one or
|
|
|
|
* more of the constants <code>Regexp::EXTENDED</code>,
|
2005-03-09 12:29:52 +03:00
|
|
|
* <code>Regexp::IGNORECASE</code>, and <code>Regexp::MULTILINE</code>,
|
2003-12-26 18:58:28 +03:00
|
|
|
* <em>or</em>-ed together. Otherwise, if <i>options</i> is not
|
2007-12-09 16:35:38 +03:00
|
|
|
* <code>nil</code>, the regexp will be case insensitive.
|
2010-05-11 17:06:54 +04:00
|
|
|
* When the <i>lang</i> parameter is `n' or `N' sets the regexp no encoding.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* r1 = Regexp.new('^a-z+:\\s+\w+') #=> /^a-z+:\s+\w+/
|
|
|
|
* r2 = Regexp.new('cat', true) #=> /cat/i
|
|
|
|
* r3 = Regexp.new('dog', Regexp::EXTENDED) #=> /dog/x
|
2007-12-09 16:35:38 +03:00
|
|
|
* r4 = Regexp.new(r2) #=> /cat/i
|
2003-12-26 18:58:28 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_initialize_m(int argc, VALUE *argv, VALUE self)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-01-14 07:51:10 +03:00
|
|
|
onig_errmsg_buffer err = "";
|
2001-02-02 14:38:20 +03:00
|
|
|
int flags = 0;
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
VALUE str;
|
2007-10-19 11:41:03 +04:00
|
|
|
rb_encoding *enc;
|
|
|
|
const char *ptr;
|
|
|
|
long len;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2007-10-16 20:57:08 +04:00
|
|
|
if (argc == 0 || argc > 3) {
|
* eval.c (make_exception, rb_obj_extend): Fix error messages in case of wrong
number of arguments
* file.c (rb_f_test, rb_file_s_umask): ditto
* numeric.c (int_chr, num_step): ditto
* process.c (rb_f_sleep): ditto
* re.c (rb_reg_initialize_m): ditto
* signal.c (rb_f_kill, sig_trap): ditto
* string.c (rb_str_aref_m, rb_str_aset_m, rb_str_count, rb_str_delete_bang,
rb_str_slice_bang, rb_str_sub_bang, str_gsub): ditto
* proc.c (curry): rdoc fix
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-30 06:40:57 +04:00
|
|
|
rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..3)", argc);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2003-02-03 11:45:26 +03:00
|
|
|
if (TYPE(argv[0]) == T_REGEXP) {
|
2007-10-16 09:48:40 +04:00
|
|
|
VALUE re = argv[0];
|
|
|
|
|
2003-02-03 11:45:26 +03:00
|
|
|
if (argc > 1) {
|
2007-10-16 09:48:40 +04:00
|
|
|
rb_warn("flags ignored");
|
2003-02-03 11:45:26 +03:00
|
|
|
}
|
2007-10-16 09:48:40 +04:00
|
|
|
rb_reg_check(re);
|
2007-10-19 11:41:03 +04:00
|
|
|
flags = rb_reg_options(re);
|
2008-06-28 16:25:45 +04:00
|
|
|
ptr = RREGEXP_SRC_PTR(re);
|
|
|
|
len = RREGEXP_SRC_LEN(re);
|
2007-10-16 09:48:40 +04:00
|
|
|
enc = rb_enc_get(re);
|
2009-08-30 12:00:31 +04:00
|
|
|
if (rb_reg_initialize(self, ptr, len, enc, flags, err, NULL, 0)) {
|
2007-10-16 09:48:40 +04:00
|
|
|
str = rb_enc_str_new(ptr, len, enc);
|
|
|
|
rb_reg_raise_str(str, flags, err);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
else {
|
2003-02-03 11:45:26 +03:00
|
|
|
if (argc >= 2) {
|
|
|
|
if (FIXNUM_P(argv[1])) flags = FIX2INT(argv[1]);
|
2005-02-17 17:43:38 +03:00
|
|
|
else if (RTEST(argv[1])) flags = ONIG_OPTION_IGNORECASE;
|
2003-02-03 11:45:26 +03:00
|
|
|
}
|
2007-10-19 11:41:03 +04:00
|
|
|
enc = 0;
|
2007-10-16 20:57:08 +04:00
|
|
|
if (argc == 3 && !NIL_P(argv[2])) {
|
|
|
|
char *kcode = StringValuePtr(argv[2]);
|
2010-05-12 05:06:24 +04:00
|
|
|
if (kcode[0] == 'n' || kcode[0] == 'N') {
|
2008-01-28 12:03:09 +03:00
|
|
|
enc = rb_ascii8bit_encoding();
|
2008-10-18 14:29:06 +04:00
|
|
|
flags |= ARG_ENCODING_NONE;
|
2007-10-16 20:57:08 +04:00
|
|
|
}
|
|
|
|
else {
|
2008-10-17 02:39:04 +04:00
|
|
|
rb_warn("encoding option is ignored - %s", kcode);
|
2007-10-16 20:57:08 +04:00
|
|
|
}
|
|
|
|
}
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
str = argv[0];
|
2007-11-04 17:53:36 +03:00
|
|
|
ptr = StringValuePtr(str);
|
2007-10-19 11:41:03 +04:00
|
|
|
if (enc
|
2009-08-30 12:00:31 +04:00
|
|
|
? rb_reg_initialize(self, ptr, RSTRING_LEN(str), enc, flags, err, NULL, 0)
|
|
|
|
: rb_reg_initialize_str(self, str, flags, err, NULL, 0)) {
|
2007-10-16 09:48:40 +04:00
|
|
|
rb_reg_raise_str(str, flags, err);
|
|
|
|
}
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
}
|
2001-01-15 10:01:00 +03:00
|
|
|
return self;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2002-07-26 10:12:39 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_quote(VALUE str)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
rb_encoding *enc = rb_enc_get(str);
|
1999-08-13 09:45:20 +04:00
|
|
|
char *s, *send, *t;
|
2000-10-10 11:03:36 +04:00
|
|
|
VALUE tmp;
|
2007-12-11 06:08:50 +03:00
|
|
|
int c, clen;
|
2007-11-25 16:25:34 +03:00
|
|
|
int ascii_only = rb_enc_str_asciionly_p(str);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2006-08-31 14:47:44 +04:00
|
|
|
s = RSTRING_PTR(str);
|
|
|
|
send = s + RSTRING_LEN(str);
|
2007-12-11 06:08:50 +03:00
|
|
|
while (s < send) {
|
2007-12-11 10:39:16 +03:00
|
|
|
c = rb_enc_ascget(s, send, &clen, enc);
|
2007-12-08 05:50:43 +03:00
|
|
|
if (c == -1) {
|
2007-12-11 06:08:50 +03:00
|
|
|
s += mbclen(s, send, enc);
|
2002-07-26 10:12:39 +04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
switch (c) {
|
|
|
|
case '[': case ']': case '{': case '}':
|
|
|
|
case '(': case ')': case '|': case '-':
|
|
|
|
case '*': case '.': case '\\':
|
|
|
|
case '?': case '+': case '^': case '$':
|
|
|
|
case ' ': case '#':
|
2007-11-04 18:03:31 +03:00
|
|
|
case '\t': case '\f': case '\v': case '\n': case '\r':
|
2002-07-26 10:12:39 +04:00
|
|
|
goto meta_found;
|
|
|
|
}
|
2007-12-11 06:08:50 +03:00
|
|
|
s += clen;
|
2002-07-26 10:12:39 +04:00
|
|
|
}
|
2008-04-08 05:53:35 +04:00
|
|
|
tmp = rb_str_new3(str);
|
2008-02-17 05:00:05 +03:00
|
|
|
if (ascii_only) {
|
2008-04-08 05:53:35 +04:00
|
|
|
rb_enc_associate(tmp, rb_usascii_encoding());
|
2007-11-25 16:25:34 +03:00
|
|
|
}
|
2008-04-08 05:53:35 +04:00
|
|
|
return tmp;
|
2002-07-26 10:12:39 +04:00
|
|
|
|
|
|
|
meta_found:
|
2006-08-31 14:47:44 +04:00
|
|
|
tmp = rb_str_new(0, RSTRING_LEN(str)*2);
|
2008-02-17 05:00:05 +03:00
|
|
|
if (ascii_only) {
|
|
|
|
rb_enc_associate(tmp, rb_usascii_encoding());
|
|
|
|
}
|
|
|
|
else {
|
2007-11-25 16:25:34 +03:00
|
|
|
rb_enc_copy(tmp, str);
|
|
|
|
}
|
2006-08-31 14:47:44 +04:00
|
|
|
t = RSTRING_PTR(tmp);
|
2002-07-29 10:14:10 +04:00
|
|
|
/* copy upto metacharacter */
|
2006-08-31 14:47:44 +04:00
|
|
|
memcpy(t, RSTRING_PTR(str), s - RSTRING_PTR(str));
|
|
|
|
t += s - RSTRING_PTR(str);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2007-12-11 06:08:50 +03:00
|
|
|
while (s < send) {
|
2007-12-11 10:39:16 +03:00
|
|
|
c = rb_enc_ascget(s, send, &clen, enc);
|
2007-12-08 05:50:43 +03:00
|
|
|
if (c == -1) {
|
2007-09-06 16:33:45 +04:00
|
|
|
int n = mbclen(s, send, enc);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2007-12-11 06:08:50 +03:00
|
|
|
while (n--)
|
1999-08-13 09:45:20 +04:00
|
|
|
*t++ = *s++;
|
|
|
|
continue;
|
|
|
|
}
|
2007-12-11 06:08:50 +03:00
|
|
|
s += clen;
|
2002-05-01 13:41:50 +04:00
|
|
|
switch (c) {
|
|
|
|
case '[': case ']': case '{': case '}':
|
|
|
|
case '(': case ')': case '|': case '-':
|
|
|
|
case '*': case '.': case '\\':
|
|
|
|
case '?': case '+': case '^': case '$':
|
2003-05-17 03:28:31 +04:00
|
|
|
case '#':
|
2008-09-15 20:01:08 +04:00
|
|
|
t += rb_enc_mbcput('\\', t, enc);
|
2003-05-17 03:28:31 +04:00
|
|
|
break;
|
|
|
|
case ' ':
|
2008-09-15 20:01:08 +04:00
|
|
|
t += rb_enc_mbcput('\\', t, enc);
|
|
|
|
t += rb_enc_mbcput(' ', t, enc);
|
2003-05-19 08:48:57 +04:00
|
|
|
continue;
|
2003-05-17 03:28:31 +04:00
|
|
|
case '\t':
|
2008-09-15 20:01:08 +04:00
|
|
|
t += rb_enc_mbcput('\\', t, enc);
|
|
|
|
t += rb_enc_mbcput('t', t, enc);
|
2003-05-19 08:48:57 +04:00
|
|
|
continue;
|
2003-05-17 03:28:31 +04:00
|
|
|
case '\n':
|
2008-09-15 20:01:08 +04:00
|
|
|
t += rb_enc_mbcput('\\', t, enc);
|
|
|
|
t += rb_enc_mbcput('n', t, enc);
|
2003-05-19 08:48:57 +04:00
|
|
|
continue;
|
2003-05-17 03:28:31 +04:00
|
|
|
case '\r':
|
2008-09-15 20:01:08 +04:00
|
|
|
t += rb_enc_mbcput('\\', t, enc);
|
|
|
|
t += rb_enc_mbcput('r', t, enc);
|
2003-05-19 08:48:57 +04:00
|
|
|
continue;
|
2003-05-17 03:28:31 +04:00
|
|
|
case '\f':
|
2008-09-15 20:01:08 +04:00
|
|
|
t += rb_enc_mbcput('\\', t, enc);
|
|
|
|
t += rb_enc_mbcput('f', t, enc);
|
2003-05-19 08:48:57 +04:00
|
|
|
continue;
|
2007-11-04 18:03:31 +03:00
|
|
|
case '\v':
|
2008-09-15 20:01:08 +04:00
|
|
|
t += rb_enc_mbcput('\\', t, enc);
|
|
|
|
t += rb_enc_mbcput('v', t, enc);
|
2007-11-04 18:03:31 +03:00
|
|
|
continue;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2008-09-15 20:01:08 +04:00
|
|
|
t += rb_enc_mbcput(c, t, enc);
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2006-08-31 14:47:44 +04:00
|
|
|
rb_str_resize(tmp, t - RSTRING_PTR(tmp));
|
2001-12-21 12:23:28 +03:00
|
|
|
OBJ_INFECT(tmp, str);
|
2000-10-10 11:03:36 +04:00
|
|
|
return tmp;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* Regexp.escape(str) -> string
|
|
|
|
* Regexp.quote(str) -> string
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* Escapes any characters that would have special meaning in a regular
|
2005-03-16 12:25:45 +03:00
|
|
|
* expression. Returns a new escaped string, or self if no characters are
|
|
|
|
* escaped. For any string,
|
2007-12-09 16:35:38 +03:00
|
|
|
* <code>Regexp.new(Regexp.escape(<i>str</i>))=~<i>str</i></code> will be true.
|
|
|
|
*
|
|
|
|
* Regexp.escape('\*?{}.') #=> \\\*\?\{\}\.
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
*/
|
|
|
|
|
2002-07-26 10:12:39 +04:00
|
|
|
static VALUE
|
2007-10-10 18:34:42 +04:00
|
|
|
rb_reg_s_quote(VALUE c, VALUE str)
|
2002-07-26 10:12:39 +04:00
|
|
|
{
|
2009-09-05 03:49:18 +04:00
|
|
|
return rb_reg_quote(reg_operand(str, TRUE));
|
2002-07-26 10:12:39 +04:00
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_options(VALUE re)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2003-07-25 08:38:42 +04:00
|
|
|
int options;
|
1998-01-16 15:19:22 +03:00
|
|
|
|
2000-05-22 11:09:55 +04:00
|
|
|
rb_reg_check(re);
|
2007-10-19 11:41:03 +04:00
|
|
|
options = RREGEXP(re)->ptr->options & ARG_REG_OPTION_MASK;
|
|
|
|
if (RBASIC(re)->flags & KCODE_FIXED) options |= ARG_ENCODING_FIXED;
|
2007-12-21 19:39:36 +03:00
|
|
|
if (RBASIC(re)->flags & REG_ENCODING_NONE) options |= ARG_ENCODING_NONE;
|
1999-01-20 07:59:39 +03:00
|
|
|
return options;
|
|
|
|
}
|
|
|
|
|
2007-08-02 18:42:59 +04:00
|
|
|
VALUE
|
|
|
|
rb_check_regexp_type(VALUE re)
|
|
|
|
{
|
|
|
|
return rb_check_convert_type(re, T_REGEXP, "Regexp", "to_regexp");
|
|
|
|
}
|
|
|
|
|
2007-08-24 21:47:09 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Regexp.try_convert(obj) -> re or nil
|
|
|
|
*
|
|
|
|
* Try to convert <i>obj</i> into a Regexp, using to_regexp method.
|
|
|
|
* Returns converted regexp or nil if <i>obj</i> cannot be converted
|
|
|
|
* for any reason.
|
|
|
|
*
|
2007-12-09 16:35:38 +03:00
|
|
|
* Regexp.try_convert(/re/) #=> /re/
|
|
|
|
* Regexp.try_convert("re") #=> nil
|
|
|
|
*
|
|
|
|
* o = Object.new
|
|
|
|
* Regexp.try_convert(o) #=> nil
|
|
|
|
* def o.to_regexp() /foo/ end
|
|
|
|
* Regexp.try_convert(o) #=> /foo/
|
|
|
|
*
|
2007-08-24 21:47:09 +04:00
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
rb_reg_s_try_convert(VALUE dummy, VALUE re)
|
|
|
|
{
|
|
|
|
return rb_check_regexp_type(re);
|
|
|
|
}
|
2003-12-26 18:58:28 +03:00
|
|
|
|
2003-10-29 11:31:43 +03:00
|
|
|
static VALUE
|
2007-10-05 16:26:35 +04:00
|
|
|
rb_reg_s_union(VALUE self, VALUE args0)
|
2003-10-29 11:31:43 +03:00
|
|
|
{
|
2007-10-05 16:26:35 +04:00
|
|
|
long argc = RARRAY_LEN(args0);
|
2007-10-16 09:06:30 +04:00
|
|
|
|
2003-10-29 11:31:43 +03:00
|
|
|
if (argc == 0) {
|
|
|
|
VALUE args[1];
|
|
|
|
args[0] = rb_str_new2("(?!)");
|
|
|
|
return rb_class_new_instance(1, args, rb_cRegexp);
|
|
|
|
}
|
|
|
|
else if (argc == 1) {
|
2007-11-25 16:25:34 +03:00
|
|
|
VALUE arg = rb_ary_entry(args0, 0);
|
|
|
|
VALUE re = rb_check_regexp_type(arg);
|
|
|
|
if (!NIL_P(re))
|
|
|
|
return re;
|
2003-10-29 11:31:43 +03:00
|
|
|
else {
|
2007-11-25 16:25:34 +03:00
|
|
|
VALUE quoted;
|
|
|
|
quoted = rb_reg_s_quote(Qnil, arg);
|
2008-01-04 19:30:33 +03:00
|
|
|
return rb_reg_new_str(quoted, 0);
|
2003-10-29 11:31:43 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2007-10-16 09:48:40 +04:00
|
|
|
int i;
|
|
|
|
VALUE source = rb_str_buf_new(0);
|
2007-11-26 05:27:59 +03:00
|
|
|
rb_encoding *result_enc;
|
2007-11-25 16:25:34 +03:00
|
|
|
|
2007-11-26 05:27:59 +03:00
|
|
|
int has_asciionly = 0;
|
|
|
|
rb_encoding *has_ascii_compat_fixed = 0;
|
|
|
|
rb_encoding *has_ascii_incompat = 0;
|
2007-10-16 09:06:30 +04:00
|
|
|
|
2007-10-16 09:48:40 +04:00
|
|
|
for (i = 0; i < argc; i++) {
|
|
|
|
volatile VALUE v;
|
2007-10-16 14:48:02 +04:00
|
|
|
VALUE e = rb_ary_entry(args0, i);
|
2007-11-25 16:25:34 +03:00
|
|
|
|
2007-10-16 09:48:40 +04:00
|
|
|
if (0 < i)
|
2008-01-25 10:35:27 +03:00
|
|
|
rb_str_buf_cat_ascii(source, "|");
|
2007-11-25 16:25:34 +03:00
|
|
|
|
2007-10-16 14:48:02 +04:00
|
|
|
v = rb_check_regexp_type(e);
|
2007-10-16 09:48:40 +04:00
|
|
|
if (!NIL_P(v)) {
|
2007-11-26 05:27:59 +03:00
|
|
|
rb_encoding *enc = rb_enc_get(v);
|
|
|
|
if (!rb_enc_asciicompat(enc)) {
|
|
|
|
if (!has_ascii_incompat)
|
|
|
|
has_ascii_incompat = enc;
|
|
|
|
else if (has_ascii_incompat != enc)
|
2007-12-27 10:38:23 +03:00
|
|
|
rb_raise(rb_eArgError, "incompatible encodings: %s and %s",
|
|
|
|
rb_enc_name(has_ascii_incompat), rb_enc_name(enc));
|
2007-11-25 16:25:34 +03:00
|
|
|
}
|
2007-11-26 05:27:59 +03:00
|
|
|
else if (rb_reg_fixed_encoding_p(v)) {
|
|
|
|
if (!has_ascii_compat_fixed)
|
|
|
|
has_ascii_compat_fixed = enc;
|
|
|
|
else if (has_ascii_compat_fixed != enc)
|
2007-12-27 10:38:23 +03:00
|
|
|
rb_raise(rb_eArgError, "incompatible encodings: %s and %s",
|
|
|
|
rb_enc_name(has_ascii_compat_fixed), rb_enc_name(enc));
|
2007-11-25 16:25:34 +03:00
|
|
|
}
|
|
|
|
else {
|
2007-11-26 05:27:59 +03:00
|
|
|
has_asciionly = 1;
|
2007-11-25 16:25:34 +03:00
|
|
|
}
|
2007-10-16 09:48:40 +04:00
|
|
|
v = rb_reg_to_s(v);
|
|
|
|
}
|
|
|
|
else {
|
2008-07-20 23:44:05 +04:00
|
|
|
rb_encoding *enc;
|
2007-11-25 16:25:34 +03:00
|
|
|
StringValue(e);
|
2007-11-26 05:27:59 +03:00
|
|
|
enc = rb_enc_get(e);
|
2007-11-25 16:25:34 +03:00
|
|
|
if (!rb_enc_str_asciicompat_p(e)) {
|
2007-11-26 05:27:59 +03:00
|
|
|
if (!has_ascii_incompat)
|
|
|
|
has_ascii_incompat = enc;
|
|
|
|
else if (has_ascii_incompat != enc)
|
2007-12-27 10:38:23 +03:00
|
|
|
rb_raise(rb_eArgError, "incompatible encodings: %s and %s",
|
|
|
|
rb_enc_name(has_ascii_incompat), rb_enc_name(enc));
|
2007-11-25 16:25:34 +03:00
|
|
|
}
|
|
|
|
else if (rb_enc_str_asciionly_p(e)) {
|
2007-11-26 05:27:59 +03:00
|
|
|
has_asciionly = 1;
|
2007-11-25 16:25:34 +03:00
|
|
|
}
|
|
|
|
else {
|
2007-11-26 05:27:59 +03:00
|
|
|
if (!has_ascii_compat_fixed)
|
|
|
|
has_ascii_compat_fixed = enc;
|
|
|
|
else if (has_ascii_compat_fixed != enc)
|
2007-12-27 10:38:23 +03:00
|
|
|
rb_raise(rb_eArgError, "incompatible encodings: %s and %s",
|
|
|
|
rb_enc_name(has_ascii_compat_fixed), rb_enc_name(enc));
|
2007-11-25 16:25:34 +03:00
|
|
|
}
|
2007-10-16 14:48:02 +04:00
|
|
|
v = rb_reg_s_quote(Qnil, e);
|
2007-10-17 09:21:10 +04:00
|
|
|
}
|
2007-12-27 10:38:23 +03:00
|
|
|
if (has_ascii_incompat) {
|
|
|
|
if (has_asciionly) {
|
|
|
|
rb_raise(rb_eArgError, "ASCII incompatible encoding: %s",
|
|
|
|
rb_enc_name(has_ascii_incompat));
|
|
|
|
}
|
|
|
|
if (has_ascii_compat_fixed) {
|
|
|
|
rb_raise(rb_eArgError, "incompatible encodings: %s and %s",
|
|
|
|
rb_enc_name(has_ascii_incompat), rb_enc_name(has_ascii_compat_fixed));
|
|
|
|
}
|
2007-11-26 05:27:59 +03:00
|
|
|
}
|
|
|
|
|
2008-01-25 10:35:27 +03:00
|
|
|
if (i == 0) {
|
|
|
|
rb_enc_copy(source, v);
|
|
|
|
}
|
2007-10-16 22:37:09 +04:00
|
|
|
rb_str_append(source, v);
|
2007-08-02 18:42:59 +04:00
|
|
|
}
|
2007-11-26 05:27:59 +03:00
|
|
|
|
|
|
|
if (has_ascii_incompat) {
|
|
|
|
result_enc = has_ascii_incompat;
|
2007-11-25 16:25:34 +03:00
|
|
|
}
|
2007-11-26 05:27:59 +03:00
|
|
|
else if (has_ascii_compat_fixed) {
|
|
|
|
result_enc = has_ascii_compat_fixed;
|
2007-11-25 16:25:34 +03:00
|
|
|
}
|
|
|
|
else {
|
2008-01-28 12:03:09 +03:00
|
|
|
result_enc = rb_ascii8bit_encoding();
|
2007-11-25 16:25:34 +03:00
|
|
|
}
|
|
|
|
|
2007-11-26 05:27:59 +03:00
|
|
|
rb_enc_associate(source, result_enc);
|
2007-10-16 09:48:40 +04:00
|
|
|
return rb_class_new_instance(1, &source, rb_cRegexp);
|
2003-10-29 11:31:43 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-10-08 20:03:53 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* Regexp.union(pat1, pat2, ...) -> new_regexp
|
|
|
|
* Regexp.union(pats_ary) -> new_regexp
|
2007-10-08 20:03:53 +04:00
|
|
|
*
|
|
|
|
* Return a <code>Regexp</code> object that is the union of the given
|
|
|
|
* <em>pattern</em>s, i.e., will match any of its parts. The <em>pattern</em>s
|
|
|
|
* can be Regexp objects, in which case their options will be preserved, or
|
|
|
|
* Strings. If no patterns are given, returns <code>/(?!)/</code>.
|
2010-05-20 17:52:18 +04:00
|
|
|
* The behavior is unspecified if any given <em>pattern</em> contains capture.
|
2007-10-08 20:03:53 +04:00
|
|
|
*
|
|
|
|
* Regexp.union #=> /(?!)/
|
|
|
|
* Regexp.union("penzance") #=> /penzance/
|
|
|
|
* Regexp.union("a+b*c") #=> /a\+b\*c/
|
|
|
|
* Regexp.union("skiing", "sledding") #=> /skiing|sledding/
|
|
|
|
* Regexp.union(["skiing", "sledding"]) #=> /skiing|sledding/
|
|
|
|
* Regexp.union(/dogs/, /cats/i) #=> /(?-mix:dogs)|(?i-mx:cats)/
|
|
|
|
*/
|
2007-10-05 16:26:35 +04:00
|
|
|
static VALUE
|
|
|
|
rb_reg_s_union_m(VALUE self, VALUE args)
|
|
|
|
{
|
|
|
|
VALUE v;
|
|
|
|
if (RARRAY_LEN(args) == 1 &&
|
|
|
|
!NIL_P(v = rb_check_array_type(rb_ary_entry(args, 0)))) {
|
|
|
|
return rb_reg_s_union(self, v);
|
|
|
|
}
|
|
|
|
return rb_reg_s_union(self, args);
|
|
|
|
}
|
|
|
|
|
2004-01-18 17:16:47 +03:00
|
|
|
/* :nodoc: */
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_init_copy(VALUE copy, VALUE re)
|
2000-01-05 07:41:21 +03:00
|
|
|
{
|
2008-01-14 07:51:10 +03:00
|
|
|
onig_errmsg_buffer err = "";
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
const char *s;
|
|
|
|
long len;
|
|
|
|
|
2002-09-03 09:20:14 +04:00
|
|
|
if (copy == re) return copy;
|
|
|
|
rb_check_frozen(copy);
|
2002-08-27 12:31:08 +04:00
|
|
|
/* need better argument type check */
|
2002-09-03 09:20:14 +04:00
|
|
|
if (!rb_obj_is_instance_of(re, rb_obj_class(copy))) {
|
2002-08-27 12:31:08 +04:00
|
|
|
rb_raise(rb_eTypeError, "wrong argument type");
|
|
|
|
}
|
2000-05-22 11:09:55 +04:00
|
|
|
rb_reg_check(re);
|
2008-06-28 16:25:45 +04:00
|
|
|
s = RREGEXP_SRC_PTR(re);
|
|
|
|
len = RREGEXP_SRC_LEN(re);
|
2009-08-30 12:00:31 +04:00
|
|
|
if (rb_reg_initialize(copy, s, len, rb_enc_get(re), rb_reg_options(re),
|
|
|
|
err, NULL, 0) != 0) {
|
2007-08-25 11:06:47 +04:00
|
|
|
rb_reg_raise(s, len, err, re);
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
}
|
2002-09-03 09:20:14 +04:00
|
|
|
return copy;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2006-03-22 18:03:40 +03:00
|
|
|
rb_reg_regsub(VALUE str, VALUE src, struct re_registers *regs, VALUE regexp)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE val = 0;
|
* ascii.c, euc_jp.c, oniggnu.h, oniguruma.h, regcomp.c, regenc.c, regenc.h, regerror.c, regexec.c, reggnu.c, regint.h, regparse.c, regparse.h, sjis.c, utf8.c:
imported Oni Guruma 3.4.0.
* parse.y, re.c: Now mbclen() takes unsigned char as its argument.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7206 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-11-04 17:43:08 +03:00
|
|
|
char *p, *s, *e;
|
2007-12-11 06:08:50 +03:00
|
|
|
int no, clen;
|
2008-01-06 12:25:09 +03:00
|
|
|
rb_encoding *str_enc = rb_enc_get(str);
|
|
|
|
rb_encoding *src_enc = rb_enc_get(src);
|
2008-05-19 12:25:03 +04:00
|
|
|
int acompat = rb_enc_asciicompat(str_enc);
|
2008-11-15 16:46:52 +03:00
|
|
|
#define ASCGET(s,e,cl) (acompat ? (*cl=1,ISASCII(s[0])?s[0]:-1) : rb_enc_ascget(s, e, cl, str_enc))
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-08-31 14:47:44 +04:00
|
|
|
p = s = RSTRING_PTR(str);
|
|
|
|
e = s + RSTRING_LEN(str);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
while (s < e) {
|
2008-05-19 12:25:03 +04:00
|
|
|
int c = ASCGET(s, e, &clen);
|
2007-12-11 06:08:50 +03:00
|
|
|
char *ss;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2007-12-08 05:50:43 +03:00
|
|
|
if (c == -1) {
|
2008-01-06 12:25:09 +03:00
|
|
|
s += mbclen(s, e, str_enc);
|
1999-01-20 07:59:39 +03:00
|
|
|
continue;
|
|
|
|
}
|
2007-12-11 06:08:50 +03:00
|
|
|
ss = s;
|
|
|
|
s += clen;
|
|
|
|
|
2007-12-08 05:50:43 +03:00
|
|
|
if (c != '\\' || s == e) continue;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-05-30 13:12:34 +04:00
|
|
|
if (!val) {
|
|
|
|
val = rb_str_buf_new(ss-p);
|
|
|
|
}
|
2008-01-06 12:25:09 +03:00
|
|
|
rb_enc_str_buf_cat(val, p, ss-p, str_enc);
|
2007-12-11 06:08:50 +03:00
|
|
|
|
2008-05-19 12:25:03 +04:00
|
|
|
c = ASCGET(s, e, &clen);
|
2007-12-11 06:08:50 +03:00
|
|
|
if (c == -1) {
|
2008-01-06 12:25:09 +03:00
|
|
|
s += mbclen(s, e, str_enc);
|
|
|
|
rb_enc_str_buf_cat(val, ss, s-ss, str_enc);
|
2008-02-17 18:35:09 +03:00
|
|
|
p = s;
|
2007-12-11 06:08:50 +03:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
s += clen;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
p = s;
|
2007-12-11 06:08:50 +03:00
|
|
|
switch (c) {
|
2006-03-23 15:43:51 +03:00
|
|
|
case '1': case '2': case '3': case '4':
|
1998-01-16 15:13:05 +03:00
|
|
|
case '5': case '6': case '7': case '8': case '9':
|
2006-03-23 15:43:51 +03:00
|
|
|
if (onig_noname_group_capture_is_active(RREGEXP(regexp)->ptr)) {
|
2007-12-11 06:08:50 +03:00
|
|
|
no = c - '0';
|
2006-03-23 15:43:51 +03:00
|
|
|
}
|
|
|
|
else {
|
2007-12-11 06:08:50 +03:00
|
|
|
continue;
|
2006-03-23 15:43:51 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
2006-03-22 18:03:40 +03:00
|
|
|
|
|
|
|
case 'k':
|
2008-05-19 12:25:03 +04:00
|
|
|
if (s < e && ASCGET(s, e, &clen) == '<') {
|
2007-12-11 06:08:50 +03:00
|
|
|
char *name, *name_end;
|
2009-02-22 17:23:33 +03:00
|
|
|
|
2007-12-11 06:08:50 +03:00
|
|
|
name_end = name = s + clen;
|
|
|
|
while (name_end < e) {
|
2008-05-19 12:25:03 +04:00
|
|
|
c = ASCGET(name_end, e, &clen);
|
2007-12-11 06:08:50 +03:00
|
|
|
if (c == '>') break;
|
2008-01-06 12:25:09 +03:00
|
|
|
name_end += c == -1 ? mbclen(name_end, e, str_enc) : clen;
|
2007-12-11 06:08:50 +03:00
|
|
|
}
|
|
|
|
if (name_end < e) {
|
|
|
|
no = name_to_backref_number(regs, regexp, name, name_end);
|
|
|
|
p = s = name_end + clen;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_raise(rb_eRuntimeError, "invalid group name reference format");
|
|
|
|
}
|
2006-03-22 18:03:40 +03:00
|
|
|
}
|
|
|
|
|
2008-01-06 12:25:09 +03:00
|
|
|
rb_enc_str_buf_cat(val, ss, s-ss, str_enc);
|
2006-03-22 18:03:40 +03:00
|
|
|
continue;
|
|
|
|
|
2006-03-23 15:43:51 +03:00
|
|
|
case '0':
|
1998-01-16 15:13:05 +03:00
|
|
|
case '&':
|
|
|
|
no = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '`':
|
2008-01-06 12:25:09 +03:00
|
|
|
rb_enc_str_buf_cat(val, RSTRING_PTR(src), BEG(0), src_enc);
|
1998-01-16 15:13:05 +03:00
|
|
|
continue;
|
|
|
|
|
|
|
|
case '\'':
|
2008-01-06 12:25:09 +03:00
|
|
|
rb_enc_str_buf_cat(val, RSTRING_PTR(src)+END(0), RSTRING_LEN(src)-END(0), src_enc);
|
1998-01-16 15:13:05 +03:00
|
|
|
continue;
|
|
|
|
|
|
|
|
case '+':
|
|
|
|
no = regs->num_regs-1;
|
|
|
|
while (BEG(no) == -1 && no > 0) no--;
|
|
|
|
if (no == 0) continue;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '\\':
|
2008-01-06 12:25:09 +03:00
|
|
|
rb_enc_str_buf_cat(val, s-clen, clen, str_enc);
|
1998-01-16 15:13:05 +03:00
|
|
|
continue;
|
|
|
|
|
|
|
|
default:
|
2008-01-06 12:25:09 +03:00
|
|
|
rb_enc_str_buf_cat(val, ss, s-ss, str_enc);
|
1998-01-16 15:13:05 +03:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (no >= 0) {
|
2000-02-08 11:54:01 +03:00
|
|
|
if (no >= regs->num_regs) continue;
|
1998-01-16 15:13:05 +03:00
|
|
|
if (BEG(no) == -1) continue;
|
2008-01-06 12:25:09 +03:00
|
|
|
rb_enc_str_buf_cat(val, RSTRING_PTR(src)+BEG(no), END(no)-BEG(no), src_enc);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-12-29 16:44:32 +03:00
|
|
|
if (!val) return str;
|
1998-01-16 15:13:05 +03:00
|
|
|
if (p < e) {
|
2008-01-06 12:25:09 +03:00
|
|
|
rb_enc_str_buf_cat(val, p, e-p, str_enc);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
kcode_getter(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2007-10-16 09:48:40 +04:00
|
|
|
rb_warn("variable $KCODE is no longer effective");
|
|
|
|
return Qnil;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2007-10-16 09:48:40 +04:00
|
|
|
kcode_setter(VALUE val, ID id)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2007-10-16 09:48:40 +04:00
|
|
|
rb_warn("variable $KCODE is no longer effective; ignored");
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
ignorecase_getter(void)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2007-10-04 12:09:06 +04:00
|
|
|
rb_warn("variable $= is no longer effective");
|
2007-10-04 11:31:50 +04:00
|
|
|
return Qfalse;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
ignorecase_setter(VALUE val, ID id)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2007-10-04 12:09:06 +04:00
|
|
|
rb_warn("variable $= is no longer effective; ignored");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_getter(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
VALUE match = rb_backref_get();
|
|
|
|
|
|
|
|
if (NIL_P(match)) return Qnil;
|
2000-02-08 11:54:01 +03:00
|
|
|
rb_match_busy(match);
|
|
|
|
return match;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
match_setter(VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2002-04-01 11:39:09 +04:00
|
|
|
if (!NIL_P(val)) {
|
|
|
|
Check_Type(val, T_MATCH);
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_backref_set(val);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* Regexp.last_match -> matchdata
|
|
|
|
* Regexp.last_match(n) -> str
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
*
|
2003-12-26 18:58:28 +03:00
|
|
|
* The first form returns the <code>MatchData</code> object generated by the
|
|
|
|
* last successful pattern match. Equivalent to reading the global variable
|
2007-12-09 16:35:38 +03:00
|
|
|
* <code>$~</code>. The second form returns the <i>n</i>th field in this
|
2003-12-26 18:58:28 +03:00
|
|
|
* <code>MatchData</code> object.
|
2007-12-09 16:35:38 +03:00
|
|
|
* <em>n</em> can be a string or symbol to reference a named capture.
|
|
|
|
*
|
2009-09-30 05:08:44 +04:00
|
|
|
* Note that the <code>last_match</code> is local to the thread and method scope
|
2009-09-29 20:38:00 +04:00
|
|
|
* of the method that did the pattern match.
|
|
|
|
*
|
2007-12-09 16:35:38 +03:00
|
|
|
* /c(.)t/ =~ 'cat' #=> 0
|
2008-03-09 04:04:46 +03:00
|
|
|
* Regexp.last_match #=> #<MatchData "cat" 1:"a">
|
2007-12-09 16:35:38 +03:00
|
|
|
* Regexp.last_match(0) #=> "cat"
|
|
|
|
* Regexp.last_match(1) #=> "a"
|
|
|
|
* Regexp.last_match(2) #=> nil
|
|
|
|
*
|
|
|
|
* /(?<lhs>\w+)\s*=\s*(?<rhs>\w+)/ =~ "var = val"
|
|
|
|
* Regexp.last_match #=> #<MatchData "var = val" lhs:"var" rhs:"val">
|
|
|
|
* Regexp.last_match(:lhs) #=> "var"
|
|
|
|
* Regexp.last_match(:rhs) #=> "val"
|
2003-12-26 18:58:28 +03:00
|
|
|
*/
|
|
|
|
|
2001-01-15 10:01:00 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_reg_s_last_match(int argc, VALUE *argv)
|
2001-01-15 10:01:00 +03:00
|
|
|
{
|
|
|
|
VALUE nth;
|
|
|
|
|
2008-03-05 08:22:17 +03:00
|
|
|
if (argc > 0 && rb_scan_args(argc, argv, "01", &nth) == 1) {
|
2007-12-09 16:35:38 +03:00
|
|
|
VALUE match = rb_backref_get();
|
|
|
|
int n;
|
|
|
|
if (NIL_P(match)) return Qnil;
|
|
|
|
n = match_backref_number(match, nth);
|
|
|
|
return rb_reg_nth_match(n, match);
|
2001-01-15 10:01:00 +03:00
|
|
|
}
|
|
|
|
return match_getter();
|
|
|
|
}
|
|
|
|
|
2008-02-18 05:52:10 +03:00
|
|
|
static void
|
2008-02-18 06:51:34 +03:00
|
|
|
re_warn(const char *s)
|
|
|
|
{
|
2008-02-18 06:43:11 +03:00
|
|
|
rb_warn("%s", s);
|
2008-02-18 05:52:10 +03:00
|
|
|
}
|
2003-12-26 18:58:28 +03:00
|
|
|
|
2010-05-08 08:50:09 +04:00
|
|
|
/*
|
|
|
|
* Document-class: RegexpError
|
|
|
|
*
|
|
|
|
* Raised when given an invalid regexp expression.
|
|
|
|
*
|
|
|
|
* Regexp.new("?")
|
|
|
|
*
|
|
|
|
* <em>raises the exception:</em>
|
|
|
|
*
|
|
|
|
* RegexpError: target of repeat operator is not specified: /?/
|
|
|
|
*/
|
|
|
|
|
2003-12-26 18:58:28 +03:00
|
|
|
/*
|
|
|
|
* Document-class: Regexp
|
|
|
|
*
|
|
|
|
* A <code>Regexp</code> holds a regular expression, used to match a pattern
|
|
|
|
* against strings. Regexps are created using the <code>/.../</code> and
|
|
|
|
* <code>%r{...}</code> literals, and by the <code>Regexp::new</code>
|
|
|
|
* constructor.
|
|
|
|
*
|
2010-04-10 10:36:13 +04:00
|
|
|
* :include: doc/re.rdoc
|
2003-12-26 18:58:28 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
Init_Regexp(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-08-28 13:53:42 +04:00
|
|
|
rb_eRegexpError = rb_define_class("RegexpError", rb_eStandardError);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2005-05-23 07:24:28 +04:00
|
|
|
onigenc_set_default_caseconv_table((UChar*)casetable);
|
2007-10-05 21:39:59 +04:00
|
|
|
onigenc_set_default_encoding(ONIG_ENCODING_ASCII);
|
2008-02-18 05:52:10 +03:00
|
|
|
onig_set_warn_func(re_warn);
|
|
|
|
onig_set_verb_warn_func(re_warn);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
rb_define_virtual_variable("$~", match_getter, match_setter);
|
|
|
|
rb_define_virtual_variable("$&", last_match_getter, 0);
|
|
|
|
rb_define_virtual_variable("$`", prematch_getter, 0);
|
|
|
|
rb_define_virtual_variable("$'", postmatch_getter, 0);
|
|
|
|
rb_define_virtual_variable("$+", last_paren_match_getter, 0);
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_virtual_variable("$=", ignorecase_getter, ignorecase_setter);
|
1998-01-16 15:13:05 +03:00
|
|
|
rb_define_virtual_variable("$KCODE", kcode_getter, kcode_setter);
|
|
|
|
rb_define_virtual_variable("$-K", kcode_getter, kcode_setter);
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_cRegexp = rb_define_class("Regexp", rb_cObject);
|
2002-12-20 11:33:17 +03:00
|
|
|
rb_define_alloc_func(rb_cRegexp, rb_reg_s_alloc);
|
2001-10-03 11:19:19 +04:00
|
|
|
rb_define_singleton_method(rb_cRegexp, "compile", rb_class_new_instance, -1);
|
2007-10-10 18:34:42 +04:00
|
|
|
rb_define_singleton_method(rb_cRegexp, "quote", rb_reg_s_quote, 1);
|
|
|
|
rb_define_singleton_method(rb_cRegexp, "escape", rb_reg_s_quote, 1);
|
2007-10-05 16:26:35 +04:00
|
|
|
rb_define_singleton_method(rb_cRegexp, "union", rb_reg_s_union_m, -2);
|
2001-01-15 10:01:00 +03:00
|
|
|
rb_define_singleton_method(rb_cRegexp, "last_match", rb_reg_s_last_match, -1);
|
2007-08-24 21:47:09 +04:00
|
|
|
rb_define_singleton_method(rb_cRegexp, "try_convert", rb_reg_s_try_convert, 1);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2000-05-22 11:09:55 +04:00
|
|
|
rb_define_method(rb_cRegexp, "initialize", rb_reg_initialize_m, -1);
|
2003-05-19 09:41:08 +04:00
|
|
|
rb_define_method(rb_cRegexp, "initialize_copy", rb_reg_init_copy, 1);
|
2002-12-12 12:17:32 +03:00
|
|
|
rb_define_method(rb_cRegexp, "hash", rb_reg_hash, 0);
|
|
|
|
rb_define_method(rb_cRegexp, "eql?", rb_reg_equal, 1);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cRegexp, "==", rb_reg_equal, 1);
|
|
|
|
rb_define_method(rb_cRegexp, "=~", rb_reg_match, 1);
|
2002-12-19 12:20:20 +03:00
|
|
|
rb_define_method(rb_cRegexp, "===", rb_reg_eqq, 1);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cRegexp, "~", rb_reg_match2, 0);
|
2004-07-17 10:28:10 +04:00
|
|
|
rb_define_method(rb_cRegexp, "match", rb_reg_match_m, -1);
|
2002-04-18 12:04:57 +04:00
|
|
|
rb_define_method(rb_cRegexp, "to_s", rb_reg_to_s, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cRegexp, "inspect", rb_reg_inspect, 0);
|
|
|
|
rb_define_method(rb_cRegexp, "source", rb_reg_source, 0);
|
|
|
|
rb_define_method(rb_cRegexp, "casefold?", rb_reg_casefold_p, 0);
|
2001-02-08 12:19:27 +03:00
|
|
|
rb_define_method(rb_cRegexp, "options", rb_reg_options_m, 0);
|
2007-10-04 10:57:19 +04:00
|
|
|
rb_define_method(rb_cRegexp, "encoding", rb_obj_encoding, 0); /* in encoding.c */
|
2007-11-26 11:33:11 +03:00
|
|
|
rb_define_method(rb_cRegexp, "fixed_encoding?", rb_reg_fixed_encoding_p, 0);
|
2007-12-10 00:44:19 +03:00
|
|
|
rb_define_method(rb_cRegexp, "names", rb_reg_names, 0);
|
|
|
|
rb_define_method(rb_cRegexp, "named_captures", rb_reg_named_captures, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2005-02-17 17:43:38 +03:00
|
|
|
rb_define_const(rb_cRegexp, "IGNORECASE", INT2FIX(ONIG_OPTION_IGNORECASE));
|
|
|
|
rb_define_const(rb_cRegexp, "EXTENDED", INT2FIX(ONIG_OPTION_EXTEND));
|
|
|
|
rb_define_const(rb_cRegexp, "MULTILINE", INT2FIX(ONIG_OPTION_MULTILINE));
|
2009-02-22 09:12:21 +03:00
|
|
|
rb_define_const(rb_cRegexp, "FIXEDENCODING", INT2FIX(ARG_ENCODING_FIXED));
|
1999-08-13 09:45:20 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
rb_global_variable(®_cache);
|
|
|
|
|
2000-02-23 08:23:12 +03:00
|
|
|
rb_cMatch = rb_define_class("MatchData", rb_cObject);
|
2002-12-20 11:33:17 +03:00
|
|
|
rb_define_alloc_func(rb_cMatch, match_alloc);
|
1999-10-15 12:52:18 +04:00
|
|
|
rb_undef_method(CLASS_OF(rb_cMatch), "new");
|
|
|
|
|
2003-05-19 09:41:08 +04:00
|
|
|
rb_define_method(rb_cMatch, "initialize_copy", match_init_copy, 1);
|
2007-12-10 00:44:19 +03:00
|
|
|
rb_define_method(rb_cMatch, "regexp", match_regexp, 0);
|
|
|
|
rb_define_method(rb_cMatch, "names", match_names, 0);
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_define_method(rb_cMatch, "size", match_size, 0);
|
|
|
|
rb_define_method(rb_cMatch, "length", match_size, 0);
|
|
|
|
rb_define_method(rb_cMatch, "offset", match_offset, 1);
|
|
|
|
rb_define_method(rb_cMatch, "begin", match_begin, 1);
|
|
|
|
rb_define_method(rb_cMatch, "end", match_end, 1);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cMatch, "to_a", match_to_a, 0);
|
|
|
|
rb_define_method(rb_cMatch, "[]", match_aref, -1);
|
2003-07-17 13:53:16 +04:00
|
|
|
rb_define_method(rb_cMatch, "captures", match_captures, 0);
|
2003-05-04 20:03:24 +04:00
|
|
|
rb_define_method(rb_cMatch, "values_at", match_values_at, -1);
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_define_method(rb_cMatch, "pre_match", rb_reg_match_pre, 0);
|
|
|
|
rb_define_method(rb_cMatch, "post_match", rb_reg_match_post, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cMatch, "to_s", match_to_s, 0);
|
2007-06-23 12:26:08 +04:00
|
|
|
rb_define_method(rb_cMatch, "inspect", match_inspect, 0);
|
2001-09-05 10:54:57 +04:00
|
|
|
rb_define_method(rb_cMatch, "string", match_string, 0);
|
2009-09-05 04:33:54 +04:00
|
|
|
rb_define_method(rb_cMatch, "hash", match_hash, 0);
|
|
|
|
rb_define_method(rb_cMatch, "eql?", match_equal, 1);
|
|
|
|
rb_define_method(rb_cMatch, "==", match_equal, 1);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|