From 519cf478d2e8e709fef0cafbcee668d0cc4f515e Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 14 Dec 2006 14:10:13 +0100
Subject: [PATCH] ly:clone-parser -> ly:parser-clone, ly:parser-lexer.
---
lily/lily-parser-scheme.cc | 10 +++++++++-
ly/music-functions-init.ly | 2 +-
python/convertrules.py | 7 +++++++
scm/parser-ly-from-scheme.scm | 2 +-
4 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index 8bc3d5e994..83c3826dbd 100644
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -163,7 +163,15 @@ LY_DEFINE (ly_parse_string, "ly:parse-string",
return SCM_UNSPECIFIED;
}
-LY_DEFINE (ly_clone_parser, "ly:clone-parser",
+LY_DEFINE (ly_parser_lexer, "ly:parser-lexer",
+ 1, 0, 0, (SCM parser_smob),
+ "Return the lexer for PARSER_SMOB.")
+{
+ Lily_parser *parser = unsmob_lily_parser (parser_smob);
+ return parser->lexer_->self_scm ();
+}
+
+LY_DEFINE (ly_parser_clone, "ly:parser-clone",
1, 0, 0, (SCM parser_smob),
"Return a clone of PARSER_SMOB.")
{
diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index f5342b052d..077c965bd5 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -551,7 +551,7 @@ includePageLayoutFile =
(if (access? tweak-filename R_OK)
(begin
(ly:message "Including tweak file ~a" tweak-filename)
- (set! page-layout-parser (ly:clone-parser parser))
+ (set! page-layout-parser (ly:parser-clone parser))
(ly:parser-parse-string page-layout-parser
(format #f "\\include \"~a\""
tweak-filename))))))
diff --git a/python/convertrules.py b/python/convertrules.py
index 2ed3b28636..a2ac08534b 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2878,3 +2878,10 @@ def conv (str):
conversions.append (((2, 10, 0), conv, """bump version for release"""))
+
+def conv (str):
+ return re.sub ('ly:clone-parser',
+ 'ly:parser-clone', str)
+
+conversions.append (((2, 11, 2), conv, """ly:clone-parser -> ly:parser-clone"""))
+
diff --git a/scm/parser-ly-from-scheme.scm b/scm/parser-ly-from-scheme.scm
index 9d2b3b5d47..86f3f89a27 100644
--- a/scm/parser-ly-from-scheme.scm
+++ b/scm/parser-ly-from-scheme.scm
@@ -78,7 +78,7 @@ character."
;; other caracters
(else
(display c out))))))))
- `(let ((parser-clone (ly:clone-parser parser)))
+ `(let ((parser-clone (ly:parser-clone parser)))
,@(map (lambda (binding)
`(ly:parser-define! parser-clone ',(car binding) ,(cdr binding)))
(reverse bindings))
--
2.39.5