From bc29319414c4d67cfb10761bc1b0d3a32f77e63e Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Sat, 10 Oct 2020 22:52:56 -0400
Subject: [PATCH] allow comma in quoted string during address check

example:

pea ',' or pea #',' previously generated a bad address mode error.

The addmode function expected an X,Y, or S after the , which is how it generated the error.

Changed to skip , search within the quoted string.

test case:

* previously caused an error
	pea #','
	pea ','
	pea #","
	pea ","
	pea ','+','

* still cause and error (as they should):
	pea ',',y
	pea #',',y
* unterminated string:
	pea  '
---
 src/asm/asm.1.s | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/asm/asm.1.s b/src/asm/asm.1.s
index 1114af6..8a71207 100644
--- a/src/asm/asm.1.s
+++ b/src/asm/asm.1.s
@@ -2412,6 +2412,10 @@ addmode      php
              beq   :force16
              cmp   #'>'
              beq   :force24
+             cmp   #$27  ; '
+             beq   :skipq
+             cmp   #$22 ; "
+             beq   :skipq
              jmp   :index
 :force8      lda   #amforce8
              tsb   myvalue
@@ -2427,6 +2431,17 @@ addmode      php
              jmp   :index
 :square      lda   #amsquare
              tsb   myvalue
+             jmp   :index
+
+* skip over quoted operand component.
+:skipq       sta   :q
+:skipq1      iny
+             lda   [lineptr],y
+             cmp   #' '
+             blt   :badmode
+             cmp   :q
+             bne   :skipq1
+
 :index       iny
              lda   [lineptr],y
              cmp   #' '+1
@@ -2434,7 +2449,13 @@ addmode      php
              cmp   #';'
              beq   :modexit
              cmp   #','
-             bne   :index
+             beq   :index1
+             cmp   #$27 ; '
+             beq   :skipq
+             cmp   #$22 ; "
+             beq   :skipq
+             bra   :index
+
 :index1      iny
              lda   [lineptr],y
              and   #$5f
@@ -2542,6 +2563,7 @@ addmode      php
              plp
              sec
              rts
+:q           ds    2
 
 addmodetbl   dfb   6*3
              dfb   7*3