Overview
| Comment: | Implement case blocks. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
f4215e721675079baef54bebd0dc2aeb |
| User & Date: | user on 2021-04-26 01:05:54 |
| Other Links: | manifest | tags |
Context
|
2021-04-26
| ||
| 03:20 | Implement the $KEY_XY SQL host variable, to allow coordinate selection by keyboard, as suggested on IRC. check-in: 8c73b0a17e user: user tags: trunk | |
| 01:05 | Implement case blocks. check-in: f4215e7216 user: user tags: trunk | |
|
2021-04-25
| ||
| 19:54 | Remove the "el ... if" block, which wasn't working. (Later, I may add a case block instead.) check-in: 932a5231ed user: user tags: trunk | |
Changes
Modified class.c from [39a51739c2] to [73ca03c751].
| ︙ | |||
1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 | 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + |
ParseError("Unexpected end of file\n");
} else {
ParseError("Improper token in pattern\n");
}
if(ptr>=0xFFEF) ParseError("Out of code space\n");
}
}
#define CaseT0(t) do{ if(t0!=-1 && t0!=t) ParseError("Type mismatch in case block\n"); t0=t; }while(0)
#define CaseT1(t) do{ if(t1!=-1 && t1!=t) ParseError("Type mismatch in case block\n"); t1=t; }while(0)
static int case_block(int cla,int ptr,Hash*hash) {
Class*cl=classes[cla];
int sptr=ptr++;
Sint8 t0=-1;
Sint8 t1=-1;
Uint16 n=0;
Uint8 e=1;
Uint8 z=0;
for(;;) {
nxttok();
if(Tokenf(TF_MACRO)) ParseError("Unexpected macro\n");
if(tokent==TF_OPEN) {
nxttok();
if(Tokenf(TF_MACRO)) ParseError("Unexpected macro\n");
if(n>=256 && tokenv!=OP_ELSE && !Tokenf(TF_NAME)) ParseError("Too many cases\n");
if(!e) ParseError("Cannot add more cases after the default block\n");
n++;
if(Tokenf(TF_INT) || Tokenf(TF_DIR)) {
if(tokenv) CaseT0(TY_NUMBER);
cl->codes[ptr++]=tokenv;
} else if(Tokenf(TF_NAME)) {
switch(tokenv) {
case OP_ELSE:
e=0;
n--;
break;
case 0x0200 ... 0x02FF:
CaseT0(TY_MESSAGE);
cl->codes[ptr++]=tokenv+1-0x0200;
break;
case 0x4000 ... 0x7FFF:
CaseT0(TY_CLASS);
cl->codes[ptr++]=tokenv-0x4000;
break;
case 0xC000 ... 0xFFFF:
CaseT0(TY_MESSAGE);
cl->codes[ptr++]=(tokenv&0x3FFF)+257;
break;
default:
ParseError("Improper token in case block\n");
break;
}
} else if(Tokenf(TF_EOF)) {
ParseError("Unexpected end of file\n");
} else {
ParseError("Improper token in case block\n");
}
nxttok();
if(Tokenf(TF_MACRO)) ParseError("Unexpected macro\n");
if(Tokenf(TF_INT) || Tokenf(TF_DIR)) {
if(tokenv) CaseT1(TY_NUMBER); else z=1;
if(tokenv&~0xFFFF) ParseError("Number in case block out of range\n");
cl->codes[ptr++]=tokenv;
} else if(Tokenf(TF_NAME)) {
switch(tokenv) {
case OP_LABEL:
CaseT1(TY_CODE);
if(Tokenf(TF_COMMA|TF_EQUAL)) ParseError("Improper token in case block\n");
tokenv=look_hash(hash,LOCAL_HASH_SIZE,0x8000,0xFFFF,*labelptr,"labels");
if(!tokenv) tokenv=*labelptr,++*labelptr;
tokenv-=0x8000;
cl->codes[ptr++]=labelptr[tokenv];
if(labelptr[tokenv]==0xFFFF) {
LabelStack*s=malloc(sizeof(LabelStack));
if(!s) fatal("Allocation failed\n");
s->id=tokenv|0x8000;
s->addr=ptr-1;
s->next=labelstack;
labelstack=s;
}
break;
case OP_STRING:
CaseT1(TY_STRING);
cl->codes[ptr++]=pool_string(tokenstr)+1;
break;
case 0x0200 ... 0x02FF:
CaseT1(TY_MESSAGE);
cl->codes[ptr++]=tokenv+1-0x0200;
break;
case 0x4000 ... 0x7FFF:
CaseT1(TY_CLASS);
cl->codes[ptr++]=tokenv-0x4000;
break;
case 0xC000 ... 0xFFFF:
CaseT1(TY_MESSAGE);
cl->codes[ptr++]=(tokenv&0x3FFF)+257;
break;
default:
ParseError("Improper token in case block\n");
break;
}
} else if(Tokenf(TF_EOF)) {
ParseError("Unexpected end of file\n");
} else {
ParseError("Improper token in case block\n");
}
nxttok();
} else if(tokent==TF_CLOSE) {
if(!n) ParseError("Empty case block\n");
if(z && t1==TY_CODE) ParseError("Type mismatch in case block\n");
if(e) {
cl->codes[ptr]=(t1==TY_CODE?ptr+1:0);
ptr++;
}
if(t0==-1) t0=TY_NUMBER;
if(t1==-1) t1=TY_NUMBER;
cl->codes[sptr]=(t0<<12)|(t1<<8)|(n-1);
return ptr;
} else if(Tokenf(TF_EOF)) {
ParseError("Unexpected end of file\n");
} else {
ParseError("Improper token in case block\n");
}
if(ptr>=0xFFEF) ParseError("Out of code space\n");
}
}
#define AddInst(x) (cl->codes[ptr++]=(x),prflag=0)
#define AddInst2(x,y) (cl->codes[ptr++]=(x),cl->codes[ptr++]=(y),prflag=0,peep=ptr)
#define AddInstF(x,y) (cl->codes[ptr++]=(x),prflag=(y))
#define ChangeInst(x) (cl->codes[ptr-1]x,prflag=0)
#define InstFlag(x) (peep<ptr && (prflag&(x)))
#define Inst7bit() (peep<ptr && cl->codes[ptr-1]<0x0080)
|
| ︙ | |||
1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 | 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 | + + + + |
nxttok();
if(tokent==TF_CLOSE) break;
if(Tokenf(TF_MACRO) || !Tokenf(TF_INT)) ParseError("Number or close parenthesis expected\n");
x|=1<<tokenv;
}
tokenv=x;
goto numeric;
case OP_CASE:
cl->codes[ptr++]=OP_CASE;
ptr=peep=case_block(cla,ptr,hash);
break;
default:
ParseError("Invalid parenthesized instruction\n");
}
} else if(tokent==TF_CLOSE) {
if(flowdepth) ParseError("Unterminated flow control structure\n");
if(peep<ptr && cl->codes[ptr-1]==OP_RET) break;
if(peep<ptr && (cl->codes[ptr-1]&0xFF00)==0x1E00) break;
|
| ︙ |
Modified class.doc from [1132aff02e] to [2e14b5c3b2].
| ︙ | |||
1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 | 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 | + + + + + | bxor ( in1 in2 -- out ) Bitwise XOR. c? ( any -- bool ) True if the value is a class, or false if it is any other type. Error if it is a sound. (case <cases...>) ( any -- ??? ) A case block. Read one value from stack; find which case it matches, and then push or jump to the result for that case. See the section below about case blocks for details. chain ( any -- bool ) If given an object of the same class as the current object, selects that object as the current object and continues executing the code with that object instead. This new current object is not saved if you return from a function or a subroutine call. If it successfully chained, then the result is false. If given an object of a different class, an object that doesn't exist, or anything other than an object, then it does nothing |
| ︙ | |||
1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 | 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | otherwise it tries the other parts; "else" means always do this if none of the previous parts match. mbegin <body> repeat ( -- any ) ( -- ) The "mbegin" instruction is a shortcut for "begin tmark while", and it has the same behaviour. === Case blocks === A case block consists of (case) with the cases listed inside of the () after the word "case". Each case consists of two tokens inside of their own parentheses. The first token may be any one of: * A number or direction (representing a number from 0 to 15); only the low 16-bits of the number will be used * A class * A message * The word "else"; if present, it must be the last one. This is the case if none of the other cases match. It is optional; if not specified, then the default is zero or to not jump. The second token may be any one of: * A number or direction (representing a number from 0 to 15); this must fit in 16-bits (unsigned) * A class * A message * A string literal * A label name (with the colon at first) All types on the left must be the same as each other, and all types on the right must be the same as each other, except that zero may be mixed with other types other than labels. If the right side is a label, then nothing is pushed to the stack, and it jumps to the specified label instead. If not, then the result is pushed to the stack instead. === Substitution codes === %c Display a single character whose code is the low 8-bits of the value. %C |
| ︙ |
Modified exec.c from [834664aa2d] to [af40ed6701].
| ︙ | |||
1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 | 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + |
if(n!=VOIDLINK) {
n=v_pattern(code,ptr,n,all);
if(n!=VOIDLINK && !all) return n;
}
}
return VOIDLINK;
}
static int v_case(Uint16*code,int ptr,Value v) {
int n=(code[ptr]&255)+1;
int t0=(code[ptr]>>12)&15;
int t1=(code[ptr]>>8)&15;
int i,j,v0,v1;
if(v.t==TY_SOUND || v.t==TY_USOUND) Throw("Cannot use sound in case block");
for(i=0;i<n;i++) {
v0=code[ptr+i+i+1];
v1=code[ptr+i+i+2];
if(!v0 && v.t==TY_NUMBER && !v.u) goto found;
if(v.t==t0) switch(t0) {
case TY_NUMBER:
if(!((v0^v.u)&0xFFFF)) goto found;
break;
case TY_CLASS:
if(v.u==v0) goto found;
break;
case TY_MESSAGE:
if(v.u+1==v0) goto found;
break;
}
}
v1=code[ptr+n+n+1];
found:
switch(t1) {
case TY_NUMBER:
Push(NVALUE(v1));
break;
case TY_CLASS:
if(v1) Push(CVALUE(v1)); else Push(NVALUE(0));
break;
case TY_MESSAGE:
if(v1) Push(MVALUE(v1-1)); else Push(NVALUE(0));
break;
case TY_STRING:
if(v1) Push(UVALUE(v1-1,TY_STRING)); else Push(NVALUE(0));
break;
case TY_CODE:
return v1;
}
return ptr+n+n+2;
}
// Here is where the execution of a Free Hero Mesh bytecode subroutine is executed.
#define NoIgnore() do{ changed=1; }while(0)
#define GetVariableOf(a,b) (i=v_object(Pop()),i==VOIDLINK?NVALUE(0):b(objects[i]->a))
#define GetVariableOrAttributeOf(a,b) (t2=Pop(),t2.t==TY_CLASS?NVALUE(classes[t2.u]->a):(i=v_object(t2),i==VOIDLINK?NVALUE(0):b(objects[i]->a)))
#define Numeric(a) do{ if((a).t!=TY_NUMBER) Throw("Type mismatch"); }while(0)
#define DivideBy(a) do{ Numeric(a); if(!(a).u) Throw("Division by zero"); }while(0)
|
| ︙ | |||
1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 | 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 | + |
case OP_BROADCASTSUMEX: StackReq(5,1); t5=Pop(); t4=Pop(); t3=Pop(); t2=Pop(); t1=Pop(); Push(v_broadcast(obj,t1,t2,t3,t4,t5,1)); break;
case OP_BUSY: StackReq(0,1); if(o->oflags&OF_BUSY) Push(NVALUE(1)); else Push(NVALUE(0)); break;
case OP_BUSY_C: StackReq(1,1); GetFlagOf(OF_BUSY); break;
case OP_BUSY_E: NoIgnore(); StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_BUSY; else o->oflags&=~OF_BUSY; break;
case OP_BUSY_EC: NoIgnore(); StackReq(2,0); SetFlagOf(OF_BUSY); break;
case OP_BXOR: StackReq(2,1); t2=Pop(); Numeric(t2); t1=Pop(); Numeric(t1); Push(NVALUE(t1.u^t2.u)); break;
case OP_CALLSUB: execute_program(code,code[ptr++],obj); break;
case OP_CASE: StackReq(1,1); t1=Pop(); ptr=v_case(code,ptr,t1); break;
case OP_CHAIN: StackReq(1,1); t1=Pop(); i=v_chain(t1,o->class); if(i==VOIDLINK) { Push(NVALUE(1)); } else { o=objects[obj=i]; Push(NVALUE(0)); } break;
case OP_CHEBYSHEV: StackReq(1,1); t1=Pop(); i=chebyshev(obj,v_object(t1)); Push(NVALUE(i)); break;
case OP_CHEBYSHEV_C: StackReq(2,1); t2=Pop(); t1=Pop(); i=chebyshev(v_object(t1),v_object(t2)); Push(NVALUE(i)); break;
case OP_CLASS: StackReq(0,1); Push(CVALUE(o->class)); break;
case OP_CLASS_C: StackReq(1,1); Push(GetVariableOf(class,CVALUE)); break;
case OP_CLIMB: StackReq(0,1); Push(NVALUE(o->climb)); break;
case OP_CLIMB_C: StackReq(1,1); Push(GetVariableOrAttributeOf(climb,NVALUE)); break;
|
| ︙ |
Modified heromesh.h from [e799f3d4f3] to [ca9d66727e].
| ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | + |
#define TY_LEVELSTRING 3
#define TY_STRING 4
#define TY_SOUND 5
#define TY_USOUND 6
#define TY_FOR 7
#define TY_MARK 8
#define TY_ARRAY 9
#define TY_CODE 10
#define TY_MAXTYPE 15
// The level file format requires type codes 0 to 3 to be as is; other codes may change.
typedef struct {
union {
Sint32 s;
Uint32 u;
|
| ︙ |
Modified instruc from [567caebc5e] to [80f4b4d00f].
| ︙ | |||
87 88 89 90 91 92 93 94 95 96 97 98 99 100 | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | + | -while -repeat -for -next *goto *CallSub ret -case ; Arithmetic add "+" sub "-" ,mul "*" ,div "/" ,mod |
| ︙ |
Modified instruc.h from [0dfbf47a7b] to [38aa7a3b09].
| ︙ | |||
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 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 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 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 | + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - + + + + + - - + + - - - - + + + + - - - - - - - - + + + + + + + + - + - - + + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - + + - - - + + + - - - - - - + + + + + + - - - + + + - + - + | #define OP_WHILE 32783 #define OP_REPEAT 32784 #define OP_FOR 32785 #define OP_NEXT 32786 #define OP_GOTO 32787 #define OP_CALLSUB 32788 #define OP_RET 32789 #define OP_CASE 32790 |
| ︙ | |||
706 707 708 709 710 711 712 | 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 | - - - - - - - + + + + + + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - + - - + + - + - + |
{"bit31",8423423},
{"bit4",8388624},
{"bit5",8388640},
{"bit6",8388672},
{"bit7",8388736},
{"bit8",8423400},
{"bit9",8423401},
|