From: David Kastrup <dak@gnu.org>
Date: Sat, 15 Oct 2011 13:05:37 +0000 (+0200)
Subject: parser: change order of arguments for context-specification constructor
X-Git-Tag: release/2.15.15-1~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a2d0217d78461bae6ae695a605b3e0a03409596c;p=lilypond.git

parser: change order of arguments for context-specification constructor
---

diff --git a/lily/parser.yy b/lily/parser.yy
index 670e1a82fa..f6baa99868 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1313,14 +1313,14 @@ complex_music:
                 SCM mods = SCM_EOL;
                 if (ctxmod)
                         mods = ctxmod->get_mods ();
-		$$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, mods, SCM_BOOL_F);
+		$$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, mods, SCM_BOOL_F, $5);
 	}
 	| NEWCONTEXT simple_string optional_id optional_context_mod music {
                 Context_mod *ctxmod = unsmob_context_mod ($4);
                 SCM mods = SCM_EOL;
                 if (ctxmod)
                         mods = ctxmod->get_mods ();
-		$$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, mods, SCM_BOOL_T);
+		$$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, mods, SCM_BOOL_T, $5);
 	}
 
 	| TIMES fraction music {
@@ -1347,7 +1347,7 @@ mode_changed_music:
                 SCM mods = SCM_EOL;
                 if (ctxmod)
                         mods = ctxmod->get_mods ();
-		$$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, mods, SCM_BOOL_T);
+		$$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, mods, SCM_BOOL_T, $3);
 		if ($1 == ly_symbol2scm ("ChordNames"))
 		{
 		  $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$);
diff --git a/scm/ly-syntax-constructors.scm b/scm/ly-syntax-constructors.scm
index f7f89cd0e1..ebd0a605a0 100644
--- a/scm/ly-syntax-constructors.scm
+++ b/scm/ly-syntax-constructors.scm
@@ -155,7 +155,7 @@ into a @code{MultiMeasureTextEvent}."
 	      'element (repetition-function previous-chord location duration articulations)
 	      'origin location))
 
-(define-ly-syntax-simple (context-specification type id mus ops create-new)
+(define-ly-syntax-simple (context-specification type id ops create-new mus)
   (let* ((type-sym (if (symbol? type) type (string->symbol type)))
 	 (csm (context-spec-music mus type-sym id)))
     (set! (ly:music-property csm 'property-operations) ops)