diff --git a/Easy2D.sln b/Easy2D.sln index c37868cd..e5a17c6a 100644 --- a/Easy2D.sln +++ b/Easy2D.sln @@ -4,17 +4,17 @@ VisualStudioVersion = 15.0.28307.271 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "samples\HelloWorld\HelloWorld.vcxproj", "{3561A359-F9FD-48AB-A977-34E7E568BC8E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D", "src\easy2d\Easy2D.vcxproj", "{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D", "easy2d\Easy2D.vcxproj", "{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D-ImGui", "src\easy2d-imgui\Easy2D-ImGui.vcxproj", "{23AFF03B-A670-4C33-B790-18EEC82C61AE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D-ImGui", "easy2d-imgui\Easy2D-ImGui.vcxproj", "{23AFF03B-A670-4C33-B790-18EEC82C61AE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D-Audio", "src\easy2d-audio\Easy2D-Audio.vcxproj", "{5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D-Audio", "easy2d-audio\Easy2D-Audio.vcxproj", "{5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Samples", "samples\Samples\Samples.vcxproj", "{45F5738D-CDF2-4024-974D-25B64F9043DE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGuiSample", "samples\ImGuiSample\ImGuiSample.vcxproj", "{6152D36C-EA40-4968-A696-244B6CA58395}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "3rd-party\box2d\Box2D.vcxproj", "{A434E80C-1049-10BE-D9CA-B31D459E0CEF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "samples\libs\box2d\Box2D.vcxproj", "{A434E80C-1049-10BE-D9CA-B31D459E0CEF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2DSample", "samples\Box2DSample\Box2DSample.vcxproj", "{324CFF47-4EB2-499A-BE5F-53A82E3BA14B}" EndProject diff --git a/src/easy2d-audio/Easy2D-Audio.vcxproj b/easy2d-audio/Easy2D-Audio.vcxproj similarity index 96% rename from src/easy2d-audio/Easy2D-Audio.vcxproj rename to easy2d-audio/Easy2D-Audio.vcxproj index d4bdddb1..da95ca2b 100644 --- a/src/easy2d-audio/Easy2D-Audio.vcxproj +++ b/easy2d-audio/Easy2D-Audio.vcxproj @@ -20,7 +20,7 @@ {5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2} - Win32Proj + Easy2D-Audio @@ -96,6 +96,7 @@ Level3 Disabled true + ../easy2d Windows @@ -111,6 +112,7 @@ true true true + ../easy2d Windows @@ -128,6 +130,7 @@ true true true + ../easy2d Windows @@ -145,9 +148,9 @@ + - diff --git a/src/easy2d-audio/Easy2D-Audio.vcxproj.filters b/easy2d-audio/Easy2D-Audio.vcxproj.filters similarity index 100% rename from src/easy2d-audio/Easy2D-Audio.vcxproj.filters rename to easy2d-audio/Easy2D-Audio.vcxproj.filters index eea586ae..883e2fa0 100644 --- a/src/easy2d-audio/Easy2D-Audio.vcxproj.filters +++ b/easy2d-audio/Easy2D-Audio.vcxproj.filters @@ -11,10 +11,10 @@ - + \ No newline at end of file diff --git a/src/easy2d-audio/Music.cpp b/easy2d-audio/Music.cpp similarity index 94% rename from src/easy2d-audio/Music.cpp rename to easy2d-audio/Music.cpp index a27e4697..002a6a1f 100644 --- a/src/easy2d-audio/Music.cpp +++ b/easy2d-audio/Music.cpp @@ -70,7 +70,7 @@ namespace easy2d if (FAILED(hr)) { - E2D_ERROR_HR_LOG(hr, L"Load media file failed"); + E2D_ERROR_LOG(L"Load media file failed with HRESULT of %08X", hr); return false; } @@ -82,7 +82,7 @@ namespace easy2d delete[] wave_data_; wave_data_ = nullptr; } - E2D_ERROR_HR_LOG(hr, L"Create source voice error"); + E2D_ERROR_LOG(L"Create source voice failed with HRESULT of %08X", hr); return false; } @@ -111,7 +111,7 @@ namespace easy2d HRESULT hr = voice_.Play(wave_data_, size_, static_cast(loop_count)); if (FAILED(hr)) { - E2D_ERROR_HR_LOG(hr, L"Submitting source buffer error"); + E2D_ERROR_LOG(L"Submitting source buffer failed with HRESULT of %08X", hr); } playing_ = SUCCEEDED(hr); diff --git a/src/easy2d-audio/Music.h b/easy2d-audio/Music.h similarity index 100% rename from src/easy2d-audio/Music.h rename to easy2d-audio/Music.h diff --git a/src/easy2d-audio/Player.cpp b/easy2d-audio/Player.cpp similarity index 100% rename from src/easy2d-audio/Player.cpp rename to easy2d-audio/Player.cpp diff --git a/src/easy2d-audio/Player.h b/easy2d-audio/Player.h similarity index 100% rename from src/easy2d-audio/Player.h rename to easy2d-audio/Player.h diff --git a/src/easy2d-audio/Transcoder.cpp b/easy2d-audio/Transcoder.cpp similarity index 100% rename from src/easy2d-audio/Transcoder.cpp rename to easy2d-audio/Transcoder.cpp diff --git a/src/easy2d-audio/Transcoder.h b/easy2d-audio/Transcoder.h similarity index 100% rename from src/easy2d-audio/Transcoder.h rename to easy2d-audio/Transcoder.h diff --git a/src/easy2d-audio/Voice.cpp b/easy2d-audio/Voice.cpp similarity index 100% rename from src/easy2d-audio/Voice.cpp rename to easy2d-audio/Voice.cpp diff --git a/src/easy2d-audio/Voice.h b/easy2d-audio/Voice.h similarity index 100% rename from src/easy2d-audio/Voice.h rename to easy2d-audio/Voice.h diff --git a/src/easy2d-audio/audio-modules.cpp b/easy2d-audio/audio-modules.cpp similarity index 100% rename from src/easy2d-audio/audio-modules.cpp rename to easy2d-audio/audio-modules.cpp diff --git a/src/easy2d-audio/audio-modules.h b/easy2d-audio/audio-modules.h similarity index 100% rename from src/easy2d-audio/audio-modules.h rename to easy2d-audio/audio-modules.h diff --git a/src/easy2d-audio/audio.cpp b/easy2d-audio/audio.cpp similarity index 100% rename from src/easy2d-audio/audio.cpp rename to easy2d-audio/audio.cpp diff --git a/src/easy2d-audio/audio.h b/easy2d-audio/audio.h similarity index 100% rename from src/easy2d-audio/audio.h rename to easy2d-audio/audio.h diff --git a/src/easy2d-audio/easy2d-audio.h b/easy2d-audio/easy2d-audio.h similarity index 100% rename from src/easy2d-audio/easy2d-audio.h rename to easy2d-audio/easy2d-audio.h diff --git a/src/easy2d-imgui/Easy2D-ImGui.vcxproj b/easy2d-imgui/Easy2D-ImGui.vcxproj similarity index 88% rename from src/easy2d-imgui/Easy2D-ImGui.vcxproj rename to easy2d-imgui/Easy2D-ImGui.vcxproj index 6d14501a..bfd21887 100644 --- a/src/easy2d-imgui/Easy2D-ImGui.vcxproj +++ b/easy2d-imgui/Easy2D-ImGui.vcxproj @@ -20,7 +20,7 @@ {23AFF03B-A670-4C33-B790-18EEC82C61AE} - Win32Proj + Easy2D-ImGui @@ -82,7 +82,7 @@ Level3 Disabled true - ../easy2d;../../3rd-party/ImGui; + ../easy2d Windows @@ -96,6 +96,7 @@ Level3 Disabled true + ../easy2d Windows @@ -111,6 +112,7 @@ true true true + ../easy2d Windows @@ -128,6 +130,7 @@ true true true + ../easy2d Windows @@ -137,22 +140,22 @@ - - - - - - + + + + + + - - - - + + + + diff --git a/src/easy2d-imgui/Easy2D-ImGui.vcxproj.filters b/easy2d-imgui/Easy2D-ImGui.vcxproj.filters similarity index 64% rename from src/easy2d-imgui/Easy2D-ImGui.vcxproj.filters rename to easy2d-imgui/Easy2D-ImGui.vcxproj.filters index 05187977..4df5b4b0 100644 --- a/src/easy2d-imgui/Easy2D-ImGui.vcxproj.filters +++ b/easy2d-imgui/Easy2D-ImGui.vcxproj.filters @@ -1,43 +1,43 @@  - - + imgui - + imgui - + imgui - + imgui - + imgui - + imgui + - + imgui - + imgui - + imgui - + imgui diff --git a/src/easy2d-imgui/ImGuiLayer.cpp b/easy2d-imgui/ImGuiLayer.cpp similarity index 100% rename from src/easy2d-imgui/ImGuiLayer.cpp rename to easy2d-imgui/ImGuiLayer.cpp diff --git a/src/easy2d-imgui/ImGuiLayer.h b/easy2d-imgui/ImGuiLayer.h similarity index 100% rename from src/easy2d-imgui/ImGuiLayer.h rename to easy2d-imgui/ImGuiLayer.h diff --git a/src/easy2d-imgui/ImGuiView.cpp b/easy2d-imgui/ImGuiView.cpp similarity index 100% rename from src/easy2d-imgui/ImGuiView.cpp rename to easy2d-imgui/ImGuiView.cpp diff --git a/src/easy2d-imgui/ImGuiView.h b/easy2d-imgui/ImGuiView.h similarity index 100% rename from src/easy2d-imgui/ImGuiView.h rename to easy2d-imgui/ImGuiView.h diff --git a/src/easy2d-imgui/easy2d-imgui.h b/easy2d-imgui/easy2d-imgui.h similarity index 80% rename from src/easy2d-imgui/easy2d-imgui.h rename to easy2d-imgui/easy2d-imgui.h index f169b80b..ce408c35 100644 --- a/src/easy2d-imgui/easy2d-imgui.h +++ b/easy2d-imgui/easy2d-imgui.h @@ -6,4 +6,4 @@ #include "ImGuiLayer.h" // ImGui -#include "imgui.h" +#include "libs/ImGui/imgui.h" diff --git a/src/easy2d-imgui/imgui_impl_dx11.cpp b/easy2d-imgui/imgui_impl_dx11.cpp similarity index 99% rename from src/easy2d-imgui/imgui_impl_dx11.cpp rename to easy2d-imgui/imgui_impl_dx11.cpp index 874407c6..d801c37a 100644 --- a/src/easy2d-imgui/imgui_impl_dx11.cpp +++ b/easy2d-imgui/imgui_impl_dx11.cpp @@ -1,6 +1,6 @@ // dear imgui: Renderer for Easy2D (DirectX11) -#include "imgui.h" +#include "libs/ImGui/imgui.h" #include "imgui_impl_dx11.h" // DirectX diff --git a/src/easy2d-imgui/imgui_impl_dx11.h b/easy2d-imgui/imgui_impl_dx11.h similarity index 100% rename from src/easy2d-imgui/imgui_impl_dx11.h rename to easy2d-imgui/imgui_impl_dx11.h diff --git a/3rd-party/ImGui/LICENSE.txt b/easy2d-imgui/libs/ImGui/LICENSE.txt similarity index 100% rename from 3rd-party/ImGui/LICENSE.txt rename to easy2d-imgui/libs/ImGui/LICENSE.txt diff --git a/3rd-party/ImGui/imconfig.h b/easy2d-imgui/libs/ImGui/imconfig.h similarity index 100% rename from 3rd-party/ImGui/imconfig.h rename to easy2d-imgui/libs/ImGui/imconfig.h diff --git a/3rd-party/ImGui/imgui.cpp b/easy2d-imgui/libs/ImGui/imgui.cpp similarity index 100% rename from 3rd-party/ImGui/imgui.cpp rename to easy2d-imgui/libs/ImGui/imgui.cpp diff --git a/3rd-party/ImGui/imgui.h b/easy2d-imgui/libs/ImGui/imgui.h similarity index 100% rename from 3rd-party/ImGui/imgui.h rename to easy2d-imgui/libs/ImGui/imgui.h diff --git a/3rd-party/ImGui/imgui_demo.cpp b/easy2d-imgui/libs/ImGui/imgui_demo.cpp similarity index 100% rename from 3rd-party/ImGui/imgui_demo.cpp rename to easy2d-imgui/libs/ImGui/imgui_demo.cpp diff --git a/3rd-party/ImGui/imgui_draw.cpp b/easy2d-imgui/libs/ImGui/imgui_draw.cpp similarity index 100% rename from 3rd-party/ImGui/imgui_draw.cpp rename to easy2d-imgui/libs/ImGui/imgui_draw.cpp diff --git a/3rd-party/ImGui/imgui_internal.h b/easy2d-imgui/libs/ImGui/imgui_internal.h similarity index 100% rename from 3rd-party/ImGui/imgui_internal.h rename to easy2d-imgui/libs/ImGui/imgui_internal.h diff --git a/3rd-party/ImGui/imgui_widgets.cpp b/easy2d-imgui/libs/ImGui/imgui_widgets.cpp similarity index 100% rename from 3rd-party/ImGui/imgui_widgets.cpp rename to easy2d-imgui/libs/ImGui/imgui_widgets.cpp diff --git a/3rd-party/ImGui/imstb_rectpack.h b/easy2d-imgui/libs/ImGui/imstb_rectpack.h similarity index 100% rename from 3rd-party/ImGui/imstb_rectpack.h rename to easy2d-imgui/libs/ImGui/imstb_rectpack.h diff --git a/3rd-party/ImGui/imstb_textedit.h b/easy2d-imgui/libs/ImGui/imstb_textedit.h similarity index 100% rename from 3rd-party/ImGui/imstb_textedit.h rename to easy2d-imgui/libs/ImGui/imstb_textedit.h diff --git a/3rd-party/ImGui/imstb_truetype.h b/easy2d-imgui/libs/ImGui/imstb_truetype.h similarity index 100% rename from 3rd-party/ImGui/imstb_truetype.h rename to easy2d-imgui/libs/ImGui/imstb_truetype.h diff --git a/src/easy2d/core/Action.cpp b/easy2d/2d/Action.cpp similarity index 100% rename from src/easy2d/core/Action.cpp rename to easy2d/2d/Action.cpp diff --git a/src/easy2d/core/Action.h b/easy2d/2d/Action.h similarity index 98% rename from src/easy2d/core/Action.h rename to easy2d/2d/Action.h index 97de29bb..a9e9684e 100644 --- a/src/easy2d/core/Action.h +++ b/easy2d/2d/Action.h @@ -20,8 +20,6 @@ #pragma once #include "include-forwards.h" -#include "time.h" -#include "../common/IntrusiveList.hpp" namespace easy2d { diff --git a/src/easy2d/core/ActionGroup.cpp b/easy2d/2d/ActionGroup.cpp similarity index 99% rename from src/easy2d/core/ActionGroup.cpp rename to easy2d/2d/ActionGroup.cpp index 865344ed..bd640662 100644 --- a/src/easy2d/core/ActionGroup.cpp +++ b/easy2d/2d/ActionGroup.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include "ActionGroup.h" -#include "logs.h" +#include "../base/logs.h" namespace easy2d { diff --git a/src/easy2d/core/ActionGroup.h b/easy2d/2d/ActionGroup.h similarity index 100% rename from src/easy2d/core/ActionGroup.h rename to easy2d/2d/ActionGroup.h diff --git a/src/easy2d/core/ActionHelper.h b/easy2d/2d/ActionHelper.h similarity index 100% rename from src/easy2d/core/ActionHelper.h rename to easy2d/2d/ActionHelper.h diff --git a/src/easy2d/core/ActionManager.cpp b/easy2d/2d/ActionManager.cpp similarity index 99% rename from src/easy2d/core/ActionManager.cpp rename to easy2d/2d/ActionManager.cpp index 4bf130f1..6db8438f 100644 --- a/src/easy2d/core/ActionManager.cpp +++ b/easy2d/2d/ActionManager.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include "ActionManager.h" -#include "logs.h" +#include "../base/logs.h" namespace easy2d { diff --git a/src/easy2d/core/ActionManager.h b/easy2d/2d/ActionManager.h similarity index 100% rename from src/easy2d/core/ActionManager.h rename to easy2d/2d/ActionManager.h diff --git a/src/easy2d/core/ActionTween.cpp b/easy2d/2d/ActionTween.cpp similarity index 100% rename from src/easy2d/core/ActionTween.cpp rename to easy2d/2d/ActionTween.cpp diff --git a/src/easy2d/core/ActionTween.h b/easy2d/2d/ActionTween.h similarity index 99% rename from src/easy2d/core/ActionTween.h rename to easy2d/2d/ActionTween.h index 6f6d1bd1..c21636e8 100644 --- a/src/easy2d/core/ActionTween.h +++ b/easy2d/2d/ActionTween.h @@ -20,9 +20,8 @@ #pragma once #include "Action.h" -#include "logs.h" #include "Geometry.h" // ActionPath -#include "../math/ease.hpp" +#include "../base/logs.h" namespace easy2d { diff --git a/src/easy2d/core/Animation.cpp b/easy2d/2d/Animation.cpp similarity index 100% rename from src/easy2d/core/Animation.cpp rename to easy2d/2d/Animation.cpp diff --git a/src/easy2d/core/Animation.h b/easy2d/2d/Animation.h similarity index 100% rename from src/easy2d/core/Animation.h rename to easy2d/2d/Animation.h diff --git a/src/easy2d/core/Canvas.cpp b/easy2d/2d/Canvas.cpp similarity index 99% rename from src/easy2d/core/Canvas.cpp rename to easy2d/2d/Canvas.cpp index 4ef31229..0b997977 100644 --- a/src/easy2d/core/Canvas.cpp +++ b/easy2d/2d/Canvas.cpp @@ -19,11 +19,10 @@ // THE SOFTWARE. #include "Canvas.h" -#include "render.h" -#include "logs.h" #include "Image.h" #include "Geometry.h" -#include "render.h" +#include "../base/logs.h" +#include "../renderer/render.h" namespace easy2d { diff --git a/src/easy2d/core/Canvas.h b/easy2d/2d/Canvas.h similarity index 99% rename from src/easy2d/core/Canvas.h rename to easy2d/2d/Canvas.h index 4cb2dbc1..d9ea23b9 100644 --- a/src/easy2d/core/Canvas.h +++ b/easy2d/2d/Canvas.h @@ -22,7 +22,7 @@ #include "Node.h" #include "Font.hpp" #include "TextStyle.hpp" -#include "../DX/TextRenderer.h" +#include "../renderer/TextRenderer.h" #undef DrawText diff --git a/src/easy2d/core/Color.cpp b/easy2d/2d/Color.cpp similarity index 100% rename from src/easy2d/core/Color.cpp rename to easy2d/2d/Color.cpp diff --git a/src/easy2d/core/Color.h b/easy2d/2d/Color.h similarity index 100% rename from src/easy2d/core/Color.h rename to easy2d/2d/Color.h diff --git a/src/easy2d/core/DebugNode.cpp b/easy2d/2d/DebugNode.cpp similarity index 98% rename from src/easy2d/core/DebugNode.cpp rename to easy2d/2d/DebugNode.cpp index 930648ce..4c542c82 100644 --- a/src/easy2d/core/DebugNode.cpp +++ b/easy2d/2d/DebugNode.cpp @@ -20,7 +20,7 @@ #include "DebugNode.h" #include "Text.h" -#include "render.h" +#include "../renderer/render.h" #include #include diff --git a/src/easy2d/core/DebugNode.h b/easy2d/2d/DebugNode.h similarity index 98% rename from src/easy2d/core/DebugNode.h rename to easy2d/2d/DebugNode.h index aee5a022..aaa67c80 100644 --- a/src/easy2d/core/DebugNode.h +++ b/easy2d/2d/DebugNode.h @@ -20,7 +20,6 @@ #pragma once #include "Node.h" -#include "time.h" namespace easy2d { diff --git a/src/easy2d/core/Font.hpp b/easy2d/2d/Font.hpp similarity index 100% rename from src/easy2d/core/Font.hpp rename to easy2d/2d/Font.hpp diff --git a/src/easy2d/core/Frames.cpp b/easy2d/2d/Frames.cpp similarity index 98% rename from src/easy2d/core/Frames.cpp rename to easy2d/2d/Frames.cpp index f90e71bb..c46520dc 100644 --- a/src/easy2d/core/Frames.cpp +++ b/easy2d/2d/Frames.cpp @@ -20,7 +20,7 @@ #include "Frames.h" #include "Image.h" -#include "logs.h" +#include "../base/logs.h" namespace easy2d { diff --git a/src/easy2d/core/Frames.h b/easy2d/2d/Frames.h similarity index 98% rename from src/easy2d/core/Frames.h rename to easy2d/2d/Frames.h index c6ba9675..128fb2a8 100644 --- a/src/easy2d/core/Frames.h +++ b/easy2d/2d/Frames.h @@ -20,7 +20,6 @@ #pragma once #include "include-forwards.h" -#include "time.h" namespace easy2d { diff --git a/src/easy2d/core/Geometry.cpp b/easy2d/2d/Geometry.cpp similarity index 99% rename from src/easy2d/core/Geometry.cpp rename to easy2d/2d/Geometry.cpp index 46c0fdf9..12ed8a0c 100644 --- a/src/easy2d/core/Geometry.cpp +++ b/easy2d/2d/Geometry.cpp @@ -19,8 +19,8 @@ // THE SOFTWARE. #include "Geometry.h" -#include "render.h" -#include "logs.h" +#include "../renderer/render.h" +#include "../base/logs.h" namespace easy2d { diff --git a/src/easy2d/core/Geometry.h b/easy2d/2d/Geometry.h similarity index 100% rename from src/easy2d/core/Geometry.h rename to easy2d/2d/Geometry.h diff --git a/src/easy2d/core/GeometryNode.cpp b/easy2d/2d/GeometryNode.cpp similarity index 98% rename from src/easy2d/core/GeometryNode.cpp rename to easy2d/2d/GeometryNode.cpp index 3a3ca899..305c3fcb 100644 --- a/src/easy2d/core/GeometryNode.cpp +++ b/easy2d/2d/GeometryNode.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include "GeometryNode.h" -#include "render.h" +#include "../renderer/render.h" namespace easy2d { diff --git a/src/easy2d/core/GeometryNode.h b/easy2d/2d/GeometryNode.h similarity index 100% rename from src/easy2d/core/GeometryNode.h rename to easy2d/2d/GeometryNode.h diff --git a/src/easy2d/core/Image.cpp b/easy2d/2d/Image.cpp similarity index 96% rename from src/easy2d/core/Image.cpp rename to easy2d/2d/Image.cpp index 68c28ee5..fcee87a1 100644 --- a/src/easy2d/core/Image.cpp +++ b/easy2d/2d/Image.cpp @@ -19,9 +19,9 @@ // THE SOFTWARE. #include "Image.h" -#include "logs.h" -#include "render.h" -#include "modules.h" +#include "../base/logs.h" +#include "../renderer/render.h" +#include "../platform/modules.h" namespace easy2d { @@ -75,7 +75,7 @@ namespace easy2d if (FAILED(hr)) { - E2D_ERROR_HR_LOG(hr, L"Load image file failed!"); + E2D_ERROR_LOG(L"Load image file failed with HRESULT of %08X", hr); return false; } diff --git a/src/easy2d/core/Image.h b/easy2d/2d/Image.h similarity index 98% rename from src/easy2d/core/Image.h rename to easy2d/2d/Image.h index f544da0b..9770e9b7 100644 --- a/src/easy2d/core/Image.h +++ b/easy2d/2d/Image.h @@ -20,7 +20,7 @@ #pragma once #include "include-forwards.h" -#include "Resource.h" +#include "../base/Resource.h" #include namespace easy2d diff --git a/src/easy2d/core/Layer.cpp b/easy2d/2d/Layer.cpp similarity index 98% rename from src/easy2d/core/Layer.cpp rename to easy2d/2d/Layer.cpp index 4c552240..7e870c78 100644 --- a/src/easy2d/core/Layer.cpp +++ b/easy2d/2d/Layer.cpp @@ -20,7 +20,7 @@ #pragma once #include "Layer.h" -#include "render.h" +#include "../renderer/render.h" namespace easy2d { diff --git a/src/easy2d/core/Layer.h b/easy2d/2d/Layer.h similarity index 100% rename from src/easy2d/core/Layer.h rename to easy2d/2d/Layer.h diff --git a/src/easy2d/core/Node.cpp b/easy2d/2d/Node.cpp similarity index 99% rename from src/easy2d/core/Node.cpp rename to easy2d/2d/Node.cpp index 09a3bde8..737bc9d5 100644 --- a/src/easy2d/core/Node.cpp +++ b/easy2d/2d/Node.cpp @@ -21,9 +21,8 @@ #include "Node.h" #include "Action.h" #include "Scene.h" -#include "Task.h" -#include "render.h" -#include "logs.h" +#include "../base/logs.h" +#include "../renderer/render.h" namespace easy2d { diff --git a/src/easy2d/core/Node.h b/easy2d/2d/Node.h similarity index 99% rename from src/easy2d/core/Node.h rename to easy2d/2d/Node.h index bbc59fd6..7a84aad7 100644 --- a/src/easy2d/core/Node.h +++ b/easy2d/2d/Node.h @@ -20,11 +20,10 @@ #pragma once #include "include-forwards.h" -#include "time.h" #include "Transform.hpp" -#include "TaskManager.h" #include "ActionManager.h" -#include "EventDispatcher.h" +#include "../base/TaskManager.h" +#include "../base/EventDispatcher.h" namespace easy2d { diff --git a/src/easy2d/core/Scene.cpp b/easy2d/2d/Scene.cpp similarity index 97% rename from src/easy2d/core/Scene.cpp rename to easy2d/2d/Scene.cpp index e43b53e3..0032ec1a 100644 --- a/src/easy2d/core/Scene.cpp +++ b/easy2d/2d/Scene.cpp @@ -19,8 +19,8 @@ // THE SOFTWARE. #include "Scene.h" -#include "logs.h" -#include "render.h" +#include "../base/logs.h" +#include "../renderer/render.h" namespace easy2d { diff --git a/src/easy2d/core/Scene.h b/easy2d/2d/Scene.h similarity index 100% rename from src/easy2d/core/Scene.h rename to easy2d/2d/Scene.h diff --git a/src/easy2d/core/Sprite.cpp b/easy2d/2d/Sprite.cpp similarity index 98% rename from src/easy2d/core/Sprite.cpp rename to easy2d/2d/Sprite.cpp index c0539b9c..b34191a9 100644 --- a/src/easy2d/core/Sprite.cpp +++ b/easy2d/2d/Sprite.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include "Sprite.h" -#include "render.h" +#include "../renderer/render.h" namespace easy2d { diff --git a/src/easy2d/core/Sprite.h b/easy2d/2d/Sprite.h similarity index 100% rename from src/easy2d/core/Sprite.h rename to easy2d/2d/Sprite.h diff --git a/src/easy2d/core/Text.cpp b/easy2d/2d/Text.cpp similarity index 99% rename from src/easy2d/core/Text.cpp rename to easy2d/2d/Text.cpp index 84054bef..e3cd7934 100644 --- a/src/easy2d/core/Text.cpp +++ b/easy2d/2d/Text.cpp @@ -19,8 +19,8 @@ // THE SOFTWARE. #include "Text.h" -#include "render.h" -#include "logs.h" +#include "../base/logs.h" +#include "../renderer/render.h" namespace easy2d { diff --git a/src/easy2d/core/Text.h b/easy2d/2d/Text.h similarity index 100% rename from src/easy2d/core/Text.h rename to easy2d/2d/Text.h diff --git a/src/easy2d/core/TextStyle.hpp b/easy2d/2d/TextStyle.hpp similarity index 100% rename from src/easy2d/core/TextStyle.hpp rename to easy2d/2d/TextStyle.hpp diff --git a/src/easy2d/core/Transform.hpp b/easy2d/2d/Transform.hpp similarity index 100% rename from src/easy2d/core/Transform.hpp rename to easy2d/2d/Transform.hpp diff --git a/src/easy2d/core/Transition.cpp b/easy2d/2d/Transition.cpp similarity index 98% rename from src/easy2d/core/Transition.cpp rename to easy2d/2d/Transition.cpp index 7f8eb3a7..51120db4 100644 --- a/src/easy2d/core/Transition.cpp +++ b/easy2d/2d/Transition.cpp @@ -21,9 +21,9 @@ #include "Transition.h" #include "Node.h" #include "Scene.h" -#include "window.h" -#include "render.h" -#include "logs.h" +#include "../base/window.h" +#include "../base/logs.h" +#include "../renderer/render.h" namespace easy2d { diff --git a/src/easy2d/core/Transition.h b/easy2d/2d/Transition.h similarity index 99% rename from src/easy2d/core/Transition.h rename to easy2d/2d/Transition.h index 12d6a284..c7fefe2a 100644 --- a/src/easy2d/core/Transition.h +++ b/easy2d/2d/Transition.h @@ -20,7 +20,6 @@ #pragma once #include "include-forwards.h" -#include "time.h" #include namespace easy2d diff --git a/src/easy2d/core/helper.h b/easy2d/2d/include-forwards.h similarity index 68% rename from src/easy2d/core/helper.h rename to easy2d/2d/include-forwards.h index 60716011..b7eaa584 100644 --- a/src/easy2d/core/helper.h +++ b/easy2d/2d/include-forwards.h @@ -19,69 +19,22 @@ // THE SOFTWARE. #pragma once -#include "RefCounter.hpp" -#include "../common/Array.h" -#include "../common/String.h" -#include "../common/IntrusivePtr.hpp" -#include -#include -#include -#include -#include - -#ifndef E2D_DECLARE_SMART_PTR -#define E2D_DECLARE_SMART_PTR(CLASS)\ - class CLASS;\ - using CLASS##Ptr = ::easy2d::SmartPtr< CLASS > -#endif +#include "Color.h" +#include "../common/helper.h" +#include "../common/ComPtr.hpp" +#include "../common/Closure.hpp" +#include "../common/Singleton.hpp" +#include "../common/IntrusiveList.hpp" +#include "../base/time.h" +#include "../base/RefCounter.hpp" +#include "../base/SmartPtr.hpp" +#include "../base/Object.h" +#include "../math/helper.h" namespace easy2d { - using StringStream = std::wstringstream; - - template - using Pair = std::pair; - - template - using List = std::list; - - template - using Set = std::set; - - template - using UnorderedSet = std::unordered_set; - - template - using Map = std::map; - - template - using UnorderedMap = std::unordered_map; -} - -namespace easy2d -{ - struct DefaultIntrusivePtrManager - { - static inline void AddRef(RefCounter* ptr) - { - if (ptr) ptr->Retain(); - } - - static inline void Release(RefCounter* ptr) - { - if (ptr) ptr->Release(); - } - }; - - template - using SmartPtr = IntrusivePtr<_Ty, DefaultIntrusivePtrManager, true>; - - - E2D_DECLARE_SMART_PTR(Object); E2D_DECLARE_SMART_PTR(Image); - E2D_DECLARE_SMART_PTR(Task); E2D_DECLARE_SMART_PTR(Frames); - E2D_DECLARE_SMART_PTR(EventListener); E2D_DECLARE_SMART_PTR(Geometry); E2D_DECLARE_SMART_PTR(LineGeometry); @@ -128,3 +81,52 @@ namespace easy2d E2D_DECLARE_SMART_PTR(Button); E2D_DECLARE_SMART_PTR(Menu); } + +namespace easy2d +{ + // ʽ + enum class StrokeStyle : int + { + Miter = 0, /* б */ + Bevel = 1, /* б */ + Round = 2 /* Բ */ + }; + + // + enum class Direction : int + { + Up, /* */ + Down, /* */ + Left, /* */ + Right /* */ + }; + + // ָ + enum class MouseCursor : int + { + Arrow, /* ָ */ + TextInput, /* ı */ + Hand, /* ָ */ + SizeAll, + SizeNESW, + SizeNS, + SizeNWSE, + SizeWE, + }; + + // ֿ + enum class TextAntialias + { + Default, // ϵͳĬ + ClearType, // ClearType + GrayScale, // Ҷȿ + None // ÿ + }; + + // ͼ + struct LayerProperties + { + math::Rect area; + float opacity; + }; +} diff --git a/src/easy2d/Easy2D.vcxproj b/easy2d/Easy2D.vcxproj similarity index 65% rename from src/easy2d/Easy2D.vcxproj rename to easy2d/Easy2D.vcxproj index 06d2c4f7..a432290d 100644 --- a/src/easy2d/Easy2D.vcxproj +++ b/easy2d/Easy2D.vcxproj @@ -1,118 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -201,7 +202,7 @@ true - Console + Windows true @@ -212,7 +213,7 @@ true - Console + Windows true @@ -226,7 +227,7 @@ true - Console + Windows true true true @@ -242,7 +243,7 @@ true - Console + Windows true true true diff --git a/easy2d/Easy2D.vcxproj.filters b/easy2d/Easy2D.vcxproj.filters new file mode 100644 index 00000000..510c5cf5 --- /dev/null +++ b/easy2d/Easy2D.vcxproj.filters @@ -0,0 +1,369 @@ + + + + + {80bc6386-2b70-4bae-993c-649a55163a1b} + + + {68eac919-ee87-4030-a033-c251731928f5} + + + {07b6d541-4a1b-472a-aae0-daf9d082fe84} + + + {86e2d0f2-a9d0-4456-b6a5-d480228bbf82} + + + {c2654ccc-59f6-4c17-bb6b-99b07fc78702} + + + {896bdedf-6e82-449b-9b6e-0bc69f3699b1} + + + {2e18d99a-e906-499a-9e29-4e0783202644} + + + {7897afce-24cb-42b4-9443-56508e4ec89c} + + + + + ui + + + ui + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + math + + + math + + + math + + + math + + + math + + + math + + + platform + + + platform + + + utils + + + utils + + + utils + + + + + math + + + math + + + base + + + base + + + base + + + base + + + + utils + + + + + ui + + + ui + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + platform + + + platform + + + utils + + + utils + + + utils + + + base + + + base + + + base + + + utils + + + \ No newline at end of file diff --git a/src/easy2d/core/Component.h b/easy2d/base/Component.h similarity index 100% rename from src/easy2d/core/Component.h rename to easy2d/base/Component.h diff --git a/src/easy2d/core/Event.hpp b/easy2d/base/Event.hpp similarity index 99% rename from src/easy2d/core/Event.hpp rename to easy2d/base/Event.hpp index 18241b37..1779f7a4 100644 --- a/src/easy2d/core/Event.hpp +++ b/easy2d/base/Event.hpp @@ -105,6 +105,8 @@ namespace easy2d void* data; }; + class Node; + // ¼ struct E2D_API Event { diff --git a/src/easy2d/core/EventDispatcher.cpp b/easy2d/base/EventDispatcher.cpp similarity index 99% rename from src/easy2d/core/EventDispatcher.cpp rename to easy2d/base/EventDispatcher.cpp index bf53dfde..981f00d2 100644 --- a/src/easy2d/core/EventDispatcher.cpp +++ b/easy2d/base/EventDispatcher.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include "EventDispatcher.h" -#include "logs.h" +#include "../base/logs.h" namespace easy2d { diff --git a/src/easy2d/core/EventDispatcher.h b/easy2d/base/EventDispatcher.h similarity index 100% rename from src/easy2d/core/EventDispatcher.h rename to easy2d/base/EventDispatcher.h diff --git a/src/easy2d/core/EventListener.cpp b/easy2d/base/EventListener.cpp similarity index 100% rename from src/easy2d/core/EventListener.cpp rename to easy2d/base/EventListener.cpp diff --git a/src/easy2d/core/EventListener.h b/easy2d/base/EventListener.h similarity index 89% rename from src/easy2d/core/EventListener.h rename to easy2d/base/EventListener.h index 1630c0de..b52c2306 100644 --- a/src/easy2d/core/EventListener.h +++ b/easy2d/base/EventListener.h @@ -19,16 +19,22 @@ // THE SOFTWARE. #pragma once -#include "include-forwards.h" +#include "../base/SmartPtr.hpp" +#include "../common/helper.h" #include "../common/IntrusiveList.hpp" +#include "Object.h" #include "Event.hpp" +#include namespace easy2d { - using EventCallback = std::function; + typedef std::function EventCallback; class EventDispatcher; + E2D_DECLARE_SMART_PTR(EventListener); + + // ¼ class E2D_API EventListener : public virtual Object , protected IntrusiveListItem diff --git a/src/easy2d/core/Input.cpp b/easy2d/base/Input.cpp similarity index 100% rename from src/easy2d/core/Input.cpp rename to easy2d/base/Input.cpp diff --git a/src/easy2d/core/Input.h b/easy2d/base/Input.h similarity index 97% rename from src/easy2d/core/Input.h rename to easy2d/base/Input.h index 2a73cbcf..33e6528c 100644 --- a/src/easy2d/core/Input.h +++ b/easy2d/base/Input.h @@ -19,10 +19,11 @@ // THE SOFTWARE. #pragma once -#include "include-forwards.h" +#include "../macros.h" +#include "../common/Singleton.hpp" +#include "../math/helper.h" #include "keys.hpp" #include "Component.h" -#include "../common/Singleton.hpp" namespace easy2d { diff --git a/src/easy2d/core/Object.cpp b/easy2d/base/Object.cpp similarity index 100% rename from src/easy2d/core/Object.cpp rename to easy2d/base/Object.cpp diff --git a/src/easy2d/core/Object.h b/easy2d/base/Object.h similarity index 93% rename from src/easy2d/core/Object.h rename to easy2d/base/Object.h index 4ec57cff..c6775017 100644 --- a/src/easy2d/core/Object.h +++ b/easy2d/base/Object.h @@ -19,10 +19,15 @@ // THE SOFTWARE. #pragma once -#include "helper.h" +#include "../macros.h" +#include "../common/helper.h" +#include "RefCounter.hpp" +#include "SmartPtr.hpp" namespace easy2d { + E2D_DECLARE_SMART_PTR(Object); + class E2D_API Object : public RefCounter { diff --git a/src/easy2d/core/RefCounter.hpp b/easy2d/base/RefCounter.hpp similarity index 100% rename from src/easy2d/core/RefCounter.hpp rename to easy2d/base/RefCounter.hpp diff --git a/src/easy2d/core/Resource.cpp b/easy2d/base/Resource.cpp similarity index 87% rename from src/easy2d/core/Resource.cpp rename to easy2d/base/Resource.cpp index fdbee74f..ec5d251a 100644 --- a/src/easy2d/core/Resource.cpp +++ b/easy2d/base/Resource.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include "Resource.h" -#include "logs.h" +#include "../base/logs.h" namespace easy2d { @@ -51,11 +51,6 @@ namespace easy2d operator=(rhs); } - Resource::Resource(Resource && rhs) - { - operator=(std::forward(rhs)); - } - Resource::~Resource() { if (IsFileType() && file_name_) @@ -96,28 +91,6 @@ namespace easy2d return *this; } - Resource & Resource::operator=(Resource && rhs) - { - if (IsFileType() && file_name_) - { - delete file_name_; - file_name_ = nullptr; - } - - type_ = rhs.type_; - if (IsFileType()) - { - file_name_ = rhs.file_name_; - rhs.file_name_ = nullptr; - } - else - { - bin_name_ = rhs.bin_name_; - bin_type_ = rhs.bin_type_; - } - return *this; - } - bool Resource::Load(LPVOID& buffer, DWORD& buffer_size) const { if (type_ != Type::Binary) diff --git a/src/easy2d/core/Resource.h b/easy2d/base/Resource.h similarity index 95% rename from src/easy2d/core/Resource.h rename to easy2d/base/Resource.h index 61912ded..bbb46d51 100644 --- a/src/easy2d/core/Resource.h +++ b/easy2d/base/Resource.h @@ -19,7 +19,8 @@ // THE SOFTWARE. #pragma once -#include "helper.h" +#include "../macros.h" +#include "../common/helper.h" namespace easy2d { @@ -53,10 +54,6 @@ namespace easy2d Resource const& rhs ); - Resource( - Resource && rhs - ); - virtual ~Resource(); inline bool IsFileType() const { return type_ == Type::File; } @@ -72,8 +69,6 @@ namespace easy2d Resource& operator= (Resource const& rhs); - Resource& operator= (Resource && rhs); - private: Type type_; union diff --git a/src/easy2d/utils/Data.h b/easy2d/base/SmartPtr.hpp similarity index 57% rename from src/easy2d/utils/Data.h rename to easy2d/base/SmartPtr.hpp index c4a63142..3b1900bc 100644 --- a/src/easy2d/utils/Data.h +++ b/easy2d/base/SmartPtr.hpp @@ -19,65 +19,31 @@ // THE SOFTWARE. #pragma once -#include "../core/helper.h" +#include "../base/RefCounter.hpp" +#include "../common/IntrusivePtr.hpp" namespace easy2d { - // ݹ - class E2D_API Data + struct DefaultIntrusivePtrManager { - public: - Data( - String const& key, /* ֵ */ - String const& field = L"Defalut" /* ֶ */ - ); + static inline void AddRef(RefCounter* ptr) + { + if (ptr) ptr->Retain(); + } - // Ƿ - bool Exists() const; - - // int ͵ֵ - bool SaveInt( - int val - ); - - // float ͵ֵ - bool SaveFloat( - float val - ); - - // double ͵ֵ - bool SaveDouble( - double val - ); - - // bool ͵ֵ - bool SaveBool( - bool val - ); - - // String ͵ֵ - bool SaveString( - String const& val - ); - - // ȡ int ͵ֵ - int GetInt() const; - - // ȡ float ͵ֵ - float GetFloat() const; - - // ȡ double ͵ֵ - double GetDouble() const; - - // ȡ bool ͵ֵ - bool GetBool() const; - - // ȡ ַ ͵ֵ - String GetString(); - - protected: - String key_; - String field_; - String const& data_path_; + static inline void Release(RefCounter* ptr) + { + if (ptr) ptr->Release(); + } }; + + template + using SmartPtr = IntrusivePtr<_Ty, DefaultIntrusivePtrManager, true>; + } + +#ifndef E2D_DECLARE_SMART_PTR +#define E2D_DECLARE_SMART_PTR(CLASS)\ + class CLASS;\ + using CLASS##Ptr = ::easy2d::SmartPtr< CLASS > +#endif diff --git a/src/easy2d/core/Task.cpp b/easy2d/base/Task.cpp similarity index 100% rename from src/easy2d/core/Task.cpp rename to easy2d/base/Task.cpp diff --git a/src/easy2d/core/Task.h b/easy2d/base/Task.h similarity index 96% rename from src/easy2d/core/Task.h rename to easy2d/base/Task.h index 2c439783..73880664 100644 --- a/src/easy2d/core/Task.h +++ b/easy2d/base/Task.h @@ -19,15 +19,18 @@ // THE SOFTWARE. #pragma once -#include "include-forwards.h" -#include "time.h" +#include "../common/helper.h" #include "../common/IntrusiveList.hpp" +#include "Object.h" +#include "time.h" #include namespace easy2d { class TaskManager; + E2D_DECLARE_SMART_PTR(Task); + // ʱ class E2D_API Task : public virtual Object diff --git a/src/easy2d/core/TaskManager.cpp b/easy2d/base/TaskManager.cpp similarity index 99% rename from src/easy2d/core/TaskManager.cpp rename to easy2d/base/TaskManager.cpp index 80d69d2f..9ab7e9a4 100644 --- a/src/easy2d/core/TaskManager.cpp +++ b/easy2d/base/TaskManager.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include "TaskManager.h" -#include "logs.h" +#include "../base/logs.h" namespace easy2d { diff --git a/src/easy2d/core/TaskManager.h b/easy2d/base/TaskManager.h similarity index 100% rename from src/easy2d/core/TaskManager.h rename to easy2d/base/TaskManager.h diff --git a/src/easy2d/core/keys.hpp b/easy2d/base/keys.hpp similarity index 98% rename from src/easy2d/core/keys.hpp rename to easy2d/base/keys.hpp index 9b611116..3d63eca0 100644 --- a/src/easy2d/core/keys.hpp +++ b/easy2d/base/keys.hpp @@ -28,7 +28,7 @@ namespace easy2d { typedef int Value; - enum : int + enum : Value { Left = VK_LBUTTON, // Right = VK_RBUTTON, // Ҽ @@ -42,7 +42,7 @@ namespace easy2d { typedef int Value; - enum : int + enum : Value { Unknown = 0, Up = VK_UP, diff --git a/easy2d/base/logs.cpp b/easy2d/base/logs.cpp new file mode 100644 index 00000000..24a34544 --- /dev/null +++ b/easy2d/base/logs.cpp @@ -0,0 +1,88 @@ +// Copyright (c) 2016-2018 Easy2D - Nomango +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include "logs.h" + +namespace easy2d +{ + namespace __console_colors + { + const WORD _blue = FOREGROUND_BLUE | FOREGROUND_INTENSITY; + const WORD _green = FOREGROUND_GREEN | FOREGROUND_INTENSITY; + const WORD _red = FOREGROUND_RED | FOREGROUND_INTENSITY; + const WORD _yellow = FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY; + const WORD _white = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY; + + const WORD _blue_bg = _white | BACKGROUND_BLUE | BACKGROUND_INTENSITY; + const WORD _green_bg = _white | BACKGROUND_GREEN | BACKGROUND_INTENSITY; + const WORD _red_bg = _white | BACKGROUND_RED | BACKGROUND_INTENSITY; + const WORD _yellow_bg = BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY; + const WORD _white_bg = BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY; + + const WORD _reset = _white; + +#define DECLARE_HANDLE_COLOR(NAME, HANDLE_NAME, COLOR)\ + inline std::wostream& (NAME)(std::wostream& _out)\ + { ::SetConsoleTextAttribute(::GetStdHandle(HANDLE_NAME), _##COLOR); return _out; } + +#define DECLARE_COLOR(COLOR) \ + DECLARE_HANDLE_COLOR(stdout_##COLOR, STD_OUTPUT_HANDLE, COLOR)\ + DECLARE_HANDLE_COLOR(stderr_##COLOR, STD_ERROR_HANDLE, COLOR) + +#define DECLARE_BG_COLOR(COLOR) \ + DECLARE_HANDLE_COLOR(stdout_##COLOR##_bg, STD_OUTPUT_HANDLE, COLOR##_bg)\ + DECLARE_HANDLE_COLOR(stderr_##COLOR##_bg, STD_ERROR_HANDLE, COLOR##_bg) + + DECLARE_COLOR(red); + DECLARE_COLOR(green); + DECLARE_COLOR(yellow); + DECLARE_COLOR(blue); + DECLARE_COLOR(white); + DECLARE_COLOR(reset); + + DECLARE_BG_COLOR(red); + DECLARE_BG_COLOR(green); + DECLARE_BG_COLOR(yellow); + DECLARE_BG_COLOR(blue); + DECLARE_BG_COLOR(white); + +#undef DECLARE_COLOR +#undef DECLARE_BG_COLOR + } + + Logger::Logger() + { + enabled_ = ::GetConsoleWindow() != nullptr; + default_stdout_color_ = default_stderr_color_ = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY; + + CONSOLE_SCREEN_BUFFER_INFO stdout_info; + if (::GetConsoleScreenBufferInfo(::GetStdHandle(STD_OUTPUT_HANDLE), &stdout_info)) + { + default_stdout_color_ = stdout_info.wAttributes; + } + + CONSOLE_SCREEN_BUFFER_INFO stderr_info; + if (::GetConsoleScreenBufferInfo(::GetStdHandle(STD_ERROR_HANDLE), &stderr_info)) + { + default_stderr_color_ = stderr_info.wAttributes; + } + } + +} diff --git a/easy2d/base/logs.h b/easy2d/base/logs.h new file mode 100644 index 00000000..96240d75 --- /dev/null +++ b/easy2d/base/logs.h @@ -0,0 +1,231 @@ +// Copyright (c) 2016-2018 Easy2D - Nomango +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#pragma once +#include "../macros.h" +#include "../common/Singleton.hpp" +#include +#include +#include +#include + +#ifndef E2D_LOG +# ifdef E2D_DEBUG +# define E2D_LOG(FORMAT, ...) easy2d::Logger::Instance().Messageln((FORMAT), __VA_ARGS__) +# else +# define E2D_LOG __noop +# endif +#endif + +#ifndef E2D_WARNING_LOG +# define E2D_WARNING_LOG(FORMAT, ...) easy2d::Logger::Instance().Warningln((FORMAT), __VA_ARGS__) +#endif + +#ifndef E2D_ERROR_LOG +# define E2D_ERROR_LOG(FORMAT, ...) easy2d::Logger::Instance().Errorln((FORMAT), __VA_ARGS__) +#endif + +namespace easy2d +{ + namespace __console_colors + { + using ConsoleColor = std::wostream&(*)(std::wostream&); + +#define DECLARE_COLOR(COLOR)\ + extern std::wostream&(stdout_##COLOR)(std::wostream&);\ + extern std::wostream&(stderr_##COLOR)(std::wostream&); + +#define DECLARE_BG_COLOR(COLOR)\ + extern std::wostream&(stdout_##COLOR##_bg)(std::wostream&);\ + extern std::wostream&(stderr_##COLOR##_bg)(std::wostream&); + + DECLARE_COLOR(red); + DECLARE_COLOR(green); + DECLARE_COLOR(yellow); + DECLARE_COLOR(blue); + DECLARE_COLOR(white); + DECLARE_COLOR(reset); + + DECLARE_BG_COLOR(red); + DECLARE_BG_COLOR(green); + DECLARE_BG_COLOR(yellow); + DECLARE_BG_COLOR(blue); + DECLARE_BG_COLOR(white); + +#undef DECLARE_COLOR +#undef DECLARE_BG_COLOR + } + + class E2D_API Logger + : public Singleton + { + E2D_DECLARE_SINGLETON(Logger); + + public: + inline void Enable() + { + enabled_ = true; + } + + inline void Disable() + { + enabled_ = false; + } + + template + inline void Print(const wchar_t* format, _Args&&... args) const + { + using namespace __console_colors; + Output(std::wcout, stdout_white, nullptr, format, std::forward<_Args&&>(args)...); + } + + template + inline void Println(const wchar_t* format, _Args&&... args) const + { + using namespace __console_colors; + OutputLine(std::wcout, stdout_white, nullptr, format, std::forward<_Args&&>(args)...); + } + + template + inline void Message(const wchar_t * format, _Args&&... args) const + { + using namespace __console_colors; + Output(std::wcout, stdout_blue, nullptr, format, std::forward<_Args&&>(args)...); + } + + template + inline void Messageln(const wchar_t * format, _Args&&... args) const + { + using namespace __console_colors; + OutputLine(std::wcout, stdout_blue, nullptr, format, std::forward<_Args&&>(args)...); + } + + template + inline void Warning(const wchar_t* format, _Args&&... args) const + { + using namespace __console_colors; + Output(std::wcerr, stdout_yellow_bg, L"Warning: ", format, std::forward<_Args&&>(args)...); + } + + template + inline void Warningln(const wchar_t* format, _Args&&... args) const + { + using namespace __console_colors; + OutputLine(std::wcerr, stdout_yellow_bg, L"Warning: ", format, std::forward<_Args&&>(args)...); + } + + template + inline void Error(const wchar_t* format, _Args&&... args) const + { + using namespace __console_colors; + Output(std::wcerr, stderr_red_bg, L"Error: ", format, std::forward<_Args&&>(args)...); + } + + template + inline void Errorln(const wchar_t* format, _Args&&... args) const + { + using namespace __console_colors; + OutputLine(std::wcerr, stderr_red_bg, L"Error: ", format, std::forward<_Args&&>(args)...); + } + + private: + Logger(); + + template + inline void OutputLine(std::wostream& os, __console_colors::ConsoleColor color, const wchar_t* prompt, const wchar_t* format, _Args&&... args) const + { + if (!enabled_) + return; + + Output(os, color, prompt, format, std::forward<_Args&&>(args)...); + + os << std::endl; + ::OutputDebugStringW(L"\r\n"); + } + + template + inline void Output(std::wostream& os, __console_colors::ConsoleColor color, const wchar_t* prompt, const wchar_t* format, _Args&&... args) const + { + if (!enabled_) + return; + + std::wstring output = MakeOutputString(prompt, format, std::forward<_Args&&>(args)...); + + os << color << output; + ::OutputDebugStringW(output.c_str()); + + ResetColor(); + } + + template + inline std::wstring MakeOutputString(const wchar_t* prompt, const wchar_t* format, _Args&&... args) const + { + static wchar_t temp_buffer[1024 * 3 + 1]; + + const auto len = ::_scwprintf(format, std::forward<_Args&&>(args)...); + ::swprintf_s(temp_buffer, len + 1, format, std::forward<_Args&&>(args)...); + + std::wstringstream ss; + ss << Logger::OutPrefix; + + if (prompt) + ss << prompt; + + ss << temp_buffer; + + return ss.str(); + } + + inline void ResetColor() const + { + ::SetConsoleTextAttribute(::GetStdHandle(STD_OUTPUT_HANDLE), default_stdout_color_); + ::SetConsoleTextAttribute(::GetStdHandle(STD_ERROR_HANDLE), default_stderr_color_); + } + + static inline std::wostream& OutPrefix(std::wostream& out) + { + std::time_t unix = std::time(nullptr); + std::tm tmbuf; + localtime_s(&tmbuf, &unix); + out << std::put_time(&tmbuf, L"[easy2d] %H:%M:%S "); + return out; + } + + private: + bool enabled_; + WORD default_stdout_color_; + WORD default_stderr_color_; + }; +} + +namespace easy2d +{ + inline void ThrowIfFailed(HRESULT hr) + { + if (FAILED(hr)) + { + E2D_ERROR_LOG(L"Fatal error with HRESULT of %08X", hr); + + static char buffer[1024 + 1]; + sprintf_s(buffer, "Fatal error with HRESULT of %08X", hr); + throw std::runtime_error(buffer); + } + } +} diff --git a/src/easy2d/core/time.cpp b/easy2d/base/time.cpp similarity index 100% rename from src/easy2d/core/time.cpp rename to easy2d/base/time.cpp diff --git a/src/easy2d/core/time.h b/easy2d/base/time.h similarity index 100% rename from src/easy2d/core/time.h rename to easy2d/base/time.h diff --git a/src/easy2d/core/window.cpp b/easy2d/base/window.cpp similarity index 100% rename from src/easy2d/core/window.cpp rename to easy2d/base/window.cpp diff --git a/src/easy2d/core/window.h b/easy2d/base/window.h similarity index 97% rename from src/easy2d/core/window.h rename to easy2d/base/window.h index 96e3efc5..fefba623 100644 --- a/src/easy2d/core/window.h +++ b/easy2d/base/window.h @@ -19,7 +19,8 @@ // THE SOFTWARE. #pragma once -#include "include-forwards.h" +#include "../common/helper.h" +#include "../math/helper.h" namespace easy2d { diff --git a/easy2d/common/Array.h b/easy2d/common/Array.h new file mode 100644 index 00000000..ade70a3f --- /dev/null +++ b/easy2d/common/Array.h @@ -0,0 +1,283 @@ +// Copyright (c) 2016-2018 Easy2D - Nomango +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#pragma once +#include +#include +#include + +namespace easy2d +{ + // + // Array + // Lightweight std::vector<>-like class + // + template + class Array; + + + // + // ArrayManager<> with memory operations + // + template::value> + struct __ArrayManager; + + + // + // Array<> + // + template< + typename _Ty, + typename _Alloc = std::allocator<_Ty>, + typename _Manager = __ArrayManager<_Ty, _Alloc>> + class Array + { + public: + using value_type = _Ty; + using size_type = int; + using iterator = value_type * ; + using const_iterator = const value_type*; + using reference = value_type & ; + using const_reference = const value_type &; + using reverse_iterator = std::reverse_iterator; + using const_reverse_iterator = std::reverse_iterator; + using allocator_type = typename _Alloc; + using manager = typename _Manager; + + public: + inline Array() : size_(0), capacity_(0), data_(nullptr) { } + inline Array(size_type count) : Array() { reserve(count); } + inline Array(size_type count, const _Ty& val) : Array() { assign(count, val); } + inline Array(std::initializer_list<_Ty> const& list) : Array() { assign(list); } + inline Array(const Array& src) : Array() { assign(src); } + inline Array(Array&& src) : Array() { swap(src); } + inline ~Array() { destroy(); } + + template + inline Array(_Iter first, _Iter last) : Array() { assign(first, last); } + + inline Array& operator=(const Array& src) { if (&src != this) { resize(src.size_); manager::copy_data(begin(), src.cbegin(), size_); } return (*this); } + inline Array& operator=(Array&& src) { swap(src); return *this; } + inline Array& operator=(std::initializer_list<_Ty> const& list) { if (list.size()) { assign(list.begin(), list.end()); } else clear(); return (*this); } + + inline Array& assign(size_type count, const _Ty& val) { if (count > 0) { resize(count); manager::copy_data(begin(), count, val); } else clear(); return (*this); } + inline Array& assign(const Array& src) { return operator=(src); } + inline Array& assign(std::initializer_list<_Ty> const& list) { return operator=(list); } + + template + inline void assign(_Iter first, _Iter last) { auto diff = std::distance(first, last); resize((size_type)diff); auto data = begin(); while (first != last) (*data++) = (*first++); } + + inline void clear() { destroy(); size_ = capacity_ = 0; data_ = nullptr; } + inline void swap(Array& rhs) { std::swap(size_, rhs.size_); std::swap(capacity_, rhs.capacity_); std::swap(data_, rhs.data_); } + + inline void resize(size_type new_size) { resize(new_size, _Ty()); } + inline void resize(size_type new_size, const _Ty& v); + inline void reserve(size_type new_capacity); + + inline void push_back(const _Ty& val) { resize(size_ + 1, val); } + inline void pop_back() { if (empty()) throw std::out_of_range("pop() called on empty vector"); resize(size_ - 1); } + inline void push_front(const _Ty& val) { if (size_ == 0) push_back(val); else insert(begin(), val); } + + inline iterator erase(const_iterator where) { return erase(where, where + 1); } + inline iterator erase(const_iterator first, const_iterator last); + + inline iterator insert(const_iterator where, const _Ty& v); + + inline bool empty() const { return size_ == 0; } + inline size_type size() const { return size_; } + inline size_type size_in_bytes() const { return size_ * ((size_type)sizeof(_Ty)); } + inline size_type capacity() const { return capacity_; } + inline reference operator[](size_type off) { if (off < 0 || off >= size_) throw std::out_of_range("vector subscript out of range"); return data_[off]; } + inline const_reference operator[](size_type off) const { if (off < 0 || off >= size_) throw std::out_of_range("vector subscript out of range"); return data_[off]; } + + + inline bool contains(const _Ty& v) const { auto data = cbegin(); const auto data_end = cend(); while (data != data_end) if (*(data++) == v) return true; return false; } + inline size_type index_of(const_iterator it) const { check_offset(it - cbegin(), "invalid array position"); return it - data_; } + + inline iterator begin() { return iterator(data_); } + inline const_iterator begin() const { return const_iterator(data_); } + inline const_iterator cbegin() const { return begin(); } + inline iterator end() { return iterator(data_ + size_); } + inline const_iterator end() const { return const_iterator(data_ + size_); } + inline const_iterator cend() const { return end(); } + inline reverse_iterator rbegin() { return reverse_iterator(end()); } + inline const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); } + inline const_reverse_iterator crbegin() const { return rbegin(); } + inline reverse_iterator rend() { return reverse_iterator(begin()); } + inline const_reverse_iterator rend() const { return const_reverse_iterator(begin()); } + inline const_reverse_iterator crend() const { return rend(); } + inline reference front() { if (empty()) throw std::out_of_range("front() called on empty array"); return data_[0]; } + inline const_reference front() const { if (empty()) throw std::out_of_range("front() called on empty array"); return data_[0]; } + inline reference back() { if (empty()) throw std::out_of_range("back() called on empty array"); return data_[size_ - 1]; } + inline const_reference back() const { if (empty()) throw std::out_of_range("back() called on empty array"); return data_[size_ - 1]; } + + private: + inline size_type grow_capacity(size_type sz) const { size_type new_capacity = capacity_ ? (capacity_ + capacity_ / 2) : 8; return new_capacity > sz ? new_capacity : sz; } + inline void check_offset(const size_type off) const { if (off < 0 || off >= size_) throw std::out_of_range("invalid vector position"); } + + inline void destroy() { manager::destroy(data_, size_); manager::deallocate(data_, capacity_); } + protected: + size_type size_; + size_type capacity_; + _Ty* data_; + }; + + template + inline void Array<_Ty, _Alloc, _Manager>::resize(size_type new_size, const _Ty& val) + { + if (new_size > size_) + { + if (new_size > capacity_) + { + reserve(grow_capacity(new_size)); + } + manager::construct(begin() + size_, new_size - size_, val); + } + else + { + manager::destroy(begin() + new_size, size_ - new_size); + } + size_ = new_size; + } + + template + inline void Array<_Ty, _Alloc, _Manager>::reserve(size_type new_capacity) + { + if (new_capacity <= capacity_) + return; + + auto new_data = manager::allocate(new_capacity); + if (data_) + { + manager::construct(new_data, size_/* only construct needed size */); + manager::copy_data(new_data, data_, size_); + /* destroy old memory, but not resize */ + destroy(); + } + data_ = new_data; + capacity_ = new_capacity; + } + + template + inline typename Array<_Ty, _Alloc, _Manager>::iterator + Array<_Ty, _Alloc, _Manager>::erase(const_iterator first, const_iterator last) + { + const auto off = first - begin(); + const auto count = last - first; + + if (count != 0) + { + check_offset(off); + + manager::move_data(begin() + off, begin() + off + count, size_ - off - count); + resize(size_ - count); // do destruction + } + return begin() + off; + } + + template + inline typename Array<_Ty, _Alloc, _Manager>::iterator + Array<_Ty, _Alloc, _Manager>::insert(const_iterator where, const _Ty& v) + { + const auto off = where - begin(); + const auto insert_at = begin() + off; + + check_offset(off); + + resize(size_ + 1); + manager::move_data(insert_at + 1, insert_at, size_ - off - 1); + data_[off] = v; + return begin() + off; + } + + // + // ArrayManager for common type + // + template + struct __ArrayManager<_Ty, _Alloc, false> + { + using value_type = _Ty; + using size_type = int; + using allocator_type = typename _Alloc; + + static inline void copy_data(value_type* dest, const value_type* src, size_type count) { if (src == dest) return; ::memcpy(dest, src, (size_t)count * sizeof(value_type)); } + static inline void copy_data(value_type* dest, size_type count, const value_type& val) { ::memset(dest, (int)val, (size_t)count * sizeof(value_type)); } + static inline void move_data(value_type* dest, const value_type* src, size_type count) { if (src == dest) return; ::memmove(dest, src, (size_t)count * sizeof(value_type)); } + + static inline value_type* allocate(size_type count) { return get_allocator().allocate(count); } + static inline void deallocate(value_type*& ptr, size_type count) { if (ptr) { get_allocator().deallocate(ptr, count); ptr = nullptr; } } + + static inline void construct(value_type* ptr, size_type count) { } + static inline void construct(value_type* ptr, size_type count, const value_type& val) { while (count) { --count; *(ptr + count) = val; } } + static inline void destroy(value_type* ptr, size_type count) { } + + private: + static allocator_type& get_allocator() + { + static allocator_type allocator_; + return allocator_; + } + }; + + // + // ArrayManager for class + // + template + struct __ArrayManager<_Ty, _Alloc, true> + { + using value_type = _Ty; + using size_type = int; + using allocator_type = typename _Alloc; + + static inline void copy_data(value_type* dest, const value_type* src, size_type count) { if (src == dest) return; while (count--) (*dest++) = (*src++); } + static inline void copy_data(value_type* dest, size_type count, const value_type& val) { while (count--) (*dest++) = val; } + static inline void move_data(value_type* dest, const value_type* src, size_type count) + { + if (src == dest) return; + if (dest > src && dest < src + count) + { + src = src + count - 1; + dest = dest + count - 1; + while (count--) + (*dest--) = (*src--); + } + else + { + while (count--) + (*dest++) = (*src++); + } + } + + static inline value_type* allocate(size_type count) { return get_allocator().allocate(count); } + static inline void deallocate(value_type*& ptr, size_type count) { if (ptr) { get_allocator().deallocate(ptr, count); ptr = nullptr; } } + + static inline void construct(value_type* ptr, size_type count) { construct(ptr, count, value_type()); } + static inline void construct(value_type* ptr, size_type count, const value_type& val) { while (count) get_allocator().construct(ptr + (--count), val); } + static inline void destroy(value_type* ptr, size_type count) { while (count) get_allocator().destroy(ptr + (--count)); } + + private: + static allocator_type& get_allocator() + { + static allocator_type allocator_; + return allocator_; + } + }; + +} diff --git a/src/easy2d/common/ComPtr.hpp b/easy2d/common/ComPtr.hpp similarity index 100% rename from src/easy2d/common/ComPtr.hpp rename to easy2d/common/ComPtr.hpp diff --git a/src/easy2d/common/IntrusiveList.hpp b/easy2d/common/IntrusiveList.hpp similarity index 100% rename from src/easy2d/common/IntrusiveList.hpp rename to easy2d/common/IntrusiveList.hpp diff --git a/src/easy2d/common/IntrusivePtr.hpp b/easy2d/common/IntrusivePtr.hpp similarity index 100% rename from src/easy2d/common/IntrusivePtr.hpp rename to easy2d/common/IntrusivePtr.hpp diff --git a/src/easy2d/common/Singleton.hpp b/easy2d/common/Singleton.hpp similarity index 100% rename from src/easy2d/common/Singleton.hpp rename to easy2d/common/Singleton.hpp diff --git a/easy2d/common/String.h b/easy2d/common/String.h new file mode 100644 index 00000000..a48ae2f1 --- /dev/null +++ b/easy2d/common/String.h @@ -0,0 +1,1217 @@ +// Copyright (c) 2016-2018 Easy2D - Nomango +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#pragma once +#include "../macros.h" +#include +#include +#include + +namespace easy2d +{ + // + // String + // Lightweight std::wstring<>-like class + // + class String + { + public: + // Iterator + template + struct _Iterator + { + using iterator_category = typename std::iterator_traits<_Ty*>::iterator_category; + using value_type = typename std::iterator_traits<_Ty*>::value_type; + using difference_type = typename std::iterator_traits<_Ty*>::difference_type; + using pointer = typename std::iterator_traits<_Ty*>::pointer; + using reference = typename std::iterator_traits<_Ty*>::reference; + + // disable warning 4996 + using _Unchecked_type = _Ty; + + inline _Iterator(pointer base = nullptr) : base_(base) {} + + inline reference operator*() const { return *base_; } + inline pointer base() const { return base_; } + + inline _Iterator& operator++() { ++base_; return (*this); } + inline _Iterator operator++(int) { _Iterator old = (*this); ++(*this); return old; } + + inline _Iterator& operator--() { --base_; return (*this); } + inline _Iterator operator--(int) { _Iterator old = (*this); --(*this); return old; } + + inline const _Iterator operator+(difference_type off) const { return _Iterator(base_ + off); } + inline const _Iterator operator-(difference_type off) const { return _Iterator(base_ - off); } + + inline _Iterator& operator+=(difference_type off) { base_ += off; return (*this); } + inline _Iterator& operator-=(difference_type off) { base_ -= off; return (*this); } + + inline difference_type operator-(_Iterator const& other) const { return base_ - other.base_; } + + inline bool operator==(_Iterator const& other) const { return base_ == other.base_; } + inline bool operator!=(_Iterator const& other) const { return !(*this == other); } + + inline bool operator<(_Iterator const& other) const { return base_ < other.base_; } + inline bool operator<=(_Iterator const& other) const { return base_ <= other.base_; } + inline bool operator>(_Iterator const& other) const { return base_ > other.base_; } + inline bool operator>=(_Iterator const& other) const { return base_ >= other.base_; } + + inline reference operator[](difference_type off) { return *(base_ + off); } + inline const reference operator[](difference_type off) const { return *(base_ + off); } + + inline operator bool() const { return base_ != nullptr; } + + private: + pointer base_{ nullptr }; + }; + + public: + using value_type = wchar_t; + using size_type = size_t; + using reference = value_type &; + using const_reference = const value_type &; + using iterator = _Iterator; + using const_iterator = _Iterator; + using reverse_iterator = std::reverse_iterator; + using const_reverse_iterator = std::reverse_iterator; + using traits = std::char_traits; + using allocator = std::allocator; + + String(); + String(const wchar_t* cstr, bool const_str = true); + String(const wchar_t* cstr, size_type count); + String(size_type count, wchar_t ch); + String(const char* cstr); + String(std::string const& str); + String(std::wstring const& str); + String(String const& rhs); + String(String const& rhs, size_type pos, size_type count = npos); + String(String && rhs); + ~String(); + + template + String(_Iter first, _Iter last) : String() { assign_iter(first, last); } + + inline const wchar_t* c_str() const { return const_str_ ? const_str_ : L""; } + inline wchar_t at(size_t i) const { return (*this)[i]; } + inline size_type size() const { return size_; } + inline size_type length() const { return size(); } + inline size_type capacity() const { return capacity_; } + inline size_type max_size() const { return (static_cast(-1) / sizeof(value_type)); } + inline bool empty() const { return size_ == 0; } + inline void clear() { discard_const_data(); if (str_) { str_[0] = value_type(); } size_ = 0; } + + void reserve(const size_type new_cap = 0); + inline void resize(const size_type new_size, const wchar_t ch = value_type()) { check_operability(); if (new_size < size_) str_[size_ = new_size] = value_type(); else append(new_size - size_, ch); } + + int compare(const wchar_t* const str) const; + inline int compare(String const& str) const { return compare(str.c_str()); } + + String& append(size_type count, wchar_t ch); + String& append(const wchar_t* cstr, size_type count); + String& append(String const& other, size_type pos, size_type count = npos); + inline String& append(const wchar_t* cstr) { return append(cstr, traits::length(cstr)); } + inline String& append(std::wstring const& str) { return append(str.c_str()); } + inline String& append(String const& other) { return append(other.const_str_, 0, npos); } + + size_type find(const wchar_t ch, size_type offset = 0) const; + size_type find(const wchar_t* const str, size_type offset, size_type count) const; + inline size_type find(String const& str, size_type offset = 0) const { return find(str.c_str(), offset, str.size()); } + inline size_type find(const wchar_t* const str, size_type offset = 0) const { return find(str, offset, traits::length(str)); } + + size_type find_first_of(const wchar_t* const str, size_type offset, size_type count) const; + inline size_type find_first_of(const wchar_t ch, size_type offset = 0) const { return find(ch, offset); } + inline size_type find_first_of(String const& str, size_type offset = 0) const { return find_first_of(str.c_str(), offset, str.size()); } + inline size_type find_first_of(const wchar_t* const str, size_type offset = 0) const { return find_first_of(str, offset, traits::length(str)); } + + size_type find_last_of(const wchar_t ch, size_type pos = npos) const; + size_type find_last_of(const wchar_t* const str, size_type pos, size_type count) const; + inline size_type find_last_of(String const& str, size_type pos = npos) const { return find_first_of(str.c_str(), pos, str.size()); } + inline size_type find_last_of(const wchar_t* const str, size_type pos = npos) const { return find_first_of(str, pos, traits::length(str)); } + + String& replace(size_type pos, size_type count, const wchar_t* cstr, size_type count2); + String& replace(size_type pos, size_type count, size_type count2, const wchar_t ch); + inline String& replace(size_type pos, size_type count, const String& str) { return replace(pos, count, str.c_str(), str.size()); } + inline String& replace(size_type pos, size_type count, const wchar_t* cstr) { return replace(pos, count, cstr, traits::length(cstr)); } + inline String& replace(const_iterator first, const_iterator last, const String& str) { return replace(first, last, str.c_str(), str.size()); } + inline String& replace(const_iterator first, const_iterator last, const wchar_t* cstr) { return replace(first, last, cstr, traits::length(cstr)); } + inline String& replace(const_iterator first, const_iterator last, const wchar_t* cstr, size_type count){ return replace(first - cbegin(), last - first, cstr, count); } + inline String& replace(const_iterator first, const_iterator last, size_type count2, const wchar_t ch) { return replace(first - cbegin(), last - first, count2, ch); } + + String& assign(size_type count, const wchar_t ch); + String& assign(const wchar_t* cstr, size_type count); + inline String& assign(const wchar_t* cstr, bool const_str = true) { String(cstr, const_str).swap(*this); return *this; } + inline String& assign(std::wstring const& str) { String{ str }.swap(*this); return *this; } + inline String& assign(String const& rhs) { String{ rhs }.swap(*this); return *this; } + inline String& assign(String const& rhs, size_type pos, size_type count = npos) { String(rhs, pos, count).swap(*this); return *this; } + + template + inline String& assign(_Iter first, _Iter last) { assign_iter(first, last); return(*this); } + + String& erase(size_type offset = 0, size_type count = npos); + iterator erase(const const_iterator where) { size_type off = where - cbegin(); erase(off, 1); return begin().base() + off; } + iterator erase(const const_iterator first, const const_iterator last) { size_type off = first - cbegin(); erase(first - cbegin(), last - first); return begin().base() + off; } + + String substr(size_type pos = 0, size_type count = npos) const { return String(*this, pos, count); } + + String& insert(size_type index, size_type count, wchar_t ch); + String& insert(size_type index, const wchar_t* s, size_type count); + String& insert(size_type index, const String& str, size_type off, size_type count = npos); + inline String& insert(size_type index, const wchar_t* s) { return insert(index, s, traits::length(s)); } + inline String& insert(size_type index, const String& str) { return insert(index, str, 0, str.size()); } + inline iterator insert(const_iterator pos, size_type count, wchar_t ch) { size_type off = pos - cbegin(); insert(off, count, ch); return begin().base() + off; } + inline iterator insert(const_iterator pos, wchar_t ch) { return insert(pos, 1, ch); } + + inline void push_back(const wchar_t ch) { append(1, ch); } + inline wchar_t pop_back() { if (empty()) throw std::out_of_range("pop_back() called on empty string"); check_operability(); wchar_t ch = str_[--size_]; str_[size_] = value_type(); return ch; } + + size_type copy(wchar_t* cstr, size_type count, size_type pos = 0) const; + + std::string to_string() const; + std::wstring to_wstring() const; + + void swap(String& rhs); + size_t hash() const; + + public: + inline iterator begin() { check_operability(); return iterator(str_); } + inline const_iterator begin() const { return const_iterator(const_str_); } + inline const_iterator cbegin() const { return begin(); } + inline iterator end() { check_operability(); return iterator(str_ + size_); } + inline const_iterator end() const { return const_iterator(const_str_ + size_); } + inline const_iterator cend() const { return end(); } + inline reverse_iterator rbegin() { check_operability(); return reverse_iterator(end()); } + inline const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); } + inline const_reverse_iterator crbegin() const { return rbegin(); } + inline reverse_iterator rend() { check_operability(); return reverse_iterator(begin()); } + inline const_reverse_iterator rend() const { return const_reverse_iterator(begin()); } + inline const_reverse_iterator crend() const { return rend(); } + inline reference front() { if (empty()) throw std::out_of_range("front() called on empty string"); check_operability(); return str_[0]; } + inline const_reference front() const { if (empty()) throw std::out_of_range("front() called on empty string"); return const_str_[0]; } + inline reference back() { if (empty()) throw std::out_of_range("back() called on empty string"); check_operability(); return str_[size_ - 1]; } + inline const_reference back() const { if (empty()) throw std::out_of_range("back() called on empty string"); return const_str_[size_ - 1]; } + + public: + inline wchar_t operator[](size_type off) const { if(off >= size_) throw std::out_of_range("string subscript out of range"); return const_str_[off]; } + inline wchar_t& operator[](size_type off) { if (off >= size_) throw std::out_of_range("string subscript out of range"); check_operability(); return str_[off]; } + + public: + inline const String operator+(const wchar_t ch) const { return String{ *this }.append(1, ch); } + inline const String operator+(const wchar_t* cstr) const { return String{ *this }.append(cstr); } + inline const String operator+(std::wstring const& str) const { return String{ *this }.append(str); } + inline const String operator+(String const& rhs) const { return String{ *this }.append(rhs); } + + inline String& operator+=(const wchar_t ch) { return append(1, ch); } + inline String& operator+=(const wchar_t* cstr) { return append(cstr); } + inline String& operator+=(std::wstring const& str) { return append(str); } + inline String& operator+=(String const& rhs) { return append(rhs); } + + public: + inline String& operator=(const wchar_t* cstr) { if (const_str_ != cstr) String{ cstr }.swap(*this); return *this; } + inline String& operator=(std::wstring const& str) { String{ str }.swap(*this); return *this; } + inline String& operator=(String const& rhs) { if (this != &rhs) String{ rhs }.swap(*this); return *this; } + inline String& operator=(String && rhs) { if (this != &rhs) String{ rhs }.swap(*this); return *this; } + + inline bool operator!=(String const& rhs) { return compare(rhs) != 0; } + inline bool operator!=(const wchar_t* cstr) { return compare(cstr) != 0; } + + public: + static const String::size_type npos = static_cast(-1); + + static inline allocator& get_allocator() + { + static allocator allocator_; + return allocator_; + } + + private: + wchar_t* allocate(size_type count); + void deallocate(wchar_t*& ptr, size_type count); + + void destroy(); + + void discard_const_data(); + void check_operability(); + void check_offset(size_type offset) const { if (offset > size()) throw std::out_of_range("invalid string position"); } + size_type clamp_suffix_size(size_type off, size_type count) const { return std::min(size() - off, count); } + + template + void assign_iter(_Iter first, _Iter last) + { + size_type diff = static_cast(std::distance(first, last)); + if (diff == 0) + return; + + discard_const_data(); + if (diff > capacity_) + { + destroy(); + str_ = allocate(diff + 1); + capacity_ = diff; + } + size_ = diff; + + for (size_type index = 0; first != last; ++first, ++index) + { + traits::assign(str_[index], traits::to_char_type(*first)); + } + traits::assign(str_[size_], value_type()); + } + + private: + union + { + struct + { + value_type* str_; + }; + + struct + { + const value_type* const_str_; + }; + }; + size_type size_; + size_type capacity_; + const bool operable_; + }; + + + // + // operator== for String + // + + inline bool operator==(String const& lhs, String const& rhs) { return lhs.compare(rhs) == 0; } + inline bool operator==(const wchar_t* lhs, String const& rhs) { return rhs.compare(rhs) == 0; } + inline bool operator==(String const& lhs, const wchar_t* rhs) { return lhs.compare(rhs) == 0; } + + // + // operator+ for String + // + + inline String operator+(const wchar_t* lhs, String const& rhs) { return String{ lhs } + rhs; } + + // + // operator<> for String + // + + inline bool operator<(String const& lhs, String const& rhs) { return lhs.compare(rhs) < 0; } + inline bool operator>(String const& lhs, String const& rhs) { return lhs.compare(rhs) > 0; } + inline bool operator<=(String const& lhs, String const& rhs) { return lhs.compare(rhs) <= 0; } + inline bool operator>=(String const& lhs, String const& rhs) { return lhs.compare(rhs) >= 0; } + + // + // operator<<>> for String + // + + std::basic_ostream& operator<<(std::basic_ostream& os, const String & str); + std::basic_istream& operator>>(std::basic_istream& is, String & str); + + // + // to_string functions + // + + String to_wstring(int val); + String to_wstring(unsigned int val); + String to_wstring(long val); + String to_wstring(unsigned long val); + String to_wstring(long long val); + String to_wstring(unsigned long long val); + String to_wstring(float val); + String to_wstring(double val); + String to_wstring(long double val); + + // + // format_wstring + // + + template + inline String format_wstring(const wchar_t* const fmt, _Args&&... args); +} + +namespace easy2d +{ + // + // details of String + // + + namespace __string_details + { + template + size_t TraitsFind( + const typename _Traits::char_type* first, size_t first_size, size_t offset, + const typename _Traits::char_type* second, size_t count) + { + if (count > first_size || offset > first_size - count) + { + return static_cast(-1); + } + + if (count == 0) + { + return offset; + } + + const auto matches_end = first + (first_size - count) + 1; + for (auto iter = first + offset; ; ++iter) + { + iter = typename _Traits::find(iter, static_cast(matches_end - iter), *second); + if (!iter) + { + return static_cast(-1); + } + + if (typename _Traits::compare(iter, second, count) == 0) + { + return static_cast(iter - first); + } + } + } + + template + size_t TraitsFindLastOf( + const typename _Traits::char_type* first, const size_t first_size, const size_t pos, + const typename _Traits::char_type* second, const size_t count) + { + if (count != 0 && first_size != 0) + { + for (auto iter = first + std::min(pos, first_size - 1); ; --iter) + { + if (typename _Traits::find(second, count, *iter)) + { + return static_cast(iter - first); + } + if (iter == first) + { + break; + } + } + } + return static_cast(-1); + } + } + + inline String::String() + : str_(nullptr) + , size_(0) + , capacity_(0) + , operable_(true) + { + } + + inline String::String(const wchar_t * cstr, bool const_str) + : operable_(!const_str) + , size_(0) + , capacity_(0) + , str_(nullptr) + { + if (operable_) + { + assign(cstr, traits::length(cstr)); + } + else + { + const_str_ = cstr; + size_ = traits::length(cstr); + capacity_ = size_; + } + } + + inline String::String(const wchar_t * cstr, size_type count) + : String() + { + assign(cstr, count); + } + + inline String::String(size_type count, wchar_t ch) + : String() + { + assign(count, ch); + } + + inline String::String(const char * cstr) + : String() + { + if (cstr) + { + int len = ::MultiByteToWideChar(CP_ACP, 0, cstr, -1, nullptr, 0); + if (len) + { + wchar_t* temp = allocate(len + 1); + temp[0] = 0; + + if (::MultiByteToWideChar(CP_ACP, 0, cstr, -1, temp, len + 1)) + { + str_ = temp; + capacity_ = size_ = static_cast(len); + } + } + } + } + + inline String::String(std::string const & str) + : String(str.c_str()) + { + } + + inline String::String(std::wstring const & str) + : String(str.c_str(), false) + { + } + + inline String::String(String const & rhs) + : String(rhs.const_str_, !rhs.operable_) + { + } + + inline String::String(String const & rhs, size_type pos, size_type count) + : String() + { + assign(rhs, pos, count); + } + + inline String::String(String && rhs) + : String() + { + swap(rhs); + } + + inline String::~String() + { + destroy(); + } + + inline String & String::assign(size_type count, const wchar_t ch) + { + discard_const_data(); + + if (count != 0) + { + if (count > capacity_) + { + destroy(); + str_ = allocate(count + 1); + capacity_ = count; + } + size_ = count; + + traits::assign(str_, count, ch); + traits::assign(str_[size_], value_type()); + + } + else + { + clear(); + } + return (*this); + } + + inline String & String::assign(const wchar_t * cstr, size_type count) + { + discard_const_data(); + + if (cstr) + { + if (count > capacity_) + { + destroy(); + str_ = allocate(count + 1); + capacity_ = count; + } + size_ = count; + + traits::move(str_, cstr, size_); + traits::assign(str_[size_], value_type()); + } + else + { + clear(); + } + return (*this); + } + + inline String & String::erase(size_type offset, size_type count) + { + if (count == 0) + return (*this); + + check_offset(offset); + check_operability(); + + count = clamp_suffix_size(offset, count); + + if (count == 0) + { + clear(); + return (*this); + } + + size_type new_size = size_ - count; + iterator erase_at = begin().base() + offset; + traits::move(erase_at.base(), erase_at.base() + count, new_size - offset + 1); + return (*this); + } + + inline String & String::insert(size_type index, size_type count, wchar_t ch) + { + if (count == 0) + return (*this); + + if (index >= size()) + return append(count, ch); + + check_operability(); + + wchar_t* const old_ptr = str_; + const size_type old_size = size_; + const size_type old_capacity = capacity_; + const size_type suffix_size = old_size - index + 1; + + size_ = old_size + count; + + if (size_ > old_capacity) + { + capacity_ = size_; + wchar_t* new_ptr = allocate(capacity_ + 1); + + wchar_t* const insert_at = new_ptr + index; + traits::move(new_ptr, old_ptr, index); // (0) - (index) + traits::assign(insert_at, count, ch); // (index) - (index + count) + traits::move(insert_at + count, old_ptr + index, suffix_size); // (index + count) - (old_size - index) + + deallocate(str_, old_capacity); + str_ = new_ptr; + } + else + { + wchar_t* const insert_at = old_ptr + index; + traits::move(insert_at + count, old_ptr + index, suffix_size); + traits::assign(insert_at, count, ch); + } + + return (*this); + } + + inline String & String::insert(size_type index, const wchar_t * cstr, size_type count) + { + if (count == 0) + return (*this); + + if (index >= size()) + return append(cstr, count); + + check_operability(); + + wchar_t* const old_ptr = str_; + const size_type old_size = size_; + const size_type old_capacity = capacity_; + const size_type suffix_size = old_size - index + 1; + + size_ = old_size + count; + + if (size_ > old_capacity) + { + capacity_ = size_; + wchar_t* new_ptr = allocate(capacity_ + 1); + + wchar_t* const insert_at = new_ptr + index; + traits::move(new_ptr, old_ptr, index); // (0) - (index) + traits::move(insert_at, cstr, count); // (index) - (index + count) + traits::move(insert_at + count, old_ptr + index, suffix_size); // (index + count) - (old_size - index) + + deallocate(str_, old_capacity); + str_ = new_ptr; + } + else + { + wchar_t* const insert_at = old_ptr + index; + traits::move(insert_at + count, old_ptr + index, suffix_size); + traits::move(insert_at, cstr, count); + } + + return (*this); + } + + inline String & String::insert(size_type index, const String & str, size_type off, size_type count) + { + if (count == 0 || off > str.size()) + return (*this); + + if (index >= size()) + return append(str, off, count); + + check_operability(); + + count = clamp_suffix_size(off, count); + + wchar_t* const old_ptr = str_; + const size_type old_size = size_; + const size_type old_capacity = capacity_; + const size_type suffix_size = old_size - index + 1; + + size_ = old_size + count; + + if (size_ > old_capacity) + { + capacity_ = size_; + wchar_t* new_ptr = allocate(capacity_ + 1); + + wchar_t* const insert_at = new_ptr + index; + traits::move(new_ptr, old_ptr, index); // (0) - (index) + traits::move(insert_at, str.begin().base() + off, count); // (index) - (index + count) + traits::move(insert_at + count, old_ptr + index, suffix_size); // (index + count) - (old_size - index) + + deallocate(str_, old_capacity); + str_ = new_ptr; + } + else + { + wchar_t* const insert_at = old_ptr + index; + traits::move(insert_at + count, old_ptr + index, suffix_size); + traits::move(insert_at, str.begin().base() + off, count); + } + + return (*this); + } + + inline String & String::append(size_type count, wchar_t ch) + { + check_operability(); + + size_t new_size = size_ + count; + size_t new_cap = new_size + 1; + wchar_t* new_str = allocate(new_cap); + + traits::move(new_str, str_, size_); + traits::assign(new_str + size_, count, ch); + traits::assign(new_str[new_size], value_type()); + + destroy(); + + str_ = new_str; + size_ = new_size; + capacity_ = new_cap; + return (*this); + } + + inline String & String::append(const wchar_t * cstr, size_type count) + { + check_operability(); + + size_t new_size = size_ + count; + size_t new_cap = new_size + 1; + wchar_t* new_str = allocate(new_cap); + + traits::move(new_str, str_, size_); + traits::move(new_str + size_, cstr, count); + traits::assign(new_str[new_size], value_type()); + + destroy(); + + str_ = new_str; + size_ = new_size; + capacity_ = new_cap; + return (*this); + } + + inline String & String::append(String const & other, size_type pos, size_type count) + { + check_operability(); + + if (pos >= other.size()) + return (*this); + + count = other.clamp_suffix_size(pos, count); + + size_t new_size = size_ + count; + size_t new_cap = new_size + 1; + wchar_t* new_str = allocate(new_cap); + + traits::move(new_str, str_, size_); + traits::move(new_str + size_, other.begin().base() + pos, count); + traits::assign(new_str[new_size], value_type()); + + destroy(); + + str_ = new_str; + size_ = new_size; + capacity_ = new_cap; + return (*this); + } + + inline void String::reserve(const size_type new_cap) + { + if (new_cap <= capacity_) + return; + + check_operability(); + + wchar_t* new_str = allocate(new_cap); + traits::move(new_str, str_, capacity_); + + destroy(); + + str_ = new_str; + capacity_ = new_cap; + } + + inline size_t String::hash() const + { + static size_t fnv_prime = 16777619U; + size_t fnv_offset_basis = 2166136261U; + + for (size_t index = 0; index < size_; ++index) + { + fnv_offset_basis ^= static_cast(const_str_[index]); + fnv_offset_basis *= fnv_prime; + } + return fnv_offset_basis; + } + + inline int String::compare(const wchar_t * const str) const + { + size_type count1 = size(); + size_type count2 = traits::length(str); + size_type rlen = std::min(count1, count2); + + int ret = traits::compare(const_str_, str, rlen); + if (ret != 0) + return ret; + + if (count1 < count2) + return -1; + + if (count1 > count2) + return 1; + + return 0; + } + + inline String::size_type String::find(const wchar_t ch, size_type offset) const + { + if (offset >= size_) + return String::npos; + + const_iterator citer = traits::find(cbegin().base() + offset, size_, ch); + return citer ? (citer - cbegin()) : String::npos; + } + + inline String::size_type String::find(const wchar_t * const str, size_type offset, size_type count) const + { + if (offset >= size_) + return String::npos; + return __string_details::TraitsFind(const_str_, size_, offset, str, count); + } + + inline String::size_type String::find_first_of(const wchar_t * const str, size_type offset, size_type count) const + { + if (offset >= size_) + return String::npos; + + const_iterator citer = std::find_first_of(cbegin().base() + offset, cend().base(), str, str + count); + return (citer != cend()) ? (citer - cbegin()) : String::npos; + } + + inline String::size_type String::find_last_of(const wchar_t ch, size_type pos) const + { + if (pos == 0 || pos > size_ || pos == npos) + return npos; + + const_reverse_iterator criter = std::find(crbegin(), crend(), ch); + return (criter != crend()) ? (criter.base() - cbegin()) : String::npos; + } + + inline String::size_type String::find_last_of(const wchar_t * const str, size_type pos, size_type count) const + { + if (pos == 0 || pos > size_ || pos == npos) + return npos; + + return __string_details::TraitsFindLastOf(const_str_, size_, pos, str, count); + } + + inline String & String::replace(size_type pos, size_type count, const wchar_t * cstr, size_type count2) + { + check_offset(pos); + check_operability(); + + count = clamp_suffix_size(pos, count); + if (count == count2) + { + traits::move(str_ + pos, cstr, count2); + return (*this); + } + + wchar_t* new_ptr = nullptr; + wchar_t* const old_ptr = str_; + const size_type old_size = size_; + const size_type old_capacity = capacity_; + const size_type suffix_size = old_size - count - pos + 1; + + if (count < count2 && (old_size + count2 - count) > capacity_) + { + const size_type growth = count2 - count; + size_ = old_size + growth; + capacity_ = size_; + new_ptr = allocate(capacity_ + 1); + + traits::move(new_ptr, old_ptr, pos); + } + else + { + size_ = old_size - (count - count2); + } + + wchar_t* const insert_at = (new_ptr ? new_ptr : old_ptr) + pos; + traits::move(insert_at, cstr, count2); + traits::move(insert_at + count2, old_ptr + count, suffix_size); + + if (new_ptr) + { + deallocate(str_, old_capacity); + str_ = new_ptr; + } + + return (*this); + } + + inline String & String::replace(size_type pos, size_type count, size_type count2, const wchar_t ch) + { + check_offset(pos); + check_operability(); + + count = clamp_suffix_size(pos, count); + if (count == count2) + { + traits::assign(str_ + pos, count2, ch); + return (*this); + } + + wchar_t* new_ptr = nullptr; + wchar_t* const old_ptr = str_; + const size_type old_size = size_; + const size_type old_capacity = capacity_; + const size_type suffix_size = old_size - count - pos + 1; + + if (count < count2 && (old_size + count2 - count) > capacity_) + { + const size_type growth = count2 - count; + size_ = old_size + growth; + capacity_ = size_; + new_ptr = allocate(capacity_ + 1); + + traits::move(new_ptr, old_ptr, pos); + } + else + { + size_ = old_size - (count - count2); + } + + wchar_t* const insert_at = (new_ptr ? new_ptr : old_ptr) + pos; + traits::assign(insert_at, count2, ch); + traits::move(insert_at + count2, old_ptr + count, suffix_size); + + if (new_ptr) + { + deallocate(str_, old_capacity); + str_ = new_ptr; + } + + return (*this); + } + + inline String::size_type String::copy(wchar_t * cstr, size_type count, size_type pos) const + { + if (count == 0 || cstr == const_str_) + return 0; + + check_offset(pos); + + count = clamp_suffix_size(pos, count); + traits::move(cstr, cbegin().base() + pos, count); + return count; + } + + inline std::string String::to_string() const + { + std::string ret; + if (const_str_) + { + int len = ::WideCharToMultiByte(CP_ACP, 0, const_str_, -1, nullptr, 0, nullptr, FALSE); + if (len) + { + char* str_tmp = new char[len + 1]; + str_tmp[0] = 0; + + len = ::WideCharToMultiByte(CP_ACP, 0, const_str_, -1, str_tmp, len + 1, nullptr, FALSE); + + ret = str_tmp; + delete[] str_tmp; + } + } + return ret; + } + + inline std::wstring String::to_wstring() const + { + return std::wstring(const_str_); + } + + inline wchar_t * String::allocate(size_type count) + { + return get_allocator().allocate(count); + } + + inline void String::deallocate(wchar_t*& ptr, size_type count) + { + get_allocator().deallocate(ptr, count); + ptr = nullptr; + } + + inline void String::destroy() + { + if (operable_ && str_) + { + deallocate(str_, capacity_); + } + else + { + const_str_ = nullptr; + } + size_ = capacity_ = 0; + } + + inline void String::swap(String & rhs) + { + std::swap(const_str_, rhs.const_str_); + std::swap(size_, rhs.size_); + std::swap(capacity_, rhs.capacity_); + + // swap const datas + std::swap(*const_cast(&operable_), *const_cast(&rhs.operable_)); + } + + inline void String::discard_const_data() + { + if (!operable_) + { + // force to enable operability + *const_cast(&operable_) = true; + const_str_ = nullptr; + capacity_ = size_ = 0; + } + } + + inline void String::check_operability() + { + if (!operable_) + { + // create a new string, then swap it with self + String(const_str_, false).swap(*this); + } + } + + // + // details of operator<<>> + // + + inline std::basic_ostream& + operator<<(std::basic_ostream& os, const String & str) + { + return os << str.c_str(); + } + + inline std::basic_istream& + operator>>(std::basic_istream& is, String & str) + { + using Ctype = std::ctype; + using IStream = std::basic_istream; + using SizeType = String::size_type; + + std::ios_base::iostate state = std::ios_base::goodbit; + bool changed = false; + + if (IStream::sentry(is)) + { + const Ctype& ctype_fac = std::use_facet(is.getloc()); + str.erase(); + try + { + SizeType size = (0 < is.width() && static_cast(is.width()) < str.max_size()) ? static_cast(is.width()) : str.max_size(); + String::traits::int_type meta = is.rdbuf()->sgetc(); + + for (; 0 < size; --size, meta = is.rdbuf()->snextc()) + { + if (String::traits::eq_int_type(String::traits::eof(), meta)) + { + state |= std::ios_base::eofbit; + break; + } + else if (ctype_fac.is(Ctype::space, String::traits::to_char_type(meta))) + { + break; + } + else + { + str.push_back(String::traits::to_char_type(meta)); + changed = true; + } + } + } + catch (...) + { + is.setstate(std::ios_base::badbit, true); + } + } + + is.width(0); + if (!changed) + state |= std::ios_base::failbit; + is.setstate(state); + return is; + } + + // + // details of to_string functions + // + + namespace __to_string_detail + { + template + inline String FloatingToString(const wchar_t *fmt, _Ty val); + + template + inline String IntegralToString(const _Ty val); + } + + inline String to_wstring(int val) + { + return (__to_string_detail::IntegralToString(val)); + } + + inline String to_wstring(unsigned int val) + { + return (__to_string_detail::IntegralToString(val)); + } + + inline String to_wstring(long val) + { + return (__to_string_detail::IntegralToString(val)); + } + + inline String to_wstring(unsigned long val) + { + return (__to_string_detail::IntegralToString(val)); + } + + inline String to_wstring(long long val) + { + return (__to_string_detail::IntegralToString(val)); + } + + inline String to_wstring(unsigned long long val) + { + return (__to_string_detail::IntegralToString(val)); + } + + inline String to_wstring(float val) + { + return (__to_string_detail::FloatingToString(L"%f", val)); + } + + inline String to_wstring(double val) + { + return (__to_string_detail::FloatingToString(L"%f", val)); + } + + inline String to_wstring(long double val) + { + return (__to_string_detail::FloatingToString(L"%Lf", val)); + } + + template + inline String format_wstring(const wchar_t* const fmt, _Args&&... args) + { + const auto len = static_cast(::_scwprintf(fmt, std::forward<_Args&&>(args)...)); + if (len) + { + String str(len, L'\0'); + ::swprintf_s(&str[0], len + 1, fmt, std::forward<_Args&&>(args)...); + return str; + } + return String{}; + } + + namespace __to_string_detail + { + template + inline String FloatingToString(const wchar_t *fmt, _Ty val) + { + static_assert(std::is_floating_point<_Ty>::value, "_Ty must be floating point"); + + return format_wstring(fmt, val); + } + + template + inline String IntegralToString(const _Ty val) + { + static_assert(std::is_integral<_Ty>::value, "_Ty must be integral"); + + using _UTy = std::make_unsigned_t<_Ty>; + using _Elem = String::traits::char_type; + + _Elem buffer[21]; + _Elem* const buffer_end = std::end(buffer); + _Elem* next = buffer_end; + auto uval = static_cast<_UTy>(val); + + if (val < 0) + uval = 0 - uval; + + do + { + *--next = static_cast<_Elem>('0' + uval % 10); + uval /= 10; + } while (uval != 0); + + if (val < 0) + *--next = static_cast<_Elem>('-'); + + return String(next, buffer_end); + } + } +} + +namespace std +{ + template<> + struct hash<::easy2d::String> + { + size_t operator()(const easy2d::String& key) const + { + return key.hash(); + } + }; + + template<> + void swap<::easy2d::String>(::easy2d::String& lhs, ::easy2d::String& rhs) + { + lhs.swap(rhs); + } +} diff --git a/src/easy2d/common/closure.hpp b/easy2d/common/closure.hpp similarity index 100% rename from src/easy2d/common/closure.hpp rename to easy2d/common/closure.hpp diff --git a/src/easy2d/core/include-forwards.h b/easy2d/common/helper.h similarity index 57% rename from src/easy2d/core/include-forwards.h rename to easy2d/common/helper.h index 3f3ee450..853f62b1 100644 --- a/src/easy2d/core/include-forwards.h +++ b/easy2d/common/helper.h @@ -19,62 +19,33 @@ // THE SOFTWARE. #pragma once -#include "helper.h" -#include "Color.h" -#include "Object.h" -#include "../common/ComPtr.hpp" -#include "../common/Closure.hpp" -#include "../math/vector.hpp" -#include "../math/Rect.hpp" -#include "../math/Matrix.hpp" +#include "Array.h" +#include "String.h" +#include +#include +#include +#include +#include namespace easy2d { - using namespace math; + using StringStream = std::wstringstream; - // ʽ - enum class StrokeStyle : int - { - Miter = 0, /* б */ - Bevel = 1, /* б */ - Round = 2 /* Բ */ - }; + template + using Pair = std::pair<_Ty1, _Ty2>; - // - enum class Direction : int - { - Up, /* */ - Down, /* */ - Left, /* */ - Right /* */ - }; + template + using List = std::list<_Ty, _Args...>; - // ָ - enum class MouseCursor : int - { - Arrow, /* ָ */ - TextInput, /* ı */ - Hand, /* ָ */ - SizeAll, - SizeNESW, - SizeNS, - SizeNWSE, - SizeWE, - }; + template + using Set = std::set<_Ty, _Args...>; - // ֿ - enum class TextAntialias - { - Default, // ϵͳĬ - ClearType, // ClearType - GrayScale, // Ҷȿ - None // ÿ - }; + template + using UnorderedSet = std::unordered_set<_Ty, _Args...>; - // ͼ - struct LayerProperties - { - Rect area; - float opacity; - }; + template + using Map = std::map<_Kty, _Ty, _Args...>; + + template + using UnorderedMap = std::unordered_map<_Kty, _Ty, _Args...>; } diff --git a/src/easy2d/common/noncopyable.hpp b/easy2d/common/noncopyable.hpp similarity index 100% rename from src/easy2d/common/noncopyable.hpp rename to easy2d/common/noncopyable.hpp diff --git a/src/easy2d/config.h b/easy2d/config.h similarity index 92% rename from src/easy2d/config.h rename to easy2d/config.h index b31fb588..69c23483 100644 --- a/src/easy2d/config.h +++ b/easy2d/config.h @@ -8,9 +8,6 @@ //#define E2D_ASSERT(EXPR) MyAssert(EXPR) //#define E2D_ASSERT(EXPR) __noop // Disable asserts -//---- Don't implement log functions -//#define E2D_DISABLE_LOG_FUNCTIONS - //---- Define debug-output handler. Defaults to calling easy2d::logs::Messageln()/Warningln()/Errorln() //#define E2D_LOG(FORMAT, ...) wprintf(FORMAT L"\n", __VA_ARGS__) //#define E2D_WARNING_LOG(FORMAT, ...) wprintf(FORMAT L"\n", __VA_ARGS__) diff --git a/src/easy2d/easy2d.h b/easy2d/easy2d.h similarity index 55% rename from src/easy2d/easy2d.h rename to easy2d/easy2d.h index cd2f2990..9366388b 100644 --- a/src/easy2d/easy2d.h +++ b/easy2d/easy2d.h @@ -29,50 +29,18 @@ // -// core +// common // -#include "core/modules.h" -#include "core/render.h" -#include "core/window.h" -#include "core/input.h" -#include "core/time.h" -#include "core/logs.h" - -#include "core/Font.hpp" -#include "core/Color.h" -#include "core/Resource.h" -#include "core/Transform.hpp" -#include "core/TextStyle.hpp" - -#include "core/Object.h" -#include "core/Image.h" -#include "core/Frames.h" -#include "core/Geometry.h" -#include "core/Task.h" -#include "core/TaskManager.h" -#include "core/Action.h" -#include "core/ActionGroup.h" -#include "core/ActionTween.h" -#include "core/ActionHelper.h" -#include "core/Animation.h" -#include "core/ActionManager.h" -#include "core/Transition.h" - -#include "core/Event.hpp" -#include "core/EventListener.h" -#include "core/EventDispatcher.h" - -#include "core/Node.h" -#include "core/Scene.h" -#include "core/Layer.h" -#include "core/Sprite.h" -#include "core/Text.h" -#include "core/Canvas.h" -#include "core/GeometryNode.h" -#include "core/DebugNode.h" - -#include "core/Application.h" +#include "common/Array.h" +#include "common/String.h" +#include "common/closure.hpp" +#include "common/IntrusiveList.hpp" +#include "common/IntrusivePtr.hpp" +#include "common/ComPtr.hpp" +#include "common/noncopyable.hpp" +#include "common/Singleton.hpp" +#include "common/helper.h" // @@ -82,11 +50,57 @@ #include "math/constants.hpp" #include "math/scalar.hpp" #include "math/ease.hpp" -#include "math/vector.hpp" +#include "math/Vec2.hpp" #include "math/rand.h" #include "math/Matrix.hpp" +// +// base +// + +#include "base/window.h" +#include "base/input.h" +#include "base/time.h" +#include "base/logs.h" +#include "renderer/render.h" +#include "platform/modules.h" +#include "platform/Application.h" + +#include "base/Event.hpp" +#include "base/EventListener.h" +#include "base/EventDispatcher.h" +#include "base/Task.h" +#include "base/TaskManager.h" + +#include "2d/Font.hpp" +#include "2d/Color.h" +#include "2d/Transform.hpp" +#include "2d/TextStyle.hpp" +#include "base/Resource.h" + +#include "base/Object.h" +#include "2d/Image.h" +#include "2d/Frames.h" +#include "2d/Geometry.h" +#include "2d/Action.h" +#include "2d/ActionGroup.h" +#include "2d/ActionTween.h" +#include "2d/ActionHelper.h" +#include "2d/Animation.h" +#include "2d/ActionManager.h" +#include "2d/Transition.h" + +#include "2d/Node.h" +#include "2d/Scene.h" +#include "2d/Layer.h" +#include "2d/Sprite.h" +#include "2d/Text.h" +#include "2d/Canvas.h" +#include "2d/GeometryNode.h" +#include "2d/DebugNode.h" + + // // utils // diff --git a/easy2d/libs/nlohmann-json/LICENSE.MIT b/easy2d/libs/nlohmann-json/LICENSE.MIT new file mode 100644 index 00000000..8b0f7002 --- /dev/null +++ b/easy2d/libs/nlohmann-json/LICENSE.MIT @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2013-2018 Niels Lohmann + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/easy2d/libs/nlohmann-json/README.md b/easy2d/libs/nlohmann-json/README.md new file mode 100644 index 00000000..8acb2842 --- /dev/null +++ b/easy2d/libs/nlohmann-json/README.md @@ -0,0 +1,1298 @@ +[![JSON for Modern C++](https://raw.githubusercontent.com/nlohmann/json/master/doc/json.gif)](https://github.com/nlohmann/json/releases) + +[![Build Status](https://travis-ci.org/nlohmann/json.svg?branch=master)](https://travis-ci.org/nlohmann/json) +[![Build Status](https://ci.appveyor.com/api/projects/status/1acb366xfyg3qybk/branch/develop?svg=true)](https://ci.appveyor.com/project/nlohmann/json) +[![Coverage Status](https://img.shields.io/coveralls/nlohmann/json.svg)](https://coveralls.io/r/nlohmann/json) +[![Coverity Scan Build Status](https://scan.coverity.com/projects/5550/badge.svg)](https://scan.coverity.com/projects/nlohmann-json) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f3732b3327e34358a0e9d1fe9f661f08)](https://www.codacy.com/app/nlohmann/json?utm_source=github.com&utm_medium=referral&utm_content=nlohmann/json&utm_campaign=Badge_Grade) +[![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/nlohmann/json.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nlohmann/json/context:cpp) +[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/TarF5pPn9NtHQjhf) +[![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](http://nlohmann.github.io/json) +[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT) +[![GitHub Releases](https://img.shields.io/github/release/nlohmann/json.svg)](https://github.com/nlohmann/json/releases) +[![GitHub Issues](https://img.shields.io/github/issues/nlohmann/json.svg)](http://github.com/nlohmann/json/issues) +[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/nlohmann/json.svg)](http://isitmaintained.com/project/nlohmann/json "Average time to resolve an issue") +[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/289/badge)](https://bestpractices.coreinfrastructure.org/projects/289) + +- [Design goals](#design-goals) +- [Integration](#integration) + - [CMake](#cmake) + - [Package Managers](#package-managers) +- [Examples](#examples) + - [JSON as first-class data type](#json-as-first-class-data-type) + - [Serialization / Deserialization](#serialization--deserialization) + - [STL-like access](#stl-like-access) + - [Conversion from STL containers](#conversion-from-stl-containers) + - [JSON Pointer and JSON Patch](#json-pointer-and-json-patch) + - [JSON Merge Patch](#json-merge-patch) + - [Implicit conversions](#implicit-conversions) + - [Conversions to/from arbitrary types](#arbitrary-types-conversions) + - [Specializing enum conversion](#specializing-enum-conversion) + - [Binary formats (BSON, CBOR, MessagePack, and UBJSON)](#binary-formats-bson-cbor-messagepack-and-ubjson) +- [Supported compilers](#supported-compilers) +- [License](#license) +- [Contact](#contact) +- [Thanks](#thanks) +- [Used third-party tools](#used-third-party-tools) +- [Projects using JSON for Modern C++](#projects-using-json-for-modern-c) +- [Notes](#notes) +- [Execute unit tests](#execute-unit-tests) + +## Design goals + +There are myriads of [JSON](http://json.org) libraries out there, and each may even have its reason to exist. Our class had these design goals: + +- **Intuitive syntax**. In languages such as Python, JSON feels like a first class data type. We used all the operator magic of modern C++ to achieve the same feeling in your code. Check out the [examples below](#examples) and you'll know what I mean. + +- **Trivial integration**. Our whole code consists of a single header file [`json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp). That's it. No library, no subproject, no dependencies, no complex build system. The class is written in vanilla C++11. All in all, everything should require no adjustment of your compiler flags or project settings. + +- **Serious testing**. Our class is heavily [unit-tested](https://github.com/nlohmann/json/tree/develop/test/src) and covers [100%](https://coveralls.io/r/nlohmann/json) of the code, including all exceptional behavior. Furthermore, we checked with [Valgrind](http://valgrind.org) and the [Clang Sanitizers](https://clang.llvm.org/docs/index.html) that there are no memory leaks. [Google OSS-Fuzz](https://github.com/google/oss-fuzz/tree/master/projects/json) additionally runs fuzz tests against all parsers 24/7, effectively executing billions of tests so far. To maintain high quality, the project is following the [Core Infrastructure Initiative (CII) best practices](https://bestpractices.coreinfrastructure.org/projects/289). + +Other aspects were not so important to us: + +- **Memory efficiency**. Each JSON object has an overhead of one pointer (the maximal size of a union) and one enumeration element (1 byte). The default generalization uses the following C++ data types: `std::string` for strings, `int64_t`, `uint64_t` or `double` for numbers, `std::map` for objects, `std::vector` for arrays, and `bool` for Booleans. However, you can template the generalized class `basic_json` to your needs. + +- **Speed**. There are certainly [faster JSON libraries](https://github.com/miloyip/nativejson-benchmark#parsing-time) out there. However, if your goal is to speed up your development by adding JSON support with a single header, then this library is the way to go. If you know how to use a `std::vector` or `std::map`, you are already set. + +See the [contribution guidelines](https://github.com/nlohmann/json/blob/master/.github/CONTRIBUTING.md#please-dont) for more information. + + +## Integration + +[`json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp) is the single required file in `single_include/nlohmann` or [released here](https://github.com/nlohmann/json/releases). You need to add + +```cpp +#include + +// for convenience +using json = nlohmann::json; +``` + +to the files you want to process JSON and set the necessary switches to enable C++11 (e.g., `-std=c++11` for GCC and Clang). + +You can further use file [`include/nlohmann/json_fwd.hpp`](https://github.com/nlohmann/json/blob/develop/include/nlohmann/json_fwd.hpp) for forward-declarations. The installation of json_fwd.hpp (as part of cmake's install step), can be achieved by setting `-DJSON_MultipleHeaders=ON`. + +### CMake + +You can also use the `nlohmann_json::nlohmann_json` interface target in CMake. This target populates the appropriate usage requirements for `INTERFACE_INCLUDE_DIRECTORIES` to point to the appropriate include directories and `INTERFACE_COMPILE_FEATURES` for the necessary C++11 flags. + +#### External + +To use this library from a CMake project, you can locate it directly with `find_package()` and use the namespaced imported target from the generated package configuration: + +```cmake +# CMakeLists.txt +find_package(nlohmann_json 3.2.0 REQUIRED) +... +add_library(foo ...) +... +target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json) +``` + +The package configuration file, `nlohmann_jsonConfig.cmake`, can be used either from an install tree or directly out of the build tree. + +#### Embedded + +To embed the library directly into an existing CMake project, place the entire source tree in a subdirectory and call `add_subdirectory()` in your `CMakeLists.txt` file: + +```cmake +# Typically you don't care so much for a third party library's tests to be +# run from your own project's code. +set(JSON_BuildTests OFF CACHE INTERNAL "") + +# If you only include this third party in PRIVATE source files, you do not +# need to install it when your main project gets installed. +# set(JSON_Install OFF CACHE INTERNAL "") + +# Don't use include(nlohmann_json/CMakeLists.txt) since that carries with it +# unintended consequences that will break the build. It's generally +# discouraged (although not necessarily well documented as such) to use +# include(...) for pulling in other CMake projects anyways. +add_subdirectory(nlohmann_json) +... +add_library(foo ...) +... +target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json) +``` + +#### Supporting Both + +To allow your project to support either an externally supplied or an embedded JSON library, you can use a pattern akin to the following: + +``` cmake +# Top level CMakeLists.txt +project(FOO) +... +option(FOO_USE_EXTERNAL_JSON "Use an external JSON library" OFF) +... +add_subdirectory(thirdparty) +... +add_library(foo ...) +... +# Note that the namespaced target will always be available regardless of the +# import method +target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json) +``` +```cmake +# thirdparty/CMakeLists.txt +... +if(FOO_USE_EXTERNAL_JSON) + find_package(nlohmann_json 3.2.0 REQUIRED) +else() + set(JSON_BuildTests OFF CACHE INTERNAL "") + add_subdirectory(nlohmann_json) +endif() +... +``` + +`thirdparty/nlohmann_json` is then a complete copy of this source tree. + +### Package Managers + +:beer: If you are using OS X and [Homebrew](http://brew.sh), just type `brew tap nlohmann/json` and `brew install nlohmann_json` and you're set. If you want the bleeding edge rather than the latest release, use `brew install nlohmann_json --HEAD`. + +If you are using the [Meson Build System](http://mesonbuild.com), then you can get a wrap file by downloading it from [Meson WrapDB](https://wrapdb.mesonbuild.com/nlohmann_json), or simply use `meson wrap install nlohmann_json`. + +If you are using [Conan](https://www.conan.io/) to manage your dependencies, merely add `jsonformoderncpp/x.y.z@vthiery/stable` to your `conanfile.py`'s requires, where `x.y.z` is the release version you want to use. Please file issues [here](https://github.com/vthiery/conan-jsonformoderncpp/issues) if you experience problems with the packages. + +If you are using [Spack](https://www.spack.io/) to manage your dependencies, you can use the `nlohmann_json` package. Please see the [spack project](https://github.com/spack/spack) for any issues regarding the packaging. + +If you are using [hunter](https://github.com/ruslo/hunter/) on your project for external dependencies, then you can use the [nlohmann_json package](https://docs.hunter.sh/en/latest/packages/pkg/nlohmann_json.html). Please see the hunter project for any issues regarding the packaging. + +If you are using [Buckaroo](https://buckaroo.pm), you can install this library's module with `buckaroo add github.com/buckaroo-pm/nlohmann-json`. Please file issues [here](https://github.com/buckaroo-pm/nlohmann-json). There is a demo repo [here](https://github.com/njlr/buckaroo-nholmann-json-example). + +If you are using [vcpkg](https://github.com/Microsoft/vcpkg/) on your project for external dependencies, then you can use the [nlohmann-json package](https://github.com/Microsoft/vcpkg/tree/master/ports/nlohmann-json). Please see the vcpkg project for any issues regarding the packaging. + +If you are using [cget](http://cget.readthedocs.io/en/latest/), you can install the latest development version with `cget install nlohmann/json`. A specific version can be installed with `cget install nlohmann/json@v3.1.0`. Also, the multiple header version can be installed by adding the `-DJSON_MultipleHeaders=ON` flag (i.e., `cget install nlohmann/json -DJSON_MultipleHeaders=ON`). + +If you are using [CocoaPods](https://cocoapods.org), you can use the library by adding pod `"nlohmann_json", '~>3.1.2'` to your podfile (see [an example](https://bitbucket.org/benman/nlohmann_json-cocoapod/src/master/)). Please file issues [here](https://bitbucket.org/benman/nlohmann_json-cocoapod/issues?status=new&status=open). + +If you are using [NuGet](https://www.nuget.org), you can use the package [nlohmann.json](https://www.nuget.org/packages/nlohmann.json/). Please check [this extensive description](https://github.com/nlohmann/json/issues/1132#issuecomment-452250255) on how to use the package. Please files issues [here](https://github.com/hnkb/nlohmann-json-nuget/issues). + +If you are using [conda](https://conda.io/), you can use the package [nlohmann_json](https://github.com/conda-forge/nlohmann_json-feedstock) from [conda-forge](https://conda-forge.org) executing `conda install -c conda-forge nlohmann_json`. Please file issues [here](https://github.com/conda-forge/nlohmann_json-feedstock/issues). + +## Examples + +Beside the examples below, you may want to check the [documentation](https://nlohmann.github.io/json/) where each function contains a separate code example (e.g., check out [`emplace()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a5338e282d1d02bed389d852dd670d98d.html#a5338e282d1d02bed389d852dd670d98d)). All [example files](https://github.com/nlohmann/json/tree/develop/doc/examples) can be compiled and executed on their own (e.g., file [emplace.cpp](https://github.com/nlohmann/json/blob/develop/doc/examples/emplace.cpp)). + +### JSON as first-class data type + +Here are some examples to give you an idea how to use the class. + +Assume you want to create the JSON object + +```json +{ + "pi": 3.141, + "happy": true, + "name": "Niels", + "nothing": null, + "answer": { + "everything": 42 + }, + "list": [1, 0, 2], + "object": { + "currency": "USD", + "value": 42.99 + } +} +``` + +With this library, you could write: + +```cpp +// create an empty structure (null) +json j; + +// add a number that is stored as double (note the implicit conversion of j to an object) +j["pi"] = 3.141; + +// add a Boolean that is stored as bool +j["happy"] = true; + +// add a string that is stored as std::string +j["name"] = "Niels"; + +// add another null object by passing nullptr +j["nothing"] = nullptr; + +// add an object inside the object +j["answer"]["everything"] = 42; + +// add an array that is stored as std::vector (using an initializer list) +j["list"] = { 1, 0, 2 }; + +// add another object (using an initializer list of pairs) +j["object"] = { {"currency", "USD"}, {"value", 42.99} }; + +// instead, you could also write (which looks very similar to the JSON above) +json j2 = { + {"pi", 3.141}, + {"happy", true}, + {"name", "Niels"}, + {"nothing", nullptr}, + {"answer", { + {"everything", 42} + }}, + {"list", {1, 0, 2}}, + {"object", { + {"currency", "USD"}, + {"value", 42.99} + }} +}; +``` + +Note that in all these cases, you never need to "tell" the compiler which JSON value type you want to use. If you want to be explicit or express some edge cases, the functions [`json::array`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_aa80485befaffcadaa39965494e0b4d2e.html#aa80485befaffcadaa39965494e0b4d2e) and [`json::object`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_aa13f7c0615867542ce80337cbcf13ada.html#aa13f7c0615867542ce80337cbcf13ada) will help: + +```cpp +// a way to express the empty array [] +json empty_array_explicit = json::array(); + +// ways to express the empty object {} +json empty_object_implicit = json({}); +json empty_object_explicit = json::object(); + +// a way to express an _array_ of key/value pairs [["currency", "USD"], ["value", 42.99]] +json array_not_object = json::array({ {"currency", "USD"}, {"value", 42.99} }); +``` + +### Serialization / Deserialization + +#### To/from strings + +You can create a JSON value (deserialization) by appending `_json` to a string literal: + +```cpp +// create object from string literal +json j = "{ \"happy\": true, \"pi\": 3.141 }"_json; + +// or even nicer with a raw string literal +auto j2 = R"( + { + "happy": true, + "pi": 3.141 + } +)"_json; +``` + +Note that without appending the `_json` suffix, the passed string literal is not parsed, but just used as JSON string value. That is, `json j = "{ \"happy\": true, \"pi\": 3.141 }"` would just store the string `"{ "happy": true, "pi": 3.141 }"` rather than parsing the actual object. + +The above example can also be expressed explicitly using [`json::parse()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a5a0339361f3282cb8fd2f9ede6e17d72.html#a5a0339361f3282cb8fd2f9ede6e17d72): + +```cpp +// parse explicitly +auto j3 = json::parse("{ \"happy\": true, \"pi\": 3.141 }"); +``` + +You can also get a string representation of a JSON value (serialize): + +```cpp +// explicit conversion to string +std::string s = j.dump(); // {\"happy\":true,\"pi\":3.141} + +// serialization with pretty printing +// pass in the amount of spaces to indent +std::cout << j.dump(4) << std::endl; +// { +// "happy": true, +// "pi": 3.141 +// } +``` + +Note the difference between serialization and assignment: + +```cpp +// store a string in a JSON value +json j_string = "this is a string"; + +// retrieve the string value +auto cpp_string = j_string.get(); +// retrieve the string value (alternative when an variable already exists) +std::string cpp_string2; +j_string.get_to(cpp_string2); + +// retrieve the serialized value (explicit JSON serialization) +std::string serialized_string = j_string.dump(); + +// output of original string +std::cout << cpp_string << " == " << cpp_string2 << " == " << j_string.get() << '\n'; +// output of serialized value +std::cout << j_string << " == " << serialized_string << std::endl; +``` + +[`.dump()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a50ec80b02d0f3f51130d4abb5d1cfdc5.html#a50ec80b02d0f3f51130d4abb5d1cfdc5) always returns the serialized value, and [`.get()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a16f9445f7629f634221a42b967cdcd43.html#a16f9445f7629f634221a42b967cdcd43) returns the originally stored string value. + +Note the library only supports UTF-8. When you store strings with different encodings in the library, calling [`dump()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a50ec80b02d0f3f51130d4abb5d1cfdc5.html#a50ec80b02d0f3f51130d4abb5d1cfdc5) may throw an exception unless `json::error_handler_t::replace` or `json::error_handler_t::ignore` are used as error handlers. + +#### To/from streams (e.g. files, string streams) + +You can also use streams to serialize and deserialize: + +```cpp +// deserialize from standard input +json j; +std::cin >> j; + +// serialize to standard output +std::cout << j; + +// the setw manipulator was overloaded to set the indentation for pretty printing +std::cout << std::setw(4) << j << std::endl; +``` + +These operators work for any subclasses of `std::istream` or `std::ostream`. Here is the same example with files: + +```cpp +// read a JSON file +std::ifstream i("file.json"); +json j; +i >> j; + +// write prettified JSON to another file +std::ofstream o("pretty.json"); +o << std::setw(4) << j << std::endl; +``` + +Please note that setting the exception bit for `failbit` is inappropriate for this use case. It will result in program termination due to the `noexcept` specifier in use. + +#### Read from iterator range + +You can also parse JSON from an iterator range; that is, from any container accessible by iterators whose content is stored as contiguous byte sequence, for instance a `std::vector`: + +```cpp +std::vector v = {'t', 'r', 'u', 'e'}; +json j = json::parse(v.begin(), v.end()); +``` + +You may leave the iterators for the range [begin, end): + +```cpp +std::vector v = {'t', 'r', 'u', 'e'}; +json j = json::parse(v); +``` + +#### SAX interface + +The library uses a SAX-like interface with the following functions: + +```cpp +// called when null is parsed +bool null(); + +// called when a boolean is parsed; value is passed +bool boolean(bool val); + +// called when a signed or unsigned integer number is parsed; value is passed +bool number_integer(number_integer_t val); +bool number_unsigned(number_unsigned_t val); + +// called when a floating-point number is parsed; value and original string is passed +bool number_float(number_float_t val, const string_t& s); + +// called when a string is parsed; value is passed and can be safely moved away +bool string(string_t& val); + +// called when an object or array begins or ends, resp. The number of elements is passed (or -1 if not known) +bool start_object(std::size_t elements); +bool end_object(); +bool start_array(std::size_t elements); +bool end_array(); +// called when an object key is parsed; value is passed and can be safely moved away +bool key(string_t& val); + +// called when a parse error occurs; byte position, the last token, and an exception is passed +bool parse_error(std::size_t position, const std::string& last_token, const detail::exception& ex); +``` + +The return value of each function determines whether parsing should proceed. + +To implement your own SAX handler, proceed as follows: + +1. Implement the SAX interface in a class. You can use class `nlohmann::json_sax` as base class, but you can also use any class where the functions described above are implemented and public. +2. Create an object of your SAX interface class, e.g. `my_sax`. +3. Call `bool json::sax_parse(input, &my_sax)`; where the first parameter can be any input like a string or an input stream and the second parameter is a pointer to your SAX interface. + +Note the `sax_parse` function only returns a `bool` indicating the result of the last executed SAX event. It does not return a `json` value - it is up to you to decide what to do with the SAX events. Furthermore, no exceptions are thrown in case of a parse error - it is up to you what to do with the exception object passed to your `parse_error` implementation. Internally, the SAX interface is used for the DOM parser (class `json_sax_dom_parser`) as well as the acceptor (`json_sax_acceptor`), see file [`json_sax.hpp`](https://github.com/nlohmann/json/blob/develop/include/nlohmann/detail/input/json_sax.hpp). + +### STL-like access + +We designed the JSON class to behave just like an STL container. In fact, it satisfies the [**ReversibleContainer**](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer) requirement. + +```cpp +// create an array using push_back +json j; +j.push_back("foo"); +j.push_back(1); +j.push_back(true); + +// also use emplace_back +j.emplace_back(1.78); + +// iterate the array +for (json::iterator it = j.begin(); it != j.end(); ++it) { + std::cout << *it << '\n'; +} + +// range-based for +for (auto& element : j) { + std::cout << element << '\n'; +} + +// getter/setter +const auto tmp = j[0].get(); +j[1] = 42; +bool foo = j.at(2); + +// comparison +j == "[\"foo\", 1, true]"_json; // true + +// other stuff +j.size(); // 3 entries +j.empty(); // false +j.type(); // json::value_t::array +j.clear(); // the array is empty again + +// convenience type checkers +j.is_null(); +j.is_boolean(); +j.is_number(); +j.is_object(); +j.is_array(); +j.is_string(); + +// create an object +json o; +o["foo"] = 23; +o["bar"] = false; +o["baz"] = 3.141; + +// also use emplace +o.emplace("weather", "sunny"); + +// special iterator member functions for objects +for (json::iterator it = o.begin(); it != o.end(); ++it) { + std::cout << it.key() << " : " << it.value() << "\n"; +} + +// the same code as range for +for (auto& el : o.items()) { + std::cout << el.key() << " : " << el.value() << "\n"; +} + +// even easier with structured bindings (C++17) +for (auto& [key, value] : o.items()) { + std::cout << key << " : " << value << "\n"; +} + +// find an entry +if (o.find("foo") != o.end()) { + // there is an entry with key "foo" +} + +// or simpler using count() +int foo_present = o.count("foo"); // 1 +int fob_present = o.count("fob"); // 0 + +// delete an entry +o.erase("foo"); +``` + + +### Conversion from STL containers + +Any sequence container (`std::array`, `std::vector`, `std::deque`, `std::forward_list`, `std::list`) whose values can be used to construct JSON values (e.g., integers, floating point numbers, Booleans, string types, or again STL containers described in this section) can be used to create a JSON array. The same holds for similar associative containers (`std::set`, `std::multiset`, `std::unordered_set`, `std::unordered_multiset`), but in these cases the order of the elements of the array depends on how the elements are ordered in the respective STL container. + +```cpp +std::vector c_vector {1, 2, 3, 4}; +json j_vec(c_vector); +// [1, 2, 3, 4] + +std::deque c_deque {1.2, 2.3, 3.4, 5.6}; +json j_deque(c_deque); +// [1.2, 2.3, 3.4, 5.6] + +std::list c_list {true, true, false, true}; +json j_list(c_list); +// [true, true, false, true] + +std::forward_list c_flist {12345678909876, 23456789098765, 34567890987654, 45678909876543}; +json j_flist(c_flist); +// [12345678909876, 23456789098765, 34567890987654, 45678909876543] + +std::array c_array {{1, 2, 3, 4}}; +json j_array(c_array); +// [1, 2, 3, 4] + +std::set c_set {"one", "two", "three", "four", "one"}; +json j_set(c_set); // only one entry for "one" is used +// ["four", "one", "three", "two"] + +std::unordered_set c_uset {"one", "two", "three", "four", "one"}; +json j_uset(c_uset); // only one entry for "one" is used +// maybe ["two", "three", "four", "one"] + +std::multiset c_mset {"one", "two", "one", "four"}; +json j_mset(c_mset); // both entries for "one" are used +// maybe ["one", "two", "one", "four"] + +std::unordered_multiset c_umset {"one", "two", "one", "four"}; +json j_umset(c_umset); // both entries for "one" are used +// maybe ["one", "two", "one", "four"] +``` + +Likewise, any associative key-value containers (`std::map`, `std::multimap`, `std::unordered_map`, `std::unordered_multimap`) whose keys can construct an `std::string` and whose values can be used to construct JSON values (see examples above) can be used to create a JSON object. Note that in case of multimaps only one key is used in the JSON object and the value depends on the internal order of the STL container. + +```cpp +std::map c_map { {"one", 1}, {"two", 2}, {"three", 3} }; +json j_map(c_map); +// {"one": 1, "three": 3, "two": 2 } + +std::unordered_map c_umap { {"one", 1.2}, {"two", 2.3}, {"three", 3.4} }; +json j_umap(c_umap); +// {"one": 1.2, "two": 2.3, "three": 3.4} + +std::multimap c_mmap { {"one", true}, {"two", true}, {"three", false}, {"three", true} }; +json j_mmap(c_mmap); // only one entry for key "three" is used +// maybe {"one": true, "two": true, "three": true} + +std::unordered_multimap c_ummap { {"one", true}, {"two", true}, {"three", false}, {"three", true} }; +json j_ummap(c_ummap); // only one entry for key "three" is used +// maybe {"one": true, "two": true, "three": true} +``` + +### JSON Pointer and JSON Patch + +The library supports **JSON Pointer** ([RFC 6901](https://tools.ietf.org/html/rfc6901)) as alternative means to address structured values. On top of this, **JSON Patch** ([RFC 6902](https://tools.ietf.org/html/rfc6902)) allows to describe differences between two JSON values - effectively allowing patch and diff operations known from Unix. + +```cpp +// a JSON value +json j_original = R"({ + "baz": ["one", "two", "three"], + "foo": "bar" +})"_json; + +// access members with a JSON pointer (RFC 6901) +j_original["/baz/1"_json_pointer]; +// "two" + +// a JSON patch (RFC 6902) +json j_patch = R"([ + { "op": "replace", "path": "/baz", "value": "boo" }, + { "op": "add", "path": "/hello", "value": ["world"] }, + { "op": "remove", "path": "/foo"} +])"_json; + +// apply the patch +json j_result = j_original.patch(j_patch); +// { +// "baz": "boo", +// "hello": ["world"] +// } + +// calculate a JSON patch from two JSON values +json::diff(j_result, j_original); +// [ +// { "op":" replace", "path": "/baz", "value": ["one", "two", "three"] }, +// { "op": "remove","path": "/hello" }, +// { "op": "add", "path": "/foo", "value": "bar" } +// ] +``` + +### JSON Merge Patch + +The library supports **JSON Merge Patch** ([RFC 7386](https://tools.ietf.org/html/rfc7386)) as a patch format. Instead of using JSON Pointer (see above) to specify values to be manipulated, it describes the changes using a syntax that closely mimics the document being modified. + +```cpp +// a JSON value +json j_document = R"({ + "a": "b", + "c": { + "d": "e", + "f": "g" + } +})"_json; + +// a patch +json j_patch = R"({ + "a":"z", + "c": { + "f": null + } +})"_json; + +// apply the patch +j_document.merge_patch(j_patch); +// { +// "a": "z", +// "c": { +// "d": "e" +// } +// } +``` + +### Implicit conversions + +Supported types can be implicitly converted to JSON values. + +It is recommended to **NOT USE** implicit conversions **FROM** a JSON value. +You can find more details about this recommendation [here](https://www.github.com/nlohmann/json/issues/958). + +```cpp +// strings +std::string s1 = "Hello, world!"; +json js = s1; +auto s2 = js.get(); +// NOT RECOMMENDED +std::string s3 = js; +std::string s4; +s4 = js; + +// Booleans +bool b1 = true; +json jb = b1; +auto b2 = jb.get(); +// NOT RECOMMENDED +bool b3 = jb; +bool b4; +b4 = jb; + +// numbers +int i = 42; +json jn = i; +auto f = jn.get(); +// NOT RECOMMENDED +double f2 = jb; +double f3; +f3 = jb; + +// etc. +``` + +Note that `char` types are not automatically converted to JSON strings, but to integer numbers. A conversion to a string must be specified explicitly: + +```cpp +char ch = 'A'; // ASCII value 65 +json j_default = ch; // stores integer number 65 +json j_string = std::string(1, ch); // stores string "A" +``` + +### Arbitrary types conversions + +Every type can be serialized in JSON, not just STL containers and scalar types. Usually, you would do something along those lines: + +```cpp +namespace ns { + // a simple struct to model a person + struct person { + std::string name; + std::string address; + int age; + }; +} + +ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60}; + +// convert to JSON: copy each value into the JSON object +json j; +j["name"] = p.name; +j["address"] = p.address; +j["age"] = p.age; + +// ... + +// convert from JSON: copy each value from the JSON object +ns::person p { + j["name"].get(), + j["address"].get(), + j["age"].get() +}; +``` + +It works, but that's quite a lot of boilerplate... Fortunately, there's a better way: + +```cpp +// create a person +ns::person p {"Ned Flanders", "744 Evergreen Terrace", 60}; + +// conversion: person -> json +json j = p; + +std::cout << j << std::endl; +// {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"} + +// conversion: json -> person +auto p2 = j.get(); + +// that's it +assert(p == p2); +``` + +#### Basic usage + +To make this work with one of your types, you only need to provide two functions: + +```cpp +using nlohmann::json; + +namespace ns { + void to_json(json& j, const person& p) { + j = json{{"name", p.name}, {"address", p.address}, {"age", p.age}}; + } + + void from_json(const json& j, person& p) { + j.at("name").get_to(p.name); + j.at("address").get_to(p.address); + j.at("age").get_to(p.age); + } +} // namespace ns +``` + +That's all! When calling the `json` constructor with your type, your custom `to_json` method will be automatically called. +Likewise, when calling `get()` or `get_to(your_type&)`, the `from_json` method will be called. + +Some important things: + +* Those methods **MUST** be in your type's namespace (which can be the global namespace), or the library will not be able to locate them (in this example, they are in namespace `ns`, where `person` is defined). +* Those methods **MUST** be available (e.g., proper headers must be included) everywhere you use these conversions. Look at [issue 1108](https://github.com/nlohmann/json/issues/1108) for errors that may occur otherwise. +* When using `get()`, `your_type` **MUST** be [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible). (There is a way to bypass this requirement described later.) +* In function `from_json`, use function [`at()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a93403e803947b86f4da2d1fb3345cf2c.html#a93403e803947b86f4da2d1fb3345cf2c) to access the object values rather than `operator[]`. In case a key does not exist, `at` throws an exception that you can handle, whereas `operator[]` exhibits undefined behavior. +* You do not need to add serializers or deserializers for STL types like `std::vector`: the library already implements these. + + +#### How do I convert third-party types? + +This requires a bit more advanced technique. But first, let's see how this conversion mechanism works: + +The library uses **JSON Serializers** to convert types to json. +The default serializer for `nlohmann::json` is `nlohmann::adl_serializer` (ADL means [Argument-Dependent Lookup](https://en.cppreference.com/w/cpp/language/adl)). + +It is implemented like this (simplified): + +```cpp +template +struct adl_serializer { + static void to_json(json& j, const T& value) { + // calls the "to_json" method in T's namespace + } + + static void from_json(const json& j, T& value) { + // same thing, but with the "from_json" method + } +}; +``` + +This serializer works fine when you have control over the type's namespace. However, what about `boost::optional` or `std::filesystem::path` (C++17)? Hijacking the `boost` namespace is pretty bad, and it's illegal to add something other than template specializations to `std`... + +To solve this, you need to add a specialization of `adl_serializer` to the `nlohmann` namespace, here's an example: + +```cpp +// partial specialization (full specialization works too) +namespace nlohmann { + template + struct adl_serializer> { + static void to_json(json& j, const boost::optional& opt) { + if (opt == boost::none) { + j = nullptr; + } else { + j = *opt; // this will call adl_serializer::to_json which will + // find the free function to_json in T's namespace! + } + } + + static void from_json(const json& j, boost::optional& opt) { + if (j.is_null()) { + opt = boost::none; + } else { + opt = j.get(); // same as above, but with + // adl_serializer::from_json + } + } + }; +} +``` + +#### How can I use `get()` for non-default constructible/non-copyable types? + +There is a way, if your type is [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible). You will need to specialize the `adl_serializer` as well, but with a special `from_json` overload: + +```cpp +struct move_only_type { + move_only_type() = delete; + move_only_type(int ii): i(ii) {} + move_only_type(const move_only_type&) = delete; + move_only_type(move_only_type&&) = default; + + int i; +}; + +namespace nlohmann { + template <> + struct adl_serializer { + // note: the return type is no longer 'void', and the method only takes + // one argument + static move_only_type from_json(const json& j) { + return {j.get()}; + } + + // Here's the catch! You must provide a to_json method! Otherwise you + // will not be able to convert move_only_type to json, since you fully + // specialized adl_serializer on that type + static void to_json(json& j, move_only_type t) { + j = t.i; + } + }; +} +``` + +#### Can I write my own serializer? (Advanced use) + +Yes. You might want to take a look at [`unit-udt.cpp`](https://github.com/nlohmann/json/blob/develop/test/src/unit-udt.cpp) in the test suite, to see a few examples. + +If you write your own serializer, you'll need to do a few things: + +- use a different `basic_json` alias than `nlohmann::json` (the last template parameter of `basic_json` is the `JSONSerializer`) +- use your `basic_json` alias (or a template parameter) in all your `to_json`/`from_json` methods +- use `nlohmann::to_json` and `nlohmann::from_json` when you need ADL + +Here is an example, without simplifications, that only accepts types with a size <= 32, and uses ADL. + +```cpp +// You should use void as a second template argument +// if you don't need compile-time checks on T +template::type> +struct less_than_32_serializer { + template + static void to_json(BasicJsonType& j, T value) { + // we want to use ADL, and call the correct to_json overload + using nlohmann::to_json; // this method is called by adl_serializer, + // this is where the magic happens + to_json(j, value); + } + + template + static void from_json(const BasicJsonType& j, T& value) { + // same thing here + using nlohmann::from_json; + from_json(j, value); + } +}; +``` + +Be **very** careful when reimplementing your serializer, you can stack overflow if you don't pay attention: + +```cpp +template +struct bad_serializer +{ + template + static void to_json(BasicJsonType& j, const T& value) { + // this calls BasicJsonType::json_serializer::to_json(j, value); + // if BasicJsonType::json_serializer == bad_serializer ... oops! + j = value; + } + + template + static void to_json(const BasicJsonType& j, T& value) { + // this calls BasicJsonType::json_serializer::from_json(j, value); + // if BasicJsonType::json_serializer == bad_serializer ... oops! + value = j.template get(); // oops! + } +}; +``` + +### Specializing enum conversion + +By default, enum values are serialized to JSON as integers. In some cases this could result in undesired behavior. If an enum is modified or re-ordered after data has been serialized to JSON, the later de-serialized JSON data may be undefined or a different enum value than was originally intended. + +It is possible to more precisely specify how a given enum is mapped to and from JSON as shown below: + +```cpp +// example enum type declaration +enum TaskState { + TS_STOPPED, + TS_RUNNING, + TS_COMPLETED, + TS_INVALID=-1, +}; + +// map TaskState values to JSON as strings +NLOHMANN_JSON_SERIALIZE_ENUM( TaskState, { + {TS_INVALID, nullptr}, + {TS_STOPPED, "stopped"}, + {TS_RUNNING, "running"}, + {TS_COMPLETED, "completed"}, +}) +``` + +The `NLOHMANN_JSON_SERIALIZE_ENUM()` macro declares a set of `to_json()` / `from_json()` functions for type `TaskState` while avoiding repetition and boilerplate serilization code. + +**Usage:** + +```cpp +// enum to JSON as string +json j = TS_STOPPED; +assert(j == "stopped"); + +// json string to enum +json j3 = "running"; +assert(j3.get() == TS_RUNNING); + +// undefined json value to enum (where the first map entry above is the default) +json jPi = 3.14; +assert(jPi.get() == TS_INVALID ); +``` + +Just as in [Arbitrary Type Conversions](#arbitrary-types-conversions) above, +- `NLOHMANN_JSON_SERIALIZE_ENUM()` MUST be declared in your enum type's namespace (which can be the global namespace), or the library will not be able to locate it and it will default to integer serialization. +- It MUST be available (e.g., proper headers must be included) everywhere you use the conversions. + +Other Important points: +- When using `get()`, undefined JSON values will default to the first pair specified in your map. Select this default pair carefully. +- If an enum or JSON value is specified more than once in your map, the first matching occurrence from the top of the map will be returned when converting to or from JSON. + +### Binary formats (BSON, CBOR, MessagePack, and UBJSON) + +Though JSON is a ubiquitous data format, it is not a very compact format suitable for data exchange, for instance over a network. Hence, the library supports [BSON](http://bsonspec.org) (Binary JSON), [CBOR](http://cbor.io) (Concise Binary Object Representation), [MessagePack](http://msgpack.org), and [UBJSON](http://ubjson.org) (Universal Binary JSON Specification) to efficiently encode JSON values to byte vectors and to decode such vectors. + +```cpp +// create a JSON value +json j = R"({"compact": true, "schema": 0})"_json; + +// serialize to BSON +std::vector v_bson = json::to_bson(j); + +// 0x1B, 0x00, 0x00, 0x00, 0x08, 0x63, 0x6F, 0x6D, 0x70, 0x61, 0x63, 0x74, 0x00, 0x01, 0x10, 0x73, 0x63, 0x68, 0x65, 0x6D, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +// roundtrip +json j_from_bson = json::from_bson(v_bson); + +// serialize to CBOR +std::vector v_cbor = json::to_cbor(j); + +// 0xA2, 0x67, 0x63, 0x6F, 0x6D, 0x70, 0x61, 0x63, 0x74, 0xF5, 0x66, 0x73, 0x63, 0x68, 0x65, 0x6D, 0x61, 0x00 + +// roundtrip +json j_from_cbor = json::from_cbor(v_cbor); + +// serialize to MessagePack +std::vector v_msgpack = json::to_msgpack(j); + +// 0x82, 0xA7, 0x63, 0x6F, 0x6D, 0x70, 0x61, 0x63, 0x74, 0xC3, 0xA6, 0x73, 0x63, 0x68, 0x65, 0x6D, 0x61, 0x00 + +// roundtrip +json j_from_msgpack = json::from_msgpack(v_msgpack); + +// serialize to UBJSON +std::vector v_ubjson = json::to_ubjson(j); + +// 0x7B, 0x69, 0x07, 0x63, 0x6F, 0x6D, 0x70, 0x61, 0x63, 0x74, 0x54, 0x69, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6D, 0x61, 0x69, 0x00, 0x7D + +// roundtrip +json j_from_ubjson = json::from_ubjson(v_ubjson); +``` + + +## Supported compilers + +Though it's 2019 already, the support for C++11 is still a bit sparse. Currently, the following compilers are known to work: + +- GCC 4.8 - 9.0 (and possibly later) +- Clang 3.4 - 8.0 (and possibly later) +- Intel C++ Compiler 17.0.2 (and possibly later) +- Microsoft Visual C++ 2015 / Build Tools 14.0.25123.0 (and possibly later) +- Microsoft Visual C++ 2017 / Build Tools 15.5.180.51428 (and possibly later) + +I would be happy to learn about other compilers/versions. + +Please note: + +- GCC 4.8 has a bug [57824](https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57824)): multiline raw strings cannot be the arguments to macros. Don't use multiline raw strings directly in macros with this compiler. +- Android defaults to using very old compilers and C++ libraries. To fix this, add the following to your `Application.mk`. This will switch to the LLVM C++ library, the Clang compiler, and enable C++11 and other features disabled by default. + + ``` + APP_STL := c++_shared + NDK_TOOLCHAIN_VERSION := clang3.6 + APP_CPPFLAGS += -frtti -fexceptions + ``` + + The code compiles successfully with [Android NDK](https://developer.android.com/ndk/index.html?hl=ml), Revision 9 - 11 (and possibly later) and [CrystaX's Android NDK](https://www.crystax.net/en/android/ndk) version 10. + +- For GCC running on MinGW or Android SDK, the error `'to_string' is not a member of 'std'` (or similarly, for `strtod`) may occur. Note this is not an issue with the code, but rather with the compiler itself. On Android, see above to build with a newer environment. For MinGW, please refer to [this site](http://tehsausage.com/mingw-to-string) and [this discussion](https://github.com/nlohmann/json/issues/136) for information on how to fix this bug. For Android NDK using `APP_STL := gnustl_static`, please refer to [this discussion](https://github.com/nlohmann/json/issues/219). + +- Unsupported versions of GCC and Clang are rejected by `#error` directives. This can be switched off by defining `JSON_SKIP_UNSUPPORTED_COMPILER_CHECK`. Note that you can expect no support in this case. + +The following compilers are currently used in continuous integration at [Travis](https://travis-ci.org/nlohmann/json) and [AppVeyor](https://ci.appveyor.com/project/nlohmann/json): + +| Compiler | Operating System | Version String | +|-----------------|------------------------------|----------------| +| GCC 4.8.5 | Ubuntu 14.04.5 LTS | g++-4.8 (Ubuntu 4.8.5-2ubuntu1~14.04.2) 4.8.5 | +| GCC 4.9.4 | Ubuntu 14.04.1 LTS | g++-4.9 (Ubuntu 4.9.4-2ubuntu1~14.04.1) 4.9.4 | +| GCC 5.5.0 | Ubuntu 14.04.1 LTS | g++-5 (Ubuntu 5.5.0-12ubuntu1~14.04) 5.5.0 20171010 | +| GCC 6.4.0 | Ubuntu 14.04.1 LTS | g++-6 (Ubuntu 6.4.0-17ubuntu1~14.04) 6.4.0 20180424 | +| GCC 7.3.0 | Ubuntu 14.04.1 LTS | g++-7 (Ubuntu 7.3.0-21ubuntu1~14.04) 7.3.0 | +| GCC 7.3.0 | Windows Server 2012 R2 (x64) | g++ (x86_64-posix-seh-rev0, Built by MinGW-W64 project) 7.3.0 | +| GCC 8.1.0 | Ubuntu 14.04.1 LTS | g++-8 (Ubuntu 8.1.0-5ubuntu1~14.04) 8.1.0 | +| Clang 3.5.0 | Ubuntu 14.04.1 LTS | clang version 3.5.0-4ubuntu2~trusty2 (tags/RELEASE_350/final) (based on LLVM 3.5.0) | +| Clang 3.6.2 | Ubuntu 14.04.1 LTS | clang version 3.6.2-svn240577-1~exp1 (branches/release_36) (based on LLVM 3.6.2) | +| Clang 3.7.1 | Ubuntu 14.04.1 LTS | clang version 3.7.1-svn253571-1~exp1 (branches/release_37) (based on LLVM 3.7.1) | +| Clang 3.8.0 | Ubuntu 14.04.1 LTS | clang version 3.8.0-2ubuntu3~trusty5 (tags/RELEASE_380/final) | +| Clang 3.9.1 | Ubuntu 14.04.1 LTS | clang version 3.9.1-4ubuntu3~14.04.3 (tags/RELEASE_391/rc2) | +| Clang 4.0.1 | Ubuntu 14.04.1 LTS | clang version 4.0.1-svn305264-1~exp1 (branches/release_40) | +| Clang 5.0.2 | Ubuntu 14.04.1 LTS | clang version 5.0.2-svn328729-1~exp1~20180509123505.100 (branches/release_50) | +| Clang 6.0.1 | Ubuntu 14.04.1 LTS | clang version 6.0.1-svn334776-1~exp1~20180726133705.85 (branches/release_60) | +| Clang 7.0.1 | Ubuntu 14.04.1 LTS | clang version 7.0.1-svn348686-1~exp1~20181213084532.54 (branches/release_70) | +| Clang Xcode 8.3 | OSX 10.11.6 | Apple LLVM version 8.1.0 (clang-802.0.38) | +| Clang Xcode 9.0 | OSX 10.12.6 | Apple LLVM version 9.0.0 (clang-900.0.37) | +| Clang Xcode 9.1 | OSX 10.12.6 | Apple LLVM version 9.0.0 (clang-900.0.38) | +| Clang Xcode 9.2 | OSX 10.13.3 | Apple LLVM version 9.1.0 (clang-902.0.39.1) | +| Clang Xcode 9.3 | OSX 10.13.3 | Apple LLVM version 9.1.0 (clang-902.0.39.2) | +| Clang Xcode 10.0 | OSX 10.13.3 | Apple LLVM version 10.0.0 (clang-1000.11.45.2) | +| Clang Xcode 10.1 | OSX 10.13.3 | Apple LLVM version 10.0.0 (clang-1000.11.45.5) | +| Visual Studio 14 2015 | Windows Server 2012 R2 (x64) | Microsoft (R) Build Engine version 14.0.25420.1, MSVC 19.0.24215.1 | +| Visual Studio 2017 | Windows Server 2016 | Microsoft (R) Build Engine version 15.7.180.61344, MSVC 19.14.26433.0 | + +## License + + + +The class is licensed under the [MIT License](http://opensource.org/licenses/MIT): + +Copyright © 2013-2018 [Niels Lohmann](http://nlohmann.me) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +* * * + +The class contains the UTF-8 Decoder from Bjoern Hoehrmann which is licensed under the [MIT License](http://opensource.org/licenses/MIT) (see above). Copyright © 2008-2009 [Björn Hoehrmann](http://bjoern.hoehrmann.de/) + +The class contains a slightly modified version of the Grisu2 algorithm from Florian Loitsch which is licensed under the [MIT License](http://opensource.org/licenses/MIT) (see above). Copyright © 2009 [Florian Loitsch](http://florian.loitsch.com/) + +## Contact + +If you have questions regarding the library, I would like to invite you to [open an issue at GitHub](https://github.com/nlohmann/json/issues/new). Please describe your request, problem, or question as detailed as possible, and also mention the version of the library you are using as well as the version of your compiler and operating system. Opening an issue at GitHub allows other users and contributors to this library to collaborate. For instance, I have little experience with MSVC, and most issues in this regard have been solved by a growing community. If you have a look at the [closed issues](https://github.com/nlohmann/json/issues?q=is%3Aissue+is%3Aclosed), you will see that we react quite timely in most cases. + +Only if your request would contain confidential information, please [send me an email](mailto:mail@nlohmann.me). For encrypted messages, please use [this key](https://keybase.io/nlohmann/pgp_keys.asc). + +## Security + +[Commits by Niels Lohmann](https://github.com/nlohmann/json/commits) and [releases](https://github.com/nlohmann/json/releases) are signed with this [PGP Key](https://keybase.io/nlohmann/pgp_keys.asc?fingerprint=797167ae41c0a6d9232e48457f3cea63ae251b69). + +## Thanks + +I deeply appreciate the help of the following people. + + + +- [Teemperor](https://github.com/Teemperor) implemented CMake support and lcov integration, realized escape and Unicode handling in the string parser, and fixed the JSON serialization. +- [elliotgoodrich](https://github.com/elliotgoodrich) fixed an issue with double deletion in the iterator classes. +- [kirkshoop](https://github.com/kirkshoop) made the iterators of the class composable to other libraries. +- [wancw](https://github.com/wanwc) fixed a bug that hindered the class to compile with Clang. +- Tomas Åblad found a bug in the iterator implementation. +- [Joshua C. Randall](https://github.com/jrandall) fixed a bug in the floating-point serialization. +- [Aaron Burghardt](https://github.com/aburgh) implemented code to parse streams incrementally. Furthermore, he greatly improved the parser class by allowing the definition of a filter function to discard undesired elements while parsing. +- [Daniel Kopeček](https://github.com/dkopecek) fixed a bug in the compilation with GCC 5.0. +- [Florian Weber](https://github.com/Florianjw) fixed a bug in and improved the performance of the comparison operators. +- [Eric Cornelius](https://github.com/EricMCornelius) pointed out a bug in the handling with NaN and infinity values. He also improved the performance of the string escaping. +- [易思龙](https://github.com/likebeta) implemented a conversion from anonymous enums. +- [kepkin](https://github.com/kepkin) patiently pushed forward the support for Microsoft Visual studio. +- [gregmarr](https://github.com/gregmarr) simplified the implementation of reverse iterators and helped with numerous hints and improvements. In particular, he pushed forward the implementation of user-defined types. +- [Caio Luppi](https://github.com/caiovlp) fixed a bug in the Unicode handling. +- [dariomt](https://github.com/dariomt) fixed some typos in the examples. +- [Daniel Frey](https://github.com/d-frey) cleaned up some pointers and implemented exception-safe memory allocation. +- [Colin Hirsch](https://github.com/ColinH) took care of a small namespace issue. +- [Huu Nguyen](https://github.com/whoshuu) correct a variable name in the documentation. +- [Silverweed](https://github.com/silverweed) overloaded `parse()` to accept an rvalue reference. +- [dariomt](https://github.com/dariomt) fixed a subtlety in MSVC type support and implemented the `get_ref()` function to get a reference to stored values. +- [ZahlGraf](https://github.com/ZahlGraf) added a workaround that allows compilation using Android NDK. +- [whackashoe](https://github.com/whackashoe) replaced a function that was marked as unsafe by Visual Studio. +- [406345](https://github.com/406345) fixed two small warnings. +- [Glen Fernandes](https://github.com/glenfe) noted a potential portability problem in the `has_mapped_type` function. +- [Corbin Hughes](https://github.com/nibroc) fixed some typos in the contribution guidelines. +- [twelsby](https://github.com/twelsby) fixed the array subscript operator, an issue that failed the MSVC build, and floating-point parsing/dumping. He further added support for unsigned integer numbers and implemented better roundtrip support for parsed numbers. +- [Volker Diels-Grabsch](https://github.com/vog) fixed a link in the README file. +- [msm-](https://github.com/msm-) added support for American Fuzzy Lop. +- [Annihil](https://github.com/Annihil) fixed an example in the README file. +- [Themercee](https://github.com/Themercee) noted a wrong URL in the README file. +- [Lv Zheng](https://github.com/lv-zheng) fixed a namespace issue with `int64_t` and `uint64_t`. +- [abc100m](https://github.com/abc100m) analyzed the issues with GCC 4.8 and proposed a [partial solution](https://github.com/nlohmann/json/pull/212). +- [zewt](https://github.com/zewt) added useful notes to the README file about Android. +- [Róbert Márki](https://github.com/robertmrk) added a fix to use move iterators and improved the integration via CMake. +- [Chris Kitching](https://github.com/ChrisKitching) cleaned up the CMake files. +- [Tom Needham](https://github.com/06needhamt) fixed a subtle bug with MSVC 2015 which was also proposed by [Michael K.](https://github.com/Epidal). +- [Mário Feroldi](https://github.com/thelostt) fixed a small typo. +- [duncanwerner](https://github.com/duncanwerner) found a really embarrassing performance regression in the 2.0.0 release. +- [Damien](https://github.com/dtoma) fixed one of the last conversion warnings. +- [Thomas Braun](https://github.com/t-b) fixed a warning in a test case. +- [Théo DELRIEU](https://github.com/theodelrieu) patiently and constructively oversaw the long way toward [iterator-range parsing](https://github.com/nlohmann/json/issues/290). He also implemented the magic behind the serialization/deserialization of user-defined types and split the single header file into smaller chunks. +- [Stefan](https://github.com/5tefan) fixed a minor issue in the documentation. +- [Vasil Dimov](https://github.com/vasild) fixed the documentation regarding conversions from `std::multiset`. +- [ChristophJud](https://github.com/ChristophJud) overworked the CMake files to ease project inclusion. +- [Vladimir Petrigo](https://github.com/vpetrigo) made a SFINAE hack more readable and added Visual Studio 17 to the build matrix. +- [Denis Andrejew](https://github.com/seeekr) fixed a grammar issue in the README file. +- [Pierre-Antoine Lacaze](https://github.com/palacaze) found a subtle bug in the `dump()` function. +- [TurpentineDistillery](https://github.com/TurpentineDistillery) pointed to [`std::locale::classic()`](https://en.cppreference.com/w/cpp/locale/locale/classic) to avoid too much locale joggling, found some nice performance improvements in the parser, improved the benchmarking code, and realized locale-independent number parsing and printing. +- [cgzones](https://github.com/cgzones) had an idea how to fix the Coverity scan. +- [Jared Grubb](https://github.com/jaredgrubb) silenced a nasty documentation warning. +- [Yixin Zhang](https://github.com/qwename) fixed an integer overflow check. +- [Bosswestfalen](https://github.com/Bosswestfalen) merged two iterator classes into a smaller one. +- [Daniel599](https://github.com/Daniel599) helped to get Travis execute the tests with Clang's sanitizers. +- [Jonathan Lee](https://github.com/vjon) fixed an example in the README file. +- [gnzlbg](https://github.com/gnzlbg) supported the implementation of user-defined types. +- [Alexej Harm](https://github.com/qis) helped to get the user-defined types working with Visual Studio. +- [Jared Grubb](https://github.com/jaredgrubb) supported the implementation of user-defined types. +- [EnricoBilla](https://github.com/EnricoBilla) noted a typo in an example. +- [Martin Hořeňovský](https://github.com/horenmar) found a way for a 2x speedup for the compilation time of the test suite. +- [ukhegg](https://github.com/ukhegg) found proposed an improvement for the examples section. +- [rswanson-ihi](https://github.com/rswanson-ihi) noted a typo in the README. +- [Mihai Stan](https://github.com/stanmihai4) fixed a bug in the comparison with `nullptr`s. +- [Tushar Maheshwari](https://github.com/tusharpm) added [cotire](https://github.com/sakra/cotire) support to speed up the compilation. +- [TedLyngmo](https://github.com/TedLyngmo) noted a typo in the README, removed unnecessary bit arithmetic, and fixed some `-Weffc++` warnings. +- [Krzysztof Woś](https://github.com/krzysztofwos) made exceptions more visible. +- [ftillier](https://github.com/ftillier) fixed a compiler warning. +- [tinloaf](https://github.com/tinloaf) made sure all pushed warnings are properly popped. +- [Fytch](https://github.com/Fytch) found a bug in the documentation. +- [Jay Sistar](https://github.com/Type1J) implemented a Meson build description. +- [Henry Lee](https://github.com/HenryRLee) fixed a warning in ICC and improved the iterator implementation. +- [Vincent Thiery](https://github.com/vthiery) maintains a package for the Conan package manager. +- [Steffen](https://github.com/koemeet) fixed a potential issue with MSVC and `std::min`. +- [Mike Tzou](https://github.com/Chocobo1) fixed some typos. +- [amrcode](https://github.com/amrcode) noted a misleading documentation about comparison of floats. +- [Oleg Endo](https://github.com/olegendo) reduced the memory consumption by replacing `` with ``. +- [dan-42](https://github.com/dan-42) cleaned up the CMake files to simplify including/reusing of the library. +- [Nikita Ofitserov](https://github.com/himikof) allowed for moving values from initializer lists. +- [Greg Hurrell](https://github.com/wincent) fixed a typo. +- [Dmitry Kukovinets](https://github.com/DmitryKuk) fixed a typo. +- [kbthomp1](https://github.com/kbthomp1) fixed an issue related to the Intel OSX compiler. +- [Markus Werle](https://github.com/daixtrose) fixed a typo. +- [WebProdPP](https://github.com/WebProdPP) fixed a subtle error in a precondition check. +- [Alex](https://github.com/leha-bot) noted an error in a code sample. +- [Tom de Geus](https://github.com/tdegeus) reported some warnings with ICC and helped fixing them. +- [Perry Kundert](https://github.com/pjkundert) simplified reading from input streams. +- [Sonu Lohani](https://github.com/sonulohani) fixed a small compilation error. +- [Jamie Seward](https://github.com/jseward) fixed all MSVC warnings. +- [Nate Vargas](https://github.com/eld00d) added a Doxygen tag file. +- [pvleuven](https://github.com/pvleuven) helped fixing a warning in ICC. +- [Pavel](https://github.com/crea7or) helped fixing some warnings in MSVC. +- [Jamie Seward](https://github.com/jseward) avoided unnecessary string copies in `find()` and `count()`. +- [Mitja](https://github.com/Itja) fixed some typos. +- [Jorrit Wronski](https://github.com/jowr) updated the Hunter package links. +- [Matthias Möller](https://github.com/TinyTinni) added a `.natvis` for the MSVC debug view. +- [bogemic](https://github.com/bogemic) fixed some C++17 deprecation warnings. +- [Eren Okka](https://github.com/erengy) fixed some MSVC warnings. +- [abolz](https://github.com/abolz) integrated the Grisu2 algorithm for proper floating-point formatting, allowing more roundtrip checks to succeed. +- [Vadim Evard](https://github.com/Pipeliner) fixed a Markdown issue in the README. +- [zerodefect](https://github.com/zerodefect) fixed a compiler warning. +- [Kert](https://github.com/kaidokert) allowed to template the string type in the serialization and added the possibility to override the exceptional behavior. +- [mark-99](https://github.com/mark-99) helped fixing an ICC error. +- [Patrik Huber](https://github.com/patrikhuber) fixed links in the README file. +- [johnfb](https://github.com/johnfb) found a bug in the implementation of CBOR's indefinite length strings. +- [Paul Fultz II](https://github.com/pfultz2) added a note on the cget package manager. +- [Wilson Lin](https://github.com/wla80) made the integration section of the README more concise. +- [RalfBielig](https://github.com/ralfbielig) detected and fixed a memory leak in the parser callback. +- [agrianius](https://github.com/agrianius) allowed to dump JSON to an alternative string type. +- [Kevin Tonon](https://github.com/ktonon) overworked the C++11 compiler checks in CMake. +- [Axel Huebl](https://github.com/ax3l) simplified a CMake check and added support for the [Spack package manager](https://spack.io). +- [Carlos O'Ryan](https://github.com/coryan) fixed a typo. +- [James Upjohn](https://github.com/jammehcow) fixed a version number in the compilers section. +- [Chuck Atkins](https://github.com/chuckatkins) adjusted the CMake files to the CMake packaging guidelines and provided documentation for the CMake integration. +- [Jan Schöppach](https://github.com/dns13) fixed a typo. +- [martin-mfg](https://github.com/martin-mfg) fixed a typo. +- [Matthias Möller](https://github.com/TinyTinni) removed the dependency from `std::stringstream`. +- [agrianius](https://github.com/agrianius) added code to use alternative string implementations. +- [Daniel599](https://github.com/Daniel599) allowed to use more algorithms with the `items()` function. +- [Julius Rakow](https://github.com/jrakow) fixed the Meson include directory and fixed the links to [cppreference.com](cppreference.com). +- [Sonu Lohani](https://github.com/sonulohani) fixed the compilation with MSVC 2015 in debug mode. +- [grembo](https://github.com/grembo) fixed the test suite and re-enabled several test cases. +- [Hyeon Kim](https://github.com/simnalamburt) introduced the macro `JSON_INTERNAL_CATCH` to control the exception handling inside the library. +- [thyu](https://github.com/thyu) fixed a compiler warning. +- [David Guthrie](https://github.com/LEgregius) fixed a subtle compilation error with Clang 3.4.2. +- [Dennis Fischer](https://github.com/dennisfischer) allowed to call `find_package` without installing the library. +- [Hyeon Kim](https://github.com/simnalamburt) fixed an issue with a double macro definition. +- [Ben Berman](https://github.com/rivertam) made some error messages more understandable. +- [zakalibit](https://github.com/zakalibit) fixed a compilation problem with the Intel C++ compiler. +- [mandreyel](https://github.com/mandreyel) fixed a compilation problem. +- [Kostiantyn Ponomarenko](https://github.com/koponomarenko) added version and license information to the Meson build file. +- [Henry Schreiner](https://github.com/henryiii) added support for GCC 4.8. +- [knilch](https://github.com/knilch0r) made sure the test suite does not stall when run in the wrong directory. +- [Antonio Borondo](https://github.com/antonioborondo) fixed an MSVC 2017 warning. +- [Dan Gendreau](https://github.com/dgendreau) implemented the `NLOHMANN_JSON_SERIALIZE_ENUM` macro to quickly define a enum/JSON mapping. +- [efp](https://github.com/efp) added line and column information to parse errors. +- [julian-becker](https://github.com/julian-becker) added BSON support. +- [Pratik Chowdhury](https://github.com/pratikpc) added support for structured bindings. +- [David Avedissian](https://github.com/davedissian) added support for Clang 5.0.1 (PS4 version). +- [Jonathan Dumaresq](https://github.com/dumarjo) implemented an input adapter to read from `FILE*`. +- [kjpus](https://github.com/kjpus) fixed a link in the documentation. +- [Manvendra Singh](https://github.com/manu-chroma) fixed a typo in the documentation. +- [ziggurat29](https://github.com/ziggurat29) fixed an MSVC warning. +- [Sylvain Corlay](https://github.com/SylvainCorlay) added code to avoid an issue with MSVC. +- [mefyl](https://github.com/mefyl) fixed a bug when JSON was parsed from an input stream. +- [Millian Poquet](https://github.com/mpoquet) allowed to install the library via Meson. + +Thanks a lot for helping out! Please [let me know](mailto:mail@nlohmann.me) if I forgot someone. + + +## Used third-party tools + +The library itself consists of a single header file licensed under the MIT license. However, it is built, tested, documented, and whatnot using a lot of third-party tools and services. Thanks a lot! + +- [**amalgamate.py - Amalgamate C source and header files**](https://github.com/edlund/amalgamate) to create a single header file +- [**American fuzzy lop**](http://lcamtuf.coredump.cx/afl/) for fuzz testing +- [**AppVeyor**](https://www.appveyor.com) for [continuous integration](https://ci.appveyor.com/project/nlohmann/json) on Windows +- [**Artistic Style**](http://astyle.sourceforge.net) for automatic source code identation +- [**Catch**](https://github.com/philsquared/Catch) for the unit tests +- [**Clang**](http://clang.llvm.org) for compilation with code sanitizers +- [**CMake**](https://cmake.org) for build automation +- [**Codacity**](https://www.codacy.com) for further [code analysis](https://www.codacy.com/app/nlohmann/json) +- [**Coveralls**](https://coveralls.io) to measure [code coverage](https://coveralls.io/github/nlohmann/json) +- [**Coverity Scan**](https://scan.coverity.com) for [static analysis](https://scan.coverity.com/projects/nlohmann-json) +- [**cppcheck**](http://cppcheck.sourceforge.net) for static analysis +- [**Doxygen**](http://www.stack.nl/~dimitri/doxygen/) to generate [documentation](https://nlohmann.github.io/json/) +- [**git-update-ghpages**](https://github.com/rstacruz/git-update-ghpages) to upload the documentation to gh-pages +- [**GitHub Changelog Generator**](https://github.com/skywinder/github-changelog-generator) to generate the [ChangeLog](https://github.com/nlohmann/json/blob/develop/ChangeLog.md) +- [**Google Benchmark**](https://github.com/google/benchmark) to implement the benchmarks +- [**libFuzzer**](http://llvm.org/docs/LibFuzzer.html) to implement fuzz testing for OSS-Fuzz +- [**OSS-Fuzz**](https://github.com/google/oss-fuzz) for continuous fuzz testing of the library ([project repository](https://github.com/google/oss-fuzz/tree/master/projects/json)) +- [**Probot**](https://probot.github.io) for automating maintainer tasks such as closing stale issues, requesting missing information, or detecting toxic comments. +- [**send_to_wandbox**](https://github.com/nlohmann/json/blob/develop/doc/scripts/send_to_wandbox.py) to send code examples to [Wandbox](http://melpon.org/wandbox) +- [**Travis**](https://travis-ci.org) for [continuous integration](https://travis-ci.org/nlohmann/json) on Linux and macOS +- [**Valgrind**](http://valgrind.org) to check for correct memory management +- [**Wandbox**](http://melpon.org/wandbox) for [online examples](https://wandbox.org/permlink/TarF5pPn9NtHQjhf) + + +## Projects using JSON for Modern C++ + +The library is currently used in Apple macOS Sierra and iOS 10. I am not sure what they are using the library for, but I am happy that it runs on so many devices. + + +## Notes + +- The code contains numerous debug **assertions** which can be switched off by defining the preprocessor macro `NDEBUG`, see the [documentation of `assert`](https://en.cppreference.com/w/cpp/error/assert). In particular, note [`operator[]`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a233b02b0839ef798942dd46157cc0fe6.html#a233b02b0839ef798942dd46157cc0fe6) implements **unchecked access** for const objects: If the given key is not present, the behavior is undefined (think of a dereferenced null pointer) and yields an [assertion failure](https://github.com/nlohmann/json/issues/289) if assertions are switched on. If you are not sure whether an element in an object exists, use checked access with the [`at()` function](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a73ae333487310e3302135189ce8ff5d8.html#a73ae333487310e3302135189ce8ff5d8). +- As the exact type of a number is not defined in the [JSON specification](https://tools.ietf.org/html/rfc7159.html), this library tries to choose the best fitting C++ number type automatically. As a result, the type `double` may be used to store numbers which may yield [**floating-point exceptions**](https://github.com/nlohmann/json/issues/181) in certain rare situations if floating-point exceptions have been unmasked in the calling code. These exceptions are not caused by the library and need to be fixed in the calling code, such as by re-masking the exceptions prior to calling library functions. +- The library supports **Unicode input** as follows: + - Only **UTF-8** encoded input is supported which is the default encoding for JSON according to [RFC 7159](https://tools.ietf.org/html/rfc7159.html#section-8.1). + - Other encodings such as Latin-1, UTF-16, or UTF-32 are not supported and will yield parse or serialization errors. + - [Unicode noncharacters](http://www.unicode.org/faq/private_use.html#nonchar1) will not be replaced by the library. + - Invalid surrogates (e.g., incomplete pairs such as `\uDEAD`) will yield parse errors. + - The strings stored in the library are UTF-8 encoded. When using the default string type (`std::string`), note that its length/size functions return the number of stored bytes rather than the number of characters or glyphs. +- The code can be compiled without C++ **runtime type identification** features; that is, you can use the `-fno-rtti` compiler flag. +- **Exceptions** are used widely within the library. They can, however, be switched off with either using the compiler flag `-fno-exceptions` or by defining the symbol `JSON_NOEXCEPTION`. In this case, exceptions are replaced by an `abort()` call. +- By default, the library does not preserve the **insertion order of object elements**. This is standards-compliant, as the [JSON standard](https://tools.ietf.org/html/rfc7159.html) defines objects as "an unordered collection of zero or more name/value pairs". If you do want to preserve the insertion order, you can specialize the object type with containers like [`tsl::ordered_map`](https://github.com/Tessil/ordered-map) ([integration](https://github.com/nlohmann/json/issues/546#issuecomment-304447518)) or [`nlohmann::fifo_map`](https://github.com/nlohmann/fifo_map) ([integration](https://github.com/nlohmann/json/issues/485#issuecomment-333652309)). + + +## Execute unit tests + +To compile and run the tests, you need to execute + +```sh +$ mkdir build +$ cd build +$ cmake .. +$ cmake --build . +$ ctest --output-on-failure +``` + +For more information, have a look at the file [.travis.yml](https://github.com/nlohmann/json/blob/master/.travis.yml). diff --git a/easy2d/libs/nlohmann-json/json.hpp b/easy2d/libs/nlohmann-json/json.hpp new file mode 100644 index 00000000..c9af0bed --- /dev/null +++ b/easy2d/libs/nlohmann-json/json.hpp @@ -0,0 +1,20406 @@ +/* + __ _____ _____ _____ + __| | __| | | | JSON for Modern C++ +| | |__ | | | | | | version 3.5.0 +|_____|_____|_____|_|___| https://github.com/nlohmann/json + +Licensed under the MIT License . +SPDX-License-Identifier: MIT +Copyright (c) 2013-2018 Niels Lohmann . + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +#ifndef NLOHMANN_JSON_HPP +#define NLOHMANN_JSON_HPP + +#define NLOHMANN_JSON_VERSION_MAJOR 3 +#define NLOHMANN_JSON_VERSION_MINOR 5 +#define NLOHMANN_JSON_VERSION_PATCH 0 + +#include // all_of, find, for_each +#include // assert +#include // and, not, or +#include // nullptr_t, ptrdiff_t, size_t +#include // hash, less +#include // initializer_list +#include // istream, ostream +#include // random_access_iterator_tag +#include // accumulate +#include // string, stoi, to_string +#include // declval, forward, move, pair, swap + +// #include +#ifndef NLOHMANN_JSON_FWD_HPP +#define NLOHMANN_JSON_FWD_HPP + +#include // int64_t, uint64_t +#include // map +#include // allocator +#include // string +#include // vector + +/*! +@brief namespace for Niels Lohmann +@see https://github.com/nlohmann +@since version 1.0.0 +*/ +namespace nlohmann +{ +/*! +@brief default JSONSerializer template argument + +This serializer ignores the template arguments and uses ADL +([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl)) +for serialization. +*/ +template +struct adl_serializer; + +template class ObjectType = + std::map, + template class ArrayType = std::vector, + class StringType = std::string, class BooleanType = bool, + class NumberIntegerType = std::int64_t, + class NumberUnsignedType = std::uint64_t, + class NumberFloatType = double, + template class AllocatorType = std::allocator, + template class JSONSerializer = + adl_serializer> +class basic_json; + +/*! +@brief JSON Pointer + +A JSON pointer defines a string syntax for identifying a specific value +within a JSON document. It can be used with functions `at` and +`operator[]`. Furthermore, JSON pointers are the base for JSON patches. + +@sa [RFC 6901](https://tools.ietf.org/html/rfc6901) + +@since version 2.0.0 +*/ +template +class json_pointer; + +/*! +@brief default JSON class + +This type is the default specialization of the @ref basic_json class which +uses the standard template types. + +@since version 1.0.0 +*/ +using json = basic_json<>; +} // namespace nlohmann + +#endif + +// #include + + +// This file contains all internal macro definitions +// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them + +// exclude unsupported compilers +#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK) + #if defined(__clang__) + #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400 + #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers" + #endif + #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER)) + #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800 + #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers" + #endif + #endif +#endif + +// disable float-equal warnings on GCC/clang +#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wfloat-equal" +#endif + +// disable documentation warnings on clang +#if defined(__clang__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdocumentation" +#endif + +// allow for portable deprecation warnings +#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) + #define JSON_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) + #define JSON_DEPRECATED __declspec(deprecated) +#else + #define JSON_DEPRECATED +#endif + +// allow to disable exceptions +#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION) + #define JSON_THROW(exception) throw exception + #define JSON_TRY try + #define JSON_CATCH(exception) catch(exception) + #define JSON_INTERNAL_CATCH(exception) catch(exception) +#else + #define JSON_THROW(exception) std::abort() + #define JSON_TRY if(true) + #define JSON_CATCH(exception) if(false) + #define JSON_INTERNAL_CATCH(exception) if(false) +#endif + +// override exception macros +#if defined(JSON_THROW_USER) + #undef JSON_THROW + #define JSON_THROW JSON_THROW_USER +#endif +#if defined(JSON_TRY_USER) + #undef JSON_TRY + #define JSON_TRY JSON_TRY_USER +#endif +#if defined(JSON_CATCH_USER) + #undef JSON_CATCH + #define JSON_CATCH JSON_CATCH_USER + #undef JSON_INTERNAL_CATCH + #define JSON_INTERNAL_CATCH JSON_CATCH_USER +#endif +#if defined(JSON_INTERNAL_CATCH_USER) + #undef JSON_INTERNAL_CATCH + #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER +#endif + +// manual branch prediction +#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) + #define JSON_LIKELY(x) __builtin_expect(!!(x), 1) + #define JSON_UNLIKELY(x) __builtin_expect(!!(x), 0) +#else + #define JSON_LIKELY(x) x + #define JSON_UNLIKELY(x) x +#endif + +// C++ language standard detection +#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464 + #define JSON_HAS_CPP_17 + #define JSON_HAS_CPP_14 +#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1) + #define JSON_HAS_CPP_14 +#endif + +/*! +@brief macro to briefly define a mapping between an enum and JSON +@def NLOHMANN_JSON_SERIALIZE_ENUM +@since version 3.4.0 +*/ +#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...) \ + template \ + inline void to_json(BasicJsonType& j, const ENUM_TYPE& e) \ + { \ + static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ + static const std::pair m[] = __VA_ARGS__; \ + auto it = std::find_if(std::begin(m), std::end(m), \ + [e](const std::pair& ej_pair) -> bool \ + { \ + return ej_pair.first == e; \ + }); \ + j = ((it != std::end(m)) ? it : std::begin(m))->second; \ + } \ + template \ + inline void from_json(const BasicJsonType& j, ENUM_TYPE& e) \ + { \ + static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ + static const std::pair m[] = __VA_ARGS__; \ + auto it = std::find_if(std::begin(m), std::end(m), \ + [j](const std::pair& ej_pair) -> bool \ + { \ + return ej_pair.second == j; \ + }); \ + e = ((it != std::end(m)) ? it : std::begin(m))->first; \ + } + +// Ugly macros to avoid uglier copy-paste when specializing basic_json. They +// may be removed in the future once the class is split. + +#define NLOHMANN_BASIC_JSON_TPL_DECLARATION \ + template class ObjectType, \ + template class ArrayType, \ + class StringType, class BooleanType, class NumberIntegerType, \ + class NumberUnsignedType, class NumberFloatType, \ + template class AllocatorType, \ + template class JSONSerializer> + +#define NLOHMANN_BASIC_JSON_TPL \ + basic_json + +// #include + + +#include // not +#include // size_t +#include // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type + +namespace nlohmann +{ +namespace detail +{ +// alias templates to reduce boilerplate +template +using enable_if_t = typename std::enable_if::type; + +template +using uncvref_t = typename std::remove_cv::type>::type; + +// implementation of C++14 index_sequence and affiliates +// source: https://stackoverflow.com/a/32223343 +template +struct index_sequence +{ + using type = index_sequence; + using value_type = std::size_t; + static constexpr std::size_t size() noexcept + { + return sizeof...(Ints); + } +}; + +template +struct merge_and_renumber; + +template +struct merge_and_renumber, index_sequence> + : index_sequence < I1..., (sizeof...(I1) + I2)... > {}; + +template +struct make_index_sequence + : merge_and_renumber < typename make_index_sequence < N / 2 >::type, + typename make_index_sequence < N - N / 2 >::type > {}; + +template<> struct make_index_sequence<0> : index_sequence<> {}; +template<> struct make_index_sequence<1> : index_sequence<0> {}; + +template +using index_sequence_for = make_index_sequence; + +// dispatch utility (taken from ranges-v3) +template struct priority_tag : priority_tag < N - 1 > {}; +template<> struct priority_tag<0> {}; + +// taken from ranges-v3 +template +struct static_const +{ + static constexpr T value{}; +}; + +template +constexpr T static_const::value; +} // namespace detail +} // namespace nlohmann + +// #include + + +#include // not +#include // numeric_limits +#include // false_type, is_constructible, is_integral, is_same, true_type +#include // declval + +// #include + +// #include + + +#include // random_access_iterator_tag + +// #include + + +namespace nlohmann +{ +namespace detail +{ +template struct make_void +{ + using type = void; +}; +template using void_t = typename make_void::type; +} // namespace detail +} // namespace nlohmann + +// #include + + +namespace nlohmann +{ +namespace detail +{ +template +struct iterator_types {}; + +template +struct iterator_types < + It, + void_t> +{ + using difference_type = typename It::difference_type; + using value_type = typename It::value_type; + using pointer = typename It::pointer; + using reference = typename It::reference; + using iterator_category = typename It::iterator_category; +}; + +// This is required as some compilers implement std::iterator_traits in a way that +// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341. +template +struct iterator_traits +{ +}; + +template +struct iterator_traits < T, enable_if_t < !std::is_pointer::value >> + : iterator_types +{ +}; + +template +struct iterator_traits::value>> +{ + using iterator_category = std::random_access_iterator_tag; + using value_type = T; + using difference_type = ptrdiff_t; + using pointer = T*; + using reference = T&; +}; +} +} + +// #include + +// #include + + +#include + +// #include + + +// http://en.cppreference.com/w/cpp/experimental/is_detected +namespace nlohmann +{ +namespace detail +{ +struct nonesuch +{ + nonesuch() = delete; + ~nonesuch() = delete; + nonesuch(nonesuch const&) = delete; + void operator=(nonesuch const&) = delete; +}; + +template class Op, + class... Args> +struct detector +{ + using value_t = std::false_type; + using type = Default; +}; + +template class Op, class... Args> +struct detector>, Op, Args...> +{ + using value_t = std::true_type; + using type = Op; +}; + +template