Show More
@@ -1,14 +1,16 b'' | |||
|
1 | 1 | |
|
2 | * Duplicate label error (in the parser) | |
|
3 | * Reporting error lines in the parser | |
|
4 | 2 | * MENU with async/await |
|
5 | 3 | * Special locations |
|
6 | 4 | * Special variables |
|
7 | 5 | * CLI build for Linux |
|
8 | 6 | * CLI build for Windows |
|
9 | * Storing error lines in the parser to report it in runtime errors | |
|
7 | ||
|
8 | * Reporting error lines in the parser | |
|
9 | * Report duplicate label (in the parser) | |
|
10 | * reporting error lines at runtime (by storing them in every form in the parser | |
|
11 | * Report JUMP with missing label (in tagbody) | |
|
10 | 12 | |
|
11 | 13 | * Build Istreblenie |
|
12 | 14 | * Windows GUI (for the compiler) |
|
13 | 15 | * Save-load game in slots |
|
14 | 16 | * Resizable frames |
@@ -1,95 +1,96 b'' | |||
|
1 | 1 | |
|
2 | 2 | # start |
|
3 | 3 | USEHTML=1 |
|
4 | 4 | '<center><font size="20" color="#FF0000" face="Times New Roman"><b>Π’Π΅ΠΊΡΡΠΎΠ²ΡΠΉ ΠΊΠ²Π΅ΡΡ</b></font></center><br>' |
|
5 | 5 | ' <b>ΠΠ°ΡΠ° ΡΠ΅Π»Ρ</b> - Π·Π°ΡΠ°Π±Π°ΡΡΠ²Π°ΡΡ <i>Π΄Π΅Π½ΡΠ³ΠΈ</i>, ΠΏΠΎΠΊΡΠΏΠ°ΡΡ Π½Π° Π½ΠΈΡ <i>ΠΏΠΎΠ΄Π°ΡΠΊΠΈ</i> ΠΈ Π΄Π°ΡΠΈΡΡ ΡΠ²ΠΎΠΈΠΌ <i>Π±Π»ΠΈΠ·ΠΊΠΈΠΌ</i>.' |
|
6 | 6 | ACT '<b>ΠΠ°ΡΠ°ΡΡ ΠΈΠ³ΡΡ</b>':GOTO 'ΠΠΎΠΌ' |
|
7 | 7 | - |
|
8 | 8 | #Π Π°Π±ΠΎΡΠ° |
|
9 | 9 | '<center><b>ΠΠΎΡΡ</b></center><br>' |
|
10 | 10 | ' ΠΠΎΡΡ Π½Π°Ρ ΠΎΠ΄ΠΈΡΡΡ Π½Π° ΡΠ°ΠΌΠΎΠΉ ΡΠΆΠ½ΠΎΠΉ ΠΎΠΊΡΠ°ΠΈΠ½Π΅ Π³ΠΎΡΠΎΠ΄Π°. ΠΠ΄Π΅ΡΡ ΠΏΠΎΡΡΠΎΡΠ½Π½ΠΎ Π·Π°Π³ΡΡΠΆΠ°ΡΡΡΡ ΠΈ ΡΠ°Π·Π³ΡΡΠΆΠ°ΡΡΡΡ ΡΠ°Π·Π»ΠΈΡΠ½ΡΠ΅ ΡΡΠ΄Π°. Π Π°Π±ΠΎΡΠΈΡ ΡΡΠΊ Π½Π΅ Ρ Π²Π°ΡΠ°Π΅Ρ ΠΈ ΡΠΊΠ»Π°Π΄ΡΠΊΠΎΠΉ Π±ΡΠΈΠ³Π°Π΄ΠΈΡ Π²ΡΠ΅Π³Π΄Π° ΡΠ°Π΄ Π·Π°ΠΏΠ»Π°ΡΠΈΡΡ <i>Π΄Π΅Π½ΡΠ³ΠΈ</i> Π·Π° ΠΏΠΎΠΌΠΎΡΡ.' |
|
11 | 11 | ' Π£ Π²Π°Ρ <font size="16"><b><<ΠΠ΅Π½ΡΠ³ΠΈ>></b></font> ΠΌΠΎΠ½Π΅Ρ.' |
|
12 | 12 | ' ΠΠ°ΠΌ Π½ΡΠΆΠ½ΠΎ ΠΏΠ΅ΡΠ΅Π½Π΅ΡΡΠΈ <font size="16" color="#00AA00"><b><<3-Π―ΡΠΈΠΊ>></b></font> ΡΡΠΈΠΊΠ°.' |
|
13 | 13 | ACT 'ΠΠ΄ΡΠΈ Π΄ΠΎΠΌΠΎΠΉ':GOTO 'ΠΠΎΠΌ' |
|
14 | 14 | ACT 'ΠΠ΄ΡΠΈ Π² ΠΌΠ°Π³Π°Π·ΠΈΠ½':GOTO 'ΠΠ°Π³Π°Π·ΠΈΠ½' |
|
15 | 15 | ACT 'ΠΠ΅ΡΠ΅Π½Π΅ΡΡΠΈ ΡΡΠΈΠΊ': |
|
16 | 16 | Π―ΡΠΈΠΊ = Π―ΡΠΈΠΊ + 1 |
|
17 | IF Π―ΡΠΈΠΊ = 3: | |
|
17 | WAIT 500 | |
|
18 | IF Π―ΡΠΈΠΊ = 3: | |
|
18 | 19 | ΠΠ΅Π½ΡΠ³ΠΈ = ΠΠ΅Π½ΡΠ³ΠΈ + 5 |
|
19 | 20 | Π―ΡΠΈΠΊ = 0 |
|
20 | 21 | END |
|
21 | 22 | GOTO 'Π Π°Π±ΠΎΡΠ°' |
|
22 | 23 | END |
|
23 | 24 | - |
|
24 | 25 | #ΠΠ°Π³Π°Π·ΠΈΠ½ |
|
25 | 26 | '<center><b>ΠΠ°Π³Π°Π·ΠΈΠ½</b></center><br>' |
|
26 | 27 | ' ΠΠ°Π³Π°Π·ΠΈΠ½ Π½Π΅Π±ΠΎΠ»ΡΡΠΎΠΉ, Π½ΠΎ ΡΡΡ ΠΎΠ±ΡΡΠ½ΠΎ Π΅ΡΡΡ Π²ΡΡ, ΡΡΠΎ Π½ΡΠΆΠ½ΠΎ ΠΏΡΠΎΡΡΠΎΠΌΡ Π³ΠΎΡΠΎΠΆΠ°Π½ΠΈΠ½Ρ. ΠΠΈΡΡΠΈΠ½Ρ Π·Π°ΡΡΠ°Π²Π»Π΅Π½Ρ ΡΠ°Π·Π»ΠΈΡΠ½ΡΠΌΠΈ ΡΠΎΠ²Π°ΡΠ°ΠΌΠΈ. Π£ ΠΊΠ°ΡΡΡ ΡΡΠΎΠΈΡ ΠΏΠΎΠ»Π½Π°Ρ ΠΆΠ΅Π½ΡΠΈΠ½Π° ΠΈ Ρ ΠΌΡΡΠΎ ΡΠΌΠΎΡΡΠΈΡ Π½Π° Π²Π°Ρ.' |
|
27 | 28 | ' Π£ Π²Π°Ρ <font size="16"><b><<ΠΠ΅Π½ΡΠ³ΠΈ>></b></font> ΠΌΠΎΠ½Π΅Ρ.' |
|
28 | 29 | IF ΠΠ΅Π½ΡΠ³ΠΈ >= 3: |
|
29 | 30 | ACT 'ΠΡΠΏΠΈΡΡ ΠΊΠΎΠ½ΡΡΡΡΠΊΡΠΎΡ': |
|
30 | 31 | ΠΠ΅Π½ΡΠ³ΠΈ = ΠΠ΅Π½ΡΠ³ΠΈ - 3 |
|
31 | 32 | ADDOBJ 'ΠΠΎΠ½ΡΡΡΡΠΊΡΠΎΡ' |
|
32 | 33 | GOTO 'ΠΠ°Π³Π°Π·ΠΈΠ½' |
|
33 | 34 | END |
|
34 | 35 | END |
|
35 | 36 | IF ΠΠ΅Π½ΡΠ³ΠΈ >= 5: |
|
36 | 37 | ACT 'ΠΡΠΏΠΈΡΡ ΠΏΠ»ΡΡΠ΅Π²ΠΎΠ³ΠΎ ΠΌΠ΅Π΄Π²Π΅Π΄Ρ': |
|
37 | 38 | ΠΠ΅Π½ΡΠ³ΠΈ = ΠΠ΅Π½ΡΠ³ΠΈ - 5 |
|
38 | 39 | ADDOBJ 'ΠΠ»ΡΡΠ΅Π²ΡΠΉ ΠΌΠ΅Π΄Π²Π΅Π΄Ρ' |
|
39 | 40 | GOTO 'ΠΠ°Π³Π°Π·ΠΈΠ½' |
|
40 | 41 | END |
|
41 | 42 | ACT 'ΠΡΠΏΠΈΡΡ Π²ΡΠ·Π°Π»ΡΠ½ΡΠΉ Π½Π°Π±ΠΎΡ': |
|
42 | 43 | ΠΠ΅Π½ΡΠ³ΠΈ = ΠΠ΅Π½ΡΠ³ΠΈ - 5 |
|
43 | 44 | ADDOBJ 'ΠΡΠ·Π°Π»ΡΠ½ΡΠΉ Π½Π°Π±ΠΎΡ' |
|
44 | 45 | GOTO 'ΠΠ°Π³Π°Π·ΠΈΠ½' |
|
45 | 46 | END |
|
46 | 47 | END |
|
47 | 48 | IF ΠΠ΅Π½ΡΠ³ΠΈ >= 7: |
|
48 | 49 | ACT 'ΠΡΠΏΠΈΡΡ ΠΈΠ½ΡΡΡΡΠΌΠ΅Π½ΡΡ': |
|
49 | 50 | ΠΠ΅Π½ΡΠ³ΠΈ = ΠΠ΅Π½ΡΠ³ΠΈ - 7 |
|
50 | 51 | ADDOBJ 'ΠΠ½ΡΡΡΡΠΌΠ΅Π½ΡΡ' |
|
51 | 52 | GOTO 'ΠΠ°Π³Π°Π·ΠΈΠ½' |
|
52 | 53 | END |
|
53 | 54 | END |
|
54 | 55 | ACT 'ΠΠ΄ΡΠΈ Π΄ΠΎΠΌΠΎΠΉ':GOTO 'ΠΠΎΠΌ' |
|
55 | 56 | ACT 'ΠΠ΄ΡΠΈ Π² ΠΏΠΎΡΡ':GOTO 'Π Π°Π±ΠΎΡΠ°' |
|
56 | 57 | - |
|
57 | 58 | #ΠΠΎΠΌ |
|
58 | 59 | '<center><b>ΠΠΎΠΌ</b></center><br>' |
|
59 | 60 | ' ΠΠΎΠΌΠ° Π²ΡΠ΅Π³Π΄Π° ΠΎΡΠ΅Π½Ρ ΡΡΡΠ½ΠΎ. Π Π²ΠΊΡΡΠ½ΠΎ ΠΏΠ°Ρ Π½Π΅Ρ Π΅Π΄ΠΎΠΉ. ΠΠ°ΠΌΠ°, ΡΠΈΠ΄Ρ Π² ΠΊΡΠ΅ΡΠ»Π΅, Π²ΡΠΆΠ΅Ρ Π½ΠΎΡΠΊΠΈ. ΠΡΠ΅Ρ Ρ Π²Π°ΡΠΈΠΌ Π±ΡΠ°ΡΠΎΠΌ ΡΠΈΠ½ΠΈΡ ΡΠΊΠ²ΠΎΡΠ΅ΡΠ½ΠΈΠΊ. Π‘Π΅ΡΡΡΠ° Ρ Π»ΠΎΠΏΠΎΡΠ΅Ρ Π½Π° ΠΊΡΡ Π½Π΅. ΠΠΎΠΌΠ° Π²ΡΠ΅Π³Π΄Π° Ρ ΠΎΡΠΎΡΠΎ.' |
|
60 | 61 | ' Π£ Π²Π°Ρ <font size="16"><b><<ΠΠ΅Π½ΡΠ³ΠΈ>></b></font> ΠΌΠΎΠ½Π΅Ρ.' |
|
61 | 62 | IF OBJ 'ΠΠΎΠ½ΡΡΡΡΠΊΡΠΎΡ': |
|
62 | 63 | ACT 'ΠΠΎΠ΄Π°ΡΠΈΡΡ ΠΊΠΎΠ½ΡΡΡΡΠΊΡΠΎΡ Π±ΡΠ°ΡΡ': |
|
63 | 64 | DELOBJ 'ΠΠΎΠ½ΡΡΡΡΠΊΡΠΎΡ' |
|
64 | 65 | ' - ΠΠΎΡ ΡΠ΅Π±Π΅ ΠΊΠΎΠ½ΡΡΡΡΠΊΡΠΎΡ.' |
|
65 | 66 | ' - Π‘ΠΏΠ°ΡΠΈΠ±ΠΎ, Π±ΡΠ°Ρ.' |
|
66 | 67 | DELACT 'ΠΠΎΠ΄Π°ΡΠΈΡΡ ΠΊΠΎΠ½ΡΡΡΡΠΊΡΠΎΡ Π±ΡΠ°ΡΡ' |
|
67 | 68 | END |
|
68 | 69 | END |
|
69 | 70 | IF OBJ 'ΠΠ»ΡΡΠ΅Π²ΡΠΉ ΠΌΠ΅Π΄Π²Π΅Π΄Ρ': |
|
70 | 71 | ACT 'ΠΠΎΠ΄Π°ΡΠΈΡΡ ΠΌΠ΅Π΄Π²Π΅Π΄Ρ ΡΠ΅ΡΡΡΠ΅': |
|
71 | 72 | DELOBJ 'ΠΠ»ΡΡΠ΅Π²ΡΠΉ ΠΌΠ΅Π΄Π²Π΅Π΄Ρ' |
|
72 | 73 | ' - ΠΠΎΡ ΡΠ΅Π±Π΅ ΠΏΠ»ΡΡΠ΅Π²ΡΠΉ ΠΌΠ΅Π΄Π²Π΅Π΄Ρ.' |
|
73 | 74 | ' - Π‘ΠΏΠ°ΡΠΈΠ±ΠΎ, Π±ΡΠ°Ρ.' |
|
74 | 75 | DELACT 'ΠΠΎΠ΄Π°ΡΠΈΡΡ ΠΌΠ΅Π΄Π²Π΅Π΄Ρ ΡΠ΅ΡΡΡΠ΅' |
|
75 | 76 | END |
|
76 | 77 | END |
|
77 | 78 | IF OBJ 'ΠΡΠ·Π°Π»ΡΠ½ΡΠΉ Π½Π°Π±ΠΎΡ': |
|
78 | 79 | ACT 'ΠΠΎΠ΄Π°ΡΠΈΡΡ Π½Π°Π±ΠΎΡ ΠΌΠ°ΠΌΠ΅': |
|
79 | 80 | DELOBJ 'ΠΡΠ·Π°Π»ΡΠ½ΡΠΉ Π½Π°Π±ΠΎΡ' |
|
80 | 81 | ' - ΠΠΎΡ ΡΠ΅Π±Π΅ Π²ΡΠ·Π°Π»ΡΠ½ΡΠΉ Π½Π°Π±ΠΎΡ.' |
|
81 | 82 | ' - Π‘ΠΏΠ°ΡΠΈΠ±ΠΎ, ΡΡΠ½ΠΎΠΊ.' |
|
82 | 83 | DELACT 'ΠΠΎΠ΄Π°ΡΠΈΡΡ Π½Π°Π±ΠΎΡ ΠΌΠ°ΠΌΠ΅' |
|
83 | 84 | END |
|
84 | 85 | END |
|
85 | 86 | IF OBJ 'ΠΠ½ΡΡΡΡΠΌΠ΅Π½ΡΡ': |
|
86 | 87 | ACT 'ΠΠΎΠ΄Π°ΡΠΈΡΡ ΠΈΠ½ΡΡΡΡΠΌΠ΅Π½ΡΡ ΠΎΡΡΡ': |
|
87 | 88 | DELOBJ 'ΠΠ½ΡΡΡΡΠΌΠ΅Π½ΡΡ' |
|
88 | 89 | ' - ΠΠΎΡ ΡΠ΅Π±Π΅ ΠΈΠ½ΡΡΡΡΠΌΠ΅Π½ΡΡ.' |
|
89 | 90 | ' - Π‘ΠΏΠ°ΡΠΈΠ±ΠΎ, ΡΡΠ½.' |
|
90 | 91 | DELACT 'ΠΠΎΠ΄Π°ΡΠΈΡΡ ΠΈΠ½ΡΡΡΡΠΌΠ΅Π½ΡΡ ΠΎΡΡΡ' |
|
91 | 92 | END |
|
92 | 93 | END |
|
93 | 94 | ACT 'ΠΠ΄ΡΠΈ Π² ΠΏΠΎΡΡ':GOTO 'Π Π°Π±ΠΎΡΠ°' |
|
94 | 95 | ACT 'ΠΠ΄ΡΠΈ Π² ΠΌΠ°Π³Π°Π·ΠΈΠ½':GOTO 'ΠΠ°Π³Π°Π·ΠΈΠ½' |
|
95 | 96 | - |
@@ -1,114 +1,121 b'' | |||
|
1 | 1 | |
|
2 | 2 | .qsp-frame { |
|
3 | 3 | border: 1px solid black; |
|
4 | 4 | overflow: auto; |
|
5 | 5 | padding: 5px; |
|
6 | 6 | box-sizing: border-box; |
|
7 | 7 | } |
|
8 | 8 | |
|
9 | 9 | #qsp { |
|
10 | 10 | position: absolute; |
|
11 | 11 | display: flex; |
|
12 | 12 | flex-flow: row; |
|
13 | 13 | top: 0; |
|
14 | 14 | left: 0; |
|
15 | 15 | width: 100%; |
|
16 | 16 | height: 100%; |
|
17 | 17 | } |
|
18 | 18 | |
|
19 | 19 | .qsp-col { |
|
20 | 20 | display: flex; |
|
21 | 21 | flex-flow: column; |
|
22 | 22 | } |
|
23 | 23 | |
|
24 | 24 | .qsp-col1 { |
|
25 | 25 | flex: 7 7 70px; |
|
26 | 26 | } |
|
27 | 27 | |
|
28 | 28 | .qsp-col2 { |
|
29 | 29 | flex: 3 3 30px; |
|
30 | 30 | } |
|
31 | 31 | |
|
32 | 32 | .qsp-col3 { |
|
33 | 33 | flex: 0 0 40px; |
|
34 | 34 | } |
|
35 | 35 | |
|
36 | 36 | #qsp-main { |
|
37 | 37 | flex: 6 6 60px; |
|
38 | 38 | } |
|
39 | 39 | |
|
40 | 40 | #qsp-acts { |
|
41 | 41 | flex: 4 4 40px; |
|
42 | 42 | } |
|
43 | 43 | |
|
44 | 44 | #qsp-input { |
|
45 | 45 | } |
|
46 | 46 | |
|
47 | 47 | #qsp-stat { |
|
48 | 48 | flex: 5 5 50px; |
|
49 | 49 | } |
|
50 | 50 | |
|
51 | 51 | #qsp-objs { |
|
52 | 52 | flex: 5 5 50px; |
|
53 | 53 | } |
|
54 | 54 | |
|
55 | 55 | .qsp-act { |
|
56 | 56 | display: block; |
|
57 | 57 | padding: 2px; |
|
58 | 58 | font-size: large; |
|
59 | 59 | } |
|
60 | 60 | |
|
61 | 61 | .qsp-act:hover { |
|
62 | 62 | outline: #9E9E9E outset 3px |
|
63 | 63 | } |
|
64 | 64 | |
|
65 | 65 | /* Dropdown */ |
|
66 | 66 | |
|
67 | 67 | #qsp-dropdown { |
|
68 | 68 | display: none; |
|
69 | 69 | position: absolute; |
|
70 | 70 | background-color: #f1f1f1; |
|
71 | 71 | min-width: 160px; |
|
72 | 72 | overflow: auto; |
|
73 | 73 | box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); |
|
74 | 74 | z-index: 1; |
|
75 | 75 | margin: auto; |
|
76 | 76 | top: 200; |
|
77 | 77 | } |
|
78 | 78 | |
|
79 | 79 | #qsp-dropdown a { |
|
80 | 80 | color: black; |
|
81 | 81 | padding: 12px 16px; |
|
82 | 82 | text-decoration: none; |
|
83 | 83 | display: block; |
|
84 | 84 | } |
|
85 | 85 | |
|
86 | 86 | #qsp-dropdown a:hover { |
|
87 | 87 | background-color: #ddd; |
|
88 | 88 | } |
|
89 | 89 | |
|
90 | 90 | /* Buttons */ |
|
91 | 91 | |
|
92 | 92 | .qsp-col3 a, .qsp-col3 img { |
|
93 | 93 | width: 50px; |
|
94 | 94 | height: 50px; |
|
95 | 95 | } |
|
96 | 96 | |
|
97 | 97 | #qsp-btn-save img { |
|
98 | 98 | background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABmJLR0QA/wD/AP+gvaeTAAACSklEQVRoge3ZPWgUQRjG8V/iRRFU/GoEQdSohSgWWqQSooVgK9iJFiKCnYV2BkFQsBRBQQwWVsHKIoWxEOzEwmhhogbRMhhFicTvYm+JCUlmZzabRLN/OPaWeZ+ZeW7feXf2lpqampqamnRaImKP4hA2VjCP27hbpoNGwbib2IPreB+IPYY7M7SvxWYM4QNO4QqWyQxVRgdeYnnB+K5A+wUcbB7z+O14hxPx08toLRDTgfv4mjrIJFrwwMS0HsABXMTxlE6LpNYqfE7pPJIBdOKhLM1uxIiLrpG5YtC4GSLMVGGkLdD+GpfxAuvxaVL7oCzN+jCG7iKDVmHkKS5hSSBuJ3bg6hRt+Zrpa553z8bEuoQrUVXk1exwKLBI1ZpPBnAL+0KBqanVim1Ykaifji+yNfIrVphipB1n8BgjCfqZ2IrTuIZXMcIUIydxFj8TtEW4JysW52JEKWtkVHUm4EdzjChSrkgLlmJXghb6m8ep9MN4K25XjvTF3sCaElrT6McS+0w2Mirb+JWhrH4CC/0+UpjUK7Ia5/86f4IeHMHeEvPJ+4km1chHE43k9KROpCyLPrViym8/vjW/b5Jt3acjL7/RzEX5bRg3sjKg+2fK7/PmZ9aZzdTqxwYzp06IBZFaDeHUCbFgUquy1Anx35TfRWXkd+WzCBOcQxEjQ7JH0PmiHW9CQUWM9Mr+Y+osO6ME8nF7Q4FFn8T2y14VDMt2vsFfqCRbZBvTdbLXFI9CgphHyjbsVu4+EcMInuH7HI1XU1NTU7OI+QMFe2N82rtssgAAAABJRU5ErkJggg=='); |
|
99 | 99 | } |
|
100 | 100 | |
|
101 | 101 | #qsp-btn-open img { |
|
102 | 102 | background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABmJLR0QA/wD/AP+gvaeTAAACCklEQVRoge3Yz6sNYRzH8deVexNxSaEoroWFUuomOceSPVnIwsbSxs6Psrgphf9AsrZR7kJWsroUlrZKKZRSl4USGouZk9Npzp1n5pm5x4/nXdNzpvP9Pp/v95nv82OGRCKRSCQS/w8zuIn3yGpe37CEQ6sedQk38BA7G/jO4BQ+YEebQZUxVfH/OxzGVSxX2D4o2mO4jmt4jpNFe6d5mPFkRbvQ0H9h6OqUtR33/xXr0celGn4/sYjXoQ5dJ3ILB7AOW2r4bcIj7GsrkEFpXWyrwwbaf15nXWqv6SqK1abuHDmPjV0EMobhBWIZt8cZVu0j2ZDNHF7gblRozdiO49g1zqDOEzmKJ7gcGVQTzmLDSgZ1Eunh2dD9aewpsXtctH3cwzn5ALysoVWlXZvhleMV5ovfU8J363mciAliRLsRg0Q244vfT3A/zgT2cQHbImIY1S4ldPk9Ii+NH8V9H08DfbfiY6BtiHYpoYmMBr4bbwN9YzfVoEELnew9+blpwBv5u0oI9wPtQrUbkWFaXqOzsZ01IFg7pLQOyp/A58igmhCsHZJInYndNsHa/0wiVWTy9/a5NjprQGvag0Qmwd462iGltdQ8lihqlVVIIn/9/CAvrajDWgTRB8VhMt1/aSljVr4RToc6hJTWioe1jujJD4rfQx2qRvuTyX1JuTIh3UQikUgkEhPnF+1xZ9hHnLjAAAAAAElFTkSuQmCC'); |
|
103 | 103 | } |
|
104 | 104 | |
|
105 | 105 | #qsp-image-container { |
|
106 | 106 | position: absolute; |
|
107 | 107 | top: 0; |
|
108 | 108 | left: 0; |
|
109 | 109 | height: 100%; |
|
110 | 110 | width: 100%; |
|
111 | 111 | display: none; |
|
112 | 112 | justify-content: center; |
|
113 | 113 | align-items: center; |
|
114 | 114 | } |
|
115 | ||
|
116 | /* misc */ | |
|
117 | ||
|
118 | .disable a { | |
|
119 | pointer-events: none; | |
|
120 | cursor: default; | |
|
121 | } |
@@ -1,407 +1,423 b'' | |||
|
1 | 1 | |
|
2 | 2 | (in-package sugar-qsp.api) |
|
3 | 3 | |
|
4 | 4 | ;;; API deals with DOM manipulation and some bookkeeping for the |
|
5 | 5 | ;;; intrinsics, namely variables |
|
6 | 6 | ;;; API is an implementation detail and has no QSP documentation. It |
|
7 | 7 | ;;; doesn't call intrinsics |
|
8 | 8 | |
|
9 | 9 | ;;; Utils |
|
10 | 10 | |
|
11 | 11 | (defun make-act-html (title img) |
|
12 | 12 | (+ "<a class='qsp-act' href='" (ps-inline call-act) "(\"" title "\");'>" |
|
13 | 13 | title |
|
14 | 14 | "</a>")) |
|
15 | 15 | |
|
16 | 16 | (defun make-menu-item-html (num title img loc) |
|
17 | 17 | (+ "<a href='" (ps-inline run-menu) "(" num ", \"" loc "\")();'>" |
|
18 | 18 | "<img src='" img "'>" |
|
19 | 19 | title |
|
20 | 20 | "</a>")) |
|
21 | 21 | |
|
22 | 22 | (defun report-error (text) |
|
23 | 23 | (alert text)) |
|
24 | 24 | |
|
25 | (defun start-sleeping () | |
|
26 | (chain (by-id "qsp") class-list (add "disable")) | |
|
27 | (setf (root sleeping) t)) | |
|
28 | ||
|
29 | (defun finish-sleeping () | |
|
30 | (chain (by-id "qsp") class-list (remove "disable")) | |
|
31 | (setf (root sleeping) nil)) | |
|
32 | ||
|
25 | 33 | (defun sleep (msec) |
|
26 | (new (*promise (=> resolve (set-timeout resolve msec))))) | |
|
34 | (start-sleeping) | |
|
35 | (new (*promise | |
|
36 | (lambda (resolve) | |
|
37 | (set-timeout | |
|
38 | (lambda () | |
|
39 | (finish-sleeping) | |
|
40 | (resolve)) | |
|
41 | msec))))) | |
|
27 | 42 | |
|
28 | 43 | (defun init-dom () |
|
29 | 44 | ;; Save/load buttons |
|
30 | 45 | (let ((btn (by-id "qsp-btn-save"))) |
|
31 | 46 | (setf (@ btn onclick) savegame) |
|
32 | 47 | (setf (@ btn href) "#")) |
|
33 | 48 | (let ((btn (by-id "qsp-btn-open"))) |
|
34 | 49 | (setf (@ btn onclick) opengame) |
|
35 | 50 | (setf (@ btn href) "#")) |
|
36 | 51 | ;; Close image on click |
|
37 | 52 | (setf (@ (by-id "qsp-image-container") onclick) |
|
38 | 53 | (show-image nil)) |
|
39 | 54 | ;; Close the dropdown on any click |
|
40 | 55 | (setf (@ window onclick) |
|
41 | 56 | (lambda (event) |
|
42 | 57 | (setf (@ (get-frame :dropdown) style display) "none")))) |
|
43 | 58 | |
|
44 | 59 | (defun call-serv-loc (var-name &rest args) |
|
45 | 60 | (let ((loc-name (get-var var-name 0 :str))) |
|
46 | 61 | (when loc-name |
|
47 | 62 | (let ((loc (getprop (root locs) loc-name))) |
|
48 | 63 | (when loc |
|
49 | 64 | (funcall loc args)))))) |
|
50 | 65 | |
|
51 | 66 | ;;; Misc |
|
52 | 67 | |
|
53 | 68 | (defun newline (key) |
|
54 | 69 | (append-id (key-to-id key) "<br>" t)) |
|
55 | 70 | |
|
56 | 71 | (defun clear-id (id) |
|
57 | 72 | (setf (inner-html (by-id id)) "")) |
|
58 | 73 | |
|
59 | 74 | (defvar text-escaper (chain document (create-element :textarea))) |
|
60 | 75 | |
|
61 | 76 | (defun prepare-contents (s &optional force-html) |
|
62 | 77 | (if (or force-html (get-var "USEHTML" 0 :num)) |
|
63 | 78 | s |
|
64 | 79 | (progn |
|
65 | 80 | (setf (@ text-escaper text-content) s) |
|
66 | 81 | (inner-html text-escaper)))) |
|
67 | 82 | |
|
68 | 83 | (defun get-id (id &optional force-html) |
|
69 | 84 | (inner-html (by-id id))) |
|
70 | 85 | |
|
71 | 86 | (defun set-id (id contents &optional force-html) |
|
72 | 87 | (setf (inner-html (by-id id)) (prepare-contents contents force-html))) |
|
73 | 88 | |
|
74 | 89 | (defun append-id (id contents &optional force-html) |
|
75 | 90 | (when contents |
|
76 | 91 | (incf (inner-html (by-id id)) (prepare-contents contents force-html)))) |
|
77 | 92 | |
|
78 | 93 | ;;; Function calls |
|
79 | 94 | |
|
80 | 95 | (defun init-args (args) |
|
81 | 96 | (dotimes (i (length args)) |
|
82 | 97 | (let ((arg (elt args i))) |
|
83 | 98 | (if (numberp arg) |
|
84 | 99 | (set-var args i :num arg) |
|
85 | 100 | (set-var args i :str arg))))) |
|
86 | 101 | |
|
87 | 102 | (defun get-result () |
|
88 | 103 | (if (not (equal "" (get-var "RESULT" 0 :str))) |
|
89 | 104 | (get-var "RESULT" 0 :str) |
|
90 | 105 | (get-var "RESULT" 0 :num))) |
|
91 | 106 | |
|
92 | 107 | (defun call-loc (name args) |
|
93 | 108 | (with-frame |
|
94 | 109 | (with-call-args args |
|
95 | 110 | (funcall (getprop (root locs) name) args)))) |
|
96 | 111 | |
|
97 | 112 | (defun call-act (title) |
|
98 | (with-frame | |
|
99 | (funcall (getprop (root acts) title 'act)))) | |
|
113 | (unless (root sleeping) | |
|
114 | (with-frame | |
|
115 | (funcall (getprop (root acts) title 'act))))) | |
|
100 | 116 | |
|
101 | 117 | ;;; Text windows |
|
102 | 118 | |
|
103 | 119 | (defun key-to-id (key) |
|
104 | 120 | (case key |
|
105 | 121 | (:main "qsp-main") |
|
106 | 122 | (:stat "qsp-stat") |
|
107 | 123 | (:objs "qsp-objs") |
|
108 | 124 | (:acts "qsp-acts") |
|
109 | 125 | (:input "qsp-input") |
|
110 | 126 | (:dropdown "qsp-dropdown") |
|
111 | 127 | (t (report-error "Internal error!")))) |
|
112 | 128 | |
|
113 | 129 | (defun get-frame (key) |
|
114 | 130 | (by-id (key-to-id key))) |
|
115 | 131 | |
|
116 | 132 | (defun add-text (key text) |
|
117 | 133 | (append-id (key-to-id key) text)) |
|
118 | 134 | |
|
119 | 135 | (defun get-text (key) |
|
120 | 136 | (get-id (key-to-id key))) |
|
121 | 137 | |
|
122 | 138 | (defun clear-text (key) |
|
123 | 139 | (clear-id (key-to-id key))) |
|
124 | 140 | |
|
125 | 141 | (defun enable-frame (key enable) |
|
126 | 142 | (let ((obj (get-frame key))) |
|
127 | 143 | (setf (@ obj style display) (if enable "block" "none")) |
|
128 | 144 | (void))) |
|
129 | 145 | |
|
130 | 146 | ;;; Actions |
|
131 | 147 | |
|
132 | 148 | (defun add-act (title img act) |
|
133 | 149 | (setf (getprop (root acts) title) |
|
134 | 150 | (create img img act act)) |
|
135 | 151 | (update-acts)) |
|
136 | 152 | |
|
137 | 153 | (defun del-act (title) |
|
138 | 154 | (delete (getprop (root acts) title)) |
|
139 | 155 | (update-acts)) |
|
140 | 156 | |
|
141 | 157 | (defun clear-act () |
|
142 | 158 | (setf (root acts) (create)) |
|
143 | 159 | (clear-id "qsp-acts")) |
|
144 | 160 | |
|
145 | 161 | (defun update-acts () |
|
146 | 162 | (clear-id "qsp-acts") |
|
147 | 163 | (let ((elt (by-id "qsp-acts"))) |
|
148 | 164 | (for-in (title (root acts)) |
|
149 | 165 | (let ((obj (getprop (root acts) title))) |
|
150 | 166 | (incf (inner-html elt) (make-act-html title (getprop obj :img))))))) |
|
151 | 167 | |
|
152 | 168 | |
|
153 | 169 | ;;; "Syntax" |
|
154 | 170 | |
|
155 | 171 | (defun qspfor (name index from to step body) |
|
156 | 172 | (for ((i from)) |
|
157 | 173 | ((< i to)) |
|
158 | 174 | ((incf i step)) |
|
159 | 175 | (set-var name index :num i) |
|
160 | 176 | (unless (funcall body) |
|
161 | 177 | (return-from qspfor)))) |
|
162 | 178 | |
|
163 | 179 | ;;; Variable class |
|
164 | 180 | |
|
165 | 181 | (defun *var (name) |
|
166 | 182 | ;; From strings to numbers |
|
167 | 183 | (setf (@ this indexes) (create)) |
|
168 | 184 | ;; From numbers to {num: 0, str: ""} objects |
|
169 | 185 | (setf (@ this values) (list)) |
|
170 | 186 | (void)) |
|
171 | 187 | |
|
172 | 188 | (defun new-value () |
|
173 | 189 | (create :num 0 :str "")) |
|
174 | 190 | |
|
175 | 191 | (setf (@ *var prototype index-num) |
|
176 | 192 | (lambda (index) |
|
177 | 193 | (let ((num-index |
|
178 | 194 | (if (stringp index) |
|
179 | 195 | (if (in index (@ this indexes)) |
|
180 | 196 | (getprop (@ this indexes) index) |
|
181 | 197 | (let ((n (length (@ this values)))) |
|
182 | 198 | (setf (getprop (@ this indexes) index) n) |
|
183 | 199 | n)) |
|
184 | 200 | index))) |
|
185 | 201 | (unless (in num-index (@ this values)) |
|
186 | 202 | (setf (elt (@ this values) num-index) (new-value))) |
|
187 | 203 | num-index))) |
|
188 | 204 | |
|
189 | 205 | (setf (@ *var prototype get) |
|
190 | 206 | (lambda (index slot) |
|
191 | 207 | (unless (or index (= 0 index)) |
|
192 | 208 | (setf index (1- (length (@ this values))))) |
|
193 | 209 | (getprop (@ this values) (chain this (index-num index)) slot))) |
|
194 | 210 | |
|
195 | 211 | (setf (@ *var prototype set) |
|
196 | 212 | (lambda (index slot value) |
|
197 | 213 | (unless (or index (= 0 index)) |
|
198 | 214 | (setf index (length (@ this values)))) |
|
199 | 215 | (case slot |
|
200 | 216 | (:num (setf value (chain *number (parse-int value)))) |
|
201 | 217 | (:str (setf value (chain value (to-string))))) |
|
202 | 218 | (setf (getprop (@ this values) |
|
203 | 219 | (chain this (index-num index)) |
|
204 | 220 | slot) value) |
|
205 | 221 | (void))) |
|
206 | 222 | |
|
207 | 223 | (setf (@ *var prototype kill) |
|
208 | 224 | (lambda (index) |
|
209 | 225 | (setf (elt (@ this values) (chain this (index-num index))) |
|
210 | 226 | (new-value)) |
|
211 | 227 | (delete (getprop 'this 'indexes index)))) |
|
212 | 228 | |
|
213 | 229 | ;;; Variables |
|
214 | 230 | |
|
215 | 231 | (defun var-real-name (name) |
|
216 | 232 | (if (= (@ name 0) #\$) |
|
217 | 233 | (values (chain name (substr 1)) :str) |
|
218 | 234 | (values name :num))) |
|
219 | 235 | |
|
220 | 236 | (defun ensure-var (name) |
|
221 | 237 | (let ((store (var-ref name))) |
|
222 | 238 | (unless store |
|
223 | 239 | (setf store (new (*var name))) |
|
224 | 240 | (setf (getprop (root vars) name) store)) |
|
225 | 241 | store)) |
|
226 | 242 | |
|
227 | 243 | (defun var-ref (name) |
|
228 | 244 | (let ((local-store (current-local-frame))) |
|
229 | 245 | (cond ((and local-store (in name local-store)) |
|
230 | 246 | (getprop local-store name)) |
|
231 | 247 | ((in name (root vars)) |
|
232 | 248 | (getprop (root vars) name)) |
|
233 | 249 | (t nil)))) |
|
234 | 250 | |
|
235 | 251 | (defun get-var (name index slot) |
|
236 | 252 | (chain (ensure-var name) (get index slot))) |
|
237 | 253 | |
|
238 | 254 | (defun set-var (name index slot value) |
|
239 | 255 | (chain (ensure-var name) (set index slot value)) |
|
240 | 256 | (void)) |
|
241 | 257 | |
|
242 | 258 | (defun get-array (name) |
|
243 | 259 | (var-ref name)) |
|
244 | 260 | |
|
245 | 261 | (defun set-array (name value) |
|
246 | 262 | (let ((store (var-ref name))) |
|
247 | 263 | (setf (@ store values) (@ value values)) |
|
248 | 264 | (setf (@ store indexes) (@ value indexes))) |
|
249 | 265 | (void)) |
|
250 | 266 | |
|
251 | 267 | (defun kill-var (name &optional index) |
|
252 | 268 | (if (and index (not (= 0 index))) |
|
253 | 269 | (chain (getprop (root vars) name) (kill index)) |
|
254 | 270 | (delete (getprop (root vars) name))) |
|
255 | 271 | (void)) |
|
256 | 272 | |
|
257 | 273 | (defun array-size (name) |
|
258 | 274 | (getprop (var-ref name) 'length)) |
|
259 | 275 | |
|
260 | 276 | ;;; Locals |
|
261 | 277 | |
|
262 | 278 | (defun push-local-frame () |
|
263 | 279 | (chain (root locals) (push (create))) |
|
264 | 280 | (void)) |
|
265 | 281 | |
|
266 | 282 | (defun pop-local-frame () |
|
267 | 283 | (chain (root locals) (pop)) |
|
268 | 284 | (void)) |
|
269 | 285 | |
|
270 | 286 | (defun current-local-frame () |
|
271 | 287 | (elt (root locals) (1- (length (root locals))))) |
|
272 | 288 | |
|
273 | 289 | (defun new-local (name) |
|
274 | 290 | (let ((frame (current-local-frame))) |
|
275 | 291 | (unless (in name frame) |
|
276 | 292 | (setf (getprop frame name) (create))) |
|
277 | 293 | (void))) |
|
278 | 294 | |
|
279 | 295 | ;;; Objects |
|
280 | 296 | |
|
281 | 297 | (defun update-objs () |
|
282 | 298 | (let ((elt (by-id "qsp-objs"))) |
|
283 | 299 | (setf (inner-html elt) "<ul>") |
|
284 | 300 | (loop :for obj :in (root objs) |
|
285 | 301 | :do (incf (inner-html elt) (+ "<li>" obj))) |
|
286 | 302 | (incf (inner-html elt) "</ul>"))) |
|
287 | 303 | |
|
288 | 304 | ;;; Menu |
|
289 | 305 | |
|
290 | 306 | (defun menu (menu-data) |
|
291 | 307 | (let ((elt (by-id "qsp-dropdown")) |
|
292 | 308 | (i 0)) |
|
293 | 309 | (setf (inner-html elt) "") |
|
294 | 310 | (loop :for item :in menu-data |
|
295 | 311 | :do (incf i) |
|
296 | 312 | :do (incf (inner-html elt) (make-menu-item-html i |
|
297 | 313 | (@ item text) |
|
298 | 314 | (@ item icon) |
|
299 | 315 | (@ item loc)))) |
|
300 | 316 | (setf (@ elt style display) "block"))) |
|
301 | 317 | |
|
302 | 318 | ;;; Content |
|
303 | 319 | |
|
304 | 320 | (defun clean-audio () |
|
305 | 321 | (loop :for k :in (chain *object (keys (root playing))) |
|
306 | 322 | :for v := (getprop (root playing) k) |
|
307 | 323 | :do (when (@ v ended) |
|
308 | 324 | (delete (@ (root playing) k))))) |
|
309 | 325 | |
|
310 | 326 | (defun show-image (path) |
|
311 | 327 | (let ((img (by-id "qsp-image"))) |
|
312 | 328 | (cond (path |
|
313 | 329 | (setf (@ img src) path) |
|
314 | 330 | (setf (@ img style display) "flex")) |
|
315 | 331 | (t |
|
316 | 332 | (setf (@ img src) "") |
|
317 | 333 | (setf (@ img style display) "hidden"))))) |
|
318 | 334 | |
|
319 | 335 | ;;; Saves |
|
320 | 336 | |
|
321 | 337 | (defun opengame () |
|
322 | 338 | (let ((element (chain document (create-element :input)))) |
|
323 | 339 | (chain element (set-attribute :type :file)) |
|
324 | 340 | (chain element (set-attribute :id :qsp-opengame)) |
|
325 | 341 | (chain element (set-attribute :tabindex -1)) |
|
326 | 342 | (chain element (set-attribute "aria-hidden" t)) |
|
327 | 343 | (setf (@ element style display) :block) |
|
328 | 344 | (setf (@ element style visibility) :hidden) |
|
329 | 345 | (setf (@ element style position) :fixed) |
|
330 | 346 | (setf (@ element onchange) |
|
331 | 347 | (lambda (event) |
|
332 | 348 | (let* ((file (@ event target files 0)) |
|
333 | 349 | (reader (new (*file-reader)))) |
|
334 | 350 | (setf (@ reader onload) |
|
335 | 351 | (lambda (ev) |
|
336 | 352 | (block nil |
|
337 | 353 | (let ((target (@ ev current-target))) |
|
338 | 354 | (unless (@ target result) |
|
339 | 355 | (return)) |
|
340 | 356 | (base64-to-state (@ target result)) |
|
341 | 357 | (unstash-state))))) |
|
342 | 358 | (chain reader (read-as-text file))))) |
|
343 | 359 | (chain document body (append-child element)) |
|
344 | 360 | (chain element (click)) |
|
345 | 361 | (chain document body (remove-child element)))) |
|
346 | 362 | |
|
347 | 363 | (defun savegame () |
|
348 | 364 | (let ((element (chain document (create-element :a)))) |
|
349 | 365 | (chain element (set-attribute :href (+ "data:text/plain;charset=utf-8," (state-to-base64)))) |
|
350 | 366 | (chain element (set-attribute :download "savegame.sav")) |
|
351 | 367 | (setf (@ element style display) :none) |
|
352 | 368 | (chain document body (append-child element)) |
|
353 | 369 | (chain element (click)) |
|
354 | 370 | (chain document body (remove-child element)))) |
|
355 | 371 | |
|
356 | 372 | (defun stash-state (args) |
|
357 | 373 | (call-serv-loc "ONGSAVE") |
|
358 | 374 | (setf (root state-stash) |
|
359 | 375 | (chain *j-s-o-n (stringify |
|
360 | 376 | (create :vars (root vars) |
|
361 | 377 | :objs (root objs) |
|
362 | 378 | :loc-args args |
|
363 | 379 | :msecs (- (chain *date (now)) (root started-at)) |
|
364 | 380 | :timer-interval (root timer-interval) |
|
365 | 381 | :main-html (inner-html |
|
366 | 382 | (by-id :qsp-main)) |
|
367 | 383 | :stat-html (inner-html |
|
368 | 384 | (by-id :qsp-stat)) |
|
369 | 385 | :next-location (root current-location))))) |
|
370 | 386 | (void)) |
|
371 | 387 | |
|
372 | 388 | (defun unstash-state () |
|
373 | 389 | (let ((data (chain *j-s-o-n (parse (root state-stash))))) |
|
374 | 390 | (clear-act) |
|
375 | 391 | (setf (root vars) (@ data :vars)) |
|
376 | 392 | (loop :for k :in (chain *object (keys (root vars))) |
|
377 | 393 | :do (chain *object (set-prototype-of (getprop (root vars) k) |
|
378 | 394 | (@ *var prototype)))) |
|
379 | 395 | (setf (root started-at) (- (chain *date (now)) (@ data :msecs))) |
|
380 | 396 | (setf (root objs) (@ data :objs)) |
|
381 | 397 | (setf (root current-location) (@ data :next-location)) |
|
382 | 398 | (setf (inner-html (by-id :qsp-main)) |
|
383 | 399 | (@ data :main-html)) |
|
384 | 400 | (setf (inner-html (by-id :qsp-stat)) |
|
385 | 401 | (@ data :stat-html)) |
|
386 | 402 | (update-objs) |
|
387 | 403 | (set-timer (@ data :timer-interval)) |
|
388 | 404 | (call-serv-loc "ONGLOAD") |
|
389 | 405 | (call-loc (root current-location) (@ data :loc-args)) |
|
390 | 406 | (void))) |
|
391 | 407 | |
|
392 | 408 | (defun state-to-base64 () |
|
393 | 409 | (btoa (encode-u-r-i-component (root state-stash)))) |
|
394 | 410 | |
|
395 | 411 | (defun base64-to-state (data) |
|
396 | 412 | (setf (root state-stash) (decode-u-r-i-component (atob data)))) |
|
397 | 413 | |
|
398 | 414 | ;;; Timers |
|
399 | 415 | |
|
400 | 416 | (defun set-timer (interval) |
|
401 | 417 | (setf (root timer-interval) interval) |
|
402 | 418 | (clear-interval (root timer-obj)) |
|
403 | 419 | (setf (root timer-obj) |
|
404 | 420 | (set-interval |
|
405 | 421 | (lambda () |
|
406 | 422 | (call-serv-loc "COUNTER")) |
|
407 | 423 | interval))) |
@@ -1,38 +1,39 b'' | |||
|
1 | 1 | |
|
2 | 2 | (in-package sugar-qsp.js) |
|
3 | 3 | |
|
4 | 4 | ;;; Contains symbols from standard JS library to avoid obfuscating |
|
5 | 5 | ;;; and/or namespacing them |
|
6 | 6 | |
|
7 | 7 | (cl:defmacro syms (cl:&rest syms) |
|
8 | 8 | `(cl:progn |
|
9 | 9 | ,@(cl:loop :for sym :in syms |
|
10 | 10 | :collect `(cl:export ',sym)))) |
|
11 | 11 | |
|
12 | 12 | (syms |
|
13 | 13 | ;; main |
|
14 | 14 | window |
|
15 | 15 | *object |
|
16 | 16 | now |
|
17 | 17 | onload |
|
18 | 18 | keys includes |
|
19 | 19 | has-own-property |
|
20 | 20 | ;; api |
|
21 | 21 | document get-element-by-id |
|
22 | 22 | onclick onchange |
|
23 | 23 | atob btoa |
|
24 | 24 | alert prompt |
|
25 | 25 | set-timeout set-interval clear-interval |
|
26 | 26 | *promise *j-s-o-n |
|
27 | 27 | href parse |
|
28 | 28 | set-prototype-of |
|
29 | 29 | body append-child remove-child |
|
30 | create-element set-attribute | |
|
30 | add ; remove (is already in COMMON-LISP) | |
|
31 | create-element set-attribute class-list | |
|
31 | 32 | *file-reader read-as-text |
|
32 | 33 | style display src |
|
33 | 34 | ;; lib |
|
34 | 35 | *number parse-int |
|
35 | 36 | to-upper-case concat |
|
36 | 37 | click target current-target files index-of result |
|
37 | 38 | decode-u-r-i-component splice |
|
38 | 39 | ) |
@@ -1,69 +1,69 b'' | |||
|
1 | 1 | |
|
2 | 2 | (in-package parenscript) |
|
3 | 3 | |
|
4 | 4 | ;;; async/await |
|
5 | 5 | |
|
6 | 6 | (defprinter ps-js::await (x) |
|
7 | 7 | (psw (string-downcase "await ")) |
|
8 | 8 | (print-op-argument 'ps-js::await x)) |
|
9 | 9 | |
|
10 | (define-trivial-special-ops await) | |
|
10 | (define-trivial-special-ops await ps-js::await) | |
|
11 | 11 | |
|
12 | 12 | (define-statement-operator async-defun (name lambda-list &rest body) |
|
13 | 13 | (multiple-value-bind (effective-args body-block docstring) |
|
14 | 14 | (compile-named-function-body name lambda-list body) |
|
15 | 15 | (list 'ps-js::async-defun name effective-args docstring body-block))) |
|
16 | 16 | |
|
17 | 17 | (defprinter ps-js::async-defun (name args docstring body-block) |
|
18 | 18 | (when docstring (print-comment docstring)) |
|
19 | 19 | (psw "async ") |
|
20 | 20 | (print-fun-def name args body-block)) |
|
21 | 21 | |
|
22 | 22 | (define-expression-operator async-lambda (lambda-list &rest body) |
|
23 | 23 | (multiple-value-bind (effective-args effective-body) |
|
24 | 24 | (parse-extended-function lambda-list body) |
|
25 | 25 | `(ps-js::async-lambda |
|
26 | 26 | ,effective-args |
|
27 | 27 | ,(let ((*function-block-names* ())) |
|
28 | 28 | (compile-function-body effective-args effective-body))))) |
|
29 | 29 | |
|
30 | 30 | (defprinter ps-js::async-lambda (args body-block) |
|
31 | 31 | (psw "async ") |
|
32 | 32 | (print-fun-def nil args body-block)) |
|
33 | 33 | |
|
34 | 34 | (cl:export 'await) |
|
35 | 35 | (cl:export 'async-defun) |
|
36 | 36 | (cl:export 'async-lambda) |
|
37 | 37 | |
|
38 | 38 | ;;; ES6 |
|
39 | 39 | |
|
40 | 40 | (define-expression-operator => (lambda-list &rest body) |
|
41 | 41 | (unless (listp lambda-list) |
|
42 | 42 | (setf lambda-list (list lambda-list))) |
|
43 | 43 | (multiple-value-bind (effective-args effective-body) |
|
44 | 44 | (parse-extended-function lambda-list body) |
|
45 | 45 | `(ps-js::=> |
|
46 | 46 | ,effective-args |
|
47 | 47 | ,(let ((*function-block-names* ())) |
|
48 | 48 | (compile-function-body effective-args effective-body))))) |
|
49 | 49 | |
|
50 | 50 | (defprinter ps-js::=> (args body) |
|
51 | 51 | (unless (= 1 (length args)) |
|
52 | 52 | (psw "(")) |
|
53 | 53 | (loop for (arg . remaining) on args do |
|
54 | 54 | (psw (symbol-to-js-string arg)) (when remaining (psw ", "))) |
|
55 | 55 | (unless (= 1 (length args)) |
|
56 | 56 | (psw ")")) |
|
57 | 57 | (psw " => ") |
|
58 | 58 | (ps-print body)) |
|
59 | 59 | |
|
60 | 60 | (cl:export '=>) |
|
61 | 61 | |
|
62 | 62 | ;;; Actually return nothing (with no empty return) |
|
63 | 63 | (defvar *old-return-result-of* (function return-result-of)) |
|
64 | 64 | |
|
65 | 65 | (defun return-result-of (tag form) |
|
66 | 66 | (if (equal form '(void)) |
|
67 | 67 | nil |
|
68 | 68 | (funcall *old-return-result-of* tag form))) |
|
69 | 69 | (export 'void) |
General Comments 0
You need to be logged in to leave comments.
Login now