peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 12:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switched the ostream wrapper to wrap a std::vector<char> instead of our manually managed memory

Browse Source
This commit is contained in:
Jesse Beder
2012-05-25 18:17:14 -05:00
parent 7c85e9d5de
commit e6d4a915dc
3 changed files with 17 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/ostream_wrapper.cpp
View File

@@ -1,37 +1,21 @@
#include "yaml-cpp/ostream_wrapper.h"
#include <cstring>
#include <iostream>
namespace YAML
{
ostream_wrapper::ostream_wrapper(): m_buffer(0), m_pos(0), m_size(0), m_row(0), m_col(0), m_comment(false)
ostream_wrapper::ostream_wrapper(): m_pos(0), m_row(0), m_col(0), m_comment(false)
{
reserve(1024);
}
ostream_wrapper::~ostream_wrapper()
{
delete [] m_buffer;
}
void ostream_wrapper::reserve(std::size_t size)
{
if(size <= m_size)
return;
char *newBuffer = new char[size];
std::memset(newBuffer, 0, size * sizeof(char));
std::memcpy(newBuffer, m_buffer, m_size * sizeof(char));
delete [] m_buffer;
m_buffer = newBuffer;
m_size = size;
}
void ostream_wrapper::write(const std::string& str)
{
while(m_pos + str.size() + 1 >= m_size)
reserve(m_size * 2);
std::copy(str.begin(), str.end(), m_buffer + m_pos);
m_buffer.resize(std::max(m_buffer.size(), m_pos + str.size() + 1));
std::copy(str.begin(), str.end(), &m_buffer[m_pos]);
for(std::size_t i=0;i<str.size();i++)
update_pos(str[i]);
@@ -39,24 +23,13 @@ namespace YAML
void ostream_wrapper::write(const char *str, std::size_t size)
{
while(m_pos + size + 1 >= m_size)
reserve(m_size * 2);
std::copy(str, str + size, m_buffer + m_pos);
m_buffer.resize(std::max(m_buffer.size(), m_pos + size + 1));
std::copy(str, str + size, &m_buffer[m_pos]);
for(std::size_t i=0;i<size;i++)
update_pos(str[i]);
}
void ostream_wrapper::put(char ch)
{
if(m_pos >= m_size - 1) // an extra space for the NULL terminator
reserve(m_size * 2);
m_buffer[m_pos] = ch;
update_pos(ch);
}
void ostream_wrapper::update_pos(char ch)
{
m_pos++;
@@ -83,7 +56,7 @@ namespace YAML
ostream_wrapper& operator << (ostream_wrapper& out, char ch)
{
out.put(ch);
out.write(&ch, 1);
return out;
}
}