release: 0.0.46.jcn1

[lilypond.git] / lily / include / my-lily-parser.hh

diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh
index 679c3811813fa998ab2e4c14e7ced06dc5753ecf..2eef0929a4cd508ec55d1bd0cbd11bcb39494b1f 100644 (file)
--- a/lily/include/my-lily-parser.hh
+++ b/lily/include/my-lily-parser.hh
@@ -18,8 +18,20 @@
 #include "duration.hh"
 #include "string.hh"
 #include "varray.hh"
+#include "input.hh"
 
 class My_lily_parser {
+    char const* here_ch_C()const;
+    Array<Input> define_spot_array_;
+  
+
+    void add_requests( Voice_element*v);
+
+    Voice_element * get_note_element(Note_req * ,Duration *);
+    Voice_element* get_rest_element(String,Duration *);
+    Voice_element* get_word_element(Text_def*, Duration*);
+    void set_last_duration(Duration const *);
+    void set_duration_mode(String s);
 public:
     friend int yyparse( void*);
    
@@ -30,8 +42,6 @@ public:
     bool last_duration_mode ;
 
     Array<Request*> pre_reqs, post_reqs;
-    Array<const char *> define_spot_array_;
-    char const* defined_ch_C_;
     int fatal_error_i_;
     Sources * source_l_;
     int error_level_i_;
@@ -39,15 +49,10 @@ public:
     My_lily_lexer * lexer_p_;
  
     Moment plet_mom();
-    void add_requests( Voice_element*v);
-
-    Voice_element * get_note_element(Note_req * ,Duration *);
-    Voice_element* get_rest_element(String,Duration *);
-    Voice_element* get_word_element(Text_def*, Duration*);
-    void set_last_duration(Duration const *);
-    void set_duration_mode(String s);
-    char const* here_ch_C()const;
+    Input here_input()const;
     void remember_spot();
+    Input pop_spot();
+    
     Paper_def*default_paper();
     void do_yyparse();
     void parser_error(String);
@@ -60,6 +65,7 @@ public:
 public:
     void parse_file ( String init_str, String file_str);
     My_lily_parser(Sources * sources_l);
+    ~My_lily_parser();
 };
 
 #endif // MY_LILY_PARSER_HH