summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mrbgems/mruby-binding/mrbgem.rake7
-rw-r--r--mrbgems/mruby-binding/mrblib/binding.rb5
-rw-r--r--mrbgems/mruby-binding/src/binding.c46
-rw-r--r--mrbgems/mruby-binding/test/binding.rb17
-rw-r--r--mrbgems/mruby-eval/src/eval.c37
-rw-r--r--mrbgems/mruby-eval/test/eval.rb2
6 files changed, 102 insertions, 12 deletions
diff --git a/mrbgems/mruby-binding/mrbgem.rake b/mrbgems/mruby-binding/mrbgem.rake
new file mode 100644
index 000000000..1dbc768de
--- /dev/null
+++ b/mrbgems/mruby-binding/mrbgem.rake
@@ -0,0 +1,7 @@
+MRuby::Gem::Specification.new('mruby-binding') do |spec|
+ spec.license = 'MIT'
+ spec.author = 'mruby developers'
+ spec.summary = 'Binding class'
+
+ spec.add_dependency('mruby-eval', :core => 'mruby-eval')
+end
diff --git a/mrbgems/mruby-binding/mrblib/binding.rb b/mrbgems/mruby-binding/mrblib/binding.rb
new file mode 100644
index 000000000..b07480db1
--- /dev/null
+++ b/mrbgems/mruby-binding/mrblib/binding.rb
@@ -0,0 +1,5 @@
+class Binding
+ def eval(expr, *args)
+ Kernel.eval(expr, self, *args)
+ end
+end
diff --git a/mrbgems/mruby-binding/src/binding.c b/mrbgems/mruby-binding/src/binding.c
new file mode 100644
index 000000000..4899dcc20
--- /dev/null
+++ b/mrbgems/mruby-binding/src/binding.c
@@ -0,0 +1,46 @@
+#include "mruby.h"
+#include "mruby/array.h"
+#include "mruby/hash.h"
+#include "mruby/proc.h"
+#include "mruby/variable.h"
+
+mrb_value proc_local_variables(mrb_state *mrb, struct RProc *proc);
+
+static mrb_value
+binding_local_variables(mrb_state *mrb, mrb_value self)
+{
+ struct RProc *proc = mrb_proc_ptr(mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "proc")));
+ return proc_local_variables(mrb, proc);
+}
+
+static mrb_value
+mrb_f_binding(mrb_state *mrb, mrb_value self)
+{
+ struct RObject *obj;
+ mrb_value binding;
+ struct RProc *proc;
+ mrb_int i;
+
+ obj = (struct RObject*)mrb_obj_alloc(mrb, MRB_TT_OBJECT, mrb_class_get(mrb, "Binding"));
+ binding = mrb_obj_value(obj);
+ proc = mrb->c->ci[-1].proc;
+ mrb_iv_set(mrb, binding, mrb_intern_lit(mrb, "proc"), mrb_obj_value(proc));
+ mrb_iv_set(mrb, binding, mrb_intern_lit(mrb, "recv"), self);
+ return binding;
+}
+
+void
+mrb_mruby_binding_gem_init(mrb_state *mrb)
+{
+ struct RClass *binding = mrb_define_class(mrb, "Binding", mrb->object_class);
+ mrb_undef_class_method(mrb, binding, "new");
+
+ mrb_define_method(mrb, mrb->kernel_module, "binding", mrb_f_binding, MRB_ARGS_NONE());
+
+ mrb_define_method(mrb, binding, "local_variables", binding_local_variables, MRB_ARGS_NONE());
+}
+
+void
+mrb_mruby_binding_gem_final(mrb_state *mrb)
+{
+}
diff --git a/mrbgems/mruby-binding/test/binding.rb b/mrbgems/mruby-binding/test/binding.rb
new file mode 100644
index 000000000..3bed9b31e
--- /dev/null
+++ b/mrbgems/mruby-binding/test/binding.rb
@@ -0,0 +1,17 @@
+assert("Kernel.#binding") do
+ assert_kind_of Binding, binding
+end
+
+assert("Binding#local_variables") do
+ block = Proc.new do |a|
+ b = 1
+ binding
+ end
+ assert_equal [:a, :b, :block], block.call(0).local_variables
+end
+
+assert("Binding#eval") do
+ b = nil
+ 1.times { x, y, z = 1, 2, 3; [x,y,z]; b = binding }
+ assert_equal([1, 2, 3], b.eval("[x, y, z]"))
+end
diff --git a/mrbgems/mruby-eval/src/eval.c b/mrbgems/mruby-eval/src/eval.c
index 08ef8d937..89a2b3b10 100644
--- a/mrbgems/mruby-eval/src/eval.c
+++ b/mrbgems/mruby-eval/src/eval.c
@@ -6,6 +6,7 @@
#include <mruby/opcode.h>
#include <mruby/error.h>
#include <mruby/presym.h>
+#include <mruby/variable.h>
struct REnv *mrb_env_new(mrb_state *mrb, struct mrb_context *c, mrb_callinfo *ci, int nstacks, mrb_value *stack, struct RClass *tc);
mrb_value mrb_exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p);
@@ -18,13 +19,24 @@ create_proc_from_string(mrb_state *mrb, const char *s, mrb_int len, mrb_value bi
{
mrbc_context *cxt;
struct mrb_parser_state *p;
- struct RProc *proc;
+ struct RProc *proc, *scope;
struct REnv *e;
mrb_callinfo *ci; /* callinfo of eval caller */
struct RClass *target_class = NULL;
+ struct mrb_context *c = mrb->c;
+ mrb_bool is_binding = FALSE;
if (!mrb_nil_p(binding)) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "Binding of eval must be nil.");
+ if (!mrb_class_defined(mrb, "Binding")
+ || !mrb_obj_is_kind_of(mrb, binding, mrb_class_get(mrb, "Binding"))) {
+ mrb_raisef(mrb, E_TYPE_ERROR, "wrong argument type %S (expected binding)",
+ mrb_obj_value(mrb_obj_class(mrb, binding)));
+ }
+ scope = mrb_proc_ptr(mrb_iv_get(mrb, binding, mrb_intern_lit(mrb, "proc")));
+ is_binding = TRUE;
+ }
+ else {
+ scope = c->ci[-1].proc;
}
cxt = mrbc_context_new(mrb);
@@ -33,7 +45,7 @@ create_proc_from_string(mrb_state *mrb, const char *s, mrb_int len, mrb_value bi
mrbc_filename(mrb, cxt, file ? file : "(eval)");
cxt->capture_errors = TRUE;
cxt->no_optimize = TRUE;
- ci = (mrb->c->ci > mrb->c->cibase) ? mrb->c->ci - 1 : mrb->c->cibase;
+ ci = (c->ci > c->cibase) ? c->ci - 1 : c->cibase;
cxt->upper = ci->proc && MRB_PROC_CFUNC_P(ci->proc) ? NULL : ci->proc;
p = mrb_parse_nstring(mrb, s, len, cxt);
@@ -70,28 +82,28 @@ create_proc_from_string(mrb_state *mrb, const char *s, mrb_int len, mrb_value bi
mrbc_context_free(mrb, cxt);
mrb_raise(mrb, E_SCRIPT_ERROR, "codegen error");
}
- if (mrb->c->ci > mrb->c->cibase) {
- ci = &mrb->c->ci[-1];
+ if (c->ci > c->cibase) {
+ ci = &c->ci[-1];
}
else {
- ci = mrb->c->cibase;
+ ci = c->cibase;
}
- if (ci->proc) {
- target_class = MRB_PROC_TARGET_CLASS(ci->proc);
+ if (scope) {
+ target_class = MRB_PROC_TARGET_CLASS(scope);
}
- if (ci->proc && !MRB_PROC_CFUNC_P(ci->proc)) {
+ if (scope && !MRB_PROC_CFUNC_P(scope)) {
if ((e = mrb_vm_ci_env(ci)) != NULL) {
/* do nothing, because e is assigned already */
}
else {
- e = mrb_env_new(mrb, mrb->c, ci, ci->proc->body.irep->nlocals, ci->stack, target_class);
+ e = mrb_env_new(mrb, c, ci, scope->body.irep->nlocals, ci->stack, target_class);
ci->u.env = e;
}
proc->e.env = e;
proc->flags |= MRB_PROC_ENVSET;
mrb_field_write_barrier(mrb, (struct RBasic*)proc, (struct RBasic*)e);
}
- proc->upper = ci->proc;
+ proc->upper = scope;
mrb_vm_ci_target_class_set(mrb->c->ci, target_class);
/* mrb_codedump_all(mrb, proc); */
@@ -133,6 +145,9 @@ f_eval(mrb_state *mrb, mrb_value self)
mrb_get_args(mrb, "s|ozi", &s, &len, &binding, &file, &line);
proc = create_proc_from_string(mrb, s, len, binding, file, line);
+ if (!mrb_nil_p(binding)) {
+ self = mrb_iv_get(mrb, binding, mrb_intern_lit(mrb, "recv"));
+ }
mrb_assert(!MRB_PROC_CFUNC_P(proc));
return exec_irep(mrb, self, proc);
}
diff --git a/mrbgems/mruby-eval/test/eval.rb b/mrbgems/mruby-eval/test/eval.rb
index 639ed68f9..e95171223 100644
--- a/mrbgems/mruby-eval/test/eval.rb
+++ b/mrbgems/mruby-eval/test/eval.rb
@@ -44,7 +44,7 @@ assert('Kernel#eval', '15.3.1.3.12') do
end
assert('rest arguments of eval') do
- assert_raise(ArgumentError) { Kernel.eval('0', 0, 'test', 0) }
+ assert_raise(TypeError) { Kernel.eval('0', 0, 'test', 0) }
assert_equal ['test', 'test.rb', 10] do
Kernel.eval('[\'test\', __FILE__, __LINE__]', nil, 'test.rb', 10)
end
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-17 14:24:09 +0000