@@ 247,9 247,9 @@ JMP2r
@print-warn ( str* -- )
.stats/warnings LDZ2k INC2 ROT STZ2
- LIT "- #18 DEOk DEO #2018 DEO
+ [ LIT2 "- 18 ] DEOk DEO #2018 DEO
;token pstr #2018 DEO
- LIT "" #18 DEO pstr LIT "" #18 DEO
+ [ LIT2 "" 18 ] DEO pstr [ LIT2 "" 18 ] DEO
!print-line
( .. )
@@ 257,10 257,10 @@ JMP2r
@print-warn2 ( str* -- )
.stats/warnings LDZ2k INC2 ROT STZ2
- LIT "- #18 DEOk DEO #2018 DEO
+ [ LIT2 "- 18 ] DEOk DEO #2018 DEO
;token/last pstr #2018 DEO
;token pstr #2018 DEO
- LIT "" #18 DEO pstr LIT "" #18 DEO
+ [ LIT2 "" 18 ] DEO pstr [ LIT2 "" 18 ] DEO
!print-line
( .. )
@@ 268,18 268,18 @@ JMP2r
@print-warn3 ( str* -- )
.stats/warnings LDZ2k INC2 ROT STZ2
- LIT "- #18 DEOk DEO #2018 DEO
+ [ LIT2 "- 18 ] DEOk DEO #2018 DEO
;token/last2 pstr #2018 DEO
;token/last pstr #2018 DEO
;token pstr #2018 DEO
- LIT "" #18 DEO pstr LIT "" #18 DEO
+ [ LIT2 "" 18 ] DEO pstr [ LIT2 "" 18 ] DEO
@print-line ( -- )
;dict/in-txt pstr
;scope pstr
;dict/at-txt pstr
- ;src pstr LIT ": #18 DEO
+ ;src pstr [ LIT2 ": 18 ] DEO
.stats/lines LDZ2 INC2 pdec
#0a18 DEO
@@ 291,11 291,11 @@ JMP2r
;src pstr #2018 DEO
;dict/with-txt pstr #2018 DEO
.stats/tokens LDZ2 pdec #2018 DEO
- ;dict/tokens-txt pstr LIT ", #18 DEO #2018 DEO
+ ;dict/tokens-txt pstr [ LIT2 ", 18 ] DEO #2018 DEO
.stats/warnings LDZ2 pdec #2018 DEO
;dict/warnings-txt pstr
.stats/lines LDZ2 pdec #2018 DEO
- ;dict/lines-txt pstr LIT ". #18 DEO #0a18 DEO
+ ;dict/lines-txt pstr [ LIT2 ". 18 ] DEO #0a18 DEO
JMP2r
@@ 319,7 319,7 @@ JMP2r
SWP2
( literals )
- LDA2k LIT "# LIT "_ NEQ2 ?&no-lit
+ LDA2k [ LIT2 "#_ ] NEQ2 ?&no-lit
DUP2 slen #0003 NEQ2 ?&no-byte
OVR2 is-litbyte ?&pass
&no-byte
@@ 327,6 327,9 @@ JMP2r
OVR2 is-litshort ?&pass
&no-short
&no-lit
+ ( any )
+ OVR2 LDA LIT "* EQU ?&pass
+ LDAk LIT "* EQU ?&pass
( references )
( a ) OVR2 LDA LIT ". EQU STH
( b ) LDA2k LIT2 "._ EQU2 STHr
@@ 701,6 704,7 @@ JMP2r
"#ff $1 "NEQ $1 =inc
"DUP2 $1 "NIP $1 =dup
"#__ $1 "#__ $1 =combine
+ "#__ $1 "LIT $1 =combine
";__ $1 "STH2 $1 =unstashed
".__ $1 "STH $1 =unstashed
"#__ $1 "STH $1 =unstashed
@@ 724,6 728,8 @@ JMP2r
"SFT2 $1 "#__ $1 "SFT $1 =combine
"SFT $1 "#__ $1 "SFT2 $1 =combine
"SFT2 $1 "#__ $1 "SFT2 $1 =combine
+ "LIT $1 "* $1 "LIT $1 =combine
+ "LIT $1 "* $1 "#__ $1 =combine
"OVR $1 "OVR $1 "EQU $1 =keep
"OVR2 $1 "OVR2 $1 "EQU2 $1 =keep
"OVR $1 "OVR $1 "NEQ $1 =keep