Revert "Update to SQUIRREL 3.0.4"

[supertux.git] / external / squirrel / squirrel / sqdebug.cpp

diff --git a/external/squirrel/squirrel/sqdebug.cpp b/external/squirrel/squirrel/sqdebug.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 6f39231..d027f61
--- a/external/squirrel/squirrel/sqdebug.cpp
+++ b/external/squirrel/squirrel/sqdebug.cpp
@@ -15,7 +15,7 @@ SQRESULT sq_getfunctioninfo(HSQUIRRELVM v,SQInteger level,SQFunctionInfo *fi)
                SQVM::CallInfo &ci = v->_callsstack[cssize-level-1];\r
                if(sq_isclosure(ci._closure)) {\r
                        SQClosure *c = _closure(ci._closure);\r
-                       SQFunctionProto *proto = c->_function;\r
+                       SQFunctionProto *proto = _funcproto(c->_function);\r
                        fi->funcid = proto;\r
                        fi->name = type(proto->_name) == OT_STRING?_stringval(proto->_name):_SC("unknown");\r
                        fi->source = type(proto->_name) == OT_STRING?_stringval(proto->_sourcename):_SC("unknown");\r
@@ -33,7 +33,7 @@ SQRESULT sq_stackinfos(HSQUIRRELVM v, SQInteger level, SQStackInfos *si)
                SQVM::CallInfo &ci = v->_callsstack[cssize-level-1];\r
                switch (type(ci._closure)) {\r
                case OT_CLOSURE:{\r
-                       SQFunctionProto *func = _closure(ci._closure)->_function;\r
+                       SQFunctionProto *func = _funcproto(_closure(ci._closure)->_function);\r
                        if (type(func->_name) == OT_STRING)\r
                                si->funcname = _stringval(func->_name);\r
                        if (type(func->_sourcename) == OT_STRING)\r
@@ -64,17 +64,17 @@ void SQVM::Raise_Error(const SQChar *s, ...)
        _lasterror = SQString::Create(_ss(this),_spval,-1);\r
 }\r
 \r
-void SQVM::Raise_Error(const SQObjectPtr &desc)\r
+void SQVM::Raise_Error(SQObjectPtr &desc)\r
 {\r
        _lasterror = desc;\r
 }\r
 \r
-SQString *SQVM::PrintObjVal(const SQObjectPtr &o)\r
+SQString *SQVM::PrintObjVal(const SQObject &o)\r
 {\r
        switch(type(o)) {\r
        case OT_STRING: return _string(o);\r
        case OT_INTEGER:\r
-               scsprintf(_sp(rsl(NUMBER_MAX_CHAR+1)), _PRINT_INT_FMT, _integer(o));\r
+               scsprintf(_sp(rsl(NUMBER_MAX_CHAR+1)), _SC("%d"), _integer(o));\r
                return SQString::Create(_ss(this), _spval);\r
                break;\r
        case OT_FLOAT:\r
@@ -86,7 +86,7 @@ SQString *SQVM::PrintObjVal(const SQObjectPtr &o)
        }\r
 }\r
 \r
-void SQVM::Raise_IdxError(const SQObjectPtr &o)\r
+void SQVM::Raise_IdxError(SQObject &o)\r
 {\r
        SQObjectPtr oval = PrintObjVal(o);\r
        Raise_Error(_SC("the index '%.50s' does not exist"), _stringval(oval));\r
@@ -95,7 +95,7 @@ void SQVM::Raise_IdxError(const SQObjectPtr &o)
 void SQVM::Raise_CompareError(const SQObject &o1, const SQObject &o2)\r
 {\r
        SQObjectPtr oval1 = PrintObjVal(o1), oval2 = PrintObjVal(o2);\r
-       Raise_Error(_SC("comparison between '%.50s' and '%.50s'"), _stringval(oval1), _stringval(oval2));\r
+       Raise_Error(_SC("comparsion between '%.50s' and '%.50s'"), _stringval(oval1), _stringval(oval2));\r
 }\r
 \r
 \r