Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix

Browse source
This commit is contained in:
Daniel Larimer 2014-04-25 15:17:10 -04:00
commit 07affde1f2
2 changed files with 54 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/io/iostream.cpp
View file

@ -264,12 +264,14 @@ namespace fc {
istream& operator>>( istream& o, std::string& v )
{
assert(false && "not implemented");
return o;
}
#ifdef USE_FC_STRING
istream& operator>>( istream& o, fc::string& v )
{
assert(false && "not implemented");
return o;
}
#endif
@ -282,51 +284,61 @@ namespace fc {
istream& operator>>( istream& o, double& v )
{
assert(false && "not implemented");
return o;
}
istream& operator>>( istream& o, float& v )
{
assert(false && "not implemented");
return o;
}
istream& operator>>( istream& o, int64_t& v )
{
assert(false && "not implemented");
return o;
}
istream& operator>>( istream& o, uint64_t& v )
{
assert(false && "not implemented");
return o;
}
istream& operator>>( istream& o, int32_t& v )
{
assert(false && "not implemented");
return o;
}
istream& operator>>( istream& o, uint32_t& v )
{
assert(false && "not implemented");
return o;
}
istream& operator>>( istream& o, int16_t& v )
{
assert(false && "not implemented");
return o;
}
istream& operator>>( istream& o, uint16_t& v )
{
assert(false && "not implemented");
return o;
}
istream& operator>>( istream& o, int8_t& v )
{
assert(false && "not implemented");
return o;
}
istream& operator>>( istream& o, uint8_t& v )
{
assert(false && "not implemented");
return o;
}

80
src/io/json.cpp
View file

@ -211,54 +211,58 @@ namespace fc
template<typename T>
variant number_from_stream( T& in )
{
char buf[30];
memset( buf, 0, sizeof(buf) );
char* pos = buf;
fc::stringstream ss;
bool dot = false;
bool neg = false;
if( in.peek() == '-')
{
neg = true;
*pos = in.get();
++pos;
ss.put( in.get() );
}
bool done = false;
while( !done)
try
{
char c = in.peek();
switch( c )
char c;
while((c = in.peek()) && !done)
{
case '.':
{
if( dot )
{
done = true;
break;
}
dot = true;
}
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
*pos = c;
++pos;
in.get();
break;
default:
done = true;
break;
switch( c )
{
case '.':
if (dot)
FC_THROW_EXCEPTION(parse_error_exception, "Can't parse a number with two decimal places");
dot = true;
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
ss.put( in.get() );
break;
default:
done = true;
break;
}
}
}
if( dot ) return to_double(buf);
if( neg ) return to_int64(buf);
return to_uint64(buf);
catch (fc::eof_exception&)
{
}
fc::string str = ss.str();
if (str == "-." || str == ".") // check the obviously wrong things we could have encountered
FC_THROW_EXCEPTION(parse_error_exception, "Can't parse token \"${token}\" as a JSON numeric constant", ("token", str));
if( dot )
return to_double(str);
if( neg )
return to_int64(str);
return to_uint64(str);
}
template<typename T>
variant token_from_stream( T& in )
@ -269,7 +273,7 @@ namespace fc
try
{
char c;
while( (c = in.peek()) && !parsed_unexpected_character)
while((c = in.peek()) && !parsed_unexpected_character)
{
switch( c )
{