Allow zones with no qualifier or no number

[r2c2.git] / source / libr2c2 / zone.cpp

diff --git a/source/libr2c2/zone.cpp b/source/libr2c2/zone.cpp
index de774431b971605f4298f2dd12b78116061bc70c..eb5d102b8414570ff6d01578b04994d675701205 100644 (file)
--- a/source/libr2c2/zone.cpp
+++ b/source/libr2c2/zone.cpp
@@ -147,16 +147,6 @@ TrackIter Zone::iter_for(Track &track, Direction dir) const
        return TrackIter();
 }
 
-TrackIter Zone::get_end(Direction dir) const
-{
-       if(dir==UNSPECIFIED)
-               return ends[0];
-       if(up_end<0)
-               return TrackIter();
-
-       return ends[up_end^(dir==DOWN)];
-}
-
 TrackIter Zone::next_iter(const TrackIter &iter) const
 {
        TrackIter next_outside;
@@ -174,6 +164,16 @@ TrackIter Zone::next_iter(const TrackIter &iter) const
        return next_outside;
 }
 
+TrackIter Zone::get_end(Direction dir) const
+{
+       if(dir==UNSPECIFIED)
+               return ends[0];
+       if(up_end<0)
+               return TrackIter();
+
+       return ends[up_end^(dir==DOWN)];
+}
+
 void Zone::save(list<DataFile::Statement> &st) const
 {
        st.push_back((DataFile::Statement("group"), group));
@@ -215,7 +215,11 @@ void Zone::save(list<DataFile::Statement> &st) const
 
 DataFile::Statement Zone::save_reference() const
 {
-       return (DataFile::Statement("zone"), group, number);
+       DataFile::Statement st("zone");
+       st.append(group);
+       if(number)
+               st.append(number);
+       return st;
 }