Merge from core

test/integration/encoding_test.cpp

@@ -95,7 +95,7 @@ class EncodingTest : public HandlerTest {
   void Run() {
     InSequence sequence;
     EXPECT_CALL(handler, OnDocumentStart(_));
-    EXPECT_CALL(handler, OnSequenceStart(_, "?", 0));
+    EXPECT_CALL(handler, OnSequenceStart(_, "?", 0, EmitterStyle::Block));
     for (std::size_t i = 0; i < m_entries.size(); i++) {
       EXPECT_CALL(handler, OnScalar(_, "!", 0, m_entries[i]));
     }

test/integration/handler_test.cpp

@@ -11,8 +11,7 @@ using ::testing::_;
   ASSERT_THROW(statement, ParserException);               \
   try {                                                   \
     statement;                                            \
-  }                                                       \
-  catch (const ParserException& e) {                      \
+  } catch (const ParserException& e) {                    \
     EXPECT_EQ(e.msg, message);                            \
   }
 
@@ -26,7 +25,7 @@ TEST_F(HandlerTest, NoEndOfMapFlow) {
 
 TEST_F(HandlerTest, PlainScalarStartingWithQuestionMark) {
   EXPECT_CALL(handler, OnDocumentStart(_));
-  EXPECT_CALL(handler, OnMapStart(_, "?", 0));
+  EXPECT_CALL(handler, OnMapStart(_, "?", 0, EmitterStyle::Block));
   EXPECT_CALL(handler, OnScalar(_, "?", 0, "foo"));
   EXPECT_CALL(handler, OnScalar(_, "?", 0, "?bar"));
   EXPECT_CALL(handler, OnMapEnd());
@@ -36,7 +35,7 @@ TEST_F(HandlerTest, PlainScalarStartingWithQuestionMark) {
 
 TEST_F(HandlerTest, NullStringScalar) {
   EXPECT_CALL(handler, OnDocumentStart(_));
-  EXPECT_CALL(handler, OnMapStart(_, "?", 0));
+  EXPECT_CALL(handler, OnMapStart(_, "?", 0, EmitterStyle::Block));
   EXPECT_CALL(handler, OnScalar(_, "?", 0, "foo"));
   EXPECT_CALL(handler, OnNull(_, 0));
   EXPECT_CALL(handler, OnMapEnd());

test/mock_event_handler.h

+#include "yaml-cpp/emitterstyle.h"
 #include "yaml-cpp/eventhandler.h"
 
 #include "gmock/gmock.h"
@@ -14,11 +15,12 @@ class MockEventHandler : public EventHandler {
   MOCK_METHOD4(OnScalar, void(const Mark&, const std::string&, anchor_t,
                               const std::string&));
 
-  MOCK_METHOD3(OnSequenceStart,
-               void(const Mark&, const std::string&, anchor_t));
+  MOCK_METHOD4(OnSequenceStart, void(const Mark&, const std::string&, anchor_t,
+                                     EmitterStyle::value));
   MOCK_METHOD0(OnSequenceEnd, void());
 
-  MOCK_METHOD3(OnMapStart, void(const Mark&, const std::string&, anchor_t));
+  MOCK_METHOD4(OnMapStart, void(const Mark&, const std::string&, anchor_t,
+                                EmitterStyle::value));
   MOCK_METHOD0(OnMapEnd, void());
 };
 }

util/read.cpp

 #include <iostream>
 
+#include "yaml-cpp/emitterstyle.h"
 #include "yaml-cpp/eventhandler.h"
 #include "yaml-cpp/yaml.h"  // IWYU pragma: keep
 
@@ -16,9 +17,11 @@ class NullEventHandler : public YAML::EventHandler {
   virtual void OnAlias(const Mark&, anchor_t) {}
   virtual void OnScalar(const Mark&, const std::string&, anchor_t,
                         const std::string&) {}
-  virtual void OnSequenceStart(const Mark&, const std::string&, anchor_t) {}
+  virtual void OnSequenceStart(const Mark&, const std::string&, anchor_t,
+                               YAML::EmitterStyle::value style) {}
   virtual void OnSequenceEnd() {}
-  virtual void OnMapStart(const Mark&, const std::string&, anchor_t) {}
+  virtual void OnMapStart(const Mark&, const std::string&, anchor_t,
+                          YAML::EmitterStyle::value style) {}
   virtual void OnMapEnd() {}
 };
 

util/sandbox.cpp

 #include <iostream>
 
+#include "yaml-cpp/emitterstyle.h"
 #include "yaml-cpp/eventhandler.h"
 #include "yaml-cpp/yaml.h"  // IWYU pragma: keep
 
@@ -16,9 +17,11 @@ class NullEventHandler : public YAML::EventHandler {
   virtual void OnAlias(const Mark&, anchor_t) {}
   virtual void OnScalar(const Mark&, const std::string&, anchor_t,
                         const std::string&) {}
-  virtual void OnSequenceStart(const Mark&, const std::string&, anchor_t) {}
+  virtual void OnSequenceStart(const Mark&, const std::string&, anchor_t,
+                               YAML::EmitterStyle::value style) {}
   virtual void OnSequenceEnd() {}
-  virtual void OnMapStart(const Mark&, const std::string&, anchor_t) {}
+  virtual void OnMapStart(const Mark&, const std::string&, anchor_t,
+                          YAML::EmitterStyle::value style) {}
   virtual void OnMapEnd() {}
 };
 

yaml-cpp-config-version.cmake.in

+set(PACKAGE_VERSION "@YAML_CPP_VERSION@")
+
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+	set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+	set(PACKAGE_VERSION_COMPATIBLE TRUE)
+	if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+		set(PACKAGE_VERSION_EXACT TRUE)
+	endif()
+endif()

yaml-cpp-config.cmake.in

+# - Config file for the yaml-cpp package
+# It defines the following variables
+#  YAML_CPP_INCLUDE_DIR - include directory
+#  YAML_CPP_LIBRARIES    - libraries to link against
+
+# Compute paths
+get_filename_component(YAML_CPP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@")
+
+# Our library dependencies (contains definitions for IMPORTED targets)
+include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake")
+
+# These are IMPORTED targets created by yaml-cpp-targets.cmake
+set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@")