X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fparser-ly-from-scheme.scm;h=00368e881fea665152831be7f4dc7938d1647b11;hb=4d405ef96a8a62771d7d9a283ff5369a772e89d8;hp=96b7ef2885e206b8bc396093991796e1f9c7c408;hpb=e24fb7cc5671aea95211d4a0c56f28fb6fe8720e;p=lilypond.git

diff --git a/scm/parser-ly-from-scheme.scm b/scm/parser-ly-from-scheme.scm
index 96b7ef2885..00368e881f 100644
--- a/scm/parser-ly-from-scheme.scm
+++ b/scm/parser-ly-from-scheme.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2004--2014  Nicolas Sceaux  <nicolas.sceaux@free.fr>
+;;;; Copyright (C) 2004--2015  Nicolas Sceaux  <nicolas.sceaux@free.fr>
 ;;;;           Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -65,17 +65,15 @@ from @var{port} and return the corresponding Scheme music expression.
                                        (set! closures
                                              (cons `(cons ,p (lambda () ,expr))
                                                    closures)))))))))))
-    (define (embedded-lilypond parser lily-string filename line
-                               closures location)
-      (let* ((clone (ly:parser-clone parser closures location))
+    (define (embedded-lilypond lily-string filename line closures)
+      (let* ((clone (ly:parser-clone closures (*location*)))
              (result (ly:parse-string-expression clone lily-string
                                                  filename line)))
         (if (ly:parser-has-error? clone)
-            (ly:parser-error parser (_ "error in #{ ... #}")))
+            (ly:parser-error (_ "error in #{ ... #}") (*location*)))
         result))
     (list embedded-lilypond
-          'parser lily-string filename line
-          (cons 'list (reverse! closures))
-          'location)))
+          lily-string filename line
+          (cons 'list (reverse! closures)))))
 
 (read-hash-extend #\{ read-lily-expression)