working to make calchart parsing better.

ccvers.h.in

@@ -28,3 +28,4 @@
 #define CC_VERSION \
     MK_CC_VERSION(CC_MAJOR_VERSION, CC_MINOR_VERSION, CC_PATCH_VERSION)
 
+static constexpr uint32_t kVersion = (CC_MAJOR_VERSION << 8) | CC_MINOR_VERSION;

src/CalChartFrame.cpp

@@ -625,22 +625,15 @@ void CalChartFrame::OnCmdPasteSheet(wxCommandEvent&)
             if (numPoints != GetShow()->GetNumPoints()) {
                 wxMessageBox(wxString::Format("Cannot paste - number of points in pasted sheet (%i) does not match number of points in current show (%i)",
                     numPoints, GetShow()->GetNumPoints()));
+                wxTheClipboard->Close();
                 return;
             }
-            std::stringstream sheetStream;
-            sheetStream.write((char*)(clipboardObject.GetData()) + sizeof(numPoints),
-                clipboardObject.GetDataSize() - sizeof(numPoints));
+            auto reader = CalChart::Reader({ (uint8_t const*)(clipboardObject.GetData()) + sizeof(numPoints),
+                clipboardObject.GetDataSize() - sizeof(numPoints) });
+            reader.Get<uint32_t>();
+            reader.Get<uint32_t>();
 
-            CalChart::ReadLong(sheetStream);
-            CalChart::ReadLong(sheetStream);
-
-            sheetStream.unsetf(std::ios_base::skipws);
-            std::istream_iterator<uint8_t> theBegin(sheetStream);
-            std::istream_iterator<uint8_t> theEnd{};
-            std::vector<uint8_t> data(theBegin, theEnd);
-
-            CalChart::Show::Sheet_container_t sht(
-                1, CalChart::Sheet(numPoints, data.data(), data.size()));
+            CalChart::Show::Sheet_container_t sht(1, CalChart::Sheet(numPoints, reader));
             GetFieldView()->DoInsertSheets(sht, GetFieldView()->GetCurrentSheetNum());
         }
         wxTheClipboard->Close();

src/core/CalChartContinuity.cpp

@@ -62,18 +62,16 @@ std::vector<std::unique_ptr<ContProcedure>> ParseContinuity(std::string const& s
     }
 }
 
-std::vector<std::unique_ptr<ContProcedure>> Deserialize(std::vector<uint8_t> const& data)
+std::vector<std::unique_ptr<ContProcedure>> Deserialize(Reader reader)
 {
     auto result = std::vector<std::unique_ptr<ContProcedure>>{};
 
-    auto begin = data.data();
-    auto end = data.data() + data.size();
-    while (std::distance(begin, end) > 0) {
-        auto next_result = std::unique_ptr<ContProcedure>{};
-        std::tie(next_result, begin) = DeserializeContProcedure(begin, end);
+    while (reader.size() > 0) {
+        auto [ next_result, new_reader ] = DeserializeContProcedure(reader);
         result.push_back(std::move(next_result));
+        reader = new_reader;
     }
-    if (begin != end) {
+    if (reader.size() != 0) {
         throw std::runtime_error("Error, did not parse all the data correctly");
     }
     return result;
@@ -99,8 +97,8 @@ Continuity::Continuity(std::vector<std::unique_ptr<ContProcedure>> from_cont)
 {
 }
 
-Continuity::Continuity(std::vector<uint8_t> const& data)
-    : m_parsedContinuity(Deserialize(data))
+Continuity::Continuity(Reader reader)
+    : m_parsedContinuity(Deserialize(reader))
 {
 }
 
@@ -175,7 +173,8 @@ void Continuity_serialize_test()
          }) {
         auto uut1 = Continuity{ i };
         auto serialize_result = uut1.Serialize();
-        auto uut2 = Continuity{ serialize_result };
+             auto reader = Reader({ serialize_result.data(), serialize_result.size()});
+             auto uut2 = Continuity{ reader };
         assert(uut1 == uut2);
     }
 }

src/core/CalChartContinuity.h

@@ -50,7 +50,7 @@ class Continuity {
     // this could throw runtime_error on bad parses.
     Continuity(std::string const& s = "", ParseErrorHandlers const* correction = nullptr);
     Continuity(std::vector<std::unique_ptr<ContProcedure>>);
-    Continuity(std::vector<uint8_t> const&);
+    Continuity(Reader);
     ~Continuity();
 
     Continuity(Continuity const&);