source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "lily-lexer.hh"
#include <cctype>
#include <sstream>
+using namespace std;
-#include "scm-hash.hh"
+#include "international.hh"
#include "interval.hh"
-#include "parser.hh"
#include "keyword.hh"
-#include "warn.hh"
-#include "source-file.hh"
#include "main.hh"
#include "moment.hh"
+#include "parser.hh"
+#include "scm-hash.hh"
+#include "source-file.hh"
+#include "warn.hh"
static Keyword_ent the_key_tab[]
= {
{"accepts", ACCEPTS},
{"addlyrics", ADDLYRICS},
- {"addquote", ADDQUOTE},
{"alias", ALIAS},
{"alternative", ALTERNATIVE},
- {"bar", BAR},
{"book", BOOK},
{"change", CHANGE},
{"chordmode", CHORDMODE},
{"chords", CHORDS},
- {"clef", CLEF},
{"consists", CONSISTS},
{"context", CONTEXT},
{"default", DEFAULT},
{"new", NEWCONTEXT},
{"notemode", NOTEMODE},
{"objectid", OBJECTID},
- {"octave", OCTAVE},
{"once", ONCE},
{"override", OVERRIDE},
{"paper", PAPER},
{"set", SET},
{"simultaneous", SIMULTANEOUS},
{"skip", SKIP},
- {"tag", TAG},
{"tempo", TEMPO},
{"time", TIME_T},
{"times", TIMES},
pitchname_tab_stack_ = src.pitchname_tab_stack_;
sources_ = src.sources_;
start_module_ = SCM_EOL;
-
+
error_level_ = src.error_level_;
is_main_input_ = src.is_main_input_;
ly_reexport_module (scm_current_module ());
if (!scm_is_pair (scopes_))
start_module_ = scm_current_module ();
-
+
for (SCM s = scopes_; scm_is_pair (s); s = scm_cdr (s))
- {
- ly_use_module (module, scm_car (s));
- }
+ ly_use_module (module, scm_car (s));
scopes_ = scm_cons (module, scopes_);
set_current_scope ();
}
-
SCM
Lily_lexer::remove_scope ()
{
Lily_lexer::set_current_scope ()
{
SCM old = scm_current_module ();
-
+
if (scm_is_pair (scopes_))
scm_set_current_module (scm_car (scopes_));
else
}
int
-Lily_lexer::lookup_keyword (String s)
+Lily_lexer::lookup_keyword (string s)
{
- return keytable_->lookup (s.to_str0 ());
+ return keytable_->lookup (s.c_str ());
}
SCM
}
SCM
-Lily_lexer::lookup_identifier (String name)
+Lily_lexer::lookup_identifier (string name)
{
- return lookup_identifier_symbol (ly_symbol2scm (name.to_str0 ()));
+ return lookup_identifier_symbol (ly_symbol2scm (name.c_str ()));
}
void
scm_module_define (scm_car (scopes_),
ly_symbol2scm ("input-file-name"),
- scm_makfrom0str (main_input_name_.to_str0 ()));
+ scm_makfrom0str (main_input_name_.c_str ()));
}
void
{
if (lookup_keyword (ly_symbol2string (sym)) >= 0)
{
- String symstr = ly_symbol2string (sym);
- warning (_f ("identifier name is a keyword: `%s'", symstr.to_str0 ()));
+ string symstr = ly_symbol2string (sym);
+ warning (_f ("identifier name is a keyword: `%s'", symstr.c_str ()));
}
SCM mod = scm_car (scopes_);
void
Lily_lexer::LexerError (char const *s)
{
- if (include_stack_.is_empty ())
+ if (include_stack_.empty ())
message (_f ("error at EOF: %s", s) + "\n");
else
{
Input
Lily_lexer::here_input () const
{
- return Input(*lexloc);
+ return Input (*lexloc);
}
void
void
Lily_lexer::add_lexed_char (int count)
{
- char const * start = here_str0 ();
+ char const *start = here_str0 ();
lexloc->set (get_source_file (),
start, start + count);
- char_count_stack_.top () += count;
+ char_count_stack_.back () += count;
}
#include "ly-smobs.icc"