revert the module-lexer.rkt changes that I accidentally pushed
This commit is contained in:
parent
42eb0a9e88
commit
dce1d0ad47
|
@ -1,58 +1,45 @@
|
||||||
#lang racket/base
|
#lang scheme/base
|
||||||
(require racket/port
|
(require scheme/port
|
||||||
"scheme-lexer.rkt")
|
"scheme-lexer.rkt")
|
||||||
|
|
||||||
(provide module-lexer)
|
(provide module-lexer)
|
||||||
|
|
||||||
;; mode = (or/c #f 'before-lang-line --
|
|
||||||
;; 'no-lang-line
|
|
||||||
;; (cons lexer mode)
|
|
||||||
;; lexer)
|
|
||||||
|
|
||||||
(define count 0)
|
|
||||||
|
|
||||||
(define (module-lexer in offset mode)
|
(define (module-lexer in offset mode)
|
||||||
(set! count (+ count 1))
|
|
||||||
(printf "~a ~s\n" count (list 'module-lexer in offset mode))
|
|
||||||
(cond
|
(cond
|
||||||
[(or (not mode) (eq? mode 'before-lang-line))
|
[(not mode)
|
||||||
(define-values (lexeme type data new-token-start new-token-end) (scheme-lexer in))
|
;; Starting out: look for #lang:
|
||||||
(printf "before-lang-line lexeme ~s type ~s\n" lexeme type)
|
(let*-values ([(p) (peeking-input-port in)]
|
||||||
|
[(init) (file-position p)]
|
||||||
|
[(start-line start-col start-pos) (port-next-location p)])
|
||||||
|
(let ([get-info (with-handlers ([exn:fail? (lambda (exn) 'fail)])
|
||||||
|
(read-language p (lambda () #f)))]
|
||||||
|
[sync-ports (lambda ()
|
||||||
|
(read-bytes (- (file-position p) init) in))])
|
||||||
(cond
|
(cond
|
||||||
[(or (eq? type 'comment) (eq? type 'whitespace))
|
|
||||||
(values lexeme 'other data new-token-start new-token-end 0 'before-lang-line)]
|
|
||||||
[else
|
|
||||||
;; look for #lang:
|
|
||||||
(define p (peeking-input-port in))
|
|
||||||
(port-count-lines! p)
|
|
||||||
(define init (file-position p))
|
|
||||||
(define get-info (with-handlers ([exn:fail:read? values]) (read-language p (λ () 'fail))))
|
|
||||||
(printf "get-info ~s\n" get-info)
|
|
||||||
(cond
|
|
||||||
[(not (procedure? get-info))
|
|
||||||
;(or (exn? get-info) (eq? get-info 'fail))
|
|
||||||
(values lexeme type data new-token-start new-token-end 0 'no-lang-line)]
|
|
||||||
[(procedure? get-info)
|
[(procedure? get-info)
|
||||||
(define end-pos (file-position p))
|
|
||||||
(read-bytes (- end-pos init) in) ;; sync ports
|
|
||||||
;; Produce language as first token:
|
;; Produce language as first token:
|
||||||
|
(sync-ports)
|
||||||
|
(let-values ([(end-line end-col end-pos) (port-next-location in)])
|
||||||
(values
|
(values
|
||||||
"#lang"
|
"#lang"
|
||||||
'other
|
'other
|
||||||
#f
|
#f
|
||||||
1 ;; start-pos
|
start-pos
|
||||||
(+ end-pos 1)
|
end-pos
|
||||||
0
|
0
|
||||||
(or (let ([v (get-info 'color-lexer #f)])
|
(or (let ([v (get-info 'color-lexer #f)])
|
||||||
(and v
|
(and v
|
||||||
(if (procedure-arity-includes? v 3)
|
(if (procedure-arity-includes? v 3)
|
||||||
(cons v #f)
|
(cons v #f)
|
||||||
v)))
|
v)))
|
||||||
scheme-lexer))])])]
|
scheme-lexer)))]
|
||||||
[(eq? mode 'no-lang-line)
|
[(eq? 'fail get-info)
|
||||||
(let-values ([(lexeme type data new-token-start new-token-end)
|
(sync-ports)
|
||||||
(scheme-lexer in)])
|
(let*-values ([(end-line end-col end-pos) (port-next-location in)])
|
||||||
(values lexeme type data new-token-start new-token-end 0 'no-lang-line))]
|
(values #f 'error #f start-pos end-pos 0 scheme-lexer))]
|
||||||
|
[else
|
||||||
|
;; Start over using the Scheme lexer
|
||||||
|
(module-lexer in offset scheme-lexer)])))]
|
||||||
[(pair? mode)
|
[(pair? mode)
|
||||||
;; #lang-selected language consumes and produces a mode:
|
;; #lang-selected language consumes and produces a mode:
|
||||||
(let-values ([(lexeme type data new-token-start new-token-end backup-delta new-mode)
|
(let-values ([(lexeme type data new-token-start new-token-end backup-delta new-mode)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user