From: fred <fred>
Date: Sun, 24 Mar 2002 19:30:35 +0000 (+0000)
Subject: lilypond-0.0.28
X-Git-Tag: release/1.5.59~5457
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a297dbe1b9527ad7f6792528b72ae8fa4e008901;p=lilypond.git

lilypond-0.0.28
---

diff --git a/src/parser.y b/src/parser.y
index 8d6ac75f0c..3f01afb423 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -19,7 +19,7 @@
 #endif
 
 Array<Request*> pre_reqs, post_reqs;
-sstack<String> define_spots;
+sstack<const char *> define_spots;
 Paperdef*default_paper();
 char const* defined_ch_c_l;
 char const* req_defined_ch_c_l;
@@ -195,10 +195,10 @@ notename_tab_body:				{
 	SCORE
 */
 score_block: SCORE 
-		{ define_spots.push(lexer->spot()); }
+		{ define_spots.push(lexer->here_ch_c_l()); }
 	'{' score_body '}' 	{
 		$$ = $4;
-		$$->define_spot_str_ = define_spots.pop();
+		$$->defined_ch_c_l_ = define_spots.pop();
 		if (!$$->paper_)
 			$$->paper_ = default_paper();
 
@@ -333,10 +333,10 @@ paper_body:
 	STAFFs
 */
 staff_block:
-	STAFF 	{ define_spots.push(lexer->spot()); }
+	STAFF 	{ define_spots.push(lexer->here_ch_c_l()); }
 /*cont*/	'{' staff_body '}' 	{
 		$$ = $4; 
-		$$->define_spot_str_ = define_spots.pop();
+		$$-> defined_ch_c_l_ = define_spots.pop();
 	}
 	;