/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
SCM
Lily_parser::parse_string_expression (string ly_code, string filename,
- int line)
+ int line)
{
// TODO: use $parser
lexer_->set_identifier (ly_symbol2scm ("parser"),
lexer_->main_input_name_ = filename;
lexer_->is_main_input_ = true;
lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
- if (line) {
- lexer_->get_source_file ()->set_line (0, line);
- }
+ if (line)
+ {
+ lexer_->get_source_file ()->set_line (0, line);
+ }
SCM mod = lexer_->set_current_scope ();
lexer_->push_extra_token (EMBEDDED_LILY);
do_yyparse ();
SCM result = lexer_->lookup_identifier_symbol (ly_symbol2scm ("parseStringResult"));
// parseStringResult is set in the grammar rule for embedded_lilypond
-
+
scm_set_current_module (mod);
error_level_ = error_level_ | lexer_->error_level_;