Bugfix test_alphanum/test_numeral, command Q

diff --git a/ddt180.z80 b/ddt180.z80
index 1af627f6865ef9d0804e2e7150116e80270b474a..122748d161aa820e17d27a33c012cfdf130fb5ef 100644 (file)
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -1243,19 +1243,17 @@ fs_nxtsym:
        inc     b\r
        push    hl                      ;symtbl ptr\r
        push    de                      ;inpsym ptr\r
-fs_2:\r
+fs_nxtchar:\r
        ld      a,(de)\r
        djnz    fs_3\r
-       cp      a,':'\r
-       jr      nz,fs_21\r
-       inc     de\r
-       pop     hl\r
-       jr      fs_cont_1\r
-\r
-fs_21:\r
        call    test_sym_char\r
        jr      z,fs_cont\r
        pop     hl                      ;inpsym ptr (discard)\r
+       inc     de\r
+       cp      a,':'\r
+       jr      z,fs_cont_1\r
+       dec     de\r
+\r
        pop     hl                      ;symtbl ptr\r
        inc     hl\r
        ld      a,(hl)                  ;symval h\r
@@ -1265,12 +1263,13 @@ fs_21:
        or      a                       ;clear carry\r
        pop     bc\r
        ret\r
+\r
 fs_3:\r
        inc     de\r
        dec     hl\r
        xor     (hl)\r
        and     c\r
-       jr      z,fs_2\r
+       jr      z,fs_nxtchar\r
 fs_cont:                               ;start over\r
        pop     de                      ;inpsym ptr\r
 fs_cont_1:\r
@@ -2593,7 +2592,7 @@ sub_0ed7h:
        push    de\r
        push bc\r
 l0edah:\r
-       call get_char_upper\r
+       ld a,(de)\r
        cp (hl)\r
        jr nz,l0ee2h\r
        inc de\r
@@ -3217,18 +3216,21 @@ test_sym_char:
 ; return nc if valid alfanumeric char\r
 \r
 test_alphanum:\r
-       cp      'z'+1\r
+       cp      'z'\r
+       ret     z\r
        ccf\r
        ret     c\r
        cp      'a'\r
        ret     nc\r
-       cp      'Z'+1\r
+       cp      'Z'\r
+       ret     z\r
        ccf\r
        ret     c\r
        cp      '?'\r
        ret     nc\r
 test_numeral:\r
-       cp      '9'+1\r
+       cp      '9'\r
+       ret     z\r
        ccf\r
        ret     c\r
        cp      '0'\r