#include "warn.hh"
#include "program-option.hh"
#include "lily-parser.hh"
+#include "ly-module.hh"
static Keyword_ent the_key_tab[]
=
{"description", DESCRIPTION},
{"drummode", DRUMMODE},
{"drums", DRUMS},
+ {"etc", ETC},
{"figuremode", FIGUREMODE},
{"figures", FIGURES},
{"header", HEADER},
SCM prev = ly_module_lookup (mod, sym);
if (scm_is_true (prev))
val = nested_property_alist (scm_variable_ref (prev), path, val);
+ else
+ val = nested_create_alist (path, val);
}
scm_module_define (mod, sym, val);
}
{
error_level_ |= 1;
Input spot (*lexloc_);
- spot.error (s);
+ spot.non_fatal_error (s);
}
}
}
-const char Lily_lexer::type_p_name_[] = "ly:lily-lexer?";
+const char * const Lily_lexer::type_p_name_ = "ly:lily-lexer?";
SCM
-Lily_lexer::mark_smob ()
+Lily_lexer::mark_smob () const
{
ASSERT_LIVE_IS_ALLOWED (self_scm ());
}
int
-Lily_lexer::print_smob (SCM port, scm_print_state *)
+Lily_lexer::print_smob (SCM port, scm_print_state *) const
{
scm_puts ("#<Lily_lexer ", port);
scm_display (scopes_, port);