mirror of
https://github.com/cc65/cc65.git
synced 2024-12-23 04:30:10 +00:00
Rewrote argument parsing
git-svn-id: svn://svn.cc65.org/cc65/trunk@2984 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
parent
968cf01d58
commit
35a099bb81
@ -26,11 +26,9 @@
|
||||
|
||||
.include "c64.inc"
|
||||
|
||||
; Maximum number of arguments allowed in the argument table.
|
||||
; (An argument contains a comma, at least.)
|
||||
;
|
||||
MAXARGS = BASIC_BUF_LEN - 2 ; (don't count REM and terminating '\0')
|
||||
|
||||
|
||||
MAXARGS = 10 ; Maximum number of arguments allowed
|
||||
REM = $8f ; BASIC token-code
|
||||
NAME_LEN = 16 ; maximum length of command-name
|
||||
|
||||
@ -51,10 +49,6 @@ L0: lda (FNAM),y
|
||||
sta name,y
|
||||
L1: dey
|
||||
bpl L0
|
||||
lda #<name
|
||||
ldx #>name
|
||||
sta argv
|
||||
stx argv + 1
|
||||
inc __argc ; argc always is equal to, at least, 1
|
||||
|
||||
; Find the "rem" token.
|
||||
@ -67,52 +61,61 @@ L2: lda BASIC_BUF,x
|
||||
bne L2
|
||||
ldy #1 * 2
|
||||
|
||||
; Find the next argument.
|
||||
;
|
||||
; Find the next argument
|
||||
|
||||
next: lda BASIC_BUF,x
|
||||
beq done
|
||||
beq done ; End of line reached
|
||||
inx
|
||||
cmp #',' ; look for argument-list separator
|
||||
bne next
|
||||
lda #$00
|
||||
sta BASIC_BUF-1,x ; make the previous arg. be a legal C string
|
||||
inc __argc ; found another arg.
|
||||
cmp #' ' ; Skip leading spaces
|
||||
beq next ;
|
||||
|
||||
L4: lda BASIC_BUF,x
|
||||
beq point ; zero-length argument
|
||||
inx
|
||||
cmp #' '
|
||||
beq L4 ; skip leading spaces
|
||||
; Found start of next argument. We've incremented the pointer in X already, so
|
||||
; it points to the second character of the argument. This is useful since we
|
||||
; will check now for a quoted argument, in which case we will have to skip this
|
||||
; first character.
|
||||
|
||||
cmp #'"' ; is argument quoted?
|
||||
beq L5
|
||||
dex ; no, don't skip over character
|
||||
clc ; (quotation-mark sets flag)
|
||||
L5: ror quoted ; save it
|
||||
found: cmp #'"' ; Is the argument quoted?
|
||||
beq setterm ; Jump if so
|
||||
dex ; Reset pointer to first argument character
|
||||
lda #' ' ; A space ends the argument
|
||||
setterm:sta term ; Set end of argument marker
|
||||
|
||||
; BASIC's input-buffer starts at the beginning of a RAM page.
|
||||
; So, we don't need to add the offset -- just store it.
|
||||
;
|
||||
point: txa
|
||||
; Now store a pointer to the argument into the next slot. Since the BASIC
|
||||
; input buffer is located at the start of a RAM page, no calculations are
|
||||
; necessary.
|
||||
|
||||
txa ; Get low byte
|
||||
sta argv,y ; argv[y]= &arg
|
||||
iny
|
||||
lda #>BASIC_BUF
|
||||
sta argv,y
|
||||
iny
|
||||
inc __argc ; Found another arg
|
||||
|
||||
asl quoted ; is argument a string-literal?
|
||||
bcc next ; no, don't look for ending quotation-mark
|
||||
L7: lda BASIC_BUF,x
|
||||
; Search for the end of the argument
|
||||
|
||||
argloop:lda BASIC_BUF,x
|
||||
beq done
|
||||
inx
|
||||
cmp #'"'
|
||||
bne L7
|
||||
lda #$00
|
||||
sta BASIC_BUF-1,x ; make this arg. be a legal C string
|
||||
beq next ;(bra)
|
||||
cmp term
|
||||
bne argloop
|
||||
|
||||
; We've found the end of the argument. X points one character behind it, and
|
||||
; A contains the terminating character. To make the argument a valid C string,
|
||||
; replace the terminating character by a zero.
|
||||
|
||||
lda #0
|
||||
sta BASIC_BUF-1,x
|
||||
|
||||
; Check if the maximum number of command line arguments is reached. If not,
|
||||
; parse the next one.
|
||||
|
||||
lda __argc ; Get low byte of argument count
|
||||
cmp #MAXARGS ; Maximum number of arguments reached?
|
||||
bcc next ; Parse next one if not
|
||||
|
||||
; (The last vector in argv[] already is NULL.)
|
||||
;
|
||||
|
||||
done: lda #<argv
|
||||
ldx #>argv
|
||||
sta __argv
|
||||
@ -123,7 +126,11 @@ done: lda #<argv
|
||||
; char name[16+1];
|
||||
; char* argv[MAXARGS+1]={name};
|
||||
;
|
||||
.bss
|
||||
quoted: .res 1, %00000000
|
||||
.bss
|
||||
term: .res 1
|
||||
name: .res NAME_LEN + 1
|
||||
argv: .res (MAXARGS + 1) * 2
|
||||
|
||||
.data
|
||||
argv: .addr name
|
||||
.res MAXARGS * 2
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user