uxn

commit ac2d30cdb9b96410faf1c0eb096c4e34b3069515
parent 0f9b03e0cb60c432628c0a9209c6e38f34987250
Author: Andrew Alderwick <andrew@alderwick.co.uk>
Date:   Thu,  7 Oct 2021 21:57:54 +0100

Redirected asma messages to stderr.

Diffstat:
M
projects/examples/demos/asma-piano.tal
 | 
2
+-
M
projects/library/asma.tal
 | 
30
+++++++++++++++---------------

2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/projects/examples/demos/asma-piano.tal b/projects/examples/demos/asma-piano.tal
@@ -1,7 +1,7 @@
 ( devices )
 
 |00 @System     [ &vector $2 &wst      $1 &rst    $1 &pad   $4 &r $2 &g $2 &b $2   &debug $1 &halt $1 ]
-|10 @Console    [ &pad    $8 &write    $1 ]
+|10 @Console    [ &vector $2 &read     $1 &pad    $5 &write $1 &error  $1 ]
 |a0 @File       [ &vector $2 &success  $2 &offset-hs $2 &offset-ls $2 &name $2 &length $2 &load $2 &save $2 ]
 
 ( vectors )
diff --git a/projects/library/asma.tal b/projects/library/asma.tal
@@ -58,13 +58,13 @@
 
 @asma-print-error ( -- )
 	;asma/error LDA2 ;asma-print-string JSR2
-	#3a .Console/write DEO
-	#20 .Console/write DEO
+	#3a .Console/error DEO
+	#20 .Console/error DEO
 	;asma/orig-token LDA2 ;asma-print-string JSR2
 	;&line ;asma-print-string JSR2
 	;asma/line LDA2 ;asma-print-short JSR2
-	#2e .Console/write DEO
-	#0a .Console/write DEO
+	#2e .Console/error DEO
+	#0a .Console/error DEO
 	JMP2r
 
 	&line 20 "on 20 "line 20 00
@@ -99,18 +99,18 @@
 	( left node )
 	DUP2 ,asma-print-sublabels JSR
 	( here )
-	#09 .Console/write DEO
+	#09 .Console/error DEO
 	DUP2 #0004 ADD2
 	&loop
 	DUP2 INC2 SWP2 LDA
 	DUP #00 EQU ,&end JCN
-	.Console/write DEO
+	.Console/error DEO
 	,&loop JMP
 	&end
 	POP
-	#09 .Console/write DEO
+	#09 .Console/error DEO
 	LDA2 ;asma-print-short JSR2
-	#0a .Console/write DEO
+	#0a .Console/error DEO
 
 	( right node )
 	#0002 ADD2 ,asma-print-sublabels JSR
@@ -135,13 +135,13 @@
 	&loop
 	DUP2 INC2 SWP2 LDA
 	DUP #00 EQU ,&end JCN
-	.Console/write DEO
+	.Console/error DEO
 	,&loop JMP
 	&end
 	POP
-	#09 .Console/write DEO
+	#09 .Console/error DEO
 	LDA2k ;asma-print-short JSR2
-	#0a .Console/write DEO
+	#0a .Console/error DEO
 	( subtree )
 	#0002 ADD2 ;asma-print-sublabels JSR2
 
@@ -155,13 +155,13 @@
 	POP POP2 JMP2r
 
 	&keep-going
-	.Console/write DEO
+	.Console/error DEO
 	INC2
 	,asma-print-string JMP
 
 @asma-print-short ( short* -- )
-	LIT '0 .Console/write DEO
-	LIT 'x .Console/write DEO
+	LIT '0 .Console/error DEO
+	LIT 'x .Console/error DEO
 	OVR #04 SFT ,&hex JSR
 	SWP #0f AND ,&hex JSR
 	DUP #04 SFT ,&hex JSR
@@ -171,7 +171,7 @@
 	#30 ADD DUP #3a LTH ,&not-alpha JCN
 	#27 ADD
 	&not-alpha
-	.Console/write DEO
+	.Console/error DEO
 	JMP2r
 
 (