OLD | NEW |
1 /* | 1 /* |
2 This file is part of LilyPond, the GNU music typesetter. | 2 This file is part of LilyPond, the GNU music typesetter. |
3 | 3 |
4 Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl> | 4 Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl> |
5 Jan Nieuwenhuizen <janneke@gnu.org> | 5 Jan Nieuwenhuizen <janneke@gnu.org> |
6 | 6 |
7 LilyPond is free software: you can redistribute it and/or modify | 7 LilyPond is free software: you can redistribute it and/or modify |
8 it under the terms of the GNU General Public License as published by | 8 it under the terms of the GNU General Public License as published by |
9 the Free Software Foundation, either version 3 of the License, or | 9 the Free Software Foundation, either version 3 of the License, or |
10 (at your option) any later version. | 10 (at your option) any later version. |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 | 113 |
114 File_name f (name); | 114 File_name f (name); |
115 string s = global_path.find (f.base_ + ".twy"); | 115 string s = global_path.find (f.base_ + ".twy"); |
116 s = gulp_file_to_string (s, false, -1); | 116 s = gulp_file_to_string (s, false, -1); |
117 scm_eval_string (ly_string2scm (s)); | 117 scm_eval_string (ly_string2scm (s)); |
118 | 118 |
119 /* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to | 119 /* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to |
120 OUT_FILE (unless IN_FILE redefines output file name). */ | 120 OUT_FILE (unless IN_FILE redefines output file name). */ |
121 | 121 |
122 SCM mod = lexer_->set_current_scope (); | 122 SCM mod = lexer_->set_current_scope (); |
123 do { | 123 do |
124 do_yyparse (); | 124 { |
125 } while (!lexer_->is_clean ()); | 125 do_yyparse (); |
| 126 } |
| 127 while (!lexer_->is_clean ()); |
126 | 128 |
127 /* | 129 /* |
128 Don't mix cyclic pointers with weak tables. | 130 Don't mix cyclic pointers with weak tables. |
129 */ | 131 */ |
130 lexer_->set_identifier (ly_symbol2scm ("parser"), | 132 lexer_->set_identifier (ly_symbol2scm ("parser"), |
131 SCM_EOL); | 133 SCM_EOL); |
132 ly_reexport_module (scm_current_module ()); | 134 ly_reexport_module (scm_current_module ()); |
133 | 135 |
134 scm_set_current_module (mod); | 136 scm_set_current_module (mod); |
135 | 137 |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
310 | 312 |
311 return id; | 313 return id; |
312 } | 314 } |
313 | 315 |
314 SCM | 316 SCM |
315 Lily_parser::make_scope () const | 317 Lily_parser::make_scope () const |
316 { | 318 { |
317 SCM module = ly_make_module (be_safe_global); | 319 SCM module = ly_make_module (be_safe_global); |
318 return module; | 320 return module; |
319 } | 321 } |
OLD | NEW |