Split ripple_json to its own module

Builds/QtCreator/rippled.pro

@@ -59,12 +59,16 @@ OTHER_FILES += \
 
 UI_HEADERS_DIR += ../../src/ripple_basics
 
-# -----
+# ---------
-# Beast
+# New style
 #
 SOURCES += \
     ../../src/ripple/beast/ripple_beast.cpp \
-    ../../src/ripple/beast/ripple_beastc.c
+    ../../src/ripple/beast/ripple_beastc.c \
+    ../../src/ripple/json/ripple_json.cpp \
+    ../../src/ripple/sophia/ripple_sophia.c \
+    ../../src/ripple/testoverlay/ripple_testoverlay.cpp \
+    ../../src/ripple/validators/ripple_validators.cpp
 
 # ---------
 # Old style
@@ -88,14 +92,6 @@ SOURCES += \
     ../../src/ripple_net/ripple_net.cpp \
     ../../src/ripple_websocket/ripple_websocket.cpp
 
-# ---------
-# New style
-#
-SOURCES += \
-    ../../src/ripple/sophia/ripple_sophia.c \
-    ../../src/ripple/testoverlay/ripple_testoverlay.cpp \
-    ../../src/ripple/validators/ripple_validators.cpp
-
 LIBS += \
     -lboost_date_time-mt\
     -lboost_filesystem-mt \

Builds/VisualStudio2012/RippleD.vcxproj

@@ -22,6 +22,25 @@
     <ClCompile Include="..\..\build\proto\ripple.pb.cc" />
     <ClCompile Include="..\..\src\ripple\beast\ripple_beast.cpp" />
     <ClCompile Include="..\..\src\ripple\beast\ripple_beastc.c" />
+    <ClCompile Include="..\..\src\ripple\json\impl\json_reader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ripple\json\impl\json_value.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ripple\json\impl\json_writer.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ripple\json\ripple_json.cpp" />
     <ClCompile Include="..\..\src\ripple\sophia\ripple_sophia.c" />
     <ClCompile Include="..\..\src\ripple\testoverlay\impl\TestOverlay.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -662,24 +681,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple_basics\json\json_reader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple_basics\json\json_value.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ripple_basics\json\json_writer.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\ripple_basics\log\Log.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1437,6 +1438,15 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\src\ripple\json\api\json_config.h" />
+    <ClInclude Include="..\..\src\ripple\json\api\json_features.h" />
+    <ClInclude Include="..\..\src\ripple\json\api\json_forwards.h" />
+    <ClInclude Include="..\..\src\ripple\json\api\json_reader.h" />
+    <ClInclude Include="..\..\src\ripple\json\api\json_value.h" />
+    <ClInclude Include="..\..\src\ripple\json\api\json_writer.h" />
+    <ClInclude Include="..\..\src\ripple\json\impl\json_autolink.h" />
+    <ClInclude Include="..\..\src\ripple\json\impl\json_batchallocator.h" />
+    <ClInclude Include="..\..\src\ripple\json\ripple_json.h" />
     <ClInclude Include="..\..\src\ripple\sophia\ripple_sophia.h" />
     <ClInclude Include="..\..\src\ripple\testoverlay\api\ConfigType.h" />
     <ClInclude Include="..\..\src\ripple\testoverlay\api\ConnectionType.h" />
@@ -1556,14 +1566,6 @@
     <ClInclude Include="..\..\src\ripple_basics\containers\RangeSet.h" />
     <ClInclude Include="..\..\src\ripple_basics\containers\SecureAllocator.h" />
     <ClInclude Include="..\..\src\ripple_basics\containers\TaggedCache.h" />
-    <ClInclude Include="..\..\src\ripple_basics\json\json_autolink.h" />
-    <ClInclude Include="..\..\src\ripple_basics\json\json_batchallocator.h" />
-    <ClInclude Include="..\..\src\ripple_basics\json\json_config.h" />
-    <ClInclude Include="..\..\src\ripple_basics\json\json_features.h" />
-    <ClInclude Include="..\..\src\ripple_basics\json\json_forwards.h" />
-    <ClInclude Include="..\..\src\ripple_basics\json\json_reader.h" />
-    <ClInclude Include="..\..\src\ripple_basics\json\json_value.h" />
-    <ClInclude Include="..\..\src\ripple_basics\json\json_writer.h" />
     <ClInclude Include="..\..\src\ripple_basics\log\Log.h" />
     <ClInclude Include="..\..\src\ripple_basics\log\LogFile.h" />
     <ClInclude Include="..\..\src\ripple_basics\log\LoggedTimings.h" />
@@ -1750,11 +1752,11 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </None>
-    <None Include="..\..\src\ripple_basics\json\json_internalarray.inl" />
+    <None Include="..\..\src\ripple\json\impl\json_internalarray.inl" />
-    <None Include="..\..\src\ripple_basics\json\json_internalmap.inl" />
+    <None Include="..\..\src\ripple\json\impl\json_internalmap.inl" />
-    <None Include="..\..\src\ripple_basics\json\json_valueiterator.inl" />
+    <None Include="..\..\src\ripple\json\impl\json_valueiterator.inl" />
-    <None Include="..\..\src\ripple_basics\json\LICENSE" />
+    <None Include="..\..\src\ripple\json\impl\LICENSE" />
-    <None Include="..\..\src\ripple_basics\json\version" />
+    <None Include="..\..\src\ripple\json\impl\version" />
     <None Include="..\..\README.md" />
     <None Include="..\..\SConstruct" />
     <None Include="..\QtCreator\rippled.pro" />

SConstruct

@@ -142,6 +142,16 @@ else:
     COMPILED_FILES.extend (['src/ripple/beast/ripple_beast.cpp'])
 COMPILED_FILES.extend (['src/ripple/beast/ripple_beastc.c'])
 
+# ------------------------------
+# New-style Ripple unity sources
+#
+COMPILED_FILES.extend([
+    'src/ripple/json/ripple_json.cpp',
+    'src/ripple/sophia/ripple_sophia.c',
+    'src/ripple/testoverlay/ripple_testoverlay.cpp',
+    'src/ripple/validators/ripple_validators.cpp'
+    ])
+
 # ------------------------------
 # Old-style Ripple unity sources
 #
@@ -162,18 +172,9 @@ COMPILED_FILES.extend([
     'src/ripple_leveldb/ripple_leveldb.cpp',
     'src/ripple_mdb/ripple_mdb.c',
     'src/ripple_net/ripple_net.cpp',
-    'src/ripple/sophia/ripple_sophia.c',
     'src/ripple_websocket/ripple_websocket.cpp'
     ])
 
-# ------------------------------
-# New-style Ripple unity sources
-#
-COMPILED_FILES.extend([
-    'src/ripple/testoverlay/ripple_testoverlay.cpp',
-    'src/ripple/validators/ripple_validators.cpp'
-    ])
-
 #
 #
 #-------------------------------------------------------------------------------

src/ripple/json/impl/json_value.cpp

@@ -378,6 +378,7 @@ Value::Value ( const std::string& value )
                      (unsigned int)value.length () );
 
 }
+
 Value::Value (beast::String const& beastString)
     : type_ ( stringValue )
     , allocated_ ( true )
@@ -750,7 +751,7 @@ Value::asString () const
         return value_.bool_ ? "true" : "false";
 
     case intValue:
-        return lexicalCastThrow <std::string> (value_.int_);
+        return beast::lexicalCastThrow <std::string> (value_.int_);
 
     case uintValue:
     case realValue:
@@ -796,7 +797,7 @@ Value::asInt () const
         return value_.bool_ ? 1 : 0;
 
     case stringValue:
-        return lexicalCastThrow <int> (value_.string_);
+        return beast::lexicalCastThrow <int> (value_.string_);
 
     case arrayValue:
     case objectValue:
@@ -832,7 +833,7 @@ Value::asUInt () const
         return value_.bool_ ? 1 : 0;
 
     case stringValue:
-        return lexicalCastThrow <unsigned int> (value_.string_);
+        return beast::lexicalCastThrow <unsigned int> (value_.string_);
 
     case arrayValue:
     case objectValue:

src/ripple/json/ripple_json.cpp

@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "beast/modules/beast_core/beast_core.h"
+
+#include "ripple_json.h"
+
+#include <cassert>
+#include <iomanip>
+#include <sstream>
+#include <string>
+
+// For json/
+//
+#ifdef JSON_USE_CPPTL
+# include <cpptl/conststring.h>
+#endif
+#ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
+#include "impl/json_batchallocator.h"
+#endif
+
+#define JSON_ASSERT_UNREACHABLE assert( false )
+#define JSON_ASSERT( condition ) assert( condition );  // @todo <= change this into an exception throw
+#define JSON_ASSERT_MESSAGE( condition, message ) if (!( condition )) throw std::runtime_error( message );
+
+#include "impl/json_reader.cpp"
+#include "impl/json_value.cpp"
+#include "impl/json_writer.cpp"

src/ripple/json/ripple_json.h

@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
+
+#ifndef RIPPLE_JSON_H_INCLUDED
+#define RIPPLE_JSON_H_INCLUDED
+
+#include "beast/beast/Config.h"
+
+#include <deque>
+#include <stack>
+#include <vector>
+
+// For json/
+//
+// VFALCO TODO Clean up these one-offs
+#include "api/json_config.h" // Needed before these cpptl includes
+#ifndef JSON_USE_CPPTL_SMALLMAP
+# include <map>
+#else
+# include <cpptl/smallmap.h>
+#endif
+#ifdef JSON_USE_CPPTL
+# include <cpptl/forwards.h>
+#endif
+
+#include "api/json_forwards.h"
+#include "api/json_features.h"
+#include "api/json_value.h"
+#include "api/json_reader.h"
+#include "api/json_writer.h"
+
+#endif

src/ripple_basics/ripple_basics.cpp

@@ -31,21 +31,6 @@
 
 //------------------------------------------------------------------------------
 
-// For json/
-//
-#ifdef JSON_USE_CPPTL
-# include <cpptl/conststring.h>
-#endif
-#ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
-#include "json/json_batchallocator.h"
-#endif
-
-#define JSON_ASSERT_UNREACHABLE assert( false )
-#define JSON_ASSERT( condition ) assert( condition );  // @todo <= change this into an exception throw
-#define JSON_ASSERT_MESSAGE( condition, message ) if (!( condition )) throw std::runtime_error( message );
-
-//------------------------------------------------------------------------------
-
 // For random numbers
 //
 // VFALCO TODO Replace OpenSSL randomness with a dependency-free implementation
@@ -75,10 +60,6 @@ namespace ripple
 #include "containers/RangeSet.cpp"
 #include "containers/TaggedCache.cpp"
 
-#include "json/json_reader.cpp"
-#include "json/json_value.cpp"
-#include "json/json_writer.cpp"
-
 #include "log/Log.cpp"
 #include "log/LogFile.cpp"
 #include "log/LogJournal.cpp"

src/ripple_basics/ripple_basics.h

@@ -24,21 +24,6 @@
 
 //------------------------------------------------------------------------------
 
-// For json/
-//
-// VFALCO TODO Clean up these one-offs
-#include "json/json_config.h" // Needed before these cpptl includes
-#ifndef JSON_USE_CPPTL_SMALLMAP
-# include <map>
-#else
-# include <cpptl/smallmap.h>
-#endif
-#ifdef JSON_USE_CPPTL
-# include <cpptl/forwards.h>
-#endif
-
-//------------------------------------------------------------------------------
-
 #include "beast/modules/beast_core/system/BeforeBoost.h" // must come first
 #include "system/BoostIncludes.h"
 
@@ -124,12 +109,6 @@ using namespace beast;
 #include "containers/SecureAllocator.h"
 #include "containers/TaggedCache.h"
 
-#include "json/json_forwards.h"
-#include "json/json_features.h"
-#include "json/json_value.h"
-#include "json/json_reader.h"
-#include "json/json_writer.h"
-
 }
 
 #endif

src/ripple_data/ripple_data.h

@@ -27,6 +27,8 @@
 //         additional hierarchy via directories.
 #include "ripple.pb.h"
 
+#include "../ripple/json/ripple_json.h"
+
 namespace ripple
 {