Overview
Comment: | Implement preprocessor, and add some more opcode names, and a few bug fixed |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
79caf678bea49b5def8f814d94e5f7b9 |
User & Date: | user on 2018-05-05 23:58:56 |
Other Links: | manifest | tags |
Context
2018-05-19
| ||
19:23 | More parsing of .class file check-in: e049e8ed33 user: user tags: trunk | |
2018-05-05
| ||
23:58 | Implement preprocessor, and add some more opcode names, and a few bug fixed check-in: 79caf678be user: user tags: trunk | |
2018-04-27
| ||
20:25 | More codes and testing in class codes parser check-in: 02b262b608 user: user tags: trunk | |
Changes
Modified class.c from [c8671ac4ba] to [10cd656230].
︙ | |||
24 25 26 27 28 29 30 | 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 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 | - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | #define TF_DROP 0x0020 // add 0x2000 to opcode if followed by OP_DROP #define TF_NAME 0x0080 // token is a name or opcode #define TF_KEY 0x0100 // token is a Hero Mesh key name #define TF_OPEN 0x0400 // token is ( #define TF_CLOSE 0x0800 // token is ) #define TF_INT 0x1000 // token is a number #define TF_FUNCTION 0x2000 // token is a user function |
︙ | |||
193 194 195 196 197 198 199 200 201 | 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 | + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + | tbl[h].id=newv; return 0; } h=(h+1)%size; if(h==m) ParseError("Hash table full\n"); } } static Uint16 look_hash_mac(void) { int h,i,m; for(h=i=0;tokenstr[i];i++) h=(13*h+tokenstr[i])%HASH_SIZE; m=h; for(;;) { if(glohash[h].id>=0xC000 && !strcmp(tokenstr,glohash[h].txt)) return h; if(!glohash[h].id) { glohash[h].txt=strdup(tokenstr); if(!glohash[h].txt) ParseError("Out of string space in hash table\n"); glohash[h].id=0xFFFF; return h; } h=(h+1)%HASH_SIZE; if(h==m) ParseError("Hash table full\n"); } } #define ReturnToken(x,y) do{ tokent=x; tokenv=y; return; }while(0) |
︙ | |||
227 228 229 230 231 232 233 234 235 236 237 238 239 240 | 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 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | if(c=='=') { fl|=TF_EQUAL; c=fgetc(classfp); } if(c==',') { fl|=TF_COMMA; c=fgetc(classfp); } if(c=='{') { c=fgetc(classfp); while(c==' ' || c=='\t' || c=='\r' || c=='\n') { if(c=='\n') ++linenum; c=fgetc(classfp); } while(c>0 && (chkind[c]&2)) { if(n==256) { tokenstr[256]=0; ParseError("Identifier too long: %s\n",tokenstr); } tokenstr[n++]=c; c=fgetc(classfp); } tokenstr[n]=0; if(!n) fatal("Expected macro name\n"); if(c!=EOF) ungetc(c,classfp); ReturnToken(TF_MACRO|TF_OPEN,look_hash_mac()); } if(c=='}') ReturnToken(TF_MACRO|TF_CLOSE,0); if(c=='|') ReturnToken(TF_MACRO,1); if(c=='\\') { i=0; while((c=fgetc(classfp))=='\\') i+=0x100; tokenv=0; for(;c>='0' && c<='9';c=fgetc(classfp)) tokenv=10*tokenv+c-'0'; --tokenv; if(tokenv&~255) ParseError("Macro parameter reference out of range\n"); if(c!=EOF) ungetc(c,classfp); tokent=TF_MACRO|TF_INT; tokenv|=i; return; } if(c==EOF) ParseError("Unexpected end of file\n"); if(chkind[c]==1) { pr=c; c=fgetc(classfp); if(c==EOF) ParseError("Unexpected end of file\n"); } |
︙ | |||
324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 | 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + | return; } } ParseError("Invalid Hero Mesh key name: %s\n",tokenstr); break; } } static void define_macro(Uint16 name) { int i; TokenList**t; if(glohash[name].id<0xC000) fatal("Confusion\n"); if(glohash[name].id<MAX_MACRO+0xC000) { free_macro(macros[i=glohash[name].id-0xC000]); macros[i]=0; } else { for(i=0;i<MAX_MACRO;i++) if(!macros[i]) break; if(i==MAX_MACRO) ParseError("Too many macro definitions\n"); } glohash[name].id=i+0xC000; t=macros+i; i=1; for(;;) { nxttok1(); if(tokent==TF_MACRO+TF_OPEN && ++i>65000) ParseError("Too much macro nesting\n"); if(tokent==TF_MACRO+TF_CLOSE && !--i) break; *t=add_macro(); t=&(*t)->next; } } static void begin_include_file(const char*name) { InputStack*nxt=inpstack; inpstack=malloc(sizeof(InputStack)); if(!inpstack) fatal("Allocation failed\n"); inpstack->classfp=classfp; inpstack->linenum=linenum; inpstack->next=nxt; linenum=1; //TODO: Use the correct directory to load the include file classfp=fopen(name,"r"); if(!classfp) ParseError("Cannot open include file \"%s\": %m\n",name); } static void begin_macro(TokenList*mac) { MacroStack*ms=malloc(sizeof(MacroStack)); TokenList**ap=0; int a=0; int b=0; int c=0; ref_macro(mac); if(!ms) fatal("Allocation failed\n"); ms->tok=mac; ms->n=0; ms->args=0; for(;;) { nxttok1(); if(tokent&TF_EOF) ParseError("Unexpected end of file in macro argument\n"); if(tokent&TF_OPEN) { ++a; if(tokent&TF_MACRO) ++c; } if(tokent&TF_CLOSE) { --a; if(tokent&TF_MACRO) --c; } if(c==-1) { if(a!=-1 && !b) ParseError("Misnested macro argument\n"); ms->next=macstack; macstack=ms; return; } else if(a==-1 && !b) { ParseError("Misnested macro argument\n"); } else if(tokent==TF_MACRO && tokenv==1 && !a && !b) { if(c) ParseError("Misnested macro argument\n"); b=1; ms->args=realloc(ms->args,++ms->n*sizeof(TokenList*)); if(!ms->args) fatal("Allocation failed\n"); ap=ms->args+ms->n-1; *ap=0; } else { if(!b && !(tokent&TF_CLOSE) && a==(tokent&TF_OPEN?1:0)) { ms->args=realloc(ms->args,++ms->n*sizeof(TokenList*)); if(!ms->args) fatal("Allocation failed\n"); ap=ms->args+ms->n-1; *ap=0; } *ap=add_macro(); ap=&((*ap)->next); } } } static void nxttok(void) { again: nxttok1(); if(tokent&TF_EOF) { if(inpstack) { InputStack s=*inpstack; free(inpstack); fclose(classfp); classfp=s.classfp; linenum=s.linenum; inpstack=s.next; goto again; } } else if(tokent&TF_MACRO) { Uint32 n; char*s; if(tokent&TF_OPEN) { call: switch(glohash[tokenv].id) { case 0xC000 ... MAX_MACRO+0xC000-1: begin_macro(macros[glohash[tokenv].id-0xC000]); goto again; case MAC_ADD: n=0; for(;;) { nxttok(); if(tokent==TF_MACRO+TF_CLOSE) break; if(tokent!=TF_INT) ParseError("Number expected\n"); n+=tokenv; } tokent=TF_INT; tokenv=n; break; case MAC_SUB: nxttok(); if(tokent!=TF_INT) ParseError("Number expected\n"); n=tokenv; nxttok(); if(tokent!=TF_INT) ParseError("Number expected\n"); n-=tokenv; nxttok(); if(tokent!=TF_MACRO+TF_CLOSE) ParseError("Too many macro arguments\n"); tokent=TF_INT; tokenv=n; break; case MAC_MUL: n=1; for(;;) { nxttok(); if(tokent==TF_MACRO+TF_CLOSE) break; if(tokent!=TF_INT) ParseError("Number expected\n"); n*=tokenv; } tokent=TF_INT; tokenv=n; break; case MAC_DIV: nxttok(); if(tokent!=TF_INT) ParseError("Number expected\n"); n=tokenv; nxttok(); if(tokent!=TF_INT) ParseError("Number expected\n"); if(!tokenv) ParseError("Division by zero\n"); n/=tokenv; nxttok(); if(tokent!=TF_MACRO+TF_CLOSE) ParseError("Too many macro arguments\n"); tokent=TF_INT; tokenv=n; break; case MAC_MOD: nxttok(); if(tokent!=TF_INT) ParseError("Number expected\n"); n=tokenv; nxttok(); if(tokent!=TF_INT) ParseError("Number expected\n"); if(!tokenv) ParseError("Division by zero\n"); n%=tokenv; nxttok(); if(tokent!=TF_MACRO+TF_CLOSE) ParseError("Too many macro arguments\n"); tokent=TF_INT; tokenv=n; break; case MAC_BAND: n=-1; for(;;) { nxttok(); if(tokent==TF_MACRO+TF_CLOSE) break; if(tokent!=TF_INT) ParseError("Number expected\n"); n&=tokenv; } tokent=TF_INT; tokenv=n; break; case MAC_BOR: n=0; for(;;) { nxttok(); if(tokent==TF_MACRO+TF_CLOSE) break; if(tokent!=TF_INT) ParseError("Number expected\n"); n|=tokenv; } tokent=TF_INT; tokenv=n; break; case MAC_BXOR: n=0; for(;;) { nxttok(); if(tokent==TF_MACRO+TF_CLOSE) break; if(tokent!=TF_INT) ParseError("Number expected\n"); n^=tokenv; } tokent=TF_INT; tokenv=n; break; case MAC_BNOT: nxttok(); if(tokent!=TF_INT) ParseError("Number expected\n"); n=~tokenv; nxttok(); if(tokent!=TF_MACRO+TF_CLOSE) ParseError("Too many macro arguments\n"); tokent=TF_INT; tokenv=n; break; case MAC_CAT: s=malloc(0x2000); if(!s) fatal("Allocation failed\n"); n=0; for(;;) { nxttok(); if(tokent==TF_MACRO+TF_CLOSE) { break; } else if(tokent==TF_INT) { sprintf(tokenstr,"%d",tokenv); goto isname; } else if(tokent&TF_NAME) { isname: if(strlen(tokenstr)+n>=0x1FFE) ParseError("Concatenated string too long\n"); strcpy(s+n,tokenstr); n+=strlen(tokenstr); } else if(tokent!=TF_MACRO || tokenv!=1) { ParseError("Number or string or name expected\n"); } } s[n]=0; strcpy(tokenstr,s); free(s); ReturnToken(TF_NAME|TF_ABNORMAL,OP_STRING); case MAC_VERSION: nxttok1(); if(tokent!=TF_INT) ParseError("Number expected\n"); if(tokenv<MIN_VERSION || tokenv>MAX_VERSION) ParseError("Version number out of range\n"); nxttok1(); if(tokent!=TF_MACRO+TF_CLOSE) ParseError("Too many macro arguments\n"); goto again; case MAC_DEFINE: if(!macros) { macros=calloc(MAX_MACRO,sizeof(TokenList*)); if(!macros) fatal("Allocation failed\n"); } nxttok(); if(!(tokent&TF_NAME) || tokenv!=OP_STRING) ParseError("String literal expected\n"); define_macro(look_hash_mac()); goto again; case MAC_INCLUDE: if(macstack) ParseError("Cannot use {include} inside of a macro\n"); nxttok1(); if(tokent==TF_MACRO && tokenv==1) ReturnToken(TF_EOF,0); if(!(tokent&TF_NAME) || tokenv!=OP_STRING) ParseError("String literal expected\n"); n=look_hash_mac(); nxttok1(); if(tokent!=TF_MACRO+TF_CLOSE) ParseError("Too many macro arguments\n"); begin_include_file(glohash[n].txt); goto again; case MAC_CALL: nxttok(); if(!(tokent&TF_NAME) || tokenv!=OP_STRING) ParseError("String literal expected\n"); tokenv=look_hash_mac(); goto call; case MAC_UNDEFINED: ParseError("Undefined macro: {%s}\n",tokenstr); break; default: ParseError("Strange macro token: 0x%04X\n",glohash[tokenv].id); } } } } void load_classes(void) { int i; char*nam=sqlite3_mprintf("%s.class",basefilename); if(!nam) fatal("Allocation failed\n"); classfp=fopen(nam,"r"); sqlite3_free(nam); if(!classfp) fatal("Cannot open class file '%s': %m\n",nam); glohash=calloc(HASH_SIZE,sizeof(Hash)); if(!glohash) fatal("Allocation failed\n"); strcpy(tokenstr,"+"); glohash[look_hash_mac()].id=MAC_ADD; strcpy(tokenstr,"-"); glohash[look_hash_mac()].id=MAC_SUB; strcpy(tokenstr,"*"); glohash[look_hash_mac()].id=MAC_MUL; strcpy(tokenstr,"/"); glohash[look_hash_mac()].id=MAC_DIV; strcpy(tokenstr,"mod"); glohash[look_hash_mac()].id=MAC_MOD; strcpy(tokenstr,"band"); glohash[look_hash_mac()].id=MAC_BAND; strcpy(tokenstr,"bor"); glohash[look_hash_mac()].id=MAC_BOR; strcpy(tokenstr,"bxor"); glohash[look_hash_mac()].id=MAC_BXOR; strcpy(tokenstr,"bnot"); glohash[look_hash_mac()].id=MAC_BNOT; strcpy(tokenstr,"cat"); glohash[look_hash_mac()].id=MAC_CAT; strcpy(tokenstr,"version"); glohash[look_hash_mac()].id=MAC_VERSION; strcpy(tokenstr,"define"); glohash[look_hash_mac()].id=MAC_DEFINE; strcpy(tokenstr,"include"); glohash[look_hash_mac()].id=MAC_INCLUDE; strcpy(tokenstr,"call"); glohash[look_hash_mac()].id=MAC_CALL; if(main_options['L']) { for(;;) { nxttok(); printf("** %5d %04X %08X \"",linenum,tokent,tokenv); for(i=0;tokenstr[i];i++) { if(tokenstr[i]<32 || tokenstr[i]>126) printf("<%02X>",tokenstr[i]&255); else putchar(tokenstr[i]); } printf("\"\n"); if(Tokenf(TF_EOF)) goto done; } } done: fclose(classfp); if(main_options['H']) { for(i=0;i<HASH_SIZE;i++) if(glohash[i].id) printf("\"%s\": %04X\n",glohash[i].txt,glohash[i].id); } for(i=0;i<HASH_SIZE;i++) free(glohash[i].txt); free(glohash); |
Modified heromesh.h from [0030d49afe] to [27851ceca3].
︙ | |||
80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 | + + | Uint16 sharp[4]; Uint16 hard[4]; Uint8 cflags,shape,shovable,collisionLayers,nimages; } Class; extern Class*classes[0x4000]; // 0 isn't a real class extern const char*messages[0x4000]; // index is 256 less than message number extern Uint16 functions[0x4000]; extern int max_animation; // max steps in animation queue (default 32) extern Sint32 max_volume; // max total volume to allow moving diagonally (default 10000) extern Uint8 back_color; void load_classes(void); // == bindings == typedef struct { char cmd; |
︙ |
Modified instruc from [97418ba69b] to [ef77bce557].
︙ | |||
152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 | + + + | ,=Departed ,=Arrivals ,=Departures ,=Busy ,=Invisible ,=KeyCleared ,=UserSignal ,=UserState ,=VisualOnly ,=Stealthy ,=Moved ,Destroyed ,Player ,Compatible Self Msg From =Arg1 =Arg2 =Arg3 MoveNumber Level Key ; Class definitions -Background ; used at top level only; not in a class -Input -Quiz -InPlace -DefaultImage -Help -EditorHelp -SUBS |
︙ | |||
205 206 207 208 209 210 211 | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 | - + + + | MaxInventory ; error if more than that many slots in inventory .,Move .,MovePlus "Move+" ; obj.Inertia+=Strength instead of obj.Inertia=Strength .,MoveTo ; the internal MoveTo() function NewX NewY ,ObjAbove |
︙ |
Modified instruc.h from [2460412a09] to [a3dc22f64a].
︙ | |||
215 216 217 218 219 220 221 | 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 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 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 | + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + + - - - - + + + + - - + + - - - + + + - + + - + - - - + + + - + - - + + - + - + - - + + - + - + - - - - + + + + - + - - - - - - + + + + + + - - + + - - - - + + + + + + - - - - + + + + - + - - - - + + + + - - + + - + + - + - + - - + + - + | #define OP_KEYCLEARED_C 34907 #define OP_KEYCLEARED_E 36955 #define OP_KEYCLEARED_EC 39003 #define OP_USERSIGNAL 32860 #define OP_USERSIGNAL_C 34908 #define OP_USERSIGNAL_E 36956 #define OP_USERSIGNAL_EC 39004 #define OP_USERSTATE 32861 #define OP_USERSTATE_C 34909 #define OP_USERSTATE_E 36957 #define OP_USERSTATE_EC 39005 |
︙ | |||
595 596 597 598 599 600 601 | 609 610 611 612 613 614 615 616 617 | - + | {"rsh",8486938}, {"swap",8421378}, {"then",8683527}, {"tuck",8421380}, {"until",8683531}, {"while",8683532}, }; |
Modified main.c from [03fb7ee697] to [2e8581e7e0].
︙ | |||
253 254 255 256 257 258 259 | 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 | - + + + + + | exit(0); break; } } int main(int argc,char**argv) { int optind=1; |
︙ |