/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Source_file *sf = ps->start_location_.get_source_file ();
SCM port = sf->get_port ();
- int off = ps->start_location_.start () - sf->c_str ();
+ long off = ps->start_location_.start () - sf->c_str ();
scm_seek (port, scm_from_long (off), scm_from_long (SEEK_SET));
SCM from = scm_ftell (port);
scm_set_port_line_x (port, scm_from_int (ps->start_location_.line_number () - 1));
scm_set_port_column_x (port, scm_from_int (ps->start_location_.column_number () - 1));
- SCM form = scm_read (port);
+ bool multiple = ly_is_equal (scm_peek_char (port), SCM_MAKE_CHAR ('@'));
+
+ if (multiple)
+ (void) scm_read_char (port);
+ SCM form = scm_read (port);
SCM to = scm_ftell (port);
- ps->nchars = scm_to_int (to) - scm_to_int (from);
+ ps->nchars = scm_to_int (to) - scm_to_int (from);
- if (!SCM_EOF_OBJECT_P (form)) {
- if (ps->parser_->lexer_->top_input ())
- {
- // Find any precompiled form.
- SCM c = scm_assv_ref (ps->parser_->closures_, from);
- if (scm_is_true (c))
- // Replace form with a call to previously compiled closure
- form = scm_list_1 (c);
- }
- return scm_cons (form, make_input (ps->start_location_));
-}
+ if (!SCM_EOF_OBJECT_P (form))
+ {
+ if (ps->parser_->lexer_->top_input ())
+ {
+ // Find any precompiled form.
+ SCM c = scm_assv_ref (ps->parser_->closures_, from);
+ if (scm_is_true (c))
+ // Replace form with a call to previously compiled closure
+ form = scm_list_1 (c);
+ }
+ if (multiple)
+ form = scm_list_3 (ly_symbol2scm ("apply"),
+ ly_symbol2scm ("values"),
+ form);
+ return scm_cons (form, make_input (ps->start_location_));
+ }
/* Don't close the port here; if we re-enter this function via a
continuation, then the next time we enter it, we'll get an error.
{
static SCM module = SCM_BOOL_F;
if (module == SCM_BOOL_F)
- {
- SCM function = ly_lily_module_constant ("make-safe-lilypond-module");
- module = scm_gc_protect_object (scm_call_0 (function));
- }
-
+ {
+ SCM function = ly_lily_module_constant ("make-safe-lilypond-module");
+ module = scm_gc_protect_object (scm_call_0 (function));
+ }
+
// We define the parser so trusted Scheme functions can
// access the real namespace underlying the parser.
if (ps->parser_)
- scm_module_define (module, ly_symbol2scm ("parser"),
- ps->parser_->self_scm ());
+ scm_module_define (module, ly_symbol2scm ("parser"),
+ ps->parser_->self_scm ());
return scm_eval (ps->form_, module);
}
return scm_primitive_eval (ps->form_);
}
-
SCM
catch_protected_parse_body (void *p)
{
scm_remember_upto_here_1 (form);
return ans;
}
-