dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r26774) -Cleanup [Squirrel]: remove _SC macro

Browse Source
This commit is contained in:
rubidium
2014-09-06 17:46:56 +00:00
parent c96026cd1f
commit 33ab505567
34 changed files with 902 additions and 903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp vendored
View File

@@ -16,30 +16,30 @@ void sqstd_printcallstack(HSQUIRRELVM v)
SQInteger level=1; //1 is to skip this function that is level 0
const SQChar *name=0;
SQInteger seq=0;
pf(v,_SC("\nCALLSTACK\n"));
pf(v,"\nCALLSTACK\n");
while(SQ_SUCCEEDED(sq_stackinfos(v,level,&si)))
{
const SQChar *fn=_SC("unknown");
const SQChar *src=_SC("unknown");
const SQChar *fn="unknown";
const SQChar *src="unknown";
if(si.funcname)fn=si.funcname;
if(si.source) {
/* We don't want to bother users with absolute paths to all AI files.
* Since the path only reaches NoAI code in a formatted string we have
* to strip it here. Let's hope nobody installs openttd in a subdirectory
* of a directory named /ai/. */
src = scstrstr(si.source, _SC("\\ai\\"));
if (!src) src = scstrstr(si.source, _SC("/ai/"));
src = scstrstr(si.source, "\\ai\\");
if (!src) src = scstrstr(si.source, "/ai/");
if (src) {
src += 4;
} else {
src = si.source;
}
}
pf(v,_SC("*FUNCTION [%s()] %s line [%d]\n"),fn,src,si.line);
pf(v,"*FUNCTION [%s()] %s line [%d]\n",fn,src,si.line);
level++;
}
level=0;
pf(v,_SC("\nLOCALS\n"));
pf(v,"\nLOCALS\n");
for(level=0;level<10;level++){
seq=0;
@@ -49,56 +49,56 @@ void sqstd_printcallstack(HSQUIRRELVM v)
switch(sq_gettype(v,-1))
{
case OT_NULL:
pf(v,_SC("[%s] NULL\n"),name);
pf(v,"[%s] NULL\n",name);
break;
case OT_INTEGER:
sq_getinteger(v,-1,&i);
pf(v,_SC("[%s] %d\n"),name,i);
pf(v,"[%s] %d\n",name,i);
break;
case OT_FLOAT:
sq_getfloat(v,-1,&f);
pf(v,_SC("[%s] %.14g\n"),name,f);
pf(v,"[%s] %.14g\n",name,f);
break;
case OT_USERPOINTER:
pf(v,_SC("[%s] USERPOINTER\n"),name);
pf(v,"[%s] USERPOINTER\n",name);
break;
case OT_STRING:
sq_getstring(v,-1,&s);
pf(v,_SC("[%s] \"%s\"\n"),name,s);
pf(v,"[%s] \"%s\"\n",name,s);
break;
case OT_TABLE:
pf(v,_SC("[%s] TABLE\n"),name);
pf(v,"[%s] TABLE\n",name);
break;
case OT_ARRAY:
pf(v,_SC("[%s] ARRAY\n"),name);
pf(v,"[%s] ARRAY\n",name);
break;
case OT_CLOSURE:
pf(v,_SC("[%s] CLOSURE\n"),name);
pf(v,"[%s] CLOSURE\n",name);
break;
case OT_NATIVECLOSURE:
pf(v,_SC("[%s] NATIVECLOSURE\n"),name);
pf(v,"[%s] NATIVECLOSURE\n",name);
break;
case OT_GENERATOR:
pf(v,_SC("[%s] GENERATOR\n"),name);
pf(v,"[%s] GENERATOR\n",name);
break;
case OT_USERDATA:
pf(v,_SC("[%s] USERDATA\n"),name);
pf(v,"[%s] USERDATA\n",name);
break;
case OT_THREAD:
pf(v,_SC("[%s] THREAD\n"),name);
pf(v,"[%s] THREAD\n",name);
break;
case OT_CLASS:
pf(v,_SC("[%s] CLASS\n"),name);
pf(v,"[%s] CLASS\n",name);
break;
case OT_INSTANCE:
pf(v,_SC("[%s] INSTANCE\n"),name);
pf(v,"[%s] INSTANCE\n",name);
break;
case OT_WEAKREF:
pf(v,_SC("[%s] WEAKREF\n"),name);
pf(v,"[%s] WEAKREF\n",name);
break;
case OT_BOOL:{
sq_getbool(v,-1,&b);
pf(v,_SC("[%s] %s\n"),name,b?_SC("true"):_SC("false"));
pf(v,"[%s] %s\n",name,b?"true":"false");
}
break;
default: assert(0); break;
@@ -116,10 +116,10 @@ static SQInteger _sqstd_aux_printerror(HSQUIRRELVM v)
const SQChar *sErr = 0;
if(sq_gettop(v)>=1) {
if(SQ_SUCCEEDED(sq_getstring(v,2,&sErr))) {
pf(v,_SC("\nAN ERROR HAS OCCURED [%s]\n"),sErr);
pf(v,"\nAN ERROR HAS OCCURED [%s]\n",sErr);
}
else{
pf(v,_SC("\nAN ERROR HAS OCCURED [unknown]\n"));
pf(v,"\nAN ERROR HAS OCCURED [unknown]\n");
}
sqstd_printcallstack(v);
}
@@ -131,7 +131,7 @@ void _sqstd_compiler_error(HSQUIRRELVM v,const SQChar *sErr,const SQChar *sSourc
{
SQPRINTFUNCTION pf = sq_getprintfunc(v);
if(pf) {
pf(v,_SC("%s line = (%d) column = (%d) : error %s\n"),sSource,line,column,sErr);
pf(v,"%s line = (%d) column = (%d) : error %s\n",sSource,line,column,sErr);
}
}