Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / lily / include / input.hh

diff --git a/lily/include/input.hh b/lily/include/input.hh
index b33b5067308f4b6f568c2dd1dc335c5de608b23a..aab0d117a66a561b7f6a0cea4c727a97b64d3e24 100644 (file)
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -32,10 +32,10 @@ class Input : public Simple_smob<Input>
   char const *end_;
   Source_file *source_file_;
 public:
-  static const char type_p_name_[];
-  int print_smob (SCM, scm_print_state *);
+  static const char * const type_p_name_;
+  int print_smob (SCM, scm_print_state *) const;
   static SCM equal_p (SCM, SCM);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   Source_file *get_source_file () const;
   char const *start () const;
   char const *end () const;
@@ -73,4 +73,12 @@ protected:
 
 extern Input dummy_input_global;
 
+// The parser calls syntax functions with a lot of arguments
+SCM with_location (SCM loc, SCM proc);
+SCM with_location (SCM loc, SCM proc, SCM);
+SCM with_location (SCM loc, SCM proc, SCM, SCM);
+SCM with_location (SCM loc, SCM proc, SCM, SCM, SCM);
+SCM with_location (SCM loc, SCM proc, SCM, SCM, SCM, SCM);
+SCM with_location (SCM loc, SCM proc, SCM, SCM, SCM, SCM, SCM);
+
 #endif // INPUT_HH