ブロックの終わりでも時刻をリセットするように変更

diff --git a/include/ir2midi/context.hpp b/include/ir2midi/context.hpp
index 498f67d..bc19119 100644 (file)
--- a/include/ir2midi/context.hpp
+++ b/include/ir2midi/context.hpp
@@ -29,7 +29,7 @@ public:
         SetLastEventTime(lastEventTime);
     }
 
-    void EnterBlock();
+    void ResetTime();
     int GetLastEventTime();
     void SetLastEventTime(int t);
     void UpdateTime(int relativeTime);

diff --git a/src/ast2ir/phrase2ir.cpp b/src/ast2ir/phrase2ir.cpp
index ae8806a..e42f59d 100644 (file)
--- a/src/ast2ir/phrase2ir.cpp
+++ b/src/ast2ir/phrase2ir.cpp
@@ -127,6 +127,7 @@ std::vector<IR::Block::EventType> Phrase2IRCompiler::operator()(const AST::NoteS
             m_IR.Blocks[newIndex.ID].Events.insert(m_IR.Blocks[newIndex.ID].Events.end(), events.begin(), events.end());
         }
 
+        ResetTime();
         return {newIndex};
     }
 }
@@ -140,6 +141,7 @@ std::vector<IR::Block::EventType> Phrase2IRCompiler::operator()(const AST::NoteS
     AutoPop<decltype(m_AttributeStack)> autoPop(m_AttributeStack);
 
     Compile(ast.Block, newIndex);
+    ResetTime();
     return {newIndex};
 }
 

diff --git a/src/ir2midi/context.cpp b/src/ir2midi/context.cpp
index 48a583d..55802a6 100644 (file)
--- a/src/ir2midi/context.cpp
+++ b/src/ir2midi/context.cpp
@@ -9,7 +9,7 @@ namespace YAMML
 namespace IR2MIDI
 {
 
-void TrackCompilerContext::EnterBlock()
+void TrackCompilerContext::ResetTime()
 {
     m_BaseTimeForCurrentBlock = m_LastEventTime;
 }

diff --git a/src/ir2midi/ir2midi.cpp b/src/ir2midi/ir2midi.cpp
index 368c508..11a4802 100644 (file)
--- a/src/ir2midi/ir2midi.cpp
+++ b/src/ir2midi/ir2midi.cpp
@@ -241,7 +241,7 @@ bool IR2MIDICompiler::CompileTrackBlock(const std::string& trackBlockName)
 
 void IR2MIDICompiler::CompileBlock(int trackNumber, IR::BlockReference blockRef)
 {
-    GetTrackContext(trackNumber).EnterBlock();
+    GetTrackContext(trackNumber).ResetTime();
     const auto& block = m_IR.Blocks.at(blockRef.ID);
     CheckForUnprocessedAttributes(block.Attributes);
 
@@ -251,6 +251,8 @@ void IR2MIDICompiler::CompileBlock(int trackNumber, IR::BlockReference blockRef)
     {
         boost::apply_visitor(*this, varTrackNumber, i);
     }
+
+    GetTrackContext(trackNumber).ResetTime();
 }
 
 void IR2MIDICompiler::Finalize()