qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-22 02:11:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ruamoko] Separate the two str_mid builtins

Browse source 
pr_argc cannot be used in Ruamoko progs because nothing sets it. This
fixes the parse errors and resulting segfault when trying to parse the
Vulkan pipeline config.
This commit is contained in:
Bill Currie 2022-02-04 11:38:36 +09:00
parent 26fca581fc
commit b425f449b6
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
libs/ruamoko/rua_string.c
View file

@ -175,17 +175,10 @@ bi_str_clear (progs_t *pr)
}
static void
bi_str_mid (progs_t *pr)
str_mid (progs_t *pr, const char *str, int pos, int end, int size)
{
const char *str = P_GSTRING (pr, 0);
int pos = P_INT (pr, 1);
int end = P_INT (pr, 2);
int size = strlen (str);
char *temp;
if (pr->pr_argc == 2)
end = size;
R_STRING (pr) = 0;
if (pos < 0)
pos += size;
@ -205,6 +198,27 @@ bi_str_mid (progs_t *pr)
RETURN_STRING (pr, temp);
}
static void
bi_str_mid_2 (progs_t *pr)
{
const char *str = P_GSTRING (pr, 0);
int pos = P_INT (pr, 1);
int size = strlen (str);
str_mid (pr, str, pos, size, size);
}
static void
bi_str_mid_3 (progs_t *pr)
{
const char *str = P_GSTRING (pr, 0);
int pos = P_INT (pr, 1);
int end = P_INT (pr, 2);
int size = strlen (str);
str_mid (pr, str, pos, end, size);
}
static void
bi_str_str (progs_t *pr)
{
@ -316,8 +330,8 @@ static builtin_t builtins[] = {
bi(str_copy, 2, p(string), p(string)),
bi(str_cat, 2, p(string), p(string)),
bi(str_clear, 1, p(string)),
{"str_mid|*i", bi_str_mid, -1, 2, {p(string), p(int)}},
{"str_mid|*ii", bi_str_mid, -1, 3, {p(string), p(int), p(int)}},
{"str_mid|*i", bi_str_mid_2, -1, 2, {p(string), p(int)}},
{"str_mid|*ii", bi_str_mid_3, -1, 3, {p(string), p(int), p(int)}},
bi(str_str, 2, p(string), p(string)),
bi(str_char, 2, p(string), p(int)),
bi(str_quote, 1, p(string)),