[Scummvm-cvs-logs] SF.net SVN: scummvm:[33397] residual/trunk/engine/lua
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Tue Jul 29 07:58:37 CEST 2008
Revision: 33397
http://scummvm.svn.sourceforge.net/scummvm/?rev=33397&view=rev
Author: aquadran
Date: 2008-07-29 05:58:36 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
formatting code
Modified Paths:
--------------
residual/trunk/engine/lua/lbuffer.cpp
residual/trunk/engine/lua/lbuiltin.cpp
residual/trunk/engine/lua/lbuiltin.h
Modified: residual/trunk/engine/lua/lbuffer.cpp
===================================================================
--- residual/trunk/engine/lua/lbuffer.cpp 2008-07-29 05:05:04 UTC (rev 33396)
+++ residual/trunk/engine/lua/lbuffer.cpp 2008-07-29 05:58:36 UTC (rev 33397)
@@ -5,9 +5,9 @@
*/
-#include "lauxlib.h"
-#include "lmem.h"
-#include "lstate.h"
+#include "engine/lua/lauxlib.h"
+#include "engine/lua/lmem.h"
+#include "engine/lua/lstate.h"
/*-------------------------------------------------------
@@ -16,68 +16,53 @@
#define BUFF_STEP 32
-#define openspace(size) if (L->Mbuffnext+(size) > L->Mbuffsize) Openspace(size)
+#define openspace(size) if (L->Mbuffnext + (size) > L->Mbuffsize) Openspace(size)
-static void Openspace (int32 size)
-{
- lua_State *l = L; /* to optimize */
- int32 base = l->Mbuffbase-l->Mbuffer;
- l->Mbuffsize *= 2;
- if (l->Mbuffnext+size > l->Mbuffsize) /* still not big enough? */
- l->Mbuffsize = l->Mbuffnext+size;
- l->Mbuffer = (char *)luaM_realloc(l->Mbuffer, l->Mbuffsize);
- l->Mbuffbase = l->Mbuffer+base;
+static void Openspace(int32 size) {
+ lua_State *l = L; // to optimize
+ int32 base = l->Mbuffbase-l->Mbuffer;
+ l->Mbuffsize *= 2;
+ if (l->Mbuffnext + size > l->Mbuffsize) // still not big enough?
+ l->Mbuffsize = l->Mbuffnext+size;
+ l->Mbuffer = (char *)luaM_realloc(l->Mbuffer, l->Mbuffsize);
+ l->Mbuffbase = l->Mbuffer+base;
}
-
-char *luaL_openspace (int32 size)
-{
- openspace(size);
- return L->Mbuffer+L->Mbuffnext;
+char *luaL_openspace(int32 size) {
+ openspace(size);
+ return L->Mbuffer + L->Mbuffnext;
}
-
-void luaL_addchar (int32 c)
-{
- openspace(BUFF_STEP);
- L->Mbuffer[L->Mbuffnext++] = c;
+void luaL_addchar(int32 c) {
+ openspace(BUFF_STEP);
+ L->Mbuffer[L->Mbuffnext++] = c;
}
-
-void luaL_resetbuffer (void)
-{
- L->Mbuffnext = L->Mbuffbase-L->Mbuffer;
+void luaL_resetbuffer() {
+ L->Mbuffnext = L->Mbuffbase - L->Mbuffer;
}
-
-void luaL_addsize (int32 n)
-{
- L->Mbuffnext += n;
+void luaL_addsize(int32 n) {
+ L->Mbuffnext += n;
}
-int32 luaL_getsize (void)
-{
- return L->Mbuffnext-(L->Mbuffbase-L->Mbuffer);
+int32 luaL_getsize() {
+ return L->Mbuffnext - (L->Mbuffbase - L->Mbuffer);
}
-int32 luaL_newbuffer (int32 size)
-{
- int32 old = L->Mbuffbase-L->Mbuffer;
- openspace(size);
- L->Mbuffbase = L->Mbuffer+L->Mbuffnext;
- return old;
+int32 luaL_newbuffer(int32 size) {
+ int32 old = L->Mbuffbase - L->Mbuffer;
+ openspace(size);
+ L->Mbuffbase = L->Mbuffer + L->Mbuffnext;
+ return old;
}
-
-void luaL_oldbuffer (int32 old)
-{
- L->Mbuffnext = L->Mbuffbase-L->Mbuffer;
- L->Mbuffbase = L->Mbuffer+old;
+void luaL_oldbuffer(int32 old) {
+ L->Mbuffnext = L->Mbuffbase - L->Mbuffer;
+ L->Mbuffbase = L->Mbuffer + old;
}
-
-char *luaL_buffer (void)
-{
- return L->Mbuffbase;
+char *luaL_buffer() {
+ return L->Mbuffbase;
}
Modified: residual/trunk/engine/lua/lbuiltin.cpp
===================================================================
--- residual/trunk/engine/lua/lbuiltin.cpp 2008-07-29 05:05:04 UTC (rev 33396)
+++ residual/trunk/engine/lua/lbuiltin.cpp 2008-07-29 05:58:36 UTC (rev 33397)
@@ -5,519 +5,516 @@
*/
-#include "lapi.h"
-#include "lauxlib.h"
-#include "lbuiltin.h"
-#include "ldo.h"
-#include "lfunc.h"
-#include "lmem.h"
-#include "lobject.h"
-#include "lstate.h"
-#include "lstring.h"
-#include "ltable.h"
-#include "ltask.h"
-#include "ltm.h"
-#include "lua.h"
-#include "lundump.h"
+#include "engine/lua/lapi.h"
+#include "engine/lua/lauxlib.h"
+#include "engine/lua/lbuiltin.h"
+#include "engine/lua/ldo.h"
+#include "engine/lua/lfunc.h"
+#include "engine/lua/lmem.h"
+#include "engine/lua/lobject.h"
+#include "engine/lua/lstate.h"
+#include "engine/lua/lstring.h"
+#include "engine/lua/ltable.h"
+#include "engine/lua/ltask.h"
+#include "engine/lua/ltm.h"
+#include "engine/lua/lua.h"
+#include "engine/lua/lundump.h"
-
-static void pushstring (TaggedString *s)
-{
- TObject o;
- o.ttype = LUA_T_STRING;
- o.value.ts = s;
- luaA_pushobject(&o);
+static void pushstring(TaggedString *s) {
+ TObject o;
+ o.ttype = LUA_T_STRING;
+ o.value.ts = s;
+ luaA_pushobject(&o);
}
-
-static void nextvar (void)
-{
- TObject *o = luaA_Address(luaL_nonnullarg(1));
- TaggedString *g;
- if (ttype(o) == LUA_T_NIL)
- g = (TaggedString *)L->rootglobal.next;
- else {
- luaL_arg_check(ttype(o) == LUA_T_STRING, 1, "variable name expected");
- g = tsvalue(o);
- /* check whether name is in global var list */
- luaL_arg_check((GCnode *)g != g->head.next, 1, "variable name expected");
- g = (TaggedString *)g->head.next;
- }
- while (g && g->u.s.globalval.ttype == LUA_T_NIL) /* skip globals with nil */
- g = (TaggedString *)g->head.next;
- if (g) {
- pushstring(g);
- luaA_pushobject(&g->u.s.globalval);
- }
- else lua_pushnil();
+static void nextvar() {
+ TObject *o = luaA_Address(luaL_nonnullarg(1));
+ TaggedString *g;
+ if (ttype(o) == LUA_T_NIL)
+ g = (TaggedString *)L->rootglobal.next;
+ else {
+ luaL_arg_check(ttype(o) == LUA_T_STRING, 1, "variable name expected");
+ g = tsvalue(o);
+ // check whether name is in global var list
+ luaL_arg_check((GCnode *)g != g->head.next, 1, "variable name expected");
+ g = (TaggedString *)g->head.next;
+ }
+ while (g && g->u.s.globalval.ttype == LUA_T_NIL) {
+ // skip globals with nil
+ g = (TaggedString *)g->head.next;
+ }
+ if (g) {
+ pushstring(g);
+ luaA_pushobject(&g->u.s.globalval);
+ } else
+ lua_pushnil();
}
-
-static void foreachvar (void)
-{
- TObject f = *luaA_Address(luaL_functionarg(1));
- GCnode *g;
- StkId name = L->Cstack.base++; /* place to keep var name (to avoid GC) */
- ttype(L->stack.stack+name) = LUA_T_NIL;
- L->stack.top++;
- for (g = L->rootglobal.next; g; g = g->next) {
- TaggedString *s = (TaggedString *)g;
- if (s->u.s.globalval.ttype != LUA_T_NIL) {
- ttype(L->stack.stack+name) = LUA_T_STRING;
- tsvalue(L->stack.stack+name) = s; /* keep s on stack to avoid GC */
- luaA_pushobject(&f);
- pushstring(s);
- luaA_pushobject(&s->u.s.globalval);
- luaD_call((L->stack.top-L->stack.stack)-2, 1);
- if (ttype(L->stack.top-1) != LUA_T_NIL)
- return;
- L->stack.top--;
- }
- }
+static void foreachvar() {
+ TObject f = *luaA_Address(luaL_functionarg(1));
+ GCnode *g;
+ StkId name = L->Cstack.base++; // place to keep var name (to avoid GC)
+ ttype(L->stack.stack + name) = LUA_T_NIL;
+ L->stack.top++;
+ for (g = L->rootglobal.next; g; g = g->next) {
+ TaggedString *s = (TaggedString *)g;
+ if (s->u.s.globalval.ttype != LUA_T_NIL) {
+ ttype(L->stack.stack + name) = LUA_T_STRING;
+ tsvalue(L->stack.stack + name) = s; // keep s on stack to avoid GC
+ luaA_pushobject(&f);
+ pushstring(s);
+ luaA_pushobject(&s->u.s.globalval);
+ luaD_call((L->stack.top - L->stack.stack) - 2, 1);
+ if (ttype(L->stack.top - 1) != LUA_T_NIL)
+ return;
+ L->stack.top--;
+ }
+ }
}
-
-static void next (void)
-{
- lua_Object o = luaL_tablearg(1);
- lua_Object r = luaL_nonnullarg(2);
- Node *n = luaH_next(luaA_Address(o), luaA_Address(r));
- if (n) {
- luaA_pushobject(&n->ref);
- luaA_pushobject(&n->val);
- }
- else lua_pushnil();
+static void next() {
+ lua_Object o = luaL_tablearg(1);
+ lua_Object r = luaL_nonnullarg(2);
+ Node *n = luaH_next(luaA_Address(o), luaA_Address(r));
+ if (n) {
+ luaA_pushobject(&n->ref);
+ luaA_pushobject(&n->val);
+ } else
+ lua_pushnil();
}
-
-static void foreach (void)
-{
- TObject t = *luaA_Address(luaL_tablearg(1));
- TObject f = *luaA_Address(luaL_functionarg(2));
- int32 i;
- for (i=0; i<avalue(&t)->nhash; i++) {
- Node *nd = &(avalue(&t)->node[i]);
- if (ttype(ref(nd)) != LUA_T_NIL && ttype(val(nd)) != LUA_T_NIL) {
- luaA_pushobject(&f);
- luaA_pushobject(ref(nd));
- luaA_pushobject(val(nd));
- luaD_call((L->stack.top-L->stack.stack)-2, 1);
- if (ttype(L->stack.top-1) != LUA_T_NIL)
- return;
- L->stack.top--;
- }
- }
+static void foreach() {
+ TObject t = *luaA_Address(luaL_tablearg(1));
+ TObject f = *luaA_Address(luaL_functionarg(2));
+ int32 i;
+ for (i = 0; i < avalue(&t)->nhash; i++) {
+ Node *nd = &(avalue(&t)->node[i]);
+ if (ttype(ref(nd)) != LUA_T_NIL && ttype(val(nd)) != LUA_T_NIL) {
+ luaA_pushobject(&f);
+ luaA_pushobject(ref(nd));
+ luaA_pushobject(val(nd));
+ luaD_call((L->stack.top - L->stack.stack) - 2, 1);
+ if (ttype(L->stack.top - 1) != LUA_T_NIL)
+ return;
+ L->stack.top--;
+ }
+ }
}
-
-static void internaldostring (void)
-{
- int32 l;
- const char *s = luaL_check_lstr(1, &l);
- if (*s == ID_CHUNK)
- lua_error("`dostring' cannot run pre-compiled code");
- if (lua_dobuffer(s, l, luaL_opt_string(2, NULL)) == 0)
- if (luaA_passresults() == 0)
- lua_pushuserdata(NULL); /* at least one result to signal no errors */
+static void internaldostring() {
+ int32 l;
+ const char *s = luaL_check_lstr(1, &l);
+ if (*s == ID_CHUNK)
+ lua_error("`dostring' cannot run pre-compiled code");
+ if (lua_dobuffer(s, l, luaL_opt_string(2, NULL)) == 0)
+ if (luaA_passresults() == 0)
+ lua_pushuserdata(NULL); // at least one result to signal no errors
}
-static void to_string (void) {
- lua_Object obj = lua_getparam(1);
- char *buff = luaL_openspace(30);
- TObject *o = luaA_Address(obj);
- switch (ttype(o)) {
- case LUA_T_NUMBER:
- lua_pushstring(lua_getstring(obj));
- return;
- case LUA_T_STRING:
- lua_pushobject(obj);
- return;
- case LUA_T_ARRAY: {
- sprintf(buff, "table: %p", (void *)o->value.a);
- break;
- }
- case LUA_T_CLOSURE: {
- sprintf(buff, "function: %p", (void *)o->value.cl);
- break;
- }
- case LUA_T_PROTO: {
- sprintf(buff, "function: %p", (void *)o->value.tf);
- break;
- }
- case LUA_T_CPROTO: {
- sprintf(buff, "function: %p", (void *)o->value.f);
- break;
- }
- case LUA_T_USERDATA: {
- sprintf(buff, "userdata: %p", o->value.ts->u.d.v);
- break;
- }
- case LUA_T_TASK: {
- sprintf(buff, "task: %d", (int)o->value.n);
- break;
- }
- case LUA_T_NIL:
- lua_pushstring("nil");
- return;
- default:
- LUA_INTERNALERROR("invalid type");
- }
- lua_pushstring(buff);
+static void to_string() {
+ lua_Object obj = lua_getparam(1);
+ char *buff = luaL_openspace(30);
+ TObject *o = luaA_Address(obj);
+ switch (ttype(o)) {
+ case LUA_T_NUMBER:
+ lua_pushstring(lua_getstring(obj));
+ return;
+ case LUA_T_STRING:
+ lua_pushobject(obj);
+ return;
+ case LUA_T_ARRAY:
+ {
+ sprintf(buff, "table: %p", (void *)o->value.a);
+ break;
+ }
+ case LUA_T_CLOSURE:
+ {
+ sprintf(buff, "function: %p", (void *)o->value.cl);
+ break;
+ }
+ case LUA_T_PROTO:
+ {
+ sprintf(buff, "function: %p", (void *)o->value.tf);
+ break;
+ }
+ case LUA_T_CPROTO:
+ {
+ sprintf(buff, "function: %p", (void *)o->value.f);
+ break;
+ }
+ case LUA_T_USERDATA:
+ {
+ sprintf(buff, "userdata: %p", o->value.ts->u.d.v);
+ break;
+ }
+ case LUA_T_TASK:
+ {
+ sprintf(buff, "task: %d", (int)o->value.n);
+ break;
+ }
+ case LUA_T_NIL:
+ lua_pushstring("nil");
+ return;
+ default:
+ LUA_INTERNALERROR("invalid type");
+ }
+ lua_pushstring(buff);
}
-
-static void luaI_print (void) {
- TaggedString *ts = luaS_new("tostring");
- lua_Object obj;
- int32 i = 1;
- while ((obj = lua_getparam(i++)) != LUA_NOOBJECT) {
- luaA_pushobject(&ts->u.s.globalval);
- lua_pushobject(obj);
- luaD_call((L->stack.top-L->stack.stack)-1, 1);
- if (ttype(L->stack.top-1) != LUA_T_STRING)
- lua_error("`tostring' must return a string to `print'");
- printf("%s\t", svalue(L->stack.top-1));
- L->stack.top--;
- }
- printf("\n");
+static void luaI_print() {
+ TaggedString *ts = luaS_new("tostring");
+ lua_Object obj;
+ int32 i = 1;
+ while ((obj = lua_getparam(i++)) != LUA_NOOBJECT) {
+ luaA_pushobject(&ts->u.s.globalval);
+ lua_pushobject(obj);
+ luaD_call((L->stack.top - L->stack.stack) - 1, 1);
+ if (ttype(L->stack.top - 1) != LUA_T_STRING)
+ lua_error("`tostring' must return a string to `print'");
+ printf("%s\t", svalue(L->stack.top - 1));
+ L->stack.top--;
+ }
+ printf("\n");
}
-
-static void luaI_type (void)
-{
- lua_Object o = luaL_nonnullarg(1);
- lua_pushstring(luaO_typenames[-ttype(luaA_Address(o))]);
- lua_pushnumber(lua_tag(o));
+static void luaI_type() {
+ lua_Object o = luaL_nonnullarg(1);
+ lua_pushstring(luaO_typenames[-ttype(luaA_Address(o))]);
+ lua_pushnumber(lua_tag(o));
}
-
-static void tonumber (void)
-{
- int32 base = (int32)luaL_opt_number(2, 10);
- if (base == 10) { /* standard conversion */
- lua_Object o = lua_getparam(1);
- if (lua_isnumber(o))
- lua_pushnumber(lua_getnumber(o));
- }
- else {
- const char *s = luaL_check_string(1);
- char *e;
- int32 n;
- luaL_arg_check(0 <= base && base <= 36, 2, "base out of range");
- n = (int32)strtol(s, &e, base);
- while (isspace(*e)) e++; /* skip trailing spaces */
- if (*e) lua_pushnil(); /* invalid format: return nil */
- else lua_pushnumber(n);
- }
+static void tonumber() {
+ int32 base = (int32)luaL_opt_number(2, 10);
+ if (base == 10) { // standard conversion
+ lua_Object o = lua_getparam(1);
+ if (lua_isnumber(o))
+ lua_pushnumber(lua_getnumber(o));
+ } else {
+ const char *s = luaL_check_string(1);
+ char *e;
+ int32 n;
+ luaL_arg_check(0 <= base && base <= 36, 2, "base out of range");
+ n = (int32)strtol(s, &e, base);
+ while (isspace(*e))
+ e++; // skip trailing spaces
+ if (*e)
+ lua_pushnil(); // invalid format: return nil
+ else
+ lua_pushnumber(n);
+ }
}
-
-static void luaI_error (void)
-{
- lua_error(lua_getstring(lua_getparam(1)));
+static void luaI_error() {
+ lua_error(lua_getstring(lua_getparam(1)));
}
-
-static void luaI_assert (void)
-{
- lua_Object p = lua_getparam(1);
- if (p == LUA_NOOBJECT || lua_isnil(p))
- luaL_verror("assertion failed! %.100s", luaL_opt_string(2, ""));
+static void luaI_assert() {
+ lua_Object p = lua_getparam(1);
+ if (p == LUA_NOOBJECT || lua_isnil(p))
+ luaL_verror("assertion failed! %.100s", luaL_opt_string(2, ""));
}
-
-static void setglobal (void)
-{
- const char *n = luaL_check_string(1);
- lua_Object value = luaL_nonnullarg(2);
- lua_pushobject(value);
- lua_setglobal(n);
- lua_pushobject(value); /* return given value */
+static void setglobal() {
+ const char *n = luaL_check_string(1);
+ lua_Object value = luaL_nonnullarg(2);
+ lua_pushobject(value);
+ lua_setglobal(n);
+ lua_pushobject(value); // return given value
}
-static void rawsetglobal (void)
-{
- const char *n = luaL_check_string(1);
- lua_Object value = luaL_nonnullarg(2);
- lua_pushobject(value);
- lua_rawsetglobal(n);
- lua_pushobject(value); /* return given value */
+static void rawsetglobal() {
+ const char *n = luaL_check_string(1);
+ lua_Object value = luaL_nonnullarg(2);
+ lua_pushobject(value);
+ lua_rawsetglobal(n);
+ lua_pushobject(value); // return given value
}
-static void getglobal (void)
-{
- lua_pushobject(lua_getglobal(luaL_check_string(1)));
+static void getglobal() {
+ lua_pushobject(lua_getglobal(luaL_check_string(1)));
}
-static void rawgetglobal (void)
-{
- lua_pushobject(lua_rawgetglobal(luaL_check_string(1)));
+static void rawgetglobal() {
+ lua_pushobject(lua_rawgetglobal(luaL_check_string(1)));
}
-static void luatag (void)
-{
- lua_pushnumber(lua_tag(lua_getparam(1)));
+static void luatag() {
+ lua_pushnumber(lua_tag(lua_getparam(1)));
}
-
-static int32 getnarg (lua_Object table)
-{
- lua_Object temp;
- /* temp = table.n */
- lua_pushobject(table); lua_pushstring("n"); temp = lua_rawgettable();
- return (lua_isnumber(temp) ? (int32)lua_getnumber(temp) : MAX_INT);
+static int32 getnarg(lua_Object table) {
+ lua_Object temp;
+ // temp = table.n
+ lua_pushobject(table);
+ lua_pushstring("n");
+ temp = lua_rawgettable();
+ return (lua_isnumber(temp) ? (int32)lua_getnumber(temp) : MAX_INT);
}
-static void luaI_call (void)
-{
- lua_Object f = luaL_nonnullarg(1);
- lua_Object arg = luaL_tablearg(2);
- const char *options = luaL_opt_string(3, "");
- lua_Object err = lua_getparam(4);
- int32 narg = getnarg(arg);
- int32 i, status;
- if (err != LUA_NOOBJECT) { /* set new error method */
- lua_pushobject(err);
- err = lua_seterrormethod();
- }
- /* push arg[1...n] */
- for (i=0; i<narg; i++) {
- lua_Object temp;
- /* temp = arg[i+1] */
- lua_pushobject(arg); lua_pushnumber(i+1); temp = lua_rawgettable();
- if (narg == MAX_INT && lua_isnil(temp))
- break;
- lua_pushobject(temp);
- }
- status = lua_callfunction(f);
- if (err != LUA_NOOBJECT) { /* restore old error method */
- lua_pushobject(err);
- lua_seterrormethod();
- }
- if (status != 0) { /* error in call? */
- if (strchr(options, 'x')) {
- lua_pushnil();
- return; /* return nil to signal the error */
- }
- else
- lua_error(NULL);
- }
- else { /* no errors */
- if (strchr(options, 'p'))
- luaA_packresults();
- else
- luaA_passresults();
- }
+static void luaI_call() {
+ lua_Object f = luaL_nonnullarg(1);
+ lua_Object arg = luaL_tablearg(2);
+ const char *options = luaL_opt_string(3, "");
+ lua_Object err = lua_getparam(4);
+ int32 narg = getnarg(arg);
+ int32 i, status;
+ if (err != LUA_NOOBJECT) { // set new error method
+ lua_pushobject(err);
+ err = lua_seterrormethod();
+ }
+ // push arg[1...n]
+ for (i = 0; i < narg; i++) {
+ lua_Object temp;
+ // temp = arg[i + 1]
+ lua_pushobject(arg);
+ lua_pushnumber(i + 1);
+ temp = lua_rawgettable();
+ if (narg == MAX_INT && lua_isnil(temp))
+ break;
+ lua_pushobject(temp);
+ }
+ status = lua_callfunction(f);
+ if (err != LUA_NOOBJECT) { // restore old error method
+ lua_pushobject(err);
+ lua_seterrormethod();
+ }
+ if (status) { // error in call?
+ if (strchr(options, 'x')) {
+ lua_pushnil();
+ return; // return nil to signal the error
+ } else
+ lua_error(NULL);
+ } else { // no errors
+ if (strchr(options, 'p'))
+ luaA_packresults();
+ else
+ luaA_passresults();
+ }
}
-
-static void settag (void)
-{
- lua_Object o = luaL_tablearg(1);
- lua_pushobject(o);
- lua_settag((int32)luaL_check_number(2));
- lua_pushobject(o); /* returns first argument */
+static void settag() {
+ lua_Object o = luaL_tablearg(1);
+ lua_pushobject(o);
+ lua_settag((int32)luaL_check_number(2));
+ lua_pushobject(o); // returns first argument
}
-
-static void newtag (void)
-{
- lua_pushnumber(lua_newtag());
+static void newtag() {
+ lua_pushnumber(lua_newtag());
}
-
-static void copytagmethods (void)
-{
- lua_pushnumber(lua_copytagmethods((int32)luaL_check_number(1),
- (int32)luaL_check_number(2)));
+static void copytagmethods() {
+ lua_pushnumber(lua_copytagmethods((int32)luaL_check_number(1), (int32)luaL_check_number(2)));
}
-
-static void rawgettable (void)
-{
- lua_pushobject(luaL_nonnullarg(1));
- lua_pushobject(luaL_nonnullarg(2));
- lua_pushobject(lua_rawgettable());
+static void rawgettable() {
+ lua_pushobject(luaL_nonnullarg(1));
+ lua_pushobject(luaL_nonnullarg(2));
+ lua_pushobject(lua_rawgettable());
}
-
-static void rawsettable (void)
-{
- lua_pushobject(luaL_nonnullarg(1));
- lua_pushobject(luaL_nonnullarg(2));
- lua_pushobject(luaL_nonnullarg(3));
- lua_rawsettable();
+static void rawsettable() {
+ lua_pushobject(luaL_nonnullarg(1));
+ lua_pushobject(luaL_nonnullarg(2));
+ lua_pushobject(luaL_nonnullarg(3));
+ lua_rawsettable();
}
-
-static void settagmethod (void)
-{
- lua_Object nf = luaL_nonnullarg(3);
- lua_pushobject(nf);
- lua_pushobject(lua_settagmethod((int32)luaL_check_number(1),
- luaL_check_string(2)));
+static void settagmethod() {
+ lua_Object nf = luaL_nonnullarg(3);
+ lua_pushobject(nf);
+ lua_pushobject(lua_settagmethod((int32)luaL_check_number(1), luaL_check_string(2)));
}
-
-static void gettagmethod (void)
-{
- lua_pushobject(lua_gettagmethod((int32)luaL_check_number(1),
- luaL_check_string(2)));
+static void gettagmethod() {
+ lua_pushobject(lua_gettagmethod((int32)luaL_check_number(1), luaL_check_string(2)));
}
-
-static void seterrormethod (void)
-{
- lua_Object nf = luaL_functionarg(1);
- lua_pushobject(nf);
- lua_pushobject(lua_seterrormethod());
+static void seterrormethod() {
+ lua_Object nf = luaL_functionarg(1);
+ lua_pushobject(nf);
+ lua_pushobject(lua_seterrormethod());
}
-
-static void luaI_collectgarbage (void)
-{
- lua_pushnumber(lua_collectgarbage((int32)luaL_opt_number(1, 0)));
+static void luaI_collectgarbage() {
+ lua_pushnumber(lua_collectgarbage((int32)luaL_opt_number(1, 0)));
}
-
/*
** =======================================================
** some DEBUG functions
** =======================================================
*/
-#ifdef DEBUG
+#ifdef LUA_DEBUG
-static void mem_query (void)
-{
- lua_pushnumber(totalmem);
- lua_pushnumber(numblocks);
+static void mem_query() {
+ lua_pushnumber(totalmem);
+ lua_pushnumber(numblocks);
}
-
-static void countlist (void)
-{
- char *s = luaL_check_string(1);
- GCnode *l = (s[0]=='t') ? L->roottable.next : (s[0]=='c') ? L->rootcl.next :
- (s[0]=='p') ? L->rootproto.next : L->rootglobal.next;
- int32 i=0;
- while (l) {
- i++;
- l = l->next;
- }
- lua_pushnumber(i);
+static void countlist() {
+ char *s = luaL_check_string(1);
+ GCnode *l = (s[0] == 't') ? L->roottable.next : (s[0] == 'c') ? L->rootcl.next :
+ (s[0] == 'p') ? L->rootproto.next : L->rootglobal.next;
+ int32 i = 0;
+ while (l) {
+ i++;
+ l = l->next;
+ }
+ lua_pushnumber(i);
}
-
-static void testC (void)
-{
+static void testC() {
#define getnum(s) ((*s++) - '0')
#define getname(s) (nome[0] = *s++, nome)
- static int32 locks[10];
- lua_Object reg[10];
- char nome[2];
- char *s = luaL_check_string(1);
- nome[1] = 0;
- while (1) {
- switch (*s++) {
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- lua_pushnumber(*(s-1) - '0');
- break;
-
- case 'c': reg[getnum(s)] = lua_createtable(); break;
- case 'C': { lua_CFunction f = lua_getcfunction(lua_getglobal(getname(s)));
- lua_pushcclosure(f, getnum(s));
- break;
- }
- case 'P': reg[getnum(s)] = lua_pop(); break;
- case 'g': { int32 n=getnum(s); reg[n]=lua_getglobal(getname(s)); break; }
- case 'G': { int32 n = getnum(s);
- reg[n] = lua_rawgetglobal(getname(s));
- break;
- }
- case 'l': locks[getnum(s)] = lua_ref(1); break;
- case 'L': locks[getnum(s)] = lua_ref(0); break;
- case 'r': { int32 n=getnum(s); reg[n]=lua_getref(locks[getnum(s)]); break; }
- case 'u': lua_unref(locks[getnum(s)]); break;
- case 'p': { int32 n = getnum(s); reg[n] = lua_getparam(getnum(s)); break; }
- case '=': lua_setglobal(getname(s)); break;
- case 's': lua_pushstring(getname(s)); break;
- case 'o': lua_pushobject(reg[getnum(s)]); break;
- case 'f': (lua_call)(getname(s)); break;
- case 'i': reg[getnum(s)] = lua_gettable(); break;
- case 'I': reg[getnum(s)] = lua_rawgettable(); break;
- case 't': lua_settable(); break;
- case 'T': lua_rawsettable(); break;
- default: luaL_verror("unknown command in `testC': %c", *(s-1));
- }
- if (*s == 0) return;
- if (*s++ != ' ') lua_error("missing ` ' between commands in `testC'");
- }
+ static int32 locks[10];
+ lua_Object reg[10];
+ char nome[2];
+ char *s = luaL_check_string(1);
+ nome[1] = 0;
+ while (1) {
+ switch (*s++) {
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
+ lua_pushnumber(*(s - 1) - '0');
+ break;
+ case 'c':
+ reg[getnum(s)] = lua_createtable();
+ break;
+ case 'C':
+ {
+ lua_CFunction f = lua_getcfunction(lua_getglobal(getname(s)));
+ lua_pushcclosure(f, getnum(s));
+ break;
+ }
+ case 'P':
+ reg[getnum(s)] = lua_pop();
+ break;
+ case 'g':
+ {
+ int32 n=getnum(s);
+ reg[n] = lua_getglobal(getname(s));
+ break;
+ }
+ case 'G':
+ {
+ int32 n = getnum(s);
+ reg[n] = lua_rawgetglobal(getname(s));
+ break;
+ }
+ case 'l':
+ locks[getnum(s)] = lua_ref(1);
+ break;
+ case 'L':
+ locks[getnum(s)] = lua_ref(0);
+ break;
+ case 'r':
+ {
+ int32 n = getnum(s);
+ reg[n] = lua_getref(locks[getnum(s)]);
+ break;
+ }
+ case 'u':
+ lua_unref(locks[getnum(s)]);
+ break;
+ case 'p':
+ {
+ int32 n = getnum(s);
+ reg[n] = lua_getparam(getnum(s));
+ break;
+ }
+ case '=':
+ lua_setglobal(getname(s));
+ break;
+ case 's':
+ lua_pushstring(getname(s));
+ break;
+ case 'o':
+ lua_pushobject(reg[getnum(s)]);
+ break;
+ case 'f':
+ (lua_call)(getname(s));
+ break;
+ case 'i':
+ reg[getnum(s)] = lua_gettable();
+ break;
+ case 'I':
+ reg[getnum(s)] = lua_rawgettable();
+ break;
+ case 't':
+ lua_settable();
+ break;
+ case 'T':
+ lua_rawsettable();
+ break;
+ default:
+ luaL_verror("unknown command in `testC': %c", *(s - 1));
+ }
+ if (*s == 0)
+ return;
+ if (*s++ != ' ')
+ lua_error("missing ` ' between commands in `testC'");
+ }
}
#endif
-
/*
** Internal functions
*/
static struct luaL_reg int_funcs[] = {
#ifdef LUA_COMPAT2_5
- {"setfallback", luaT_setfallback},
+ { "setfallback", luaT_setfallback },
#endif
-#ifdef DEBUG
- {"testC", testC},
- {"totalmem", mem_query},
- {"count", countlist},
+#ifdef LUA_DEBUG
+ { "testC", testC },
+ { "totalmem", mem_query },
+ { "count", countlist },
#endif
- {"assert", luaI_assert},
- {"call", luaI_call},
- {"collectgarbage", luaI_collectgarbage},
- {"copytagmethods", copytagmethods},
- {"dostring", internaldostring},
- {"error", luaI_error},
- {"foreach", foreach},
- {"foreachvar", foreachvar},
- {"getglobal", getglobal},
- {"newtag", newtag},
- {"next", next},
- {"nextvar", nextvar},
- {"print", luaI_print},
- {"rawgetglobal", rawgetglobal},
- {"rawgettable", rawgettable},
- {"rawsetglobal", rawsetglobal},
- {"rawsettable", rawsettable},
- {"seterrormethod", seterrormethod},
- {"setglobal", setglobal},
- {"settagmethod", settagmethod},
- {"gettagmethod", gettagmethod},
- {"settag", settag},
- {"tonumber", tonumber},
- {"tostring", to_string},
- {"tag", luatag},
- {"type", luaI_type},
- {"start_script", start_script},
- {"stop_script", stop_script},
- {"next_script", next_script},
- {"identify_script", identify_script},
- {"pause_scripts", pause_scripts},
- {"unpause_scripts", unpause_scripts},
- {"find_script", find_script},
- {"break_here", break_here}
+ { "assert", luaI_assert },
+ { "call", luaI_call },
+ { "collectgarbage", luaI_collectgarbage },
+ { "copytagmethods", copytagmethods },
+ { "dostring", internaldostring },
+ { "error", luaI_error },
+ { "foreach", foreach },
+ { "foreachvar", foreachvar },
+ { "getglobal", getglobal },
+ { "newtag", newtag },
+ { "next", next },
+ { "nextvar", nextvar },
+ { "print", luaI_print },
+ { "rawgetglobal", rawgetglobal },
+ { "rawgettable", rawgettable },
+ { "rawsetglobal", rawsetglobal },
+ { "rawsettable", rawsettable },
+ { "seterrormethod", seterrormethod },
+ { "setglobal", setglobal },
+ { "settagmethod", settagmethod },
+ { "gettagmethod", gettagmethod },
+ { "settag", settag },
+ { "tonumber", tonumber },
+ { "tostring", to_string },
+ { "tag", luatag },
+ { "type", luaI_type },
+ { "start_script", start_script },
+ { "stop_script", stop_script },
+ { "next_script", next_script },
+ { "identify_script", identify_script },
+ { "pause_scripts", pause_scripts },
+ { "unpause_scripts", unpause_scripts },
+ { "find_script", find_script },
+ { "break_here", break_here }
};
-
-#define INTFUNCSIZE (sizeof(int_funcs)/sizeof(int_funcs[0]))
-
-void luaB_predefine (void)
-{
- /* pre-register mem error messages, to avoid loop when error arises */
- luaS_newfixedstring(tableEM);
- luaS_newfixedstring(memEM);
- luaL_openlib(int_funcs, (sizeof(int_funcs)/sizeof(int_funcs[0])));
- lua_pushstring(LUA_VERSION);
- lua_setglobal("_VERSION");
+void luaB_predefine() {
+ // pre-register mem error messages, to avoid loop when error arises
+ luaS_newfixedstring(tableEM);
+ luaS_newfixedstring(memEM);
+ luaL_openlib(int_funcs, sizeof(int_funcs) / sizeof(int_funcs[0]));
+ lua_pushstring(LUA_VERSION);
+ lua_setglobal("_VERSION");
}
Modified: residual/trunk/engine/lua/lbuiltin.h
===================================================================
--- residual/trunk/engine/lua/lbuiltin.h 2008-07-29 05:05:04 UTC (rev 33396)
+++ residual/trunk/engine/lua/lbuiltin.h 2008-07-29 05:58:36 UTC (rev 33397)
@@ -7,8 +7,6 @@
#ifndef lbuiltin_h
#define lbuiltin_h
+void luaB_predefine();
-void luaB_predefine (void);
-
-
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list