diff options
author | Yukihiro Matsumoto <matz@ruby-lang.org> | 1997-10-02 17:59:18 +0900 |
---|---|---|
committer | Takashi Kokubun <takashikkbn@gmail.com> | 2019-08-17 22:09:32 +0900 |
commit | 10d21745c8c1c3c78678ea7e0b62c0a7433ccfce (patch) | |
tree | 4e40254178d66c343cae763029131d959518f795 /string.c | |
parent | ce930d042913722f209bbd3209b6c90a3c71325f (diff) |
version 1.0-971002v1_0_971002
https://cache.ruby-lang.org/pub/ruby/1.0/ruby-1.0-971002.tar.gz
Thu Oct 2 17:59:18 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-971002
Wed Oct 1 14:01:49 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* ext/marshal/marshal.c (w_byte): argument must be char.
Wed Oct 1 10:30:22 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* ext/marshal/marshal.c (marshal_dump): try to set binmode.
* ext/marshal/marshal.c (r_object): forgot to re-regist structs in
the object table.
* eval.c (ruby_options): call Init_ext() before any require()
calls by `-r'.
Tue Sep 30 14:51:07 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970930
Fri Sep 30 14:29:22 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* ext/marshal/marshal.c (w_object): marshal dumped core.
Tue Sep 30 10:27:39 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* sample/test.rb: bignum test suits added.
Mon Sep 29 13:37:58 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* ruby.c (forbid_setid): forbid some options in suid mode.
Mon Sep 27 09:53:48 1997 EGUCHI Matsumoto <eguchi@shizuokanet.or.jp>
* bignum.c: modified for speeding.
Fri Sep 26 18:27:59 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* sample/from.rb: some extensions.
Mon Sep 29 13:15:56 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* parse.y (lhs): no more syntax error on `obj.CONSTANT = value'.
Fri Sep 26 14:41:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (ruby_run): deferred calling Init_ext() just before eval_node.
Fri Sep 26 13:27:24 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* io.c (io_isatty): forgot to return TRUE value.
Fri Sep 25 11:10:58 1997 EGUCHI Osamu <eguchi@shizuokanet.or.jp>
* eval.c: use _setjmp/_longjmp instead of setjmp/longjmp on some
platforms.
Wed Sep 24 17:43:13 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* string.c (Init_String): String#taint and String#taint? added.
Wed Sep 24 00:57:00 1997 Katsuyuki Okabe <HGC02147@niftyserve.or.jp>
* X68000 patch.
Tue Sep 23 20:42:30 1997 EGUCHI Osamu <eguchi@shizuokanet.or.jp>
* parse.y (node_newnode): SEGV on null node setup.
Mon Sep 22 11:22:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* ruby.c (ruby_prog_init): wrong safe condition check.
Sun Sep 21 14:46:02 1997 MAEDA shugo <shugo@po.aianet.ne.jp>
* error.c (exc_inspect): garbage added to classpath.
Fri Sep 19 11:49:23 1997 <matz@netlab.co.jp>
* version 1.0-970919
* parse.y (newtok): forgot to adjust buffer size when shrinking
the token buffer.
* enum.c (enum_find): rb_eval_cmd() does not return value.
* io.c (pipe_open): close fds on pipe exec. fcntl(fd, F_SETFD, 1)
no longer used.
Tue Sep 16 17:54:25 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* file.c (f_test): problem if wrong command specified.
* ruby.c (ruby_prog_init): close stdaux and stdprn for MSDOS.
* ruby.c (ruby_prog_init): should not add path from environment
variable, if ruby is running under seuid.
* process.c (init_ids): check suid check for setuid/seteuid etc.
Mon Sep 15 00:42:04 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* regex.c (re_compile_pattern): \w{3} and \W{3} did not work.
Thu Sep 11 10:31:48 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970911
* ext/socket/socket.c (sock_new): no setbuf() for NT.
* io.c (rb_fopen,rb_fdopen): set close-on-exec for every fd.
Wed Sep 10 15:55:31 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970910
* ext/marshal/marshal.c (r_bytes0): extra big length check.
Tue Sep 9 16:27:14 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* io.c (pipe_fptr_atexit): clean up popen()'ed fptr.
* error.c (set_syserr): some system has error code that is bigger
than sys_nerr. grrr.
Tue Sep 9 16:27:14 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970909
* error.c (set_syserr): some system has error code that is bigger
than sys_nerr. grrr.
Wed Sep 3 18:11:00 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970903
* eval.c (f_load): expand path if fname begins with `~'.
Mon Sep 1 13:42:48 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (rb_call): alias occured in the module body caused SEGV.
Fri Aug 29 11:10:21 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* parse.y (yylex): spaces can follow =begin/=end.
* variable.c (find_class_path): look for class_tbl also for
unnamed fundamental classes, such as Object, String, etc.
* variable.c (rb_name_class): can't name class before String class
is initilialized.
* inits.c (rb_call_inits): unrecognized dependency from GC to
Array.
* variable.c (find_class_path): could not find class if Object's
iv_tbl is NULL.
Thu Aug 28 13:12:05 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* parse.y (yylex): revised `=begin' skip code.
* eval.c (is_defined): separated from rb_eval().
Wed Aug 27 11:32:42 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* variable.c (fc_i): some classes/modules does not have iv_tbl.
* variable.c (find_class_path): avoid inifinite loop.
Tue Aug 26 13:43:47 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (rb_eval): undef'ing non-existing method will raise
NameError exception.
* object.c (class_s_new): needed to create metaclass too.
* eval.c (error_print): no class name print for anonymous class.
* eval.c (rb_longjmp): proper exception raised if raise() called
without arguments, with $! or $@ set.
* object.c (Init_Object): superclass()'s method argument setting
was wrong again.
Mon Aug 25 11:53:11 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* sample/ruby-mode.el (ruby-parse-region): auto-indent now
supports "\\" in the strings.
* struct.c (struct_getmember): new API to get member value from C
language side.
Fri Aug 22 14:26:40 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (error_print): modified exception print format.
Thu Aug 21 16:10:58 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* sample/ruby-mode.el (ruby-calculate-indent): wrong indent level
calculated with keyword operators.
Thu Aug 21 11:55:41 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970821
Thu Aug 21 11:36:58 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* parse.y (arg): ary[0] += 1 cause SEGV
Wed Aug 20 14:24:42 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970820
* eval.c (rb_call): infinite loop bug
Tue Aug 19 00:15:38 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970819
* eval.c (rb_call): did not raise ArgumentError if too many
arguments more than optional arguments (without rest arg).
* eval.c (rb_eval): did not work well for op_asgn2 (attribute
self assignment).
Mon Aug 18 09:25:56 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* object.c (inspect_i): did not display T_DATA instance variables.
* parse.y: provides more accurate line number information.
* eval.c (thread_value): include value's backtrace information in
the variable `$@'.
* eval.c (f_abort): print backtrace and exit.
Sat Aug 16 00:17:44 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* object.c (class_s_new): do not make subclass of singleton class.
Fri Aug 15 15:49:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (call_trace_func): block context switch in the trace
function.
* eval.c (rb_eval): clear method cache at class extention.
Fri Aug 15 19:40:43 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* ext/socket/socket.c (Init_socket): small typo caused SEGV.
Tue Aug 12 16:02:18 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* variable.c: option variables: $-0, $-p(readonly), $-v,
$-I(load_path), $-a(readonly), $-K, $-d, $-F, $-i, $-l.
* parse.y (yylex): ignore rd (ruby document) in the code.
Mon Aug 11 12:37:58 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* re.c (Init_Regexp): $-K as alias to the $KCODE.
* io.c (Init_IO): new virtual variable $-i for the value of -i
option.
* enum.c (Init_Enumerable): include? as alias of member?
Fri Aug 8 11:16:50 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* io.c (io_foreach): now the record separator can be specified.
* io.c (io_s_readlines): new method to read in whole file (or
command output) from path.
* ext/socket/socket.c (Init_socket): recvfrom did not work.
* ext/socket/socket.c (sock_send): forgot to check nil for false
value.
Thu Aug 7 11:40:01 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* object.c (Init_Object): remove private_attr/public_attr.
Wed Aug 6 14:21:36 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* object.c (mod_attr): forgot to check nil for false value.
Mon Aug 4 11:50:28 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* variable.c (rb_class_path): scan class constants for anonymous
classes/modules to make up pathes.
Wed Jul 30 08:45:12 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (rb_eval): stop to cache const value in nodes.
Sat Jul 26 03:17:22 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* numeric.c (flo_to_s): wrong .0 at end.
Sat Jul 26 00:36:36 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (error_print): always print exception type in the
toplevel exception handler.
* string.c (str_hash): wrong hash value.
Thu Jul 24 11:05:51 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* string.c (uscore_get): proper error message for unset $_.
Wed Jul 23 09:56:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* object.c (obj_methods): returns list of method names of the
specified object.
* class.c (mod_instance_methods): returns list of method names of
the class instnace.
Fri Jul 11 22:38:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* object.c (class_superclass): returns class's superclass
itself. (1.1)
* object.c (obj_type): returns object's class itself. (1.1)
* class.c (mod_included_modules): list included modules.
* object.c (class_superclass): raises error for Object.
Thu Jul 3 09:54:02 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (SETUP_ARGS): save source position, remove nd_line().
* eval.c (rb_call): replace modulo by bit-masking.
* eval.c (POP_SCOPE): force recycle scope object to reduce gc rate.
* gc.c (obj_free): aboid calling run_final() when no finalizer is set.
* eval.c (PUSH_VARS): do not allocate the dynamic scope's end-mark
object.
Wed Jul 2 14:25:07 1997 KIMURA Koichi <kkimura@pure.cpdc.canon.co.jp>
* Native mswin32 support.
Tue Jul 1 09:59:00 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970701
* parse.y (mrhs): allow rest-star(*) in right hand side.
Tue Jun 24 19:04:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970624
Sat Jun 20 22:22:51 1997 Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
* eval.c: freebsd 3.0 <sys/select.h> support.
Fri Jun 20 01:24:45 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970620
* gc.c: eliminate uninitilalized field of Hash, Array etc., to
avoid dumping core.
Thu Jun 19 01:29:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970619
* string.c (str_split_method): wrong limit.
Sat Jun 14 01:54:16 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* class.c (rb_singleton_class): no singleton for special
constants (now raises exception).
* eval.c (ruby_init): cbase in TOPLEVEL_BINDING need to be
initialized.
Sat Jun 14 01:01:16 1997 maeda shugo <shugo@po.aianet.ne.jp>
* array.c (sort_2): wrong comparison.
Sat Jun 14 00:53:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* hash.c (hash_foreach): safe iteration.
Fri Jun 13 14:04:56 1997 Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
* configure.in: -Bshareable option for netbsd.
Fri Jun 13 01:16:22 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* io.c (pipe_open): call io_unbuffered() only for writable pipes.
Thu Jun 12 01:14:15 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970612
* ext/socket/socket.c (sock_new): use io_unbuffered().
* ext/marshal/marshal.c (w_long): compact long format, which
supports 64 bit architectures (unless longs are >32 bit size).
* ext/marshal/marshal.c: allows recursive data for marshaling.
* parse.y (rb_intern): raise exception for non-internable string.
* ext/marshal/marshal.c (marshal_load): allows direct loading from
strings.
* ext/marshal/marshal.c (marshal_dump): allows direct dump to strings.
* ext/marshal/marshal.c (marshal_dump): interface changed.
Wed Jun 11 18:26:00 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* gc.c (rb_newobj): remove needless memset().
Mon Jun 9 13:03:43 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (rb_eval): reduce condition checks from while/until loop.
* eval.c (rb_eval): wrong jump point for `next'.
Fri Jun 6 11:47:39 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.c (ruby_set_argv): initialize dln_argv0 for dln_a_out.
* ext/socket/socket.c (open_unix): display path name for exceptions.
* ruby.c (proc_options): option -S did not work well.
Fri May 30 02:14:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970530
* eval.c (eval): set $! properly if exception raised in eval().
* io.c (io_write): now handles non T_FILE object.
* io.c (io_defset): $< can be anything which has `write' method.
Thu May 29 15:40:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (eval): $@ is always an array (not string).
* pack.c (pack_unpack): avoid corrupting memory for unexpected
input strings.
Wed May 28 12:46:13 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970528
* process.c (rb_waitpid): do not block other threads.
Tue May 27 12:02:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (ruby_init): split initialize and processing command line
options.
* ruby.c (ruby_options): ruby_init(0, 0, envp) dumps core.
Tue May 20 18:59:45 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* variable.c (rb_ivar_set): invalid instance variable access for
built-in object raises TypeError.
Fri May 16 17:32:21 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970516
* dir.c (push_globs): was freeing non heap pointer.
* gc.c: remove some duplicated prototypes.
* ext/kconv/kconv.c: fix prototypes.
Fri May 9 11:38:59 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970509
* gc.c (obj_free): avoid free(NULL).
* eval.c (rb_check_safe_str): argument missing for TypeError().
Thu May 8 01:14:28 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* file.c (file_s_dirname): need to return "." for path without
slashes.
Wed May 7 19:18:48 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* process.c (f_fork): child processe does not inherit parent's
itimer setting on linux. call setitimer() again in the child
process.
Sat May 3 02:49:43 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ext/curses/curses.c: modified for portability and add to the
standard distribution.
Wed Apr 30 00:34:00 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* file.c (file_s_size): returns 0 for empty files (not FALSE).
Fri Apr 25 02:17:50 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970425
* eval.c (f_load): free unused name-table.
* eval.c (f_load): copy local variable name-table.
* gc.c (obj_free): avoid free(NULL).
* eval.c (rb_eval): forgot to make link from the scope object to
NODE_SCOPE. It may crash the interpreter.
Thu Apr 24 00:35:09 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* random.c (f_srand): save old seed anyway. srand() returns no
value on some systems.
* gc.c (obj_free): avoid double free of the local variable name
table.
* parse.y (top_local_setup): modify realloc to handle offset.
Tue Apr 22 12:58:26 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970422
Thu Apr 17 00:40:51 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* configure.in (rb_cv_bsdpgrp): proper check for BSD
setpgrp/setpgrp.
Wed Apr 16 16:14:02 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (proc_call): proc called in other thread must be orphan.
Tue Apr 15 10:46:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970415
* gc.c (obj_free): NODE_SCOPE marked from SCOPE object.
* gc.c (gc_mark): some nodes marked wrong.
* process.c (proc_getpgrp): wrong argument
Fri Apr 14 18:32:42 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970414
Fri Apr 12 01:20:12 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.h: String pointer changed to unsigned char.
Fri Apr 11 10:27:29 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970411
* Makefile.in: create libruby.a before linking ruby.
* string.c (str_strip_bang): >0x80 characters for isspace().
* eval.c (proc_call): set safe-level temporally
* eval.c (proc_s_new): save safe-level in the proc context.
* eval.c (rb_eval): no class/module extention in safe mode.
Thu Apr 10 02:10:41 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* gc.c (gc_mark): remove some pointer checks for speeding up.
* ruby.c (ruby_options): set $0 temporally for -r option.
* eval.c: built-in security feature.
* gc.c (gc_sweep): do not free nodes during compile.
* parse.y (yycompile): set flag when compiling.
Wed Apr 9 10:19:02 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.c: forgot to include <ctype.h> for isspace().
* file.c: provide S_ISREG for some platforms.
* io.c (Init_IO): added some $< operations.
* lib/ping.rb: check host upness using TCP echo.
Tue Apr 8 00:10:15 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (arg_read): bug with 0 length input.
Mon Apr 7 11:36:16 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ext/fcntl/fcntl.c: module for fcntl constants.
* eval.c (rb_alias): bug when original was an alias.
* parse.y (primary): syntax to access singleton class.
* eval.c (mod_public_method): method's to specify visibitily of
the class methods. make_method_{public,private} removed.
Fri Apr 4 21:43:57 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970404
* gc.c (obj_free): finalizer added for experiment.
Thu Apr 3 02:12:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_schedule): make Fatal rise on main_thread on
deadlocks.
* eval.c (thread_join): raise ThreadError instead of Fatal, in
case of deadlock.
* regex.c (re_compile_fastmap): uninitialized local variable.
* parse.y (parse_regx): new option //[nes] to specify character
code for regexp literals. Last specified code option is valid.
* re.c (reg_s_new): addtional 3rd argument to specify compiled
regexp's character code.
* re.c (reg_new_1): regexp character code can be specified for
each regexp object.
Wed Apr 2 14:51:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_create): handle uncaught throw.
* eval.c (thread_create): halt on some deadlock conditions.
* regex.c (is_in_list): wrong result for non-mbc higher-byte
characters.
* regex.c (re_match): wrong skip for multi-byte characters.
* regex.c (re_compile_fastmap): wrong fastmap in non-mbc mode.
* hash.c (Init_Hash): hash compatible features added to ENV.
Tue Apr 1 15:24:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (obj_extend): remove Object#extend as an iterator which
is in experimental state, since it unveils internal singleton
classes.
Mon Mar 31 14:29:39 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970331
Sun Mar 30 19:40:57 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* parse.y (terms): avoided win32 gcc's optimization bug.
Sat Mar 29 11:21:58 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* struct.c (make_struct): St[val,..] creates new structure.
Fri Mar 28 11:24:51 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (obj_make_private): new method make_method_{public,private}
to change visibility of singleton methods.
* regex.c (re_compile_pattern): enables numeric literal >= 0x80 in
the character class.
* regex.c (re_compile_pattern): enabled numeric literal >= 0x80,
in multibyte mode.
* regex.c (re_compile_fastmap): modified exantn and charset(_not)
to set fastmap for higher bytes properly.
* regex.c (is_in_list): now matches numeric literals.
Thu Mar 27 13:34:20 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* pack.c (pack_unpack): extra null byte after unpacked string.
Wed Mar 26 15:20:34 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* regex.c (re_compile_pattern): register numbers must be fit in a
byte (0 <= regnum <= 0xff).
* regex.c (re_compile_fastmap): forgot to set mbchar map for
charset_not if RE_MBCTYPE is on.
* regex.c (re_compile_pattern): set list bits for multi-byte
characters for \W, \S, \D in range expression.
* object.c (obj_is_kind_of): defined that nil itself is kind of
nil. TRUE is kind of TRUE, FALSE is kind of FALSE likewise.
This change makes `obj.kind_of?(eval(obj.type))' always true.
Tue Mar 25 14:08:43 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* lib/English.rb: provides nicer English alias for the variables.
* parse.y (expr): alias $var1 $var2 makes alias of the global
variable.
Mon Mar 24 18:23:20 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970324
Thu Mar 20 22:04:59 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (mod_modfunc): forget to clear method cache.
Wed Mar 19 17:06:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* parse.y (program): set methods' default private/public status
correctly under eval().
* eval.c (eval): set the_class correctly while evaluating string.
Tue Mar 18 12:23:53 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (eval): yield can be called from eval().
* version 1.0-970318
* parse.y (program): regexp in condition expression should do
matching operation with $_.
* re.c (reg_regsub): wrong substitution.
Fri Mar 14 14:36:28 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* hash.c (hash_invert): returns value to key mapping of the
associative array.
* ext/socket/extconf.rb: set environment variable SOCKS_SERVER to
compile with libsocks.a.
* ext/socket/socket.c (socks_s_open): SOCKSsocket class to access
internet via SOCKS library.
* sprintf.c (f_sprintf): unsigned formats display leading double
dots for imaginary sequence of signed bit to the left.
* sprintf.c (f_sprintf): correct width and precision formatting
for big integers.
* parse.y (yylex): enables negative hex/octal numbers and `_' in
non-decimal numbers.
* sprintf.c (f_sprintf): %u added for unsigned decimal format.
Thu Mar 13 10:24:27 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* sprintf.c (f_sprintf): wrong output for bignums.
* array.c (ary_reverse_each): iterates in reverse order.
* pack.c (pack_unpack): L unpacked signed long.
* io.c (f_backquote): now returns an empty string for no output.
Wed Mar 12 10:20:30 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ext/socks/socks.c: socket module with socks library.
Mon Mar 10 20:44:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* re.c (reg_regsub): \& for substitution. \`, \', and \+ are
avaiable also.
Thu Mar 6 01:47:03 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970306
* sample/rubydb.el (gud): ruby debugger emacs interface
* lib/debug.rb: ruby debugger
* parse.y (exprs): more accurate line number display.
Wed Mar 5 21:31:46 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970305
Tue Mar 4 12:28:32 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.c (proc_options): search through RUBYPATH and PATH for
option -S.
Mon Mar 3 22:44:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_status): returns nil for exception terminated
threads.
* eval.c (thread_value): re-raise exceptions.
Sat Mar 1 00:59:47 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (rb_eval): restore $! value after rescue clause, to
re-raise exceptions correctly.
Fri Feb 28 16:43:38 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970228
Thu Feb 27 11:23:41 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (rb_yield_0): redo raises exception
* eval.c (thread_schedule): bug in interrupt handling by rescue.
Wed Feb 26 00:55:36 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (eval): forgot to restore dynamic local variable
bindings.
Tue Feb 25 11:22:08 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ext/aix_ld.rb: AIX dynamic load support (not tested).
* eval.c (rb_eval): wrong return value for defined? super.
* error.c (exception): more error check.
* re.c (reg_regsub): wrong substitution when sub expanded to null
string.
Fri Feb 21 13:01:47 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970221
* eval.c (f_require): volatile added. register variable was
recycled, so that GC did not mark that variable.
* object.c (Init_Object): forget to mark main object (was mostly
ok, but made trouble with early GC.)
Thu Feb 20 11:50:50 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970220
Thu Feb 20 11:25:50 1997 Yasuo OHBA <jammy@shljapan.co.jp>
* lib/date.rb: update
Thu Feb 20 08:25:57 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* parse.y (yylex): forgot tokfix() before rb_intern().
* lib/tk.rb (TkVariable): give up using trace_var.
Wed Feb 19 00:24:35 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970219
* pack.c (pack_pack): packed by null for A specifier. must be
space filled.
* pack.c (pack_unpack): bug in skipping spaces
* gc.c (xmalloc): garbage collect for every 4 Meg. allocation.
* string.c (str_split_method): limit worked wrong way.
* io.c (io_gets_method): misunderstand 0xff in binary files when
$/ == nil.
* re.c (reg_regsub): re-implement.
* ext/socket/socket.c (thread_connect): remove O_NONBLOCK, which
is not defined on some platform like NeXT.
Mon Feb 17 13:08:30 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970217
* object.c (mod_eqq): === extended for subclass check (to use case
as typecase).
Sat Feb 15 02:07:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* regex.c (re_compile_pattern): wrong match backref at end of pattern.
* io.c (arg_read): now works beyond end of file.
Thu Feb 13 16:21:24 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* parse.y (expr): return/yield now accept normal argument format.
* parse.y (yylex): a star in `yield *x' must not be multiplication
operator.
Wed Feb 12 15:06:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* time.c (time_plus): bug in simple addition.
* eval.c (thread_raise): raise exceptions from outside.
* eval.c (Init_Thread): Thread#alive? -- alias for Thread#status.
Mon Feb 10 00:38:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.h (Data_Make_Struct): rename macros.
Sun Feb 8 11:48:13 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (f_syscall): argument offset was wrong.
Fri Feb 7 18:01:17 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970207
* eval.c: add volatiles to avoid variable crobbering by longjmp().
* eval.c (f_raise): 1st argument can be the GlobalExit object now.
* array.c (ary_unshift): no longer accept more than 2 args.
* eval.c (f_raise): bug if 2nd argument is the exception.
Tue Feb 4 00:37:29 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970204
* eval.c (eval): check compile errors by nerrs.
* eval.c (rb_eval): check syntax error by nerrs, not by the return
value, which may be NULL.
* eval.c (compile): Do not clear errinfo.
Mon Feb 3 10:13:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (obj_extend): move real inclusion to Module#extend_object
to allow redfinition.
* object.c (Init_Object): Kernel class is now Module. Object class
became the true root class.
* object.c (obj_inspect): remove useless buffer.
* hash.c (any_cmp): disable interrupts and context switching.
* st.c: remove ALLOW_INTS to disable interrupt during operations.
Fri Jan 31 22:10:08 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* hash.c (hash_rehash): re-register all key-value.
Thu Jan 30 02:14:49 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (io_reopen): re-implement according to clone() way.
* io.c (io_clone): copy IO object.
* struct.c (struct_eql): compare elements by eql?.
* io.c (io_mode_flags): detect "rb", "wb" etc.
* io.h (FMODE_BINMODE): added.
* ext/socket/socket.c (Init_socket): undef BasicSocket.new
* file.c (Init_File): File.new(path[,mode])
* io.c (Init_IO): IO.new(fd[,mode])
* eval.c (rb_method_boundp): forgot to enable priv argument.
* object.c (Init_Object): remove `=~' from Kernel class.
* ext/socket/socket.c (open_inet): initialize sockaddr before
calling bind(2).
* sample/ruby-mode.el (ruby-calculate-indent): skip comment lines
Wed Jan 29 18:43:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (Init_Thread): DEFER_INTS during initializing threads.
* hash.c (Init_Hash): Hash#eql? checks for object identity.
* eval.c (thread_set_critical): wrong value assigned.
Mon Jan 27 16:10:51 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (io_print): remove print_on().
* eval.c (f_missing): proper error message for undefined method
without argument
Sat Jan 25 23:32:32 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* string.c (str_sub_s): false alert - sub() does not modify string.
* array.c (ary_times): negative multiplication detected
* string.c (str_times): negative multiplication detected
Fri Jan 24 10:51:39 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* time.c (time_arg): month -> 0 == "jan" == "1" == "01", little bit
confusing but wanted to conform japanese style.
* version 1.0-970124
Fri Jan 24 09:52:49 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* util.c (_fixpath): supports SJIS filenames on DJGPP.
Thu Jan 23 16:52:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* README.EXT: update. partially translated into English.
* ext/extmk.rb.in: inherit $LDFLAGS to the final link.
* ext/socket/socket.c (Init_socket): add various constants.
Mon Jan 23 11:40:59 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* eval.c (Init_Thread): allocate main_thread first to avoid crash.
Thu Jan 23 02:09:26 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* gc.c (ObjectSpace): API modified. each_object method will do all
the iteration.
* eval.c (proc_call): wrong return from nested lambda.
* ext/GD/GD.c: debugged.
Wed Jan 22 16:12:25 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970122
* gc.c (gc_mark): forgot to mark match->str.
* ext/GD/GD.c: GD interface module.
* eval.c (PUSH_BLOCK): wrong value pushed as the block level.
Mon Jan 20 14:01:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_run): no context switch in the critical section.
Mon Jan 20 09:40:59 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* utils.c: supports 8+3 filenames
Sat Jan 18 01:23:03 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970118
* regex.c (PATFETCH): need cast to unsigned char.
* io.c (io_ctl): bug in case when arg is not a string.
* lib/tk.rb: forgot that Kernel#type returns the class name now.
* regex.c (re_search): "abc\n" =~ "^$" should not match.
Fri Jan 17 12:31:37 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970117
* ruby.c (ruby_options): constant PLATFORM, which is in the {cpu}-{os}
form, defined.
* configure.in: platform infomation embedded in the interpreter.
* regex.c (re_search): /^$/ did not match to "" by wrong exit condition.
* lib/thread.rb: re-write Mutex/Queue based on Thread.critical.
* eval.c (thread_set_critical): remove Thread.exclusive, add
Thread.critical = TRUE/FALSE instead.
* re.c (reg_search): re-compile pattern if needed
* regex.c (PATFETCH): do translate at compile time
Thu Jan 16 00:49:10 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* gc.c (gc_mark_frame): forgot to mark frame->cbase.
* regex.c (re_compile_pattern): /a$|b)/ causes error.
* regex.c (re_compile_pattern): /(^|b)/ causes error.
* version 1.0-970116
* re.c (Init_Regexp): set RE_CONTEXTUAL_INVALID_OPS flag.
Tue Jan 14 02:09:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (proc_call): Proc#callをイテレータとして呼んだ時に対応
* configure.in: nextstep対応?
* eval.c (rb_eval): a[b]=cで無駄な配列を割り当てない
* eval.c (f_send): イテレータとして呼ばれたらイテレータとしてメソッ
ドを呼ぶ.
* string.c (str_new4): match共有用の生成関数
* re.c (reg_search): matchの実体(文字列)をマッチを行った文字列と
copy-on-writeで共有
* string.c (str_hash): toupperをかける条件が違っていた
* array.c (sort_2): FixnumとStringを特別扱いして高速化
Mon Jan 13 11:03:53 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_create): threadが生成されるまで割込みを設定しない
* eval.c (Init_Thread): 割込みタイミングを100msecに
Sat Jan 11 00:17:05 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* regex.c (re_search): マッチに失敗する場合があった(本当に直ったか?)
* io.c (io_ioctl,io_fcntl): 第2引数を省略可能に
* io.c (io_ioctl,io_fcntl): 戻り値がIOだった.整数(システムコール
の戻り値)を返すようにした.
* io.c (io_ctl): 引数が整数の時に対応
* io.c (io_fcntl): file.cから移動
Fri Jan 10 17:01:47 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970110
* ext/socket/socket.c (thread_connect): open(connect(2))で他の
threadをブロックしないように
* eval.c (thread_create): exitでないときにexitだと思い込む
Mon Jan 6 17:42:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* string.c (str_sub_s): 文字列長より長いoffsetの検出
* regex.c (re_search): 空にマッチするパターン後の$で失敗
Thu Jan 2 16:36:23 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* file.c (file_reopen): Fileのreopen(pathまたはIOで指定).
* io.c (io_reopen): IOのreopen(IOで指定) -- change classつき
Wed Jan 1 11:09:01 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (f_select): timeoutでnilを返す
Fri Dec 27 13:06:44 1996 Yukihiro Matsumoto <matz@caelum.co.jp>
* file.c (file_s_open): サブクラスではそのクラスのインスタンスを返
すように.
Fri Dec 27 08:58:27 1996 ono@isl.nara.sharp.co.jp
* numeric.c (flo_to_s): index()を使わない.strstr()に.
Thu Dec 26 01:34:17 1996 Yukihiro Matsumoto <matz@caelum.co.jp>
* lib/tk.rb: placeが使えるように
* pack.c (endian): マクロDYNAMIC_ENDIANを指定すると実行時にendian
を判定するように.
* eval.c (thread_alloc): 初期化忘れのメンバがあった.
Co-authored-by: EGUCHI Matsumoto <eguchi@shizuokanet.or.jp>
Co-authored-by: EGUCHI Osamu <eguchi@shizuokanet.or.jp>
Co-authored-by: KIMURA Koichi <kkimura@pure.cpdc.canon.co.jp>
Co-authored-by: Katsuyuki Okabe <HGC02147@niftyserve.or.jp>
Co-authored-by: MAEDA shugo <shugo@po.aianet.ne.jp>
Co-authored-by: Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
Co-authored-by: WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
Co-authored-by: Yasuo OHBA <jammy@shljapan.co.jp>
Co-authored-by: maeda shugo <shugo@po.aianet.ne.jp>
Co-authored-by: ono <ono@isl.nara.sharp.co.jp>
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 359 |
1 files changed, 225 insertions, 134 deletions
@@ -23,14 +23,22 @@ VALUE cString; #define STRLEN(s) RSTRING(s)->len +#define STR_FREEZE FL_USER1 +#define STR_TAINT FL_USER2 +VALUE str_taint(); +VALUE str_tainted(); + VALUE str_new(ptr, len) - char *ptr; + UCHAR *ptr; UINT len; { NEWOBJ(str, struct RString); OBJSETUP(str, cString, T_STRING); + if (rb_safe_level() >= 3) { + FL_SET(str, STR_TAINT); + } str->len = len; str->orig = 0; str->ptr = ALLOC_N(char,len+1); @@ -43,7 +51,7 @@ str_new(ptr, len) VALUE str_new2(ptr) - char *ptr; + UCHAR *ptr; { return str_new(ptr, strlen(ptr)); } @@ -59,9 +67,36 @@ str_new3(str) str2->ptr = str->ptr; str2->orig = str; + if (rb_safe_level() >= 3) { + FL_SET(str2, STR_TAINT); + } + return (VALUE)str2; } +VALUE +str_new4(orig) + struct RString *orig; +{ + NEWOBJ(str, struct RString); + OBJSETUP(str, cString, T_STRING); + + str->len = orig->len; + str->ptr = orig->ptr; + if (orig->orig) { + str->orig = orig->orig; + } + else { + orig->orig = str; + str->orig = 0; + } + if (rb_safe_level() >= 3) { + FL_SET(str, STR_TAINT); + } + + return (VALUE)str; +} + #define as_str(str) (struct RString*)obj_as_string(str) static ID pr_str; @@ -77,48 +112,55 @@ obj_as_string(obj) } str = rb_funcall(obj, pr_str, 0); if (TYPE(str) != T_STRING) - return krn_to_s(obj); + return any_to_s(obj); return str; } static VALUE -str_clone(str) - struct RString *str; +str_clone(orig) + struct RString *orig; { - VALUE obj; + VALUE str; - if (str->orig) - obj = str_new3(str->orig); + if (orig->orig) + str = str_new3(orig->orig); else - obj = str_new(str->ptr, str->len); - CLONESETUP(obj, str); - return obj; + str = str_new(orig->ptr, orig->len); + CLONESETUP(str, orig); + return str; } VALUE str_dup(str) struct RString *str; { - return str_new(str->ptr, str->len); + VALUE s = str_new(str->ptr, str->len); + if (str_tainted(str)) s = str_taint(s); + return s; } static VALUE -str_s_new(class, str) +str_s_new(class, orig) VALUE class; - struct RString *str; + struct RString *orig; { - NEWOBJ(str2, struct RString); - OBJSETUP(str2, class, T_STRING); + NEWOBJ(str, struct RString); + OBJSETUP(str, class, T_STRING); - str = as_str(str); - str2->len = str->len; - str2->ptr = ALLOC_N(char, str->len+1); - if (str2->ptr) { - memcpy(str2->ptr, str->ptr, str->len); + orig = as_str(orig); + str->len = orig->len; + str->ptr = ALLOC_N(char, orig->len+1); + if (str->ptr) { + memcpy(str->ptr, orig->ptr, orig->len); } - str2->ptr[str->len] = '\0'; - str2->orig = 0; - return (VALUE)str2; + str->ptr[orig->len] = '\0'; + str->orig = 0; + + if (rb_safe_level() >= 3) { + FL_SET(str, STR_TAINT); + } + + return (VALUE)str; } static VALUE @@ -140,6 +182,8 @@ str_plus(str1, str2) memcpy(str3->ptr+str1->len, str2->ptr, str2->len); str3->ptr[str3->len] = '\0'; + if (str_tainted(str1) || str_tainted(str2)) + return str_taint(str3); return (VALUE)str3; } @@ -149,16 +193,22 @@ str_times(str, times) VALUE times; { struct RString *str2; - int i; + int i, len; - times = NUM2INT(times); + len = NUM2INT(times); + if (len < 0) { + ArgError("negative argument"); + } - str2 = (struct RString*)str_new(0, str->len*times); - for (i=0; i<times; i++) { + str2 = (struct RString*)str_new(0, str->len*len); + for (i=0; i<len; i++) { memcpy(str2->ptr+(i*str->len), str->ptr, str->len); } str2->ptr[str2->len] = '\0'; + if (str_tainted(str)) + return str_taint(str2); + return (VALUE)str2; } @@ -184,7 +234,7 @@ str_substr(str, start, len) return (VALUE)str2; } -VALUE +static VALUE str_subseq(str, beg, end) struct RString *str; int beg, end; @@ -221,14 +271,16 @@ str_subseq(str, beg, end) extern VALUE ignorecase; -#define STR_FREEZE FL_USER1 - void str_modify(str) struct RString *str; { - char *ptr; + UCHAR *ptr; + if (rb_safe_level() >= 5) { + extern VALUE eSecurityError; + Raise(eSecurityError, "cannot change string status"); + } if (FL_TEST(str, STR_FREEZE)) TypeError("can't modify frozen string"); if (!str->orig) return; @@ -250,7 +302,7 @@ str_freeze(str) } static VALUE -str_frozen(str) +str_frozen_p(str) VALUE str; { if (FL_TEST(str, STR_FREEZE)) @@ -268,9 +320,28 @@ str_dup_freezed(str) } VALUE +str_taint(str) + VALUE str; +{ + if (TYPE(str) == T_STRING) { + FL_SET(str, STR_TAINT); + } + return str; +} + +VALUE +str_tainted(str) + VALUE str; +{ + if (FL_TEST(str, STR_TAINT)) + return TRUE; + return FALSE; +} + +VALUE str_resize(str, len) struct RString *str; - UINT len; + int len; { str_modify(str); @@ -287,12 +358,11 @@ str_resize(str, len) VALUE str_cat(str, ptr, len) struct RString *str; - char *ptr; + UCHAR *ptr; UINT len; { - str_modify(str); - if (len > 0) { + str_modify(str); REALLOC_N(str->ptr, char, str->len + len + 1); if (ptr) memcpy(str->ptr + str->len, ptr, len); @@ -316,17 +386,19 @@ str_hash(str) struct RString *str; { int len = str->len; - unsigned char *p = (unsigned char*)str->ptr; + UCHAR *p = str->ptr; int key = 0; if (ignorecase) { while (len--) { - key = key*65599 + *p; + key = key*65599 + toupper(*p); + p++; } } else { while (len--) { - key = key*65599 + toupper(*p); + key = key*65599 + *p; + p++; } } return key; @@ -425,7 +497,7 @@ str_index(str, sub, offset) struct RString *str, *sub; int offset; { - char *s, *e, *p; + UCHAR *s, *e, *p; int len; if (str->len - offset < sub->len) return -1; @@ -472,7 +544,7 @@ str_index_method(argc, argv, str) TypeError("Type mismatch: %s given", rb_class2name(CLASS_OF(sub))); } - if (pos == -1) return FALSE; + if (pos == -1) return Qnil; return INT2FIX(pos); } @@ -485,7 +557,7 @@ str_rindex(argc, argv, str) struct RString *sub; VALUE initpos; int pos, len; - char *s, *sbeg, *t; + UCHAR *s, *sbeg, *t; if (rb_scan_args(argc, argv, "11", &sub, &initpos) == 2) { pos = NUM2INT(initpos); @@ -509,9 +581,9 @@ str_rindex(argc, argv, str) return Qnil; } -static char +static UCHAR succ_char(s) - char *s; + UCHAR *s; { char c = *s; @@ -539,7 +611,7 @@ str_succ(orig) struct RString *orig; { struct RString *str, *str2; - char *sbeg, *s; + UCHAR *sbeg, *s; char c = -1; str = (struct RString*)str_new(orig->ptr, orig->len); @@ -562,6 +634,9 @@ str_succ(orig) } } + if (str_tainted(orig)) + return str_taint(str); + return (VALUE)str; } @@ -708,9 +783,6 @@ str_sub_s(str, pat, val, once) int beg, offset, n; struct re_registers *regs; - val = obj_as_string(val); - str_modify(str); - switch (TYPE(pat)) { case T_REGEXP: break; @@ -724,6 +796,7 @@ str_sub_s(str, pat, val, once) Check_Type(pat, T_REGEXP); } + val = obj_as_string(val); result = str_new(0,0); offset=0; n=0; while ((beg=reg_search(pat, str, offset, 0)) >= 0) { @@ -750,8 +823,11 @@ str_sub_s(str, pat, val, once) if (offset >= STRLEN(str)) break; } if (n == 0) return Qnil; - str_cat(result, str->ptr+offset, str->len-offset); + if (str->len > offset) { + str_cat(result, str->ptr+offset, str->len-offset); + } + if (str_tainted(val)) str_taint(result); return result; } @@ -762,11 +838,15 @@ str_sub_f(str, pat, val, once) VALUE val; int once; { - VALUE result = str_sub_s(str, pat, val, once); + VALUE result; + + str_modify(str); + result = str_sub_s(str, pat, val, once); if (NIL_P(result)) return Qnil; str_resize(str, RSTRING(result)->len); memcpy(str->ptr, RSTRING(result)->ptr, RSTRING(result)->len); + if (str_tainted(result)) str_taint(str); return (VALUE)str; } @@ -785,7 +865,6 @@ str_sub_iter_s(str, pat, once) ArgError("Wrong # of arguments(1 for 2)"); } - str_modify(str); switch (TYPE(pat)) { case T_REGEXP: break; @@ -827,7 +906,9 @@ str_sub_iter_s(str, pat, once) if (offset >= STRLEN(str)) break; } if (n == 0) return Qnil; - str_cat(result, str->ptr+offset, str->len-offset); + if (str->len > offset) { + str_cat(result, str->ptr+offset, str->len-offset); + } return result; } @@ -838,7 +919,10 @@ str_sub_iter_f(str, pat, once) VALUE pat; int once; { - VALUE result = str_sub_iter_s(str, pat, once); + VALUE result; + + str_modify(str); + result = str_sub_iter_s(str, pat, once); if (NIL_P(result)) return Qnil; str_resize(str, RSTRING(result)->len); @@ -989,14 +1073,25 @@ str_gsub(argc, argv, str) } static VALUE +uscore_get() +{ + VALUE line; + + line = lastline_get(); + if (TYPE(line) != T_STRING) { + TypeError("$_ value need to be String"); + } + return line; +} + +static VALUE f_sub_bang(argc, argv) int argc; VALUE *argv; { VALUE pat, val, line; - line = lastline_get(); - Check_Type(line, T_STRING); + line = uscore_get(); if (rb_scan_args(argc, argv, "11", &pat, &val) == 1) { return str_sub_iter_f(line, pat, 1); } @@ -1010,8 +1105,7 @@ f_sub(argc, argv) { VALUE pat, val, line, v; - line = lastline_get(); - Check_Type(line, T_STRING); + line = uscore_get(); if (rb_scan_args(argc, argv, "11", &pat, &val) == 1) { v = str_sub_iter_s(line, pat, 1); } @@ -1032,8 +1126,7 @@ f_gsub_bang(argc, argv) { VALUE pat, val, line; - line = lastline_get(); - Check_Type(line, T_STRING); + line = uscore_get(); if (rb_scan_args(argc, argv, "11", &pat, &val) == 1) { return str_sub_iter_f(line, pat, 0); } @@ -1047,8 +1140,7 @@ f_gsub(argc, argv) { VALUE pat, val, line, v; - line = lastline_get(); - Check_Type(line, T_STRING); + line = uscore_get(); if (rb_scan_args(argc, argv, "11", &pat, &val) == 1) { v = str_sub_iter_s(line, pat, 0); } @@ -1066,7 +1158,7 @@ static VALUE str_reverse_bang(str) struct RString *str; { - char *s, *e, *p; + UCHAR *s, *e, *p; s = str->ptr; e = s + str->len - 1; @@ -1085,7 +1177,7 @@ str_reverse(str) struct RString *str; { VALUE obj = str_new(0, str->len); - char *s, *e, *p; + UCHAR *s, *e, *p; s = str->ptr; e = s + str->len - 1; p = RSTRING(obj)->ptr; @@ -1104,11 +1196,14 @@ str_to_i(str) return str2inum(str->ptr, 10); } +#ifndef atof +double atof(); +#endif + static VALUE str_to_f(str) struct RString *str; { - double atof(); double f = atof(str->ptr); return float_new(f); @@ -1121,15 +1216,14 @@ str_to_s(str) return str; } -static VALUE +VALUE str_inspect(str) struct RString *str; { #define STRMAX 80 - char buf[STRMAX]; - char *p, *pend; - char *b; - int offset; + UCHAR buf[STRMAX]; + UCHAR *p, *pend; + UCHAR *b; p = str->ptr; pend = p + str->len; b = buf; @@ -1144,7 +1238,7 @@ str_inspect(str) } while (p < pend) { - unsigned char c = *p++; + UCHAR c = *p++; if (ismbchar(c) && p < pend) { CHECK(2); *b++ = c; @@ -1214,7 +1308,7 @@ static VALUE str_upcase_bang(str) struct RString *str; { - char *s, *send; + UCHAR *s, *send; str_modify(str); s = str->ptr; send = s + str->len; @@ -1222,7 +1316,7 @@ str_upcase_bang(str) if (islower(*s)) { *s = toupper(*s); } - *s++; + s++; } return (VALUE)str; @@ -1239,7 +1333,7 @@ static VALUE str_downcase_bang(str) struct RString *str; { - char *s, *send; + UCHAR *s, *send; str_modify(str); s = str->ptr; send = s + str->len; @@ -1247,7 +1341,7 @@ str_downcase_bang(str) if (isupper(*s)) { *s = tolower(*s); } - *s++; + s++; } return (VALUE)str; @@ -1264,7 +1358,7 @@ static VALUE str_capitalize_bang(str) struct RString *str; { - char *s, *send; + UCHAR *s, *send; str_modify(str); s = str->ptr; send = s + str->len; @@ -1289,7 +1383,7 @@ static VALUE str_swapcase_bang(str) struct RString *str; { - char *s, *send; + UCHAR *s, *send; str_modify(str); s = str->ptr; send = s + str->len; @@ -1300,7 +1394,7 @@ str_swapcase_bang(str) else if (islower(*s)) { *s = toupper(*s); } - *s++; + s++; } return (VALUE)str; @@ -1313,11 +1407,11 @@ str_swapcase(str) return str_swapcase_bang(str_dup(str)); } -typedef unsigned char *USTR; +typedef UCHAR *USTR; -struct tr { +static struct tr { int gen, now, max; - char *p, *pend; + UCHAR *p, *pend; } trsrc, trrepl; static int @@ -1360,9 +1454,9 @@ tr_trans(str, src, repl, sflag) { struct tr trsrc, trrepl; int cflag = 0; - char trans[256]; + UCHAR trans[256]; int i, c, c0; - char *s, *send, *t; + UCHAR *s, *send, *t; Check_Type(src, T_STRING); trsrc.p = src->ptr; trsrc.pend = trsrc.p + src->len; @@ -1453,7 +1547,7 @@ str_tr(str, src, repl) static void tr_setup_table(str, table) struct RString *str; - char table[256]; + UCHAR table[256]; { struct tr tr; int i, cflag = 0; @@ -1478,8 +1572,8 @@ static VALUE str_delete_bang(str1, str2) struct RString *str1, *str2; { - char *s, *send, *t; - char squeez[256]; + UCHAR *s, *send, *t; + UCHAR squeez[256]; Check_Type(str2, T_STRING); tr_setup_table(str2, squeez); @@ -1511,8 +1605,8 @@ static VALUE tr_squeeze(str1, str2) struct RString *str1, *str2; { - char squeez[256]; - char *s, *send, *t; + UCHAR squeez[256]; + UCHAR *s, *send, *t; char c, save; if (str2) { @@ -1600,6 +1694,8 @@ str_split_method(argc, argv, str) rb_scan_args(argc, argv, "02", &spat, &limit); if (!NIL_P(limit)) { lim = NUM2INT(limit); + if (lim == 0) limit = Qnil; + else if (lim == 1) return ary_new3(1, str); i = 1; } @@ -1631,9 +1727,9 @@ str_split_method(argc, argv, str) result = ary_new(); beg = 0; if (char_sep != 0) { - char *ptr = str->ptr; + UCHAR *ptr = str->ptr; int len = str->len; - char *eptr = ptr + len; + UCHAR *eptr = ptr + len; if (char_sep == ' ') { /* AWK emulation */ int skip = 1; @@ -1651,9 +1747,9 @@ str_split_method(argc, argv, str) else { if (isspace(*ptr)) { ary_push(result, str_substr(str, beg, end-beg)); - if (!NIL_P(limit) && lim <= ++i) break; skip = 1; beg = end + 1; + if (!NIL_P(limit) && lim <= ++i) break; } else { end++; @@ -1665,8 +1761,8 @@ str_split_method(argc, argv, str) for (end = beg = 0; ptr<eptr; ptr++) { if (*ptr == char_sep) { ary_push(result, str_substr(str, beg, end-beg)); - if (!NIL_P(limit) && lim <= ++i) break; beg = end + 1; + if (!NIL_P(limit) && lim <= ++i) break; } end++; } @@ -1687,7 +1783,6 @@ str_split_method(argc, argv, str) else ary_push(result, str_substr(str, beg, 1)); beg = start; - if (!NIL_P(limit) && lim <= ++i) break; } else { start += ismbchar(str->ptr[start])?2:1; @@ -1736,11 +1831,7 @@ f_split(argc, argv) int argc; VALUE *argv; { - VALUE line; - - line = lastline_get(); - Check_Type(line, T_STRING); - return str_split_method(argc, argv, line); + return str_split_method(argc, argv, uscore_get()); } static VALUE @@ -1753,8 +1844,8 @@ str_each_line(argc, argv, str) VALUE rs; int newline; int rslen; - char *p = str->ptr, *pend = p + str->len, *s; - char *ptr = p; + UCHAR *p = str->ptr, *pend = p + str->len, *s; + UCHAR *ptr = p; int len = str->len; VALUE line; @@ -1824,11 +1915,12 @@ str_chop_bang(str) str_modify(str); str->len--; - str->ptr[str->len] = '\0'; - if (str->len > 1 && str->ptr[str->len-1] == '\r') { - str->len--; - str->ptr[str->len] = '\0'; + if (str->ptr[str->len] == '\n') { + if (str->len > 0 && str->ptr[str->len-1] == '\r') { + str->len--; + } } + str->ptr[str->len] = '\0'; return (VALUE)str; } @@ -1844,28 +1936,20 @@ static VALUE f_chop_bang(str) struct RString *str; { - VALUE line; - - line = lastline_get(); - Check_Type(line, T_STRING); - return str_chop_bang(line); + return str_chop_bang(uscore_get()); } static VALUE f_chop() { - VALUE line; - - line = lastline_get(); - Check_Type(line, T_STRING); - return str_chop_bang(str_dup(line)); + return str_chop_bang(str_dup(uscore_get())); } static VALUE str_strip_bang(str) struct RString *str; { - char *s, *t, *e; + UCHAR *s, *t, *e; str_modify(str); @@ -1881,7 +1965,7 @@ str_strip_bang(str) str->len = t-s; if (s > str->ptr) { - char *p = str->ptr; + UCHAR *p = str->ptr; str->ptr = ALLOC_N(char, str->len+1); memcpy(str->ptr, s, str->len); @@ -1994,10 +2078,12 @@ static VALUE str_intern(str) struct RString *str; { + ID id; + if (strlen(str->ptr) != str->len) ArgError("string contains `\0'"); - - return rb_intern(str->ptr)|FIXNUM_FLAG; + id = rb_intern(str->ptr); + return INT2FIX(id); } static VALUE @@ -2008,7 +2094,7 @@ str_sum(argc, argv, str) { VALUE vbits; int bits; - char *p, *pend; + UCHAR *p, *pend; rb_scan_args(argc, argv, "01", &vbits); if (NIL_P(vbits)) bits = 16; @@ -2042,14 +2128,14 @@ str_sum(argc, argv, str) } } -VALUE +static VALUE str_ljust(str, w) struct RString *str; VALUE w; { int width = NUM2INT(w); struct RString *res; - char *p, *pend; + UCHAR *p, *pend; if (str->len >= width) return (VALUE)str; res = (struct RString*)str_new(0, width); @@ -2061,14 +2147,14 @@ str_ljust(str, w) return (VALUE)res; } -VALUE +static VALUE str_rjust(str, w) struct RString *str; VALUE w; { int width = NUM2INT(w); struct RString *res; - char *p, *pend; + UCHAR *p, *pend; if (str->len >= width) return (VALUE)str; res = (struct RString*)str_new(0, width); @@ -2080,14 +2166,14 @@ str_rjust(str, w) return (VALUE)res; } -VALUE +static VALUE str_center(str, w) struct RString *str; VALUE w; { int width = NUM2INT(w); struct RString *res; - char *p, *pend; + UCHAR *p, *pend; int n; if (str->len >= width) return (VALUE)str; @@ -2105,7 +2191,7 @@ str_center(str, w) return (VALUE)res; } -extern VALUE cKernel; +extern VALUE mKernel; extern VALUE mComparable; extern VALUE mEnumerable; @@ -2121,6 +2207,7 @@ Init_String() rb_define_method(cString, "<=>", str_cmp_method, 1); rb_define_method(cString, "==", str_equal, 1); rb_define_method(cString, "===", str_equal, 1); + rb_define_method(cString, "eql?", str_equal, 1); rb_define_method(cString, "hash", str_hash_method, 0); rb_define_method(cString, "+", str_plus, 1); rb_define_method(cString, "*", str_times, 1); @@ -2136,7 +2223,10 @@ Init_String() rb_define_method(cString, "rindex", str_rindex, -1); rb_define_method(cString, "freeze", str_freeze, 0); - rb_define_method(cString, "frozen?", str_frozen, 0); + rb_define_method(cString, "frozen?", str_frozen_p, 0); + + rb_define_method(cString, "taint", str_taint, 0); + rb_define_method(cString, "tainted?", str_tainted, 0); rb_define_method(cString, "to_i", str_to_i, 0); rb_define_method(cString, "to_f", str_to_f, 0); @@ -2159,6 +2249,7 @@ Init_String() rb_define_method(cString, "reverse", str_reverse, 0); rb_define_method(cString, "reverse!", str_reverse_bang, 0); rb_define_method(cString, "concat", str_concat, 1); + rb_define_method(cString, "<<", str_concat, 1); rb_define_method(cString, "crypt", str_crypt, 1); rb_define_method(cString, "intern", str_intern, 0); @@ -2194,16 +2285,16 @@ Init_String() rb_define_method(cString, "sum", str_sum, -1); - rb_define_private_method(cKernel, "sub", f_sub, -1); - rb_define_private_method(cKernel, "gsub", f_gsub, -1); + rb_define_global_function("sub", f_sub, -1); + rb_define_global_function("gsub", f_gsub, -1); - rb_define_private_method(cKernel, "sub!", f_sub_bang, -1); - rb_define_private_method(cKernel, "gsub!", f_gsub_bang, -1); + rb_define_global_function("sub!", f_sub_bang, -1); + rb_define_global_function("gsub!", f_gsub_bang, -1); - rb_define_private_method(cKernel, "chop", f_chop, 0); - rb_define_private_method(cKernel, "chop!", f_chop_bang, 0); + rb_define_global_function("chop", f_chop, 0); + rb_define_global_function("chop!", f_chop_bang, 0); - rb_define_private_method(cKernel, "split", f_split, -1); + rb_define_global_function("split", f_split, -1); pr_str = rb_intern("to_s"); } |