From ce2a857e5a40690ef05451afcbb7c0dbc49bd718 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Thu, 25 Feb 2016 16:40:14 +0100 Subject: [PATCH] Use new arguments of make_duration --- lily/parser.yy | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/lily/parser.yy b/lily/parser.yy index 57f951400a..ae00eb64a2 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -3208,22 +3208,13 @@ steno_duration: } } | DURATION_IDENTIFIER dots { - Duration *d = unsmob ($1); - Duration k (d->duration_log (), - d->dot_count () + scm_to_int ($2)); - k = k.compressed (d->factor ()); - scm_remember_upto_here_1 ($1); - $$ = k.smobbed_copy (); + $$ = make_duration ($1, scm_to_int ($2)); } ; multiplied_duration: steno_duration multipliers { - if (scm_is_number ($2)) { - Rational m (ly_scm2rational ($2)); - $$ = unsmob ($1)->compressed (m).smobbed_copy (); - } else - $$ = $1; + $$ = make_duration ($1, 0, $2); } ; -- 2.39.2