From a374a839cefb99a08afa009a22d9eb1df1613bec Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Tue, 3 Jul 2018 22:07:14 +0200
Subject: [PATCH] [DEV] remote _userdate()

---
 rabbit/Object.hpp         |  1 -
 rabbit/VirtualMachine.cpp |  2 +-
 rabbit/sqapi.cpp          | 16 ++++++++--------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/rabbit/Object.hpp b/rabbit/Object.hpp
index a1258e1..9d65d6d 100644
--- a/rabbit/Object.hpp
+++ b/rabbit/Object.hpp
@@ -149,7 +149,6 @@ namespace rabbit {
 	#define is_delegable(t) (sq_type(t)&SQOBJECT_DELEGABLE)
 	#define raw_type(obj) _RAW_TYPE((obj)._type)
 	
-	#define _userdata(obj) ((obj)._unVal.pUserData)
 	#define _userpointer(obj) ((obj)._unVal.pUserPointer)
 	#define _thread(obj) ((obj)._unVal.pThread)
 	#define _funcproto(obj) ((obj)._unVal.pFunctionProto)
diff --git a/rabbit/VirtualMachine.cpp b/rabbit/VirtualMachine.cpp
index 720d6fd..d506fad 100644
--- a/rabbit/VirtualMachine.cpp
+++ b/rabbit/VirtualMachine.cpp
@@ -1793,7 +1793,7 @@ void rabbit::VirtualMachine::dumpstack(int64_t stackbase,bool dumpall)
 		case rabbit::OT_ARRAY:		  printf("ARRAY %p",obj.toArray());break;
 		case rabbit::OT_CLOSURE:		printf("CLOSURE [%p]",obj.toClosure());break;
 		case rabbit::OT_NATIVECLOSURE:  printf("NATIVECLOSURE");break;
-		case rabbit::OT_USERDATA:	   printf("USERDATA %p[%p]",_userdataval(obj),_userdata(obj)->_delegate);break;
+		case rabbit::OT_USERDATA:	   printf("USERDATA %p[%p]",_userdataval(obj),obj.toUserData()->_delegate);break;
 		case rabbit::OT_GENERATOR:	  printf("GENERATOR %p",obj.toGenerator());break;
 		case rabbit::OT_THREAD:		 printf("THREAD [%p]",_thread(obj));break;
 		case rabbit::OT_USERPOINTER:	printf("USERPOINTER %p",_userpointer(obj));break;
diff --git a/rabbit/sqapi.cpp b/rabbit/sqapi.cpp
index dd33ba2..0180d92 100644
--- a/rabbit/sqapi.cpp
+++ b/rabbit/sqapi.cpp
@@ -740,7 +740,7 @@ int64_t rabbit::sq_getsize(rabbit::VirtualMachine* v, int64_t idx)
 	case rabbit::OT_STRING:	 return o.toString()->_len;
 	case rabbit::OT_TABLE:	  return o.toTable()->countUsed();
 	case rabbit::OT_ARRAY:	  return o.toArray()->size();
-	case rabbit::OT_USERDATA:   return _userdata(o)->getsize();
+	case rabbit::OT_USERDATA:   return o.toUserData()->getsize();
 	case rabbit::OT_INSTANCE:   return _instance(o)->_class->_udsize;
 	case rabbit::OT_CLASS:	  return _class(o)->_udsize;
 	default:
@@ -760,7 +760,7 @@ rabbit::Result rabbit::sq_getuserdata(rabbit::VirtualMachine* v,int64_t idx,rabb
 	_GETSAFE_OBJ(v, idx, rabbit::OT_USERDATA,o);
 	(*p) = _userdataval(*o);
 	if(typetag) {
-		*typetag = _userdata(*o)->getTypeTag();
+		*typetag = o->toUserData()->getTypeTag();
 	}
 	return SQ_OK;
 }
@@ -770,7 +770,7 @@ rabbit::Result rabbit::sq_settypetag(rabbit::VirtualMachine* v,int64_t idx,rabbi
 	rabbit::ObjectPtr &o = stack_get(v,idx);
 	switch(sq_type(o)) {
 		case rabbit::OT_USERDATA:
-			_userdata(o)->setTypeTag(typetag);
+			o.toUserData()->setTypeTag(typetag);
 			break;
 		case rabbit::OT_CLASS:
 			_class(o)->_typetag = typetag;
@@ -785,7 +785,7 @@ rabbit::Result rabbit::sq_getobjtypetag(const rabbit::Object *o,rabbit::UserPoin
 {
   switch(sq_type(*o)) {
 	case rabbit::OT_INSTANCE: *typetag = _instance(*o)->_class->_typetag; break;
-	case rabbit::OT_USERDATA: *typetag = _userdata(*o)->getTypeTag(); break;
+	case rabbit::OT_USERDATA: *typetag = o->toUserData()->getTypeTag(); break;
 	case rabbit::OT_CLASS:	*typetag = _class(*o)->_typetag; break;
 	default: return SQ_ERROR;
   }
@@ -1007,9 +1007,9 @@ rabbit::Result rabbit::sq_setdelegate(rabbit::VirtualMachine* v,int64_t idx)
 		break;
 	case rabbit::OT_USERDATA:
 		if(sq_type(mt)==rabbit::OT_TABLE) {
-			_userdata(self)->setDelegate(mt.toTable()); v->pop(); }
+			self.toUserData()->setDelegate(mt.toTable()); v->pop(); }
 		else if(sq_type(mt)==rabbit::OT_NULL) {
-			_userdata(self)->setDelegate(NULL); v->pop(); }
+			self.toUserData()->setDelegate(NULL); v->pop(); }
 		else return sq_aux_invalidtype(v, type);
 		break;
 	default:
@@ -1264,7 +1264,7 @@ void rabbit::sq_setreleasehook(rabbit::VirtualMachine* v,int64_t idx,SQRELEASEHO
 	rabbit::ObjectPtr &ud=stack_get(v,idx);
 	switch(sq_type(ud) ) {
 		case rabbit::OT_USERDATA:
-			_userdata(ud)->setHook(hook);
+			ud.toUserData()->setHook(hook);
 			break;
 		case rabbit::OT_INSTANCE:
 			_instance(ud)->_hook = hook;
@@ -1282,7 +1282,7 @@ SQRELEASEHOOK rabbit::sq_getreleasehook(rabbit::VirtualMachine* v,int64_t idx)
 	rabbit::ObjectPtr &ud=stack_get(v,idx);
 	switch(sq_type(ud) ) {
 		case rabbit::OT_USERDATA:
-			return _userdata(ud)->getHook();
+			return ud.toUserData()->getHook();
 			break;
 		case rabbit::OT_INSTANCE:
 			return _instance(ud)->_hook;