Differences From Artifact [4117ae0f6a]:
- File
src/commands.m
— part of check-in
[6b85eefc85]
at
2025-03-23 02:47:40
on branch trunk
— Remove loop[ijkl]
They confused clang-format a lot. (user: js, size: 11474) [annotate] [blame] [check-ins using]
To Artifact [116e44fb5b]:
- File src/commands.m — part of check-in [d7661be1b1] at 2025-03-23 19:40:00 on branch trunk — Clean up identifiers, use blocks for commands (user: js, size: 11087) [annotate] [blame] [check-ins using]
1 2 3 4 5 6 7 8 9 10 11 | // command.cpp: implements the parsing and execution of a tiny script language // which is largely backwards compatible with the quake console language. #include "cube.h" #import "Alias.h" #import "Command.h" #import "Identifier.h" #import "OFString+Cube.h" #import "Variable.h" | < < < | | | | < < | < | > | > > | | | | | | < < < < < < > | > > > > > > > | | | < < < < < < < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | // command.cpp: implements the parsing and execution of a tiny script language // which is largely backwards compatible with the quake console language. #include "cube.h" #import "Alias.h" #import "Command.h" #import "Identifier.h" #import "OFString+Cube.h" #import "Variable.h" static void cleanup(char **string) { free(*string); } void alias(OFString *name, OFString *action) { Alias *alias = [Identifier identifierForName:name]; if (alias == nil) [Identifier addIdentifier:[Alias aliasWithName:name action:action persisted:true]]; else { if ([alias isKindOfClass:Alias.class]) alias.action = action; else conoutf( @"cannot redefine builtin %@ with an alias", name); } } COMMAND(alias, ARG_2STR, ^(OFString *name, OFString *action) { alias(name, action); }) int variable(OFString *name, int min, int cur, int max, int *storage, void (*function)(), bool persisted) { [Identifier addIdentifier:[Variable variableWithName:name min:min max:max storage:storage function:function persisted:persisted]]; return cur; } void setvar(OFString *name, int i) { Variable *variable = [Identifier identifierForName:name]; if ([variable isKindOfClass:Variable.class]) *variable.storage = i; } int getvar(OFString *name) { Variable *variable = [Identifier identifierForName:name]; if ([variable isKindOfClass:Variable.class]) return *variable.storage; return 0; } bool identexists(OFString *name) { return ([Identifier identifierForName:name] != nil); } OFString * getalias(OFString *name) { Alias *alias = [Identifier identifierForName:name]; if ([alias isKindOfClass:Alias.class]) return alias.action; return nil; } // parse any nested set of () or [] static char * parseexp(char **p, int right) { int left = *(*p)++; char *word = *p; for (int brak = 1; brak;) { |
︙ | ︙ | |||
164 165 166 167 168 169 170 | return strndup(word, *p - word); } // find value of ident referenced with $ in exp OFString * lookup(OFString *n) { | | > | 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 | return strndup(word, *p - word); } // find value of ident referenced with $ in exp OFString * lookup(OFString *n) { __kindof Identifier *identifier = [Identifier identifierForName:[n substringFromIndex:1]]; if ([identifier isKindOfClass:Variable.class]) { return [OFString stringWithFormat:@"%d", *[identifier storage]]; } else if ([identifier isKindOfClass:Alias.class]) return [identifier action]; conoutf(@"unknown alias lookup: %@", [n substringFromIndex:1]); |
︙ | ︙ | |||
271 272 273 274 275 276 277 | c = [c substringFromIndex:1]; w[0] = c; } // empty statement if (c.length == 0) continue; | | | 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 | c = [c substringFromIndex:1]; w[0] = c; } // empty statement if (c.length == 0) continue; val = executeIdentifier([Identifier identifierForName:c], [OFArray arrayWithObjects:w count:numargs], isDown); } return val; } // tab-completion of all identifiers |
︙ | ︙ | |||
303 304 305 306 307 308 309 | if (!completesize) { completesize = s.length - 1; completeidx = 0; } __block int idx = 0; | | | | 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 | if (!completesize) { completesize = s.length - 1; completeidx = 0; } __block int idx = 0; [Identifier enumerateIdentifiersUsingBlock:^( __kindof Identifier *identifier) { if (strncmp(identifier.name.UTF8String, s.UTF8String + 1, completesize) == 0 && idx++ == completeidx) [s replaceCharactersInRange:OFMakeRange(1, s.length - 1) withString:identifier.name]; }]; |
︙ | ︙ | |||
343 344 345 346 347 348 349 350 351 352 353 354 355 356 | { if (!execfile([Cube.sharedInstance.userDataIRI IRIByAppendingPathComponent:cfgfile]) && !execfile([Cube.sharedInstance.gameDataIRI IRIByAppendingPathComponent:cfgfile])) conoutf(@"could not read \"%@\"", cfgfile); } void writecfg() { OFStream *stream; @try { OFIRI *IRI = [Cube.sharedInstance.userDataIRI | > > > > | 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 | { if (!execfile([Cube.sharedInstance.userDataIRI IRIByAppendingPathComponent:cfgfile]) && !execfile([Cube.sharedInstance.gameDataIRI IRIByAppendingPathComponent:cfgfile])) conoutf(@"could not read \"%@\"", cfgfile); } COMMAND(exec, ARG_1STR, ^(OFString *cfgfile) { exec(cfgfile); }) void writecfg() { OFStream *stream; @try { OFIRI *IRI = [Cube.sharedInstance.userDataIRI |
︙ | ︙ | |||
366 367 368 369 370 371 372 | @"overwrite these settings\n" @"// modify settings in game, or put settings in " @"autoexec.cfg to override anything\n" @"\n"]; writeclientinfo(stream); [stream writeString:@"\n"]; | | | | | | | | | | | | | | | | | | > > < | < | < | < | < | < | < | < | | | > | > | < | < | < | < | < < < < < < < < < < < | < | < < | < | < < | < | < < | < | < < | < > | < < < | < | < < | < | < < | < | < < | < | < < | < | | < < | < | < | 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 | @"overwrite these settings\n" @"// modify settings in game, or put settings in " @"autoexec.cfg to override anything\n" @"\n"]; writeclientinfo(stream); [stream writeString:@"\n"]; [Identifier enumerateIdentifiersUsingBlock:^(__kindof Identifier *identifier) { if (![identifier isKindOfClass:Variable.class] || ![identifier persisted]) return; [stream writeFormat:@"%@ %d\n", identifier.name, *[identifier storage]]; }]; [stream writeString:@"\n"]; writebinds(stream); [stream writeString:@"\n"]; [Identifier enumerateIdentifiersUsingBlock:^(__kindof Identifier *identifier) { if (![identifier isKindOfClass:Alias.class] || [identifier.name hasPrefix:@"nextmap_"]) return; [stream writeFormat:@"alias \"%@\" [%@]\n", identifier.name, [identifier action]]; }]; [stream close]; } COMMAND(writecfg, ARG_NONE, ^{ writecfg(); }) // below the commands that implement a small imperative language. thanks to the // semantics of () and [] expressions, any control construct can be defined // trivially. void intset(OFString *name, int v) { alias(name, [OFString stringWithFormat:@"%d", v]); } COMMAND(if, ARG_3STR, ^(OFString *cond, OFString *thenp, OFString *elsep) { execute((![cond hasPrefix:@"0"] ? thenp : elsep), true); }) COMMAND(loop, ARG_2STR, ^(OFString *times, OFString *body) { int t = times.cube_intValue; for (int i = 0; i < t; i++) { intset(@"i", i); execute(body, true); } }) COMMAND(while, ARG_2STR, ^(OFString *cond, OFString *body) { while (execute(cond, true)) execute(body, true); }) COMMAND(onrelease, ARG_DWN1, ^(bool on, OFString *body) { if (!on) execute(body, true); }) void concat(OFString *s) { alias(@"s", s); } COMMAND(concat, ARG_VARI, ^(OFString *s) { concat(s); }) COMMAND(concatword, ARG_VARI, ^(OFString *s) { concat([s stringByReplacingOccurrencesOfString:@" " withString:@""]); }) COMMAND(listlen, ARG_1EST, ^(OFString *a_) { const char *a = a_.UTF8String; if (!*a) return 0; int n = 0; while (*a) if (*a++ == ' ') n++; return n + 1; }) COMMAND(at, ARG_2STR, ^(OFString *s_, OFString *pos) { int n = pos.cube_intValue; char *copy __attribute__((__cleanup__(cleanup))) = strdup(s_.UTF8String); char *s = copy; for (int i = 0; i < n; i++) { s += strcspn(s, " \0"); s += strspn(s, " "); } s[strcspn(s, " \0")] = 0; concat(@(s)); }) COMMAND(+, ARG_2EXP, ^(int a, int b) { return a + b; }) COMMAND(*, ARG_2EXP, ^(int a, int b) { return a * b; }) COMMAND(-, ARG_2EXP, ^(int a, int b) { return a - b; }) COMMAND(div, ARG_2EXP, ^(int a, int b) { return b ? a / b : 0; }) COMMAND(mod, ARG_2EXP, ^(int a, int b) { return b ? a % b : 0; }) COMMAND(=, ARG_2EXP, ^(int a, int b) { return (int)(a == b); }) COMMAND(<, ARG_2EXP, ^(int a, int b) { return (int)(a < b); }) COMMAND(>, ARG_2EXP, ^(int a, int b) { return (int)(a > b); }) COMMAND(strcmp, ARG_2EST, ^(OFString *a, OFString *b) { return [a isEqual:b]; }) COMMAND(rnd, ARG_1EXP, ^(int a) { return (a > 0 ? rnd(a) : 0); }) COMMAND(millis, ARG_1EXP, ^(int unused) { return lastmillis; }) |