X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser-scheme.cc;h=180d8527b158fb1bc734955b1b9d4f8893ad0390;hb=0c61221b46addec50e2406e04af44a7d460443d4;hp=dc6b652b3d285503ff089ea1b587632868f5c80e;hpb=ddd74753371d73e65bb57d086fe376e771ef86b8;p=lilypond.git

diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index dc6b652b3d..180d8527b1 100644
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -114,8 +114,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
       sources.set_path (&global_path);
 
       string mapped_fn = map_file_name (file_name);
-      message (_f ("Processing `%s'", mapped_fn.c_str ()));
-      progress_indication ("\n");
+      basic_progress (_f ("Processing `%s'", mapped_fn.c_str ()));
 
       Lily_parser *parser = new Lily_parser (&sources);
 
@@ -147,12 +146,19 @@ LY_DEFINE (ly_parser_lexer, "ly:parser-lexer",
 }
 
 LY_DEFINE (ly_parser_clone, "ly:parser-clone",
-           1, 0, 0, (SCM parser_smob),
-           "Return a clone of @var{parser-smob}.")
+           1, 1, 0, (SCM parser_smob, SCM closures),
+           "Return a clone of @var{parser-smob}.  An association list"
+           " of port positions to closures can be specified in @var{closures}"
+           " in order to have @code{$} and @code{#} interpreted in their original"
+           " lexical environment.")
 {
   LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
   Lily_parser *parser = unsmob_lily_parser (parser_smob);
-  Lily_parser *clone = new Lily_parser (*parser);
+  if (SCM_UNBNDP (closures))
+    closures = SCM_EOL;
+  else
+    LY_ASSERT_TYPE (ly_is_list, closures, 2);
+  Lily_parser *clone = new Lily_parser (*parser, closures);
 
   return clone->unprotect ();
 }
@@ -182,7 +188,7 @@ LY_DEFINE (ly_parser_lookup, "ly:parser-lookup",
 
   LY_ASSERT_TYPE (ly_is_symbol, symbol, 2);
 
-  SCM val = parser->lexer_->lookup_identifier (ly_scm2string (scm_symbol_to_string (symbol)));
+  SCM val = parser->lexer_->lookup_identifier (ly_symbol2string (symbol));
   if (val != SCM_UNDEFINED)
     return val;
   else
@@ -208,28 +214,42 @@ LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string",
 }
 
 LY_DEFINE (ly_parse_string_expression, "ly:parse-string-expression",
-           2, 0, 0, (SCM parser_smob, SCM ly_code),
+           2, 2, 0, (SCM parser_smob, SCM ly_code, SCM filename,
+                     SCM line),
            "Parse the string @var{ly-code} with @var{parser-smob}."
-" Return the contained music expression.")
+           " Return the contained music expression."
+           " @var{filename} and @var{line} are optional source indicators.")
 {
   LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
   Lily_parser *parser = unsmob_lily_parser (parser_smob);
   LY_ASSERT_TYPE (scm_is_string, ly_code, 2);
+  string fn;
+  if (SCM_UNBNDP (filename) || !scm_is_string (filename))
+    fn = "<string>";
+  else
+    fn = ly_scm2string (filename);
+  int ln;
+  if (SCM_UNBNDP (line) || !scm_is_integer (line))
+    ln = 0;
+  else
+    ln = scm_to_int (line);
 
   if (!parser->lexer_->is_clean ())
     {
       parser->parser_error (_ ("ly:parse-string-expression is only valid with a new parser."
-			       "  Use ly:parser-include-string instead."));
+                               "  Use ly:parser-include-string instead."));
       return SCM_UNSPECIFIED;
     }
 
-  return parser->parse_string_expression (ly_scm2string (ly_code));
+  return parser->parse_string_expression (ly_scm2string (ly_code),
+                                          fn, ln);
 }
 
 LY_DEFINE (ly_parser_include_string, "ly:parser-include-string",
            2, 0, 0, (SCM parser_smob, SCM ly_code),
            "Include the string @var{ly-code} into the input stream"
-           " for @var{parser-smob}.")
+           " for @var{parser-smob}.  Can only be used in immediate"
+           " Scheme expressions (@code{$} instead of @code{#}).")
 {
   LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
   Lily_parser *parser = unsmob_lily_parser (parser_smob);