Menu

#4630 Fix a few input locations from within music functions

Verified
Defect
2015-10-20
2015-10-06
No

Fix a few input locations from within music functions

Contains commits:

Add override_input to music created from loc_on_music

This makes sure that music created from default arguments of function
calls appears to generate from surrounding music function calls rather
than the music function body.

Add location info override to some music expressions

This gives location information for #{ … #} to music function callers
instead of the music function body.

Rietveld issue: 268260043

Discussion

  • Anonymous

    Anonymous - 2015-10-06

    I'm getting a lot of programming errors on make check

    --snip--

    input/regression/fingering-cross-staff.log

    @@ -13,3 +13,6 @@
    Writing ./fingering-cross-staff-systems.tex...
    Writing ./fingering-cross-staff-systems.count...
    Writing timing to fingering-cross-staff.profile...
    +programming error: Parsed object should be dead: #<prob: music="" c++:="" music((origin="" .="" #\<location="" home="" jlowe="" lilypond-git="" input="" regression="" fingering-cross-staff.ly:13:13="">) (span-direction . 1))((display-methods #\<procedure #f="" (event)="">) (name . BeamEvent) (types post-event event beam-event span-event)) >
    +
    +continuing, cross fingers</procedure></prob:>

    input/regression/fingering-cross-staff.log
    1.732051

    input/regression/paper-margins-consistency.log

    @@ -13,3 +13,6 @@
    Writing ./paper-margins-consistency-systems.tex...
    Writing ./paper-margins-consistency-systems.count...
    Writing timing to paper-margins-consistency.profile...
    +programming error: Parsed object should be dead: #<prob: music="" c++:="" music((pitch="" .="" #\<pitch="" f'="">) (duration . #\<duration 4="">) (origin . #\<location home="" jlowe="" lilypond-git="" input="" regression="" paper-margins-consistency.ly:12:53="">))((display-methods #\<procedure #f="" (note)="">) (name . NoteEvent) (iterator-ctor . #\<primitive-procedure ly:rhythmic-music-iterator::constructor="">) (types event note-event rhythmic-event melodic-event)) >
    +
    +continuing, cross fingers</primitive-procedure></procedure></location></duration></prob:>

    input/regression/paper-margins-consistency.log
    1.732051

    input/regression/repeat-unfold-all.log

    @@ -13,3 +13,6 @@
    Writing ./repeat-unfold-all-systems.tex...
    Writing ./repeat-unfold-all-systems.count...
    Writing timing to repeat-unfold-all.profile...
    +programming error: Parsed object should be dead: #<prob: music="" c++:="" music((duration="" .="" #\<duration="" 4="">) (pitch . #\<pitch c'="">) (origin . #\<location home="" jlowe="" lilypond-git="" input="" regression="" repeat-unfold-all.ly:9:25="">))((display-methods #\<procedure #f="" (note)="">) (name . NoteEvent) (iterator-ctor . #\<primitive-procedure ly:rhythmic-music-iterator::constructor="">) (types event note-event rhythmic-event melodic-event)) >
    +
    +continuing, cross fingers</primitive-procedure></procedure></location></pitch></prob:>

    input/regression/repeat-unfold-all.log
    1.732051

    input/regression/quote-during-subvoice.log

    @@ -18,3 +18,6 @@
    Writing ./quote-during-subvoice-systems.tex...
    Writing ./quote-during-subvoice-systems.count...
    Writing timing to quote-during-subvoice.profile...
    +programming error: Parsed object should be dead: #<prob: music="" c++:="" music((duration="" .="" #\<duration="" 4="">) (pitch . #\<pitch c'="">) (origin . #\<location home="" jlowe="" lilypond-git="" input="" regression="" quote-during-subvoice.ly:32:3="">))((display-methods #\<procedure #f="" (note)="">) (name . NoteEvent) (iterator-ctor . #\<primitive-procedure ly:rhythmic-music-iterator::constructor="">) (types event note-event rhythmic-event melodic-event)) >
    +
    +continuing, cross fingers</primitive-procedure></procedure></location></pitch></prob:>

    etc.

     
  • David Kastrup

    David Kastrup - 2015-10-06

    Sigh: an answer sent via "reply" by mail did not arrive, so here in short: I've looked through the patch and don't think it does anything warranting this problem. Either it will disappear with a repeat of the test, or it's related to some other change committed to master recently.

     
  • Anonymous

    Anonymous - 2015-10-07
    • Patch: new --> review
     
  • Anonymous

    Anonymous - 2015-10-07

    I re-ran the test and I did not get any programming errors this tim.

     
  • Simon Albrecht

    Simon Albrecht - 2015-10-07
    • Description has changed:

    Diff:

    --- old
    +++ new
    @@ -3,7 +3,7 @@
    
     Contains commits:
    
    -Add override_input to music created from loc_on_music
    +Add `override_input` to music created from `loc_on_music`
    
     This makes sure that music created from default arguments of function
     calls appears to generate from surrounding music function calls rather
    @@ -11,7 +11,7 @@
    
     Add location info override to some music expressions
    
    -This gives location information for #{ ... #} to music function callers
    +This gives location information for `#{ … #}` to music function callers
     instead of the music function body.
    
    -Rietveld issue: 268260043 (https://codereview.appspot.com/268260043)
    +Rietveld issue: [268260043](https://codereview.appspot.com/268260043)
    
     
  • Anonymous

    Anonymous - 2015-10-11
    • Patch: review --> countdown
     
  • Anonymous

    Anonymous - 2015-10-11

    Patch on countdown for October 14th.

     
  • Anonymous

    Anonymous - 2015-10-14
    • Patch: countdown --> push
     
  • Anonymous

    Anonymous - 2015-10-14

    Patch counted down - please push

     
  • David Kastrup

    David Kastrup - 2015-10-14

    Pushed to staging as
    commit 0e91bb16e020081fbbecab38fb7a8ed1c1a761dd
    Author: David Kastrup dak@gnu.org
    Date: Tue Oct 6 15:36:28 2015 +0200

    Issue 4630/2: Add override_input to music created from loc_on_music
    
    This makes sure that music created from default arguments of function
    calls appears to generate from surrounding music function calls rather
    than the music function body.
    

    commit fd7e58a2d700ac0bd926268dece7afcb161bd9fa
    Author: David Kastrup dak@gnu.org
    Date: Tue Oct 6 15:24:14 2015 +0200

    Issue 4630/1: Add location info override to some music expressions
    
    This gives location information for #{ ... #} to music function callers
    instead of the music function body.
    
     
  • David Kastrup

    David Kastrup - 2015-10-14
    • labels: --> Fixed_2_19_29
    • status: Started --> Fixed
    • Patch: push -->
     
  • Phil Holmes

    Phil Holmes - 2015-10-20
    • status: Fixed --> Verified