Skip to content

Commit

Permalink
Add Enumerator.produce
Browse files Browse the repository at this point in the history
This commit makes the following test pass.
 * test_produce in test/mri/ruby/test_enumerator.rb
 * spec/ruby/core/enumerator/produce_spec.rb

For jruby#6464
  • Loading branch information
k77ch7 committed Jan 23, 2022
1 parent 045a1fe commit 24ceede
Show file tree
Hide file tree
Showing 3 changed files with 123 additions and 0 deletions.
7 changes: 7 additions & 0 deletions core/src/main/java/org/jruby/Ruby.java
Expand Up @@ -468,12 +468,14 @@ private Ruby(RubyInstanceConfig config) {
yielderClass = RubyYielder.createYielderClass(this);
chainClass = RubyChain.createChainClass(this, enumeratorClass);
aseqClass = RubyArithmeticSequence.createArithmeticSequenceClass(this, enumeratorClass);
producerClass = RubyProducer.createProducerClass(this, enumeratorClass);
} else {
enumeratorClass = null;
generatorClass = null;
yielderClass = null;
chainClass = null;
aseqClass = null;
producerClass = null;
}

continuationClass = initContinuation();
Expand Down Expand Up @@ -1988,6 +1990,10 @@ public RubyClass getArithmeticSequence() {
return aseqClass;
}

public RubyClass getProducer() {
return producerClass;
}

public RubyClass getFiber() {
return fiberClass;
}
Expand Down Expand Up @@ -5391,6 +5397,7 @@ public RubyClass getData() {
private final RubyClass generatorClass;
private final RubyClass chainClass;
private final RubyClass aseqClass;
private final RubyClass producerClass;
private final RubyClass arrayClass;
private final RubyClass hashClass;
private final RubyClass rangeClass;
Expand Down
19 changes: 19 additions & 0 deletions core/src/main/java/org/jruby/RubyEnumerator.java
Expand Up @@ -654,4 +654,23 @@ private static JavaSites.FiberSites sites(ThreadContext context) {
public IRubyObject op_plus(ThreadContext context, IRubyObject obj) {
return RubyChain.newChain(context, new IRubyObject[] {this, obj});
}

/** MRI: enumerator_s_produce
*
*/
@JRubyMethod(meta = true, optional = 1)
public static IRubyObject produce(ThreadContext context, IRubyObject recv, IRubyObject[] args, final Block block) {
IRubyObject init;

if (!block.isGiven()) throw context.runtime.newArgumentError("no block given");

if (args.length == 0) {
init = null;
} else {
init = args[0];
}

RubyProducer producer = RubyProducer.newProducer(context, init, block);
return enumeratorizeWithSize(context, producer, "each", RubyProducer::size);
}
}
97 changes: 97 additions & 0 deletions core/src/main/java/org/jruby/RubyProducer.java
@@ -0,0 +1,97 @@
/***** BEGIN LICENSE BLOCK *****
* Version: EPL 2.0/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Eclipse Public
* License Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.eclipse.org/legal/epl-v20.html
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the EPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the EPL, the GPL or the LGPL.
***** END LICENSE BLOCK *****/

package org.jruby;

import org.jruby.anno.JRubyClass;
import org.jruby.anno.JRubyMethod;

import org.jruby.exceptions.StopIteration;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;

/**
* Implements Enumerator::Producer
*/
@JRubyClass(name = "Enumerator::Producer")
public class RubyProducer extends RubyObject {

private IRubyObject init;
private Block producerBlock;

public static RubyClass createProducerClass(Ruby runtime, RubyClass enumeratorModule) {
RubyClass producerc = runtime.defineClassUnder("Producer", runtime.getObject(), RubyProducer::new, enumeratorModule);

producerc.includeModule(runtime.getEnumerable());
producerc.defineAnnotatedMethods(RubyProducer.class);

return producerc;
}

public RubyProducer(Ruby runtime, RubyClass klass) {
super(runtime, klass);
}

public RubyProducer(Ruby runtime, RubyClass klass, IRubyObject init, final Block block) {
super(runtime, klass);
this.init = init;
this.producerBlock = block;
}

public static RubyProducer newProducer(ThreadContext context, IRubyObject init, final Block block) {
return new RubyProducer(context.runtime, context.runtime.getProducer(), init, block);
}

/** MRI: producer_size
*/
public static IRubyObject size(ThreadContext context, RubyProducer self, IRubyObject[] args) {
return RubyNumeric.dbl2num(context.runtime, Double.POSITIVE_INFINITY);
}

@JRubyMethod(rest = true)
public IRubyObject each(ThreadContext context, IRubyObject[] args, final Block block) {
IRubyObject cur;

if (init == null) {
cur = context.nil;
} else {
cur = init;
block.yield(context, cur);
}

for (;;) {
try {
cur = producerBlock.call(context, cur);
block.yield(context, cur);
} catch(StopIteration si) {
break;
}
}

return this;
}
}

0 comments on commit 24ceede

Please sign in to comment.