archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 00:54:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

* several backports from 1.9

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2004-02-06 09:28:03 +00:00
parent e8253cceca
commit 70bf6c6754
5 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -143,6 +143,14 @@ Mon Jan 26 15:11:47 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* sample/exyacc.rb: escape '}' to avoid warning. * sample/exyacc.rb: escape '}' to avoid warning.
Mon Jan 26 14:41:46 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/delegate.rb (Delegator::initialize): preserve
singleton_method_added method [ruby-dev:22685]
* lib/delegate.rb (Delegator::initialize): use Kernel::raise
instead of mere raise. [ruby-dev:22681]
Mon Jan 26 12:47:17 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Mon Jan 26 12:47:17 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c: define CONST84 when TCL_MAJOR_VERSION == 7 * ext/tcltklib/tcltklib.c: define CONST84 when TCL_MAJOR_VERSION == 7

4
config.sub vendored
View file

@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. # 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
timestamp='2003-01-03' timestamp='2004-01-28'
# This file is (in principle) common to ALL GNU software. # This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software # The presence of a machine in this file suggests that SOME GNU software
@ -118,7 +118,7 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations. # Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in case $maybe_os in
nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) nto-qnx* | linux-* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;; ;;

5
lib/find.rb
View file

@ -36,7 +36,8 @@ module Find
paths.collect!{|d| d.dup} paths.collect!{|d| d.dup}
while file = paths.shift while file = paths.shift
catch(:prune) do catch(:prune) do
yield file next unless File.exist? file
yield file.dup.taint
begin begin
if File.lstat(file).directory? then if File.lstat(file).directory? then
d = Dir.open(file) d = Dir.open(file)
@ -50,7 +51,7 @@ module Find
else else
f = File.join(file, f) f = File.join(file, f)
end end
paths.unshift f paths.unshift f.untaint
end end
ensure ensure
d.close d.close

2
lib/rexml/encodings/ISO-8859-1.rb
View file

@ -1,6 +1,6 @@
module REXML module REXML
module Encoding module Encoding
@@__REXML_encoding_methods =<<-EOL @@__REXML_encoding_methods =<<-'EOL'
# Convert from UTF-8 # Convert from UTF-8
def encode content def encode content
array_utf8 = content.unpack('U*') array_utf8 = content.unpack('U*')

2
parse.y
View file

@ -384,7 +384,7 @@ stmts : none
} }
| stmts terms stmt | stmts terms stmt
{ {
$$ = block_append($1, $3); $$ = block_append($1, newline_node($3));
} }
| error stmt | error stmt
{ {