js/Cube
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Be more tolerant of invalid arguments

Browse source 
FossilOrigin-Name: d2f07d884a4f4319ff687e085c3233e210ee05b46a2675ecd757a261e6f19e6e
This commit is contained in:
Jonathan Schleifer 2025-03-12 00:16:05 +00:00
parent f1968ce5af
commit 38747afbb5
12 changed files with 112 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/Command.mm
View file

@ -1,4 +1,5 @@
#import "Command.h"
#import "OFString+Cube.h"
#include <cube.h>
@ -38,34 +39,34 @@ padArguments(OFArray<OFString *> *arguments, size_t count)
if (isDown) {
arguments = padArguments(arguments, 2);
((void(__cdecl *)(int))_function)(
[arguments[1] intValueWithBase:0]);
[arguments[1] cube_intValueWithBase:0]);
}
break;
case ARG_2INT:
if (isDown) {
arguments = padArguments(arguments, 3);
((void(__cdecl *)(int, int))_function)(
[arguments[1] intValueWithBase:0],
[arguments[2] intValueWithBase:0]);
[arguments[1] cube_intValueWithBase:0],
[arguments[2] cube_intValueWithBase:0]);
}
break;
case ARG_3INT:
if (isDown) {
arguments = padArguments(arguments, 4);
((void(__cdecl *)(int, int, int))_function)(
[arguments[1] intValueWithBase:0],
[arguments[2] intValueWithBase:0],
[arguments[3] intValueWithBase:0]);
[arguments[1] cube_intValueWithBase:0],
[arguments[2] cube_intValueWithBase:0],
[arguments[3] cube_intValueWithBase:0]);
}
break;
case ARG_4INT:
if (isDown) {
arguments = padArguments(arguments, 5);
((void(__cdecl *)(int, int, int, int))_function)(
[arguments[1] intValueWithBase:0],
[arguments[2] intValueWithBase:0],
[arguments[3] intValueWithBase:0],
[arguments[4] intValueWithBase:0]);
[arguments[1] cube_intValueWithBase:0],
[arguments[2] cube_intValueWithBase:0],
[arguments[3] cube_intValueWithBase:0],
[arguments[4] cube_intValueWithBase:0]);
}
break;
case ARG_NONE:

7
src/MenuItem.m
View file

@ -23,12 +23,17 @@
x = _text.intValue;
} @catch (OFInvalidFormatException *e) {
x = 0;
} @catch (OFOutOfRangeException *e) {
x = 0;
}
@try {
@
try {
y = otherItem.text.intValue;
} @catch (OFInvalidFormatException *e) {
y = 0;
} @catch (OFOutOfRangeException *e) {
y = 0;
}
if (x > y)

3
src/clientgame.mm
View file

@ -3,6 +3,7 @@
#include "cube.h"
#import "DynamicEntity.h"
#import "OFString+Cube.h"
int nextmode = 0; // nextmode becomes gamemode after next map load
VAR(gamemode, 1, 0, 0);
@ -238,7 +239,7 @@ static OFString *sleepcmd = nil;
void
sleepf(OFString *msec, OFString *cmd)
{
sleepwait = msec.intValue + lastmillis;
sleepwait = msec.cube_intValue + lastmillis;
sleepcmd = cmd;
}
COMMANDN(sleep, sleepf, ARG_2STR)

116
src/commands.mm
View file

@ -8,6 +8,7 @@
#import "Alias.h"
#import "Command.h"
#import "Identifier.h"
#import "OFString+Cube.h"
#import "Variable.h"
// contains ALL vars/commands/aliases
@ -181,6 +182,54 @@ lookup(OFString *n) // find value of ident referenced with $ in exp
return n;
}
int
executeIdentifier(__kindof Identifier *identifier,
OFArray<OFString *> *arguments, bool isDown)
{
if (identifier == nil) {
@try {
return [arguments[0] intValueWithBase:0];
} @catch (OFInvalidFormatException *e) {
conoutf(@"unknown command: %@", arguments[0]);
return 0;
} @catch (OFOutOfRangeException *e) {
conoutf(@"invalid value: %@", arguments[0]);
return 0;
}
}
if ([identifier isKindOfClass:Command.class])
// game defined commands use very ad-hoc function signature,
// and just call it
return [identifier callWithArguments:arguments isDown:isDown];
if ([identifier isKindOfClass:Variable.class]) {
if (!isDown)
return 0;
// game defined variables
if (arguments.count < 2 || arguments[1].length == 0)
[identifier printValue];
else
[identifier
setValue:[arguments[1] cube_intValueWithBase:0]];
}
if ([identifier isKindOfClass:Alias.class]) {
// alias, also used as functions and (global) variables
for (int i = 1; i < arguments.count; i++) {
// set any arguments as (global) arg values so
// functions can access them
OFString *t = [OFString stringWithFormat:@"arg%d", i];
alias(t, arguments[i]);
}
return execute([identifier action], isDown);
}
return 0;
}
// all evaluation happens here, recursively
int
execute(OFString *string, bool isDown)
@ -230,55 +279,8 @@ execute(OFString *string, bool isDown)
if (c.length == 0)
continue;
__kindof Identifier *identifier = identifiers[c];
if (identifier == nil) {
@try {
val = [c intValueWithBase:0];
} @catch (OFInvalidFormatException *e) {
conoutf(@"unknown command: %@", c);
}
} else {
if ([identifier isKindOfClass:Command.class]) {
// game defined commands use very
// ad-hoc function signature, and just
// call it
OFArray<OFString *> *arguments =
[[OFArray alloc]
initWithObjects:w
count:numargs];
val = [identifier
callWithArguments:arguments
isDown:isDown];
} else if ([identifier
isKindOfClass:Variable.class]) {
// game defined variables
if (isDown) {
if (w[1].length == 0)
[identifier printValue];
else
[identifier
setValue:
[w[1]
intValueWithBase:
0]];
}
} else if ([identifier
isKindOfClass:Alias.class]) {
// alias, also used as functions and
// (global) variables
for (int i = 1; i < numargs; i++) {
// set any arguments as
// (global) arg values so
// functions can access them
OFString *t = [OFString
stringWithFormat:@"arg%d",
i];
alias(t, w[i]);
}
val = execute(
[identifier action], isDown);
}
}
val = executeIdentifier(identifiers[c],
[OFArray arrayWithObjects:w count:numargs], isDown);
}
return val;
@ -378,10 +380,9 @@ writecfg()
return;
}
[stream writeString:
@"// automatically written on exit, do not modify\n"
@"// delete this file to have defaults.cfg overwrite these "
@"settings\n"
[stream writeString:@"// automatically written on exit, do not modify\n"
@"// delete this file to have defaults.cfg "
@"overwrite these settings\n"
@"// modify settings in game, or put settings in "
@"autoexec.cfg to override anything\n"
@"\n"];
@ -418,8 +419,8 @@ writecfg()
COMMAND(writecfg, ARG_NONE)
// below the commands that implement a small imperative language. thanks to the
// semantics of
// () and [] expressions, any control construct can be defined trivially.
// semantics of () and [] expressions, any control construct can be defined
// trivially.
void
intset(OFString *name, int v)
@ -439,7 +440,7 @@ void
loopa(OFString *times, OFString *body)
{
@autoreleasepool {
int t = times.intValue;
int t = times.cube_intValue;
loopi(t)
{
@ -497,10 +498,9 @@ void
at(OFString *s_, OFString *pos)
{
@autoreleasepool {
int n = pos.intValue;
int n = pos.cube_intValue;
std::unique_ptr<char> copy(strdup(s_.UTF8String));
char *s = copy.get();
loopi(n) s += strspn(s += strcspn(s, " \0"), " ");
s[strcspn(s, " \0")] = 0;
concat(@(s));

5
src/console.mm
View file

@ -5,6 +5,7 @@
#include <ctype.h>
#import "KeyMapping.h"
#import "OFString+Cube.h"
struct cline {
char *cref;
@ -106,8 +107,8 @@ keymap(OFString *code, OFString *key, OFString *action)
if (keyMappings == nil)
keyMappings = [[OFMutableArray alloc] init];
KeyMapping *mapping = [[KeyMapping alloc] initWithCode:code.intValue
name:key];
KeyMapping *mapping =
[[KeyMapping alloc] initWithCode:code.cube_intValue name:key];
mapping.action = action;
[keyMappings addObject:mapping];
}

5
src/editing.mm
View file

@ -4,6 +4,7 @@
#include "cube.h"
#import "DynamicEntity.h"
#import "OFString+Cube.h"
bool editmode = false;
@ -605,8 +606,8 @@ newent(OFString *what, OFString *a1, OFString *a2, OFString *a3, OFString *a4)
EDITSEL;
@autoreleasepool {
newentity(sel.x, sel.y, (int)player1.o.z, what,
[a1 intValueWithBase:0], [a2 intValueWithBase:0],
[a3 intValueWithBase:0], [a4 intValueWithBase:0]);
[a1 cube_intValueWithBase:0], [a2 cube_intValueWithBase:0],
[a3 cube_intValueWithBase:0], [a4 cube_intValueWithBase:0]);
}
}

1
src/meson.build
View file

@ -10,6 +10,7 @@ executable('client',
'MapModelInfo.m',
'Menu.m',
'MenuItem.m',
'OFString+Cube.mm',
'Projectile.m',
'ServerInfo.mm',
'Variable.mm',

3
src/renderextras.mm
View file

@ -206,6 +206,9 @@ loadsky(OFString *basename)
@autoreleasepool {
static OFString *lastsky = @"";
basename = [basename stringByReplacingOccurrencesOfString:@"\\"
withString:@"/"];
if ([lastsky isEqual:basename])
return;

9
src/rendergl.mm
View file

@ -3,6 +3,7 @@
#include "cube.h"
#import "DynamicEntity.h"
#import "OFString+Cube.h"
#ifdef DARWIN
# define GL_COMBINE_EXT GL_COMBINE_ARB
@ -197,11 +198,15 @@ void
texture(OFString *aframe, OFString *name)
{
@autoreleasepool {
int num = curtexnum++, frame = aframe.intValue;
int num = curtexnum++, frame = aframe.cube_intValue;
if (num < 0 || num >= 256 || frame < 0 || frame >= MAXFRAMES)
return;
mapping[num][frame] = 1;
mapname[num][frame] = name;
mapname[num][frame] =
[name stringByReplacingOccurrencesOfString:@"\\"
withString:@"/"];
}
}
COMMAND(texture, ARG_2STR)

12
src/rendermd2.mm
View file

@ -5,6 +5,7 @@
#import "DynamicEntity.h"
#import "MD2.h"
#import "MapModelInfo.h"
#import "OFString+Cube.h"
static OFMutableDictionary<OFString *, MD2 *> *mdllookup = nil;
static OFMutableArray<MD2 *> *mapmodels = nil;
@ -67,11 +68,12 @@ void
mapmodel(
OFString *rad, OFString *h, OFString *zoff, OFString *snap, OFString *name)
{
MD2 *m = loadmodel(name);
m.mmi = [[MapModelInfo alloc] initWithRad:rad.intValue
h:h.intValue
zoff:zoff.intValue
snap:snap.intValue
MD2 *m = loadmodel([name stringByReplacingOccurrencesOfString:@"\\"
withString:@"/"]);
m.mmi = [[MapModelInfo alloc] initWithRad:rad.cube_intValue
h:h.cube_intValue
zoff:zoff.cube_intValue
snap:snap.cube_intValue
name:m.loadname];
if (mapmodels == nil)

5
src/sound.mm
View file

@ -88,6 +88,8 @@ music(OFString *name)
stopsound();
if (soundvol && musicvol) {
@autoreleasepool {
name = [name stringByReplacingOccurrencesOfString:@"\\"
withString:@"/"];
OFString *path =
[OFString stringWithFormat:@"packages/%@", name];
OFIRI *IRI = [Cube.sharedInstance.gameDataIRI
@ -148,7 +150,8 @@ registersound(OFString *name)
if (snames == nil)
snames = [[OFMutableArray alloc] init];
[snames addObject:name];
[snames addObject:[name stringByReplacingOccurrencesOfString:@"\\"
withString:@"/"]];
samples.add(NULL);
return samples.length() - 1;

7
src/weapon.mm
View file

@ -3,6 +3,7 @@
#include "cube.h"
#import "DynamicEntity.h"
#import "OFString+Cube.h"
#import "Projectile.h"
static const int MONSTERDAMAGEFACTOR = 4;
@ -63,9 +64,9 @@ reloadtime(int gun)
void
weapon(OFString *a1, OFString *a2, OFString *a3)
{
selectgun((a1.length > 0 ? a1.intValue : -1),
(a2.length > 0 ? a2.intValue : -1),
(a3.length > 0 ? a3.intValue : -1));
selectgun((a1.length > 0 ? a1.cube_intValue : -1),
(a2.length > 0 ? a2.cube_intValue : -1),
(a3.length > 0 ? a3.cube_intValue : -1));
}
COMMAND(weapon, ARG_3STR)