;;;; This file is part of LilyPond, the GNU music typesetter.
;;;;
-;;;; Copyright (C) 2004--2011 Nicolas Sceaux <nicolas.sceaux@free.fr>
+;;;; Copyright (C) 2004--2012 Nicolas Sceaux <nicolas.sceaux@free.fr>
;;;; Jan Nieuwenhuizen <janneke@gnu.org>
;;;;
;;;; LilyPond is free software: you can redistribute it and/or modify
(write-char x out)
x)) #f)
"r")))
+ (set-port-filename! copycat filename)
(do ((c (read-char port) (read-char port)))
((and (char=? c #\#)
(char=? (peek-char port) #\}))
(write-char c out)
;; a #scheme or $scheme expression
(if (or (char=? c #\#) (char=? c #\$))
- (let ((p (ftell out)))
- (set! closures
- (cons (cons p (read copycat))
- closures))))))))))
- `(let* ((clone
- (ly:parser-clone parser (list ,@(map (lambda (c)
- `(cons ,(car c)
- (lambda () ,(cdr c))))
- (reverse! closures)))))
- (result (ly:parse-string-expression clone ,lily-string
- ,filename
- ,line)))
- (if (ly:parser-has-error? clone)
- (ly:parser-error parser (_ "error in #{ ... #}")))
- result)))
+ (let* ((p (ftell out))
+ (expr
+ (begin
+ (set-port-line! copycat
+ (port-line port))
+ (set-port-column! copycat
+ (port-column port))
+ (if (char=? (peek-char port) #\@)
+ (read-char copycat))
+ (read copycat))))
+ ;; kill unused lookahead, it has been
+ ;; written out already
+ (drain-input copycat)
+ ;; only put symbols and non-quote
+ ;; lists into closures -- constants
+ ;; don't need lexical environments
+ ;; for evaluation.
+ (if (or (symbol? expr)
+ (and (pair? expr)
+ (not (eq? 'quote (car expr)))))
+ (set! closures
+ (cons `(cons ,p (lambda () ,expr))
+ closures)))))))))))
+ (define (embedded-lilypond parser lily-string filename line closures)
+ (let* ((clone (ly:parser-clone parser closures))
+ (result (ly:parse-string-expression clone lily-string
+ filename line)))
+ (if (ly:parser-has-error? clone)
+ (ly:parser-error parser (_ "error in #{ ... #}")))
+ result))
+ (list embedded-lilypond 'parser lily-string filename line (cons 'list (reverse! closures)))))
(read-hash-extend #\{ read-lily-expression)