izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-24 01:58:06 +11:00
Code Issues Releases Wiki Activity

zasm: try for regular number or symbol before parsing expr

Browse Source 
Previously, we would mess up literals like '-'.
This commit is contained in:
Virgil Dupras 2019-05-18 21:06:31 -04:00
parent 723497af69
commit bccf933ea9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/zasm/expr.asm
View File

@ -2,6 +2,11 @@
; We expect (HL) to be disposable: we mutate it to avoid having to make a copy. ; We expect (HL) to be disposable: we mutate it to avoid having to make a copy.
; Sets Z on success, unset on error. ; Sets Z on success, unset on error.
parseExpr: parseExpr:
; Before we evaluate an expression, we first try for a regular number or
; symbol. We do this because parsing expressions can mess up some values
; with its splitting logic. For example '-' is going to end up '\0'.
call parseNumberOrSymbol
ret z
push de push de
push hl push hl
call _parseExpr call _parseExpr
@ -19,7 +24,7 @@ _parseExpr:
ld a, '*' ld a, '*'
call _findAndSplit call _findAndSplit
jp z, _applyMult jp z, _applyMult
jp parseNumberOrSymbol ret ; failure
; Given a string in (HL) and a separator char in A, return a splitted string, ; Given a string in (HL) and a separator char in A, return a splitted string,
; that is, the same (HL) string but with the found A char replaced by a null ; that is, the same (HL) string but with the found A char replaced by a null

1
tools/tests/zasm/test1.asm
View File

@ -24,3 +24,4 @@ label2: .dw 0x42
rl d rl d
rr e rr e
rlc c rlc c
cp '-'