- SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG1, __FUNCTION__, "parser");
- SCM_ASSERT_TYPE (scm_is_string (ly_code), ly_code, SCM_ARG2, __FUNCTION__, "string");
+ if (!parser->lexer_->is_clean ())
+ parser->parser_error (_ ("ly:parser-parse-string is only valid with a new parser."
+ " Use ly:parser-include-string instead."));
+ else
+ parser->parse_string (ly_scm2string (ly_code));
+
+ return SCM_UNSPECIFIED;
+}
+
+LY_DEFINE (ly_parse_string_expression, "ly:parse-string-expression",
+ 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."
+ " @var{filename} and @var{line} are optional source indicators.")
+{
+ LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
+ Lily_parser *parser = Lily_parser::unsmob (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."));
+ return SCM_UNSPECIFIED;
+ }