- code from JSONExpression::esc(char val, ...) moved to Pikotools (convert/misc.h)
- added ModelContainerWrapper::set_iterator_at_first_model() method
This commit is contained in:
parent
e682e057ad
commit
c25a5d2215
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include "jsonexpression.h"
|
||||
#include "morm_types.h"
|
||||
|
||||
#include "convert/misc.h"
|
||||
|
||||
|
||||
namespace morm
|
||||
|
@ -125,40 +125,7 @@ void JSONExpression::esc(char val, pt::TextStream & stream, const FT & field_typ
|
|||
}
|
||||
else
|
||||
{
|
||||
if( (unsigned char)val < 32 )
|
||||
{
|
||||
char buf[10];
|
||||
size_t len;
|
||||
pt::Toa((unsigned char)val, buf, sizeof(buf)/sizeof(char), 16, &len);
|
||||
|
||||
stream << "\\u";
|
||||
|
||||
if( len < 4 )
|
||||
{
|
||||
for(size_t i=0 ; i < (4-len) ; ++i)
|
||||
{
|
||||
stream << '0';
|
||||
}
|
||||
}
|
||||
|
||||
stream << buf;
|
||||
}
|
||||
else
|
||||
{
|
||||
switch( val )
|
||||
{
|
||||
case 0: stream << '\\'; stream << '0'; break; // may to skip this character is better?
|
||||
case '\r': stream << '\\'; stream << 'r'; break;
|
||||
case '\n': stream << '\\'; stream << 'n'; break;
|
||||
case '\t': stream << '\\'; stream << 't'; break;
|
||||
case 0x08: stream << '\\'; stream << 'b'; break;
|
||||
case 0x0c: stream << '\\'; stream << 'f'; break;
|
||||
case '\\': stream << '\\'; stream << '\\'; break;
|
||||
case '"': stream << '\\'; stream << '\"'; break;
|
||||
default:
|
||||
stream << val;
|
||||
}
|
||||
}
|
||||
pt::esc_to_json(val, stream);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -69,6 +69,9 @@ public:
|
|||
return false;
|
||||
}
|
||||
|
||||
virtual void set_iterator_at_first_model()
|
||||
{
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
@ -106,6 +109,10 @@ public:
|
|||
return iterator != container->end();
|
||||
}
|
||||
|
||||
void set_iterator_at_first_model()
|
||||
{
|
||||
iterator = container->begin();
|
||||
}
|
||||
|
||||
|
||||
protected:
|
||||
|
|
Loading…
Reference in New Issue