uxn

commit dd21ae5de89ebb48f673a43075d8e352f4edecea
parent 5496712ae1b231ea31be68151d2cfd10e9339694
Author: Andrew Alderwick <andrew@alderwick.co.uk>
Date:   Wed, 19 Oct 2022 11:38:45 +0100

(asma) Remove deprecated rawchr support.

Diffstat:
M
etc/asma-test.sh
 | 
4
++++
M
projects/library/asma.tal
 | 
7
+------

2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/etc/asma-test.sh b/etc/asma-test.sh
@@ -10,6 +10,7 @@ expect_failure() {
 	if ! grep -qF "${1}" asma-test/asma.log; then
 		echo "error: asma didn't report error ${1} in faulty code"
 		cat asma-test/asma.log
+		exit 1
 	fi
 }
 
@@ -94,5 +95,8 @@ EOD
 expect_failure 'Label not found: .blah' <<'EOD'
 |1000 .blah
 EOD
+expect_failure "Unrecognised token: 'a" <<'EOD'
+|1000 'a
+EOD
 echo 'All OK'
 
diff --git a/projects/library/asma.tal b/projects/library/asma.tal
@@ -735,10 +735,6 @@
 	&valid
 	;asma-advance-addr JMP2 ( tail call )
 
-@asma-raw-char
-	;asma/token LDA2 LDA
-	;asma-write-byte JMP2 ( tail call )
-
 @asma-raw-word
 	;asma/token LDA2
 
@@ -962,8 +958,7 @@
 	&24         :&23       :&25         "$ 00          :asma-pad-relative
 	&25          $2         $2          "% 00          :asma-macro-define
 	&26         :&24       :&29         26 00 ( & )    :asma-sublabel-define
-	&27          $2         $2          "' 00          :asma-raw-char
-	&28         :&27        $2          "( 00          :asma-comment-start
+	&28          $2         $2          "( 00          :asma-comment-start
 	&29         :&28       :&2c         ") 00          :asma-comment-end
 	&2c          $2         $2          ", 00          :asma-literal-rel-addr
 	&_entry     :&26       :&7b         ". 00          :asma-literal-zero-addr