@@ -24,6 +24,6 @@ RubyValue eval_hook(RubyEnvironment &_e, linked_ptr<Binding> _binding, RubyValue Reader reader(iss); Context *c = new Context(_binding); - return process(_e, reader, c); + return process(_e, reader, c, NULL); } ruby/eval.cpp @@ -49,7 +49,7 @@ int irb(int, char **) std::istringstream iss(bytecode.str()); Reader reader(iss); - RubyValue result = process(e, reader, c); + RubyValue result = process(e, reader, c, NULL); std::cout << "=> "; RubyValue inspection = result.call(c->binding, "inspect"); std::cout << dynamic_cast<RubyString *>(inspection.object)->string_value ruby/irb.cpp @@ -24,7 +24,7 @@ int twophase(int, char **) Reader reader(iss); Context *c = new Context(e, RubyValue::from_object(e.main)); - process(e, reader, c); + process(e, reader, c, NULL); return 0; } ruby/twophase.cpp @@ -43,10 +43,30 @@ RubyValue Block::call(linked_ptr<Binding> &_b, const std::vector<RubyValue> &_ar for (unsigned int i = given_args_to_add; i < this->args.size(); ++i) c->assign(this->args[i], _b->environment.NIL); - RubyValue ret_val = process(_b->environment, r, c); + RubyValue ret_val = process(_b->environment, r, c, NULL); delete c; return ret_val; } +RubyValue Block::call(linked_ptr<Binding> &_b, const std::vector<RubyValue> &_args, Block &_block) +{ + std::istringstream iss(this->code); + Reader r = Reader(iss); + + Context *c = new Context(_b->environment, _b->context); + + unsigned int given_args_to_add = std::min(this->args.size(), _args.size()); + for (unsigned int i = 0; i < given_args_to_add; ++i) + c->assign(this->args[i], _args[i]); + + for (unsigned int i = given_args_to_add; i < this->args.size(); ++i) + c->assign(this->args[i], _b->environment.NIL); + + RubyValue ret_val = process(_b->environment, r, c, &_block); + + delete c; + return ret_val; +} + vm/block.cpp @@ -6,7 +6,7 @@ int main(int argc, char **argv) Reader r(std::cin); Context *c = new Context(e, RubyValue::from_object(e.main)); - process(e, r, c); + process(e, r, c, NULL); return 0; } vm/main.cxx @@ -5,7 +5,7 @@ #include "rnumeric.h" #include "rmethod.h" -RubyValue process(RubyEnvironment &e, Reader &r, Context *context) +RubyValue process(RubyEnvironment &e, Reader &r, Context *context, Block *yield_block) { Stack s; RubyValue last_value = e.NIL; @@ -100,10 +100,18 @@ RubyValue process(RubyEnvironment &e, Reader &r, Context *context) } case I_YIELD: { - std::cerr << "YIELD" << std::endl; + if (!yield_block) { + std::cerr << "I_YIELD: LocalJumpError: no block given" << std::endl; // XXX LocalJumpError + throw; + } uint32 arg_count = r.read_uint32(); - std::cerr << arg_count << " arg(s)" << std::endl; + + std::vector<RubyValue> arguments; + while (arg_count--) + arguments.push_back(s.pop_value(context)); + + last_value = yield_block->call(context->binding, arguments); break; } vm/process.cpp @@ -6,6 +6,6 @@ #include "reader.h" #include "context.h" -RubyValue process(RubyEnvironment &, Reader &, Context *); +RubyValue process(RubyEnvironment &, Reader &, Context *, Block *); #endif vm/process.h @@ -17,7 +17,7 @@ void RubyNumericEI::init(RubyEnvironment &_e) { // TODO: the whole Numeric, Fixnum, Bignum, etc. class hierarchy. RubyClass *rb_cFixnum = RubyClass::create_class(_e, "Fixnum"); - // TODO: undefine Fixnum's `new'? + // TODO: undefine Fixnum's `new'? or just redefine Numeric#new to throw a method not found error? rb_cFixnum->add_method("+", RubyMethod::Create(fixnum_add, 1)); rb_cFixnum->add_method("*", RubyMethod::Create(fixnum_multiply, 1)); vm/rnumeric.cpp 1044fbfddd6e3b67075a4e996bfc0ba7a6e7b505 Arlen Cuss celtic@sairyx.org http://github.com/celtic/rubyex/commit/11cd81b8a67665f4ef4f799bf30a7e4d8ae9d985 11cd81b8a67665f4ef4f799bf30a7e4d8ae9d985 2008-08-21T23:49:29-07:00 2008-08-21T23:49:29-07:00 Implementing I_YIELD. 97d721d64f15c437f168f23ba850830d7bf9621b Arlen Cuss celtic@sairyx.org