]> git.donarmstrong.com Git - lilypond.git/commitdiff
Use new arguments of make_duration
authorDavid Kastrup <dak@gnu.org>
Thu, 25 Feb 2016 15:40:14 +0000 (16:40 +0100)
committerDavid Kastrup <dak@gnu.org>
Fri, 4 Mar 2016 11:37:16 +0000 (12:37 +0100)
lily/parser.yy

index 57f951400a954c79a228e4c8b4f61a652d297cbc..ae00eb64a2b8c673af628161aa9674628063efa7 100644 (file)
@@ -3208,22 +3208,13 @@ steno_duration:
                }
        }
        | DURATION_IDENTIFIER dots      {
-               Duration *d = unsmob<Duration> ($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<Duration> ($1)->compressed (m).smobbed_copy ();
-               } else
-                       $$ = $1;
+               $$ = make_duration ($1, 0, $2);
        }
        ;