Update to SQUIRREL 3.0.4
[supertux.git] / external / squirrel / squirrel / sqbaselib.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 9b1fb5b..4a7d39d
 bool str2num(const SQChar *s,SQObjectPtr &res)\r
 {\r
        SQChar *end;\r
-       if(scstrstr(s,_SC("."))){\r
+       const SQChar *e = s;\r
+       SQBool isfloat = SQFalse;\r
+       SQChar c;\r
+       while((c = *e) != _SC('\0'))\r
+       {\r
+               if(c == _SC('.') || c == _SC('E')|| c == _SC('e')) { //e and E is for scientific notation\r
+                       isfloat = SQTrue;\r
+                       break;\r
+               }\r
+               e++;\r
+       }\r
+       if(isfloat){\r
                SQFloat r = SQFloat(scstrtod(s,&end));\r
                if(s == end) return false;\r
                res = r;\r
-               return true;\r
        }\r
        else{\r
                SQInteger r = SQInteger(scstrtol(s,&end,10));\r
                if(s == end) return false;\r
                res = r;\r
-               return true;\r
        }\r
+       return true;\r
 }\r
 \r
 static SQInteger base_dummy(HSQUIRRELVM v)\r
@@ -41,6 +51,11 @@ static SQInteger base_collectgarbage(HSQUIRRELVM v)
        sq_pushinteger(v, sq_collectgarbage(v));\r
        return 1;\r
 }\r
+static SQInteger base_resurectureachable(HSQUIRRELVM v)\r
+{\r
+       sq_resurrectunreachable(v);\r
+       return 1;\r
+}\r
 #endif\r
 \r
 static SQInteger base_getroottable(HSQUIRRELVM v)\r
@@ -58,7 +73,7 @@ static SQInteger base_getconsttable(HSQUIRRELVM v)
 \r
 static SQInteger base_setroottable(HSQUIRRELVM v)\r
 {\r
-       SQObjectPtr &o=stack_get(v,2);\r
+       SQObjectPtr o = v->_roottable;\r
        if(SQ_FAILED(sq_setroottable(v))) return SQ_ERROR;\r
        v->Push(o);\r
        return 1;\r
@@ -66,7 +81,7 @@ static SQInteger base_setroottable(HSQUIRRELVM v)
 \r
 static SQInteger base_setconsttable(HSQUIRRELVM v)\r
 {\r
-       SQObjectPtr &o=stack_get(v,2);\r
+       SQObjectPtr o = _ss(v)->_consts;\r
        if(SQ_FAILED(sq_setconsttable(v))) return SQ_ERROR;\r
        v->Push(o);\r
        return 1;\r
@@ -87,17 +102,17 @@ static SQInteger base_setdebughook(HSQUIRRELVM v)
 static SQInteger base_enabledebuginfo(HSQUIRRELVM v)\r
 {\r
        SQObjectPtr &o=stack_get(v,2);\r
-       sq_enabledebuginfo(v,(type(o) != OT_NULL)?1:0);\r
+       \r
+       sq_enabledebuginfo(v,SQVM::IsFalse(o)?SQFalse:SQTrue);\r
        return 0;\r
 }\r
 \r
-static SQInteger base_getstackinfos(HSQUIRRELVM v)\r
+static SQInteger __getcallstackinfos(HSQUIRRELVM v,SQInteger level)\r
 {\r
-       SQInteger level;\r
        SQStackInfos si;\r
        SQInteger seq = 0;\r
        const SQChar *name = NULL;\r
-       sq_getinteger(v, -1, &level);\r
+       \r
        if (SQ_SUCCEEDED(sq_stackinfos(v, level, &si)))\r
        {\r
                const SQChar *fn = _SC("unknown");\r
@@ -107,33 +122,39 @@ static SQInteger base_getstackinfos(HSQUIRRELVM v)
                sq_newtable(v);\r
                sq_pushstring(v, _SC("func"), -1);\r
                sq_pushstring(v, fn, -1);\r
-               sq_createslot(v, -3);\r
+               sq_newslot(v, -3, SQFalse);\r
                sq_pushstring(v, _SC("src"), -1);\r
                sq_pushstring(v, src, -1);\r
-               sq_createslot(v, -3);\r
+               sq_newslot(v, -3, SQFalse);\r
                sq_pushstring(v, _SC("line"), -1);\r
                sq_pushinteger(v, si.line);\r
-               sq_createslot(v, -3);\r
+               sq_newslot(v, -3, SQFalse);\r
                sq_pushstring(v, _SC("locals"), -1);\r
                sq_newtable(v);\r
                seq=0;\r
                while ((name = sq_getlocal(v, level, seq))) {\r
                        sq_pushstring(v, name, -1);\r
                        sq_push(v, -2);\r
-                       sq_createslot(v, -4);\r
+                       sq_newslot(v, -4, SQFalse);\r
                        sq_pop(v, 1);\r
                        seq++;\r
                }\r
-               sq_createslot(v, -3);\r
+               sq_newslot(v, -3, SQFalse);\r
                return 1;\r
        }\r
 \r
        return 0;\r
 }\r
+static SQInteger base_getstackinfos(HSQUIRRELVM v)\r
+{\r
+       SQInteger level;\r
+       sq_getinteger(v, -1, &level);\r
+       return __getcallstackinfos(v,level);\r
+}\r
 \r
 static SQInteger base_assert(HSQUIRRELVM v)\r
 {\r
-       if(v->IsFalse(stack_get(v,2))){\r
+       if(SQVM::IsFalse(stack_get(v,2))){\r
                return sq_throwerror(v,_SC("assertion failed"));\r
        }\r
        return 0;\r
@@ -170,6 +191,15 @@ static SQInteger base_print(HSQUIRRELVM v)
        return 0;\r
 }\r
 \r
+static SQInteger base_error(HSQUIRRELVM v)\r
+{\r
+       const SQChar *str;\r
+       sq_tostring(v,2);\r
+       sq_getstring(v,-1,&str);\r
+       if(_ss(v)->_errorfunc) _ss(v)->_errorfunc(v,_SC("%s"),str);\r
+       return 0;\r
+}\r
+\r
 static SQInteger base_compilestring(HSQUIRRELVM v)\r
 {\r
        SQInteger nargs=sq_gettop(v);\r
@@ -189,7 +219,7 @@ static SQInteger base_compilestring(HSQUIRRELVM v)
 static SQInteger base_newthread(HSQUIRRELVM v)\r
 {\r
        SQObjectPtr &func = stack_get(v,2);\r
-       SQInteger stksize = (_funcproto(_closure(func)->_function)->_stacksize << 1) +2;\r
+       SQInteger stksize = (_closure(func)->_function->_stacksize << 1) +2;\r
        HSQUIRRELVM newv = sq_newthread(v, (stksize < MIN_STACK_OVERHEAD + 2)? MIN_STACK_OVERHEAD + 2 : stksize);\r
        sq_move(newv,v,-2);\r
        return 1;\r
@@ -222,6 +252,16 @@ static SQInteger base_type(HSQUIRRELVM v)
        return 1;\r
 }\r
 \r
+static SQInteger base_callee(HSQUIRRELVM v)\r
+{\r
+       if(v->_callsstacksize > 1)\r
+       {\r
+               v->Push(v->_callsstack[v->_callsstacksize - 2]._closure);\r
+               return 1;\r
+       }\r
+       return sq_throwerror(v,_SC("no closure in the calls stack"));\r
+}\r
+\r
 static SQRegFunction base_funcs[]={\r
        //generic\r
        {_SC("seterrorhandler"),base_seterrorhandler,2, NULL},\r
@@ -234,14 +274,17 @@ static SQRegFunction base_funcs[]={
        {_SC("setconsttable"),base_setconsttable,2, NULL},\r
        {_SC("assert"),base_assert,2, NULL},\r
        {_SC("print"),base_print,2, NULL},\r
+       {_SC("error"),base_error,2, NULL},\r
        {_SC("compilestring"),base_compilestring,-2, _SC(".ss")},\r
        {_SC("newthread"),base_newthread,2, _SC(".c")},\r
        {_SC("suspend"),base_suspend,-1, NULL},\r
        {_SC("array"),base_array,-2, _SC(".n")},\r
        {_SC("type"),base_type,2, NULL},\r
+       {_SC("callee"),base_callee,0,NULL},\r
        {_SC("dummy"),base_dummy,0,NULL},\r
 #ifndef NO_GARBAGE_COLLECTOR\r
-       {_SC("collectgarbage"),base_collectgarbage,1, _SC("t")},\r
+       {_SC("collectgarbage"),base_collectgarbage,0, NULL},\r
+       {_SC("resurrectunreachable"),base_resurectureachable,0, NULL},\r
 #endif\r
        {0,0}\r
 };\r
@@ -255,21 +298,25 @@ void sq_base_register(HSQUIRRELVM v)
                sq_newclosure(v,base_funcs[i].f,0);\r
                sq_setnativeclosurename(v,-1,base_funcs[i].name);\r
                sq_setparamscheck(v,base_funcs[i].nparamscheck,base_funcs[i].typemask);\r
-               sq_createslot(v,-3);\r
+               sq_newslot(v,-3, SQFalse);\r
                i++;\r
        }\r
+       \r
+       sq_pushstring(v,_SC("_versionnumber_"),-1);\r
+       sq_pushinteger(v,SQUIRREL_VERSION_NUMBER);\r
+       sq_newslot(v,-3, SQFalse);\r
        sq_pushstring(v,_SC("_version_"),-1);\r
        sq_pushstring(v,SQUIRREL_VERSION,-1);\r
-       sq_createslot(v,-3);\r
+       sq_newslot(v,-3, SQFalse);\r
        sq_pushstring(v,_SC("_charsize_"),-1);\r
        sq_pushinteger(v,sizeof(SQChar));\r
-       sq_createslot(v,-3);\r
+       sq_newslot(v,-3, SQFalse);\r
        sq_pushstring(v,_SC("_intsize_"),-1);\r
        sq_pushinteger(v,sizeof(SQInteger));\r
-       sq_createslot(v,-3);\r
+       sq_newslot(v,-3, SQFalse);\r
        sq_pushstring(v,_SC("_floatsize_"),-1);\r
        sq_pushinteger(v,sizeof(SQFloat));\r
-       sq_createslot(v,-3);\r
+       sq_newslot(v,-3, SQFalse);\r
        sq_pop(v,1);\r
 }\r
 \r
@@ -298,7 +345,7 @@ static SQInteger default_delegate_tofloat(HSQUIRRELVM v)
                v->Push(SQObjectPtr((SQFloat)(_integer(o)?1:0)));\r
                break;\r
        default:\r
-               v->Push(_null_);\r
+               v->PushNull();\r
                break;\r
        }\r
        return 1;\r
@@ -323,7 +370,7 @@ static SQInteger default_delegate_tointeger(HSQUIRRELVM v)
                v->Push(SQObjectPtr(_integer(o)?(SQInteger)1:(SQInteger)0));\r
                break;\r
        default:\r
-               v->Push(_null_);\r
+               v->PushNull();\r
                break;\r
        }\r
        return 1;\r
@@ -356,6 +403,7 @@ static SQInteger number_delegate_tochar(HSQUIRRELVM v)
 }\r
 \r
 \r
+\r
 /////////////////////////////////////////////////////////////////\r
 //TABLE DEFAULT DELEGATE\r
 \r
@@ -377,27 +425,41 @@ static SQInteger container_rawexists(HSQUIRRELVM v)
        return 1;\r
 }\r
 \r
-static SQInteger table_rawset(HSQUIRRELVM v)\r
+static SQInteger container_rawset(HSQUIRRELVM v)\r
 {\r
        return sq_rawset(v,-3);\r
 }\r
 \r
 \r
-static SQInteger table_rawget(HSQUIRRELVM v)\r
+static SQInteger container_rawget(HSQUIRRELVM v)\r
 {\r
        return SQ_SUCCEEDED(sq_rawget(v,-2))?1:SQ_ERROR;\r
 }\r
 \r
+static SQInteger table_setdelegate(HSQUIRRELVM v)\r
+{\r
+       if(SQ_FAILED(sq_setdelegate(v,-2)))\r
+               return SQ_ERROR;\r
+       sq_push(v,-1); // -1 because sq_setdelegate pops 1\r
+       return 1;\r
+}\r
+\r
+static SQInteger table_getdelegate(HSQUIRRELVM v)\r
+{\r
+       return SQ_SUCCEEDED(sq_getdelegate(v,-1))?1:SQ_ERROR;\r
+}\r
 \r
 SQRegFunction SQSharedState::_table_default_delegate_funcz[]={\r
        {_SC("len"),default_delegate_len,1, _SC("t")},\r
-       {_SC("rawget"),table_rawget,2, _SC("t")},\r
-       {_SC("rawset"),table_rawset,3, _SC("t")},\r
+       {_SC("rawget"),container_rawget,2, _SC("t")},\r
+       {_SC("rawset"),container_rawset,3, _SC("t")},\r
        {_SC("rawdelete"),table_rawdelete,2, _SC("t")},\r
        {_SC("rawin"),container_rawexists,2, _SC("t")},\r
        {_SC("weakref"),obj_delegate_weakref,1, NULL },\r
        {_SC("tostring"),default_delegate_tostring,1, _SC(".")},\r
        {_SC("clear"),obj_clear,1, _SC(".")},\r
+       {_SC("setdelegate"),table_setdelegate,2, _SC(".t|o")},\r
+       {_SC("getdelegate"),table_getdelegate,1, _SC(".")},\r
        {0,0}\r
 };\r
 \r
@@ -472,6 +534,111 @@ static SQInteger array_resize(HSQUIRRELVM v)
        return sq_throwerror(v, _SC("size must be a number"));\r
 }\r
 \r
+static SQInteger __map_array(SQArray *dest,SQArray *src,HSQUIRRELVM v) {\r
+       SQObjectPtr temp;\r
+       SQInteger size = src->Size();\r
+       for(SQInteger n = 0; n < size; n++) {\r
+               src->Get(n,temp);\r
+               v->Push(src);\r
+               v->Push(temp);\r
+               if(SQ_FAILED(sq_call(v,2,SQTrue,SQFalse))) {\r
+                       return SQ_ERROR;\r
+               }\r
+               dest->Set(n,v->GetUp(-1));\r
+               v->Pop();\r
+       }\r
+       return 0;\r
+}\r
+\r
+static SQInteger array_map(HSQUIRRELVM v)\r
+{\r
+       SQObject &o = stack_get(v,1);\r
+       SQInteger size = _array(o)->Size();\r
+       SQObjectPtr ret = SQArray::Create(_ss(v),size);\r
+       if(SQ_FAILED(__map_array(_array(ret),_array(o),v)))\r
+               return SQ_ERROR;\r
+       v->Push(ret);\r
+       return 1;\r
+}\r
+\r
+static SQInteger array_apply(HSQUIRRELVM v)\r
+{\r
+       SQObject &o = stack_get(v,1);\r
+       if(SQ_FAILED(__map_array(_array(o),_array(o),v)))\r
+               return SQ_ERROR;\r
+       return 0;\r
+}\r
+\r
+static SQInteger array_reduce(HSQUIRRELVM v)\r
+{\r
+       SQObject &o = stack_get(v,1);\r
+       SQArray *a = _array(o);\r
+       SQInteger size = a->Size();\r
+       if(size == 0) {\r
+               return 0;\r
+       }\r
+       SQObjectPtr res;\r
+       a->Get(0,res);\r
+       if(size > 1) {\r
+               SQObjectPtr other;\r
+               for(SQInteger n = 1; n < size; n++) {\r
+                       a->Get(n,other);\r
+                       v->Push(o);\r
+                       v->Push(res);\r
+                       v->Push(other);\r
+                       if(SQ_FAILED(sq_call(v,3,SQTrue,SQFalse))) {\r
+                               return SQ_ERROR;\r
+                       }\r
+                       res = v->GetUp(-1);\r
+                       v->Pop();\r
+               }\r
+       }\r
+       v->Push(res);\r
+       return 1;\r
+}\r
+\r
+static SQInteger array_filter(HSQUIRRELVM v)\r
+{\r
+       SQObject &o = stack_get(v,1);\r
+       SQArray *a = _array(o);\r
+       SQObjectPtr ret = SQArray::Create(_ss(v),0);\r
+       SQInteger size = a->Size();\r
+       SQObjectPtr val;\r
+       for(SQInteger n = 0; n < size; n++) {\r
+               a->Get(n,val);\r
+               v->Push(o);\r
+               v->Push(n);\r
+               v->Push(val);\r
+               if(SQ_FAILED(sq_call(v,3,SQTrue,SQFalse))) {\r
+                       return SQ_ERROR;\r
+               }\r
+               if(!SQVM::IsFalse(v->GetUp(-1))) {\r
+                       _array(ret)->Append(val);\r
+               }\r
+               v->Pop();\r
+       }\r
+       v->Push(ret);\r
+       return 1;\r
+}\r
+\r
+static SQInteger array_find(HSQUIRRELVM v)\r
+{\r
+       SQObject &o = stack_get(v,1);\r
+       SQObjectPtr &val = stack_get(v,2);\r
+       SQArray *a = _array(o);\r
+       SQInteger size = a->Size();\r
+       SQObjectPtr temp;\r
+       for(SQInteger n = 0; n < size; n++) {\r
+               bool res = false;\r
+               a->Get(n,temp);\r
+               if(SQVM::IsEqual(temp,val,res) && res) {\r
+                       v->Push(n);\r
+                       return 1;\r
+               }\r
+       }\r
+       return 0;\r
+}\r
+\r
 \r
 bool _sort_compare(HSQUIRRELVM v,SQObjectPtr &a,SQObjectPtr &b,SQInteger func,SQInteger &ret)\r
 {\r
@@ -499,7 +666,7 @@ bool _sort_compare(HSQUIRRELVM v,SQObjectPtr &a,SQObjectPtr &b,SQInteger func,SQ
        return true;\r
 }\r
 \r
-bool _hsort_sift_down(HSQUIRRELVM v,SQArray *arr, int root, int bottom, SQInteger func)\r
+bool _hsort_sift_down(HSQUIRRELVM v,SQArray *arr, SQInteger root, SQInteger bottom, SQInteger func)\r
 {\r
        SQInteger maxChild;\r
        SQInteger done = 0;\r
@@ -524,6 +691,11 @@ bool _hsort_sift_down(HSQUIRRELVM v,SQArray *arr, int root, int bottom, SQIntege
                if(!_sort_compare(v,arr->_values[root],arr->_values[maxChild],func,ret))\r
                        return false;\r
                if (ret < 0) {\r
+                       if (root == maxChild) {\r
+                v->Raise_Error(_SC("inconsistent compare function"));\r
+                return false; // We'd be swapping ourselve. The compare function is incorrect\r
+            }\r
+\r
                        _Swap(arr->_values[root],arr->_values[maxChild]);\r
                        root = maxChild;\r
                }\r
@@ -602,6 +774,11 @@ SQRegFunction SQSharedState::_array_default_delegate_funcz[]={
        {_SC("weakref"),obj_delegate_weakref,1, NULL },\r
        {_SC("tostring"),default_delegate_tostring,1, _SC(".")},\r
        {_SC("clear"),obj_clear,1, _SC(".")},\r
+       {_SC("map"),array_map,2, _SC("ac")}, \r
+       {_SC("apply"),array_apply,2, _SC("ac")}, \r
+       {_SC("reduce"),array_reduce,2, _SC("ac")}, \r
+       {_SC("filter"),array_filter,2, _SC("ac")},\r
+       {_SC("find"),array_find,2, _SC("a.")},\r
        {0,0}\r
 };\r
 \r
@@ -717,12 +894,16 @@ static SQInteger closure_getinfos(HSQUIRRELVM v) {
        SQObject o = stack_get(v,1);\r
        SQTable *res = SQTable::Create(_ss(v),4);\r
        if(type(o) == OT_CLOSURE) {\r
-               SQFunctionProto *f = _funcproto(_closure(o)->_function);\r
+               SQFunctionProto *f = _closure(o)->_function;\r
                SQInteger nparams = f->_nparameters + (f->_varparams?1:0);\r
                SQObjectPtr params = SQArray::Create(_ss(v),nparams);\r
+    SQObjectPtr defparams = SQArray::Create(_ss(v),f->_ndefaultparams);\r
                for(SQInteger n = 0; n<f->_nparameters; n++) {\r
                        _array(params)->Set((SQInteger)n,f->_parameters[n]);\r
                }\r
+    for(SQInteger j = 0; j<f->_ndefaultparams; j++) {\r
+                       _array(defparams)->Set((SQInteger)j,_closure(o)->_defaultparams[j]);\r
+               }\r
                if(f->_varparams) {\r
                        _array(params)->Set(nparams-1,SQString::Create(_ss(v),_SC("..."),-1));\r
                }\r
@@ -731,6 +912,7 @@ static SQInteger closure_getinfos(HSQUIRRELVM v) {
                res->NewSlot(SQString::Create(_ss(v),_SC("src"),-1),f->_sourcename);\r
                res->NewSlot(SQString::Create(_ss(v),_SC("parameters"),-1),params);\r
                res->NewSlot(SQString::Create(_ss(v),_SC("varargs"),-1),f->_varparams);\r
+    res->NewSlot(SQString::Create(_ss(v),_SC("defparams"),-1),defparams);\r
        }\r
        else { //OT_NATIVECLOSURE \r
                SQNativeClosure *nc = _nativeclosure(o);\r
@@ -752,6 +934,7 @@ static SQInteger closure_getinfos(HSQUIRRELVM v) {
 }\r
 \r
 \r
+\r
 SQRegFunction SQSharedState::_closure_default_delegate_funcz[]={\r
        {_SC("call"),closure_call,-1, _SC("c")},\r
        {_SC("pcall"),closure_pcall,-1, _SC("c")},\r
@@ -784,17 +967,15 @@ SQRegFunction SQSharedState::_generator_default_delegate_funcz[]={
 };\r
 \r
 //THREAD DEFAULT DELEGATE\r
-\r
 static SQInteger thread_call(HSQUIRRELVM v)\r
 {\r
-       \r
        SQObjectPtr o = stack_get(v,1);\r
        if(type(o) == OT_THREAD) {\r
                SQInteger nparams = sq_gettop(v);\r
                _thread(o)->Push(_thread(o)->_roottable);\r
                for(SQInteger i = 2; i<(nparams+1); i++)\r
                        sq_move(_thread(o),v,i);\r
-               if(SQ_SUCCEEDED(sq_call(_thread(o),nparams,SQTrue,SQFalse))) {\r
+               if(SQ_SUCCEEDED(sq_call(_thread(o),nparams,SQTrue,SQTrue))) {\r
                        sq_move(v,_thread(o),-1);\r
                        sq_pop(_thread(o),1);\r
                        return 1;\r
@@ -860,46 +1041,117 @@ static SQInteger thread_getstatus(HSQUIRRELVM v)
        return 1;\r
 }\r
 \r
+static SQInteger thread_getstackinfos(HSQUIRRELVM v)\r
+{\r
+       SQObjectPtr o = stack_get(v,1);\r
+       if(type(o) == OT_THREAD) {\r
+               SQVM *thread = _thread(o);\r
+               SQInteger threadtop = sq_gettop(thread);\r
+               SQInteger level;\r
+               sq_getinteger(v,-1,&level);\r
+               SQRESULT res = __getcallstackinfos(thread,level);\r
+               if(SQ_FAILED(res))\r
+               {\r
+                       sq_settop(thread,threadtop);\r
+                       if(type(thread->_lasterror) == OT_STRING) {\r
+                               sq_throwerror(v,_stringval(thread->_lasterror));\r
+                       }\r
+                       else {\r
+                               sq_throwerror(v,_SC("unknown error"));\r
+                       }\r
+               }\r
+               if(res > 0) {\r
+                       //some result\r
+                       sq_move(v,thread,-1);\r
+                       sq_settop(thread,threadtop);\r
+                       return 1;\r
+               }\r
+               //no result\r
+               sq_settop(thread,threadtop);\r
+               return 0;\r
+               \r
+       }\r
+       return sq_throwerror(v,_SC("wrong parameter"));\r
+}\r
+\r
 SQRegFunction SQSharedState::_thread_default_delegate_funcz[] = {\r
        {_SC("call"), thread_call, -1, _SC("v")},\r
        {_SC("wakeup"), thread_wakeup, -1, _SC("v")},\r
        {_SC("getstatus"), thread_getstatus, 1, _SC("v")},\r
        {_SC("weakref"),obj_delegate_weakref,1, NULL },\r
+       {_SC("getstackinfos"),thread_getstackinfos,2, _SC("vn")},\r
        {_SC("tostring"),default_delegate_tostring,1, _SC(".")},\r
        {0,0},\r
 };\r
 \r
 static SQInteger class_getattributes(HSQUIRRELVM v)\r
 {\r
-       if(SQ_SUCCEEDED(sq_getattributes(v,-2)))\r
-               return 1;\r
-       return SQ_ERROR;\r
+       return SQ_SUCCEEDED(sq_getattributes(v,-2))?1:SQ_ERROR;\r
 }\r
 \r
 static SQInteger class_setattributes(HSQUIRRELVM v)\r
 {\r
-       if(SQ_SUCCEEDED(sq_setattributes(v,-3)))\r
-               return 1;\r
-       return SQ_ERROR;\r
+       return SQ_SUCCEEDED(sq_setattributes(v,-3))?1:SQ_ERROR;\r
 }\r
 \r
 static SQInteger class_instance(HSQUIRRELVM v)\r
 {\r
-       if(SQ_SUCCEEDED(sq_createinstance(v,-1)))\r
-               return 1;\r
-       return SQ_ERROR;\r
+       return SQ_SUCCEEDED(sq_createinstance(v,-1))?1:SQ_ERROR;\r
+}\r
+\r
+static SQInteger class_getbase(HSQUIRRELVM v)\r
+{\r
+       return SQ_SUCCEEDED(sq_getbase(v,-1))?1:SQ_ERROR;\r
+}\r
+\r
+static SQInteger class_newmember(HSQUIRRELVM v)\r
+{\r
+       SQInteger top = sq_gettop(v);\r
+       SQBool bstatic = SQFalse;\r
+       if(top == 5)\r
+       {\r
+               sq_tobool(v,-1,&bstatic);\r
+               sq_pop(v,1);\r
+       }\r
+\r
+       if(top < 4) {\r
+               sq_pushnull(v);\r
+       }\r
+       return SQ_SUCCEEDED(sq_newmember(v,-4,bstatic))?1:SQ_ERROR;\r
+}\r
+\r
+static SQInteger class_rawnewmember(HSQUIRRELVM v)\r
+{\r
+       SQInteger top = sq_gettop(v);\r
+       SQBool bstatic = SQFalse;\r
+       if(top == 5)\r
+       {\r
+               sq_tobool(v,-1,&bstatic);\r
+               sq_pop(v,1);\r
+       }\r
+\r
+       if(top < 4) {\r
+               sq_pushnull(v);\r
+       }\r
+       return SQ_SUCCEEDED(sq_rawnewmember(v,-4,bstatic))?1:SQ_ERROR;\r
 }\r
 \r
 SQRegFunction SQSharedState::_class_default_delegate_funcz[] = {\r
        {_SC("getattributes"), class_getattributes, 2, _SC("y.")},\r
        {_SC("setattributes"), class_setattributes, 3, _SC("y..")},\r
+       {_SC("rawget"),container_rawget,2, _SC("y")},\r
+       {_SC("rawset"),container_rawset,3, _SC("y")},\r
        {_SC("rawin"),container_rawexists,2, _SC("y")},\r
        {_SC("weakref"),obj_delegate_weakref,1, NULL },\r
        {_SC("tostring"),default_delegate_tostring,1, _SC(".")},\r
        {_SC("instance"),class_instance,1, _SC("y")},\r
+       {_SC("getbase"),class_getbase,1, _SC("y")},\r
+       {_SC("newmember"),class_newmember,-3, _SC("y")},\r
+       {_SC("rawnewmember"),class_rawnewmember,-3, _SC("y")},\r
        {0,0}\r
 };\r
 \r
+\r
 static SQInteger instance_getclass(HSQUIRRELVM v)\r
 {\r
        if(SQ_SUCCEEDED(sq_getclass(v,1)))\r
@@ -909,6 +1161,8 @@ static SQInteger instance_getclass(HSQUIRRELVM v)
 \r
 SQRegFunction SQSharedState::_instance_default_delegate_funcz[] = {\r
        {_SC("getclass"), instance_getclass, 1, _SC("x")},\r
+       {_SC("rawget"),container_rawget,2, _SC("x")},\r
+       {_SC("rawset"),container_rawset,3, _SC("x")},\r
        {_SC("rawin"),container_rawexists,2, _SC("x")},\r
        {_SC("weakref"),obj_delegate_weakref,1, NULL },\r
        {_SC("tostring"),default_delegate_tostring,1, _SC(".")},\r
@@ -929,4 +1183,3 @@ SQRegFunction SQSharedState::_weakref_default_delegate_funcz[] = {
        {0,0}\r
 };\r
 \r
-\r