suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of key=val shorthand for attributes

Browse Source 
svn: r6699
This commit is contained in:
Eli Barzilay 2007-06-19 19:41:24 +00:00
parent e6aafcf888
commit 77ecb16001
2 changed files with 6 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
collects/scribble/docreader.ss
View File

@ -7,15 +7,14 @@
(rename *read-syntax read-syntax))
(define (call-with-scribble-params t)
(parameterize ([scribble:read-accept-=-keyword #f]
[scribble:read-insert-indents #f])
(parameterize ([scribble:read-insert-indents #f])
(t)))
(define/kw (*read #:optional [inp (current-input-port)])
(call-with-scribble-params
(lambda ()
(wrap inp (scribble:read-inside inp)))))
(define/kw (*read-syntax #:optional src [port (current-input-port)])
(call-with-scribble-params
(lambda ()

36
collects/scribble/reader.ss
View File

@ -5,10 +5,8 @@
(module reader mzscheme
(require (lib "string.ss") (lib "kw.ss") (lib "readerr.ss" "syntax"))
(provide read-insert-indents
read-accept-=-keyword)
(provide read-insert-indents)
(define read-insert-indents (make-parameter #t))
(define read-accept-=-keyword (make-parameter #t))
(define cmd-char #\@)
@ -24,7 +22,6 @@
(define close-lines* '(#"^(?:[ \t]*\r?\n[ \t]*)?" #""))
(define comment-start #rx#"^[ \t]*;")
(define comment-line #rx#"^[^\r\n]*\r?\n[ \t]*") ; like tex's `%' nl & space
(define attr-sep #rx#"^[ \t\r\n]*=[ \t\r\n]*")
(define sub-start #rx#"^[@]")
(define line-item #rx#"^(?:[^{}@\r\n]*[^\\{}@\r\n]|[\\]+[{}@])+")
(define line-item* '(#"^(?:[^{}@\r\n]*[^\\{}@\r\n]|[\\]+(?:[@]|" #"))+"))
@ -132,29 +129,12 @@
(loop (sub1 i))))
r))
(define eol-token "\n")
(define (get-attr)
(if (regexp-match/fail-without-reading close-attrs inp) #f
(let* ([fst (next-syntax
;; hack: if we see an open paren or other nested
;; constructs, use the usual readtable so a nested `='
;; behaves correctly
(if (or (not (read-accept-=-keyword))
(regexp-match-peek-positions
#rx#"^[ \t\r\n]*['`,]*[[({@]" inp))
at-readtable attr-readtable)
#t)]
[snd (and (read-accept-=-keyword)
(symbol? (syntax-e fst))
(regexp-match/fail-without-reading attr-sep inp)
(next-syntax at-readtable))])
(if snd
(list (string->keyword (symbol->string (syntax-e fst))) snd)
(list fst)))))
(define (get-attrs)
(and (regexp-match/fail-without-reading open-attrs inp)
(let loop ([attrs '()])
(let ([a (get-attr)])
(if a (loop (append! (reverse! a) attrs)) (reverse! attrs))))))
(if (regexp-match/fail-without-reading close-attrs inp)
(reverse! attrs)
(loop (cons (next-syntax at-readtable #t) attrs))))))
(define ((get-line open open-re close close-re item-re unquote-re level))
(let-values ([(line col pos) (port-next-location inp)])
(define (make-stx sexpr)
@ -352,14 +332,6 @@
(list source-name line-num col-num position
(add1 (bytes-length (car m)))))))))
;; similar to plain Scheme, but with `=' always parsed as a separate symbol
(define attr-readtable
(make-readtable at-readtable #\= 'terminating-macro
(lambda (char inp source-name line-num col-num position)
(datum->syntax-object
#f (string->symbol (string char))
(list source-name line-num col-num position 1)))))
(provide use-at-readtable)
(define (use-at-readtable)
(port-count-lines! (current-input-port))