diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 01:01:48 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 01:01:48 +0000 |
| commit | 2dab996c6072f86c41c624dbdd584f5d2de39438 (patch) | |
| tree | 72591c2f9b9f614971b2ec553b1841c254ec20ff | |
| parent | 35aefacb16017be8065a84b17262419fe4072ea2 (diff) | |
merges r20604 from trunk into ruby_1_9_1.
* enumerator.c (enumerator_next): Fix a typo: s/rewinded/rewound/.
* lib/prime.rb (Prime::OldCompatibility#each): Ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | enumerator.c | 2 | ||||
| -rw-r--r-- | lib/prime.rb | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Wed Dec 10 12:46:52 2008 Akinori MUSHA <knu@iDaemons.org> + + * enumerator.c (enumerator_next): Fix a typo: s/rewinded/rewound/. + + * lib/prime.rb (Prime::OldCompatibility#each): Ditto. + Wed Dec 10 11:25:53 2008 NARUSE, Yui <naruse@ruby-lang.org> * re.c (rb_reg_initialize): raise RegexpError when encoding diff --git a/enumerator.c b/enumerator.c index 60b2a55cb8..38b6791503 100644 --- a/enumerator.c +++ b/enumerator.c @@ -498,7 +498,7 @@ next_init(VALUE obj, struct enumerator *e) * * Returns the next object in the enumerator, and move the internal * position forward. When the position reached at the end, internal - * position is rewinded then StopIteration is raised. + * position is rewound then StopIteration is raised. * * Note that enumeration sequence by next method does not affect other * non-external enumeration methods, unless underlying iteration diff --git a/lib/prime.rb b/lib/prime.rb index dd1190a0c7..0c60695c6c 100644 --- a/lib/prime.rb +++ b/lib/prime.rb @@ -450,7 +450,7 @@ class Prime # Overwrites Prime#each. # # Iterates the given block over all prime numbers. Note that enumeration starts from - # the current position of internal pointer, not rewinded. + # the current position of internal pointer, not rewound. def each(&block) return @generator.dup unless block_given? loop do |