qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 12:52:46 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/ruamoko/rua_plist.c

545 lines
13 KiB
C
Raw Normal View History

plist api (hope it works:)
2003-04-07 20:02:06 +00:00
/*
bi_plist.c
QuakeC plist api
copyright date fixes
2003-04-10 16:54:12 +00:00
Copyright (C) 2003 Bill Currie
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
Author: Bill Currie <bill@taniwha.org>
Date: 2003/4/7
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include <stdlib.h>
#include "QF/hash.h"
[util] Rename qfplist.[ch] The name is a hold-over from before the current quakeforge tree and the QF include directory.
2021-03-21 07:13:03 +00:00
#include "QF/plist.h"
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
#include "QF/progs.h"
more rua cleanups: now just one init function to call (it calls the rest)
2004-01-16 07:03:58 +00:00
#include "rua_internal.h"
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
Fix more gcc 4.8 errors. More actual bugs found, too.
2013-09-27 14:08:33 +00:00
#define always_inline inline __attribute__((__always_inline__))
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
typedef struct bi_plist_s {
struct bi_plist_s *next;
struct bi_plist_s **prev;
plitem_t *plitem;
[plist] Use reference counts for items This makes it much easier to share items between property lists (eg, targets and the main entity list in cl_light).
2023-03-12 06:17:28 +00:00
int users;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
} bi_plist_t;
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
typedef struct {
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
PR_RESMAP (bi_plist_t) plist_map;
bi_plist_t *plists;
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
} plist_resources_t;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
static bi_plist_t *
plist_new (plist_resources_t *res)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
[gamecode] Make PR_RESMAP macros more function-like I never liked that some of the macros needed the type as a parameter (yay typeof and __auto_type) or those that returned a value hid the return statement so they couldn't be used in assignments.
2021-03-21 12:26:36 +00:00
return PR_RESNEW (res->plist_map);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
static void
plist_free (plist_resources_t *res, bi_plist_t *plist)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
[gamecode] Make PR_RESMAP macros more function-like I never liked that some of the macros needed the type as a parameter (yay typeof and __auto_type) or those that returned a value hid the return statement so they couldn't be used in assignments.
2021-03-21 12:26:36 +00:00
PR_RESFREE (res->plist_map, plist);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
static void
plist_reset (plist_resources_t *res)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
[gamecode] Make PR_RESMAP macros more function-like I never liked that some of the macros needed the type as a parameter (yay typeof and __auto_type) or those that returned a value hid the return statement so they couldn't be used in assignments.
2021-03-21 12:26:36 +00:00
PR_RESRESET (res->plist_map);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
static inline bi_plist_t *
plist_get (plist_resources_t *res, unsigned index)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
[gamecode] Make PR_RESMAP macros more function-like I never liked that some of the macros needed the type as a parameter (yay typeof and __auto_type) or those that returned a value hid the return statement so they couldn't be used in assignments.
2021-03-21 12:26:36 +00:00
return PR_RESGET(res->plist_map, index);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
}
[build] Fix a pile of gcc 10 issues gcc got stricter about array accesses, complicating progs macros, and much better at detecting buffer overflows.
2020-12-20 17:12:51 +00:00
static inline int __attribute__((pure))
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
plist_index (plist_resources_t *res, bi_plist_t *plist)
{
[gamecode] Make PR_RESMAP macros more function-like I never liked that some of the macros needed the type as a parameter (yay typeof and __auto_type) or those that returned a value hid the return statement so they couldn't be used in assignments.
2021-03-21 12:26:36 +00:00
return PR_RESINDEX(res->plist_map, plist);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_clear (progs_t *pr, void *_res)
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = (plist_resources_t *) _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
bi_plist_t *plist;
for (plist = res->plists; plist; plist = plist->next) {
[plist] Use reference counts for items This makes it much easier to share items between property lists (eg, targets and the main entity list in cl_light).
2023-03-12 06:17:28 +00:00
PL_Release (plist->plitem);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
}
Fix some bugs found while hacking inputlines.
2011-07-09 00:42:11 +00:00
res->plists = 0;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
plist_reset (res);
}
[gamecode] Add PR_Shutdown for tearing down a VM This is meant for a "permanent" tear-down before freeing the memory holding the VM state or at program shutdown. As a consequence, builtin sub-systems registering resources are now required to pass a "destroy" function pointer that will be called just before the memory holding those resources is freed by the VM resource manager (ie, the manager owns the resource memory block, but each subsystem is responsible for cleaning up any resources held within that block). This even enhances thread-safety in rua_obj (there are some problems with cmd, cvar, and gib).
2022-05-12 09:23:32 +00:00
static void
bi_plist_destroy (progs_t *pr, void *_res)
{
__auto_type res = (plist_resources_t *) _res;
[gamecode] Clean up a pile of memory leaks Usually doesn't matter, but it makes it easier to evaluate valgrind's output.
2023-03-03 13:07:27 +00:00
PR_RESDELMAP (res->plist_map);
[gamecode] Make modules responsible for freeing resources It should have been this way all along, and it seems I thought they were when I did rua_gui.c as it already freed its resource block, which would have been a double free (oops). Fixes an invalid write when shutting down progs in qwaq-cmd (relevant change not committed).
2023-03-03 10:36:28 +00:00
free (res);
[gamecode] Add PR_Shutdown for tearing down a VM This is meant for a "permanent" tear-down before freeing the memory holding the VM state or at program shutdown. As a consequence, builtin sub-systems registering resources are now required to pass a "destroy" function pointer that will be called just before the memory holding those resources is freed by the VM resource manager (ie, the manager owns the resource memory block, but each subsystem is responsible for cleaning up any resources held within that block). This even enhances thread-safety in rua_obj (there are some problems with cmd, cvar, and gib).
2022-05-12 09:23:32 +00:00
}
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
static inline int
plist_handle (plist_resources_t *res, plitem_t *plitem)
{
[plist] Use reference counts for items This makes it much easier to share items between property lists (eg, targets and the main entity list in cl_light).
2023-03-12 06:17:28 +00:00
bi_plist_t *plist = PL_GetUserData (plitem);
Massive whitespace cleanup. Lots of trailing whitespace and otherwise blank lines.
2012-05-21 23:23:22 +00:00
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
if (plist)
return plist_index (res, plist);
plist = plist_new (res);
if (!plist)
return 0;
plist->next = res->plists;
plist->prev = &res->plists;
if (res->plists)
res->plists->prev = &plist->next;
res->plists = plist;
[plist] Use reference counts for items This makes it much easier to share items between property lists (eg, targets and the main entity list in cl_light).
2023-03-12 06:17:28 +00:00
PL_Retain (plitem);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
plist->plitem = plitem;
[plist] Use reference counts for items This makes it much easier to share items between property lists (eg, targets and the main entity list in cl_light).
2023-03-12 06:17:28 +00:00
PL_SetUserData (plitem, plist);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
return plist_index (res, plist);
}
static inline void
plist_free_handle (plist_resources_t *res, bi_plist_t *plist)
{
[plist] Use reference counts for items This makes it much easier to share items between property lists (eg, targets and the main entity list in cl_light).
2023-03-12 06:17:28 +00:00
PL_SetUserData (plist->plitem, 0);
PL_Release (plist->plitem);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
*plist->prev = plist->next;
Fix some bugs found while hacking inputlines.
2011-07-09 00:42:11 +00:00
if (plist->next)
plist->next->prev = plist->prev;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
plist_free (res, plist);
}
[gamecode] Pass gcc's purity test again I guess maybe that change might make a bigger difference than I thought, gcc wasn't happy with it.
2022-02-14 10:30:50 +00:00
static always_inline bi_plist_t * __attribute__((pure))
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
get_plist (progs_t *pr, plist_resources_t *res, const char *name, int handle)
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
{
bi_plist_t *plist = plist_get (res, handle);
// plist->prev will be null if the handle is unallocated
if (!plist || !plist->prev)
PR_RunError (pr, "invalid plist passed to %s", name + 3);
return plist;
}
static inline int
plist_retain (plist_resources_t *res, plitem_t *plitem)
{
int handle;
if (!plitem)
return 0;
handle = plist_handle (res, plitem);
if (!handle) {
// we're taking ownership of the plitem, but we have nowhere to store
// it, so we have to lose it. However, in this situation, we have worse
// things to worry about.
[plist] Use reference counts for items This makes it much easier to share items between property lists (eg, targets and the main entity list in cl_light).
2023-03-12 06:17:28 +00:00
PL_Release (plitem);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
return 0;
}
return handle;
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
Add PL_GetFromFile builtin. This is an extension "wrapper" (no such C function). This allows ruamoko programs to read property lists without worrying about the memory required to store the string for the property list being read.
2010-11-24 04:12:41 +00:00
static void
[plist] Add parsing for bare dictionaries and arrays Requiring top-level {} or () for (usually) hand-written files is awkward and even a little error prone, and certainly ugly at times. With this, loaders that expect a particular format can specify the format a little more directly.
2023-03-12 05:31:17 +00:00
bi_pl_getfromfile (progs_t *pr, plist_resources_t *res,
plitem_t *get (const char *, struct hashctx_s **))
Add PL_GetFromFile builtin. This is an extension "wrapper" (no such C function). This allows ruamoko programs to read property lists without worrying about the memory required to store the string for the property list being read.
2010-11-24 04:12:41 +00:00
{
QFile *file = QFile_GetFile (pr, P_INT (pr, 0));
plitem_t *plitem;
long offset;
long size;
long len;
char *buf;
offset = Qtell (file);
size = Qfilesize (file);
len = size - offset;
buf = malloc (len + 1);
Qread (file, buf, len);
buf[len] = 0;
[plist] Add parsing for bare dictionaries and arrays Requiring top-level {} or () for (usually) hand-written files is awkward and even a little error prone, and certainly ugly at times. With this, loaders that expect a particular format can specify the format a little more directly.
2023-03-12 05:31:17 +00:00
plitem = get (buf, pr->hashctx);
[ruamoko] Free buffer used for loading plists That's definitely a leak.
2022-05-12 13:47:55 +00:00
free (buf);
Massive whitespace cleanup. Lots of trailing whitespace and otherwise blank lines.
2012-05-21 23:23:22 +00:00
Add PL_GetFromFile builtin. This is an extension "wrapper" (no such C function). This allows ruamoko programs to read property lists without worrying about the memory required to store the string for the property list being read.
2010-11-24 04:12:41 +00:00
R_INT (pr) = plist_retain (res, plitem);
}
[plist] Add parsing for bare dictionaries and arrays Requiring top-level {} or () for (usually) hand-written files is awkward and even a little error prone, and certainly ugly at times. With this, loaders that expect a particular format can specify the format a little more directly.
2023-03-12 05:31:17 +00:00
static void
bi_pl_get (progs_t *pr, plist_resources_t *res,
plitem_t *get (const char *, struct hashctx_s **))
{
plitem_t *plitem = get (P_GSTRING (pr, 0), pr->hashctx);
R_INT (pr) = plist_retain (res, plitem);
}
static void
bi_PL_GetFromFile (progs_t *pr, void *_res)
{
plist_resources_t *res = _res;
bi_pl_getfromfile (pr, res, PL_GetPropertyList);
}
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_GetPropertyList (progs_t *pr, void *_res)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
[plist] Add parsing for bare dictionaries and arrays Requiring top-level {} or () for (usually) hand-written files is awkward and even a little error prone, and certainly ugly at times. With this, loaders that expect a particular format can specify the format a little more directly.
2023-03-12 05:31:17 +00:00
bi_pl_get (pr, res, PL_GetPropertyList);
}
Massive whitespace cleanup. Lots of trailing whitespace and otherwise blank lines.
2012-05-21 23:23:22 +00:00
[plist] Add parsing for bare dictionaries and arrays Requiring top-level {} or () for (usually) hand-written files is awkward and even a little error prone, and certainly ugly at times. With this, loaders that expect a particular format can specify the format a little more directly.
2023-03-12 05:31:17 +00:00
static void
bi_PL_GetDictionaryFromFile (progs_t *pr, void *_res)
{
plist_resources_t *res = _res;
bi_pl_getfromfile (pr, res, PL_GetDictionary);
}
static void
bi_PL_GetDictionary (progs_t *pr, void *_res)
{
plist_resources_t *res = _res;
bi_pl_get (pr, res, PL_GetDictionary);
}
static void
bi_PL_GetArrayFromFile (progs_t *pr, void *_res)
{
plist_resources_t *res = _res;
bi_pl_getfromfile (pr, res, PL_GetArray);
}
static void
bi_PL_GetArray (progs_t *pr, void *_res)
{
plist_resources_t *res = _res;
bi_pl_get (pr, res, PL_GetArray);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_WritePropertyList (progs_t *pr, void *_res)
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int handle = P_INT (pr, 0);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
char *pl = PL_WritePropertyList (plist->plitem);
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
R_STRING (pr) = PR_SetDynamicString (pr, pl);
free (pl);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_Type (progs_t *pr, void *_res)
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int handle = P_INT (pr, 0);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
R_INT (pr) = PL_Type (plist->plitem);
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
}
[ruamoko] Add a wrapper for PL_Line Makes error reporting in rua code easier.
2020-12-23 12:52:42 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_Line (progs_t *pr, void *_res)
[ruamoko] Add a wrapper for PL_Line Makes error reporting in rua code easier.
2020-12-23 12:52:42 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
[ruamoko] Add a wrapper for PL_Line Makes error reporting in rua code easier.
2020-12-23 12:52:42 +00:00
int handle = P_INT (pr, 0);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
[ruamoko] Add a wrapper for PL_Line Makes error reporting in rua code easier.
2020-12-23 12:52:42 +00:00
R_INT (pr) = PL_Line (plist->plitem);
}
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_String (progs_t *pr, void *_res)
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int handle = P_INT (pr, 0);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
const char *str = PL_String (plist->plitem);
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
RETURN_STRING (pr, str);
}
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_ObjectForKey (progs_t *pr, void *_res)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int handle = P_INT (pr, 0);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
const char *key = P_GSTRING (pr, 1);
plitem_t *plitem = PL_ObjectForKey (plist->plitem, key);
R_INT (pr) = 0;
if (!plitem)
return;
R_INT (pr) = plist_handle (res, plitem);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_RemoveObjectForKey (progs_t *pr, void *_res)
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int handle = P_INT (pr, 0);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
const char *key = P_GSTRING (pr, 1);
[plist] Use reference counts for items This makes it much easier to share items between property lists (eg, targets and the main entity list in cl_light).
2023-03-12 06:17:28 +00:00
PL_RemoveObjectForKey (plist->plitem, key);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_ObjectAtIndex (progs_t *pr, void *_res)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int handle = P_INT (pr, 0);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int ind = P_INT (pr, 1);
plitem_t *plitem = PL_ObjectAtIndex (plist->plitem, ind);
R_INT (pr) = 0;
if (!plitem)
return;
R_INT (pr) = plist_handle (res, plitem);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_D_AllKeys (progs_t *pr, void *_res)
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int handle = P_INT (pr, 0);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
plitem_t *plitem = PL_D_AllKeys (plist->plitem);
R_INT (pr) = plist_retain (res, plitem);
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_D_NumKeys (progs_t *pr, void *_res)
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int handle = P_INT (pr, 0);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
R_INT (pr) = PL_D_NumKeys (plist->plitem);
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
}
[ruamoko] Add support for PL_KeyAtIndex I'd forgotten to wrap the function when I added it, but didn't need it until now.
2023-02-11 17:30:21 +00:00
static void
bi_PL_KeyAtIndex (progs_t *pr, void *_res)
{
plist_resources_t *res = _res;
int handle = P_INT (pr, 0);
int index = P_INT (pr, 1);
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
const char *key = PL_KeyAtIndex (plist->plitem, index);
RETURN_STRING (pr, key);
}
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_D_AddObject (progs_t *pr, void *_res)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int dict_handle = P_INT (pr, 0);
int obj_handle = P_INT (pr, 2);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *dict = get_plist (pr, res, __FUNCTION__, dict_handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
const char *key = P_GSTRING (pr, 1);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *obj = get_plist (pr, res, __FUNCTION__, obj_handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
R_INT (pr) = PL_D_AddObject (dict->plitem, key, obj->plitem);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_A_AddObject (progs_t *pr, void *_res)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int arr_handle = P_INT (pr, 0);
int obj_handle = P_INT (pr, 1);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *arr = get_plist (pr, res, __FUNCTION__, arr_handle);
bi_plist_t *obj = get_plist (pr, res, __FUNCTION__, obj_handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
R_INT (pr) = PL_A_AddObject (arr->plitem, obj->plitem);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_A_NumObjects (progs_t *pr, void *_res)
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int handle = P_INT (pr, 0);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
R_INT (pr) = PL_A_NumObjects (plist->plitem);
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
}
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_A_InsertObjectAtIndex (progs_t *pr, void *_res)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int dict_handle = P_INT (pr, 0);
int obj_handle = P_INT (pr, 1);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *arr = get_plist (pr, res, __FUNCTION__, dict_handle);
bi_plist_t *obj = get_plist (pr, res, __FUNCTION__, obj_handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int ind = P_INT (pr, 2);
R_INT (pr) = PL_A_InsertObjectAtIndex (arr->plitem, obj->plitem, ind);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_RemoveObjectAtIndex (progs_t *pr, void *_res)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int handle = P_INT (pr, 0);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int ind = P_INT (pr, 1);
[plist] Use reference counts for items This makes it much easier to share items between property lists (eg, targets and the main entity list in cl_light).
2023-03-12 06:17:28 +00:00
PL_RemoveObjectAtIndex (plist->plitem, ind);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_NewDictionary (progs_t *pr, void *_res)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
[hash] Rename the publicly visible hashlink_t to hashctx_t I think my biggest problem with the hashlink freelist parameter was how much implementation it exposed in just the name.
2022-05-12 08:54:23 +00:00
plitem_t *plitem = PL_NewDictionary (pr->hashctx);
Massive whitespace cleanup. Lots of trailing whitespace and otherwise blank lines.
2012-05-21 23:23:22 +00:00
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
R_INT (pr) = plist_retain (res, plitem);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_NewArray (progs_t *pr, void *_res)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
plitem_t *plitem = PL_NewArray ();
Massive whitespace cleanup. Lots of trailing whitespace and otherwise blank lines.
2012-05-21 23:23:22 +00:00
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
R_INT (pr) = plist_retain (res, plitem);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_NewData (progs_t *pr, void *_res)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
//FIXME not safe
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
plitem_t *plitem = PL_NewData (P_GPOINTER (pr, 0), P_INT (pr, 1));
Massive whitespace cleanup. Lots of trailing whitespace and otherwise blank lines.
2012-05-21 23:23:22 +00:00
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
R_INT (pr) = plist_retain (res, plitem);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_PL_NewString (progs_t *pr, void *_res)
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
plitem_t *plitem = PL_NewString (P_GSTRING (pr, 0));
Massive whitespace cleanup. Lots of trailing whitespace and otherwise blank lines.
2012-05-21 23:23:22 +00:00
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
R_INT (pr) = plist_retain (res, plitem);
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
}
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
static void
[plist] Use reference counts for items This makes it much easier to share items between property lists (eg, targets and the main entity list in cl_light).
2023-03-12 06:17:28 +00:00
bi_PL_Release (progs_t *pr, void *_res)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = _res;
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
int handle = P_INT (pr, 0);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
[plist] Use reference counts for items This makes it much easier to share items between property lists (eg, targets and the main entity list in cl_light).
2023-03-12 06:17:28 +00:00
if (!(plist->users && --plist->users > 0)) {
plist_free_handle (res, plist);
handle = 0;
}
R_INT (pr) = handle;
}
Rewrite ruamoko plist support to use handles. The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
2010-11-19 04:39:20 +00:00
[plist] Use reference counts for items This makes it much easier to share items between property lists (eg, targets and the main entity list in cl_light).
2023-03-12 06:17:28 +00:00
static void
bi_PL_Retain (progs_t *pr, void *_res)
{
plist_resources_t *res = _res;
int handle = P_INT (pr, 0);
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
[plist] Use reference counts for items This makes it much easier to share items between property lists (eg, targets and the main entity list in cl_light).
2023-03-12 06:17:28 +00:00
plist->users++;
R_INT (pr) = handle;
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
[ruamoko] Retrieve a plitem_t from PropertyList And also internally for cross-builtin use.
2021-12-21 15:24:14 +00:00
plitem_t *
Plist_GetItem (progs_t *pr, int handle)
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
plist_resources_t *res = PR_Resources_Find (pr, "plist");
bi_plist_t *plist = get_plist (pr, res, __FUNCTION__, handle);
[ruamoko] Retrieve a plitem_t from PropertyList And also internally for cross-builtin use.
2021-12-21 15:24:14 +00:00
return plist->plitem;
}
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
#define bi(x,np,params...) {#x, bi_##x, -1, np, {params}}
#define p(type) PR_PARAM(type)
move to using a hash table for builtin number -> builtin lookup so sparse ranges can be used efficiently. move the auto-allocated builtins to 0x10000000-0x7fffffff. should be more than enough :) use static builtin tables ("nul" terminated) instead of a series of function calls to add builtins to a vm. should be more memory efficient.
2004-01-06 05:51:09 +00:00
static builtin_t builtins[] = {
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
bi(PL_GetFromFile, 1, p(ptr)),
bi(PL_GetPropertyList, 1, p(string)),
[plist] Add parsing for bare dictionaries and arrays Requiring top-level {} or () for (usually) hand-written files is awkward and even a little error prone, and certainly ugly at times. With this, loaders that expect a particular format can specify the format a little more directly.
2023-03-12 05:31:17 +00:00
bi(PL_GetDictionary, 1, p(string)),
bi(PL_GetDictionaryFromFile, 1, p(string)),
bi(PL_GetArray, 1, p(string)),
bi(PL_GetArrayFromFile, 1, p(string)),
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
bi(PL_WritePropertyList, 1, p(ptr)),
bi(PL_Type, 1, p(ptr)),
bi(PL_Line, 1, p(ptr)),
bi(PL_String, 1, p(ptr)),
bi(PL_ObjectForKey, 2, p(ptr), p(string)),
bi(PL_RemoveObjectForKey, 2, p(ptr), p(string)),
bi(PL_ObjectAtIndex, 2, p(ptr), p(int)),
bi(PL_D_AllKeys, 1, p(ptr)),
bi(PL_D_NumKeys, 1, p(ptr)),
[ruamoko] Add support for PL_KeyAtIndex I'd forgotten to wrap the function when I added it, but didn't need it until now.
2023-02-11 17:30:21 +00:00
bi(PL_KeyAtIndex, 2, p(ptr), p(int)),
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
bi(PL_D_AddObject, 3, p(ptr), p(string), p(ptr)),
bi(PL_A_AddObject, 2, p(ptr), p(ptr)),
bi(PL_A_NumObjects, 1, p(ptr)),
bi(PL_A_InsertObjectAtIndex, 3, p(ptr), p(ptr), p(int)),
bi(PL_RemoveObjectAtIndex, 2, p(ptr), p(int)),
bi(PL_NewDictionary, 0),
bi(PL_NewArray, 0),
bi(PL_NewData, 2, p(ptr), p(int)),
bi(PL_NewString, 1, p(string)),
[plist] Use reference counts for items This makes it much easier to share items between property lists (eg, targets and the main entity list in cl_light).
2023-03-12 06:17:28 +00:00
bi(PL_Release, 1, p(ptr)),
bi(PL_Retain, 1, p(ptr)),
move to using a hash table for builtin number -> builtin lookup so sparse ranges can be used efficiently. move the auto-allocated builtins to 0x10000000-0x7fffffff. should be more than enough :) use static builtin tables ("nul" terminated) instead of a series of function calls to add builtins to a vm. should be more memory efficient.
2004-01-06 05:51:09 +00:00
{0}
};
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
void
more rua cleanups: now just one init function to call (it calls the rest)
2004-01-16 07:03:58 +00:00
RUA_Plist_Init (progs_t *pr, int secure)
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
{
wrap the plist functions This is an imperfect revision of history.
2004-11-11 22:42:00 +00:00
plist_resources_t *res = calloc (1, sizeof (plist_resources_t));
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
[gamecode] Add PR_Shutdown for tearing down a VM This is meant for a "permanent" tear-down before freeing the memory holding the VM state or at program shutdown. As a consequence, builtin sub-systems registering resources are now required to pass a "destroy" function pointer that will be called just before the memory holding those resources is freed by the VM resource manager (ie, the manager owns the resource memory block, but each subsystem is responsible for cleaning up any resources held within that block). This even enhances thread-safety in rua_obj (there are some problems with cmd, cvar, and gib).
2022-05-12 09:23:32 +00:00
PR_Resources_Register (pr, "plist", res, bi_plist_clear, bi_plist_destroy);
[gamecode] Add a data pointer passed to builtin functions This is part of the work for #26 (Record resource pointer with builtin function data). Currently, the data pointer gets as far as the per-instance VM function table (I don't feel like tackling the job of converting all the builtin functions tonight). All the builtin modules that register a resources data block pass that block on to PR_RegisterBuiltins.
2022-01-23 15:20:05 +00:00
PR_RegisterBuiltins (pr, builtins, res);
plist api (hope it works:)
2003-04-07 20:02:06 +00:00
}
Reference in a new issue Copy permalink