Restoring authorship annotation for <nadya73@yandex-team.ru>. Commit 2 of 2.

library/cpp/json/yson/json2yson.cpp

@@ -47,13 +47,13 @@ namespace NJson2Yson {
         }
     }
 
-    void SerializeJsonValueAsYson(const NJson::TJsonValue& inputValue, NYson::TYsonWriter* ysonWriter) { 
+    void SerializeJsonValueAsYson(const NJson::TJsonValue& inputValue, NYson::TYsonWriter* ysonWriter) {
         NYT::TYson2JsonCallbacksAdapter adapter(ysonWriter);
         WriteJsonValue(inputValue, &adapter);
     }
 
     void SerializeJsonValueAsYson(const NJson::TJsonValue& inputValue, IOutputStream* outputStream) {
-        NYson::TYsonWriter ysonWriter(outputStream, NYson::EYsonFormat::Binary, ::NYson::EYsonType::Node, false); 
+        NYson::TYsonWriter ysonWriter(outputStream, NYson::EYsonFormat::Binary, ::NYson::EYsonType::Node, false);
         SerializeJsonValueAsYson(inputValue, &ysonWriter);
     }
 
@@ -71,7 +71,7 @@ namespace NJson2Yson {
     bool DeserializeYsonAsJsonValue(IInputStream* inputStream, NJson::TJsonValue* outputValue, bool throwOnError) {
         NJson::TParserCallbacks parser(*outputValue);
         NJson2Yson::TJsonBuilder consumer(&parser);
-        NYson::TYsonParser ysonParser(&consumer, inputStream, ::NYson::EYsonType::Node); 
+        NYson::TYsonParser ysonParser(&consumer, inputStream, ::NYson::EYsonType::Node);
         try {
             ysonParser.Parse();
         } catch (...) {
@@ -89,8 +89,8 @@ namespace NJson2Yson {
     }
 
     void ConvertYson2Json(IInputStream* inputStream, IOutputStream* outputStream) {
-        NYT::TJsonWriter writer(outputStream, ::NYson::EYsonType::Node, NYT::JF_TEXT, NYT::JAM_ON_DEMAND, NYT::SBF_BOOLEAN); 
-        NYson::TYsonParser ysonParser(&writer, inputStream, ::NYson::EYsonType::Node); 
+        NYT::TJsonWriter writer(outputStream, ::NYson::EYsonType::Node, NYT::JF_TEXT, NYT::JAM_ON_DEMAND, NYT::SBF_BOOLEAN);
+        NYson::TYsonParser ysonParser(&writer, inputStream, ::NYson::EYsonType::Node);
         ysonParser.Parse();
     }
 

library/cpp/json/yson/json2yson.h

@@ -5,14 +5,14 @@
 #include <library/cpp/yson/writer.h>
 
 namespace NJson2Yson {
-    class TJsonBuilderImpl: public NYson::TYsonConsumerBase { 
+    class TJsonBuilderImpl: public NYson::TYsonConsumerBase {
     public:
         TJsonBuilderImpl(NJson::TJsonCallbacks* parserCallbacks)
             : ParserCallbacks_(parserCallbacks)
         {
         }
 
-        void OnStringScalar(TStringBuf value) override { 
+        void OnStringScalar(TStringBuf value) override {
             ParserCallbacks_->OnString(value);
         }
 
@@ -51,7 +51,7 @@ namespace NJson2Yson {
             ParserCallbacks_->OnOpenMap();
         }
 
-        void OnKeyedItem(TStringBuf key) override { 
+        void OnKeyedItem(TStringBuf key) override {
             ParserCallbacks_->OnMapKey(key);
         }
 
@@ -78,7 +78,7 @@ namespace NJson2Yson {
         {
         }
 
-        void OnStringScalar(TStringBuf value) override { 
+        void OnStringScalar(TStringBuf value) override {
             if (AttributesDepth == 0) {
                 TBase::OnStringScalar(value);
             }
@@ -138,7 +138,7 @@ namespace NJson2Yson {
             }
         }
 
-        void OnKeyedItem(TStringBuf key) override { 
+        void OnKeyedItem(TStringBuf key) override {
             if (AttributesDepth == 0) {
                 TBase::OnKeyedItem(key);
             }
@@ -172,7 +172,7 @@ namespace NJson2Yson {
     bool DeserializeYsonAsJsonValue(IInputStream* inputStream, NJson::TJsonValue* outputValue, bool throwOnError = false);
     bool DeserializeYsonAsJsonValue(TStringBuf str, NJson::TJsonValue* outputValue, bool throwOnError = false);
 
-    void SerializeJsonValueAsYson(const NJson::TJsonValue& inputValue, NYson::TYsonWriter* ysonWriter); 
+    void SerializeJsonValueAsYson(const NJson::TJsonValue& inputValue, NYson::TYsonWriter* ysonWriter);
     void SerializeJsonValueAsYson(const NJson::TJsonValue& inputValue, IOutputStream* outputStream);
     void SerializeJsonValueAsYson(const NJson::TJsonValue& inputValue, TString& result);
     TString SerializeJsonValueAsYson(const NJson::TJsonValue& inputValue);

library/cpp/yson/consumer.cpp

@@ -1,13 +1,13 @@
 #include "consumer.h"
-#include "string.h" 
+#include "string.h"
 #include "parser.h"
 
 namespace NYson {
- 
+
     ////////////////////////////////////////////////////////////////////////////////
 
-    void TYsonConsumerBase::OnRaw(TStringBuf str, NYT::NYson::EYsonType type) { 
-        ParseYsonStringBuffer(str, this, type); 
+    void TYsonConsumerBase::OnRaw(TStringBuf str, NYT::NYson::EYsonType type) {
+        ParseYsonStringBuffer(str, this, type);
     }
 
     ////////////////////////////////////////////////////////////////////////////////

library/cpp/yson/consumer.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include <library/cpp/yt/yson/consumer.h> 
+#include <library/cpp/yt/yson/consumer.h>
 
 #include <util/generic/strbuf.h>
 #include <util/system/defaults.h>
 
 namespace NYson {
     struct TYsonConsumerBase
-       : public virtual NYT::NYson::IYsonConsumer { 
-        void OnRaw(TStringBuf ysonNode, NYT::NYson::EYsonType type) override; 
+       : public virtual NYT::NYson::IYsonConsumer {
+        void OnRaw(TStringBuf ysonNode, NYT::NYson::EYsonType type) override;
     };
 } // namespace NYson

library/cpp/yson/json/json_writer.cpp

@@ -13,7 +13,7 @@ namespace NYT {
 
     TJsonWriter::TJsonWriter(
         IOutputStream* output,
-        ::NYson::EYsonType type, 
+        ::NYson::EYsonType type,
         EJsonFormat format,
         EJsonAttributesMode attributesMode,
         ESerializedBoolFormat booleanFormat)
@@ -29,7 +29,7 @@ namespace NYT {
     TJsonWriter::TJsonWriter(
         IOutputStream* output,
         NJson::TJsonWriterConfig config,
-        ::NYson::EYsonType type, 
+        ::NYson::EYsonType type,
         EJsonAttributesMode attributesMode,
         ESerializedBoolFormat booleanFormat)
         : Output(output)
@@ -38,8 +38,8 @@ namespace NYT {
         , BooleanFormat(booleanFormat)
         , Depth(0)
     {
-        if (Type == ::NYson::EYsonType::MapFragment) { 
-            ythrow ::NYson::TYsonException() << ("Map fragments are not supported by Json"); 
+        if (Type == ::NYson::EYsonType::MapFragment) {
+            ythrow ::NYson::TYsonException() << ("Map fragments are not supported by Json");
         }
 
         UnderlyingJsonWriter.Reset(new NJson::TJsonWriter(
@@ -84,7 +84,7 @@ namespace NYT {
 
         Depth -= 1;
 
-        if (Depth == 0 && Type == ::NYson::EYsonType::ListFragment && InAttributesBalance == 0) { 
+        if (Depth == 0 && Type == ::NYson::EYsonType::ListFragment && InAttributesBalance == 0) {
             JsonWriter->Flush();
             Output->Write("\n");
         }
@@ -97,7 +97,7 @@ namespace NYT {
         return true;
     }
 
-    void TJsonWriter::OnStringScalar(TStringBuf value) { 
+    void TJsonWriter::OnStringScalar(TStringBuf value) {
         if (IsWriteAllowed()) {
             EnterNode();
             WriteStringScalar(value);
@@ -173,7 +173,7 @@ namespace NYT {
         }
     }
 
-    void TJsonWriter::OnKeyedItem(TStringBuf name) { 
+    void TJsonWriter::OnKeyedItem(TStringBuf name) {
         if (IsWriteAllowed()) {
             if (IsSpecialJsonKey(name)) {
                 WriteStringScalar(TString("$") + name);

library/cpp/yson/json/json_writer.h

@@ -31,7 +31,7 @@ namespace NYT {
     public:
         TJsonWriter(
             IOutputStream* output,
-            ::NYson::EYsonType type = ::NYson::EYsonType::Node, 
+            ::NYson::EYsonType type = ::NYson::EYsonType::Node,
             EJsonFormat format = JF_TEXT,
             EJsonAttributesMode attributesMode = JAM_ON_DEMAND,
             ESerializedBoolFormat booleanFormat = SBF_STRING);
@@ -39,13 +39,13 @@ namespace NYT {
         TJsonWriter(
             IOutputStream* output,
             NJson::TJsonWriterConfig config,
-            ::NYson::EYsonType type = ::NYson::EYsonType::Node, 
+            ::NYson::EYsonType type = ::NYson::EYsonType::Node,
             EJsonAttributesMode attributesMode = JAM_ON_DEMAND,
             ESerializedBoolFormat booleanFormat = SBF_STRING);
 
         void Flush();
 
-        void OnStringScalar(TStringBuf value) override; 
+        void OnStringScalar(TStringBuf value) override;
         void OnInt64Scalar(i64 value) override;
         void OnUint64Scalar(ui64 value) override;
         void OnDoubleScalar(double value) override;
@@ -58,7 +58,7 @@ namespace NYT {
         void OnEndList() override;
 
         void OnBeginMap() override;
-        void OnKeyedItem(TStringBuf key) override; 
+        void OnKeyedItem(TStringBuf key) override;
         void OnEndMap() override;
 
         void OnBeginAttributes() override;
@@ -68,7 +68,7 @@ namespace NYT {
         THolder<NJson::TJsonWriter> UnderlyingJsonWriter;
         NJson::TJsonWriter* JsonWriter;
         IOutputStream* Output;
-        ::NYson::EYsonType Type; 
+        ::NYson::EYsonType Type;
         EJsonAttributesMode AttributesMode;
         ESerializedBoolFormat BooleanFormat;
 

library/cpp/yson/json/yson2json_adapter.cpp

@@ -1,7 +1,7 @@
 #include "yson2json_adapter.h"
 
 namespace NYT {
-    TYson2JsonCallbacksAdapter::TYson2JsonCallbacksAdapter(::NYson::TYsonConsumerBase* impl, bool throwException) 
+    TYson2JsonCallbacksAdapter::TYson2JsonCallbacksAdapter(::NYson::TYsonConsumerBase* impl, bool throwException)
         : NJson::TJsonCallbacks(throwException)
         , Impl_(impl)
     {

library/cpp/yson/node/node.cpp

@@ -852,13 +852,13 @@ void TNode::CreateAttributes()
 
 void TNode::Save(IOutputStream* out) const
 {
-    NodeToYsonStream(*this, out, NYson::EYsonFormat::Binary); 
+    NodeToYsonStream(*this, out, NYson::EYsonFormat::Binary);
 }
 
 void TNode::Load(IInputStream* in)
 {
     Clear();
-    *this = NodeFromYsonStream(in, ::NYson::EYsonType::Node); 
+    *this = NodeFromYsonStream(in, ::NYson::EYsonType::Node);
 }
 
 ////////////////////////////////////////////////////////////////////////////////

library/cpp/yson/node/node_builder.cpp

@@ -9,7 +9,7 @@ TNodeBuilder::TNodeBuilder(TNode* node)
     Stack_.push(node);
 }
 
-void TNodeBuilder::OnStringScalar(TStringBuf value) 
+void TNodeBuilder::OnStringScalar(TStringBuf value)
 {
     AddNode(value, true);
 }
@@ -59,7 +59,7 @@ void TNodeBuilder::OnBeginMap()
     AddNode(TNode::CreateMap(), false);
 }
 
-void TNodeBuilder::OnKeyedItem(TStringBuf key) 
+void TNodeBuilder::OnKeyedItem(TStringBuf key)
 {
     Stack_.push(&(*Stack_.top())[TString(key)]);
 }

library/cpp/yson/node/node_builder.h

@@ -18,7 +18,7 @@ class TNodeBuilder
 public:
     TNodeBuilder(TNode* node);
 
-    void OnStringScalar(TStringBuf) override; 
+    void OnStringScalar(TStringBuf) override;
     void OnInt64Scalar(i64) override;
     void OnUint64Scalar(ui64) override;
     void OnDoubleScalar(double) override;
@@ -28,7 +28,7 @@ public:
     void OnListItem() override;
     void OnEndList() override;
     void OnBeginMap() override;
-    void OnKeyedItem(TStringBuf) override; 
+    void OnKeyedItem(TStringBuf) override;
     void OnEndMap() override;
     void OnBeginAttributes() override;
     void OnEndAttributes() override;