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

src/io/iostream.cpp

@@ -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;
   }
 

src/io/json.cpp

@@ -211,54 +211,58 @@ namespace fc
    template<typename T>
    variant number_from_stream( T& in )
    {
-      char buf[30];
+      fc::stringstream ss;
-      memset( buf, 0, sizeof(buf) );
+
-      char* pos = buf;
       bool  dot = false;
       bool  neg = false;
       if( in.peek() == '-')
       {
         neg = true;
-        *pos = in.get();
+        ss.put( in.get() );
-        ++pos;
       }
       bool done = false;
-      while(  !done)
+
+      try
       {
-        char c = in.peek();
+        char c;
-        switch( c )
+        while((c = in.peek()) && !done)
         {
-            case '.':
+          
-            {
+          switch( c )
-               if( dot ) 
+          {
-               {
+              case '.':
-                  done = true;
+                 if (dot) 
-                  break;
+                    FC_THROW_EXCEPTION(parse_error_exception, "Can't parse a number with two decimal places");
-               }
+                 dot = true;
-               dot = true;
+              case '0':
-            }
+              case '1':
-            case '0':
+              case '2':
-            case '1':
+              case '3':
-            case '2':
+              case '4':
-            case '3':
+              case '5':
-            case '4':
+              case '6':
-            case '5':
+              case '7':
-            case '6':
+              case '8':
-            case '7':
+              case '9':
-            case '8':
+                 ss.put( in.get() );
-            case '9':
+                 break;
-               *pos = c;
+              default:
-               ++pos;
+                done = true;
-               in.get();
+                break;
-               break;
+          }
-            default:
-              done = true;
-              break;
         }
       }
-      if( dot ) return to_double(buf);
+      catch (fc::eof_exception&)
-      if( neg ) return to_int64(buf);
+      {
-      return to_uint64(buf);
+      }
+      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 )
            {