zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-05-10 14:34:57 +00:00
Code Issues Packages Projects Wiki Activity

chore: extend CsvStream to be able to emit const char* allocated with a MemoryManager

Browse Source
This commit is contained in:
Jan 2024-01-20 16:30:59 +01:00
parent 09f3313d76
commit 4696011d9d
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ObjCommon/Csv/CsvStream.cpp
View File

@ -14,6 +14,27 @@ bool CsvInputStream::NextRow(std::vector<std::string>& out) const
if (!out.empty()) if (!out.empty())
out.clear(); out.clear();
return EmitNextRow(
[&out](std::string value)
{
out.emplace_back(std::move(value));
});
}
bool CsvInputStream::NextRow(std::vector<const char*>& out, MemoryManager& memory) const
{
if (!out.empty())
out.clear();
return EmitNextRow(
[&out, &memory](const std::string& value)
{
out.emplace_back(memory.Dup(value.c_str()));
});
}
bool CsvInputStream::EmitNextRow(const std::function<void(std::string)>& cb) const
{
auto c = m_stream.get(); auto c = m_stream.get();
const auto isEof = c == EOF; const auto isEof = c == EOF;
std::ostringstream col; std::ostringstream col;
@ -21,7 +42,7 @@ bool CsvInputStream::NextRow(std::vector<std::string>& out) const
{ {
if (c == CSV_SEPARATOR) if (c == CSV_SEPARATOR)
{ {
out.emplace_back(col.str()); cb(col.str());
col.clear(); col.clear();
col.str(std::string()); col.str(std::string());
} }
@ -46,7 +67,7 @@ bool CsvInputStream::NextRow(std::vector<std::string>& out) const
if (!isEof) if (!isEof)
{ {
out.emplace_back(col.str()); cb(col.str());
} }
return !isEof; return !isEof;

22
src/ObjCommon/Csv/CsvStream.h
View File

@ -1,28 +1,36 @@
#pragma once #pragma once
#include "Utils/MemoryManager.h"
#include <functional>
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <vector> #include <vector>
class CsvInputStream class CsvInputStream
{ {
std::istream& m_stream;
public: public:
explicit CsvInputStream(std::istream& stream); explicit CsvInputStream(std::istream& stream);
bool NextRow(std::vector<std::string>& out) const; bool NextRow(std::vector<std::string>& out) const;
bool NextRow(std::vector<const char*>& out, MemoryManager& memory) const;
private:
bool EmitNextRow(const std::function<void(std::string)>& cb) const;
std::istream& m_stream;
}; };
class CsvOutputStream class CsvOutputStream
{ {
std::ostream& m_stream;
unsigned m_column_count;
unsigned m_current_column;
bool m_first_row;
public: public:
explicit CsvOutputStream(std::ostream& stream); explicit CsvOutputStream(std::ostream& stream);
void WriteColumn(const std::string& value); void WriteColumn(const std::string& value);
void NextRow(); void NextRow();
private:
std::ostream& m_stream;
unsigned m_column_count;
unsigned m_current_column;
bool m_first_row;
}; };