big batch of progress

[chaz/yoink] / src / serializer.cc

diff --git a/src/serializer.cc b/src/serializer.cc
index 06563ef1ed69995847cd0f9751ae8713f43f8fee..7b7596d7b3eb99c8054df4a62250fac5eb66746f 100644 (file)
--- a/src/serializer.cc
+++ b/src/serializer.cc
@@ -37,7 +37,7 @@
 namespace dc {
 
 
-class serializer_impl
+class serializer::serializer_impl
 {
 public:
        serializer_impl(const std::string& filePath, const std::string& indent = "")
@@ -72,6 +72,8 @@ public:
                                throw serializer::exception("maximum archive depth exceeded");
                        case yajl_gen_in_error_state:
                                throw serializer::exception("serializer already in error state");
+                       case yajl_gen_status_ok:
+                               ; // There is no error here.  Move along...
                }
        }
 
@@ -105,10 +107,12 @@ private:
 
 
 serializer::serializer(const std::string& filePath, const std::string& indent) :
-               impl(new serializer_impl(filePath, indent)) {}
+       // pass through
+       impl(new serializer::serializer_impl(filePath, indent)) {}
 
 serializer::serializer(std::ostream& output, const std::string& indent) :
-               impl(new serializer_impl(output, indent)) {}
+       // pass through
+       impl(new serializer::serializer_impl(output, indent)) {}
 
 serializer::~serializer()
 {
@@ -119,26 +123,30 @@ serializer::~serializer()
 void serializer::push(long value)
 {
        yajl_gen_status stat = yajl_gen_integer(impl->gen, value);
-       if (stat != yajl_gen_status_ok) serializer_impl::throwError(stat);
+       if (stat != yajl_gen_status_ok)
+               serializer::serializer_impl::throwError(stat);
 }
 
 void serializer::push(double value)
 {
        yajl_gen_status stat = yajl_gen_double(impl->gen, value);
-       if (stat != yajl_gen_status_ok) serializer_impl::throwError(stat);
+       if (stat != yajl_gen_status_ok)
+               serializer::serializer_impl::throwError(stat);
 }
 
 void serializer::push(bool value)
 {
        yajl_gen_status stat = yajl_gen_bool(impl->gen, value);
-       if (stat != yajl_gen_status_ok) serializer_impl::throwError(stat);
+       if (stat != yajl_gen_status_ok)
+               serializer::serializer_impl::throwError(stat);
 }
 
 void serializer::push(const std::string& value)
 {
        yajl_gen_status stat = yajl_gen_string(impl->gen,
                        (const unsigned char*)value.c_str(), value.length());
-       if (stat != yajl_gen_status_ok) serializer_impl::throwError(stat);
+       if (stat != yajl_gen_status_ok)
+               serializer::serializer_impl::throwError(stat);
 }
 
 void serializer::push(const std::wstring& value)
@@ -149,32 +157,37 @@ void serializer::push(const std::wstring& value)
 void serializer::pushNull()
 {
        yajl_gen_status stat = yajl_gen_null(impl->gen);
-       if (stat != yajl_gen_status_ok) serializer_impl::throwError(stat);
+       if (stat != yajl_gen_status_ok)
+               serializer::serializer_impl::throwError(stat);
 }
 
 
 void serializer::pushMapHead()
 {
        yajl_gen_status stat = yajl_gen_map_open(impl->gen);
-       if (stat != yajl_gen_status_ok) serializer_impl::throwError(stat);
+       if (stat != yajl_gen_status_ok)
+               serializer::serializer_impl::throwError(stat);
 }
 
 void serializer::pushMapTail()
 {
        yajl_gen_status stat = yajl_gen_map_close(impl->gen);
-       if (stat != yajl_gen_status_ok) serializer_impl::throwError(stat);
+       if (stat != yajl_gen_status_ok)
+               serializer::serializer_impl::throwError(stat);
 }
 
 void serializer::pushArrayHead()
 {
        yajl_gen_status stat = yajl_gen_array_open(impl->gen);
-       if (stat != yajl_gen_status_ok) serializer_impl::throwError(stat);
+       if (stat != yajl_gen_status_ok)
+               serializer::serializer_impl::throwError(stat);
 }
 
 void serializer::pushArrayTail()
 {
        yajl_gen_status stat = yajl_gen_array_close(impl->gen);
-       if (stat != yajl_gen_status_ok) serializer_impl::throwError(stat);
+       if (stat != yajl_gen_status_ok)
+               serializer::serializer_impl::throwError(stat);
 }
 
 
@@ -191,3 +204,5 @@ void serializer::flush()
 
 } // namespace dc
 
+/** vim: set ts=4 sw=4 tw=80: *************************************************/
+