rua 0.2.6-mswin32 → 0.3.0-mswin32

data/README.txt

@@ -26,8 +26,9 @@ http://rubyforge.org/frs/?group_id=4845
     
     rua = Rua.new(:all)
     #rua.openlibs(:base, :package, :string)
-    rua.error_handler = lambda do |e|
+    rua.error_handler = lambda do |e, ar|
       p e
+      p ar.to_hash
     end
     
     rua.str = 'xxx'
@@ -85,3 +86,5 @@ http://rubyforge.org/frs/?group_id=4845
     p co.resume('r')
     p co.resume('x', 'y')
     p co.resume('x', 'y')
+    
+    p rua.f.info.to_hash

data/ext/rua.c

@@ -16,7 +16,7 @@ __declspec(dllexport) void Init_rua(void);
 
 #include "rua.h"
 
-#define VERSION "0.2.6"
+#define VERSION "0.3.0"
 #define REF_RBOBJ "self"
 
 static const char *insecure_methods[] = {
@@ -75,7 +75,7 @@ static const char *insecure_methods[] = {
 };
 
 static const int insecure_method_num = sizeof(insecure_methods) / sizeof(char*);
-static VALUE Rua, RuaFunc, RuaThread, RuaError;
+static VALUE Rua, RuaFunc, RuaThread, RuaError, RuaDebug;
 static VALUE s_all, s_base, s_package, s_string, s_table, s_math, s_io, s_debug;
 
 void Init_rua() {
@@ -83,6 +83,7 @@ void Init_rua() {
   RuaFunc = rb_define_class("RuaFunc", rb_cObject);
   RuaThread = rb_define_class("RuaThread", rb_cObject);
   RuaError = rb_define_class("RuaError", rb_eStandardError);
+  RuaDebug = rb_define_class("RuaDebug", rb_cObject);
 
   rb_define_alloc_func(Rua, rua_alloc);
   rb_define_const(Rua, "VERSION", rb_str_new2(VERSION));
@@ -100,13 +101,25 @@ void Init_rua() {
   rb_define_alloc_func(RuaFunc, rua_ref_alloc);
   rb_define_private_method(RuaFunc, "initialize", rua_func_initialize, 0);
   rb_define_method(RuaFunc, "call", rua_func_call, -1);
-  //rb_define_method(RuaFunc, "[]", rua_func_get, 1);
-  //rb_define_method(RuaFunc, "[]=", rua_func_set, 2);
+  rb_define_method(RuaFunc, "info", rua_func_info, 0);
 
   rb_define_alloc_func(RuaThread, rua_ref_alloc);
   rb_define_private_method(RuaThread, "initialize", rua_thread_initialize, 0);
   rb_define_method(RuaThread, "resume", rua_thread_resume, -1);
 
+  rb_define_alloc_func(RuaDebug, rua_debug_alloc);
+  rb_define_private_method(RuaDebug, "initialize", rua_debug_initialize, 0);
+  rb_define_method(RuaDebug, "name", rua_debug_name, 0);
+  rb_define_method(RuaDebug, "namewhat", rua_debug_namewhat, 0);
+  rb_define_method(RuaDebug, "what", rua_debug_what, 0);
+  rb_define_method(RuaDebug, "source", rua_debug_source, 0);
+  rb_define_method(RuaDebug, "currentline", rua_debug_currentline, 0);
+  rb_define_method(RuaDebug, "nups", rua_debug_nups, 0);
+  rb_define_method(RuaDebug, "linedefined", rua_debug_linedefined, 0);
+  rb_define_method(RuaDebug, "lastlinedefined",rua_debug_lastlinedefined, 0);
+  rb_define_method(RuaDebug, "short_src", rua_debug_short_src, 0);
+  rb_define_method(RuaDebug, "to_hash", rua_debug_to_hash, 0);
+
   s_all     = ID2SYM(rb_intern("all"));
   s_base    = ID2SYM(rb_intern("base"));
   s_package = ID2SYM(rb_intern("package"));
@@ -145,7 +158,7 @@ static void rua_free(struct rua *p) {
   free(p);
 }
 
-/*
+/**
  * new Rua instance.
  */
 static VALUE rua_initialize(int argc, VALUE *argv, VALUE self) {
@@ -164,7 +177,7 @@ static VALUE rua_initialize(int argc, VALUE *argv, VALUE self) {
   return Qnil;
 }
 
-/*
+/**
  * open libraries.
  * see http://www.lua.org/manual/5.1/manual.html#5.
  */
@@ -217,7 +230,7 @@ static VALUE rua_openlibs(int argc, VALUE *argv, VALUE self) {
   return Qnil;
 }
 
-/*
+/**
  * evaluates string.
  */
 static VALUE rua_eval(VALUE self, VALUE str) {
@@ -239,7 +252,7 @@ static VALUE rua_eval(VALUE self, VALUE str) {
   return rua_tomultiretval(p->L, pretop, p->R);
 }
 
-/*
+/**
  * set global variable.
  */
 static VALUE rua_get(VALUE self, VALUE key) {
@@ -253,7 +266,7 @@ static VALUE rua_get(VALUE self, VALUE key) {
   return retval;
 }
 
-/*
+/**
  * set global variable.
  */
 static VALUE rua_set(VALUE self, VALUE key, VALUE val) {
@@ -270,7 +283,7 @@ static VALUE rua_set(VALUE self, VALUE key, VALUE val) {
   return Qnil;
 }
 
-/*
+/**
  * get secure flag.
  */
 static VALUE rua_get_secure(VALUE self) {
@@ -280,7 +293,7 @@ static VALUE rua_get_secure(VALUE self) {
   return p->R->secure ? Qtrue : Qfalse;
 }
 
-/*
+/**
  * set secure flag.
  */
 static VALUE rua_set_secure(VALUE self, VALUE secure) {
@@ -300,7 +313,7 @@ static VALUE rua_set_secure(VALUE self, VALUE secure) {
 }
 
 
-/*
+/**
  * get error handler.
  */
 static VALUE rua_get_error_handler(VALUE self) {
@@ -310,7 +323,7 @@ static VALUE rua_get_error_handler(VALUE self) {
   return p->R->error_handler;
 }
 
-/*
+/**
  * set error handler.
  */
 static VALUE rua_set_error_handler(VALUE self, VALUE error_handler) {
@@ -325,7 +338,7 @@ static VALUE rua_set_error_handler(VALUE self, VALUE error_handler) {
   return Qnil;
 }
 
-/*
+/**
  * dispatch Rua#[], Rua#[]=.
  */
 static VALUE rua_method_missing(int argc, VALUE *argv, VALUE self) {
@@ -375,14 +388,14 @@ static void rua_ref_free(struct rua_ref *p) {
 
 // ------------------------------------------------------------------
 
-/*
+/**
  * new RuaFunc instance.
  */
 static VALUE rua_func_initialize(VALUE self) {
   return Qnil;
 }
 
-/*
+/**
  * call Lua function.
  */
 static VALUE rua_func_call(int argc, VALUE *argv, VALUE self) {
@@ -407,28 +420,36 @@ static VALUE rua_func_call(int argc, VALUE *argv, VALUE self) {
   return rua_tomultiretval(p->L, pretop, p->R);
 }
 
-/*
- * set local variable.
+/**
+ * get debug info.
  */
-//static VALUE rua_func_get(VALUE self, VALUE key) {
-//}
+static VALUE rua_func_info(VALUE self) {
+  struct rua_ref *p;
+  VALUE ruadebug;
+  lua_Debug ar;
 
-/*
- * set local variable.
- */
-//static VALUE rua_func_set(VALUE self, VALUE key, VALUE val) {
-//}
+  Data_Get_Struct(self, struct rua_ref, p);
+  lua_rawgeti(p->L, LUA_REGISTRYINDEX, p->ref);
+
+  if (lua_isfunction(p->L, -1) && lua_getinfo(p->L, ">nSlu", &ar)) {
+    ruadebug = rua_toruadebug(&ar);
+  } else {
+    ruadebug = Qnil;
+  }
+
+  return ruadebug;
+}
 
 // ------------------------------------------------------------------
 
-/*
+/**
  * new RuaThread instance.
  */
 static VALUE rua_thread_initialize(VALUE self) {
   return Qnil;
 }
 
-/*
+/**
  * resume Lua coroutine.
  */
 static VALUE rua_thread_resume(int argc, VALUE *argv, VALUE self) {
@@ -461,6 +482,145 @@ static VALUE rua_thread_resume(int argc, VALUE *argv, VALUE self) {
 
 // ------------------------------------------------------------------
 
+static VALUE rua_debug_alloc(VALUE klass) {
+  struct rua_debug *p = ALLOC(struct rua_debug);
+
+  return Data_Wrap_Struct(klass, rua_debug_mark, -1, p);
+}
+
+static void rua_debug_mark(struct rua_debug *p) {
+  rb_gc_mark(p->name);
+  rb_gc_mark(p->namewhat);
+  rb_gc_mark(p->what);
+  rb_gc_mark(p->source);
+  rb_gc_mark(p->currentline);
+  rb_gc_mark(p->nups);
+  rb_gc_mark(p->linedefined);
+  rb_gc_mark(p->lastlinedefined);
+  rb_gc_mark(p->short_src);
+}
+
+/**
+ * new RuaDebug instance.
+ * see http://www.lua.org/manual/5.1/manual.html#lua_Debug.
+ */
+static VALUE rua_debug_initialize(VALUE self) {
+  return Qnil;
+}
+
+/**
+ * get name.
+ */
+static VALUE rua_debug_name(VALUE self) {
+  struct rua_debug *p;
+
+  Data_Get_Struct(self, struct rua_debug, p);
+  return p->name;
+}
+
+/**
+ * get namewhat.
+ */
+static VALUE rua_debug_namewhat(VALUE self) {
+  struct rua_debug *p;
+
+  Data_Get_Struct(self, struct rua_debug, p);
+  return p->namewhat;
+}
+
+/**
+ * get what.
+ */
+static VALUE rua_debug_what(VALUE self) {
+  struct rua_debug *p;
+
+  Data_Get_Struct(self, struct rua_debug, p);
+  return p->what;
+}
+
+/**
+ * get source.
+ */
+static VALUE rua_debug_source(VALUE self) {
+  struct rua_debug *p;
+
+  Data_Get_Struct(self, struct rua_debug, p);
+  return p->source;
+}
+
+/**
+ * get currentline.
+ */
+static VALUE rua_debug_currentline(VALUE self) {
+  struct rua_debug *p;
+
+  Data_Get_Struct(self, struct rua_debug, p);
+  return p->currentline;
+}
+
+/**
+ * get nups.
+ */
+static VALUE rua_debug_nups(VALUE self) {
+  struct rua_debug *p;
+
+  Data_Get_Struct(self, struct rua_debug, p);
+  return p->nups;
+}
+
+/**
+ * get linedefined.
+ */
+static VALUE rua_debug_linedefined(VALUE self) {
+  struct rua_debug *p;
+
+  Data_Get_Struct(self, struct rua_debug, p);
+  return p->linedefined;
+}
+
+/**
+ * get lastlinedefined.
+ */
+static VALUE rua_debug_lastlinedefined(VALUE self) {
+  struct rua_debug *p;
+
+  Data_Get_Struct(self, struct rua_debug, p);
+  return p->lastlinedefined;
+}
+
+/**
+ * get short_src.
+ */
+static VALUE rua_debug_short_src(VALUE self) {
+  struct rua_debug *p;
+
+  Data_Get_Struct(self, struct rua_debug, p);
+  return p->short_src;
+}
+
+/**
+ * convert to hash.
+ */
+static VALUE rua_debug_to_hash(VALUE self) {
+  struct rua_debug *p;
+  VALUE hash;
+
+  Data_Get_Struct(self, struct rua_debug, p);
+  hash = rb_hash_new();
+  rb_hash_aset(hash, ID2SYM(rb_intern("name"))           , p->name);
+  rb_hash_aset(hash, ID2SYM(rb_intern("namewhat"))       , p->namewhat);
+  rb_hash_aset(hash, ID2SYM(rb_intern("what"))           , p->what);
+  rb_hash_aset(hash, ID2SYM(rb_intern("source"))         , p->source);
+  rb_hash_aset(hash, ID2SYM(rb_intern("currentline"))    , p->currentline);
+  rb_hash_aset(hash, ID2SYM(rb_intern("nups"))           , p->nups);
+  rb_hash_aset(hash, ID2SYM(rb_intern("linedefined"))    , p->linedefined);
+  rb_hash_aset(hash, ID2SYM(rb_intern("lastlinedefined")), p->lastlinedefined);
+  rb_hash_aset(hash, ID2SYM(rb_intern("short_src"))      , p->short_src);
+  return hash;
+}
+
+// ------------------------------------------------------------------
+
 static VALUE rua_tomultiretval(lua_State *L, int pretop, struct rua_state *R) {
   VALUE retval;
   int nresults, i;
@@ -689,6 +849,7 @@ static int rua_proc_call(lua_State *L) {
   struct rua_state *R;
   VALUE proc, args, last, retval, errargs;
   int i, n, status;
+  lua_Debug ar;
 
   proc = (VALUE) lua_touserdata(L, lua_upvalueindex(1));
   R = (struct rua_state *) lua_touserdata(L, lua_upvalueindex(2));
@@ -712,6 +873,11 @@ static int rua_proc_call(lua_State *L) {
     if (rua_obj_is_executable(R->error_handler)) {
       errargs = rb_ary_new();
       rb_ary_push(errargs, ruby_errinfo);
+
+      if (lua_getstack(L, 0, &ar) && lua_getinfo(L, "nSlu", &ar)) {
+        rb_ary_push(errargs, rua_toruadebug(&ar));
+      }
+
       rb_ary_push(errargs, R->error_handler);
       retval = rb_protect(_rua_proc_call, errargs, &status);
 
@@ -765,6 +931,24 @@ static VALUE rua_toruaobj(VALUE klass, lua_State *L, int idx, struct rua_state *
   return ruaobj;
 }
 
+static VALUE rua_toruadebug(lua_Debug *ar) {
+  struct rua_debug *p;
+  VALUE ruadebug;
+
+  ruadebug = rb_funcall(RuaDebug, rb_intern("new"), 0);
+  Data_Get_Struct(ruadebug, struct rua_debug, p);
+  p->name            = ar->name ? rb_str_new2(ar->name) : Qnil;
+  p->namewhat        = ar->namewhat ? rb_str_new2(ar->namewhat) : Qnil;
+  p->what            = ar->what ? rb_str_new2(ar->what) : Qnil;
+  p->source          = ar->source ? rb_str_new2(ar->source) : Qnil;
+  p->currentline     = INT2NUM(ar->currentline);
+  p->nups            = INT2NUM(ar->nups);
+  p->linedefined     = INT2NUM(ar->linedefined);
+  p->lastlinedefined = INT2NUM(ar->lastlinedefined);
+  p->short_src       = ar->short_src ? rb_str_new2(ar->short_src) : Qnil;
+  return ruadebug;
+}
+
 static VALUE rua_obj_is_executable(VALUE obj) {
   return (rb_obj_is_kind_of(obj, rb_cProc) || rb_obj_is_kind_of(obj, rb_cMethod));
 }

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
+rubygems_version: 0.9.2
 specification_version: 1
 name: rua
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
-date: 2007-11-23 00:00:00 +09:00
+  version: 0.3.0
+date: 2007-11-24 00:00:00 +09:00
 summary: Rua is a library for using Lua under Ruby.
 require_paths: 
 - lib/i386-mswin32