Browse code

Merge branch 'main' of git.sr.ht:~rabbits/uxn

Devine Lu Linvega authored on 24/11/2021 22:12:10
Showing 1 changed files
... ...
@@ -188,6 +188,9 @@
188 188
 )
189 189
 
190 190
 @asma-init-first-pass ( -- )
191
+	LIT2 POP2 POP EOR ;asma-parse-opcode/short-flag STA
192
+	LIT2 POPr POP EOR ;asma-parse-opcode/return-flag STA
193
+	LIT2 POPk POP EOR ;asma-parse-opcode/keep-flag STA
191 194
 	#ff ;asma/pass STA
192 195
 	#0000 DUP2k
193 196
 		;asma/error STA2
... ...
@@ -401,10 +404,6 @@
401 404
 	#00
402 405
 	JMP2r
403 406
 
404
-%asma-SHORT-FLAG { #20 }
405
-%asma-RETURN-FLAG { #40 }
406
-%asma-KEEP-FLAG { #80 }
407
-
408 407
 ~projects/library/string.tal
409 408
 
410 409
 @asma-traverse-tree ( incoming-ptr* -- binary-ptr* 00 if key found
... ...
@@ -441,15 +440,15 @@
441 440
 
442 441
 	&not-end
443 442
 	DUP LIT '2 NEQ ,&not-two JCN
444
-	POP asma-SHORT-FLAG ORA ,&loop JMP
443
+	POP LIT &short-flag $1 ORA ,&loop JMP
445 444
 
446 445
 	&not-two
447 446
 	DUP LIT 'r NEQ ,&not-return JCN
448
-	POP asma-RETURN-FLAG ORA ,&loop JMP
447
+	POP LIT &return-flag $1 ORA ,&loop JMP
449 448
 
450 449
 	&not-return
451 450
 	LIT 'k NEQ ,&not-keep JCN
452
-	&set-keep asma-KEEP-FLAG ORA ,&loop JMP
451
+	&set-keep LIT &keep-flag $1 ORA ,&loop JMP
453 452
 
454 453
 	&not-keep ( 00 byte / end* )
455 454
 	&not-found ( incoming-ptr* / end* )