HeeroYui-deprecated/rabbit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] remote _outer()

Browse Source
This commit is contained in:
Edouard DUPIN 2018-07-03 22:36:30 +02:00
parent d1509119e9
commit d76c59feb2
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rabbit/Object.hpp
View File

@ -149,7 +149,6 @@ namespace rabbit {
#define is_delegable(t) (sq_type(t)&SQOBJECT_DELEGABLE) #define is_delegable(t) (sq_type(t)&SQOBJECT_DELEGABLE)
#define raw_type(obj) _RAW_TYPE((obj)._type) #define raw_type(obj) _RAW_TYPE((obj)._type)
#define _outer(obj) ((obj)._unVal.pOuter)
#define _refcounted(obj) ((obj)._unVal.pRefCounted) #define _refcounted(obj) ((obj)._unVal.pRefCounted)
#define _rawval(obj) ((obj)._unVal.raw) #define _rawval(obj) ((obj)._unVal.raw)

4
rabbit/VirtualMachine.cpp
View File

@ -893,13 +893,13 @@ exception_restore:
case _OP_JZ: if(IsFalse(STK(arg0))) ci->_ip+=(sarg1); continue; case _OP_JZ: if(IsFalse(STK(arg0))) ci->_ip+=(sarg1); continue;
case _OP_GETOUTER: { case _OP_GETOUTER: {
rabbit::Closure *cur_cls = ci->_closure.toClosure(); rabbit::Closure *cur_cls = ci->_closure.toClosure();
rabbit::Outer *otr = _outer(cur_cls->_outervalues[arg1]); rabbit::Outer *otr = cur_cls->_outervalues[arg1].toOuter();
TARGET = *(otr->_valptr); TARGET = *(otr->_valptr);
} }
continue; continue;
case _OP_SETOUTER: { case _OP_SETOUTER: {
rabbit::Closure *cur_cls = ci->_closure.toClosure(); rabbit::Closure *cur_cls = ci->_closure.toClosure();
rabbit::Outer *otr = _outer(cur_cls->_outervalues[arg1]); rabbit::Outer *otr = cur_cls->_outervalues[arg1].toOuter();
*(otr->_valptr) = STK(arg2); *(otr->_valptr) = STK(arg2);
if(arg0 != 0xFF) { if(arg0 != 0xFF) {
TARGET = STK(arg2); TARGET = STK(arg2);

6
rabbit/sqapi.cpp
View File

@ -1123,7 +1123,7 @@ const char * rabbit::sq_getlocal(rabbit::VirtualMachine* v,uint64_t level,uint64
rabbit::Closure *c=ci._closure.toClosure(); rabbit::Closure *c=ci._closure.toClosure();
rabbit::FunctionProto *func=c->_function; rabbit::FunctionProto *func=c->_function;
if(func->_noutervalues > (int64_t)idx) { if(func->_noutervalues > (int64_t)idx) {
v->push(*_outer(c->_outervalues[idx])->_valptr); v->push(*c->_outervalues[idx].toOuter()->_valptr);
return _stringval(func->_outervalues[idx]._name); return _stringval(func->_outervalues[idx]._name);
} }
idx -= func->_noutervalues; idx -= func->_noutervalues;
@ -1365,7 +1365,7 @@ const char * rabbit::sq_getfreevariable(rabbit::VirtualMachine* v,int64_t idx,ui
rabbit::Closure *clo = self.toClosure(); rabbit::Closure *clo = self.toClosure();
rabbit::FunctionProto *fp = clo->_function; rabbit::FunctionProto *fp = clo->_function;
if(((uint64_t)fp->_noutervalues) > nval) { if(((uint64_t)fp->_noutervalues) > nval) {
v->push(*(_outer(clo->_outervalues[nval])->_valptr)); v->push(*(clo->_outervalues[nval].toOuter()->_valptr));
rabbit::OuterVar &ov = fp->_outervalues[nval]; rabbit::OuterVar &ov = fp->_outervalues[nval];
name = _stringval(ov._name); name = _stringval(ov._name);
} }
@ -1392,7 +1392,7 @@ rabbit::Result rabbit::sq_setfreevariable(rabbit::VirtualMachine* v,int64_t idx,
case rabbit::OT_CLOSURE:{ case rabbit::OT_CLOSURE:{
rabbit::FunctionProto *fp = self.toClosure()->_function; rabbit::FunctionProto *fp = self.toClosure()->_function;
if(((uint64_t)fp->_noutervalues) > nval){ if(((uint64_t)fp->_noutervalues) > nval){
*(_outer(self.toClosure()->_outervalues[nval])->_valptr) = stack_get(v,-1); *(self.toClosure()->_outervalues[nval].toOuter()->_valptr) = stack_get(v,-1);
} }
else return sq_throwerror(v,"invalid free var index"); else return sq_throwerror(v,"invalid free var index");
} }