ruby-changes:16129
From: nobu <ko1@a...>
Date: Sun, 30 May 2010 03:52:50 +0900 (JST)
Subject: [ruby-changes:16129] Ruby:r28085 (trunk, ruby_1_9_2): * removed trailing spaces.
nobu 2010-05-30 03:51:39 +0900 (Sun, 30 May 2010) New Revision: 28085 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28085 Log: * removed trailing spaces. Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/array.c branches/ruby_1_9_2/bignum.c branches/ruby_1_9_2/class.c branches/ruby_1_9_2/enum.c branches/ruby_1_9_2/enumerator.c branches/ruby_1_9_2/error.c branches/ruby_1_9_2/file.c branches/ruby_1_9_2/io.c branches/ruby_1_9_2/object.c branches/ruby_1_9_2/pack.c branches/ruby_1_9_2/proc.c branches/ruby_1_9_2/thread.c branches/ruby_1_9_2/time.c branches/ruby_1_9_2/vm.c branches/ruby_1_9_2/vm_eval.c branches/ruby_1_9_2/vm_insnhelper.c branches/ruby_1_9_2/vm_method.c branches/ruby_1_9_2/vsnprintf.c trunk/ChangeLog trunk/array.c trunk/bignum.c trunk/class.c trunk/enum.c trunk/enumerator.c trunk/error.c trunk/file.c trunk/io.c trunk/object.c trunk/pack.c trunk/proc.c trunk/thread.c trunk/time.c trunk/vm.c trunk/vm_eval.c trunk/vm_insnhelper.c trunk/vm_method.c trunk/vsnprintf.c Index: array.c =================================================================== --- array.c (revision 28084) +++ array.c (revision 28085) @@ -1610,7 +1610,7 @@ } else { VALUE args[3]; - + args[0] = val; args[1] = sep; args[2] = result; @@ -1865,7 +1865,7 @@ return Qnil; } - + /* * call-seq: * ary.rotate!(cnt=1) -> ary Index: time.c =================================================================== --- time.c (revision 28084) +++ time.c (revision 28085) @@ -131,7 +131,7 @@ mul(VALUE x, VALUE y) { if (FIXNUM_P(x) && FIXNUM_P(y)) { -#if HAVE_LONG_LONG && SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG +#if HAVE_LONG_LONG && SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG LONG_LONG ll = (LONG_LONG)FIX2LONG(x) * FIX2LONG(y); if (FIXABLE(ll)) return LONG2FIX(ll); @@ -1362,7 +1362,7 @@ * The year 2037 is not used because * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=522949 * - * #!/usr/bin/ruby + * #!/usr/bin/ruby * * require 'date' * @@ -1373,8 +1373,8 @@ * d = Date.new(y,m,1) * h[m] ||= {} * h[m][d.wday] ||= y - * } - * } + * } + * } * * 1.upto(12) {|m| * print "{" @@ -1405,10 +1405,10 @@ /* * compat_leap_month_table is generated by following program. * - * #!/usr/bin/ruby - * + * #!/usr/bin/ruby + * * require 'date' - * + * * h = {} * 2037.downto(2010) {|y| * 1.upto(12) {|m| @@ -1418,7 +1418,7 @@ * h[m][d.wday] ||= y * } * } - * + * * 2.upto(2) {|m| * 0.upto(6) {|w| * y = h[m][w] @@ -2145,7 +2145,7 @@ * t1 = Time.new(2007,11,1,15,25,0, "+09:00") # JST (Narita) * t2 = Time.new(2007,11,1,12, 5,0, "-05:00") # CDT (Minneapolis) * t3 = Time.new(2007,11,1,13,25,0, "-05:00") # CDT (Minneapolis) - * t4 = Time.new(2007,11,1,16,53,0, "-04:00") # EDT (Charlotte) + * t4 = Time.new(2007,11,1,16,53,0, "-04:00") # EDT (Charlotte) * t5 = Time.new(2007,11,5, 9,24,0, "-05:00") # EST (Charlotte) * t6 = Time.new(2007,11,5,11,21,0, "-05:00") # EST (Detroit) * t7 = Time.new(2007,11,5,13,45,0, "-05:00") # EST (Detroit) @@ -3701,7 +3701,7 @@ * p t.round(9).iso8601(10) #=> "2010-03-30T05:43:25.1234567890Z" * p t.round(10).iso8601(10) #=> "2010-03-30T05:43:25.1234567890Z" * - * t = Time.utc(1999,12,31, 23,59,59) + * t = Time.utc(1999,12,31, 23,59,59) * p((t + 0.4).round.iso8601(3)) #=> "1999-12-31T23:59:59.000Z" * p((t + 0.49).round.iso8601(3)) #=> "1999-12-31T23:59:59.000Z" * p((t + 0.5).round.iso8601(3)) #=> "2000-01-01T00:00:00.000Z" @@ -4258,13 +4258,13 @@ * %C - Century (20 in 2009) * %d - Day of the month (01..31) * %D - Date (%m/%d/%y) - * %e - Day of the month, blank-padded ( 1..31) + * %e - Day of the month, blank-padded ( 1..31) * %F - Equivalent to %Y-%m-%d (the ISO 8601 date format) * %h - Equivalent to %b * %H - Hour of the day, 24-hour clock (00..23) * %I - Hour of the day, 12-hour clock (01..12) * %j - Day of the year (001..366) - * %k - hour, 24-hour clock, blank-padded ( 0..23) + * %k - hour, 24-hour clock, blank-padded ( 0..23) * %l - hour, 12-hour clock, blank-padded ( 0..12) * %L - Millisecond of the second (000..999) * %m - Month of the year (01..12) Index: ChangeLog =================================================================== --- ChangeLog (revision 28084) +++ ChangeLog (revision 28085) @@ -21,8 +21,8 @@ Sun May 30 01:25:48 2010 Masaya Tarui <tarui@r...> - * thread.c (RB_GC_SAVE_MACHINE_CONTEXT): start GC - by switching the thread if gc_stress == true + * thread.c (RB_GC_SAVE_MACHINE_CONTEXT): start GC + by switching the thread if gc_stress == true * gc.c (ruby_gc_stress_start): ditto. @@ -103,7 +103,7 @@ Fri May 28 00:47:16 2010 Masaya Tarui <tarui@r...> - * error.c (rb_bug): suppress the error report dialog if report_bug() + * error.c (rb_bug): suppress the error report dialog if report_bug() is finished successfly. Fri May 28 00:32:25 2010 Yusuke Endoh <mame@t...> @@ -254,7 +254,6 @@ * ext/psych/lib/psych/json/tree_builder.rb: refactor * ext/psych/lib/psych/visitors/json_tree.rb: refactor - Sat May 22 03:53:05 2010 Satoshi Shiba <shiba@r...> @@ -772,7 +771,7 @@ * array.c (rb_ary_fetch, rb_ary_splice, rb_ary_store): Improve IndexError messages [ruby-core:28394] - + * hash.c (rb_hash_fetch_m): Improve KeyError message Sat May 8 13:11:28 2010 Nobuyoshi Nakada <nobu@r...> @@ -1154,21 +1153,21 @@ * 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 Fri Apr 30 04:09:30 2010 NAKAMURA Usaku <usa@r...> @@ -4634,7 +4633,6 @@ * lib/drb/eq.rb: fix circular require in drb. reported by akr. see [ruby-dev:40156] [ruby-core:27661] - Tue Jan 26 19:59:17 2010 NARUSE, Yui <naruse@r...> * ext/zlib/zlib.c (rb_gzfile_s_wrap): add rdoc. [Bug #2656] @@ -4889,7 +4887,6 @@ * test/zlib/test_zlib.rb: corresponding tests [ruby-core:27551] - Tue Jan 19 02:02:32 2010 Yusuke Endoh <mame@t...> * test/ruby/test_array.rb: add some tests (for coverage). @@ -6710,7 +6707,6 @@ * ext/etc/etc.c (etc_each_group): fixed typo. - Wed Oct 28 13:02:10 2009 Shugo Maeda <shugo@r...> * lib/net/ftp.rb (Net::FTP#initialize): sets @binary to true. @@ -8044,7 +8040,6 @@ * tool/instruction.rb (make_footer_stack_val): ditto. - Wed Sep 23 05:03:36 2009 Marc-Andre Lafortune <ruby-core@m...> * proc.c (umethod_bind, rb_mod_define_method): Fix bug that @@ -8468,7 +8463,6 @@ * symbian/configure.bat: fixed harmless error message. - Sun Sep 13 22:18:33 2009 Nobuyoshi Nakada <nobu@r...> * variable.c (rb_mod_remove_const): do not change VM state when an Index: enumerator.c =================================================================== --- enumerator.c (revision 28084) +++ enumerator.c (revision 28085) @@ -22,7 +22,7 @@ * * An enumerator can be created by following methods. * - Kernel#to_enum - * - Kernel#enum_for + * - Kernel#enum_for * - Enumerator.new * * Also, most iteration methods without a block returns an enumerator. @@ -72,7 +72,7 @@ * # convert o.each to an external iterator for * # implementing an internal iterator. * p ext_each(o.to_enum) {|*x| p x; [:b, *x] } - * #=> [], [:b], [1], [:b, 1], [1, 2], [:b, 1, 2], 3 + * #=> [], [:b], [1], [:b, 1], [1, 2], [:b, 1, 2], 3 * */ VALUE rb_cEnumerator; @@ -600,18 +600,18 @@ * * o = Object.new * def o.each - * yield + * yield * yield 1 * yield 1, 2 * end * e = o.to_enum * p e.peek_values #=> [] - * e.next + * e.next * p e.peek_values #=> [1] * p e.peek_values #=> [1] - * e.next + * e.next * p e.peek_values #=> [1, 2] - * e.next + * e.next * p e.peek_values # raises StopIteration * */ @@ -662,10 +662,10 @@ * o = Object.new * def o.each * # (2) - * x = yield + * x = yield * p x #=> "foo" * # (5) - * x = yield + * x = yield * p x #=> nil * # (7) * x = yield @@ -1061,7 +1061,7 @@ * rescue StopIteration * p $!.result #=> 100 * end - * + * */ static VALUE stop_result(VALUE self) Index: vsnprintf.c =================================================================== --- vsnprintf.c (revision 28084) +++ vsnprintf.c (revision 28085) @@ -37,7 +37,7 @@ * paragraph 3 above is now null and void. */ -/* SNPRINTF.C +/* SNPRINTF.C * fjc 7-31-97 Modified by Mib Software to be a standalone snprintf.c module. * http://www.mibsoftware.com * Mib Software does not warrant this software any differently than the @@ -50,7 +50,7 @@ * allow inclusion into libraries with less chance of namespace collisions. * * snprintf should be the only externally visible item. - * + * * As of 7-31-97 FLOATING_POINT is NOT provided. The code is somewhat * non-portable, so it is disabled. */ @@ -84,7 +84,7 @@ # endif # include <varargs.h> #endif -#ifndef _BSD_VA_LIST_ +#ifndef _BSD_VA_LIST_ #define _BSD_VA_LIST_ va_list #endif @@ -408,7 +408,7 @@ break; default: /* oops */ - /* + /* abort(); */ break; /* fjc 7-31-97. Don't reference abort() here */ @@ -473,7 +473,7 @@ break; default: /* oops */ - /* + /* abort(); */ break; /* fjc 7-31-97. Don't reference abort() here */ @@ -824,7 +824,7 @@ ch = (ch == 'g') ? 'e' : 'E'; else ch = 'g'; - } + } if (ch == 'a' || ch == 'A') { --expt; expsize = exponent(expstr, expt, ch + 'p' - 'a'); Index: enum.c =================================================================== --- enum.c (revision 28084) +++ enum.c (revision 28085) @@ -2273,7 +2273,7 @@ * splitted as follows. * * [3,1,4,1,5,9,2,6,5,3,5].chunk {|n| - * n.even? + * n.even? * }.each {|even, ary| * p [even, ary] * } @@ -2305,12 +2305,12 @@ * For example, the sequence of hyphens in svn log can be eliminated as follows. * * sep = "-"*72 + "\n" - * IO.popen("svn log README") {|f| + * IO.popen("svn log README") {|f| * f.chunk {|line| * line != sep || nil * }.each {|_, lines| * pp lines - * } + * } * } * #=> ["r20018 | knu | 2008-10-29 13:20:42 +0900 (Wed, 29 Oct 2008) | 2 lines\n", * # "\n", @@ -2322,7 +2322,7 @@ * # "\n"] * # ... * - * paragraphs separated by empty lines can be parsed as follows. + * paragraphs separated by empty lines can be parsed as follows. * * File.foreach("README").chunk {|line| * /\A\s*\z/ !~ line || nil @@ -2438,7 +2438,7 @@ * * Creates an enumerator for each chunked elements. * The beginnings of chunks are defined by _pattern_ and the block. - * If _pattern_ === _elt_ returns true or + * If _pattern_ === _elt_ returns true or * the block returns true for the element, * the element is beginning of a chunk. * @@ -2471,7 +2471,7 @@ * } * * "svn proplist -R" produces multiline output for each file. - * They can be chunked as follows: + * They can be chunked as follows: * * IO.popen([{"LC_ALL"=>"C"}, "svn", "proplist", "-R"]) {|f| * f.lines.slice_before(/\AProp/).each {|lines| p lines } @@ -2487,7 +2487,7 @@ * For example, three or more consecutive increasing numbers can be squashed * as follows: * - * a = [0,2,3,4,6,7,9] + * a = [0,2,3,4,6,7,9] * prev = a[0] * p a.slice_before {|e| * prev, prev2 = e, prev Index: object.c =================================================================== --- object.c (revision 28084) +++ object.c (revision 28085) @@ -2202,7 +2202,7 @@ * when <i>base</i> is omitted or equals to zero, radix indicators * (<code>0</code>, <code>0b</code>, and <code>0x</code>) are honored. * In any case, strings should be strictly conformed to numeric - * representation. This behavior is different from that of + * representation. This behavior is different from that of * <code>String#to_i</code>. Non string values will be converted using * <code>to_int</code>, and <code>to_i</code>. * Index: io.c =================================================================== --- io.c (revision 28084) +++ io.c (revision 28085) @@ -1176,7 +1176,7 @@ * f.rewind #=> 0 * f.lineno #=> 0 * f.readline #=> "This is line one\n" - * + * * Note that it cannot be used with streams such as pipes, ttys, and sockets. */ Index: pack.c =================================================================== --- pack.c (revision 28084) +++ pack.c (revision 28085) @@ -330,7 +330,7 @@ * s | Integer | 16-bit signed integer, native endian (int16_t) * l | Integer | 32-bit signed integer, native endian (int32_t) * q | Integer | 64-bit signed integer, native endian (int64_t) - * | | + * | | * S_ | Integer | unsigned short, native endian * I, I_ | Integer | unsigned int, native endian * L_ | Integer | unsigned long, native endian @@ -346,7 +346,7 @@ * | | * U | Integer | UTF-8 character * w | Integer | BER-compressed integer - * + * * Float | | * Directive | | Meaning * ------------------------------------------------------------------------ @@ -356,7 +356,7 @@ * e | Float | single-precision float, little-endian byte order * G | Float | double-precision float, network (big-endian) byte order * g | Float | single-precision float, network (big-endian) byte order - * + * * String | | * Directive | | Meaning * ------------------------------------------------------------------------ @@ -373,7 +373,7 @@ * | | (if count is 0, no line feed are added, see RFC 4648) * P | String | pointer to a structure (fixed-length string) * p | String | pointer to a null-terminated string - * + * * Misc. | | * Directive | | Meaning * ------------------------------------------------------------------------ @@ -1258,7 +1258,7 @@ * | | * U | Integer | UTF-8 character * w | Integer | BER-compressed integer (see Array.pack) - * + * * Float | | * Directive | Returns | Meaning * -------------------------------------------------------------- @@ -1268,7 +1268,7 @@ * e | Float | single-precision float, little-endian byte order * G | Float | double-precision float, network (big-endian) byte order * g | Float | single-precision float, network (big-endian) byte order - * + * * String | | * Directive | Returns | Meaning * -------------------------------------------------------------- @@ -1285,7 +1285,7 @@ * | | base64 encoded string (RFC 4648) if followed by 0 * P | String | pointer to a structure (fixed-length string) * p | String | pointer to a null-terminated string - * + * * Misc. | | * Directive | Returns | Meaning * -------------------------------------------------------------- @@ -1554,7 +1554,7 @@ integer_size = QUAD_SIZE; bigendian_p = BIGENDIAN_P(); goto unpack_integer; - + case 'Q': signed_p = 0; integer_size = QUAD_SIZE; Index: vm_eval.c =================================================================== --- vm_eval.c (revision 28084) +++ vm_eval.c (revision 28085) @@ -214,7 +214,7 @@ * \param mid an ID that represents the name of the method * \param argc the number of method arguments * \param argv a pointer to an array of method arguments - * \param scope + * \param scope * \param self self in the caller. Qundef means the current control frame's self. * * \note \a self is used in order to controlling access to protected methods. @@ -429,7 +429,7 @@ * \param mid an ID that represents the name of the method * \param argc the number of method arguments * \param argv a pointer to an array of method arguments - * \param scope + * \param scope */ static inline VALUE rb_call(VALUE recv, ID mid, int argc, const VALUE *argv, call_type scope) Index: proc.c =================================================================== --- proc.c (revision 28084) +++ proc.c (revision 28085) @@ -1332,7 +1332,7 @@ * * Defines a singleton method in the receiver. The _method_ * parameter can be a +Proc+, a +Method+ or an +UnboundMethod+ object. - * If a block is specified, it is used as the method body. + * If a block is specified, it is used as the method body. * * class A * class << self Index: thread.c =================================================================== --- thread.c (revision 28084) +++ thread.c (revision 28085) @@ -3725,7 +3725,7 @@ } static void -rb_threadptr_add_event_hook(rb_thread_t *th, +rb_threadptr_add_event_hook(rb_thread_t *th, rb_event_hook_func_t func, rb_event_flag_t events, VALUE data) { rb_event_hook_t *hook = alloc_event_hook(func, events, data); Index: vm_method.c =================================================================== --- vm_method.c (revision 28084) +++ vm_method.c (revision 28085) @@ -756,7 +756,7 @@ return Qfalse; } return Qtrue; - + } #define VISI_CHECK(x,f) (((x)&NOEX_MASK) == (f)) Index: class.c =================================================================== --- class.c (revision 28084) +++ class.c (revision 28085) @@ -243,7 +243,7 @@ -#define METACLASS_OF(k) RBASIC(k)->klass +#define METACLASS_OF(k) RBASIC(k)->klass /*! * whether k is a meta^(n)-class of Class class @@ -344,7 +344,7 @@ rb_cModule = boot_defclass("Module", rb_cObject); rb_cClass = boot_defclass("Class", rb_cModule); - RBASIC(rb_cClass)->klass + RBASIC(rb_cClass)->klass = RBASIC(rb_cModule)->klass = RBASIC(rb_cObject)->klass = RBASIC(rb_cBasicObject)->klass @@ -419,10 +419,10 @@ /*! * Defines a top-level class. * \param name name of the class - * \param super a class from which the new class will derive. + * \param super a class from which the new class will derive. * NULL means \c Object class. * \return the created class - * \throw TypeError if the constant name \a name is already taken but + * \throw TypeError if the constant name \a name is already taken but * the constant is not a \c Class. * \throw NameError if the class is already defined but the class can not * be reopened because its superclass is not \a super. @@ -465,10 +465,10 @@ * Defines a class under the namespace of \a outer. * \param outer a class which contains the new class. * \param name name of the new class - * \param super a class from which the new class will derive. + * \param super a class from which the new class will derive. * NULL means \c Object class. * \return the created class - * \throw TypeError if the constant name \a name is already taken but + * \throw TypeError if the constant name \a name is already taken but * the constant is not a \c Class. * \throw NameError if the class is already defined but the class can not * be reopened because its superclass is not \a super. @@ -488,10 +488,10 @@ * Defines a class under the namespace of \a outer. * \param outer a class which contains the new class. * \param id name of the new class - * \param super a class from which the new class will derive. + * \param super a class from which the new class will derive. * NULL means \c Object class. * \return the created class - * \throw TypeError if the constant name \a name is already taken but + * \throw TypeError if the constant name \a name is already taken but * the constant is not a \c Class. * \throw NameError if the class is already defined but the class can not * be reopened because its superclass is not \a super. @@ -1019,12 +1019,12 @@ * These API takes a C function as a method body. * * \par Method body functions - * Method body functions must return a VALUE and + * Method body functions must return a VALUE and * can be one of the following form: * <dl> * <dt>Fixed number of parameters</dt> * <dd> - * This form is a normal C function, excepting it takes + * This form is a normal C function, excepting it takes * a receiver object as the first argument. * * \code @@ -1044,7 +1044,7 @@ * <dt>Ruby array style</dt> * <dd> * This form takes two parameters: self and args. - * \a self is the receiver. \a args is an Array object which + * \a self is the receiver. \a args is an Array object which * contains the arguments. * * \code @@ -1118,7 +1118,7 @@ * * \note DO NOT expose the returned singleton class to * outside of class.c. - * Use \ref rb_singleton_class instead for + * Use \ref rb_singleton_class instead for * consistency of the metaclass hierarchy. */ static VALUE @@ -1170,11 +1170,11 @@ * \return the singleton class. * * \post \a obj has its own singleton class. - * \post if \a obj is a class, - * the returned singleton class also has its own + * \post if \a obj is a class, + * the returned singleton class also has its own * singleton class in order to keep consistency of the * inheritance structure of metaclasses. - * \note a new singleton class will be created + * \note a new singleton class will be created * if \a obj does not have it. * \note the singleton classes for nil, true and false are: * NilClass, TrueClass and FalseClass. @@ -1185,7 +1185,7 @@ VALUE klass = singleton_class_of(obj); /* ensures an exposed class belongs to its own eigenclass */ - if (TYPE(obj) == T_CLASS) ENSURE_EIGENCLASS(klass); + if (TYPE(obj) == T_CLASS) ENSURE_EIGENCLASS(klass); return klass; } Index: error.c =================================================================== --- error.c (revision 28084) +++ error.c (revision 28085) @@ -31,7 +31,7 @@ rb_strerrno(int err) { #define defined_error(name, num) if (err == num) return name; -#define undefined_error(name) +#define undefined_error(name) #include "known_errors.inc" #undef defined_error #undef undefined_error Index: vm.c =================================================================== --- vm.c (revision 28084) +++ vm.c (revision 28085) @@ -397,7 +397,7 @@ static int collect_local_variables_in_env(rb_env_t * env, const VALUE ary) { - + while (collect_local_variables_in_iseq(env->block.iseq, ary), env->prev_envval) { GetEnvPtr(env->prev_envval, env); Index: vm_insnhelper.c =================================================================== --- vm_insnhelper.c (revision 28084) +++ vm_insnhelper.c (revision 28085) @@ -448,8 +448,8 @@ } static inline void -vm_setup_method(rb_thread_t *th, rb_control_frame_t *cfp, - VALUE recv, int argc, const rb_block_t *blockptr, VALUE flag, +vm_setup_method(rb_thread_t *th, rb_control_frame_t *cfp, + VALUE recv, int argc, const rb_block_t *blockptr, VALUE flag, const rb_method_entry_t *me) { int opt_pc, i; Index: bignum.c =================================================================== --- bignum.c (revision 28084) +++ bignum.c (revision 28085) @@ -2670,7 +2670,7 @@ return x; } -static VALUE +static VALUE big_fdiv(VALUE x, VALUE y) { #define DBL_BIGDIG ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG) Index: file.c =================================================================== --- file.c (revision 28084) +++ file.c (revision 28085) @@ -3355,7 +3355,7 @@ * * If _dir_string_ is given, it is used as a base directory * for interpreting relative pathname instead of the current directory. - * + * * All components of the pathname must exist when this method is * called. */ @@ -3373,10 +3373,10 @@ * * Returns the real (absolute) pathname of _pathname_ in the actual filesystem. * The real pathname doesn't contain symlinks or useless dots. - * + * * If _dir_string_ is given, it is used as a base directory * for interpreting relative pathname instead of the current directory. - * + * * The last component of the real pathname can be nonexistent. */ static VALUE Index: ruby_1_9_2/array.c =================================================================== --- ruby_1_9_2/array.c (revision 28084) +++ ruby_1_9_2/array.c (revision 28085) @@ -1610,7 +1610,7 @@ } else { VALUE args[3]; - + args[0] = val; args[1] = sep; args[2] = result; @@ -1865,7 +1865,7 @@ return Qnil; } - + /* * call-seq: * ary.rotate!(cnt=1) -> ary Index: ruby_1_9_2/time.c =================================================================== --- ruby_1_9_2/time.c (revision 28084) +++ ruby_1_9_2/time.c (revision 28085) @@ -131,7 +131,7 @@ mul(VALUE x, VALUE y) { if (FIXNUM_P(x) && FIXNUM_P(y)) { -#if HAVE_LONG_LONG && SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG +#if HAVE_LONG_LONG && SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG LONG_LONG ll = (LONG_LONG)FIX2LONG(x) * FIX2LONG(y); if (FIXABLE(ll)) return LONG2FIX(ll); @@ -1362,7 +1362,7 @@ * The year 2037 is not used because * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=522949 * - * #!/usr/bin/ruby + * #!/usr/bin/ruby * * require 'date' * @@ -1373,8 +1373,8 @@ * d = Date.new(y,m,1) * h[m] ||= {} * h[m][d.wday] ||= y - * } - * } + * } + * } * * 1.upto(12) {|m| * print "{" @@ -1405,10 +1405,10 @@ /* * compat_leap_month_table is generated by following program. * - * #!/usr/bin/ruby - * + * #!/usr/bin/ruby + * * require 'date' - * + * * h = {} * 2037.downto(2010) {|y| * 1.upto(12) {|m| @@ -1418,7 +1418,7 @@ * h[m][d.wday] ||= y * } * } - * + * * 2.upto(2) {|m| * 0.upto(6) {|w| * y = h[m][w] @@ -2145,7 +2145,7 @@ * t1 = Time.new(2007,11,1,15,25,0, "+09:00") # JST (Narita) * t2 = Time.new(2007,11,1,12, 5,0, "-05:00") # CDT (Minneapolis) * t3 = Time.new(2007,11,1,13,25,0, "-05:00") # CDT (Minneapolis) - * t4 = Time.new(2007,11,1,16,53,0, "-04:00") # EDT (Charlotte) + * t4 = Time.new(2007,11,1,16,53,0, "-04:00") # EDT (Charlotte) * t5 = Time.new(2007,11,5, 9,24,0, "-05:00") # EST (Charlotte) * t6 = Time.new(2007,11,5,11,21,0, "-05:00") # EST (Detroit) * t7 = Time.new(2007,11,5,13,45,0, "-05:00") # EST (Detroit) @@ -3701,7 +3701,7 @@ * p t.round(9).iso8601(10) #=> "2010-03-30T05:43:25.1234567890Z" * p t.round(10).iso8601(10) #=> "2010-03-30T05:43:25.1234567890Z" * - * t = Time.utc(1999,12,31, 23,59,59) + * t = Time.utc(1999,12,31, 23,59,59) * p((t + 0.4).round.iso8601(3)) #=> "1999-12-31T23:59:59.000Z" * p((t + 0.49).round.iso8601(3)) #=> "1999-12-31T23:59:59.000Z" * p((t + 0.5).round.iso8601(3)) #=> "2000-01-01T00:00:00.000Z" @@ -4258,13 +4258,13 @@ * %C - Century (20 in 2009) * %d - Day of the month (01..31) * %D - Date (%m/%d/%y) - * %e - Day of the month, blank-padded ( 1..31) + * %e - Day of the month, blank-padded ( 1..31) * %F - Equivalent to %Y-%m-%d (the ISO 8601 date format) * %h - Equivalent to %b * %H - Hour of the day, 24-hour clock (00..23) * %I - Hour of the day, 12-hour clock (01..12) * %j - Day of the year (001..366) - * %k - hour, 24-hour clock, blank-padded ( 0..23) + * %k - hour, 24-hour clock, blank-padded ( 0..23) * %l - hour, 12-hour clock, blank-padded ( 0..12) * %L - Millisecond of the second (000..999) * %m - Month of the year (01..12) Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 28084) +++ ruby_1_9_2/ChangeLog (revision 28085) @@ -83,7 +83,7 @@ Fri May 28 00:47:16 2010 Masaya Tarui <tarui@r...> - * error.c (rb_bug): suppress the error report dialog if report_bug() + * error.c (rb_bug): suppress the error report dialog if report_bug() is finished successfly. Thu May 27 23:52:43 2010 NARUSE, Yui <naruse@r...> @@ -211,7 +211,7 @@ Sun May 23 17:29:41 2010 Yuki Sonoda (Yugui) <yugui@y...> - * common.mk (capi): uses a timestamp file to get rid of + * common.mk (capi): uses a timestamp file to get rid of generating twice. Sun May 23 17:48:39 2010 Nobuyoshi Nakada <nobu@r...> @@ -991,21 +991,21 @@ * 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 Fri Apr 30 04:09:30 2010 NAKAMURA Usaku <usa@r...> @@ -4471,7 +4471,6 @@ * lib/drb/eq.rb: fix circular require in drb. reported by akr. see [ruby-dev:40156] [ruby-core:27661] - Tue Jan 26 19:59:17 2010 NARUSE, Yui <naruse@r...> * ext/zlib/zlib.c (rb_gzfile_s_wrap): add rdoc. [Bug #2656] Index: ruby_1_9_2/enumerator.c =================================================================== --- ruby_1_9_2/enumerator.c (revision 28084) +++ ruby_1_9_2/enumerator.c (revision 28085) @@ -22,7 +22,7 @@ * * An enumerator can be created by following methods. * - Kernel#to_enum - * - Kernel#enum_for + * - Kernel#enum_for * - Enumerator.new * * Also, most iteration methods without a block returns an enumerator. @@ -72,7 +72,7 @@ * # convert o.each to an external iterator for * # implementing an internal iterator. * p ext_each(o.to_enum) {|*x| p x; [:b, *x] } - * #=> [], [:b], [1], [:b, 1], [1, 2], [:b, 1, 2], 3 + * #=> [], [:b], [1], [:b, 1], [1, 2], [:b, 1, 2], 3 * */ VALUE rb_cEnumerator; @@ -600,18 +600,18 @@ * * o = Object.new * def o.each - * yield + * yield * yield 1 * yield 1, 2 * end * e = o.to_enum * p e.peek_values #=> [] - * e.next + * e.next * p e.peek_values #=> [1] * p e.peek_values #=> [1] - * e.next + * e.next * p e.peek_values #=> [1, 2] - * e.next + * e.next * p e.peek_values # raises StopIteration * */ @@ -662,10 +662,10 @@ * o = Object.new * def o.each * # (2) - * x = yield + * x = yield * p x #=> "foo" * # (5) - * x = yield + * x = yield * p x #=> nil * # (7) * x = yield @@ -1061,7 +1061,7 @@ * rescue StopIteration * p $!.result #=> 100 * end - * + * */ static VALUE stop_result(VALUE self) Index: ruby_1_9_2/vsnprintf.c =================================================================== --- ruby_1_9_2/vsnprintf.c (revision 28084) +++ ruby_1_9_2/vsnprintf.c (revision 28085) @@ -37,7 +37,7 @@ * paragraph 3 above is now null and void. */ -/* SNPRINTF.C +/* SNPRINTF.C * fjc 7-31-97 Modified by Mib Software to be a standalone snprintf.c module. * http://www.mibsoftware.com * Mib Software does not warrant this software any differently than the @@ -50,7 +50,7 @@ * allow inclusion into libraries with less chance of namespace collisions. * * snprintf should be the only externally visible item. - * + * * As of 7-31-97 FLOATING_POINT is NOT provided. The code is somewhat * non-portable, so it is disabled. */ @@ -84,7 +84,7 @@ # endif # include <varargs.h> #endif -#ifndef _BSD_VA_LIST_ +#ifndef _BSD_VA_LIST_ #define _BSD_VA_LIST_ va_list #endif @@ -408,7 +408,7 @@ break; default: /* oops */ - /* + /* abort(); */ break; /* fjc 7-31-97. Don't reference abort() here */ @@ -473,7 +473,7 @@ break; default: /* oops */ - /* + /* abort(); */ break; /* fjc 7-31-97. Don't reference abort() here */ @@ -824,7 +824,7 @@ ch = (ch == 'g') ? 'e' : 'E'; else ch = 'g'; - } + } if (ch == 'a' || ch == 'A') { --expt; expsize = exponent(expstr, expt, ch + 'p' - 'a'); Index: ruby_1_9_2/enum.c =================================================================== --- ruby_1_9_2/enum.c (revision 28084) +++ ruby_1_9_2/enum.c (revision 28085) @@ -2273,7 +2273,7 @@ * splitted as follows. * * [3,1,4,1,5,9,2,6,5,3,5].chunk {|n| - * n.even? + * n.even? * }.each {|even, ary| * p [even, ary] * } @@ -2305,12 +2305,12 @@ * For example, the sequence of hyphens in svn log can be eliminated as follows. * * sep = "-"*72 + "\n" - * IO.popen("svn log README") {|f| + * IO.popen("svn log README") {|f| * f.chunk {|line| * line != sep || nil * }.each {|_, lines| * pp lines - * } + * } * } * #=> ["r20018 | knu | 2008-10-29 13:20:42 +0900 (Wed, 29 Oct 2008) | 2 lines\n", * # "\n", @@ -2322,7 +2322,7 @@ * # "\n"] * # ... * - * paragraphs separated by empty lines can be parsed as follows. + * paragraphs separated by empty lines can be parsed as follows. * * File.foreach("README").chunk {|line| * /\A\s*\z/ !~ line || nil @@ -2438,7 +2438,7 @@ * * Creates an enumerator for each chunked elements. * The beginnings of chunks are defined by _pattern_ and the block. - * If _pattern_ === _elt_ returns true or + * If _pattern_ === _elt_ returns true or * the block returns true for the element, * the element is beginning of a chunk. * @@ -2471,7 +2471,7 @@ * } * * "svn proplist -R" produces multiline output for each file. - * They can be chunked as follows: + * They can be chunked as follows: * * IO.popen([{"LC_ALL"=>"C"}, "svn", "proplist", "-R"]) {|f| * f.lines.slice_before(/\AProp/).each {|lines| p lines } @@ -2487,7 +2487,7 @@ * For example, three or more consecutive increasing numbers can be squashed * as follows: * - * a = [0,2,3,4,6,7,9] + * a = [0,2,3,4,6,7,9] * prev = a[0] * p a.slice_before {|e| * prev, prev2 = e, prev Index: ruby_1_9_2/object.c =================================================================== --- ruby_1_9_2/object.c (revision 28084) +++ ruby_1_9_2/object.c (revision 28085) @@ -2202,7 +2202,7 @@ * when <i>base</i> is omitted or equals to zero, radix indicators * (<code>0</code>, <code>0b</code>, and <code>0x</code>) are honored. * In any case, strings should be strictly conformed to numeric - * representation. This behavior is different from that of + * representation. This behavior is different from that of * <code>String#to_i</code>. Non string values will be converted using * <code>to_int</code>, and <code>to_i</code>. * Index: ruby_1_9_2/io.c =================================================================== --- ruby_1_9_2/io.c (revision 28084) +++ ruby_1_9_2/io.c (revision 28085) @@ -1176,7 +1176,7 @@ * f.rewind #=> 0 * f.lineno #=> 0 * f.readline #=> "This is line one\n" - * + * * Note that it cannot be used with streams such as pipes, ttys, and sockets. */ Index: ruby_1_9_2/pack.c =================================================================== --- ruby_1_9_2/pack.c (revision 28084) +++ ruby_1_9_2/pack.c (revision 28085) @@ -330,7 +330,7 @@ * s | Integer | 16-bit signed integer, native endian (int16_t) * l | Integer | 32-bit signed integer, native endian (int32_t) * q | Integer | 64-bit signed integer, native endian (int64_t) - * | | + * | | * S_ | Integer | unsigned short, native endian * I, I_ | Integer | unsigned int, native endian * L_ | Integer | unsigned long, native endian @@ -346,7 +346,7 @@ * | | * U | Integer | UTF-8 character * w | Integer | BER-compressed integer - * + * * Float | | * Directive | | Meaning * ------------------------------------------------------------------------ @@ -356,7 +356,7 @@ * e | Float | Single-precision float, little-endian byte order * G | Float | Double-precision float, network (big-endian) byte order * g | Float | Single-precision float, network (big-endian) byte order - * + * * String | | * Directive | | Meaning * ------------------------------------------------------------------------ @@ -373,7 +373,7 @@ * | | (if count is 0, no line feed are added, see RFC 4648) * P | String | Pointer to a structure (fixed-length string) * p | String | Pointer to a null-terminated string - * + * * Misc. | | * Directive | | Meaning * ------------------------------------------------------------------------ @@ -1258,7 +1258,7 @@ * | | * U | Integer | UTF-8 character * w | Integer | BER-compressed integer (see Array.pack) - * + * * Float | | * Directive | Returns | Meaning * -------------------------------------------------------------- @@ -1268,7 +1268,7 @@ * e | Float | Single-precision float, little-endian byte order * G | Float | Double-precision float, network (big-endian) byte order * g | Float | Single-precision float, network (big-endian) byte order - * + * * String | | * Directive | Returns | Meaning * -------------------------------------------------------------- @@ -1285,7 +1285,7 @@ * | | base64-encoded (RFC 4648) if followed by 0 * P | String | Pointer to a structure (fixed-length string) * p | String | Pointer to a null-terminated string - * + * * Misc. | | * Directive | Returns | Meaning * -------------------------------------------------------------- @@ -1554,7 +1554,7 @@ integer_size = QUAD_SIZE; bigendian_p = BIGENDIAN_P(); goto unpack_integer; - + case 'Q': signed_p = 0; integer_size = QUAD_SIZE; Index: ruby_1_9_2/vm_eval.c =================================================================== --- ruby_1_9_2/vm_eval.c (revision 28084) +++ ruby_1_9_2/vm_eval.c (revision 28085) @@ -214,7 +214,7 @@ * \param mid an ID that represents the name of the method * \param argc the number of method arguments * \param argv a pointer to an array of method arguments - * \param scope + * \param scope * \param self self in the caller. Qundef means the current control frame's self. * * \note \a self is used in order to controlling access to protected methods. @@ -429,7 +429,7 @@ * \param mid an ID that represents the name of the method * \param argc the number of method arguments * \param argv a pointer to an array of method arguments - * \param scope + * \param scope */ static inline VALUE rb_call(VALUE recv, ID mid, int argc, const VALUE *argv, call_type scope) Index: ruby_1_9_2/proc.c =================================================================== --- ruby_1_9_2/proc.c (revision 28084) +++ ruby_1_9_2/proc.c (revision 28085) @@ -1332,7 +1332,7 @@ * * Defines a singleton method in the receiver. The _method_ * parameter can be a +Proc+, a +Method+ or an +UnboundMethod+ object. - * If a block is specified, it is used as the method body. + * If a block is specified, it is used as the method body. * * class A * class << self Index: ruby_1_9_2/thread.c =================================================================== --- ruby_1_9_2/thread.c (revision 28084) +++ ruby_1_9_2/thread.c (revision 28085) @@ -3725,7 +3725,7 @@ } static void -rb_threadptr_add_event_hook(rb_thread_t *th, +rb_threadptr_add_event_hook(rb_thread_t *th, rb_event_hook_func_t func, rb_event_flag_t events, VALUE data) { rb_event_hook_t *hook = alloc_event_hook(func, events, data); Index: ruby_1_9_2/vm_method.c =================================================================== --- ruby_1_9_2/vm_method.c (revision 28084) +++ ruby_1_9_2/vm_method.c (revision 28085) @@ -756,7 +756,7 @@ return Qfalse; } return Qtrue; - + } #define VISI_CHECK(x,f) (((x)&NOEX_MASK) == (f)) Index: ruby_1_9_2/class.c =================================================================== --- ruby_1_9_2/class.c (revision 28084) +++ ruby_1_9_2/class.c (revision 28085) @@ -243,7 +243,7 @@ -#define METACLASS_OF(k) RBASIC(k)->klass +#define METACLASS_OF(k) RBASIC(k)->klass /*! * whether k is a meta^(n)-class of Class class @@ -344,7 +344,7 @@ rb_cModule = boot_defclass("Module", rb_cObject); rb_cClass = boot_defclass("Class", rb_cModule); - RBASIC(rb_cClass)->klass + RBASIC(rb_cClass)->klass = RBASIC(rb_cModule)->klass = RBASIC(rb_cObject)->klass = RBASIC(rb_cBasicObject)->klass @@ -419,10 +419,10 @@ /*! * Defines a top-level class. * \param name name of the class - * \param super a class from which the new class will derive. + * \param super a class from which the new class will derive. * NULL means \c Object class. * \return the created class - * \throw TypeError if the constant name \a name is already taken but + * \throw TypeError if the constant name \a name is already taken but * the constant is not a \c Class. * \throw NameError if the class is already defined but the class can not * be reopened because its superclass is not \a super. @@ -465,10 +465,10 @@ * Defines a class under the namespace of \a outer. * \param outer a class which contains the new class. * \param name name of the new class - * \param super a class from which the new class will derive. + * \param super a class from which the new class will derive. * NULL means \c Object class. * \return the created class - * \throw TypeError if the constant name \a name is already taken but + * \throw TypeError if the constant name \a name is already taken but * the constant is not a \c Class. * \throw NameError if the class is already defined but the class can not * be reopened because its superclass is not \a super. @@ -488,10 +488,10 @@ * Defines a class under the namespace of \a outer. * \param outer a class which contains the new class. * \param id name of the new class - * \param super a class from which the new class will derive. + * \param super a class from which the new class will derive. * NULL means \c Object class. * \return the created class - * \throw TypeError if the constant name \a name is already taken but + * \throw TypeError if the constant name \a name is already taken but * the constant is not a \c Class. * \throw NameError if the class is already defined but the class can not * be reopened because its superclass is not \a super. @@ -1019,12 +1019,12 @@ * These API takes a C function as a method body. * * \par Method body functions - * Method body functions must return a VALUE and + * Method body functions must return a VALUE and * can be one of the following form: * <dl> * <dt>Fixed number of parameters</dt> * <dd> - * This form is a normal C function, excepting it takes + * This form is a normal C function, excepting it takes * a receiver object as the first argument. * * \code @@ -1044,7 +1044,7 @@ * <dt>Ruby array style</dt> * <dd> * This form takes two parameters: self and args. - * \a self is the receiver. \a args is an Array object which + * \a self is the receiver. \a args is an Array object which * contains the arguments. * * \code @@ -1118,7 +1118,7 @@ * * \note DO NOT expose the returned singleton class to * outside of class.c. - * Use \ref rb_singleton_class instead for + * Use \ref rb_singleton_class instead for * consistency of the metaclass hierarchy. */ static VALUE @@ -1170,11 +1170,11 @@ * \return the singleton class. * * \post \a obj has its own singleton class. - * \post if \a obj is a class, - * the returned singleton class also has its own + * \post if \a obj is a class, + * the returned singleton class also has its own * singleton class in order to keep consistency of the * inheritance structure of metaclasses. - * \note a new singleton class will be created + * \note a new singleton class will be created * if \a obj does not have it. * \note the singleton classes for nil, true and false are: * NilClass, TrueClass and FalseClass. @@ -1185,7 +1185,7 @@ VALUE klass = singleton_class_of(obj); /* ensures an exposed class belongs to its own eigenclass */ - if (TYPE(obj) == T_CLASS) ENSURE_EIGENCLASS(klass); + if (TYPE(obj) == T_CLASS) ENSURE_EIGENCLASS(klass); return klass; } Index: ruby_1_9_2/error.c =================================================================== --- ruby_1_9_2/error.c (revision 28084) +++ ruby_1_9_2/error.c (revision 28085) @@ -31,7 +31,7 @@ rb_strerrno(int err) { #define defined_error(name, num) if (err == num) return name; -#define undefined_error(name) +#define undefined_error(name) #include "known_errors.inc" #undef defined_error #undef undefined_error Index: ruby_1_9_2/vm.c =================================================================== --- ruby_1_9_2/vm.c (revision 28084) +++ ruby_1_9_2/vm.c (revision 28085) @@ -397,7 +397,7 @@ static int collect_local_variables_in_env(rb_env_t * env, const VALUE ary) { - + while (collect_local_variables_in_iseq(env->block.iseq, ary), env->prev_envval) { GetEnvPtr(env->prev_envval, env); Index: ruby_1_9_2/vm_insnhelper.c =================================================================== --- ruby_1_9_2/vm_insnhelper.c (revision 28084) +++ ruby_1_9_2/vm_insnhelper.c (revision 28085) @@ -448,8 +448,8 @@ } static inline void -vm_setup_method(rb_thread_t *th, rb_control_frame_t *cfp, - VALUE recv, int argc, const rb_block_t *blockptr, VALUE flag, +vm_setup_method(rb_thread_t *th, rb_control_frame_t *cfp, + VALUE recv, int argc, const rb_block_t *blockptr, VALUE flag, const rb_method_entry_t *me) { int opt_pc, i; Index: ruby_1_9_2/bignum.c =================================================================== --- ruby_1_9_2/bignum.c (revision 28084) +++ ruby_1_9_2/bignum.c (revision 28085) @@ -2670,7 +2670,7 @@ return x; } -static VALUE +static VALUE big_fdiv(VALUE x, VALUE y) { #define DBL_BIGDIG ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG) Index: ruby_1_9_2/file.c =================================================================== --- ruby_1_9_2/file.c (revision 28084) +++ ruby_1_9_2/file.c (revision 28085) @@ -3355,7 +3355,7 @@ * * If _dir_string_ is given, it is used as a base directory * for interpreting relative pathname instead of the current directory. - * + * * All components of the pathname must exist when this method is * called. */ @@ -3373,10 +3373,10 @@ * * Returns the real (absolute) pathname of _pathname_ in the actual filesystem. * The real pathname doesn't contain symlinks or useless dots. - * + * * If _dir_string_ is given, it is used as a base directory * for interpreting relative pathname instead of the current directory. - * + * * The last component of the real pathname can be nonexistent. */ static VALUE -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/