From fe47f841e74327f874ab4bdd96403e706fa667a7 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 13 Oct 2019 17:31:58 +0200 Subject: [PATCH 001/234] Don't close menu(s) on certain operations In several cases we don't want menu(s) to close when an action on menu was done. For example on drag-n-drop or menu item deletion (where confirmation dialog is shown). In such situations `s_bPreventClosing` was set to true (and then back to false when closing was allowed again). Though original code honored this variable only in certain situations and typically (at least on Win10) menus were hidden/closed despite of it. This patch changes the behavior and menus(s) are not closed when `s_bPreventClosing` is set to true. Basically now menu(s) stay visible until there is an action that changes active window. Following functionality was also removed because it is not needed now: * CMenuContainer::HideTemp * COwnerWindow::OnClear WM_CLEAR was sent to the window only by already removed `HideTemp` --- Src/StartMenu/StartMenuDLL/DragDrop.cpp | 4 -- Src/StartMenu/StartMenuDLL/MenuCommands.cpp | 7 +--- Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 31 +++++----------- Src/StartMenu/StartMenuDLL/MenuContainer.h | 1 - Src/StartMenu/StartMenuDLL/ProgramsTree.cpp | 2 - Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp | 39 +++----------------- 6 files changed, 16 insertions(+), 68 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/DragDrop.cpp b/Src/StartMenu/StartMenuDLL/DragDrop.cpp index 5e3f6880e..41c78b00c 100644 --- a/Src/StartMenu/StartMenuDLL/DragDrop.cpp +++ b/Src/StartMenu/StartMenuDLL/DragDrop.cpp @@ -248,7 +248,6 @@ bool CMenuContainer::DragOutApps( const CItemManager::ItemInfo *pInfo ) s_bDragFromTree=false; if (!m_bDestroyed) KillTimer(TIMER_DRAG); - HideTemp(false); s_bPreventClosing=false; if (s_bDragClosed) @@ -343,7 +342,6 @@ bool CMenuContainer::DragOut( int index, bool bApp ) if (!m_bDestroyed) KillTimer(TIMER_DRAG); s_bDragMovable=false; - HideTemp(false); s_bPreventClosing=false; if (s_bDragClosed) @@ -863,8 +861,6 @@ HRESULT STDMETHODCALLTYPE CMenuContainer::Drop( IDataObject *pDataObj, DWORD grf s_bPreventClosing=true; AddRef(); pTarget->Drop(pDataObj,grfKeyState,pt,pdwEffect); - if (!bOld) - HideTemp(false); s_bPreventClosing=bOld; for (std::vector::iterator it=s_Menus.begin();it!=s_Menus.end();++it) if (!(*it)->m_bDestroyed) diff --git a/Src/StartMenu/StartMenuDLL/MenuCommands.cpp b/Src/StartMenu/StartMenuDLL/MenuCommands.cpp index b3f542a7a..8c8704166 100644 --- a/Src/StartMenu/StartMenuDLL/MenuCommands.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuCommands.cpp @@ -2396,7 +2396,6 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p } } DestroyMenu(menu2); - HideTemp(false); s_bPreventClosing=false; PITEMID_CHILD newPidl=NULL; @@ -2485,7 +2484,6 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p Invalidate(); if (m_HotItem<0) SetHotItem(index); } - HideTemp(false); s_bPreventClosing=false; } SetContextItem(-1); @@ -2742,7 +2740,6 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p else SetFocus(); } - HideTemp(false); s_bPreventClosing=false; s_HotPos=GetMessagePos(); res=CMD_RENAME; @@ -2802,8 +2799,7 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p if (bRefresh || bRefreshMain) info.fMask|=CMIC_MASK_NOASYNC; // wait for delete/link commands to finish so we can refresh the menu - if ((type!=ACTIVATE_MENU && type!=ACTIVATE_DELETE) || GetWinVersion()::iterator it=s_Menus.begin();it!=s_Menus.end();++it) (*it)->EnableWindow(FALSE); // disable all menus bool bAllPrograms=s_bAllPrograms; @@ -2880,7 +2876,6 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p else SetFocus(); } - HideTemp(false); s_bPreventClosing=false; if (!bKeepOpen && !bRefresh && !bRefreshMain) diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp index 539be6185..c8d5f8839 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp @@ -6365,11 +6365,6 @@ LRESULT CMenuContainer::OnRefresh( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL return 0; } -void CMenuContainer::HideTemp( bool bHide ) -{ - ::PostMessage(g_OwnerWindow,WM_CLEAR,bHide,0); -} - LRESULT CMenuContainer::OnActivate( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled ) { if (LOWORD(wParam)!=WA_INACTIVE) @@ -6379,6 +6374,9 @@ LRESULT CMenuContainer::OnActivate( UINT uMsg, WPARAM wParam, LPARAM lParam, BOO return 0; } #ifndef PREVENT_CLOSING + if (s_bPreventClosing) + return 0; + if (lParam) { // check if another menu window is being activated @@ -6389,24 +6387,15 @@ LRESULT CMenuContainer::OnActivate( UINT uMsg, WPARAM wParam, LPARAM lParam, BOO if ((HWND)lParam==g_OwnerWindow || (HWND)lParam==g_TopWin7Menu) return 0; - - if (s_bPreventClosing && (::GetWindowLong((HWND)lParam,GWL_EXSTYLE)&WS_EX_TOPMOST)) - return 0; } - // a non-top-most window tries to activate while we are still here - if (s_bPreventClosing && (!g_TopWin7Menu || !s_bAllPrograms)) - HideTemp(true); - else - { - for (std::vector::reverse_iterator it=s_Menus.rbegin();it!=s_Menus.rend();++it) - if ((*it)->m_hWnd && !(*it)->m_bDestroyed) - { - (*it)->PostMessage(WM_CLOSE); - (*it)->m_bClosing=true; - } - if (g_TopWin7Menu && s_bAllPrograms) ::PostMessage(g_TopWin7Menu,WM_CLOSE,0,0); - } + for (std::vector::reverse_iterator it=s_Menus.rbegin();it!=s_Menus.rend();++it) + if ((*it)->m_hWnd && !(*it)->m_bDestroyed) + { + (*it)->PostMessage(WM_CLOSE); + (*it)->m_bClosing=true; + } + if (g_TopWin7Menu && s_bAllPrograms) ::PostMessage(g_TopWin7Menu,WM_CLOSE,0,0); #endif return 0; diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.h b/Src/StartMenu/StartMenuDLL/MenuContainer.h index 3fcb04851..696e8db48 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.h +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.h @@ -957,7 +957,6 @@ class CMenuContainer: public IDropTarget, public IFrameworkInputPaneHandler, pub friend LRESULT CALLBACK SubclassTopMenuProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData ); friend HRESULT CreatePinLink( PCIDLIST_ABSOLUTE sourcePidl, const wchar_t *name, const wchar_t *iconPath, int iconIndex ); - static void HideTemp( bool bHide ); static void AddMRUShortcut( const wchar_t *path ); static void AddMRUAppId( const wchar_t *appid ); static void DeleteMRUShortcut( const wchar_t *path ); diff --git a/Src/StartMenu/StartMenuDLL/ProgramsTree.cpp b/Src/StartMenu/StartMenuDLL/ProgramsTree.cpp index 9906aae0b..d937c756e 100644 --- a/Src/StartMenu/StartMenuDLL/ProgramsTree.cpp +++ b/Src/StartMenu/StartMenuDLL/ProgramsTree.cpp @@ -1601,8 +1601,6 @@ HRESULT CProgramsTree::Drop( IDataObject *pDataObj, DWORD grfKeyState, POINTL pt CMenuContainer::s_bPreventClosing=true; m_pOwner->AddRef(); pTarget->Drop(pDataObj,grfKeyState,pt,pdwEffect); - if (!bOld) - CMenuContainer::HideTemp(false); CMenuContainer::s_bPreventClosing=bOld; for (std::vector::iterator it=CMenuContainer::s_Menus.begin();it!=CMenuContainer::s_Menus.end();++it) if (!(*it)->m_bDestroyed) diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp index b10caba99..b77e1cbc0 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp @@ -292,7 +292,6 @@ class COwnerWindow: public CWindowImpl // message handlers BEGIN_MSG_MAP( COwnerWindow ) MESSAGE_HANDLER( WM_ACTIVATE, OnActivate ) - MESSAGE_HANDLER( WM_CLEAR, OnClear ) MESSAGE_HANDLER( WM_SYSCOLORCHANGE, OnColorChange ) MESSAGE_HANDLER( WM_SETTINGCHANGE, OnSettingChange ) MESSAGE_HANDLER( WM_DISPLAYCHANGE, OnDisplayChange ) @@ -304,7 +303,7 @@ class COwnerWindow: public CWindowImpl if (LOWORD(wParam)!=WA_INACTIVE) return 0; - if (CMenuContainer::s_bPreventClosing && lParam && (::GetWindowLongPtr((HWND)lParam,GWL_EXSTYLE)&WS_EX_TOPMOST)) + if (CMenuContainer::s_bPreventClosing) return 0; // check if another menu window is being activated @@ -313,42 +312,14 @@ class COwnerWindow: public CWindowImpl if ((*it)->m_hWnd==(HWND)lParam) return 0; - if (CMenuContainer::s_bPreventClosing) - { - CMenuContainer::HideTemp(true); - } - else - { - for (std::vector::reverse_iterator it=CMenuContainer::s_Menus.rbegin();it!=CMenuContainer::s_Menus.rend();++it) - if (!(*it)->m_bDestroyed) - (*it)->PostMessage(WM_CLOSE); - } - return 0; - } + for (std::vector::reverse_iterator it=CMenuContainer::s_Menus.rbegin();it!=CMenuContainer::s_Menus.rend();++it) + if (!(*it)->m_bDestroyed) + (*it)->PostMessage(WM_CLOSE); - LRESULT OnClear( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled ) - { - bool bHide=(wParam!=0); // hide or destroy - if (CMenuContainer::s_bTempHidden!=bHide) - { - CMenuContainer::s_bTempHidden=bHide; - if (bHide && CMenuContainer::s_UserPicture.m_hWnd) - CMenuContainer::s_UserPicture.ShowWindow(SW_HIDE); - for (std::vector::iterator it=CMenuContainer::s_Menus.begin();it!=CMenuContainer::s_Menus.end();++it) - { - if ((*it)->m_hWnd && !(*it)->m_bDestroyed) - { - (*it)->m_bClosing=true; - if (!bHide) - (*it)->PostMessage(WM_CLOSE); - else - (*it)->ShowWindow(SW_HIDE); - } - } - } return 0; } + LRESULT OnColorChange( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled ) { CMenuContainer::s_Skin.Hash=0; From 30ffce6939f18b1c31874d2423ae4b731a510a51 Mon Sep 17 00:00:00 2001 From: Kaleb Klein Date: Wed, 4 Dec 2019 14:14:14 -0500 Subject: [PATCH 002/234] Change homepage url in settings Changed the homepage text and link on the settings dialog to link to the Open-Shell home page. --- Src/Lib/Lib.rc | 4 ++-- Src/Lib/Settings.cpp | 2 +- Src/Localization/English/en-US.csv | Bin 126024 -> 126106 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Src/Lib/Lib.rc b/Src/Lib/Lib.rc index 58445918a..479584a30 100644 --- a/Src/Lib/Lib.rc +++ b/Src/Lib/Lib.rc @@ -71,7 +71,7 @@ BEGIN CONTROL "Show all settings",IDC_CHECKALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,7,79,12 CONTROL "Help...",IDC_LINKHELP,"SysLink",WS_TABSTOP,348,9,26,10,WS_EX_TRANSPARENT CONTROL "",IDC_TABSETTINGS,"SysTabControl32",TCS_MULTILINE | TCS_FOCUSNEVER,7,20,367,169 - CONTROL "www.classicshell.net",IDC_LINKWEB,"SysLink",WS_TABSTOP,7,195,66,10,WS_EX_TRANSPARENT + CONTROL "Open-Shell Homepage",IDC_LINKWEB,"SysLink",WS_TABSTOP,7,195,75,10,WS_EX_TRANSPARENT CONTROL "Name of translator goes here",IDC_SYSLINKLOC, "SysLink",NOT WS_VISIBLE | WS_TABSTOP,80,195,111,10 PUSHBUTTON "&Backup",IDC_BUTTONBACKUP,200,192,60,14,WS_GROUP @@ -277,7 +277,7 @@ BEGIN IDS_BMP_TITLE "Select Image File" IDS_SEARCH_PROMPT "Search Settings" IDS_SETTING_SEARCH "Search Results" - IDS_WEBSITE_TIP "Visit Open-Shell on the web - http://www.classicshell.net" + IDS_WEBSITE_TIP "Visit Open-Shell on the web - https://open-shell.github.io/Open-Shell-Menu" IDS_LOCATE_SETTING "Locate setting" IDS_LANGUAGE_UPDATED "The language %s is up to date." IDS_LANGUAGE_MISSING "Update for language %s is not available." diff --git a/Src/Lib/Settings.cpp b/Src/Lib/Settings.cpp index 7dbcc94e3..16afba7ad 100644 --- a/Src/Lib/Settings.cpp +++ b/Src/Lib/Settings.cpp @@ -1810,7 +1810,7 @@ LRESULT CSettingsDlg::OnHelp( int idCtrl, LPNMHDR pnmh, BOOL& bHandled ) LRESULT CSettingsDlg::OnWeb( int idCtrl, LPNMHDR pnmh, BOOL& bHandled ) { - ShellExecute(m_hWnd,NULL,L"http://www.classicshell.net",NULL,NULL,SW_SHOWNORMAL); + ShellExecute(m_hWnd,NULL,L"https://open-shell.github.io/Open-Shell-Menu",NULL,NULL,SW_SHOWNORMAL); return 0; } diff --git a/Src/Localization/English/en-US.csv b/Src/Localization/English/en-US.csv index fc7f9e7ec51124024c89a43fc385982de1d2e275..237892172399e5843ef0b1824875310f4020312a 100644 GIT binary patch delta 206 zcmX?cgMHRb_J%Et0@DnO8LSxefiRz;fFYG3k3pBAm>~nm$^k+>hIEEZh7usZlpzVo z%LJ;@pIn$M%BVX%v7J$LyVo?v62IwR&NGTgDlm8eWpjZ#3m6iC`cfHefTkug*iFCq zlu>xwQ^pIdsu@7DN`Ue(J5fzf2J45I4<-e58GONRDutWn_=-_ Date: Wed, 4 Dec 2019 14:35:14 -0500 Subject: [PATCH 003/234] ignore vscode generated files Added generated files/folders in gitignore from vscode --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index f3e3bbfc6..363b43464 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,10 @@ ## ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore +# ignore vscode stuff +.vscode/ +.ionide/ + # User-specific files *.suo *.user From 4f46134f100737474f47dc4d4a0313000695ba8f Mon Sep 17 00:00:00 2001 From: coddec <12678338+coddec@users.noreply.github.com> Date: Wed, 29 Jan 2020 15:41:23 +1100 Subject: [PATCH 004/234] Add Temporary Translation/Language Solution --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index fce9bf9ee..69541ab71 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,14 @@ If you just want to use it or looking for setup file, click here to download!!! [![GitHub All Releases](https://img.shields.io/github/downloads/Open-Shell/Open-Shell-Menu/total?style=for-the-badge)](https://github.com/Open-Shell/Open-Shell-Menu/releases) + +### Temporary Translation/Language Solution +Translations/Language files/DLLs + +1. Download .dlls from here [https://coddec.github.io/Classic-Shell/www.classicshell.net/translations/index.html](https://coddec.github.io/Classic-Shell/www.classicshell.net/translations/index.html) + +2. After you download the DLL file you need to place it either in the Classic Shell's __install folder__ or in the __%ALLUSERSPROFILE%\ClassicShell\Languages__ folder. + --- *For archival reasons, we have a mirror of `www.classicshell.net` [here](https://coddec.github.io/Classic-Shell/www.classicshell.net/).* From 5f59aab40a992c210b54cf03f9ec9663d3135c32 Mon Sep 17 00:00:00 2001 From: coddec <12678338+coddec@users.noreply.github.com> Date: Wed, 29 Jan 2020 18:22:08 +1100 Subject: [PATCH 005/234] fix typo classic shell -> Open-Shell --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 69541ab71..ee4cbef44 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Translations/Language files/DLLs 1. Download .dlls from here [https://coddec.github.io/Classic-Shell/www.classicshell.net/translations/index.html](https://coddec.github.io/Classic-Shell/www.classicshell.net/translations/index.html) -2. After you download the DLL file you need to place it either in the Classic Shell's __install folder__ or in the __%ALLUSERSPROFILE%\ClassicShell\Languages__ folder. +2. After you download the DLL file you need to place it either in the Open-Shell's __install folder__ or in the __%ALLUSERSPROFILE%\Open-Shell\Languages__ folder. --- From 9ebe53fdbf8dba49bd0be71f3789df3b97af644f Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sat, 18 Jan 2020 15:25:54 +0100 Subject: [PATCH 006/234] Fix issue with confirmation dialog being blocked Delete confirmation dialog may be (partially) hidden behing start menu. As a result the dialog may be not accessible because start menu(s) are displayed as top-most windows. Thus when executing menu command we will make menu(s) non-topmost. So that other windows can be drawn on top of menu(s). Fixes #257 --- Src/StartMenu/StartMenuDLL/DragDrop.cpp | 22 +++++++++++++++------ Src/StartMenu/StartMenuDLL/MenuCommands.cpp | 18 ++++++++++++----- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/DragDrop.cpp b/Src/StartMenu/StartMenuDLL/DragDrop.cpp index 41c78b00c..7b3262db8 100644 --- a/Src/StartMenu/StartMenuDLL/DragDrop.cpp +++ b/Src/StartMenu/StartMenuDLL/DragDrop.cpp @@ -852,9 +852,14 @@ HRESULT STDMETHODCALLTYPE CMenuContainer::Drop( IDataObject *pDataObj, DWORD grf CComQIPtr pAsync=pDataObj; if (pAsync) pAsync->SetAsyncMode(FALSE); - for (std::vector::iterator it=s_Menus.begin();it!=s_Menus.end();++it) - if (!(*it)->m_bDestroyed) - (*it)->EnableWindow(FALSE); // disable all menus + for (auto& it : s_Menus) + { + if (!it->m_bDestroyed) + { + it->EnableWindow(FALSE); // disable all menus + it->SetWindowPos(HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + } + } bool bAllPrograms=s_bAllPrograms; if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,FALSE); bool bOld=s_bPreventClosing; @@ -862,9 +867,14 @@ HRESULT STDMETHODCALLTYPE CMenuContainer::Drop( IDataObject *pDataObj, DWORD grf AddRef(); pTarget->Drop(pDataObj,grfKeyState,pt,pdwEffect); s_bPreventClosing=bOld; - for (std::vector::iterator it=s_Menus.begin();it!=s_Menus.end();++it) - if (!(*it)->m_bDestroyed) - (*it)->EnableWindow(TRUE); // enable all menus + for (auto& it : s_Menus) + { + if (!it->m_bDestroyed) + { + it->EnableWindow(TRUE); // enable all menus + it->SetWindowPos(HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + } + } if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,TRUE); } else diff --git a/Src/StartMenu/StartMenuDLL/MenuCommands.cpp b/Src/StartMenu/StartMenuDLL/MenuCommands.cpp index 8c8704166..843d5c412 100644 --- a/Src/StartMenu/StartMenuDLL/MenuCommands.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuCommands.cpp @@ -2800,8 +2800,11 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p info.fMask|=CMIC_MASK_NOASYNC; // wait for delete/link commands to finish so we can refresh the menu s_bPreventClosing=true; - for (std::vector::iterator it=s_Menus.begin();it!=s_Menus.end();++it) - (*it)->EnableWindow(FALSE); // disable all menus + for (auto& it : s_Menus) + { + it->EnableWindow(FALSE); // disable all menus + it->SetWindowPos(HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + } bool bAllPrograms=s_bAllPrograms; if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,FALSE); info.hwnd=g_OwnerWindow; @@ -2846,9 +2849,14 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p } } } - for (std::vector::iterator it=s_Menus.begin();it!=s_Menus.end();++it) - if (!(*it)->m_bDestroyed) - (*it)->EnableWindow(TRUE); // enable all menus + for (auto& it : s_Menus) + { + if (!it->m_bDestroyed) + { + it->EnableWindow(TRUE); // enable all menus + it->SetWindowPos(HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + } + } if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,TRUE); if (bRefreshMain && m_bSubMenu) { From 1b410e5a8002d69d14b9510f3caff5968da848a2 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sat, 6 Jun 2020 12:45:48 +0200 Subject: [PATCH 007/234] Fix compilation with VS16.6 --- Src/StartMenu/StartMenuDLL/Accessibility.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/StartMenu/StartMenuDLL/Accessibility.cpp b/Src/StartMenu/StartMenuDLL/Accessibility.cpp index fe6b0e859..a7d57bf3d 100644 --- a/Src/StartMenu/StartMenuDLL/Accessibility.cpp +++ b/Src/StartMenu/StartMenuDLL/Accessibility.cpp @@ -182,7 +182,7 @@ HRESULT STDMETHODCALLTYPE CMenuAccessible::accSelect( long flagsSelect, VARIANT int index=varChild.lVal-1; if (index<0 || index>=(int)m_pOwner->m_Items.size()) return S_FALSE; - m_pOwner->ActivateItem(index,CMenuContainer::ACTIVATE_SELECT,NULL,false); + m_pOwner->ActivateItem(index,CMenuContainer::ACTIVATE_SELECT,NULL); } return S_OK; } From 9976e134ca6b8d491b278abac78e3afd526bb328 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sat, 6 Jun 2020 13:01:13 +0200 Subject: [PATCH 008/234] Fix 'Invert Metro icon color' option for grayscale icons When `Invert Metro icon color` is enabled `Open-Shell` needs to distinguish full color icons from monochromatic ones. Color icons are displayed normally. Monochromatic ones are displayed inverted (original background becomes transparent and foreground will get Metro accent color). Metro icon is loaded from Metro app resources (usually PNG image) as bitmap with premultiplied alpha channel. This causes monochromatic image to essentially become grayscale (because RGB values are multiplied with alpha channel value). Function `DetectGrayscaleImage` is used to distinguish such images. Unfortunatelly if original image is grayscale (such as new Windows Terminal icon) it is recognized as monochromatic and thus inverted. To prevent this we will take into account also alpha channel in `DetectGrayscaleImage`. In monochromatic images alpha channel value will be the same as the rest of channel values. For color images alpha channel value will be different than other channel values. Fixes #364. --- Src/StartMenu/StartMenuDLL/ItemManager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/StartMenu/StartMenuDLL/ItemManager.cpp b/Src/StartMenu/StartMenuDLL/ItemManager.cpp index 456ab751f..0ff59c65a 100644 --- a/Src/StartMenu/StartMenuDLL/ItemManager.cpp +++ b/Src/StartMenu/StartMenuDLL/ItemManager.cpp @@ -142,10 +142,11 @@ static bool DetectGrayscaleImage( const unsigned int *bits, int stride, int widt for (int x=0;x>24)&255; int r=(pixel>>16)&255; int g=(pixel>>8)&255; int b=(pixel)&255; - if (abs(r-g)>2 || abs(r-b)>2 || abs(g-b)>2) + if (abs(a-r)>2 || abs(r-g)>2 || abs(r-b)>2 || abs(g-b)>2) return false; // found colored pixel if (!(pixel&0xFF000000)) transparent++; From 261929f4c351fc404edc4180081d3fd20e1d4eba Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sat, 6 Jun 2020 23:49:47 +0200 Subject: [PATCH 009/234] Don't use obsolete /Gm switch `cl : command line warning D9035: option 'Gm' has been deprecated and will be removed in a future release` --- Src/ClassicExplorer/ClassicExplorer.vcxproj | 2 -- .../ClassicExplorerSettings/ClassicExplorerSettings.vcxproj | 1 - Src/ClassicIE/ClassicIE.vcxproj | 2 -- Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj | 2 -- Src/Setup/Setup.vcxproj | 1 - Src/Setup/SetupHelper/SetupHelper.vcxproj | 1 - Src/Setup/Utility/Utility.vcxproj | 2 -- Src/StartMenu/StartMenu.vcxproj | 2 -- Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj | 2 -- Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj | 2 -- Src/Update/Update.vcxproj | 1 - 11 files changed, 18 deletions(-) diff --git a/Src/ClassicExplorer/ClassicExplorer.vcxproj b/Src/ClassicExplorer/ClassicExplorer.vcxproj index 7fdc2cff0..9d79a5a0f 100644 --- a/Src/ClassicExplorer/ClassicExplorer.vcxproj +++ b/Src/ClassicExplorer/ClassicExplorer.vcxproj @@ -158,7 +158,6 @@ Disabled ..\Lib;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - false EnableFastChecks MultiThreadedDebug Use @@ -194,7 +193,6 @@ Disabled ..\Lib;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - false EnableFastChecks MultiThreadedDebug Use diff --git a/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj b/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj index 8e65901b6..4bbe79540 100644 --- a/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj +++ b/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj @@ -77,7 +77,6 @@ Disabled ..\..\Lib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug Level3 diff --git a/Src/ClassicIE/ClassicIE.vcxproj b/Src/ClassicIE/ClassicIE.vcxproj index 723cde502..42b34e621 100644 --- a/Src/ClassicIE/ClassicIE.vcxproj +++ b/Src/ClassicIE/ClassicIE.vcxproj @@ -142,7 +142,6 @@ Disabled ..\Lib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug NotUsing @@ -163,7 +162,6 @@ Disabled ..\Lib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug NotUsing diff --git a/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj b/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj index 8bd960c2a..6621e01bd 100644 --- a/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj +++ b/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj @@ -152,7 +152,6 @@ Disabled ..\..\Lib;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug Use @@ -187,7 +186,6 @@ Disabled ..\..\Lib;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug Use diff --git a/Src/Setup/Setup.vcxproj b/Src/Setup/Setup.vcxproj index 46cf10790..62ccbfe77 100644 --- a/Src/Setup/Setup.vcxproj +++ b/Src/Setup/Setup.vcxproj @@ -55,7 +55,6 @@ Disabled ..\Lib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug NotUsing diff --git a/Src/Setup/SetupHelper/SetupHelper.vcxproj b/Src/Setup/SetupHelper/SetupHelper.vcxproj index e8cd632a4..26e8e932c 100644 --- a/Src/Setup/SetupHelper/SetupHelper.vcxproj +++ b/Src/Setup/SetupHelper/SetupHelper.vcxproj @@ -53,7 +53,6 @@ Disabled ..\..\Lib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug NotUsing diff --git a/Src/Setup/Utility/Utility.vcxproj b/Src/Setup/Utility/Utility.vcxproj index 6524e75e5..c06b734fe 100644 --- a/Src/Setup/Utility/Utility.vcxproj +++ b/Src/Setup/Utility/Utility.vcxproj @@ -92,7 +92,6 @@ Disabled ..\..\Lib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug NotUsing @@ -112,7 +111,6 @@ Disabled ..\..\Lib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug NotUsing diff --git a/Src/StartMenu/StartMenu.vcxproj b/Src/StartMenu/StartMenu.vcxproj index 64ccc6c75..fa4f31e73 100644 --- a/Src/StartMenu/StartMenu.vcxproj +++ b/Src/StartMenu/StartMenu.vcxproj @@ -136,7 +136,6 @@ Disabled ..\Lib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - false EnableFastChecks MultiThreadedDebug Use @@ -159,7 +158,6 @@ Disabled ..\Lib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - false EnableFastChecks MultiThreadedDebug Use diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj b/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj index 6d8e38afd..5777b91ae 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj @@ -136,7 +136,6 @@ Disabled ..\..\Lib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions) - false EnableFastChecks MultiThreadedDebug Use @@ -161,7 +160,6 @@ Disabled ..\..\Lib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions) - false EnableFastChecks MultiThreadedDebug Use diff --git a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj index 91eaf75e2..be20133c6 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj +++ b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj @@ -157,7 +157,6 @@ Disabled ..\..\Lib;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug Use @@ -192,7 +191,6 @@ Disabled ..\..\Lib;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug Use diff --git a/Src/Update/Update.vcxproj b/Src/Update/Update.vcxproj index 3681e1660..013ace8cf 100644 --- a/Src/Update/Update.vcxproj +++ b/Src/Update/Update.vcxproj @@ -57,7 +57,6 @@ Disabled ..\Lib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug NotUsing From 9e297866ed3e4ca7010ea4572278c88dca33f349 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 7 Jun 2020 00:02:04 +0200 Subject: [PATCH 010/234] Register server with per-user redirection Some projects do register COM server in Debug/Release sonfigurations. We should do it with per-user redirection so that there is no need to run elevated Visual Studio. This has no effect on COM server registering in installed Opne-Shell. It is related only to local development. --- Src/ClassicExplorer/ClassicExplorer.vcxproj | 4 ++++ Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj | 4 ++++ Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/Src/ClassicExplorer/ClassicExplorer.vcxproj b/Src/ClassicExplorer/ClassicExplorer.vcxproj index 9d79a5a0f..d53ba9d65 100644 --- a/Src/ClassicExplorer/ClassicExplorer.vcxproj +++ b/Src/ClassicExplorer/ClassicExplorer.vcxproj @@ -177,6 +177,7 @@ .\$(TargetName).def true Windows + true @@ -212,6 +213,7 @@ .\$(TargetName).def true Windows + true @@ -249,6 +251,7 @@ Windows true true + true @@ -285,6 +288,7 @@ Windows true true + true diff --git a/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj b/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj index 6621e01bd..593f173a4 100644 --- a/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj +++ b/Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj @@ -170,6 +170,7 @@ .\$(TargetName).def true Windows + true @@ -204,6 +205,7 @@ .\$(TargetName).def true Windows + true @@ -240,6 +242,7 @@ Windows true true + true @@ -275,6 +278,7 @@ Windows true true + true diff --git a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj index be20133c6..31ac2de73 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj +++ b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj @@ -176,6 +176,7 @@ .\$(TargetName).def true Windows + true @@ -210,6 +211,7 @@ .\$(TargetName).def true Windows + true @@ -246,6 +248,7 @@ Windows true true + true @@ -281,6 +284,7 @@ Windows true true + true From 9c119c6e2912a524ca1a1134881cf1e59a51b94e Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sat, 6 Jun 2020 21:06:40 +0200 Subject: [PATCH 011/234] StartMenuHelper: Simplify shell extension registration --- Src/Setup/Utility/ManualUninstall.cpp | 60 +++++++++---------- .../StartMenuHelper/StartMenuHelper.cpp | 54 +++++++++-------- 2 files changed, 58 insertions(+), 56 deletions(-) diff --git a/Src/Setup/Utility/ManualUninstall.cpp b/Src/Setup/Utility/ManualUninstall.cpp index 478af74ea..a08a7bd5c 100644 --- a/Src/Setup/Utility/ManualUninstall.cpp +++ b/Src/Setup/Utility/ManualUninstall.cpp @@ -453,6 +453,32 @@ static void SaveReportFile( void ) } } +static void RemoveShellExtKey(const wchar_t* progID) +{ + static const auto ShellExtName = L"StartMenuExt"; + auto contextMenuHandlers = std::wstring(progID) + L"\\ShellEx\\ContextMenuHandlers"; + auto startMenuExt = contextMenuHandlers + L"\\" + ShellExtName; + + HKEY hkey = NULL; + if (RegOpenKeyEx(HKEY_CLASSES_ROOT, startMenuExt.c_str(), 0, KEY_READ | KEY_WOW64_64KEY, &hkey) == ERROR_SUCCESS) + { + RegCloseKey(hkey); + LogMessage(-1, L"Deleting registry key HKEY_CLASSES_ROOT\\%s", startMenuExt.c_str()); + auto error = RegCreateKeyEx(HKEY_CLASSES_ROOT, contextMenuHandlers.c_str(), NULL, NULL, REG_OPTION_BACKUP_RESTORE, KEY_WRITE | DELETE | KEY_WOW64_64KEY, NULL, &hkey, NULL); + if (error == ERROR_SUCCESS) + { + error = RegDeleteTree2(hkey, ShellExtName); + if (error != ERROR_SUCCESS && error != ERROR_FILE_NOT_FOUND) + LogMessage(error, L"Failed to delete registry key HKEY_CLASSES_ROOT\\%s.", startMenuExt.c_str()); + RegCloseKey(hkey); + } + else if (error != ERROR_FILE_NOT_FOUND) + { + LogMessage(error, L"Failed to open registry key HKEY_CLASSES_ROOT\\%s for writing.", contextMenuHandlers.c_str()); + } + } +} + static bool RemoveRegistryKeys( bool bPin ) { HKEY hkey=NULL; @@ -489,40 +515,10 @@ static bool RemoveRegistryKeys( bool bPin ) } } - hkey=NULL; if (bPin) { - if (RegOpenKeyEx(HKEY_CLASSES_ROOT,L"Launcher.ImmersiveApplication\\ShellEx\\ContextMenuHandlers\\StartMenuExt",0,KEY_READ|KEY_WOW64_64KEY,&hkey)==ERROR_SUCCESS) - { - RegCloseKey(hkey); - LogMessage(-1,L"Deleting registry key HKEY_CLASSES_ROOT\\Launcher.ImmersiveApplication\\ShellEx\\ContextMenuHandlers\\StartMenuExt"); - error=RegCreateKeyEx(HKEY_CLASSES_ROOT,L"Launcher.ImmersiveApplication\\ShellEx\\ContextMenuHandlers",NULL,NULL,REG_OPTION_BACKUP_RESTORE,KEY_WRITE|DELETE|KEY_WOW64_64KEY,NULL,&hkey,NULL); - if (error==ERROR_SUCCESS) - { - error=RegDeleteTree2(hkey,L"StartMenuExt"); - if (error!=ERROR_SUCCESS && error!=ERROR_FILE_NOT_FOUND) - LogMessage(error,L"Failed to delete registry key HKEY_CLASSES_ROOT\\Launcher.ImmersiveApplication\\ShellEx\\ContextMenuHandlers\\StartMenuExt."); - RegCloseKey(hkey); - } - else if (error!=ERROR_FILE_NOT_FOUND) - LogMessage(error,L"Failed to open registry key HKEY_CLASSES_ROOT\\Launcher.ImmersiveApplication\\ShellEx\\ContextMenuHandlers for writing."); - } - - if (RegOpenKeyEx(HKEY_CLASSES_ROOT,L"Launcher.SystemSettings\\ShellEx\\ContextMenuHandlers\\StartMenuExt",0,KEY_READ|KEY_WOW64_64KEY,&hkey)==ERROR_SUCCESS) - { - RegCloseKey(hkey); - LogMessage(-1,L"Deleting registry key HKEY_CLASSES_ROOT\\Launcher.SystemSettings\\ShellEx\\ContextMenuHandlers\\StartMenuExt"); - error=RegCreateKeyEx(HKEY_CLASSES_ROOT,L"Launcher.SystemSettings\\ShellEx\\ContextMenuHandlers",NULL,NULL,REG_OPTION_BACKUP_RESTORE,KEY_WRITE|DELETE|KEY_WOW64_64KEY,NULL,&hkey,NULL); - if (error==ERROR_SUCCESS) - { - error=RegDeleteTree2(hkey,L"StartMenuExt"); - if (error!=ERROR_SUCCESS && error!=ERROR_FILE_NOT_FOUND) - LogMessage(error,L"Failed to delete registry key HKEY_CLASSES_ROOT\\Launcher.SystemSettings\\ShellEx\\ContextMenuHandlers\\StartMenuExt."); - RegCloseKey(hkey); - } - else if (error!=ERROR_FILE_NOT_FOUND) - LogMessage(error,L"Failed to open registry key HKEY_CLASSES_ROOT\\Launcher.SystemSettings\\ShellEx\\ContextMenuHandlers for writing."); - } + RemoveShellExtKey(L"Launcher.ImmersiveApplication"); + RemoveShellExtKey(L"Launcher.SystemSettings"); } return true; diff --git a/Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp b/Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp index 8086f6f5d..7be7c2f7c 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp +++ b/Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp @@ -25,6 +25,8 @@ const CLSID g_ExplorerClsid= {0xECD4FC4D, 0x521C, 0x11D0, {0xB7, 0x92, 0x00, 0xA const CLSID g_EmulationClsid= {0xD3214FBB, 0x3CA1, 0x406A, {0xB3, 0xE8, 0x3E, 0xB7, 0xC3, 0x93, 0xA1, 0x5E}}; #define EMULATION_KEY L"TreatAs" +#define SHELLEXT_NAME L"StartMenuExt" + static void AdjustPrivileges( void ) { HANDLE hToken; @@ -46,6 +48,18 @@ static void AdjustPrivileges( void ) } } +static void AddShellExt(const wchar_t* progID, const LPSECURITY_ATTRIBUTES sa) +{ + HKEY hkey = NULL; + + if (RegCreateKeyEx(HKEY_CLASSES_ROOT, CString(progID) + L"\\ShellEx\\ContextMenuHandlers\\" SHELLEXT_NAME, NULL, NULL, REG_OPTION_BACKUP_RESTORE, KEY_WRITE, sa, &hkey, NULL) == ERROR_SUCCESS) + { + wchar_t val[] = L"{E595F05F-903F-4318-8B0A-7F633B520D2B}"; + RegSetValueEx(hkey, NULL, NULL, REG_SZ, (BYTE*)val, sizeof(val)); + RegCloseKey(hkey); + } +} + static void AddRegistryKeys( bool bPin ) { AdjustPrivileges(); @@ -103,21 +117,11 @@ static void AddRegistryKeys( bool bPin ) RegSetValueEx(hkey,NULL,NULL,REG_SZ,(BYTE*)val,sizeof(val)); RegCloseKey(hkey); } - hkey=NULL; + if (bPin) { - if (RegCreateKeyEx(HKEY_CLASSES_ROOT,L"Launcher.ImmersiveApplication\\ShellEx\\ContextMenuHandlers\\StartMenuExt",NULL,NULL,REG_OPTION_BACKUP_RESTORE,KEY_WRITE,&sa,&hkey,NULL)==ERROR_SUCCESS) - { - wchar_t val[]=L"{E595F05F-903F-4318-8B0A-7F633B520D2B}"; - RegSetValueEx(hkey,NULL,NULL,REG_SZ,(BYTE*)val,sizeof(val)); - RegCloseKey(hkey); - } - if (RegCreateKeyEx(HKEY_CLASSES_ROOT,L"Launcher.SystemSettings\\ShellEx\\ContextMenuHandlers\\StartMenuExt",NULL,NULL,REG_OPTION_BACKUP_RESTORE,KEY_WRITE,&sa,&hkey,NULL)==ERROR_SUCCESS) - { - wchar_t val[]=L"{E595F05F-903F-4318-8B0A-7F633B520D2B}"; - RegSetValueEx(hkey,NULL,NULL,REG_SZ,(BYTE*)val,sizeof(val)); - RegCloseKey(hkey); - } + AddShellExt(L"Launcher.ImmersiveApplication", &sa); + AddShellExt(L"Launcher.SystemSettings", &sa); } } } @@ -127,6 +131,16 @@ static void AddRegistryKeys( bool bPin ) FreeSid(pAdminSID); } +static void RemoveShellExt(const wchar_t* progID) +{ + HKEY hkey = NULL; + if (RegCreateKeyEx(HKEY_CLASSES_ROOT, CString(progID) + L"\\ShellEx\\ContextMenuHandlers", NULL, NULL, REG_OPTION_BACKUP_RESTORE, KEY_WRITE | DELETE, NULL, &hkey, NULL) == ERROR_SUCCESS) + { + RegDeleteTree(hkey, SHELLEXT_NAME); + RegCloseKey(hkey); + } +} + static void RemoveRegistryKeys( bool bPin ) { AdjustPrivileges(); @@ -136,19 +150,11 @@ static void RemoveRegistryKeys( bool bPin ) RegDeleteTree(hkey,EMULATION_KEY); RegCloseKey(hkey); } - hkey=NULL; + if (bPin) { - if (RegCreateKeyEx(HKEY_CLASSES_ROOT,L"Launcher.ImmersiveApplication\\ShellEx\\ContextMenuHandlers",NULL,NULL,REG_OPTION_BACKUP_RESTORE,KEY_WRITE|DELETE,NULL,&hkey,NULL)==ERROR_SUCCESS) - { - RegDeleteTree(hkey,L"StartMenuExt"); - RegCloseKey(hkey); - } - if (RegCreateKeyEx(HKEY_CLASSES_ROOT,L"Launcher.SystemSettings\\ShellEx\\ContextMenuHandlers",NULL,NULL,REG_OPTION_BACKUP_RESTORE,KEY_WRITE|DELETE,NULL,&hkey,NULL)==ERROR_SUCCESS) - { - RegDeleteTree(hkey,L"StartMenuExt"); - RegCloseKey(hkey); - } + RemoveShellExt(L"Launcher.ImmersiveApplication"); + RemoveShellExt(L"Launcher.SystemSettings"); } } From cc02e38aefc4d5fe3bb543fcd355f806fbfdd5bb Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sat, 6 Jun 2020 21:10:03 +0200 Subject: [PATCH 012/234] StartMenuHelper: Add shell extension to desktop packaged applications This will allow `Pin to start` for desktop applications downloaded from Microsoft Store (such as Windows Terminal). --- Src/Setup/Utility/ManualUninstall.cpp | 1 + Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Src/Setup/Utility/ManualUninstall.cpp b/Src/Setup/Utility/ManualUninstall.cpp index a08a7bd5c..6c0b0ad69 100644 --- a/Src/Setup/Utility/ManualUninstall.cpp +++ b/Src/Setup/Utility/ManualUninstall.cpp @@ -518,6 +518,7 @@ static bool RemoveRegistryKeys( bool bPin ) if (bPin) { RemoveShellExtKey(L"Launcher.ImmersiveApplication"); + RemoveShellExtKey(L"Launcher.DesktopPackagedApplication"); RemoveShellExtKey(L"Launcher.SystemSettings"); } diff --git a/Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp b/Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp index 7be7c2f7c..d54ce3690 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp +++ b/Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp @@ -121,6 +121,7 @@ static void AddRegistryKeys( bool bPin ) if (bPin) { AddShellExt(L"Launcher.ImmersiveApplication", &sa); + AddShellExt(L"Launcher.DesktopPackagedApplication", &sa); AddShellExt(L"Launcher.SystemSettings", &sa); } } @@ -154,6 +155,7 @@ static void RemoveRegistryKeys( bool bPin ) if (bPin) { RemoveShellExt(L"Launcher.ImmersiveApplication"); + RemoveShellExt(L"Launcher.DesktopPackagedApplication"); RemoveShellExt(L"Launcher.SystemSettings"); } } From fcf95a3ea6ef2e429fe04d2cbec7b062c39134c9 Mon Sep 17 00:00:00 2001 From: ale5000 Date: Sun, 14 Jun 2020 20:31:45 +0200 Subject: [PATCH 013/234] Readme: Fix folder for translations --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ee4cbef44..9f56096cd 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Translations/Language files/DLLs 1. Download .dlls from here [https://coddec.github.io/Classic-Shell/www.classicshell.net/translations/index.html](https://coddec.github.io/Classic-Shell/www.classicshell.net/translations/index.html) -2. After you download the DLL file you need to place it either in the Open-Shell's __install folder__ or in the __%ALLUSERSPROFILE%\Open-Shell\Languages__ folder. +2. After you download the DLL file you need to place it either in the Open-Shell's __install folder__ or in the __%ALLUSERSPROFILE%\OpenShell\Languages__ folder. --- From 473f7e1445036d44350493d464502d1c2f1d9012 Mon Sep 17 00:00:00 2001 From: rkagerer Date: Sun, 12 Jul 2020 10:33:45 -0700 Subject: [PATCH 014/234] Null check in PremultiplyBitmap() Blind attempt to eliminate a crash which seems to occur when PremultiplyBitmap() is called after LoadImage() fails. I'm hoping this might fix the issue reported here: https://github.com/Open-Shell/Open-Shell-Menu/issues/400 --- Src/Lib/ResourceHelper.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Src/Lib/ResourceHelper.cpp b/Src/Lib/ResourceHelper.cpp index 76b2d407c..3ab46510e 100644 --- a/Src/Lib/ResourceHelper.cpp +++ b/Src/Lib/ResourceHelper.cpp @@ -332,6 +332,7 @@ HBITMAP BitmapFromIcon( HICON hIcon, int iconSize, unsigned int **pBits, bool bD // Premultiplies a DIB section by the alpha channel and a given color void PremultiplyBitmap( HBITMAP hBitmap, COLORREF rgb ) { + if (hBitmap == NULL) return; BITMAP info; GetObject(hBitmap,sizeof(info),&info); int n=info.bmWidth*info.bmHeight; From 3bceac1515d9b4098f599cda21b1851959d1e76c Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Tue, 11 Aug 2020 21:01:55 +0200 Subject: [PATCH 015/234] ProgramsTree: Fix theme usage Obtain theme data for proper window. Fixes #415 --- Src/StartMenu/StartMenuDLL/ProgramsTree.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/ProgramsTree.cpp b/Src/StartMenu/StartMenuDLL/ProgramsTree.cpp index d937c756e..2e55c32b5 100644 --- a/Src/StartMenu/StartMenuDLL/ProgramsTree.cpp +++ b/Src/StartMenu/StartMenuDLL/ProgramsTree.cpp @@ -60,9 +60,9 @@ void CProgramsTree::Create( CMenuContainer *pOwner ) HWND hWnd=CreateWindowEx(0,WC_TREEVIEW,NULL,WS_CHILD|TVS_EDITLABELS|TVS_FULLROWSELECT|(CMenuContainer::s_TipHideTime?TVS_INFOTIP:0)|TVS_NOHSCROLL|TVS_SHOWSELALWAYS|TVS_NONEVENHEIGHT,0,0,0,0,pOwner->m_hWnd,NULL,g_Instance,NULL); TreeView_SetExtendedStyle(hWnd,TVS_EX_AUTOHSCROLL,TVS_EX_AUTOHSCROLL); const MenuSkin &skin=CMenuContainer::s_Skin; - m_TreeTheme=OpenThemeData(m_hWnd,L"treeview"); + m_TreeTheme=OpenThemeData(hWnd,L"treeview"); if (skin.BHasScrollbar) - m_ScrollTheme=OpenThemeData(m_hWnd,L"scrollbar"); + m_ScrollTheme=OpenThemeData(hWnd,L"scrollbar"); const MenuSkin::ItemDrawSettings &settings=skin.ItemSettings[MenuSkin::PROGRAMS_TREE_ITEM]; From 695e4197223838dcfe793c559dc477604c701ca9 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Fri, 14 Aug 2020 18:00:40 +0200 Subject: [PATCH 016/234] Setup: Use high version when doing local build This way the build can be installed over existing older installation. --- Src/Setup/__MakeFinal.bat | 2 +- Src/Setup/__MakeFinalAllLanguages.bat | 2 +- Src/Version.props | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Src/Setup/__MakeFinal.bat b/Src/Setup/__MakeFinal.bat index b66af6c4f..16bcdf1e4 100644 --- a/Src/Setup/__MakeFinal.bat +++ b/Src/Setup/__MakeFinal.bat @@ -7,7 +7,7 @@ rem Clean repository and build fresh. Will erase current changes so disabled by rem git clean -dfx rem Default version -set CS_VERSION=4.4.110 +set CS_VERSION=4.4.1000 if defined APPVEYOR_BUILD_VERSION ( set CS_VERSION=%APPVEYOR_BUILD_VERSION% diff --git a/Src/Setup/__MakeFinalAllLanguages.bat b/Src/Setup/__MakeFinalAllLanguages.bat index dfbe2a94e..ad73e7a04 100644 --- a/Src/Setup/__MakeFinalAllLanguages.bat +++ b/Src/Setup/__MakeFinalAllLanguages.bat @@ -9,7 +9,7 @@ rem Clean repository and build fresh. Will erase current changes so disabled by rem git clean -dfx rem Default version -set CS_VERSION=4.3.2 +set CS_VERSION=4.4.1000 if defined APPVEYOR_BUILD_VERSION ( set CS_VERSION=%APPVEYOR_BUILD_VERSION% diff --git a/Src/Version.props b/Src/Version.props index 8951258be..4345cbde9 100644 --- a/Src/Version.props +++ b/Src/Version.props @@ -4,7 +4,7 @@ - 4.3.2 + 4.4.1000 From ed3675ca7f50539bc87a425fb2f902645c826d02 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Thu, 13 Aug 2020 12:19:19 +0200 Subject: [PATCH 017/234] Remove non-working update component from installation We can add it later once it will be ready and working. --- Src/Setup/Setup.wxs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Src/Setup/Setup.wxs b/Src/Setup/Setup.wxs index 791b13902..4d414c2c8 100644 --- a/Src/Setup/Setup.wxs +++ b/Src/Setup/Setup.wxs @@ -103,10 +103,6 @@ IE_BUILD>=90000 - - - - @@ -473,9 +469,6 @@ - - - @@ -563,11 +556,6 @@ START_MENU_FOLDER=1 - - - - START_MENU_FOLDER=1 - From 1f6e06fc85d9872bd521163b46ee6d5bfdf433a5 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 23 Aug 2020 16:20:52 +0200 Subject: [PATCH 018/234] Use proper flag in LoadMetroIcon --- Src/StartMenu/StartMenuDLL/ItemManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/StartMenu/StartMenuDLL/ItemManager.cpp b/Src/StartMenu/StartMenuDLL/ItemManager.cpp index 0ff59c65a..72df24c2c 100644 --- a/Src/StartMenu/StartMenuDLL/ItemManager.cpp +++ b/Src/StartMenu/StartMenuDLL/ItemManager.cpp @@ -2442,7 +2442,7 @@ void CItemManager::LoadMetroIcon( IShellItem *pItem, int &refreshFlags, const Ic StoreInCache(hash,L"",NULL,hLargeBitmap,NULL,INFO_LARGE_ICON,smallIcon,largeIcon,extraLargeIcon,false,true); } } - if ((refreshFlags&INFO_SMALL_ICON) && SetResContextTargetSize(pResContext,EXTRA_LARGE_ICON_SIZE-delta)) + if ((refreshFlags&INFO_EXTRA_LARGE_ICON) && SetResContextTargetSize(pResContext,EXTRA_LARGE_ICON_SIZE-delta)) { CComString pLocation; if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation))) From 1f57c782e5e071a6474388405ecc5edb04219b31 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 23 Aug 2020 16:20:54 +0200 Subject: [PATCH 019/234] Modern settings shell folder Adds virtual shell folder that contains items representing modern settings parsed from `%windir%\ImmersiveControlPanel\Settings\AllSystemSettings_{253E530E-387D-4BC2-959D-E6F86122E5F2}.xml`. It can be accessed via `shell:::{82E749ED-B971-4550-BAF7-06AA2BF7E836}` (in explorer). Item in folder will open given setting page in `Settings` application. --- .../StartMenuHelper/ModernSettings.cpp | 434 +++++++++++++ .../StartMenuHelper/ModernSettings.h | 139 ++++ .../ModernSettingsContextMenu.cpp | 169 +++++ .../ModernSettingsContextMenu.h | 60 ++ .../ModernSettingsContextMenu.rgs | 19 + .../ModernSettingsShellFolder.cpp | 603 ++++++++++++++++++ .../ModernSettingsShellFolder.h | 84 +++ .../ModernSettingsShellFolder.rgs | 26 + .../StartMenuHelper/StartMenuHelper.idl | 18 + .../StartMenuHelper/StartMenuHelper.rc | 2 + .../StartMenuHelper/StartMenuHelper.vcxproj | 8 + .../StartMenuHelper.vcxproj.filters | 24 + Src/StartMenu/StartMenuHelper/resource.h | 4 +- 13 files changed, 1589 insertions(+), 1 deletion(-) create mode 100644 Src/StartMenu/StartMenuHelper/ModernSettings.cpp create mode 100644 Src/StartMenu/StartMenuHelper/ModernSettings.h create mode 100644 Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp create mode 100644 Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.h create mode 100644 Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.rgs create mode 100644 Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.cpp create mode 100644 Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h create mode 100644 Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.rgs diff --git a/Src/StartMenu/StartMenuHelper/ModernSettings.cpp b/Src/StartMenu/StartMenuHelper/ModernSettings.cpp new file mode 100644 index 000000000..1ef7bfdf1 --- /dev/null +++ b/Src/StartMenu/StartMenuHelper/ModernSettings.cpp @@ -0,0 +1,434 @@ +// Modern settings helper + +// - parse modern settings definitions from %windir%\ImmersiveControlPanel\Settings\AllSystemSettings_{253E530E-387D-4BC2-959D-E6F86122E5F2}.xml +// - store cached data (parsed settings, localized strings) in %LOCALAPPDATA%\OpenShell\ModernSettings.dat +// - provide mapped view over cached data + +#include "stdafx.h" +#include "ModernSettings.h" +#include "ResourceHelper.h" +#include +#include +#include +#include +#include + +enum class Id : uint32_t +{ + Header = 'SMSO', + Undef = 0, + Blob, + FileName, + DeepLink, + Icon, + Glyph, + PageId, + HostId, + GroupId, + SettingId, + Description, + Keywords, +}; + +#pragma pack(1) +struct FileHdr +{ + uint32_t openShellVersion = GetVersionEx(g_Instance); + uint32_t windowsVersion = GetVersionEx(GetModuleHandle(L"user32.dll")); + uint32_t userLanguageId = GetUserDefaultUILanguage(); + + bool operator==(const FileHdr& other) const + { + return (windowsVersion == other.windowsVersion) && + (openShellVersion == other.openShellVersion) && + (userLanguageId == other.userLanguageId); + } +}; + +struct ItemHdr +{ + Id id; + uint32_t size; + + const uint8_t* data() const + { + return (const uint8_t*)this + sizeof(*this); + } + + const ItemHdr* next() const + { + return (const ItemHdr*)(data() + size); + } + + std::wstring_view asString() const + { + std::wstring_view retval((const wchar_t*)data(), size / sizeof(wchar_t)); + if (!retval.empty() && retval.back() == 0) + { + retval.remove_suffix(1); + return retval; + } + + return {}; + } +}; +#pragma pack() + +class AttributeWriter +{ +public: + std::vector buffer() + { + return std::move(m_buffer); + } + + void addBlob(Id id, const void* data, size_t size) + { + ItemHdr hdr{ id, (uint32_t)size }; + append(&hdr, sizeof(hdr)); + append(data, size); + } + + void addString(Id id, const std::wstring& str) + { + if (!str.empty()) + addBlob(id, str.data(), (str.size() + 1) * sizeof(str[0])); + } + +private: + void append(const void* data, size_t size) + { + m_buffer.insert(m_buffer.end(), (const uint8_t*)data, (const uint8_t*)data + size); + } + + std::vector m_buffer; +}; + +static void ProcessAttributes(const void* buffer, size_t size, std::function callback) +{ + if (size < sizeof(ItemHdr)) + return; + + auto item = (const ItemHdr*)buffer; + auto last = (const ItemHdr*)((const uint8_t*)buffer + size); + + while (item < last) + { + auto next = item->next(); + if (next <= item || next > last) + break; + + callback(*item); + + item = next; + } +} + +/// + +static std::wstring TranslateIndirectString(const WCHAR* string) +{ + std::wstring retval; + retval.resize(1024); + + if (SUCCEEDED(::SHLoadIndirectString(string, retval.data(), (UINT)retval.size(), nullptr))) + { + retval.resize(wcslen(retval.data())); + return retval; + } + + return {}; +} + +static std::wstring TranslateIndirectMultiString(const WCHAR* string) +{ + std::wstring retval; + std::wstring_view str(string); + + // remove '@' + str.remove_prefix(1); + + while (!str.empty()) + { + auto len = str.find(L'@', 1); + if (len == std::wstring::npos) + len = str.length(); + + std::wstring tmp(str.substr(0, len)); + retval += TranslateIndirectString(tmp.c_str()); + + str.remove_prefix(len); + } + + return retval; +} + +static std::wstring GetTranslatedString(CComPtr& parent, const WCHAR* name) +{ + CComPtr node; + if (parent->selectSingleNode(CComBSTR(name), &node) == S_OK) + { + CComBSTR value; + if (node->get_text(&value) == S_OK) + { + if (value[0] == L'@') + { + if (value[1] == L'@') + return TranslateIndirectMultiString(value); + else + return TranslateIndirectString(value); + } + else + { + return (LPWSTR)value; + } + } + } + + return {}; +} + +static void ParseFileName(CComPtr& parent, AttributeWriter& writer) +{ + writer.addString(Id::FileName, GetTranslatedString(parent, L"Filename")); +} + +static void ParseApplicationInformation(CComPtr& parent, AttributeWriter& writer) +{ + CComPtr node; + if (parent->selectSingleNode(CComBSTR(L"ApplicationInformation"), &node) == S_OK) + { + writer.addString(Id::DeepLink, GetTranslatedString(node, L"DeepLink")); + writer.addString(Id::Icon, GetTranslatedString(node, L"Icon")); + writer.addString(Id::Glyph, GetTranslatedString(node, L"Glyph")); + } +} + +static void ParseSettingIdentity(CComPtr& parent, AttributeWriter& writer) +{ + CComPtr node; + if (parent->selectSingleNode(CComBSTR(L"SettingIdentity"), &node) == S_OK) + { + writer.addString(Id::PageId, GetTranslatedString(node, L"PageID")); + writer.addString(Id::HostId, GetTranslatedString(node, L"HostID")); + writer.addString(Id::GroupId, GetTranslatedString(node, L"GroupID")); + writer.addString(Id::SettingId, GetTranslatedString(node, L"SettingID")); + } +} + +static void ParseSettingInformation(CComPtr& parent, AttributeWriter& writer) +{ + CComPtr node; + if (parent->selectSingleNode(CComBSTR(L"SettingInformation"), &node) == S_OK) + { + auto description = GetTranslatedString(node, L"Description"); + if (description.empty()) + description = GetTranslatedString(node, L"Name"); + + writer.addString(Id::Description, description); + + auto keywords = GetTranslatedString(node, L"HighKeywords"); + keywords += GetTranslatedString(node, L"LowKeywords"); + keywords += GetTranslatedString(node, L"Keywords"); + + writer.addString(Id::Keywords, keywords); + } +} + +static std::vector ParseSetting(CComPtr& parent) +{ + AttributeWriter writer; + + ParseFileName(parent, writer); + ParseApplicationInformation(parent, writer); + ParseSettingIdentity(parent, writer); + ParseSettingInformation(parent, writer); + + return writer.buffer(); +} + +static std::vector ParseModernSettings() +{ + AttributeWriter writer; + + CComPtr doc; + if (SUCCEEDED(doc.CoCreateInstance(L"Msxml2.FreeThreadedDOMDocument"))) + { + doc->put_async(VARIANT_FALSE); + + wchar_t path[MAX_PATH]{}; + wcscpy_s(path, LR"(%windir%\ImmersiveControlPanel\Settings\AllSystemSettings_{253E530E-387D-4BC2-959D-E6F86122E5F2}.xml)"); + DoEnvironmentSubst(path, _countof(path)); + + VARIANT_BOOL loaded; + if (SUCCEEDED(doc->load(CComVariant(path), &loaded)) && loaded) + { + CComPtr root; + if (doc->selectSingleNode(CComBSTR(L"PCSettings"), &root) == S_OK) + { + FileHdr hdr{}; + writer.addBlob(Id::Header, &hdr, sizeof(hdr)); + + CComPtr node; + root->get_firstChild(&node); + while (node) + { + auto buffer = ParseSetting(node); + if (!buffer.empty()) + writer.addBlob(Id::Blob, buffer.data(), buffer.size()); + + CComPtr next; + if (FAILED(node->get_nextSibling(&next))) + break; + node = next; + } + } + } + } + + return writer.buffer(); +} + +ModernSettings::ModernSettings(const wchar_t* fname) : m_storage(fname) +{ + if (m_storage) + { + bool valid = false; + auto s = m_storage.get(); + ProcessAttributes(s.data, s.size, [&](const ItemHdr& item) { + switch (item.id) + { + case Id::Header: + if (item.size >= sizeof(FileHdr)) + { + const auto hdr = (const FileHdr*)item.data(); + if (FileHdr() == *hdr) + valid = true; + } + break; + case Id::Blob: + if (valid) + { + const Blob blob = { item.data(), item.size }; + ModernSettings::Setting s(blob); + if (s) + m_settings.emplace(s.fileName, blob); + } + break; + } + }); + } +} + +ModernSettings::Setting::Setting(const Blob& blob) +{ + ProcessAttributes(blob.data, blob.size, [&](const ItemHdr& item) { + switch (item.id) + { + case Id::FileName: + fileName = item.asString(); + break; + case Id::DeepLink: + deepLink = item.asString(); + break; + case Id::Glyph: + glyph = item.asString(); + break; + case Id::Icon: + icon = item.asString(); + break; + case Id::PageId: + pageId = item.asString(); + break; + case Id::HostId: + hostId = item.asString(); + break; + case Id::GroupId: + groupId = item.asString(); + break; + case Id::SettingId: + settingId = item.asString(); + break; + case Id::Description: + description = item.asString();; + break; + case Id::Keywords: + keywords = item.asString(); + break; + } + }); +} + +std::vector ModernSettings::enumerate() const +{ + std::vector retval; + retval.reserve(m_settings.size()); + + for (const auto& i : m_settings) + retval.emplace_back(i.second); + + return retval; +} + +ModernSettings::Setting ModernSettings::get(const std::wstring_view& name) const +{ + auto it = m_settings.find(name); + if (it != m_settings.end()) + return { (*it).second }; + + return {}; +} + +static std::mutex s_lock; +static std::shared_ptr s_settings; + +std::wstring GetLocalAppData() +{ + WCHAR path[MAX_PATH]{}; + wcscpy_s(path, L"%LOCALAPPDATA%\\OpenShell"); + DoEnvironmentSubst(path, _countof(path)); + + // make sure directory exists + SHCreateDirectory(nullptr, path); + + return { path }; +} + +std::shared_ptr GetModernSettings() +{ + std::unique_lock l(s_lock); + + if (!s_settings) + { + auto path = GetLocalAppData(); + path += L"\\ModernSettings.dat"; + + // try to open cached settings + s_settings = std::make_shared(path.c_str()); + if (s_settings->size() == 0) + { + // file doesn't exist or wrong format + s_settings.reset(); + + // re-parse settings + auto buffer = ParseModernSettings(); + if (!buffer.empty()) + { + // store to file + { + File f(path.c_str(), GENERIC_WRITE, 0, CREATE_ALWAYS); + if (f) + { + DWORD written; + ::WriteFile(f, buffer.data(), (DWORD)buffer.size(), &written, nullptr); + } + } + + // and try again + s_settings = std::make_shared(path.c_str()); + } + } + } + + return s_settings; +} diff --git a/Src/StartMenu/StartMenuHelper/ModernSettings.h b/Src/StartMenu/StartMenuHelper/ModernSettings.h new file mode 100644 index 000000000..1795a3362 --- /dev/null +++ b/Src/StartMenu/StartMenuHelper/ModernSettings.h @@ -0,0 +1,139 @@ +// Modern settings helper + +#pragma once + +#include +#include +#include +#include + +struct Blob +{ + const void* data = nullptr; + size_t size = 0; +}; + +class File +{ +public: + File(const WCHAR* fileName, DWORD desiredAccess, DWORD shareMode, DWORD creationDisposition = OPEN_EXISTING, DWORD flagsAndAttributes = FILE_ATTRIBUTE_NORMAL) + { + m_handle = ::CreateFile(fileName, desiredAccess, shareMode, nullptr, creationDisposition, flagsAndAttributes, nullptr); + } + + ~File() + { + if (m_handle != INVALID_HANDLE_VALUE) + ::CloseHandle(m_handle); + } + + File(const File&) = delete; + File& operator=(const File&) = delete; + + explicit operator bool() const + { + return (m_handle != INVALID_HANDLE_VALUE); + } + + operator HANDLE() const + { + return m_handle; + } + + uint64_t size() const + { + LARGE_INTEGER li = {}; + return ::GetFileSizeEx(m_handle, &li) ? li.QuadPart : (uint64_t)-1; + } + +private: + HANDLE m_handle; +}; + +class MappedFile +{ +public: + MappedFile(const WCHAR* fileName) : m_file(fileName, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE) + { + if (m_file) + { + auto mapping = ::CreateFileMapping(m_file, nullptr, PAGE_READONLY, 0, 0, nullptr); + if (mapping) + { + m_view.data = ::MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + if (m_view.data) + m_view.size = (size_t)m_file.size(); + + ::CloseHandle(mapping); + } + } + } + + ~MappedFile() + { + if (m_view.data) + ::UnmapViewOfFile(m_view.data); + } + + MappedFile(const MappedFile&) = delete; + MappedFile& operator=(const MappedFile&) = delete; + + explicit operator bool() const + { + return (m_view.data != nullptr); + } + + Blob get() const + { + return m_view; + } + +private: + File m_file; + Blob m_view; +}; + +class ModernSettings +{ +public: + ModernSettings(const wchar_t* fname); + + size_t size() const + { + return m_settings.size(); + } + + struct Setting + { + std::wstring_view fileName; + + std::wstring_view deepLink; + std::wstring_view icon; + std::wstring_view glyph; + + std::wstring_view pageId; + std::wstring_view hostId; + std::wstring_view groupId; + std::wstring_view settingId; + std::wstring_view description; + std::wstring_view keywords; + + Setting() = default; + Setting(const Blob& blob); + + explicit operator bool() const + { + return !fileName.empty(); + } + }; + + std::vector enumerate() const; + Setting get(const std::wstring_view& name) const; + +private: + MappedFile m_storage; + std::map m_settings; +}; + +// retrieve actual instance of ModernSettings +std::shared_ptr GetModernSettings(); diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp new file mode 100644 index 000000000..549b774b6 --- /dev/null +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp @@ -0,0 +1,169 @@ +// Context menu handler for Open-Shell Modern Settings shell folder + +// Based on Explorer Data Provider Sample (https://docs.microsoft.com/en-us/windows/win32/shell/samples-explorerdataprovider) + +#include "stdafx.h" +#include "ModernSettings.h" +#include "ModernSettingsContextMenu.h" + +#define MENUVERB_OPEN 0 + +struct ICIVERBTOIDMAP +{ + LPCWSTR pszCmd; // verbW + LPCSTR pszCmdA; // verbA + UINT idCmd; // hmenu id +}; + +static const ICIVERBTOIDMAP g_ContextMenuIDMap[] = +{ + { L"open", "open", MENUVERB_OPEN }, + { NULL, NULL, (UINT)-1 } +}; + +HRESULT _MapICIVerbToCmdID(LPCMINVOKECOMMANDINFO pici, UINT* pid) +{ + if (IS_INTRESOURCE(pici->lpVerb)) + { + *pid = LOWORD((UINT_PTR)pici->lpVerb); + return S_OK; + } + + if (pici->fMask & CMIC_MASK_UNICODE) + { + for (const auto& i : g_ContextMenuIDMap) + { + if (StrCmpIC(((LPCMINVOKECOMMANDINFOEX)pici)->lpVerbW, i.pszCmd) == 0) + { + *pid = i.idCmd; + return S_OK; + } + } + } + else + { + for (const auto& i : g_ContextMenuIDMap) + { + if (StrCmpICA(pici->lpVerb, i.pszCmdA) == 0) + { + *pid = i.idCmd; + return S_OK; + } + } + } + + return E_FAIL; +} + +static bool ActivateModernSettingPage(const WCHAR* page) +{ + CComPtr mgr; + mgr.CoCreateInstance(CLSID_ApplicationActivationManager); + if (mgr) + { + DWORD pid = 0; + return SUCCEEDED(mgr->ActivateApplication(L"windows.immersivecontrolpanel_cw5n1h2txyewy!microsoft.windows.immersivecontrolpanel", page, AO_NONE, &pid)); + } + + return false; +} + +extern ModernSettings::Setting GetModernSetting(LPCITEMIDLIST pidl); + +static HRESULT OpenItemByPidl(LPCITEMIDLIST pidl) +{ + auto child = ILFindLastID(pidl); + auto setting = GetModernSetting(child); + + if (!setting) + return E_INVALIDARG; + + if (setting.hostId == L"{6E6DDBCB-9C89-434B-A994-D5F22239523B}") + { + std::wstring cmd(L"windowsdefender://"); + cmd += setting.deepLink; + + return (intptr_t)::ShellExecute(nullptr, L"open", cmd.c_str(), nullptr, nullptr, SW_SHOWNORMAL) > 32 ? S_OK : E_FAIL; + } + + if (setting.pageId.empty()) + return E_INVALIDARG; + + std::wstring page; + + page += L"page="; + page += setting.pageId; + + if (!setting.settingId.empty()) + { + page += L"&target="; + page += setting.settingId; + } + else if (!setting.groupId.empty()) + { + page += L"&group="; + page += setting.groupId; + } + + page += L"&ActivationType=Search"; + + ActivateModernSettingPage(page.c_str()); + + return S_OK; +} + + +// CModernSettingsContextMenu + +HRESULT CModernSettingsContextMenu::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT /* idCmdLast */, UINT /* uFlags */) +{ + InsertMenu(hmenu, indexMenu++, MF_BYPOSITION, idCmdFirst + MENUVERB_OPEN, L"Open"); + // other verbs could go here... + + // indicate that we added one verb. + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (USHORT)(1)); +} + +HRESULT CModernSettingsContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO pici) +{ + HRESULT hr = E_INVALIDARG; + UINT uID; + // Is this command for us? + if (SUCCEEDED(_MapICIVerbToCmdID(pici, &uID))) + { + if (uID == MENUVERB_OPEN && m_pdtobj) + { + LPITEMIDLIST pidl; + hr = SHGetIDListFromObject(m_pdtobj, &pidl); + if (SUCCEEDED(hr)) + { + hr = OpenItemByPidl(pidl); + ILFree(pidl); + } + } + } + + return hr; +} + +HRESULT CModernSettingsContextMenu::GetCommandString(UINT_PTR /* idCmd */, UINT /* uType */, UINT* /* pRes */, LPSTR /* pszName */, UINT /* cchMax */) +{ + return E_NOTIMPL; +} + +HRESULT CModernSettingsContextMenu::Initialize(PCIDLIST_ABSOLUTE /* pidlFolder */, IDataObject* pdtobj, HKEY /* hkeyProgID */) +{ + m_pdtobj = pdtobj; + return S_OK; +} + +HRESULT CModernSettingsContextMenu::SetSite(IUnknown* punkSite) +{ + m_punkSite = punkSite; + return S_OK; +} + +HRESULT CModernSettingsContextMenu::GetSite(REFIID riid, void** ppvSite) +{ + return m_punkSite ? m_punkSite->QueryInterface(riid, ppvSite) : E_FAIL; +} diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.h b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.h new file mode 100644 index 000000000..78fe1f16b --- /dev/null +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.h @@ -0,0 +1,60 @@ +// Context menu handler for Open-Shell Modern Settings shell folder + +#pragma once +#include "resource.h" +#include "StartMenuHelper_i.h" +#include + +// CModernSettingsContextMenu + +class ATL_NO_VTABLE CModernSettingsContextMenu : + public CComObjectRootEx, + public CComCoClass, + public IContextMenu, + public IShellExtInit, + public IObjectWithSite +{ +public: + CModernSettingsContextMenu() + { + } + +DECLARE_REGISTRY_RESOURCEID(IDR_MODERNSETTINGSCONTEXTMENU) + +DECLARE_NOT_AGGREGATABLE(CModernSettingsContextMenu) + +BEGIN_COM_MAP(CModernSettingsContextMenu) + COM_INTERFACE_ENTRY(IContextMenu) + COM_INTERFACE_ENTRY(IShellExtInit) + COM_INTERFACE_ENTRY(IObjectWithSite) +END_COM_MAP() + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + HRESULT FinalConstruct() + { + return S_OK; + } + + void FinalRelease() + { + } + + // IContextMenu + IFACEMETHODIMP QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); + IFACEMETHODIMP InvokeCommand(LPCMINVOKECOMMANDINFO lpici); + IFACEMETHODIMP GetCommandString(UINT_PTR idCmd, UINT uType, UINT* pRes, LPSTR pszName, UINT cchMax); + + // IShellExtInit + IFACEMETHODIMP Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject* pdtobj, HKEY hkeyProgID); + + // IObjectWithSite + IFACEMETHODIMP SetSite(IUnknown* punkSite); + IFACEMETHODIMP GetSite(REFIID riid, void** ppvSite); + +private: + CComPtr m_pdtobj; + CComPtr m_punkSite; +}; + +OBJECT_ENTRY_AUTO(__uuidof(ModernSettingsContextMenu), CModernSettingsContextMenu) diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.rgs b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.rgs new file mode 100644 index 000000000..ad8bce577 --- /dev/null +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.rgs @@ -0,0 +1,19 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {5ab14324-c087-42c1-b905-a0bfdb4e9532} = s 'Open-Shell Modern Settings Context Menu' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + ShellEx + { + MayChangeDefaultMenu = s '' + { + } + } + } + } +} diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.cpp b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.cpp new file mode 100644 index 000000000..21f944356 --- /dev/null +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.cpp @@ -0,0 +1,603 @@ +// Open-Shell Modern Settings shell folder +// Provides folder that contains all modern settings +// +// To open the folder press Win+R and type: +// shell:::{82E749ED-B971-4550-BAF7-06AA2BF7E836} + +// Based on Explorer Data Provider Sample (https://docs.microsoft.com/en-us/windows/win32/shell/samples-explorerdataprovider) + +#include "stdafx.h" +#include "ModernSettings.h" +#include "ModernSettingsShellFolder.h" +#include +#include +#include + +struct ColumnDescription +{ + const wchar_t* name; + PROPERTYKEY key; +}; + +static const ColumnDescription g_columnDescriptions[] = +{ + {L"Name", PKEY_ItemNameDisplay}, + {L"Keywords", PKEY_Keywords}, + {L"Filename", PKEY_FileName}, +}; + +#define MAGIC 'SMSO' + +#pragma pack(1) +struct FVITEMID +{ + USHORT cb; + DWORD magic; + WORD size; + wchar_t data[1]; +}; +#pragma pack() + +static const FVITEMID* PidlToItem(LPCITEMIDLIST pidl) +{ + if (pidl) + { + auto item = (const FVITEMID*)pidl; + if (item->cb && item->magic == MAGIC) + return item; + } + + return nullptr; +} + +ModernSettings::Setting GetModernSetting(LPCITEMIDLIST pidl) +{ + auto item = PidlToItem(pidl); + if (item) + { + auto settings = GetModernSettings(); + if (settings) + return settings->get({ item->data, item->size / sizeof(wchar_t) }); + } + + return {}; +} + +STDAPI StringToStrRet(PCWSTR pszName, STRRET* pStrRet) +{ + pStrRet->uType = STRRET_WSTR; + return SHStrDup(pszName, &pStrRet->pOleStr); +} + +// CModernSettingsShellFolderEnumIDList + +class ATL_NO_VTABLE CModernSettingsShellFolderEnumIDList : + public CComObjectRoot, + public IEnumIDList +{ +public: + BEGIN_COM_MAP(CModernSettingsShellFolderEnumIDList) + COM_INTERFACE_ENTRY(IEnumIDList) + END_COM_MAP() + + // IEnumIDList + IFACEMETHODIMP Next(ULONG celt, PITEMID_CHILD* rgelt, ULONG* pceltFetched) + { + ULONG celtFetched = 0; + + HRESULT hr = (pceltFetched || celt <= 1) ? S_OK : E_INVALIDARG; + if (SUCCEEDED(hr)) + { + ULONG i = 0; + while (SUCCEEDED(hr) && i < celt && m_item < m_items.size()) + { + const auto& s = m_items[m_item]; + if ((s.hostId.empty() && s.deepLink.empty()) || + (s.hostId == L"{6E6DDBCB-9C89-434B-A994-D5F22239523B}" && !s.deepLink.empty())) + { + hr = m_parent->CreateChildID(s.fileName, &rgelt[i]); + if (SUCCEEDED(hr)) + { + celtFetched++; + i++; + } + } + + m_item++; + } + } + + if (pceltFetched) + *pceltFetched = celtFetched; + + return (celtFetched == celt) ? S_OK : S_FALSE; + } + IFACEMETHODIMP Skip(DWORD celt) + { + m_item += celt; + return S_OK; + } + IFACEMETHODIMP Reset() + { + m_item = 0; + return S_OK; + } + IFACEMETHODIMP Clone(IEnumIDList** ppenum) + { + // this method is rarely used and it's acceptable to not implement it. + *ppenum = NULL; + return E_NOTIMPL; + } + + void Initialize(CModernSettingsShellFolder* parent) + { + m_parent = parent; + + m_settings = GetModernSettings(); + if (m_settings) + m_items = m_settings->enumerate(); + } + +private: + CComPtr m_parent; + std::shared_ptr m_settings; + std::vector m_items; + DWORD m_item = 0; +}; + +// Extract icon + +static void BitmapDataToStraightAlpha(void* bits, UINT width, UINT height) +{ + RGBQUAD* data = (RGBQUAD*)bits; + for (UINT y = 0; y < height; y++) + { + for (UINT x = 0; x < width; x++) + { + auto alpha = data->rgbReserved; + if (alpha) + { + data->rgbBlue = (BYTE)((DWORD)data->rgbBlue * 255 / alpha); + data->rgbGreen = (BYTE)((DWORD)data->rgbGreen * 255 / alpha); + data->rgbRed = (BYTE)((DWORD)data->rgbRed * 255 / alpha); + } + data++; + } + } +} + +HICON IconFromGlyph(UINT glyph, UINT size) +{ + ICONINFO info{}; + + info.fIcon = TRUE; + info.hbmMask = CreateBitmap(size, size, 1, 1, nullptr); + + BITMAPINFO bi{}; + bi.bmiHeader.biSize = sizeof(bi.bmiHeader); + bi.bmiHeader.biWidth = size; + bi.bmiHeader.biHeight = -((LONG)size); + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 32; + + void* bits = nullptr; + info.hbmColor = CreateDIBSection(nullptr, &bi, 0, &bits, nullptr, 0); + + HDC dc = CreateCompatibleDC(nullptr); + SelectObject(dc, info.hbmColor); + + HFONT font = CreateFontW(size, 0, 0, 0, 400, 0, 0, 0, 1, 0, 0, 0, 0, L"Segoe MDL2 Assets"); + SelectObject(dc, font); + + RECT rc{}; + rc.right = size; + rc.bottom = size; + + auto theme = OpenThemeData(nullptr, L"CompositedWindow::Window"); + DTTOPTS opts{}; + opts.dwSize = sizeof(opts); + opts.dwFlags = DTT_TEXTCOLOR | DTT_COMPOSITED; + opts.crText = 0x00FFFFFF; + DrawThemeTextEx(theme, dc, 0, 0, (LPCWSTR)&glyph, 1, DT_CENTER | DT_VCENTER | DT_SINGLELINE, &rc, &opts); + CloseThemeData(theme); + + DeleteObject(font); + DeleteDC(dc); + + BitmapDataToStraightAlpha(bits, size, size); + + HICON retval = CreateIconIndirect(&info); + + DeleteObject(info.hbmColor); + DeleteObject(info.hbmMask); + + return retval; +} + +class ATL_NO_VTABLE GlyphExtractIcon : + public CComObjectRoot, + public IExtractIconW +{ +public: + + BEGIN_COM_MAP(GlyphExtractIcon) + COM_INTERFACE_ENTRY(IExtractIconW) + END_COM_MAP() + + void SetGlyph(USHORT glyph) + { + m_glyph = glyph; + } + + // IExtractIconW methods + IFACEMETHODIMP GetIconLocation(UINT uFlags, _Out_writes_(cchMax) PWSTR pszIconFile, UINT cchMax, _Out_ int* piIndex, _Out_ UINT* pwFlags) + { + StringCchCopy(pszIconFile, cchMax, L"OpenShell-ModernSettingIcon"); + *piIndex = m_glyph; + *pwFlags = GIL_NOTFILENAME; + return S_OK; + } + IFACEMETHODIMP Extract(_In_ PCWSTR pszFile, UINT nIconIndex, _Out_opt_ HICON* phiconLarge, _Out_opt_ HICON* phiconSmall, UINT nIconSize) + { + if (phiconLarge) + *phiconLarge = IconFromGlyph(nIconIndex, LOWORD(nIconSize)); + if (phiconSmall) + *phiconSmall = IconFromGlyph(nIconIndex, HIWORD(nIconSize)); + return S_OK; + } + +private: + USHORT m_glyph = 0; +}; + + +// CModernSettingsShellFolder + +// IShellFolder methods + +// Translates a display name into an item identifier list. +HRESULT CModernSettingsShellFolder::ParseDisplayName(HWND hwnd, IBindCtx* pbc, PWSTR pszName, ULONG* pchEaten, PIDLIST_RELATIVE* ppidl, ULONG* pdwAttributes) +{ + return E_INVALIDARG; +} + +// Allows a client to determine the contents of a folder by +// creating an item identifier enumeration object and returning +// its IEnumIDList interface. The methods supported by that +// interface can then be used to enumerate the folder's contents. +HRESULT CModernSettingsShellFolder::EnumObjects(HWND /* hwnd */, DWORD grfFlags, IEnumIDList** ppenumIDList) +{ + CComObject* enumIdList; + auto hr = CComObject::CreateInstance(&enumIdList); + if (SUCCEEDED(hr)) + { + enumIdList->Initialize(this); + hr = enumIdList->QueryInterface(IID_PPV_ARGS(ppenumIDList)); + } + + return hr; +} + +// Factory for handlers for the specified item. +HRESULT CModernSettingsShellFolder::BindToObject(PCUIDLIST_RELATIVE pidl, IBindCtx* pbc, REFIID riid, void** ppv) +{ + return E_NOINTERFACE; +} + +HRESULT CModernSettingsShellFolder::BindToStorage(PCUIDLIST_RELATIVE pidl, IBindCtx* pbc, REFIID riid, void** ppv) +{ + return BindToObject(pidl, pbc, riid, ppv); +} + +// Called to determine the equivalence and/or sort order of two idlists. +HRESULT CModernSettingsShellFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) +{ + UINT column = LOWORD(lParam); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (USHORT)(StrCmp(GetColumnDisplayName(pidl1, column).data(), GetColumnDisplayName(pidl2, column).data()))); +} + +// Called by the Shell to create the View Object and return it. +HRESULT CModernSettingsShellFolder::CreateViewObject(HWND hwnd, REFIID riid, void** ppv) +{ + HRESULT hr = E_NOINTERFACE; + *ppv = NULL; + + if (riid == IID_IShellView) + { + SFV_CREATE csfv = { sizeof(csfv), 0 }; + hr = QueryInterface(IID_PPV_ARGS(&csfv.pshf)); + if (SUCCEEDED(hr)) + { + hr = SHCreateShellFolderView(&csfv, (IShellView**)ppv); + csfv.pshf->Release(); + } + } + + return hr; +} + +// Retrieves the attributes of one or more file objects or subfolders. +HRESULT CModernSettingsShellFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, ULONG* rgfInOut) +{ + *rgfInOut &= SFGAO_CANLINK; + return S_OK; +} + +// Retrieves an OLE interface that can be used to carry out +// actions on the specified file objects or folders. +HRESULT CModernSettingsShellFolder::GetUIObjectOf(HWND hwnd, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT* /* prgfInOut */, void** ppv) +{ + HRESULT hr = E_NOINTERFACE; + *ppv = nullptr; + + if (riid == IID_IContextMenu) + { + // The default context menu will call back for IQueryAssociations to determine the + // file associations with which to populate the menu. + const DEFCONTEXTMENU dcm = { hwnd, nullptr, m_pidl, static_cast(this), cidl, apidl, nullptr, 0, nullptr }; + hr = SHCreateDefaultContextMenu(&dcm, riid, ppv); + } + else if (riid == IID_IExtractIconW) + { + hr = E_INVALIDARG; + + auto s = GetModernSetting(*apidl); + if (s) + { + if (!s.icon.empty()) + { + IDefaultExtractIconInit* pdxi; + hr = SHCreateDefaultExtractIcon(IID_PPV_ARGS(&pdxi)); + if (SUCCEEDED(hr)) + { + WCHAR icon_path[MAX_PATH]; + + StringCchCopy(icon_path, _countof(icon_path), s.icon.data()); + auto location = PathParseIconLocation(icon_path); + + hr = pdxi->SetNormalIcon(icon_path, location); + if (SUCCEEDED(hr)) + hr = pdxi->QueryInterface(riid, ppv); + + pdxi->Release(); + } + } + else + { + auto glyph = !s.glyph.empty() ? s.glyph.front() : 0xe115; + + CComObject* extract; + hr = CComObject::CreateInstance(&extract); + if (SUCCEEDED(hr)) + { + extract->SetGlyph(glyph); + hr = extract->QueryInterface(riid, ppv); + } + + } + } + } + else if (riid == IID_IDataObject) + { + hr = SHCreateDataObject(m_pidl, cidl, apidl, nullptr, riid, ppv); + } + else if (riid == IID_IQueryAssociations) + { + WCHAR szFolderViewImplClassID[64]; + hr = StringFromGUID2(CLSID_ModernSettingsShellFolder, szFolderViewImplClassID, ARRAYSIZE(szFolderViewImplClassID)); + if (SUCCEEDED(hr)) + { + const ASSOCIATIONELEMENT assocItem = { ASSOCCLASS_CLSID_STR, nullptr, szFolderViewImplClassID }; + hr = AssocCreateForClasses(&assocItem, 1, riid, ppv); + } + } + + return hr; +} + +// Retrieves the display name for the specified file object or subfolder. +HRESULT CModernSettingsShellFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, SHGDNF shgdnFlags, STRRET* pName) +{ + auto setting = GetModernSetting(pidl); + if (!setting) + return E_INVALIDARG; + + HRESULT hr = S_OK; + + if (shgdnFlags & SHGDN_FORPARSING) + { + if (shgdnFlags & SHGDN_INFOLDER) + { + // This form of the display name needs to be handled by ParseDisplayName. + hr = StringToStrRet(setting.fileName.data(), pName); + } + else + { + WCHAR szDisplayName[MAX_PATH]; + PWSTR pszThisFolder; + hr = SHGetNameFromIDList(m_pidl, (shgdnFlags & SHGDN_FORADDRESSBAR) ? SIGDN_DESKTOPABSOLUTEEDITING : SIGDN_DESKTOPABSOLUTEPARSING, &pszThisFolder); + if (SUCCEEDED(hr)) + { + StringCchCopy(szDisplayName, ARRAYSIZE(szDisplayName), pszThisFolder); + StringCchCat(szDisplayName, ARRAYSIZE(szDisplayName), L"\\"); + StringCchCat(szDisplayName, ARRAYSIZE(szDisplayName), setting.fileName.data()); + + CoTaskMemFree(pszThisFolder); + + hr = StringToStrRet(szDisplayName, pName); + } + } + } + else + { + hr = StringToStrRet(setting.description.data(), pName); + } + + return hr; +} + +// Sets the display name of a file object or subfolder, changing the item identifier in the process. +HRESULT CModernSettingsShellFolder::SetNameOf(HWND /* hwnd */, PCUITEMID_CHILD /* pidl */, PCWSTR /* pszName */, DWORD /* uFlags */, PITEMID_CHILD* ppidlOut) +{ + *ppidlOut = NULL; + return E_NOTIMPL; +} + +// IShellFolder2 methods + +// Requests the GUID of the default search object for the folder. +HRESULT CModernSettingsShellFolder::GetDefaultSearchGUID(GUID* /* pguid */) +{ + return E_NOTIMPL; +} + +HRESULT CModernSettingsShellFolder::EnumSearches(IEnumExtraSearch** ppEnum) +{ + *ppEnum = NULL; + return E_NOINTERFACE; +} + +// Retrieves the default sorting and display column (indices from GetDetailsOf). +HRESULT CModernSettingsShellFolder::GetDefaultColumn(DWORD /* dwRes */, ULONG* pSort, ULONG* pDisplay) +{ + *pSort = 0; + *pDisplay = 0; + return S_OK; +} + +// Retrieves the default state for a specified column. +HRESULT CModernSettingsShellFolder::GetDefaultColumnState(UINT iColumn, SHCOLSTATEF* pcsFlags) +{ + if (iColumn < _countof(g_columnDescriptions)) + { + *pcsFlags = SHCOLSTATE_ONBYDEFAULT | SHCOLSTATE_TYPE_STR; + return S_OK; + } + + return E_INVALIDARG; +} + +// Retrieves detailed information, identified by a property set ID (FMTID) and property ID (PID), on an item in a Shell folder. +HRESULT CModernSettingsShellFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const PROPERTYKEY* pkey, VARIANT* pv) +{ + for (const auto& desc : g_columnDescriptions) + { + if (IsEqualPropertyKey(*pkey, desc.key)) + { + auto str = GetColumnDisplayName(pidl, (UINT)std::distance(g_columnDescriptions, &desc)); + + pv->vt = VT_BSTR; + pv->bstrVal = SysAllocString(str.data()); + return pv->bstrVal ? S_OK : E_OUTOFMEMORY; + } + } + + return S_OK; +} + +// Retrieves detailed information, identified by a column index, on an item in a Shell folder. +HRESULT CModernSettingsShellFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS* pDetails) +{ + pDetails->cxChar = 24; + + if (!pidl) + { + // No item means we're returning information about the column itself. + + if (iColumn >= _countof(g_columnDescriptions)) + { + // GetDetailsOf is called with increasing column indices until failure. + return E_FAIL; + } + + pDetails->fmt = LVCFMT_LEFT; + return StringToStrRet(g_columnDescriptions[iColumn].name, &pDetails->str); + } + + auto str = GetColumnDisplayName(pidl, iColumn); + return StringToStrRet(str.data(), &pDetails->str); +} + +// Converts a column name to the appropriate property set ID (FMTID) and property ID (PID). +HRESULT CModernSettingsShellFolder::MapColumnToSCID(UINT iColumn, PROPERTYKEY* pkey) +{ + if (iColumn < _countof(g_columnDescriptions)) + { + *pkey = g_columnDescriptions[iColumn].key; + return S_OK; + } + + return E_FAIL; +} + +// IPersist method +HRESULT CModernSettingsShellFolder::GetClassID(CLSID* pClassID) +{ + *pClassID = CLSID_ModernSettingsShellFolder; + return S_OK; +} + +// IPersistFolder method +HRESULT CModernSettingsShellFolder::Initialize(PCIDLIST_ABSOLUTE pidl) +{ + m_pidl = ILCloneFull(pidl); + return m_pidl ? S_OK : E_FAIL; +} + +// IPersistFolder2 methods +// Retrieves the PIDLIST_ABSOLUTE for the folder object. +HRESULT CModernSettingsShellFolder::GetCurFolder(PIDLIST_ABSOLUTE* ppidl) +{ + *ppidl = NULL; + HRESULT hr = m_pidl ? S_OK : E_FAIL; + if (SUCCEEDED(hr)) + { + *ppidl = ILCloneFull(m_pidl); + hr = *ppidl ? S_OK : E_OUTOFMEMORY; + } + return hr; +} + +HRESULT CModernSettingsShellFolder::CreateChildID(const std::wstring_view& fileName, PITEMID_CHILD* ppidl) +{ + auto size = fileName.size() * sizeof(wchar_t); + + // Sizeof an object plus the next cb plus the characters in the string. + UINT nIDSize = sizeof(FVITEMID) + sizeof(USHORT) + (WORD)size; + + // Allocate and zero the memory. + FVITEMID* lpMyObj = (FVITEMID*)CoTaskMemAlloc(nIDSize); + + HRESULT hr = lpMyObj ? S_OK : E_OUTOFMEMORY; + if (SUCCEEDED(hr)) + { + ZeroMemory(lpMyObj, nIDSize); + lpMyObj->cb = static_cast(nIDSize - sizeof(lpMyObj->cb)); + lpMyObj->magic = MAGIC; + lpMyObj->size = (WORD)size; + memcpy(lpMyObj->data, fileName.data(), size); + + *ppidl = (PITEMID_CHILD)lpMyObj; + } + + return hr; +} + +std::wstring_view CModernSettingsShellFolder::GetColumnDisplayName(PCUITEMID_CHILD pidl, UINT iColumn) +{ + auto setting = GetModernSetting(pidl); + if (setting) + { + switch (iColumn) + { + case 0: + return setting.description; + case 1: + return setting.keywords; + case 2: + return setting.fileName; + } + } + + return {}; +} diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h new file mode 100644 index 000000000..a6d84b489 --- /dev/null +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h @@ -0,0 +1,84 @@ +// Open-Shell Modern Settings shell folder +// Provides folder that contains all modern settings + +#pragma once +#include "resource.h" +#include "StartMenuHelper_i.h" +#include +#include + +// CModernSettingsShellFolder + +class ATL_NO_VTABLE CModernSettingsShellFolder : + public CComObjectRootEx, + public CComCoClass, + public IShellFolder2, + public IPersistFolder2 +{ +public: + CModernSettingsShellFolder() + { + } + +DECLARE_REGISTRY_RESOURCEID(IDR_MODERNSETTINGSSHELLFOLDER) + +DECLARE_NOT_AGGREGATABLE(CModernSettingsShellFolder) + +BEGIN_COM_MAP(CModernSettingsShellFolder) + COM_INTERFACE_ENTRY(IShellFolder) + COM_INTERFACE_ENTRY(IShellFolder2) + COM_INTERFACE_ENTRY(IPersist) + COM_INTERFACE_ENTRY(IPersistFolder) + COM_INTERFACE_ENTRY(IPersistFolder2) +END_COM_MAP() + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + HRESULT FinalConstruct() + { + return S_OK; + } + + void FinalRelease() + { + } + + // IShellFolder + IFACEMETHODIMP ParseDisplayName(HWND hwnd, IBindCtx* pbc, PWSTR pszName, ULONG* pchEaten, PIDLIST_RELATIVE* ppidl, ULONG* pdwAttributes); + IFACEMETHODIMP EnumObjects(HWND hwnd, DWORD grfFlags, IEnumIDList** ppenumIDList); + IFACEMETHODIMP BindToObject(PCUIDLIST_RELATIVE pidl, IBindCtx* pbc, REFIID riid, void** ppv); + IFACEMETHODIMP BindToStorage(PCUIDLIST_RELATIVE pidl, IBindCtx* pbc, REFIID riid, void** ppv); + IFACEMETHODIMP CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); + IFACEMETHODIMP CreateViewObject(HWND hwnd, REFIID riid, void** ppv); + IFACEMETHODIMP GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, ULONG* rgfInOut); + IFACEMETHODIMP GetUIObjectOf(HWND hwnd, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT* prgfInOut, void** ppv); + IFACEMETHODIMP GetDisplayNameOf(PCUITEMID_CHILD pidl, SHGDNF shgdnFlags, STRRET* pName); + IFACEMETHODIMP SetNameOf(HWND hwnd, PCUITEMID_CHILD pidl, PCWSTR pszName, DWORD uFlags, PITEMID_CHILD* ppidlOut); + + // IShellFolder2 + IFACEMETHODIMP GetDefaultSearchGUID(GUID* pGuid); + IFACEMETHODIMP EnumSearches(IEnumExtraSearch** ppenum); + IFACEMETHODIMP GetDefaultColumn(DWORD dwRes, ULONG* pSort, ULONG* pDisplay); + IFACEMETHODIMP GetDefaultColumnState(UINT iColumn, SHCOLSTATEF* pbState); + IFACEMETHODIMP GetDetailsEx(PCUITEMID_CHILD pidl, const PROPERTYKEY* pkey, VARIANT* pv); + IFACEMETHODIMP GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS* pDetails); + IFACEMETHODIMP MapColumnToSCID(UINT iColumn, PROPERTYKEY* pkey); + + // IPersist + IFACEMETHODIMP GetClassID(CLSID* pClassID); + + // IPersistFolder + IFACEMETHODIMP Initialize(PCIDLIST_ABSOLUTE pidl); + + // IPersistFolder2 + IFACEMETHODIMP GetCurFolder(PIDLIST_ABSOLUTE* ppidl); + + HRESULT CreateChildID(const std::wstring_view& fileName, PITEMID_CHILD* ppidl); + +private: + std::wstring_view GetColumnDisplayName(PCUITEMID_CHILD pidl, UINT iColumn); + + PIDLIST_ABSOLUTE m_pidl = nullptr; // where this folder is in the name space +}; + +OBJECT_ENTRY_AUTO(__uuidof(ModernSettingsShellFolder), CModernSettingsShellFolder) diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.rgs b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.rgs new file mode 100644 index 000000000..d73087217 --- /dev/null +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.rgs @@ -0,0 +1,26 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {82e749ed-b971-4550-baf7-06aa2bf7e836} = s 'Open-Shell Modern Settings' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + ShellFolder + { + val Attributes = d '&HA0000000' + } + ShellEx + { + ContextMenuHandlers + { + Default = s '{5ab14324-c087-42c1-b905-a0bfdb4e9532}' + { + } + } + } + } + } +} diff --git a/Src/StartMenu/StartMenuHelper/StartMenuHelper.idl b/Src/StartMenu/StartMenuHelper/StartMenuHelper.idl index 34030f7d9..96c2cd8ac 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuHelper.idl +++ b/Src/StartMenu/StartMenuHelper/StartMenuHelper.idl @@ -6,6 +6,7 @@ import "oaidl.idl"; import "ocidl.idl"; +import "shobjidl.idl"; [ object, @@ -31,4 +32,21 @@ library StartMenuHelperLib { [default] interface IStartMenuExt; }; + [ + uuid(82e749ed-b971-4550-baf7-06aa2bf7e836) + ] + coclass ModernSettingsShellFolder + { + interface IShellFolder2; + interface IPersistFolder2; + }; + [ + uuid(5ab14324-c087-42c1-b905-a0bfdb4e9532) + ] + coclass ModernSettingsContextMenu + { + interface IContextMenu; + interface IShellExtInit; + interface IObjectWithSite; + }; }; diff --git a/Src/StartMenu/StartMenuHelper/StartMenuHelper.rc b/Src/StartMenu/StartMenuHelper/StartMenuHelper.rc index c15df9d02..825ffc08d 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuHelper.rc +++ b/Src/StartMenu/StartMenuHelper/StartMenuHelper.rc @@ -98,6 +98,8 @@ END IDR_STARTMENUHELPER REGISTRY "StartMenuHelper.rgs" IDR_STARTMENUEXT REGISTRY "StartMenuExt.rgs" +IDR_MODERNSETTINGSSHELLFOLDER REGISTRY "ModernSettingsShellFolder.rgs" +IDR_MODERNSETTINGSCONTEXTMENU REGISTRY "ModernSettingsContextMenu.rgs" #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj index 31ac2de73..5e9cd3144 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj +++ b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj @@ -358,6 +358,9 @@ + + + @@ -371,6 +374,8 @@ + + @@ -379,6 +384,9 @@ + + + diff --git a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj.filters b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj.filters index 496c1d988..942b4e440 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj.filters +++ b/Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj.filters @@ -34,6 +34,15 @@ Generated Files + + Source Files + + + Source Files + + + Source Files + @@ -56,6 +65,12 @@ Resource Files + + Resource Files + + + Resource Files + @@ -76,6 +91,15 @@ Generated Files + + Header Files + + + Header Files + + + Header Files + diff --git a/Src/StartMenu/StartMenuHelper/resource.h b/Src/StartMenu/StartMenuHelper/resource.h index 1f9e57e6a..d9ab48d28 100644 --- a/Src/StartMenu/StartMenuHelper/resource.h +++ b/Src/StartMenu/StartMenuHelper/resource.h @@ -4,6 +4,8 @@ // #define IDR_STARTMENUHELPER 101 #define IDR_STARTMENUEXT 102 +#define IDR_MODERNSETTINGSSHELLFOLDER 103 +#define IDR_MODERNSETTINGSCONTEXTMENU 104 // Next default values for new objects // @@ -12,6 +14,6 @@ #define _APS_NEXT_RESOURCE_VALUE 201 #define _APS_NEXT_COMMAND_VALUE 32768 #define _APS_NEXT_CONTROL_VALUE 201 -#define _APS_NEXT_SYMED_VALUE 103 +#define _APS_NEXT_SYMED_VALUE 105 #endif #endif From 0da20180ac440f4fc9a65985d075c859601e88bc Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 23 Aug 2020 16:20:55 +0200 Subject: [PATCH 020/234] Search modern settings using our new shell folder Use our modern settings shell folder (`shell:::{82E749ED-B971-4550-BAF7-06AA2BF7E836}`) to search (enumerate) modern settings. Fixes #57 --- Src/StartMenu/StartMenuDLL/MenuCommands.cpp | 14 +++--- Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 36 ++++++++++------ Src/StartMenu/StartMenuDLL/SearchManager.cpp | 45 ++++++++++++++------ Src/StartMenu/StartMenuDLL/SearchManager.h | 2 + 4 files changed, 67 insertions(+), 30 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/MenuCommands.cpp b/Src/StartMenu/StartMenuDLL/MenuCommands.cpp index 843d5c412..bd89335cc 100644 --- a/Src/StartMenu/StartMenuDLL/MenuCommands.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuCommands.cpp @@ -2192,11 +2192,15 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p if (res==CMD_PINSETTING) { - CSearchManager::TItemCategory cat=(CSearchManager::TItemCategory)(item.categoryHash&CSearchManager::CATEGORY_MASK); - if (cat==CSearchManager::CATEGORY_SETTING) - CreatePinLink(pItemPidl1,item.name,NULL,0); - else if (cat==CSearchManager::CATEGORY_METROSETTING) - CreatePinLink(pItemPidl1,item.name,L"%windir%\\ImmersiveControlPanel\\systemsettings.exe",0); + CString iconPath; + if (item.pItemInfo) + { + CItemManager::RWLock lock(&g_ItemManager, false, CItemManager::RWLOCK_ITEMS); + if (_wcsicmp(PathFindExtension(item.pItemInfo->GetPath()), L".settingcontent-ms") == 0) + iconPath = L"%windir%\\ImmersiveControlPanel\\systemsettings.exe"; + } + + CreatePinLink(pItemPidl1, item.name, iconPath.IsEmpty() ? nullptr : iconPath.GetString(), 0); m_bRefreshItems=true; } diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp index c8d5f8839..a362c4d57 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp @@ -2656,17 +2656,11 @@ int CMenuContainer::AddSearchItems( const std::vector &items, const if (!categoryName.IsEmpty()) { MenuItem item(MENU_SEARCH_CATEGORY); - if (categoryHash==CSearchManager::CATEGORY_PROGRAM || categoryHash==CSearchManager::CATEGORY_SETTING) - { - item.name.Format(L"%s (%d)",categoryName,originalCount); - } - else - { - item.name=categoryName; - item.bSplit=(s_Skin.More_bitmap_Size.cx>0); - } + item.name.Format(L"%s (%d)",categoryName,originalCount); item.nameHash=CalcFNVHash(categoryName); item.categoryHash=categoryHash; + if (categoryHash!=CSearchManager::CATEGORY_PROGRAM || categoryHash!=CSearchManager::CATEGORY_SETTING) + item.bSplit=(s_Skin.More_bitmap_Size.cx>0); m_Items.push_back(item); } } @@ -2724,7 +2718,7 @@ bool CMenuContainer::InitSearchItems( void ) unsigned int runCategoryHash=0; CString runCommand; CComString runExe; - if (!bAutoComlpete && !s_bNoRun && s_SearchResults.programs.empty() && s_SearchResults.settings.empty()) + if (!bAutoComlpete && !s_bNoRun && s_SearchResults.programs.empty() && s_SearchResults.settings.empty() && s_SearchResults.metrosettings.empty()) { if (s_bWin7Style) m_SearchBox.GetWindowText(runCommand); @@ -2787,6 +2781,12 @@ bool CMenuContainer::InitSearchItems( void ) if (m_SearchCategoryHash==CSearchManager::CATEGORY_SETTING) selectedCount=(int)s_SearchResults.settings.size(); } + if (!s_SearchResults.metrosettings.empty()) + { + counts.push_back((int)s_SearchResults.metrosettings.size()); + if (m_SearchCategoryHash==CSearchManager::CATEGORY_METROSETTING) + selectedCount=(int)s_SearchResults.metrosettings.size(); + } for (std::list::const_iterator it=s_SearchResults.indexed.begin();it!=s_SearchResults.indexed.end();++it) { if (!it->items.empty()) @@ -2829,7 +2829,7 @@ bool CMenuContainer::InitSearchItems( void ) // add categories std::list::const_iterator it=s_SearchResults.indexed.begin(); - for (size_t idx=0;idxcategoryHash; @@ -2854,7 +2856,7 @@ bool CMenuContainer::InitSearchItems( void ) } if (count<=0) { - if (idx>=2) ++it; + if (idx>=3) ++it; continue; } @@ -2880,6 +2882,16 @@ bool CMenuContainer::InitSearchItems( void ) items.push_back(SearchItem(*it)); name=FindTranslation(L"Search.CategorySettings",L"Settings"); } + else if (idx==2) + { + originalCount=(int)s_SearchResults.metrosettings.size(); + if (count>originalCount) + count=originalCount; + items.reserve(count); + for (std::vector::const_iterator it=s_SearchResults.metrosettings.begin();it!=s_SearchResults.metrosettings.end() && (int)items.size()items.size(); diff --git a/Src/StartMenu/StartMenuDLL/SearchManager.cpp b/Src/StartMenu/StartMenuDLL/SearchManager.cpp index a275a4e80..12966670e 100644 --- a/Src/StartMenu/StartMenuDLL/SearchManager.cpp +++ b/Src/StartMenu/StartMenuDLL/SearchManager.cpp @@ -170,6 +170,7 @@ void CSearchManager::CloseMenu( void ) m_SettingsItems.clear(); m_SettingsHash=FNV_HASH0; m_bSettingsFound=false; + m_bMetroSettingsFound = false; m_IndexedItems.clear(); m_AutoCompleteItems.clear(); @@ -310,7 +311,9 @@ bool CSearchManager::AddSearchItem( IShellItem *pItem, const wchar_t *name, int PROPVARIANT val; PropVariantInit(&val); pItem2->GetProperty(PKEY_Keywords,&val); - wchar_t keywords[1024]; + if (val.vt==VT_EMPTY) + pItem2->GetProperty(PKEY_HighKeywords,&val); + wchar_t keywords[2048]; int len=0; if (val.vt==VT_BSTR || val.vt==VT_LPWSTR) { @@ -334,7 +337,7 @@ bool CSearchManager::AddSearchItem( IShellItem *pItem, const wchar_t *name, int } Lock lock(this,LOCK_DATA); - if (category==CATEGORY_PROGRAM || category==CATEGORY_SETTING) + if (category==CATEGORY_PROGRAM || category==CATEGORY_SETTING || category==CATEGORY_METROSETTING) { if (searchRequest.requestId &items=(category==CATEGORY_PROGRAM)?m_ProgramItems:m_SettingsItems; - if (category==CATEGORY_SETTING) + if (category==CATEGORY_SETTING || category==CATEGORY_METROSETTING) { // remove duplicate settings for (std::vector::const_iterator it=items.begin();it!=items.end();++it) @@ -381,6 +384,8 @@ bool CSearchManager::AddSearchItem( IShellItem *pItem, const wchar_t *name, int } items.push_back(item); + if (item.category==CATEGORY_METROSETTING) + m_bMetroSettingsFound=true; } else if (category==CATEGORY_AUTOCOMPLETE) { @@ -409,7 +414,7 @@ void CSearchManager::CollectSearchItems( IShellItem *pFolder, int flags, TItemCa CComPtr pChild; while (pChild=NULL,pEnum->Next(1,&pChild,NULL)==S_OK) { - if (category==CATEGORY_PROGRAM || category==CATEGORY_SETTING) + if (category==CATEGORY_PROGRAM || category==CATEGORY_SETTING || category==CATEGORY_METROSETTING) { if (searchRequest.requestId pFolder; + if (SUCCEEDED(SHCreateItemFromParsingName(L"shell:::{82E749ED-B971-4550-BAF7-06AA2BF7E836}",NULL,IID_IShellItem,(void**)&pFolder))) + CollectSearchItems(pFolder,(searchRequest.bSearchKeywords?COLLECT_KEYWORDS:0)|COLLECT_NOREFRESH,CATEGORY_METROSETTING,searchRequest); + if (searchRequest.requestId scopeList; - if (searchRequest.bSearchMetroSettings) + if (searchRequest.bSearchMetroSettings && !m_bMetroSettingsFound) { scopeList.push_back(SearchScope()); SearchScope &scope=*scopeList.rbegin(); scope.bFiles=true; - scope.name=FindTranslation(L"Search.CategoryPCSettings",L"Settings"); + scope.name=FindTranslation(L"Search.CategoryPCSettings",L"Modern Settings"); scope.categoryHash=CATEGORY_METROSETTING; scope.roots.push_back(L"FILE:"); } @@ -1240,7 +1253,7 @@ void CSearchManager::SearchThread( void ) Lock lock(this,LOCK_DATA); m_IndexedItems.push_back(SearchCategory()); pCategory=&*m_IndexedItems.rbegin(); - pCategory->name.Format(L"%s (%d)",it->name,it->resultCount); + pCategory->name=it->name; pCategory->categoryHash=it->categoryHash; pCategory->search.Clone(it->search); } @@ -1348,6 +1361,7 @@ void CSearchManager::GetSearchResults( SearchResults &results ) { results.programs.clear(); results.settings.clear(); + results.metrosettings.clear(); results.indexed.clear(); results.autocomplete.clear(); results.autoCompletePath.Empty(); @@ -1397,14 +1411,19 @@ void CSearchManager::GetSearchResults( SearchResults &results ) std::vector &settings=m_bSettingsFound?m_SettingsItems:m_SettingsItemsOld; for (std::vector::iterator it=settings.begin();it!=settings.end();++it) { - int match=(it->category==CATEGORY_SETTING)?it->MatchText(m_SearchText,bSearchSubWord):0; + int match=(it->category==CATEGORY_SETTING || it->category==CATEGORY_METROSETTING)?it->MatchText(m_SearchText,bSearchSubWord):0; it->rank=(it->rank&0xFFFFFFFE)|(match>>1); } std::sort(settings.begin(),settings.end()); for (std::vector::const_iterator it=settings.begin();it!=settings.end();++it) { - if (it->category==CATEGORY_SETTING && it->MatchText(m_SearchText,bSearchSubWord)) - results.settings.push_back(it->pInfo); + if (it->MatchText(m_SearchText, bSearchSubWord)) + { + if (it->category==CATEGORY_SETTING) + results.settings.push_back(it->pInfo); + if (it->category==CATEGORY_METROSETTING) + results.metrosettings.push_back(it->pInfo); + } } } @@ -1423,7 +1442,7 @@ void CSearchManager::GetSearchResults( SearchResults &results ) results.autocomplete.push_back(it->pInfo); } } - results.bResults=(!results.programs.empty() || !results.settings.empty() || !results.indexed.empty() || !results.autocomplete.empty()); + results.bResults=(!results.programs.empty() || !results.settings.empty() || !results.metrosettings.empty() || !results.indexed.empty() || !results.autocomplete.empty()); results.bSearching=(m_LastCompletedId!=m_LastRequestId); } diff --git a/Src/StartMenu/StartMenuDLL/SearchManager.h b/Src/StartMenu/StartMenuDLL/SearchManager.h index 32341278e..c521eec17 100644 --- a/Src/StartMenu/StartMenuDLL/SearchManager.h +++ b/Src/StartMenu/StartMenuDLL/SearchManager.h @@ -63,6 +63,7 @@ class CSearchManager CString autoCompletePath; std::vector programs; std::vector settings; + std::vector metrosettings; std::vector autocomplete; std::list indexed; }; @@ -149,6 +150,7 @@ class CSearchManager unsigned int m_SettingsHashOld; bool m_bProgramsFound; bool m_bSettingsFound; + bool m_bMetroSettingsFound = false; std::vector m_AutoCompleteItems; std::list m_IndexedItems; std::vector m_ItemRanks; From 257023209b0c2f8a663658538016787f5af0a3fe Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Tue, 1 Sep 2020 19:18:48 +0200 Subject: [PATCH 021/234] Update README.md - Few text adjustments - Minor formatting changes --- README.md | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 9f56096cd..9fd0bb4f5 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,11 @@ [![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![Build status](https://ci.appveyor.com/api/projects/status/2wj5x5qoypfjj0tr/branch/master?svg=true)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master) [![GitQ](https://gitq.com/badge.svg)](https://gitq.com/passionate-coder/Classic-Start) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/open-shell/Lobby) -[Home Page](https://open-shell.github.io/Open-Shell-Menu) - -[Discussion room](https://gitter.im/Open-Shell) - -[Latest nightly build](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master/artifacts) +[Home Page](https://open-shell.github.io/Open-Shell-Menu) +[Discussion room](https://gitter.im/Open-Shell) +[Latest nightly build](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master/artifacts) ### Features - - Classic style Start Menu for Windows 7, 8, 8.1, 10 - Toolbar for Windows Explorer - Classic copy UI (Windows 7 only) @@ -19,24 +16,18 @@ - Title bar and status bar for Internet Explorer ### Download -If you just want to use it or looking for setup file, click here to download!!! +If you just want to use it or looking for setup file, click here to download: [![GitHub All Releases](https://img.shields.io/github/downloads/Open-Shell/Open-Shell-Menu/total?style=for-the-badge)](https://github.com/Open-Shell/Open-Shell-Menu/releases) - ### Temporary Translation/Language Solution -Translations/Language files/DLLs - -1. Download .dlls from here [https://coddec.github.io/Classic-Shell/www.classicshell.net/translations/index.html](https://coddec.github.io/Classic-Shell/www.classicshell.net/translations/index.html) - -2. After you download the DLL file you need to place it either in the Open-Shell's __install folder__ or in the __%ALLUSERSPROFILE%\OpenShell\Languages__ folder. +1. Download [language DLL](https://coddec.github.io/Classic-Shell/www.classicshell.net/translations/index.html) +2. Place it either in the Open-Shell's __install folder__ or in the `%ALLUSERSPROFILE%\OpenShell\Languages` folder --- *For archival reasons, we have a mirror of `www.classicshell.net` [here](https://coddec.github.io/Classic-Shell/www.classicshell.net/).* -[How To Skin a Start Menu](https://coddec.github.io/Classic-Shell/www.classicshell.net/tutorials/skintutorial.html) - -[Classic Shell - Custom Start Buttons](https://coddec.github.io/Classic-Shell/www.classicshell.net/tutorials/buttontutorial.html) - +[How To Skin a Start Menu](https://coddec.github.io/Classic-Shell/www.classicshell.net/tutorials/skintutorial.html) +[Classic Shell - Custom Start Buttons](https://coddec.github.io/Classic-Shell/www.classicshell.net/tutorials/buttontutorial.html) [Report a bug/issue or submit a feature request](https://github.com/Open-Shell/Open-Shell-Menu/issues) From 3eb134a28067dafeef4affdeb1f0bbe79b0263f2 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sat, 29 Aug 2020 15:18:36 +0200 Subject: [PATCH 022/234] Setup: Store symbols in symstore compatible way This way they can be directly extracted to symbol server cache. So any tool that uses _NT_SYMBOL_PATH will be able to use them automatically. --- Src/Setup/BuildArchives.bat | 4 +--- Src/Setup/BuildBinaries.bat | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Src/Setup/BuildArchives.bat b/Src/Setup/BuildArchives.bat index 75d38f72d..eb5231a6d 100644 --- a/Src/Setup/BuildArchives.bat +++ b/Src/Setup/BuildArchives.bat @@ -3,9 +3,7 @@ REM ***** Collect PDBs echo -- Creating symbols package set CS_SYMBOLS_NAME=OpenShellPDB_%CS_VERSION_STR%.7z -cd Output -7z a -mx9 ..\Final\%CS_SYMBOLS_NAME% PDB32 PDB64 > nul -cd .. +7z a -mx9 .\Final\%CS_SYMBOLS_NAME% .\Output\symbols\* > nul if defined APPVEYOR ( appveyor PushArtifact Final\%CS_SYMBOLS_NAME% diff --git a/Src/Setup/BuildBinaries.bat b/Src/Setup/BuildBinaries.bat index 28df6b3fa..55b03ac19 100644 --- a/Src/Setup/BuildBinaries.bat +++ b/Src/Setup/BuildBinaries.bat @@ -1,8 +1,6 @@ if exist Output rd /Q /S Output md Output md Output\x64 -md Output\PDB32 -md Output\PDB64 echo -- Compiling @@ -67,6 +65,8 @@ copy /B "..\StartMenu\Skins\Metallic.skin7" Output > nul REM ********* Collect debug info +md Output\PDB32 +md Output\PDB64 REM Explorer 32 copy /B ..\ClassicExplorer\Setup\ClassicExplorer32.pdb Output\PDB32 > nul @@ -126,6 +126,18 @@ if exist %PDBSTR_PATH% ( ) ) +REM ********* Prepare symbols + +set SYMSTORE_PATH="C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore.exe" + +%SYMSTORE_PATH% add /r /f Output\PDB32 /s Output\symbols /t OpenShell -:NOREFS > nul +%SYMSTORE_PATH% add /r /f Output\PDB64 /s Output\symbols /t OpenShell -:NOREFS > nul +rd /Q /S Output\symbols\000Admin > nul +del Output\symbols\pingme.txt > nul + +rd /Q /S Output\PDB32 +rd /Q /S Output\PDB64 + REM ********* Build ADMX echo --- ADMX if exist Output\PolicyDefinitions.zip ( From ee59bb76deb9437d107102c5e24a3e736bcbb97d Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sat, 29 Aug 2020 15:18:40 +0200 Subject: [PATCH 023/234] Setup: Don't add symbols for unused update.exe --- Src/Setup/BuildBinaries.bat | 3 --- 1 file changed, 3 deletions(-) diff --git a/Src/Setup/BuildBinaries.bat b/Src/Setup/BuildBinaries.bat index 55b03ac19..2672ed41a 100644 --- a/Src/Setup/BuildBinaries.bat +++ b/Src/Setup/BuildBinaries.bat @@ -37,7 +37,6 @@ copy /B ..\ClassicIE\Setup\ClassicIEDLL_32.dll Output > nul copy /B ..\ClassicIE\Setup\ClassicIE_32.exe Output > nul copy /B ..\StartMenu\Setup\StartMenu.exe Output > nul copy /B ..\StartMenu\Setup\StartMenuDLL.dll Output > nul -copy /B ..\Update\Release\Update.exe Output > nul copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.dll Output > nul copy /B ..\Setup\SetupHelper\Release\SetupHelper.exe Output > nul @@ -97,8 +96,6 @@ copy /B ..\StartMenu\Setup\StartMenuDLL.pdb Output\PDB32 > nul copy /B Output\StartMenuDLL.dll Output\PDB32 > nul copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.pdb Output\PDB32 > nul copy /B Output\StartMenuHelper32.dll Output\PDB32 > nul -copy /B ..\Update\Release\Update.pdb Output\PDB32 > nul -copy /B Output\Update.exe Output\PDB32 > nul REM Menu 64 copy /B ..\StartMenu\Setup64\StartMenu.pdb Output\PDB64 > nul From 6242e8d9b9eb5e02d61a2c094423d9f9dfd712ac Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sat, 29 Aug 2020 15:18:41 +0200 Subject: [PATCH 024/234] Settings: Use images in PNG format It makes StartmenuDLL.dll ~830kB smaller. --- Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 11 ++++------- Src/StartMenu/StartMenuDLL/StartMenuDLL.rc | 13 +++++++------ Src/StartMenu/StartMenuDLL/style_7.bmp | Bin 127856 -> 0 bytes Src/StartMenu/StartMenuDLL/style_7.png | Bin 0 -> 32535 bytes Src/StartMenu/StartMenuDLL/style_7150.bmp | Bin 275936 -> 0 bytes Src/StartMenu/StartMenuDLL/style_7150.png | Bin 0 -> 57603 bytes Src/StartMenu/StartMenuDLL/style_classic.bmp | Bin 86456 -> 0 bytes Src/StartMenu/StartMenuDLL/style_classic.png | Bin 0 -> 19687 bytes .../StartMenuDLL/style_classic150.bmp | Bin 186176 -> 0 bytes .../StartMenuDLL/style_classic150.png | Bin 0 -> 34797 bytes Src/StartMenu/StartMenuDLL/style_vista.bmp | Bin 123356 -> 0 bytes Src/StartMenu/StartMenuDLL/style_vista.png | Bin 0 -> 25239 bytes Src/StartMenu/StartMenuDLL/style_vista150.bmp | Bin 265376 -> 0 bytes Src/StartMenu/StartMenuDLL/style_vista150.png | Bin 0 -> 44965 bytes 14 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 Src/StartMenu/StartMenuDLL/style_7.bmp create mode 100644 Src/StartMenu/StartMenuDLL/style_7.png delete mode 100644 Src/StartMenu/StartMenuDLL/style_7150.bmp create mode 100644 Src/StartMenu/StartMenuDLL/style_7150.png delete mode 100644 Src/StartMenu/StartMenuDLL/style_classic.bmp create mode 100644 Src/StartMenu/StartMenuDLL/style_classic.png delete mode 100644 Src/StartMenu/StartMenuDLL/style_classic150.bmp create mode 100644 Src/StartMenu/StartMenuDLL/style_classic150.png delete mode 100644 Src/StartMenu/StartMenuDLL/style_vista.bmp create mode 100644 Src/StartMenu/StartMenuDLL/style_vista.png delete mode 100644 Src/StartMenu/StartMenuDLL/style_vista150.bmp create mode 100644 Src/StartMenu/StartMenuDLL/style_vista150.png diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index 2b334b301..ba2d4c1c0 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -3718,7 +3718,6 @@ class CMenuStyleDlg: public CResizeableDlg CWindow m_ImageClassic1, m_ImageClassic2, m_ImageWin7; CWindow m_Tooltip; CWindow m_ButtonAero, m_ButtonClassic, m_ButtonCustom; - bool m_bLargeBitmaps; HICON m_hIcon; CString m_IconPath; @@ -3737,14 +3736,13 @@ LRESULT CMenuStyleDlg::OnInitDialog( UINT uMsg, WPARAM wParam, LPARAM lParam, BO HDC hdc=::GetDC(NULL); int dpi=GetDeviceCaps(hdc,LOGPIXELSY); ::ReleaseDC(NULL,hdc); - m_bLargeBitmaps=dpi>=144; - if (m_bLargeBitmaps) + bool bLargeBitmaps=dpi>=144; { - HBITMAP bmp=(HBITMAP)LoadImage(g_Instance,MAKEINTRESOURCE(IDB_STYLE_CLASSIC1150),IMAGE_BITMAP,0,0,LR_CREATEDIBSECTION); + HBITMAP bmp=LoadImageResource(g_Instance,MAKEINTRESOURCE(bLargeBitmaps?IDB_STYLE_CLASSIC1150:IDB_STYLE_CLASSIC1),true,true); m_ImageClassic1.SendMessage(STM_SETIMAGE,IMAGE_BITMAP,(LPARAM)bmp); - bmp=(HBITMAP)LoadImage(g_Instance,MAKEINTRESOURCE(IDB_STYLE_CLASSIC2150),IMAGE_BITMAP,0,0,LR_CREATEDIBSECTION); + bmp=LoadImageResource(g_Instance,MAKEINTRESOURCE(bLargeBitmaps?IDB_STYLE_CLASSIC2150:IDB_STYLE_CLASSIC2),true,true); m_ImageClassic2.SendMessage(STM_SETIMAGE,IMAGE_BITMAP,(LPARAM)bmp); - bmp=(HBITMAP)LoadImage(g_Instance,MAKEINTRESOURCE(IDB_STYLE_WIN7150),IMAGE_BITMAP,0,0,LR_CREATEDIBSECTION); + bmp=LoadImageResource(g_Instance,MAKEINTRESOURCE(bLargeBitmaps?IDB_STYLE_WIN7150:IDB_STYLE_WIN7),true,true); m_ImageWin7.SendMessage(STM_SETIMAGE,IMAGE_BITMAP,(LPARAM)bmp); } @@ -3779,7 +3777,6 @@ LRESULT CMenuStyleDlg::OnDestroy( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& { if (m_hIcon) DestroyIcon(m_hIcon); m_hIcon=NULL; - if (m_bLargeBitmaps) { HBITMAP bmp=(HBITMAP)m_ImageClassic1.SendMessage(STM_GETIMAGE,IMAGE_BITMAP); if (bmp) DeleteObject(bmp); diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc index 34c7744b4..113528ab8 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc @@ -369,19 +369,20 @@ IDI_START10 ICON "start10.ico" IDB_ARROWS BITMAP "menu_arrows.bmp" IDB_ARROWS150 BITMAP "menu_arrows150.bmp" IDB_SEARCH_ICONS BITMAP "search_icons.bmp" -IDB_STYLE_CLASSIC1 BITMAP "style_classic.bmp" -IDB_STYLE_CLASSIC2 BITMAP "style_vista.bmp" -IDB_STYLE_WIN7 BITMAP "style_7.bmp" IDB_BTN_CLASSIC BITMAP "btn_classic.bmp" -IDB_STYLE_CLASSIC1150 BITMAP "style_classic150.bmp" -IDB_STYLE_CLASSIC2150 BITMAP "style_vista150.bmp" -IDB_STYLE_WIN7150 BITMAP "style_7150.bmp" ///////////////////////////////////////////////////////////////////////////// // // IMAGE // +IDB_STYLE_CLASSIC1 IMAGE "style_classic.png" +IDB_STYLE_CLASSIC2 IMAGE "style_vista.png" +IDB_STYLE_WIN7 IMAGE "style_7.png" +IDB_STYLE_CLASSIC1150 IMAGE "style_classic150.png" +IDB_STYLE_CLASSIC2150 IMAGE "style_vista150.png" +IDB_STYLE_WIN7150 IMAGE "style_7150.png" + IDB_BUTTON96 IMAGE "button96.png" IDB_BUTTON120 IMAGE "button120.png" IDB_BUTTON144 IMAGE "button144.png" diff --git a/Src/StartMenu/StartMenuDLL/style_7.bmp b/Src/StartMenu/StartMenuDLL/style_7.bmp deleted file mode 100644 index 7514cbbff57476d84aa483b68dbadc50b8bc11af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127856 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 literal 0 HcmV?d00001 diff --git a/Src/StartMenu/StartMenuDLL/style_7150.bmp b/Src/StartMenu/StartMenuDLL/style_7150.bmp deleted file mode 100644 index 996c3d3cfe9a0c3ce5dea05eb1affcb29a83579c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 275936 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 diff --git a/Src/StartMenu/StartMenuDLL/style_7150.png b/Src/StartMenu/StartMenuDLL/style_7150.png new file mode 100644 index 0000000000000000000000000000000000000000..94111641ffef0b3ac4f24cbaf796966ce0d26693 GIT binary patch literal 57603 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 JPDHLkV1lJ$rPBZa literal 0 HcmV?d00001 diff --git a/Src/StartMenu/StartMenuDLL/style_classic.bmp b/Src/StartMenu/StartMenuDLL/style_classic.bmp deleted file mode 100644 index a177e4e7be6fba761be8c65f20911ff7bb602a26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86456 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 diff --git a/Src/StartMenu/StartMenuDLL/style_classic150.png b/Src/StartMenu/StartMenuDLL/style_classic150.png new file mode 100644 index 0000000000000000000000000000000000000000..f3e910668ff3c5e0fa08ebf7ecf4b668799e1d01 GIT binary patch literal 34797 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 literal 0 HcmV?d00001 diff --git a/Src/StartMenu/StartMenuDLL/style_vista.bmp b/Src/StartMenu/StartMenuDLL/style_vista.bmp deleted file mode 100644 index fc868951c91588b8e54c036c574bec0234b8990f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 123356 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 WYJnG9;85bl<)@{m7MNin^#1{YtH})j diff --git a/Src/StartMenu/StartMenuDLL/style_vista.png b/Src/StartMenu/StartMenuDLL/style_vista.png new file mode 100644 index 0000000000000000000000000000000000000000..6e6d886b1879f77383722ce85ee8b6587df82c7a GIT binary patch literal 25239 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 z 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

x@oNNX4HiTlCCX+O_N+^UUgb{^+4BUc|wYw*$6 zqo``;z=F0eg@tZiMSHNSzBXyAwo)Ed>o(6nF+ayoTZy7F0Yin^UUgU3GxdQH|1EbC z0(_ZOETalugecpe$SK)m@C!w?-)fhUY+DX=U=U*T(TK{j{PU;w*42~)bk0Vz zF*JU)j|pZt1cKn(7$%QVz=lc^ScT#I1-Yqlr}w^m{`kSI3+n(^=hk1 zG1~Xw&Q*`=D`QXYI(Z<}l0Er$;;kctkt!D> z;69OhviGRnGKzYgRNJPY z=)Bp1)%LuIf2*sHXCJe3OMBDcq3l%h?16>avez%KI`~{pJsh&_PVvv*D=t)Cq_|*V z+yWT{&E)2EQenwRoFWTIkdz^pH!4~?6wMfJQfAh9lR9#UNvCe}t`#X%ubv2!b zcQ}Tt`#Y$q&G`0w)UL$1qrUd4m^cdq6@6`0FvV7on>J=j30vWS&?q+%$bw>? zhx+RB)qW-_zyAI3t~D6s?rJsP`VIH3P>_ZrdDS5YinaAteOw;vI z*|`@F2Lz_nK6dkRYOlGp^;#XlNJkAz#*V5zb-R3U#b6I*c98(U&tQfn5N7Iigj^zbdtxvR7LW|Z@<1v$k_)*LKrOR<_6Og$ms68x+= zmVMaM$0h7^>Mj#(_dk_?Bt+MJ>G||SYxmx*^itEJ+DdofPTbr}+w1fd0&pj&w)AY- zW-XmOs>X8W5~}59ea$QCeM@C0#hSac?mAai5FXif?})2&_48*sc55FUTXMdx$$vg3 zPtL2Wd=4IY*h1;cThzb47UX)MA?-};{f5Jv!ZO}GR-10y(GYX?aqH~w8|tLDyc@HzC8?kXMzZTV?N7Fk3u^rzzxM$90 z>$zK6)!jXWz3bz0Ich3i9v(^tcH8wea;REEd5_Mw*SDQ5a(A=Sbn*;TpZWGh3UhLT zk*#;n`Fde>`TpD!uAY~w%K{d-yr+s*>`L+Uv{W?lJZYyfPm6^wpFPIB*{gkwD@q=@naoR1zP>rw z8T3(*n|3w+1g3Ye)16*cl)EQ<32Wv*FP=M;lyDM!0rm;@GBi<^1V8}5l)H)hHZ8T& z`4u%I)_VBct9w~4QvKzxm_*{nrPEL`FP=YM<6{gBQdX3MPz@v%8L?7VVRT0F_2uq* zSI!?JJfbRNq5eh3RFVh{{k5P+&|izz>?GFW3ODkb)PY_WPCe(1uT9xinR?Q8PnOgc zN;0DLS}|9%Lu~GU*de{P?Z20_jtg!Zy`p*l{=Lt#PdtjJ^~lZjITr$ia=*=8l+&uH zj0i`3>GA1LWWMJVCWoTze5hzopx%qdCod{%Te{lI3hGk|$}XOdq1w4=tE8gF=;)ZU z>4~<#`B1N};gB08P1sU+^E}EGFW%MFK}2*`*1djFK|-S^FJ5-Od|L6AijF>iJvzGm zbp1X_~TJegCK6fSm76Li)XCmVicds}mI(pOb zbD`Q^ZB%7-Q9af5rmmfej=vHY6aBh2i+dJY@OXsZjdiGSyX3e8x{^#r7Fg#M+ zh&wr#5F1UsDSz^YDl92Nh738i(xQ^i=GtZu;-$2E*h{@48}sXPD(kMFi+$Jln1Awt z7YIh&EPD1u;r2X1%!By9yeM~lptbhAA0f060zq7CU++~{Rf<^|b2IN_dIv;VPzq@e zlAubU4x$c*ziE0!BDA$0AcFkdl-$gFL2f!ApxVk3WX4Jgvmojbw!zggQ819m2yMh# z2P0N$EBusv`_l2f8^9EgG9Tn-+^efDUE^!I#DP^)S(5hPT0>psi34F^F+j4ayb#lW z#h%=ayP{*Q1ArUpvik))&!C;1?yn_H_h}@Wor@8S)g_q<5g4g@xbt~lOv3dP*^SS~ z?s%VEL7b=XX{X_d_V0pQMz3j=+t~WuiVnT7^qj=)ZIxHD&wG{J4lTYZqJ88EWO(So z&O$f?mGzPe@D6G!CR+7c0~Ni)wY0XjC^LuZYU#@#Kn7Zp_SDNueN`C9_U*Uo{4`Xl z#$0~o`cBHqEuttsn7^fWVe^gp;Q1!aR7FZkG1ZKhz39)jOT`LvHRmr}xZA@JY2(8M zZ(OD!qU*+y=);C|D}xaWwy+ds1T116WR~EZd%^>DhWbSx+m8GaQd>?&zq^?$T5C;( z5WwtP_{nmlp`4B909J7R>heN3ITB(>Lt!RHq_$82iCF;3-F!ZN;vBOYB83Hvtn@a5 zoHwOaHsEvPO7w{Xq4hNtn2ZbCaV2NxNgYy?1pJe@ zb<~j!kV6~=-dXKq3JNfzwZqPhe#o9B#vMmunVbq&VJ<`vMEZO1x8MdC&*Wbec)4>m z7U32!VnOfi{kMF+Ex0#=5yV<5J$VH4qKL-Gj`EZf%?&wuHxGJ5#QnIw@!R$9CT@K< zd3(F`miAHW+7&}fPDUMh_2}fgnxwZC7qiYY7(uKhZfE~;(BNN*hY=9~;W`y-5~RA; z+#g{me9+SX2fg`Y;rad4gp=E9{Q@!Kpg)TN8Y%;f%vGT4`#HAvE&@Pxc?4sAc4`cK zde;%LW$5BDGj-&CF$Y~w9w7}$qA^mLyuBP2O0UFNCUj57xg?zM@yvtV<{tguSm z?KvTlmu{Wk`SQ`3_Npr_<(JwjE@hqfD!mh4dM7kHURaOtzejQ5^F4tNW26_ki14?; z*MT!b;D9eIG$s$p34zM~fhl~I&x#ROEyR;ZXd}Yxt=TK@Z!Nih2-#Y6eSck+*j#$) zdFIi_8AqOG9ebXAqPZltqb8}V;d)1HQb*l&>hX=NbFO)pmZzR_$+{RO9%=RYu+Z0; zd3uC&Vf}L%d$ReE82#LgRAflscz&!!V+5ff1YK{8)I7TU;LM7w_zf8`D>KgpXT=6T zid&T(w<7!eimce6jF`am=zxc({2re6OFrfE@RZN>{k9nwLaTEVo1UW~TKxIaPk@IJ zG7ZjWwm&Qe%`_$(D$6YEjgdZhq_eZDy{-9eb7Ol;)7zHUu(sw#p1o>)1AEE0mZlf& zt?v0VE5^vDLl`>FNJTctRaZ!l03%41LyriJ zu@ZaT$a(@|j0^=vz#{}B{5HhpZvQ`fZvmE9mZb|*(lXO>d*+{i`c6-GS65e8Rm$V; zL?93d?(XjH?ht}Q(BKd}0fGj1cXxO9bKmoQKnRhlN=2(U&w5~=eYSo3toN+7wye#{ zOaD2J9HQ!4dl-4QK(VW}dl>oY7=fBf(X}|J`w+1fWv8wMdt?tIySVP%y8S+k?DiV8 zW9(~d`O5b!nkA>m-xm7uV|V1zujg56`?0ru(;iXWfe}U0W~bUCdl-4Q5bj*74x z7h*jw%z8qY^^_3XX<_!W!W`#?IW7ou&GofT#~Ey8+|>;abJ!YoIHZyXW6aTxt0eB%HJ>(ictkv*IJ9mU1YW&f#(e%?OlLn~JoCx5QyLY5F z?WfepU4O}26u#Ax?GmWX+iv8c|0NqtAvFHtk-yO%`}^hNA6+@|kE; z_Q+0-d-uY-FhWHN`S-?m01h^cP)UqsKb6E;_LIbV03@-K*bYd%&BT5{;`y|r@#1U; zNFskD7UXXc%YK}oxEvlf5&(2OT#UUz%PoSA_XJQ82g=@o1Y}Fsb|yV#3V_S zYe%xFsfmfn>FMd!9o}``J)V2lTD(iw+A>3a;(X%IdeZQTDbY<`YYQX1j5{y_IkID1 z3%s45n-dls6c%zP{Mi&477`s99vu-D5gM{HS?Ha>yHOFfwYBr}&)hckt});{(B3_a z{KT@CE>7413V@)kL=U>dwv1GBMEq?%)6I_rL$$bLbDh|NS5T zKoSCvCHvjKfAiIsSsCej7=nAd0rHLH3gu0oQ^c7;d-X^)nf=-Yi zhU`*%OfDlZ;F#HOc2Tg7XlMUQiI_+!APBa7(!}V!VuIlLTCS}>heO=NN?SnJ!|}jJ z7dmpRv^|Og#o<9~Ro%VRUqpP7SYWXT)DgU4YH#-WIU!#WI=Hr@vR>T4yy(}$#Kxwp z6JUeksL@2B2cE)btH`ZnVRm{nmFWhjqEFY zAqp%fk@7N|WKMuM_LxZ+WhwJq8Y&I{kv#rWlRqCL)R7qs2!l7a!ruxoeud8?{=$dn zR{WRn|AU!Fc=+LGz!ck8q&py-UxQmXg`*6XQUi!b0FS85hQ&^ND2jCWgHP_4D3F>3 zF-VE0sCuh}-2o&fOG93!Z=Yn{*BA51X6NGF(zSpQjB7nfDS|QmY9woKOuc6NHS6Z_7Oo&%91Y4!8gvamnnnWrf4KA@|%tduEwN zqEq;!4t&sop@ojA5n~U^2}1geMnO}llCUUT)>rk7(_Pf+$Z<6BD+^bGbNE$5-^vIj zmE4hDv9pr+KRgirjF5_^(0lbdDXQ{cS0Nj&yw$?Y)6vu~q!VRga z=oL7lgQL;7a1XG0Oo%HSFgDbbz=M#o(1oI$6isPHCBciuIVtKA^l*{g)?DM|s0-iM z0GhqA3|y5KK1{aNmu#vlPl>w&&kSivVJ!_6jWwkX#xlBcECt#37{4FaN?hj> zyUuj|$VbO}if)!2UH~01H zXIb}O7_7Jj&5!@G%|bo-@lTsvHa>x7ka|~W(XbN}d}8-Voz^3k3d^Vsn9Z#u2+?D@ zQyV$LT!F(6eUWk;F>LNrD-Q$(!<(aR5%ZcaiajC%TtEcuBDgGoxAxAqMpdz^92fqP zmJphknF!CN6kn!N@MQ|eCiq&G7iDGKj{u)oY75&LNWrPQx)?p%xsUJ^XClCbqn-kr zs>qeDwnk%B-io5EJKi?nH>Afgf?_O(s!MZ&JS?LEor`i(1sT3^v(Z3}k{ri5Y5&Q6 z`BN)xG@wCAkk&+n7bPeQUxrH4)!w8b!6?A+4cocDr^W~6WhDwT?H6If(y3Pk6ZDKM z&uL>7ZtlzfLYt{Dp^7Sm5ujp(Do213V-*f~6vsjZA;vEa)J3<~#!pX8swycmFfblH zdh`!}_`?gpWEV!@DcIaKFI5-Zi{R!JSv?`c#7B%~v@8=m{Av@G5soDz93P!nAInj^ z+snW2U&LIkK}3%iJADH&dFbz=1E~i0=7_KVXa9VG>HTR!{9F3<`Qo}lIPYD?u^+rw zjeE;oHA3nXzdN$J(k)|}o}|s&IzPk4q%~FPhANq~;{v4_;nba4{r$lO)w2q)9z2>h z3@EM0AJhbo$@l`fy&4Lr~aOfhYw;h zlOx@1HLUeSn;YOR{-TL0cUx1HipV8HWezxaR2Qd%|HjPwk&s_@M$*&*Q5sxFz6t`U zAx3AWCyi9O;SYaT6%Z}}EIblZF~Yxv5psHw@k{;3Ffyg8tVmCPje&u|%E~G?H}~K{ z(rw*;{nvkOOBQc$Z^US6X=OfsF)=YAeiuf-Dp3_v;*xSi|K_1NYb&IC2))SibEhs{ zJar+_MI7FAeRBr{>E*aZBrl&mn-uAFiBI|b;bSwU-jEvXw8rXM@?Ral9Oo`CW#azT zu?yAS(i_BTVE*`dy6Z>IUGS2lTVEZq4zH7Bm%hX*!gKk=LMN##1(ggQy}-^ue}R*o zGf*D-+orAsjHsLeMjA7g2$_SDQ$#f{x4)c{tn}rp>)k17J<|uTid?vG!Cd70##~GJ z3L0RbMrlC2hk}%`+gC>~G~Sk-CssuzLR1xGE?nSZ`Sx^Im5*gy!~gyBw->+uq&>;_ zbpix+QFSdWPZ9%69w#_BHPzsqnVx{=GdVGm92dZK`D0@h&XJ*BcRLLnxX|6%Y^cOu zS5=4;dAKhB6D|(Copf<13H$>`1US}L6`H7VceKUI&P(;asfRs! z@NtR(XD}Nuf+J2sZreP3aF^@yCjbi$H!)G?O-;B1$GBlrT5Hw7$AX$wdB{TUx`)0gK@B+hQ + /// If not running under the Desktop Bridge, you must call this method to register your AUMID with the Compat library and to + /// register your COM CLSID and EXE in LocalServer32 registry. Feel free to call this regardless, and we will no-op if running + /// under Desktop Bridge. Call this upon application startup, before calling any other APIs. + /// + /// An AUMID that uniquely identifies your application. + /// The CLSID of your NotificationActivator class. + HRESULT RegisterAumidAndComServer(const wchar_t *aumid, GUID clsid); + + /// + /// Registers your module to handle COM activations. Call this upon application startup. + /// + HRESULT RegisterActivator(); + + /// + /// Creates a toast notifier. You must have called RegisterActivator first (and also RegisterAumidAndComServer if you're a classic Win32 app), or this will throw an exception. + /// + HRESULT CreateToastNotifier(IToastNotifier** notifier); + + /// + /// Creates an XmlDocument initialized with the specified string. This is simply a convenience helper method. + /// + HRESULT CreateXmlDocumentFromString(const wchar_t *xmlString, ABI::Windows::Data::Xml::Dom::IXmlDocument** doc); + + /// + /// Creates a toast notification. This is simply a convenience helper method. + /// + HRESULT CreateToastNotification(ABI::Windows::Data::Xml::Dom::IXmlDocument* content, IToastNotification** notification); + + /// + /// Gets the DesktopNotificationHistoryCompat object. You must have called RegisterActivator first (and also RegisterAumidAndComServer if you're a classic Win32 app), or this will throw an exception. + /// + HRESULT get_History(std::unique_ptr* history); + + /// + /// Gets a boolean representing whether http images can be used within toasts. This is true if running under Desktop Bridge. + /// + bool CanUseHttpImages(); +} + +class DesktopNotificationHistoryCompat +{ +public: + + /// + /// Removes all notifications sent by this app from action center. + /// + HRESULT Clear(); + + /// + /// Gets all notifications sent by this app that are currently still in Action Center. + /// + HRESULT GetHistory(ABI::Windows::Foundation::Collections::IVectorView** history); + + /// + /// Removes an individual toast, with the specified tag label, from action center. + /// + /// The tag label of the toast notification to be removed. + HRESULT Remove(const wchar_t *tag); + + /// + /// Removes a toast notification from the action using the notification's tag and group labels. + /// + /// The tag label of the toast notification to be removed. + /// The group label of the toast notification to be removed. + HRESULT RemoveGroupedTag(const wchar_t *tag, const wchar_t *group); + + /// + /// Removes a group of toast notifications, identified by the specified group label, from action center. + /// + /// The group label of the toast notifications to be removed. + HRESULT RemoveGroup(const wchar_t *group); + + /// + /// Do not call this. Instead, call DesktopNotificationManagerCompat.get_History() to obtain an instance. + /// + DesktopNotificationHistoryCompat(const wchar_t *aumid, Microsoft::WRL::ComPtr history); + +private: + std::wstring m_aumid; + Microsoft::WRL::ComPtr m_history = nullptr; +}; \ No newline at end of file diff --git a/Src/Update/DesktopToasts/DesktopToasts.def b/Src/Update/DesktopToasts/DesktopToasts.def new file mode 100644 index 000000000..45eb4a7ed --- /dev/null +++ b/Src/Update/DesktopToasts/DesktopToasts.def @@ -0,0 +1,5 @@ +LIBRARY "DesktopToasts.dll" + +EXPORTS + Initialize + DisplaySimpleToast diff --git a/Src/Update/DesktopToasts/DesktopToasts.h b/Src/Update/DesktopToasts/DesktopToasts.h new file mode 100644 index 000000000..a1ac9cef7 --- /dev/null +++ b/Src/Update/DesktopToasts/DesktopToasts.h @@ -0,0 +1,59 @@ +#include + +using DesktopToastActivateHandler = void(__cdecl*)(void* context, LPCWSTR invokedArgs); + +HRESULT Initialize(LPCWSTR appUserModelId, DesktopToastActivateHandler handler, void* handlerContext); +HRESULT DisplaySimpleToast(LPCWSTR title, LPCWSTR text); + +class DesktopToasts +{ +public: + explicit DesktopToasts(LPCWSTR appUserModelId) + { + if (::IsWindows10OrGreater()) + { + auto m_lib = ::LoadLibrary(L"DesktopToasts.dll"); + if (m_lib) + { + m_pInitialize = (decltype(m_pInitialize))::GetProcAddress(m_lib, "Initialize"); + m_pDisplayToast = (decltype(m_pDisplayToast))::GetProcAddress(m_lib, "DisplaySimpleToast"); + + if (m_pInitialize && m_pDisplayToast) + { + if (m_pInitialize(appUserModelId, ToastActivate, this) == S_OK) + m_initialized = true; + } + } + } + } + + ~DesktopToasts() + { + if (m_lib) + ::FreeLibrary(m_lib); + } + + explicit operator bool() const + { + return m_initialized; + } + + HRESULT DisplaySimpleToast(LPCWSTR title, LPCWSTR text) + { + return m_pDisplayToast(title, text); + } + +private: + virtual void OnToastActivate(LPCWSTR invokedArgs) {} + + static void __cdecl ToastActivate(void* context, LPCWSTR invokedArgs) + { + static_cast(context)->OnToastActivate(invokedArgs); + } + + bool m_initialized = false; + + HMODULE m_lib = nullptr; + decltype(&::Initialize) m_pInitialize = nullptr; + decltype(&::DisplaySimpleToast) m_pDisplayToast = nullptr; +}; diff --git a/Src/Update/DesktopToasts/DesktopToasts.rc b/Src/Update/DesktopToasts/DesktopToasts.rc new file mode 100644 index 000000000..3d252060b --- /dev/null +++ b/Src/Update/DesktopToasts/DesktopToasts.rc @@ -0,0 +1,61 @@ +// Microsoft Visual C++ generated resource script. +// + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION _PRODUCT_VERSION + PRODUCTVERSION _PRODUCT_VERSION + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "Open-Shell" + VALUE "FileDescription", "Desktop toast notifications support" + VALUE "FileVersion", _PRODUCT_VERSION_STR + VALUE "InternalName", "DesktopToasts.dll" + VALUE "LegalCopyright", "Copyright (C) 2020, The Open-Shell Team" + VALUE "OriginalFilename", "DesktopToasts.dll" + VALUE "ProductName", "Open-Shell" + VALUE "ProductVersion", _PRODUCT_VERSION_STR + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// diff --git a/Src/Update/DesktopToasts/DesktopToasts.vcxproj b/Src/Update/DesktopToasts/DesktopToasts.vcxproj new file mode 100644 index 000000000..5d5a7755a --- /dev/null +++ b/Src/Update/DesktopToasts/DesktopToasts.vcxproj @@ -0,0 +1,110 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + 16.0 + Win32Proj + {d94bd2a6-1872-4f01-b911-f406603aa2e1} + DesktopToasts + 10.0 + + + + DynamicLibrary + true + v142 + Unicode + + + DynamicLibrary + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + true + ..\$(Configuration)\ + + + false + $(Configuration)\ + + + + Level3 + true + WIN32;_DEBUG;DESKTOPTOASTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + false + runtimeobject.lib;%(AdditionalDependencies) + DesktopToasts.def + + + + + Level3 + true + true + true + WIN32;NDEBUG;DESKTOPTOASTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + stdcpp17 + MultiThreaded + + + Windows + true + true + true + false + runtimeobject.lib;%(AdditionalDependencies) + DesktopToasts.def + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Src/Update/DesktopToasts/DesktopToasts.vcxproj.filters b/Src/Update/DesktopToasts/DesktopToasts.vcxproj.filters new file mode 100644 index 000000000..e13aeaa0a --- /dev/null +++ b/Src/Update/DesktopToasts/DesktopToasts.vcxproj.filters @@ -0,0 +1,43 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/Src/Update/DesktopToasts/dllmain.cpp b/Src/Update/DesktopToasts/dllmain.cpp new file mode 100644 index 000000000..cccd93365 --- /dev/null +++ b/Src/Update/DesktopToasts/dllmain.cpp @@ -0,0 +1,131 @@ +// dllmain.cpp : Defines the entry point for the DLL application. +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#include +#include +#include +#include + +#include "DesktopToasts.h" +#include "DesktopNotificationManagerCompat.h" + +#define RETURN_IF_FAILED(hr) do { HRESULT _hrTemp = hr; if (FAILED(_hrTemp)) { return _hrTemp; } } while (false) + +using namespace ABI::Windows::Data::Xml::Dom; +using namespace ABI::Windows::UI::Notifications; +using namespace Microsoft::WRL; +using namespace Microsoft::WRL::Wrappers; + +DesktopToastActivateHandler g_handler = nullptr; +void* g_handlerContext = nullptr; + +class DECLSPEC_UUID("E407B70A-1FBD-4D5E-8822-231C69102472") NotificationActivator WrlSealed WrlFinal + : public RuntimeClass, INotificationActivationCallback> +{ +public: + virtual HRESULT STDMETHODCALLTYPE Activate( + _In_ LPCWSTR appUserModelId, + _In_ LPCWSTR invokedArgs, + _In_reads_(dataCount) const NOTIFICATION_USER_INPUT_DATA * data, + ULONG dataCount) override + { + if (g_handler) + g_handler(g_handlerContext, invokedArgs); + + return S_OK; + } +}; + +// Flag class as COM creatable +CoCreatableClass(NotificationActivator); + +HRESULT Initialize(LPCWSTR appUserModelId, DesktopToastActivateHandler handler, void* handlerContext) +{ + RETURN_IF_FAILED(DesktopNotificationManagerCompat::RegisterAumidAndComServer(appUserModelId, __uuidof(NotificationActivator))); + RETURN_IF_FAILED(DesktopNotificationManagerCompat::RegisterActivator()); + g_handler = handler; + g_handlerContext = handlerContext; + + return S_OK; +} + +HRESULT SetNodeValueString(HSTRING inputString, IXmlNode* node, IXmlDocument* xml) +{ + ComPtr inputText; + RETURN_IF_FAILED(xml->CreateTextNode(inputString, &inputText)); + + ComPtr inputTextNode; + RETURN_IF_FAILED(inputText.As(&inputTextNode)); + + ComPtr appendedChild; + return node->AppendChild(inputTextNode.Get(), &appendedChild); +} + +_Use_decl_annotations_ +HRESULT SetTextValues(const PCWSTR* textValues, UINT32 textValuesCount, IXmlDocument* toastXml) +{ + ComPtr nodeList; + RETURN_IF_FAILED(toastXml->GetElementsByTagName(HStringReference(L"text").Get(), &nodeList)); + + UINT32 nodeListLength; + RETURN_IF_FAILED(nodeList->get_Length(&nodeListLength)); + + // If a template was chosen with fewer text elements, also change the amount of strings + // passed to this method. + RETURN_IF_FAILED(textValuesCount <= nodeListLength ? S_OK : E_INVALIDARG); + + for (UINT32 i = 0; i < textValuesCount; i++) + { + ComPtr textNode; + RETURN_IF_FAILED(nodeList->Item(i, &textNode)); + + RETURN_IF_FAILED(SetNodeValueString(HStringReference(textValues[i]).Get(), textNode.Get(), toastXml)); + } + + return S_OK; +} + +HRESULT DisplaySimpleToast(LPCWSTR title, LPCWSTR text) +{ + // Construct XML + ComPtr doc; + HRESULT hr = DesktopNotificationManagerCompat::CreateXmlDocumentFromString(L"", &doc); + if (SUCCEEDED(hr)) + { + PCWSTR textValues[] = { title, text }; + SetTextValues(textValues, ARRAYSIZE(textValues), doc.Get()); + + // Create the notifier + // Classic Win32 apps MUST use the compat method to create the notifier + ComPtr notifier; + hr = DesktopNotificationManagerCompat::CreateToastNotifier(¬ifier); + if (SUCCEEDED(hr)) + { + // Create the notification itself (using helper method from compat library) + ComPtr toast; + hr = DesktopNotificationManagerCompat::CreateToastNotification(doc.Get(), &toast); + if (SUCCEEDED(hr)) + { + // And show it! + hr = notifier->Show(toast.Get()); + } + } + } + + return hr; +} + +BOOL APIENTRY DllMain( HMODULE hModule, + DWORD ul_reason_for_call, + LPVOID lpReserved + ) +{ + switch (ul_reason_for_call) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} From ed3da927cc1acfac4097ba7584737f9810d21c34 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Wed, 9 Sep 2020 21:11:10 +0200 Subject: [PATCH 048/234] Update: Use desktop toast notifications on Windows 10 Use toast notification to announce new update on modern Windows versions. The advantage of toasts is that they look more natural and they are persistent. So one can find the information about new update in action center even after notification timed out. --- Src/Setup/BuildBinaries.bat | 3 ++ Src/Setup/Setup.wxs | 15 +++++- Src/Update/Update.cpp | 103 +++++++++++++++++++++--------------- 3 files changed, 77 insertions(+), 44 deletions(-) diff --git a/Src/Setup/BuildBinaries.bat b/Src/Setup/BuildBinaries.bat index 55b03ac19..f1f814962 100644 --- a/Src/Setup/BuildBinaries.bat +++ b/Src/Setup/BuildBinaries.bat @@ -38,6 +38,7 @@ copy /B ..\ClassicIE\Setup\ClassicIE_32.exe Output > nul copy /B ..\StartMenu\Setup\StartMenu.exe Output > nul copy /B ..\StartMenu\Setup\StartMenuDLL.dll Output > nul copy /B ..\Update\Release\Update.exe Output > nul +copy /B ..\Update\DesktopToasts\Release\DesktopToasts.dll Output > nul copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.dll Output > nul copy /B ..\Setup\SetupHelper\Release\SetupHelper.exe Output > nul @@ -99,6 +100,8 @@ copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.pdb Output\PDB32 > copy /B Output\StartMenuHelper32.dll Output\PDB32 > nul copy /B ..\Update\Release\Update.pdb Output\PDB32 > nul copy /B Output\Update.exe Output\PDB32 > nul +copy /B ..\Update\DesktopToasts\Release\DesktopToasts.pdb Output\PDB32 > nul +copy /B Output\DesktopToasts.dll Output\PDB32 > nul REM Menu 64 copy /B ..\StartMenu\Setup64\StartMenu.pdb Output\PDB64 > nul diff --git a/Src/Setup/Setup.wxs b/Src/Setup/Setup.wxs index 9706cacea..eb9c07d06 100644 --- a/Src/Setup/Setup.wxs +++ b/Src/Setup/Setup.wxs @@ -105,7 +105,9 @@ + + @@ -476,6 +478,9 @@ + + + @@ -551,6 +556,11 @@ + + + + + @@ -564,7 +574,10 @@ START_MENU_FOLDER=1 - + + + + START_MENU_FOLDER=1 diff --git a/Src/Update/Update.cpp b/Src/Update/Update.cpp index 1a99e805d..6f522b541 100644 --- a/Src/Update/Update.cpp +++ b/Src/Update/Update.cpp @@ -16,6 +16,7 @@ #include "ResourceHelper.h" #include "Translations.h" #include +#include "DesktopToasts/DesktopToasts.h" void ClosingSettings( HWND hWnd, int flags, int command ) @@ -487,8 +488,6 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC CString language=GetSettingString(L"Language"); ParseTranslations(NULL,language); - g_Instance=hInstance; - HINSTANCE resInstance=LoadTranslationDll(language); LoadTranslationResources(resInstance,g_LoadDialogs); @@ -500,6 +499,9 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC COwnerWindow ownerWindow; ownerWindow.Create(NULL,0,0,WS_POPUP); + + DesktopToasts toasts(L"OpenShell.Update"); + if (wcsstr(lpstrCmdLine,L"-popup")!=NULL) { g_UpdateDlg.UpdateData(); @@ -507,53 +509,68 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC int sleep=5000-(timeGetTime()-time0); if (sleep>0) Sleep(sleep); - HWND balloon=CreateWindowEx(WS_EX_TOPMOST|WS_EX_TOOLWINDOW|(IsLanguageRTL()?WS_EX_LAYOUTRTL:0),TOOLTIPS_CLASS,NULL,WS_POPUP|TTS_CLOSE|TTS_NOPREFIX,0,0,0,0,NULL,NULL,g_Instance,NULL); - SendMessage(balloon,TTM_SETMAXTIPWIDTH,0,500); - TOOLINFO tool={sizeof(tool),TTF_ABSOLUTE|TTF_TRANSPARENT|TTF_TRACK|(IsLanguageRTL()?TTF_RTLREADING:0U)}; - tool.uId=1; - CString message=LoadStringEx(g_UpdateDlg.HasNewLanguage()?IDS_LANG_NEWVERSION:IDS_NEWVERSION); - tool.lpszText=(wchar_t*)(const wchar_t*)message; - SendMessage(balloon,TTM_ADDTOOL,0,(LPARAM)&tool); - SendMessage(balloon,TTM_SETTITLE,(WPARAM)LoadIcon(g_Instance,MAKEINTRESOURCE(IDI_APPICON)),(LPARAM)(const wchar_t*)LoadStringEx(IDS_UPDATE_TITLE)); - APPBARDATA appbar={sizeof(appbar)}; - SHAppBarMessage(ABM_GETTASKBARPOS,&appbar); - MONITORINFO info={sizeof(info)}; - GetMonitorInfo(MonitorFromWindow(appbar.hWnd,MONITOR_DEFAULTTOPRIMARY),&info); - SendMessage(balloon,TTM_TRACKPOSITION,0,0); - SendMessage(balloon,TTM_TRACKACTIVATE,TRUE,(LPARAM)&tool); - RECT rc; - GetWindowRect(balloon,&rc); - LONG pos; - if (appbar.uEdge==ABE_LEFT) - pos=MAKELONG(info.rcWork.left,info.rcWork.bottom-rc.bottom+rc.top); - else if (appbar.uEdge==ABE_RIGHT) - pos=MAKELONG(info.rcWork.right-rc.right+rc.left,info.rcWork.bottom-rc.bottom+rc.top); - else if (appbar.uEdge==ABE_TOP) - pos=MAKELONG(IsLanguageRTL()?info.rcWork.left:info.rcWork.right-rc.right+rc.left,info.rcWork.top); + + auto title = LoadStringEx(IDS_UPDATE_TITLE); + auto message = LoadStringEx(g_UpdateDlg.HasNewLanguage() ? IDS_LANG_NEWVERSION : IDS_NEWVERSION); + + if (toasts) + { + toasts.DisplaySimpleToast(title, message); + } else - pos=MAKELONG(IsLanguageRTL()?info.rcWork.left:info.rcWork.right-rc.right+rc.left,info.rcWork.bottom-rc.bottom+rc.top); - SendMessage(balloon,TTM_TRACKPOSITION,0,pos); - SetWindowSubclass(balloon,SubclassBalloonProc,0,'CLSH'); - PlaySound(L"SystemNotification",NULL,SND_APPLICATION|SND_ALIAS|SND_ASYNC|SND_NODEFAULT|SND_SYSTEM); - int time0=timeGetTime(); - while (IsWindowVisible(balloon)) { - if (time0 && (timeGetTime()-time0)>=15000) - { - time0=0; - TOOLINFO tool={sizeof(tool)}; - tool.uId=1; - SendMessage(balloon,TTM_TRACKACTIVATE,FALSE,(LPARAM)&tool); - } - MSG msg; - while (PeekMessage(&msg,0,0,0,PM_REMOVE)) + HWND balloon = CreateWindowEx(WS_EX_TOPMOST | WS_EX_TOOLWINDOW | (IsLanguageRTL() ? WS_EX_LAYOUTRTL : 0), TOOLTIPS_CLASS, NULL, WS_POPUP | TTS_CLOSE | TTS_NOPREFIX, 0, 0, 0, 0, NULL, NULL, g_Instance, NULL); + SendMessage(balloon, TTM_SETMAXTIPWIDTH, 0, 500); + TOOLINFO tool = { sizeof(tool),TTF_ABSOLUTE | TTF_TRANSPARENT | TTF_TRACK | (IsLanguageRTL() ? TTF_RTLREADING : 0U) }; + tool.uId = 1; + tool.lpszText = (wchar_t*)(const wchar_t*)message; + SendMessage(balloon, TTM_ADDTOOL, 0, (LPARAM)&tool); + SendMessage(balloon, TTM_SETTITLE, (WPARAM)LoadIcon(g_Instance, MAKEINTRESOURCE(IDI_APPICON)), (LPARAM)(const wchar_t*)title); + APPBARDATA appbar = { sizeof(appbar) }; + SHAppBarMessage(ABM_GETTASKBARPOS, &appbar); + MONITORINFO info = { sizeof(info) }; + GetMonitorInfo(MonitorFromWindow(appbar.hWnd, MONITOR_DEFAULTTOPRIMARY), &info); + SendMessage(balloon, TTM_TRACKPOSITION, 0, 0); + SendMessage(balloon, TTM_TRACKACTIVATE, TRUE, (LPARAM)&tool); + RECT rc; + GetWindowRect(balloon, &rc); + LONG pos; + if (appbar.uEdge == ABE_LEFT) + pos = MAKELONG(info.rcWork.left, info.rcWork.bottom - rc.bottom + rc.top); + else if (appbar.uEdge == ABE_RIGHT) + pos = MAKELONG(info.rcWork.right - rc.right + rc.left, info.rcWork.bottom - rc.bottom + rc.top); + else if (appbar.uEdge == ABE_TOP) + pos = MAKELONG(IsLanguageRTL() ? info.rcWork.left : info.rcWork.right - rc.right + rc.left, info.rcWork.top); + else + pos = MAKELONG(IsLanguageRTL() ? info.rcWork.left : info.rcWork.right - rc.right + rc.left, info.rcWork.bottom - rc.bottom + rc.top); + SendMessage(balloon, TTM_TRACKPOSITION, 0, pos); + SetWindowSubclass(balloon, SubclassBalloonProc, 0, 'CLSH'); + PlaySound(L"SystemNotification", NULL, SND_APPLICATION | SND_ALIAS | SND_ASYNC | SND_NODEFAULT | SND_SYSTEM); + int time0 = timeGetTime(); + while (IsWindowVisible(balloon)) { - TranslateMessage(&msg); - DispatchMessage(&msg); + if (time0 && (timeGetTime() - time0) >= 15000) + { + time0 = 0; + TOOLINFO tool = { sizeof(tool) }; + tool.uId = 1; + SendMessage(balloon, TTM_TRACKACTIVATE, FALSE, (LPARAM)&tool); + } + MSG msg; + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + Sleep(10); } - Sleep(10); } } + else if (wcsstr(lpstrCmdLine, L"-ToastActivated")) + { + g_UpdateDlg.UpdateData(); + g_UpdateDlg.Run(); + } else { g_UpdateDlg.Run(); From fbcf85559eea7491a0889115084afeeaf047d569 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Mon, 14 Sep 2020 15:20:20 +0200 Subject: [PATCH 049/234] Update: Add option to check for nightly updates Use Appveyor REST API to obtain information about latest build from master. --- Src/Lib/DownloadHelper.cpp | 135 ++++++++++++++++++++++++++++++++++++- Src/Lib/DownloadHelper.h | 1 + Src/Lib/Lib.vcxproj | 5 ++ Src/Update/Update.cpp | 22 ++++++ Src/Update/Update.rc | 22 +++--- Src/Update/resource.h | 3 +- 6 files changed, 175 insertions(+), 13 deletions(-) diff --git a/Src/Lib/DownloadHelper.cpp b/Src/Lib/DownloadHelper.cpp index 62bf6aa48..19160d008 100644 --- a/Src/Lib/DownloadHelper.cpp +++ b/Src/Lib/DownloadHelper.cpp @@ -318,6 +318,7 @@ struct VersionCheckParams TSettingsComponent component; tNewVersionCallback callback; CProgressDlg *progress; + bool nightly = false; }; // 0 - fail, 1 - success, 2 - cancel @@ -342,7 +343,7 @@ static DWORD WINAPI ThreadVersionCheck( void *param ) VersionData data; { - auto load = data.Load(); + auto load = params.nightly ? data.LoadNightly() : data.Load(); #ifdef UPDATE_LOG LogToFile(UPDATE_LOG, L"Load result: %d", load); @@ -450,6 +451,21 @@ DWORD CheckForNewVersion( HWND owner, TSettingsComponent component, TVersionChec params->callback=callback; params->progress=NULL; + // check the Update setting (uses the current value in the registry, not the one from memory + { + CRegKey regSettings, regSettingsUser, regPolicy, regPolicyUser; + bool bUpgrade = OpenSettingsKeys(COMPONENT_SHARED, regSettings, regSettingsUser, regPolicy, regPolicyUser); + + CSetting settings[] = { + {L"Nightly",CSetting::TYPE_BOOL,0,0,0}, + {NULL} + }; + + settings[0].LoadValue(regSettings, regSettingsUser, regPolicy, regPolicyUser); + + params->nightly = GetSettingBool(settings[0]); + } + if (!owner) return ThreadVersionCheck(params); @@ -495,19 +511,23 @@ DWORD CheckForNewVersion( HWND owner, TSettingsComponent component, TVersionChec return 0; // check weekly // check the Update setting (uses the current value in the registry, not the one from memory + bool nightly = false; { CRegKey regSettings, regSettingsUser, regPolicy, regPolicyUser; bool bUpgrade=OpenSettingsKeys(COMPONENT_SHARED,regSettings,regSettingsUser,regPolicy,regPolicyUser); CSetting settings[]={ {L"Update",CSetting::TYPE_BOOL,0,0,1}, + {L"Nightly",CSetting::TYPE_BOOL,0,0,0}, {NULL} }; settings[0].LoadValue(regSettings,regSettingsUser,regPolicy,regPolicyUser); + settings[1].LoadValue(regSettings,regSettingsUser,regPolicy,regPolicyUser); if (!GetSettingBool(settings[0])) - return 0; + return 0; + nightly = GetSettingBool(settings[1]); } VersionCheckParams *params=new VersionCheckParams; @@ -515,6 +535,7 @@ DWORD CheckForNewVersion( HWND owner, TSettingsComponent component, TVersionChec params->component=component; params->callback=callback; params->progress=NULL; + params->nightly=nightly; g_bCheckingVersion=true; if (check==CHECK_AUTO_WAIT) @@ -810,6 +831,116 @@ VersionData::TLoadResult VersionData::Load() } } +VersionData::TLoadResult VersionData::LoadNightly() +{ + Clear(); + + auto buf = DownloadUrl(L"https://ci.appveyor.com/api/projects/passionate-coder/open-shell-menu/branch/master"); + if (buf.empty()) + return LOAD_ERROR; + + try + { + auto data = json::parse(buf.begin(), buf.end()); + auto build = data["build"]; + + // get version + auto version = build["version"].get(); + if (version.empty()) + return LOAD_BAD_FILE; + + { + int v1, v2, v3; + if (sscanf_s(version.c_str(), "%d.%d.%d", &v1, &v2, &v3) != 3) + return LOAD_BAD_FILE; + + newVersion = (v1 << 24) | (v2 << 16) | v3; + + if (newVersion <= GetVersionEx(g_Instance)) + return LOAD_OK; + } + + // artifact url + { + auto jobId = build["jobs"][0]["jobId"].get(); + if (jobId.empty()) + return LOAD_BAD_FILE; + + std::wstring jobUrl(L"https://ci.appveyor.com/api/buildjobs/"); + jobUrl += std::wstring(jobId.begin(), jobId.end()); + jobUrl += L"/artifacts"; + + buf = DownloadUrl(jobUrl.c_str()); + if (buf.empty()) + return LOAD_ERROR; + + auto artifacts = json::parse(buf.begin(), buf.end()); + + std::string fileName; + for (const auto& artifact : artifacts) + { + auto name = artifact["fileName"].get(); + if (name.find("OpenShellSetup") == 0) + { + fileName = name; + break; + } + } + + if (fileName.empty()) + return LOAD_BAD_FILE; + + auto artifactUrl(jobUrl); + artifactUrl += L'/'; + artifactUrl += std::wstring(fileName.begin(), fileName.end()); + + downloadUrl = artifactUrl.c_str(); + } + + // changelog + news.Append(CA2T(version.c_str())); + news.Append(L"\r\n\r\n"); + try + { + // use Github API to compare commit that actual version was built from (APPVEYOR_REPO_COMMIT) + // and commit that AppVeyor version was built from (commitId) + auto commitId = build["commitId"].get(); + + std::wstring compareUrl(L"https://api.github.com/repos/Open-Shell/Open-Shell-Menu/compare/"); + compareUrl += _T(APPVEYOR_REPO_COMMIT); + compareUrl += L"..."; + compareUrl += std::wstring(commitId.begin(), commitId.end()); + + buf = DownloadUrl(compareUrl.c_str()); + auto compare = json::parse(buf.begin(), buf.end()); + + // then use first lines (subjects) of commit messages as changelog + auto commits = compare["commits"]; + for (const auto& commit : commits) + { + auto message = commit["commit"]["message"].get(); + + auto pos = message.find('\n'); + if (pos != message.npos) + message.resize(pos); + + news.Append(L"- "); + news.Append(CA2T(message.c_str())); + news.Append(L"\r\n"); + } + } + catch (...) + { + } + } + catch (...) + { + return LOAD_BAD_FILE; + } + + return LOAD_OK; +} + VersionData::TLoadResult VersionData::Load( const wchar_t *fname, bool bLoadFlags ) { Clear(); diff --git a/Src/Lib/DownloadHelper.h b/Src/Lib/DownloadHelper.h index 5941f5cf8..32d536e64 100644 --- a/Src/Lib/DownloadHelper.h +++ b/Src/Lib/DownloadHelper.h @@ -60,6 +60,7 @@ struct VersionData }; TLoadResult Load(); + TLoadResult LoadNightly(); TLoadResult Load( const wchar_t *fname, bool bLoadFlags ); private: void operator=( const VersionData& ); diff --git a/Src/Lib/Lib.vcxproj b/Src/Lib/Lib.vcxproj index 69d8f80b8..ac8a4d84a 100644 --- a/Src/Lib/Lib.vcxproj +++ b/Src/Lib/Lib.vcxproj @@ -83,6 +83,11 @@ $(Configuration)64\ $(Configuration)64\ + + + APPVEYOR_REPO_COMMIT="$(APPVEYOR_REPO_COMMIT)";%(PreprocessorDefinitions) + + Disabled diff --git a/Src/Update/Update.cpp b/Src/Update/Update.cpp index 6f522b541..011d33e31 100644 --- a/Src/Update/Update.cpp +++ b/Src/Update/Update.cpp @@ -60,11 +60,13 @@ static CSetting g_Settings[]={ {L"Update",CSetting::TYPE_GROUP}, {L"Language",CSetting::TYPE_STRING,0,0,L"",CSetting::FLAG_SHARED}, {L"Update",CSetting::TYPE_BOOL,0,0,1,CSetting::FLAG_SHARED}, + {L"Nightly",CSetting::TYPE_BOOL,0,0,0,CSetting::FLAG_SHARED}, {NULL} }; const int SETTING_UPDATE=2; +const int SETTING_NIGHTLY=3; /////////////////////////////////////////////////////////////////////////////// @@ -79,6 +81,7 @@ class CUpdateDlg: public CResizeableDlg MESSAGE_HANDLER( WM_GETMINMAXINFO, OnGetMinMaxInfo ) MESSAGE_HANDLER( WM_CTLCOLORSTATIC, OnColorStatic ) COMMAND_HANDLER( IDC_CHECKAUTOCHECK, BN_CLICKED, OnCheckAuto ) + COMMAND_HANDLER( IDC_CHECKNIGHTLY, BN_CLICKED, OnCheckNightly ) COMMAND_HANDLER( IDC_BUTTONCHECKNOW, BN_CLICKED, OnCheckNow ) COMMAND_HANDLER( IDC_BUTTONDOWNLOAD, BN_CLICKED, OnDownload ) COMMAND_HANDLER( IDC_CHECKDONT, BN_CLICKED, OnDontRemind ) @@ -114,6 +117,7 @@ class CUpdateDlg: public CResizeableDlg LRESULT OnCancel( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled ); LRESULT OnColorStatic( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled ); LRESULT OnCheckAuto( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled ); + LRESULT OnCheckNightly( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled ); LRESULT OnCheckNow( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled ); LRESULT OnDownload( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled ); LRESULT OnDontRemind( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled ); @@ -161,6 +165,13 @@ LRESULT CUpdateDlg::OnInitDialog( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& CheckDlgButton(IDC_CHECKAUTOCHECK,check?BST_CHECKED:BST_UNCHECKED); GetDlgItem(IDC_CHECKAUTOCHECK).EnableWindow(!(g_Settings[SETTING_UPDATE].flags&CSetting::FLAG_LOCKED_MASK)); GetDlgItem(IDC_BUTTONCHECKNOW).EnableWindow(!(g_Settings[SETTING_UPDATE].flags&CSetting::FLAG_LOCKED_MASK) || check); + + bool nightly = false; + if (g_Settings[SETTING_NIGHTLY].value.vt == VT_I4) + nightly = g_Settings[SETTING_NIGHTLY].value.intVal != 0; + CheckDlgButton(IDC_CHECKNIGHTLY, nightly ? BST_CHECKED : BST_UNCHECKED); + GetDlgItem(IDC_CHECKNIGHTLY).EnableWindow(!(g_Settings[SETTING_NIGHTLY].flags & CSetting::FLAG_LOCKED_MASK) && check); + UpdateUI(); return TRUE; @@ -210,6 +221,17 @@ LRESULT CUpdateDlg::OnCheckAuto( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bool check=IsDlgButtonChecked(IDC_CHECKAUTOCHECK)==BST_CHECKED; g_Settings[SETTING_UPDATE].value=CComVariant(check?1:0); g_Settings[SETTING_UPDATE].flags&=~CSetting::FLAG_DEFAULT; + GetDlgItem(IDC_CHECKNIGHTLY).EnableWindow(check); + UpdateUI(); + return 0; +} + +LRESULT CUpdateDlg::OnCheckNightly(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + CSettingsLockWrite lock; + bool check = IsDlgButtonChecked(IDC_CHECKNIGHTLY) == BST_CHECKED; + g_Settings[SETTING_NIGHTLY].value = CComVariant(check ? 1 : 0); + g_Settings[SETTING_NIGHTLY].flags &= ~CSetting::FLAG_DEFAULT; UpdateUI(); return 0; } diff --git a/Src/Update/Update.rc b/Src/Update/Update.rc index c92ed813c..382ed11d1 100644 --- a/Src/Update/Update.rc +++ b/Src/Update/Update.rc @@ -123,22 +123,24 @@ END // Dialog // -IDD_UPDATE DIALOGEX 0, 0, 316, 183 +IDD_UPDATE DIALOGEX 0, 0, 316, 200 STYLE DS_SETFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Open-Shell Update" FONT 9, "Segoe UI", 400, 0, 0x0 BEGIN CONTROL "Automatically check for new versions",IDC_CHECKAUTOCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,129,10 - PUSHBUTTON "Check now",IDC_BUTTONCHECKNOW,7,19,50,14 - LTEXT "message",IDC_STATICLATEST,7,33,302,10,SS_CENTERIMAGE - EDITTEXT IDC_EDITTEXT,7,45,302,97,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE | WS_VSCROLL - PUSHBUTTON "Download",IDC_BUTTONDOWNLOAD,7,146,50,14,NOT WS_VISIBLE + CONTROL "Check for nightly builds",IDC_CHECKNIGHTLY, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,19,151,10 + PUSHBUTTON "Check now",IDC_BUTTONCHECKNOW,7,34,50,14 + LTEXT "message",IDC_STATICLATEST,7,48,302,10,SS_CENTERIMAGE + EDITTEXT IDC_EDITTEXT,7,60,302,97,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "Download",IDC_BUTTONDOWNLOAD,7,161,50,14,NOT WS_VISIBLE CONTROL "Don't remind me again about this version",IDC_CHECKDONT, - "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,61,146,141,14 - CONTROL "Open-Shell-Menu",IDC_LINKWEB,"SysLink",WS_TABSTOP,7,166,66,10,WS_EX_TRANSPARENT - DEFPUSHBUTTON "OK",IDOK,202,162,50,14 - PUSHBUTTON "Cancel",IDCANCEL,259,162,50,14 + "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,61,161,141,14 + CONTROL "Open-Shell-Menu",IDC_LINKWEB,"SysLink",WS_TABSTOP,7,181,66,10,WS_EX_TRANSPARENT + DEFPUSHBUTTON "OK",IDOK,202,177,50,14 + PUSHBUTTON "Cancel",IDCANCEL,259,177,50,14 END @@ -155,7 +157,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 309 TOPMARGIN, 7 - BOTTOMMARGIN, 174 + BOTTOMMARGIN, 191 END END #endif // APSTUDIO_INVOKED diff --git a/Src/Update/resource.h b/Src/Update/resource.h index 3cc9b965b..f842f9c92 100644 --- a/Src/Update/resource.h +++ b/Src/Update/resource.h @@ -9,6 +9,7 @@ #define IDC_CHECKDONT 1004 #define IDC_BUTTONCHECKNOW 1005 #define IDC_CHECKAUTOCHECK 1006 +#define IDC_CHECKNIGHTLY 1007 #define IDD_UPDATE 6001 #define IDS_UPDATED 6001 #define IDS_OUTOFDATE 6002 @@ -21,7 +22,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 227 +#define _APS_NEXT_RESOURCE_VALUE 228 #define _APS_NEXT_COMMAND_VALUE 32769 #define _APS_NEXT_CONTROL_VALUE 262 #define _APS_NEXT_SYMED_VALUE 106 From e2ff7459493cc5a5b48be62e5c5d7864d2de7312 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Thu, 24 Sep 2020 20:49:37 +0200 Subject: [PATCH 050/234] Skin: Add support for `Immersive*` color names --- Src/Setup/Utility/MetroColorViewer.cpp | 2 +- Src/StartMenu/StartMenuDLL/SkinManager.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Src/Setup/Utility/MetroColorViewer.cpp b/Src/Setup/Utility/MetroColorViewer.cpp index cafe28f3b..79280557b 100644 --- a/Src/Setup/Utility/MetroColorViewer.cpp +++ b/Src/Setup/Utility/MetroColorViewer.cpp @@ -405,7 +405,7 @@ void ShowMetroColorViewer( void ) if (fout) fprintf(fout,"%02X%02X%02X%02X %S\n",(color>>24)&0xFF,color&0xFF,(color>>8)&0xFF,(color>>16)&0xFF,name); #endif MetroColor mc; - mc.name=name; + mc.name=text; mc.NAME=mc.name; mc.NAME.MakeUpper(); mc.type=type; diff --git a/Src/StartMenu/StartMenuDLL/SkinManager.cpp b/Src/StartMenu/StartMenuDLL/SkinManager.cpp index 1a631d0f2..71352a5f3 100644 --- a/Src/StartMenu/StartMenuDLL/SkinManager.cpp +++ b/Src/StartMenu/StartMenuDLL/SkinManager.cpp @@ -375,7 +375,10 @@ COLORREF MenuSkin::GetMetroColor( const wchar_t *names ) const if (GetImmersiveUserColorSetPreference!=NULL) { wchar_t text[256]; - Sprintf(text,_countof(text),L"Immersive%s",name); + if (wcsncmp(name,L"Immersive",9)==0) + wcscpy_s(text,name); + else + Sprintf(text,_countof(text),L"Immersive%s",name); int type=GetImmersiveColorTypeFromName(text); data.colorType=type<0?-1:type; if (type>=0) From 0b535d1dd89f381a778b4e7303e6e95daf512510 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Fri, 25 Sep 2020 20:45:43 +0200 Subject: [PATCH 051/234] Update: Properly handle toast activation Use `OnToastActivate` to display update dialog if user clicked on toast during `update.exe` life-time. Process messages for some time after displaying toast. Otherwise toast may be not displayed at all. --- Src/Update/Update.cpp | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/Src/Update/Update.cpp b/Src/Update/Update.cpp index 011d33e31..c7f40e451 100644 --- a/Src/Update/Update.cpp +++ b/Src/Update/Update.cpp @@ -422,6 +422,9 @@ void CUpdateDlg::UpdateUI( void ) void CUpdateDlg::Run( void ) { + if (m_hWnd) + return; + DLGTEMPLATE *pTemplate=LoadDialogEx(IDD_UPDATE); Create(NULL,pTemplate); MSG msg; @@ -480,6 +483,20 @@ class COwnerWindow: public CWindowImpl /////////////////////////////////////////////////////////////////////////////// +class UpdateToasts : public DesktopToasts +{ +public: + UpdateToasts() : DesktopToasts(L"OpenShell.Update") {} + +private: + void OnToastActivate(LPCWSTR invokedArgs) override + { + g_UpdateDlg.Run(); + } +}; + +/////////////////////////////////////////////////////////////////////////////// + int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrCmdLine, int nCmdShow ) { INITCOMMONCONTROLSEX init={sizeof(init),ICC_STANDARD_CLASSES}; @@ -522,7 +539,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC COwnerWindow ownerWindow; ownerWindow.Create(NULL,0,0,WS_POPUP); - DesktopToasts toasts(L"OpenShell.Update"); + UpdateToasts toasts; if (wcsstr(lpstrCmdLine,L"-popup")!=NULL) { @@ -591,12 +608,25 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC else if (wcsstr(lpstrCmdLine, L"-ToastActivated")) { g_UpdateDlg.UpdateData(); - g_UpdateDlg.Run(); + // dialog will be shown once toast is activated (UpdateToasts::OnToastActivate) } else { g_UpdateDlg.Run(); } + + // process messages for a while + for (int i = 0; i < 100; i++) + { + MSG msg; + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + Sleep(10); + } + ownerWindow.DestroyWindow(); CoUninitialize(); return 0; From 80c38d95e9fc8d5451ea6b0603583a96bbaddbb7 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sat, 26 Sep 2020 09:10:44 +0200 Subject: [PATCH 052/234] ModernSettings: Fix crash when invoking with unknown verb --- Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp index bf282fe79..44bf38987 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp @@ -19,7 +19,6 @@ struct ICIVERBTOIDMAP static const ICIVERBTOIDMAP g_ContextMenuIDMap[] = { { L"open", "open", MENUVERB_OPEN }, - { NULL, NULL, (UINT)-1 } }; HRESULT _MapICIVerbToCmdID(LPCMINVOKECOMMANDINFO pici, UINT* pid) From bce9efcc434001e930037dd5bd16b1ee721f84ee Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Fri, 25 Sep 2020 16:54:55 +0200 Subject: [PATCH 053/234] Display monochrome icons using color of corresponding text item Some icons (modern settings, jump-list tasks) are monochrome, basically they are defined just by alpha channel. Thus they can be displayed in any color (white is default). Since these icons are white by default, they look nice on dark backgrounds. But they are not very visible on light backgrounds. Thus the idea is to 'colorize' such icon using color of corresponding text item. That way they will always have proper color. Fixes #466. --- Src/StartMenu/StartMenuDLL/ItemManager.cpp | 21 ++++++++++++ Src/StartMenu/StartMenuDLL/ItemManager.h | 1 + Src/StartMenu/StartMenuDLL/MenuPaint.cpp | 37 ++++++++++++++-------- 3 files changed, 45 insertions(+), 14 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/ItemManager.cpp b/Src/StartMenu/StartMenuDLL/ItemManager.cpp index 0530070c5..f21d969e3 100644 --- a/Src/StartMenu/StartMenuDLL/ItemManager.cpp +++ b/Src/StartMenu/StartMenuDLL/ItemManager.cpp @@ -176,6 +176,27 @@ static void CreateMonochromeImage( unsigned int *bits, int stride, int width, in } } +HBITMAP ColorizeMonochromeImage(HBITMAP bitmap, DWORD color) +{ + { + BITMAP info{}; + GetObject(bitmap, sizeof(info), &info); + if (!DetectGrayscaleImage((const unsigned int*)info.bmBits, info.bmWidth, info.bmWidth, info.bmHeight)) + return nullptr; + } + + HBITMAP bmp = (HBITMAP)CopyImage(bitmap, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); + if (bmp) + { + BITMAP info{}; + GetObject(bmp, sizeof(info), &info); + + CreateMonochromeImage((unsigned int*)info.bmBits, info.bmWidth, info.bmWidth, info.bmHeight, color); + } + + return bmp; +} + static HBITMAP BitmapFromMetroIcon( HICON hIcon, int bitmapSize, int iconSize, DWORD metroColor, bool bDestroyIcon=true ) { ICONINFO info; diff --git a/Src/StartMenu/StartMenuDLL/ItemManager.h b/Src/StartMenu/StartMenuDLL/ItemManager.h index a4795e087..71666e505 100644 --- a/Src/StartMenu/StartMenuDLL/ItemManager.h +++ b/Src/StartMenu/StartMenuDLL/ItemManager.h @@ -467,6 +467,7 @@ bool MenuGetFileTimestamp( const wchar_t *path, FILETIME *pWriteTime, FILETIME * STDAPI ShGetKnownFolderPath( REFKNOWNFOLDERID rfid, PWSTR *pPath ); STDAPI ShGetKnownFolderIDList(REFKNOWNFOLDERID rfid, PIDLIST_ABSOLUTE *pPidl ); STDAPI ShGetKnownFolderItem(REFKNOWNFOLDERID rfid, IShellItem **ppItem ); +HBITMAP ColorizeMonochromeImage(HBITMAP bitmap, DWORD color); #define TASKBAR_PINNED_ROOT L"%APPDATA%\\Microsoft\\Internet Explorer\\Quick Launch\\User Pinned\\TaskBar" #define START_MENU_PINNED_ROOT L"%APPDATA%\\OpenShell\\Pinned" diff --git a/Src/StartMenu/StartMenuDLL/MenuPaint.cpp b/Src/StartMenu/StartMenuDLL/MenuPaint.cpp index 4917dd860..94815859f 100644 --- a/Src/StartMenu/StartMenuDLL/MenuPaint.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuPaint.cpp @@ -2200,6 +2200,21 @@ void CMenuContainer::DrawBackground( HDC hdc, const RECT &drawRect ) else iconSize.cx=iconSize.cy=0; + COLORREF color, shadowColor; + { + bool bHotColor = (bHot && !bSplit) || stateLeft > 0; + if (item.id == MENU_EMPTY || item.id == MENU_EMPTY_TOP) + { + color = settings.textColors[bHotColor ? 3 : 2]; + shadowColor = settings.textShadowColors[bHotColor ? 3 : 2]; + } + else + { + color = settings.textColors[bHotColor ? 1 : 0]; + shadowColor = settings.textShadowColors[bHotColor ? 1 : 0]; + } + } + // draw icon if (drawType==MenuSkin::PROGRAMS_BUTTON || drawType==MenuSkin::PROGRAMS_BUTTON_NEW) { @@ -2256,15 +2271,21 @@ void CMenuContainer::DrawBackground( HDC hdc, const RECT &drawRect ) const CItemManager::IconInfo *pIcon=(settings.iconSize==MenuSkin::ICON_SIZE_LARGE)?item.pItemInfo->largeIcon:item.pItemInfo->smallIcon; if (pIcon && pIcon->bitmap) { + HBITMAP temp = ColorizeMonochromeImage(pIcon->bitmap, color); + HBITMAP bitmap = temp ? temp : pIcon->bitmap; + BITMAP info; - GetObject(pIcon->bitmap,sizeof(info),&info); - HGDIOBJ bmp0=SelectObject(hdc2,pIcon->bitmap); + GetObject(bitmap,sizeof(info),&info); + HGDIOBJ bmp0=SelectObject(hdc2,bitmap); if (bmp0) { BLENDFUNCTION func={AC_SRC_OVER,0,255,AC_SRC_ALPHA}; AlphaBlend(hdc,iconX,iconY,iconSize.cx,iconSize.cy,hdc2,0,0,info.bmWidth,info.bmHeight,func); SelectObject(hdc2,bmp0); } + + if (temp) + DeleteObject(temp); } } else if (item.id==MENU_SHUTDOWN_BUTTON && s_bHasUpdates && s_Skin.Shutdown_bitmap.GetBitmap()) @@ -2287,18 +2308,6 @@ void CMenuContainer::DrawBackground( HDC hdc, const RECT &drawRect ) // draw text SelectObject(hdc,settings.font); - COLORREF color, shadowColor; - bool bHotColor=(bHot && !bSplit) || stateLeft>0; - if (item.id==MENU_EMPTY || item.id==MENU_EMPTY_TOP) - { - color=settings.textColors[bHotColor?3:2]; - shadowColor=settings.textShadowColors[bHotColor?3:2]; - } - else - { - color=settings.textColors[bHotColor?1:0]; - shadowColor=settings.textShadowColors[bHotColor?1:0]; - } RECT rc={itemRect.left+settings.iconPadding.left+settings.iconPadding.right+settings.textPadding.left,itemRect.top+settings.textPadding.top, itemRect.right-settings.arrPadding.cx-settings.arrPadding.cy-settings.textPadding.right,itemRect.bottom-settings.textPadding.bottom}; if (item.id==MENU_SHUTDOWN_BUTTON) From f197c9f43d066a9b7b6bdbbfba5cefa4b467ee24 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 27 Sep 2020 10:20:31 +0200 Subject: [PATCH 054/234] Don't show jump list for Settings application It reports just one category with unsupported type, thus jump-list will be empty. Fixes #487. --- Src/StartMenu/StartMenuDLL/JumpLists.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Src/StartMenu/StartMenuDLL/JumpLists.cpp b/Src/StartMenu/StartMenuDLL/JumpLists.cpp index 6a91b7d44..4da6e5a60 100644 --- a/Src/StartMenu/StartMenuDLL/JumpLists.cpp +++ b/Src/StartMenu/StartMenuDLL/JumpLists.cpp @@ -198,7 +198,13 @@ bool HasJumplist( const wchar_t *appid ) { UINT count; if (SUCCEEDED(pCustomList->GetCategoryCount(&count)) && count>0) + { + // skip Settings app (it reports one category with unsupported type, thus jump-list will be empty) + if (wcscmp(appid, L"windows.immersivecontrolpanel_cw5n1h2txyewy!microsoft.windows.immersivecontrolpanel") == 0) + return false; + return true; + } } if (CAutomaticList(appid).HasList()) From a5f35b133f4352218b3138778e58d6a2bf5af865 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 18 Oct 2020 09:10:54 +0200 Subject: [PATCH 055/234] Improve compatibility with WindowBlinds `Open-Shell` hooks `SHFillRectClr` (ordinal 197) API from `shlwapi.dll` in order to be able to customize taskbar. The API is hooked even if taskbar customization is disabled in `Open-Shell` (default). `WindowBlinds` hooks the same API so this is causing clashes between both programs. In fact `Open-Shell` hooks later which makes `WindowBlinds` hook to be completely ignored. The solution would be to hook only if taskbar customization is enabled. This way `Open-Shell` should be more compatible with other customization tools in default state. Fixes #433. --- Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp | 52 +++++++++++---------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp index b77e1cbc0..1ae435f12 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp @@ -2790,6 +2790,9 @@ static void OpenCortana( void ) static void InitStartMenuDLL( void ) { + LogToFile(STARTUP_LOG, L"StartMenu DLL: InitStartMenuDLL"); + WaitDllInitThread(); + InitializeIatHooks(); if (IsWin81Update1()) { @@ -2817,39 +2820,40 @@ static void InitStartMenuDLL( void ) } } - if (GetWinVersion()>=WIN_VER_WIN10) + if (GetSettingBool(L"CustomTaskbar")) { - HMODULE shlwapi=GetModuleHandle(L"shlwapi.dll"); - if (shlwapi) + if (GetWinVersion()>=WIN_VER_WIN10) { - g_SHFillRectClr=(tSHFillRectClr)GetProcAddress(shlwapi,MAKEINTRESOURCEA(197)); - if (g_SHFillRectClr) + HMODULE shlwapi=GetModuleHandle(L"shlwapi.dll"); + if (shlwapi) { - g_SHFillRectClrHook=SetIatHook(GetModuleHandle(NULL),"shlwapi.dll",MAKEINTRESOURCEA(197),SHFillRectClr2); - if (!g_SHFillRectClrHook) - g_SHFillRectClrHook=SetIatHook(GetModuleHandle(NULL),"api-ms-win-shlwapi-winrt-storage-l1-1-1.dll",MAKEINTRESOURCEA(197),SHFillRectClr2); + g_SHFillRectClr=(tSHFillRectClr)GetProcAddress(shlwapi,MAKEINTRESOURCEA(197)); + if (g_SHFillRectClr) + { + g_SHFillRectClrHook=SetIatHook(GetModuleHandle(NULL),"shlwapi.dll",MAKEINTRESOURCEA(197),SHFillRectClr2); + if (!g_SHFillRectClrHook) + g_SHFillRectClrHook=SetIatHook(GetModuleHandle(NULL),"api-ms-win-shlwapi-winrt-storage-l1-1-1.dll",MAKEINTRESOURCEA(197),SHFillRectClr2); + } } + g_StretchDIBitsHook=SetIatHook(GetModuleHandle(NULL),"gdi32.dll","StretchDIBits",StretchDIBits2); } - g_StretchDIBitsHook=SetIatHook(GetModuleHandle(NULL),"gdi32.dll","StretchDIBits",StretchDIBits2); - } - { - HWND dlg=CreateWindow(L"#32770",L"",WS_POPUP,0,0,0,0,NULL,0,0,0); - HWND toolbar=CreateWindow(TOOLBARCLASSNAME,L"",WS_CHILD|TBS_TOOLTIPS,0,0,0,0,dlg,0,0,0); - DestroyWindow(dlg); - } + { + HWND dlg=CreateWindow(L"#32770",L"",WS_POPUP,0,0,0,0,NULL,0,0,0); + HWND toolbar=CreateWindow(TOOLBARCLASSNAME,L"",WS_CHILD|TBS_TOOLTIPS,0,0,0,0,dlg,0,0,0); + DestroyWindow(dlg); + } - if (GetWinVersion()<=WIN_VER_WIN81) - g_DrawThemeBackgroundHook=SetIatHook(GetModuleHandle(NULL),"uxtheme.dll","DrawThemeBackground",DrawThemeBackground2); - g_DrawThemeTextHook=SetIatHook(GetModuleHandle(NULL),"uxtheme.dll","DrawThemeText",DrawThemeText2); - g_DrawThemeTextExHook=SetIatHook(GetModuleHandle(NULL),"uxtheme.dll","DrawThemeTextEx",DrawThemeTextEx2); - g_DrawThemeTextCtlHook=SetIatHook(GetModuleHandle(L"comctl32.dll"),"uxtheme.dll","DrawThemeText",DrawThemeText2); - if (GetWinVersion()>=WIN_VER_WIN10) - g_SetWindowCompositionAttributeHook=SetIatHook(GetModuleHandle(NULL),"user32.dll","SetWindowCompositionAttribute",SetWindowCompositionAttribute2); + if (GetWinVersion()<=WIN_VER_WIN81) + g_DrawThemeBackgroundHook=SetIatHook(GetModuleHandle(NULL),"uxtheme.dll","DrawThemeBackground",DrawThemeBackground2); + g_DrawThemeTextHook=SetIatHook(GetModuleHandle(NULL),"uxtheme.dll","DrawThemeText",DrawThemeText2); + g_DrawThemeTextExHook=SetIatHook(GetModuleHandle(NULL),"uxtheme.dll","DrawThemeTextEx",DrawThemeTextEx2); + g_DrawThemeTextCtlHook=SetIatHook(GetModuleHandle(L"comctl32.dll"),"uxtheme.dll","DrawThemeText",DrawThemeText2); + if (GetWinVersion()>=WIN_VER_WIN10) + g_SetWindowCompositionAttributeHook=SetIatHook(GetModuleHandle(NULL),"user32.dll","SetWindowCompositionAttribute",SetWindowCompositionAttribute2); + } g_TaskbarThreadId=GetCurrentThreadId(); - LogToFile(STARTUP_LOG,L"StartMenu DLL: InitStartMenuDLL"); - WaitDllInitThread(); g_bTrimHooks=GetWinVersion()==WIN_VER_WIN7 && (GetSettingInt(L"CompatibilityFixes")&COMPATIBILITY_TRIM_HOOKS); InitManagers(false); int level=GetSettingInt(L"CrashDump"); From ca576a0224feca6b2182957fd340d6a577543b9d Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 18 Oct 2020 09:48:02 +0200 Subject: [PATCH 056/234] Display Modern settings search results above Control Panel ones (Modern) Settings are just more and more important in Windows 10. So it makes sense to show their search results first. Fixes #481. --- Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp index 2f9efb265..c4969c05a 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp @@ -2768,18 +2768,18 @@ bool CMenuContainer::InitSearchItems( void ) if (m_SearchCategoryHash==CSearchManager::CATEGORY_PROGRAM) selectedCount=(int)s_SearchResults.programs.size(); } - if (!s_SearchResults.settings.empty()) - { - counts.push_back((int)s_SearchResults.settings.size()); - if (m_SearchCategoryHash==CSearchManager::CATEGORY_SETTING) - selectedCount=(int)s_SearchResults.settings.size(); - } if (!s_SearchResults.metrosettings.empty()) { counts.push_back((int)s_SearchResults.metrosettings.size()); if (m_SearchCategoryHash==CSearchManager::CATEGORY_METROSETTING) selectedCount=(int)s_SearchResults.metrosettings.size(); } + if (!s_SearchResults.settings.empty()) + { + counts.push_back((int)s_SearchResults.settings.size()); + if (m_SearchCategoryHash==CSearchManager::CATEGORY_SETTING) + selectedCount=(int)s_SearchResults.settings.size(); + } for (std::list::const_iterator it=s_SearchResults.indexed.begin();it!=s_SearchResults.indexed.end();++it) { if (!it->items.empty()) @@ -2829,9 +2829,9 @@ bool CMenuContainer::InitSearchItems( void ) if (idx==0) categoryHash=CSearchManager::CATEGORY_PROGRAM; else if (idx==1) - categoryHash=CSearchManager::CATEGORY_SETTING; - else if (idx==2) categoryHash=CSearchManager::CATEGORY_METROSETTING; + else if (idx==2) + categoryHash=CSearchManager::CATEGORY_SETTING; else categoryHash=it->categoryHash; @@ -2867,23 +2867,23 @@ bool CMenuContainer::InitSearchItems( void ) } else if (idx==1) { - originalCount=(int)s_SearchResults.settings.size(); + originalCount=(int)s_SearchResults.metrosettings.size(); if (count>originalCount) count=originalCount; items.reserve(count); - for (std::vector::const_iterator it=s_SearchResults.settings.begin();it!=s_SearchResults.settings.end() && (int)items.size()::const_iterator it=s_SearchResults.metrosettings.begin();it!=s_SearchResults.metrosettings.end() && (int)items.size()originalCount) count=originalCount; items.reserve(count); - for (std::vector::const_iterator it=s_SearchResults.metrosettings.begin();it!=s_SearchResults.metrosettings.end() && (int)items.size()::const_iterator it=s_SearchResults.settings.begin();it!=s_SearchResults.settings.end() && (int)items.size() Date: Sun, 18 Oct 2020 10:59:34 +0200 Subject: [PATCH 057/234] Update settings search category names To make it consistent with the rest of product: `Settings` category is renamed to `Control Panel` `Modern Settings` category is renamed to `Settings` --- Localization/StartMenuL10N.ini | 96 ++++++++++---------- Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 4 +- Src/StartMenu/StartMenuDLL/SearchManager.cpp | 2 +- Src/StartMenu/StartMenuL10N.ini | 76 ++++++++-------- 4 files changed, 89 insertions(+), 89 deletions(-) diff --git a/Localization/StartMenuL10N.ini b/Localization/StartMenuL10N.ini index 7a019048f..890dc15a9 100644 --- a/Localization/StartMenuL10N.ini +++ b/Localization/StartMenuL10N.ini @@ -1,4 +1,4 @@ -; This file contains all localized text for Open-Shell Menu. There is one section per language. +; This file contains all localized text for Open-Shell Menu. There is one section per language. ; Every section contains text lines in the form of = . ; Which section is used depends on the current OS setting. If a key is missing from the language section ; it will be searched in the [default] section. In some cases more than one language can be used. @@ -129,7 +129,7 @@ Menu.RemoveHighlight = إزالة التمييز Menu.Uninstall = إز&الة التثبيت Menu.UninstallTitle = إزالة التثبيت Menu.UninstallPrompt = ‏‏هل تريد بالتأكيد إزالة تثبيت %s؟ -Search.CategorySettings = الإعدادات +Search.CategorySettings = لوحة التح&كم Search.CategoryPCSettings = إعدادات الكمبيوتر Search.CategoryPrograms = البرامج Search.CategoryDocuments = المستندات @@ -265,7 +265,7 @@ Menu.RemoveHighlight = Премахни осветяването Menu.Uninstall = &Деинсталирай Menu.UninstallTitle = Деинсталиране Menu.UninstallPrompt = Наистина ли искате да деинсталирате %s? -Search.CategorySettings = Настройки +Search.CategorySettings = Контролен панел Search.CategoryPCSettings = Настройки на компютъра Search.CategoryPrograms = Програми Search.CategoryDocuments = Документи @@ -403,7 +403,7 @@ Menu.UninstallTitle = Desinstal·la Menu.UninstallPrompt = Esteu segur que voleu desinstal·lar el %s? Menu.ClassicSettings = Open-Shell &Menú Menu.SettingsTip = Ajustaments del Open-Shell Menú -Search.CategorySettings = Configuració +Search.CategorySettings = Panell de control Search.CategoryPCSettings = Configuració de l'ordinador Search.CategoryPrograms = Programes Search.CategoryDocuments = Documents @@ -539,7 +539,7 @@ Menu.RemoveHighlight = Odebrat nejzajímavější místo Menu.Uninstall = &Odinstalovat Menu.UninstallTitle = Odinstalovat Menu.UninstallPrompt = Opravdu chcete odinstalovat položku %s? -Search.CategorySettings = Nastavení +Search.CategorySettings = Ovládací panely Search.CategoryPCSettings = Nastavení počítače Search.CategoryPrograms = Programy Search.CategoryDocuments = Dokumenty @@ -675,7 +675,7 @@ Menu.RemoveHighlight = Fjern centralt punkt Menu.Uninstall = &Fjern Menu.UninstallTitle = Fjern Menu.UninstallPrompt = Er du sikker på, at du vil fjerne %s? -Search.CategorySettings = Indstillinger +Search.CategorySettings = Kontrolpanel Search.CategoryPCSettings = Pc-indstillinger Search.CategoryPrograms = Programmer Search.CategoryDocuments = Dokumenter @@ -811,7 +811,7 @@ Menu.RemoveHighlight = Haupttreffer entfernen Menu.Uninstall = &Deinstallieren Menu.UninstallTitle = Deinstallieren Menu.UninstallPrompt = Möchten Sie %s wirklich deinstallieren? -Search.CategorySettings = Einstellungen +Search.CategorySettings = Systemsteuerung Search.CategoryPCSettings = PC-Einstellungen Search.CategoryPrograms = Programme Search.CategoryDocuments = Dokumente @@ -947,7 +947,7 @@ Menu.RemoveHighlight = Κατάργηση επισήμανσης Menu.Uninstall = &Κατάργηση εγκατάστασης Menu.UninstallTitle = Κατάργηση εγκατάστασης Menu.UninstallPrompt = Είστε βέβαιοι ότι θέλετε να καταργήσετε την εγκατάσταση του %s; -Search.CategorySettings = Ρυθμίσεις +Search.CategorySettings = Πίνακας Ελέγχου Search.CategoryPCSettings = Ρυθμίσεις υπολογιστή Search.CategoryPrograms = Προγράμματα Search.CategoryDocuments = Έγγραφα @@ -1083,8 +1083,8 @@ Menu.RemoveHighlight = Remove highlight Menu.Uninstall = &Uninstall Menu.UninstallTitle = Uninstall Menu.UninstallPrompt = Are you sure you want to uninstall %s? -Search.CategorySettings = Settings -Search.CategoryPCSettings = Modern Settings +Search.CategorySettings = Control Panel +Search.CategoryPCSettings = Settings Search.CategoryPrograms = Programs Search.CategoryDocuments = Documents Search.CategoryMusic = Music @@ -1219,7 +1219,7 @@ Menu.RemoveHighlight = Quitar como elemento destacado Menu.Uninstall = &Desinstalar Menu.UninstallTitle = Desinstalar Menu.UninstallPrompt = ¿Está seguro de que desea desinstalar %s? -Search.CategorySettings = Configuración +Search.CategorySettings = Panel de control Search.CategoryPCSettings = Configuración de tu PC Search.CategoryPrograms = Programas Search.CategoryDocuments = Documentos @@ -1355,7 +1355,7 @@ Menu.RemoveHighlight = Eemalda esiletõst Menu.Uninstall = &Desinstalli Menu.UninstallTitle = Desinstalli Menu.UninstallPrompt = Kas soovite kindlasti desinstallida %s? -Search.CategorySettings = Sätted +Search.CategorySettings = Juhtpaneel Search.CategoryPCSettings = Arvutisätted Search.CategoryPrograms = Programmid Search.CategoryDocuments = Dokumendid @@ -1493,7 +1493,7 @@ Menu.UninstallTitle = لغو نصب Menu.UninstallPrompt = ‏‏آیا مطمئنید می خواهید %s را لغو نصب کنید؟ Menu.ClassicSettings = منوی ش&روع کلاسیک Menu.SettingsTip = تنظیمات منوی شروع کلاسیک -Search.CategorySettings = تنظیمات +Search.CategorySettings = صفحه کنترل Search.CategoryPCSettings = تنظیمات رایانه Search.CategoryPrograms = برنامه‌ها Search.CategoryDocuments = اسناد @@ -1629,7 +1629,7 @@ Menu.RemoveHighlight = Poista tärkeä kohde Menu.Uninstall = &Poista asennus Menu.UninstallTitle = Poista asennus Menu.UninstallPrompt = Haluatko varmasti poistaa kohteen %s asennuksen? -Search.CategorySettings = Asetukset +Search.CategorySettings = Ohjauspaneeli Search.CategoryPCSettings = Tietokoneen asetukset Search.CategoryPrograms = Ohjelmat Search.CategoryDocuments = Tiedostot @@ -1765,7 +1765,7 @@ Menu.RemoveHighlight = Supprimer la recommandation Menu.Uninstall = &Désinstaller Menu.UninstallTitle = Désinstaller Menu.UninstallPrompt = Faut-il vraiment désinstaller %s ? -Search.CategorySettings = Paramètres +Search.CategorySettings = Panneau de configuration Search.CategoryPCSettings = Paramètres du PC Search.CategoryPrograms = Programmes Search.CategoryDocuments = Documents @@ -1901,7 +1901,7 @@ Menu.RemoveHighlight = Remove highlight Menu.Uninstall = &Dì-stàlaich Menu.UninstallTitle = Dì-stàlaich Menu.UninstallPrompt = A bheil thu cinnteach gu bheil thu airson %s a dhì-stàladh? -Search.CategorySettings = Roghainnean +Search.CategorySettings = A' phanail-smachd Search.CategoryPCSettings = Roghainnean a' PC Search.CategoryPrograms = Prògraman Search.CategoryDocuments = Sgrìobhainnean @@ -2037,7 +2037,7 @@ Menu.RemoveHighlight = הסר הבלטה Menu.Uninstall = ה&סר התקנה Menu.UninstallTitle = הסר התקנה Menu.UninstallPrompt = ‏‏האם אתה בטוח שברצונך להסיר את התקנת %s? -Search.CategorySettings = הגדרות +Search.CategorySettings = לוח הבקרה Search.CategoryPCSettings = הגדרות מחשב Search.CategoryPrograms = תוכניות Search.CategoryDocuments = מסמכים @@ -2173,7 +2173,7 @@ Menu.RemoveHighlight = Ukloni isticanje Menu.Uninstall = &Deinstaliraj Menu.UninstallTitle = Deinstaliraj Menu.UninstallPrompt = Jeste li sigurni da želite deinstalirati %s iz računala? -Search.CategorySettings = Postavke +Search.CategorySettings = Upravljačka ploča Search.CategoryPCSettings = Postavke PC-ja Search.CategoryPrograms = Programi Search.CategoryDocuments = Dokumenti @@ -2309,7 +2309,7 @@ Menu.RemoveHighlight = Kiemelés eltávolítása Menu.Uninstall = Eltá&volítás Menu.UninstallTitle = Eltávolítás Menu.UninstallPrompt = Biztosan el kívánja távolítani a következőt: %s? -Search.CategorySettings = Beállítások +Search.CategorySettings = Vezérlőpult Search.CategoryPCSettings = Gépház Search.CategoryPrograms = Programs Search.CategoryDocuments = Dokumentumok @@ -2447,8 +2447,8 @@ Menu.RemoveHighlight = Fjarlægja auðkenningu Menu.Uninstall = Fjarlægja Menu.UninstallTitle = Fjarlægja Menu.UninstallPrompt = Ertu viss um að það eigi að fjarlægja %s? -Search.CategorySettings = Stillingar -Search.CategoryPCSettings = Sérstillingar tölvunnar +Search.CategorySettings = Stjórnborð +Search.CategoryPCSettings = PC stillingar Search.CategoryPrograms = Forrit Search.CategoryDocuments = Skjöl Search.CategoryMusic = Tónlist @@ -2479,7 +2479,7 @@ Menu.Search = Ce&rca Menu.SearchBox = Cerca Menu.SearchPrograms = Cerca programmi e file Menu.SearchInternet = Cerca in Internet -Menu.Searching = Ricerca... +Menu.Searching = Ricerca in corso... Menu.NoMatch = Nessun elemento corrisponde ai criteri di ricerca. Menu.MoreResults = Ulteriori risultati Menu.Help = &Guida e supporto tecnico @@ -2502,10 +2502,10 @@ Menu.PCSettings = Impostazioni PC Menu.Security = Protezione di Windows Menu.Network = Connessioni di &rete Menu.Printers = &Stampanti -Menu.Taskbar = &Barra applicazioni e menu Start +Menu.Taskbar = &Barra delle applicazioni e menu Start Menu.SearchFiles = &File o cartelle... Menu.SearchPrinter = &Per stampante -Menu.SearchComputers = Per &computer +Menu.SearchComputers = Per &Computer Menu.UserFilesTip = Contiene cartelle per documenti, immagini, musica e altri file dell'utente. Menu.UserDocumentsTip = Contiene lettere, rapporti e altri documenti e file. Menu.UserPicturesTip = Contiene foto digitali, immagini e file di grafica. @@ -2527,8 +2527,8 @@ Menu.HelpTip = Trovare argomenti della Guida, esercitazioni, risoluzione problem Menu.ProgramsTip = Apre l'elenco dei programmi. Menu.SearchFilesTip = Cercare documenti, musica, immagini, posta elettronica e altro. Menu.GamesTip = Consente di giocare e gestire i giochi installati nel computer. -Menu.SecurityTip = Avvia programmi per modifica opzioni di sicurezza di Windows per cambiare la password, cambiare utente o avviare Gestione attività. -Menu.SearchComputersTip = Cerca computer nella rete +Menu.SecurityTip = Avvia le opzioni di Sicurezza di Windows per modificare la password, cambiare utente o avviare Gestione attività. +Menu.SearchComputersTip = Cerca computer sulla rete Menu.SearchPrintersTip = Cerca stampante Menu.AdminToolsTip = Configura le impostazioni amministrative del computer. Menu.ShutdownTip = Chiude tutti i programmi aperti, arresta Windows e spegne il computer. @@ -2536,7 +2536,7 @@ Menu.RestartTip = Chiude tutti i programmi aperti e riavvia Windows. Menu.SleepTip = Mantiene la sessione in memoria e imposta la modalità basso consumo che consente di riprendere rapidamente il lavoro. Menu.HibernateTip = Salva la sessione e spegne il computer. Quando si riaccende il computer, la sessione verrà ripristinata. Menu.LogOffTip = Chiude i programmi e disconnette l'utente. -Menu.DisconnectTip = Disconnette dalla sessione. È possibile riconnettersi a questa sessione al prossimo accesso. +Menu.DisconnectTip = Disconnette la sessione. È possibile riconnettersi a questa sessione al prossimo accesso. Menu.LockTip = Blocca il computer. Menu.UndockTip = Consente di rimuovere il computer portatile o il notebook dall'alloggiamento di espansione. Menu.SwitchUserTip = Consente di cambiare utente senza chiudere i programmi. @@ -2553,7 +2553,7 @@ Menu.MenuSettings = Impostazioni Menu.MenuHelp = Guida Menu.MenuExit = Esci Menu.LogoffTitle = Disconnessione da Windows -Menu.LogoffPrompt = Vuoi disconnetterti? +Menu.LogoffPrompt = Disconnettersi? Menu.LogoffYes = &Disconnetti Menu.LogoffNo = &No Menu.RenameTitle = Rinomina @@ -2570,7 +2570,7 @@ Menu.ActionOpen = Apri Menu.ActionClose = Chiudi Menu.ActionExecute = Esegui Menu.RemoveList = &Rimuovi da questo elenco -Menu.RemoveAll = Azzera elenco ogge&tti recenti +Menu.RemoveAll = Cancella elenco Ogge&tti recenti Menu.Explorer = Esplora risorse Menu.Start = Start Menu.StartScreen = Schermata Start @@ -2582,8 +2582,8 @@ Menu.MonitorOff = Spegne lo schermo Menu.RemoveHighlight = Rimuovi elemento di rilievo Menu.Uninstall = &Disinstalla Menu.UninstallTitle = Disinstalla -Menu.UninstallPrompt = Vuoi disinstallare %s? -Search.CategorySettings = Impostazioni +Menu.UninstallPrompt = Disinstallare %s? +Search.CategorySettings = Pannello di controllo Search.CategoryPCSettings = Impostazioni PC Search.CategoryPrograms = Programmi Search.CategoryDocuments = Documenti @@ -2991,7 +2991,7 @@ Menu.RemoveHighlight = Šalinti paryškinimą Menu.Uninstall = &Pašalinti Menu.UninstallTitle = Pašalinti Menu.UninstallPrompt = Ar tikrai norite pašalinti %s? -Search.CategorySettings = Parametrai +Search.CategorySettings = Valdymo skydas Search.CategoryPCSettings = PC parametrai Search.CategoryPrograms = Programos Search.CategoryDocuments = Dokumentai @@ -3127,7 +3127,7 @@ Menu.RemoveHighlight = Noņemt marķējumu Menu.Uninstall = &Atinstalēt Menu.UninstallTitle = Atinstalēt Menu.UninstallPrompt = Vai esat pārliecināts, ka vēlaties atinstalēt %s? -Search.CategorySettings = Iestatījumi +Search.CategorySettings = Vadības panelis Search.CategoryPCSettings = Datora iestatījumi Search.CategoryPrograms = Programmas Search.CategoryDocuments = Dokumenti @@ -3263,7 +3263,7 @@ Menu.RemoveHighlight = Remove highlight Menu.Uninstall = &Деинсталирај Menu.UninstallTitle = Деинсталирај Menu.UninstallPrompt = Дали сте сигурни дека сакате да го деинсталирате %s? -Search.CategorySettings = Подесувања +Search.CategorySettings = Контрол панел Search.CategoryPCSettings = Параметри на компјутерот Search.CategoryPrograms = Програми Search.CategoryDocuments = Документи @@ -3399,7 +3399,7 @@ Menu.RemoveHighlight = Fjern høydepunkt Menu.Uninstall = &Avinstaller Menu.UninstallTitle = Avinstaller Menu.UninstallPrompt = Er du sikker på at du vil avinstallere %s? -Search.CategorySettings = Innstillinger +Search.CategorySettings = Kontrollpanel Search.CategoryPCSettings = PC-innstillinger Search.CategoryPrograms = Programmer Search.CategoryDocuments = Dokumenter @@ -3535,7 +3535,7 @@ Menu.RemoveHighlight = Aandachtspunt verwijderen Menu.Uninstall = V&erwijderen Menu.UninstallTitle = Verwijderen Menu.UninstallPrompt = Weet u zeker dat u %s wilt verwijderen? -Search.CategorySettings = Instellingen +Search.CategorySettings = Configuratiescherm Search.CategoryPCSettings = Pc-instellingen Search.CategoryPrograms = Programma's Search.CategoryDocuments = Documenten @@ -3671,7 +3671,7 @@ Menu.RemoveHighlight = Usuń wyróżnienie Menu.Uninstall = &Odinstaluj Menu.UninstallTitle = Odinstaluj Menu.UninstallPrompt = Czy na pewno chcesz odinstalować program %s? -Search.CategorySettings = Ustawienia +Search.CategorySettings = Panel sterowania Search.CategoryPCSettings = Ustawienia komputera Search.CategoryPrograms = Programy Search.CategoryDocuments = Dokumenty @@ -3807,7 +3807,7 @@ Menu.RemoveHighlight = Remover Destaque Menu.Uninstall = &Desinstalar Menu.UninstallTitle = Desinstalar Menu.UninstallPrompt = Tem certeza de que deseja desinstalar %s? -Search.CategorySettings = Configurações +Search.CategorySettings = Painel de controle Search.CategoryPCSettings = Configurações do computador Search.CategoryPrograms = Programas Search.CategoryDocuments = Documentos @@ -3943,7 +3943,7 @@ Menu.RemoveHighlight = Remover destaque Menu.Uninstall = D&esinstalar Menu.UninstallTitle = Desinstalar Menu.UninstallPrompt = Tem a certeza de que pretende desinstalar %s? -Search.CategorySettings = Definições +Search.CategorySettings = Painel de controlo Search.CategoryPCSettings = Definições do PC Search.CategoryPrograms = Programas Search.CategoryDocuments = Documentos @@ -4079,7 +4079,7 @@ Menu.RemoveHighlight = Eliminare evidențiere Menu.Uninstall = &Dezinstalare Menu.UninstallTitle = Dezinstalare Menu.UninstallPrompt = Sigur dezinstalați %s? -Search.CategorySettings = Setări +Search.CategorySettings = Panou de control Search.CategoryPCSettings = Setări PC Search.CategoryPrograms = Programe Search.CategoryDocuments = Documente @@ -4215,7 +4215,7 @@ Menu.RemoveHighlight = Выключить пометку Menu.Uninstall = &Удалить Menu.UninstallTitle = Удалить Menu.UninstallPrompt = Вы действительно хотите удалить "%s"? -Search.CategorySettings = Параметры +Search.CategorySettings = Панель управления Search.CategoryPCSettings = Параметры ПК Search.CategoryPrograms = Программы Search.CategoryDocuments = Документы @@ -4351,7 +4351,7 @@ Menu.RemoveHighlight = Odstrániť zvýraznenie Menu.Uninstall = &Odinštalovať Menu.UninstallTitle = Odinštalovať Menu.UninstallPrompt = Naozaj chcete odinštalovať program %s? -Search.CategorySettings = Nastavenia +Search.CategorySettings = Ovládací panel Search.CategoryPCSettings = Nastavenie PC Search.CategoryPrograms = Programy Search.CategoryDocuments = Dokumenty @@ -4487,7 +4487,7 @@ Menu.RemoveHighlight = Odstrani označitev Menu.Uninstall = &Odstrani Menu.UninstallTitle = Odstrani Menu.UninstallPrompt = Ali ste prepričani, da želite odstraniti %s? -Search.CategorySettings = Nastavitve +Search.CategorySettings = Nadzorna plošča Search.CategoryPCSettings = Nastavitve računalnika Search.CategoryPrograms = Programi Search.CategoryDocuments = Dokumenti @@ -4623,7 +4623,7 @@ Menu.RemoveHighlight = Ukloni istaknuti sadržaj Menu.Uninstall = &Deinstaliraj Menu.UninstallTitle = Deinstaliraj Menu.UninstallPrompt = Želite li zaista da deinstalirate %s? -Search.CategorySettings = Postavke +Search.CategorySettings = Kontrolna tabla Search.CategoryPCSettings = Postavke računara Search.CategoryPrograms = Programs Search.CategoryDocuments = Dokumenti @@ -4759,7 +4759,7 @@ Menu.RemoveHighlight = Ta bort fokus Menu.Uninstall = &Avinstallera Menu.UninstallTitle = Avinstallera Menu.UninstallPrompt = Vill du avinstallera %s? -Search.CategorySettings = Inställningar +Search.CategorySettings = Kontrollpanelen Search.CategoryPCSettings = Datorinställningar Search.CategoryPrograms = Program Search.CategoryDocuments = Dokument @@ -4896,7 +4896,7 @@ Menu.RemoveHighlight = เอาไฮไลท์ออก Menu.Uninstall = &ถอนการติดตั้ง Menu.UninstallTitle = ถอนการติดตั้ง Menu.UninstallPrompt = คุณแน่ใจหรือไม่ว่าคุณต้องการถอนการติดตั้ง %s -Search.CategorySettings = การตั้งค่า +Search.CategorySettings = แผงควบคุม Search.CategoryPCSettings = การตั้งค่าพีซี Search.CategoryPrograms = โปรแกรม Search.CategoryDocuments = เอกสาร @@ -5032,7 +5032,7 @@ Menu.RemoveHighlight = Önemli Noktayı Kaldır Menu.Uninstall = &Kaldır Menu.UninstallTitle = Kaldır Menu.UninstallPrompt = %s programını kaldırmak istediğinizden emin misiniz? -Search.CategorySettings = Ayarlar +Search.CategorySettings = Denetim Masası Search.CategoryPCSettings = Bilgisayar ayarları Search.CategoryPrograms = Programlar Search.CategoryDocuments = Belgeler @@ -5168,7 +5168,7 @@ Menu.RemoveHighlight = Видалити виділення Menu.Uninstall = &Видалити Menu.UninstallTitle = Видалити Menu.UninstallPrompt = Дійсно видалити %s? -Search.CategorySettings = Настройки +Search.CategorySettings = Панель керування Search.CategoryPCSettings = Параметри ПК Search.CategoryPrograms = Програми Search.CategoryDocuments = Документи diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp index c4969c05a..74e7904e0 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp @@ -2873,7 +2873,7 @@ bool CMenuContainer::InitSearchItems( void ) items.reserve(count); for (std::vector::const_iterator it=s_SearchResults.metrosettings.begin();it!=s_SearchResults.metrosettings.end() && (int)items.size()::const_iterator it=s_SearchResults.settings.begin();it!=s_SearchResults.settings.end() && (int)items.size() Date: Sun, 18 Oct 2020 15:25:26 +0200 Subject: [PATCH 058/234] Show Settings above Control Panel by default (Modern) Settings are more and more important in Windows 10, so it makes sense to show them above Control Panel. This changes only defaults, users will be still able to order start menu items as they like. Fixes #23. --- Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index ba2d4c1c0..cae231c46 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -1057,7 +1057,7 @@ L"RecentDocumentsItem.Label=$Menu.Documents\n" L"RecentDocumentsItem.Icon=shell32.dll,327\n" L"RecentDocumentsItem.Settings=ITEMS_FIRST\n" L"SettingsMenu.Command=settings\n" -L"SettingsMenu.Items=ControlPanelItem, PCSettingsItem, SEPARATOR, SecurityItem, NetworkItem, PrintersItem, TaskbarSettingsItem, ProgramsFeaturesItem, SEPARATOR, MenuSettingsItem\n" +L"SettingsMenu.Items=PCSettingsItem, ControlPanelItem, SEPARATOR, SecurityItem, NetworkItem, PrintersItem, TaskbarSettingsItem, ProgramsFeaturesItem, SEPARATOR, MenuSettingsItem\n" L"SettingsMenu.Label=$Menu.Settings\n" L"SettingsMenu.Icon=shell32.dll,330\n" L"SearchMenu.Command=search\n" @@ -1183,7 +1183,7 @@ L"ShutdownItem.Icon=none\n" ; const wchar_t *g_DefaultStartMenu2= -L"Items=COLUMN_PADDING, ProgramsMenu, AppsMenu, SearchBoxItem, COLUMN_BREAK, FavoritesItem, UserFilesItem, UserDocumentsItem, UserPicturesItem, ComputerItem, RecentDocumentsItem, SEPARATOR, ControlPanelItem, PCSettingsItem, SecurityItem, NetworkItem, PrintersItem, SEPARATOR, SearchMenu, HelpItem, RunItem, COLUMN_PADDING, SEPARATOR, ShutdownBoxItem\n" +L"Items=COLUMN_PADDING, ProgramsMenu, AppsMenu, SearchBoxItem, COLUMN_BREAK, FavoritesItem, UserFilesItem, UserDocumentsItem, UserPicturesItem, ComputerItem, RecentDocumentsItem, SEPARATOR, PCSettingsItem, ControlPanelItem, SecurityItem, NetworkItem, PrintersItem, SEPARATOR, SearchMenu, HelpItem, RunItem, COLUMN_PADDING, SEPARATOR, ShutdownBoxItem\n" L"ProgramsMenu.Command=programs\n" L"ProgramsMenu.Label=$Menu.Programs\n" L"ProgramsMenu.Icon=shell32.dll,326\n" @@ -1379,9 +1379,9 @@ L"Item13.Settings=ITEM_DISABLED\n" L"Item14.Command=network_connections\n" L"Item14.Settings=ITEM_DISABLED\n" L"Item15.Command=separator\n" -L"Item16.Command=control_panel\n" +L"Item16.Command=pc_settings\n" L"Item16.Settings=TRACK_RECENT\n" -L"Item17.Command=pc_settings\n" +L"Item17.Command=control_panel\n" L"Item17.Settings=TRACK_RECENT\n" L"Item18.Command=admin\n" L"Item18.Settings=TRACK_RECENT|ITEM_DISABLED\n" From b2df22104ee04e3f926628483a39f77a1ba3e7fd Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Fri, 23 Oct 2020 16:20:42 +0200 Subject: [PATCH 059/234] Setup: Fix installer warning on Windows 7 `Warning 1946. Property 'System.AppUserModel.ToastActivatorCLSID' for shortcut 'Open-Shell Update.lnk' could not be set.` Windows 7 doesn't recognize `System.AppUserModel.ToastActivatorCLSID` name so we have to use GUID directly. https://docs.microsoft.com/en-us/troubleshoot/windows/win32/warning-1946-when-you-install-installer-package Fixes #507. --- Src/Setup/Setup.wxs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/Setup/Setup.wxs b/Src/Setup/Setup.wxs index eb9c07d06..cedf0723c 100644 --- a/Src/Setup/Setup.wxs +++ b/Src/Setup/Setup.wxs @@ -576,7 +576,8 @@ - + + START_MENU_FOLDER=1 From ac5e69f1a0600864578ac547a106af731ef044b4 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Fri, 23 Oct 2020 17:43:18 +0200 Subject: [PATCH 060/234] Use modern Help icon in Classic/Two column menu style Fixes #506. --- Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index cae231c46..a54c7e33a 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -1001,7 +1001,7 @@ static const CStdCommand g_StdCommands[]={ {L"settings",IDS_SETTINGS_ITEM,IDS_SETTINGS_MENU_TIP,L"SettingsMenu",L"$Menu.Settings",L"",L"shell32.dll,330"}, {L"search",IDS_SEARCH_MENU_ITEM,IDS_SEARCH_TIP,L"SearchMenu",L"$Menu.Search",L"",L"shell32.dll,323"}, {L"search_box",IDS_SEARCH_BOX_ITEM,IDS_SEARCH_BOX_TIP,L"SearchBoxItem",L"$Menu.SearchBox",NULL,L"none",NULL,StdMenuItem::MENU_TRACK|StdMenuItem::MENU_OPENUP}, - {L"help",IDS_HELP_ITEM,IDS_HELP_TIP,L"HelpItem",L"$Menu.Help",L"$Menu.HelpTip",L"shell32.dll,324"}, + {L"help",IDS_HELP_ITEM,IDS_HELP_TIP,L"HelpItem",L"$Menu.Help",L"$Menu.HelpTip",L"imageres.dll,99"}, {L"run",IDS_RUN_ITEM,IDS_RUN_TIP,L"RunItem",L"$Menu.Run",L"$Menu.RunTip",L"shell32.dll,328"}, {L"logoff",IDS_SHUTDOWN_LOGOFF,IDS_LOGOFF_TIP,L"LogOffItem",L"$Menu.Logoff",L"$Menu.LogOffTip",L"shell32.dll,325",NULL,StdMenuItem::MENU_STYLE_CLASSIC1}, {L"logoff",IDS_SHUTDOWN_LOGOFF,IDS_LOGOFF_TIP,L"LogOffItem",L"$Menu.Logoff",L"$Menu.LogOffTip",L"none",NULL,StdMenuItem::MENU_STYLE_CLASSIC2}, @@ -1068,7 +1068,7 @@ L"ComputerItem.Command=computer\n" L"HelpItem.Command=help\n" L"HelpItem.Label=$Menu.Help\n" L"HelpItem.Tip=$Menu.HelpTip\n" -L"HelpItem.Icon=shell32.dll,324\n" +L"HelpItem.Icon=imageres.dll,99\n" L"RunItem.Command=run\n" L"RunItem.Label=$Menu.Run\n" L"RunItem.Tip=$Menu.RunTip\n" @@ -1203,7 +1203,7 @@ L"SearchMenu.Icon=shell32.dll,323\n" L"HelpItem.Command=help\n" L"HelpItem.Label=$Menu.Help\n" L"HelpItem.Tip=$Menu.HelpTip\n" -L"HelpItem.Icon=shell32.dll,324\n" +L"HelpItem.Icon=imageres.dll,99\n" L"RunItem.Command=run\n" L"RunItem.Label=$Menu.Run\n" L"RunItem.Tip=$Menu.RunTip\n" From 283c0fce03f0804a6d8a79728b2630e588e6dcb2 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Fri, 23 Oct 2020 17:50:37 +0200 Subject: [PATCH 061/234] Fix Shutdown item text To be consistent with text in Windows. Fixes #501. --- Localization/StartMenuL10N.ini | 2 +- Src/StartMenu/StartMenuL10N.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Localization/StartMenuL10N.ini b/Localization/StartMenuL10N.ini index 890dc15a9..6df9b5086 100644 --- a/Localization/StartMenuL10N.ini +++ b/Localization/StartMenuL10N.ini @@ -991,7 +991,7 @@ Menu.LogOffShort = &Log off Menu.Undock = Undock Comput&er Menu.Disconnect = D&isconnect Menu.ShutdownBox = Sh&ut Down... -Menu.Shutdown = Sh&ut Down +Menu.Shutdown = Sh&ut down Menu.Restart = &Restart Menu.ShutdownUpdate = Update and shut down Menu.RestartUpdate = Update and restart diff --git a/Src/StartMenu/StartMenuL10N.ini b/Src/StartMenu/StartMenuL10N.ini index 890dc15a9..6df9b5086 100644 --- a/Src/StartMenu/StartMenuL10N.ini +++ b/Src/StartMenu/StartMenuL10N.ini @@ -991,7 +991,7 @@ Menu.LogOffShort = &Log off Menu.Undock = Undock Comput&er Menu.Disconnect = D&isconnect Menu.ShutdownBox = Sh&ut Down... -Menu.Shutdown = Sh&ut Down +Menu.Shutdown = Sh&ut down Menu.Restart = &Restart Menu.ShutdownUpdate = Update and shut down Menu.RestartUpdate = Update and restart From ee6db35b34cdfc368a8c50c325dde9d1d311ee9f Mon Sep 17 00:00:00 2001 From: Xenhat Date: Sun, 27 Dec 2020 10:49:38 -0500 Subject: [PATCH 062/234] Update README.md Add link to Discussions section and Discord for questions --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c377403c1..110978e15 100644 --- a/README.md +++ b/README.md @@ -30,4 +30,5 @@ If you just want to use it or looking for setup file, click here to download: [How To Skin a Start Menu](https://coddec.github.io/Classic-Shell/www.classicshell.net/tutorials/skintutorial.html) [Classic Shell - Custom Start Buttons](https://coddec.github.io/Classic-Shell/www.classicshell.net/tutorials/buttontutorial.html) +[Questions? Ask on the Discussions section](https://github.com/Open-Shell/Open-Shell-Menu/discussions) or on [Discord](https://discord.gg/7H6arr5) [Report a bug/issue or submit a feature request](https://github.com/Open-Shell/Open-Shell-Menu/issues) From 859afc63d31c5f66c0d558d9853dc91d5fb867bc Mon Sep 17 00:00:00 2001 From: Xenhat Date: Sun, 27 Dec 2020 10:50:55 -0500 Subject: [PATCH 063/234] Label topmost discussion link correctly as Gitter --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 110978e15..dd1920add 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![Build status](https://ci.appveyor.com/api/projects/status/2wj5x5qoypfjj0tr/branch/master?svg=true)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master) [![GitQ](https://gitq.com/badge.svg)](https://gitq.com/passionate-coder/Classic-Start) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/open-shell/Lobby) [![Discord](https://img.shields.io/discord/757701054782636082?color=%4E5D94&label=Discord&logo=discord&logoColor=white)](https://discord.gg/7H6arr5) [Home Page](https://open-shell.github.io/Open-Shell-Menu) -[Discussion room](https://gitter.im/Open-Shell) +[Gitter Discussion room](https://gitter.im/Open-Shell) [Latest nightly build](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master/artifacts) ### Features From 8e1b4e35a38710e4455d71a6ee3d17e95073bfc3 Mon Sep 17 00:00:00 2001 From: Anis Errais Date: Sun, 24 Jan 2021 21:23:08 +0100 Subject: [PATCH 064/234] Added options for moving the start menu and showing the start menu at the edge of working area instead of against the taskbar --- Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 81 ++++++++++++++------ Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 3 + Src/StartMenu/StartMenuDLL/StartMenuDLL.rc | 6 ++ Src/StartMenu/StartMenuDLL/resource.h | 6 ++ 4 files changed, 74 insertions(+), 22 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp index 74e7904e0..8ad791b0e 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp @@ -7401,35 +7401,46 @@ bool CMenuContainer::HasMoreResults( void ) RECT CMenuContainer::CalculateWorkArea( const RECT &taskbarRect ) { - RECT rc=s_MenuLimits; - if ((s_TaskBarEdge==ABE_LEFT || s_TaskBarEdge==ABE_RIGHT) && GetSettingBool(L"ShowNextToTaskbar")) - { - // when the taskbar is on the side and the menu is not on top of it - // the start button is assumed at the top - if (s_TaskBarEdge==ABE_LEFT) - rc.left=taskbarRect.right; - else - rc.right=taskbarRect.left; - } - else + RECT rc; + if (!GetSettingBool(L"AlignToWorkArea")) { - if (s_TaskBarEdge==ABE_BOTTOM) - { - // taskbar is at the bottom - rc.bottom=taskbarRect.top; - } - else if (s_TaskBarEdge==ABE_TOP) + rc = s_MenuLimits; + if ((s_TaskBarEdge == ABE_LEFT || s_TaskBarEdge == ABE_RIGHT) && GetSettingBool(L"ShowNextToTaskbar")) { - // taskbar is at the top - rc.top=taskbarRect.bottom; + // when the taskbar is on the side and the menu is not on top of it + // the start button is assumed at the top + if (s_TaskBarEdge == ABE_LEFT) + rc.left = taskbarRect.right; + else + rc.right = taskbarRect.left; } else { - // taskbar is on the side, start button must be at the top - rc.top=s_StartRect.bottom; + if (s_TaskBarEdge == ABE_BOTTOM) + { + // taskbar is at the bottom + rc.bottom = taskbarRect.top; + } + else if (s_TaskBarEdge == ABE_TOP) + { + // taskbar is at the top + rc.top = taskbarRect.bottom; + } + else + { + // taskbar is on the side, start button must be at the top + rc.top = s_StartRect.bottom; + } } } - + else + { + // Get working area of the monitor the specified taskbar is on + MONITORINFO info{ sizeof(MONITORINFO) }; + HMONITOR mon = MonitorFromRect(&taskbarRect, 0); + GetMonitorInfo(mon, &info); + rc = info.rcWork; + } if (!s_bLockWorkArea) { // exclude floating keyboard @@ -7455,6 +7466,32 @@ RECT CMenuContainer::CalculateWorkArea( const RECT &taskbarRect ) } } } + + //calculate offsets + int xOff = GetSettingInt(L"HorizontalMenuOffset"); + int yOff = GetSettingInt(L"VerticalMenuOffset"); + if (s_TaskBarEdge == ABE_BOTTOM) + { + if (xOff != 0) + rc.left += xOff; + if (yOff != 0) + rc.bottom += yOff; + } + else if (s_TaskBarEdge == ABE_TOP || s_TaskBarEdge == ABE_LEFT) + { + if (xOff != 0) + rc.left += xOff; + if (yOff != 0) + rc.top += yOff; + } + else + { + if (xOff != 0) + rc.right += xOff; + if (yOff != 0) + rc.top += yOff; + } + return rc; } diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index a54c7e33a..c2fb2e994 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -4348,6 +4348,9 @@ CSetting g_Settings[]={ {L"InvertMetroIcons",CSetting::TYPE_BOOL,IDS_INVERT_ICONS,IDS_INVERT_ICONS_TIP,0}, {L"MaxMainMenuWidth",CSetting::TYPE_INT,IDS_MENU_WIDTH,IDS_MENU_WIDTH_TIP,60,CSetting::FLAG_MENU_CLASSIC_BOTH}, {L"MaxMenuWidth",CSetting::TYPE_INT,IDS_SUBMENU_WIDTH,IDS_SUBMENU_WIDTH_TIP,60}, + {L"AlignToWorkArea",CSetting::TYPE_BOOL,IDS_ALIGN_WORK_AREA,IDS_ALIGN_WORK_AREA_TIP,0}, + {L"HorizontalMenuOffset",CSetting::TYPE_INT,IDS_HOR_OFFSET,IDS_HOR_OFFSET_TIP,0}, + {L"VerticalMenuOffset",CSetting::TYPE_INT,IDS_VERT_OFFSET,IDS_VERT_OFFSET_TIP,0 }, {L"OverrideDPI",CSetting::TYPE_INT,IDS_DPI_OVERRIDE,IDS_DPI_OVERRIDE_TIP,0,CSetting::FLAG_COLD}, {L"MainMenuAnimate",CSetting::TYPE_BOOL,IDS_ANIMATION7,IDS_ANIMATION7_TIP,1,CSetting::FLAG_MENU_WIN7}, {L"MainMenuAnimation",CSetting::TYPE_INT,IDS_ANIMATION,IDS_ANIMATION_TIP,-1}, // system animation type diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc index 113528ab8..1660b8493 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc @@ -644,6 +644,12 @@ BEGIN IDS_PIC_COMMAND_TIP "Enter the command you want to run when you click on the user picture" IDS_NAME_COMMAND "User name command" IDS_NAME_COMMAND_TIP "Enter the command you want to run when you click on the user name" + IDS_ALIGN_WORK_AREA "Align start menu to working area" + IDS_ALIGN_WORK_AREA_TIP "Align the start menu to the working area instead of to the taskbar. Use with custom taskbars" + IDS_HOR_OFFSET "Horizontal position offset" + IDS_HOR_OFFSET_TIP "Offset the start menu horizontally by the amount of pixels specified" + IDS_VERT_OFFSET "Vertical position offset" + IDS_VERT_OFFSET_TIP "Offset the start menu vertically by the amount of pixels specified" IDS_SMALL_SIZE_SM "Small icon size" IDS_SMALL_SIZE_SM_TIP "Set the small icon size. The default is 16 for DPI<=96, 20 for 96120" IDS_LARGE_SIZE_SM "Large icon size" diff --git a/Src/StartMenu/StartMenuDLL/resource.h b/Src/StartMenu/StartMenuDLL/resource.h index 0aed48692..ca08926ca 100644 --- a/Src/StartMenu/StartMenuDLL/resource.h +++ b/Src/StartMenu/StartMenuDLL/resource.h @@ -754,6 +754,12 @@ #define IDS_SELECT_LAST 3657 #define IDS_SELECT_LAST_TIP 3658 #define IDS_CLEAR_CACHE 3659 +#define IDS_ALIGN_WORK_AREA 3660 +#define IDS_ALIGN_WORK_AREA_TIP 3661 +#define IDS_HOR_OFFSET 3662 +#define IDS_HOR_OFFSET_TIP 3663 +#define IDS_VERT_OFFSET 3664 +#define IDS_VERT_OFFSET_TIP 3665 #define IDS_STRING7001 7001 #define IDS_STRING7002 7002 #define IDS_STRING7003 7003 From 7d0a9df1c38e6be117d74b7978dd176f1b713c50 Mon Sep 17 00:00:00 2001 From: GenesisToxical Date: Fri, 2 Apr 2021 07:14:08 -0600 Subject: [PATCH 065/234] Quick Access to Taskbar Tab - SettingsUI.cpp Easy access to modify Taskbar options without having to activate all other tabs. --- Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index c2fb2e994..69e6a4f99 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -4416,7 +4416,7 @@ CSetting g_Settings[]={ {L"StartButtonIconSize",CSetting::TYPE_INT,IDS_BUTTON_ICON_SIZE,IDS_BUTTON_ICON_SIZE_TIP,0,0,L"#StartButtonType=1",L"ClasicButton"}, {L"StartButtonText",CSetting::TYPE_STRING,IDS_BUTTON_TEXT,IDS_BUTTON_TEXT_TIP,L"$Menu.Start",0,L"#StartButtonType=1",L"ClasicButton"}, -{L"Taskbar",CSetting::TYPE_GROUP,IDS_TASKBAR_SETTINGS}, +{L"Taskbar",CSetting::TYPE_GROUP,IDS_TASKBAR_SETTINGS,0,0,CSetting::FLAG_BASIC}, {L"CustomTaskbar",CSetting::TYPE_BOOL,IDS_TASK_CUSTOM,IDS_TASK_CUSTOM_TIP,0,CSetting::FLAG_CALLBACK}, {L"TaskbarLook",CSetting::TYPE_INT,IDS_TASK_LOOK,IDS_TASK_LOOK_TIP,1,CSetting::FLAG_CALLBACK,L"CustomTaskbar",L"CustomTaskbar"}, {L"Opaque",CSetting::TYPE_RADIO,IDS_TASK_OPAQUE,IDS_TASK_OPAQUE_TIP}, From 1db0006c968ca43dfb6cd108f26edc0da4455619 Mon Sep 17 00:00:00 2001 From: bonzibudd <61938331+bonzibudd@users.noreply.github.com> Date: Mon, 3 May 2021 16:54:16 -0400 Subject: [PATCH 066/234] Fix right-hand padding with Icon frames enabled This should improve the right-hand spacing when icon frames are enabled, and right-hand icons are disabled. There shouldn't be any extra icon/text padding for Main2 when icons aren't enabled. --- Src/Skins/Metro/SkinDescription.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Src/Skins/Metro/SkinDescription.txt b/Src/Skins/Metro/SkinDescription.txt index 6dc7337e4..79d068743 100644 --- a/Src/Skins/Metro/SkinDescription.txt +++ b/Src/Skins/Metro/SkinDescription.txt @@ -182,6 +182,8 @@ Main_icon_frame_slices_Y=4,4,4 Main_icon_frame_offset=3,3 Main_icon_padding=6,6,6,6,100% Main_text_padding=5,2,8,2,100% + +[ICON_FRAMES AND NOT SMALL_ICONS AND NOT NO_ICONS] Main2_icon_padding=6,6,6,6,100% Main2_text_padding=5,2,8,2,100% From e50c5f73d79e643802a1cd93070c5ef06b80bb44 Mon Sep 17 00:00:00 2001 From: bonzibudd <61938331+bonzibudd@users.noreply.github.com> Date: Tue, 4 May 2021 20:03:25 -0400 Subject: [PATCH 067/234] "About this skin" text should link to Open-Shell --- Src/StartMenu/StartMenuDLL/StartMenuDLL.rc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc index 1660b8493..405d5aa1f 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc @@ -1160,21 +1160,21 @@ END STRINGTABLE BEGIN - IDS_STRING7100 "This is the default skin when no other skin is selected or if the selected skin fails to load.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" - IDS_STRING7101 "Windows Aero skin\n\nDefault skin to use for the Windows Aero theme.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" - IDS_STRING7102 "Windows Basic skin\n\nDefault skin to use for the Windows Basic theme.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" - IDS_STRING7103 "Classic skin\n\nClassic look with large or small icons.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" + IDS_STRING7100 "This is the default skin when no other skin is selected or if the selected skin fails to load.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" + IDS_STRING7101 "Windows Aero skin\n\nDefault skin to use for the Windows Aero theme.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" + IDS_STRING7102 "Windows Basic skin\n\nDefault skin to use for the Windows Basic theme.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" + IDS_STRING7103 "Classic skin\n\nClassic look with large or small icons.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" END STRINGTABLE BEGIN - IDS_STRING7104 "Full Glass skin\n\nTransparent menu with large or small icons.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" - IDS_STRING7105 "Smoked Glass skin\n\nSimple transparent menu with dark background.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" - IDS_STRING7106 "Windows XP Luna skin\n\nA start menu similar to the one in Windows XP.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" - IDS_STRING7107 "Windows 8 skin\n\nDefault skin to use for Windows 8.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" - IDS_STRING7108 "Midnight skin\n\nSkin with dark background.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" - IDS_STRING7109 "Metro skin\n\nSkin that uses the start screen colors.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" - IDS_STRING7110 "Metallic skin\n\nA start menu skin with metallic look.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" + IDS_STRING7104 "Full Glass skin\n\nTransparent menu with large or small icons.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" + IDS_STRING7105 "Smoked Glass skin\n\nSimple transparent menu with dark background.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" + IDS_STRING7106 "Windows XP Luna skin\n\nA start menu similar to the one in Windows XP.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" + IDS_STRING7107 "Windows 8 skin\n\nDefault skin to use for Windows 8.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" + IDS_STRING7108 "Midnight skin\n\nSkin with dark background.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" + IDS_STRING7109 "Metro skin\n\nSkin that uses the start screen colors.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" + IDS_STRING7110 "Metallic skin\n\nA start menu skin with metallic look.\n\nPart of Open-Shell (c) 2009-2017, Ivo Beltchev" END STRINGTABLE From ebd530f65257c2958bf7c7635f0a56c7c8182a35 Mon Sep 17 00:00:00 2001 From: bonzibudd <61938331+bonzibudd@users.noreply.github.com> Date: Tue, 4 May 2021 20:05:25 -0400 Subject: [PATCH 068/234] Skin: Better scaling of icon frames This will make the space around icon frames scale appropriately. --- Src/Skins/Metro/SkinDescription.txt | 2 +- Src/Skins/Metro7/SkinDescription.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/Skins/Metro/SkinDescription.txt b/Src/Skins/Metro/SkinDescription.txt index 79d068743..c5a19ea4e 100644 --- a/Src/Skins/Metro/SkinDescription.txt +++ b/Src/Skins/Metro/SkinDescription.txt @@ -179,7 +179,7 @@ Main_icon_frame_tint1=$SystemAccentDark2|$StartSelectionBackground Main_icon_frame_mask=10 Main_icon_frame_slices_X=4,4,4 Main_icon_frame_slices_Y=4,4,4 -Main_icon_frame_offset=3,3 +Main_icon_frame_offset=3,3,100% Main_icon_padding=6,6,6,6,100% Main_text_padding=5,2,8,2,100% diff --git a/Src/Skins/Metro7/SkinDescription.txt b/Src/Skins/Metro7/SkinDescription.txt index 2f9c25595..9a5dbafd7 100644 --- a/Src/Skins/Metro7/SkinDescription.txt +++ b/Src/Skins/Metro7/SkinDescription.txt @@ -249,7 +249,7 @@ Main_icon_frame_tint1=$SystemAccentDark2|$StartSelectionBackground Main_icon_frame_mask=10 Main_icon_frame_slices_X=4,4,4 Main_icon_frame_slices_Y=4,4,4 -Main_icon_frame_offset=3,3 +Main_icon_frame_offset=3,3,100% List_icon_frame=0 Main_icon_padding=6,6,6,6,100% Main_text_padding=5,2,8,2,100% From fc290d5a6afe1d6cdae413e7f228c1965a3fea1e Mon Sep 17 00:00:00 2001 From: bonzibudd <61938331+bonzibudd@users.noreply.github.com> Date: Tue, 4 May 2021 20:06:46 -0400 Subject: [PATCH 069/234] Skin: Remove extra "Submenu_opacity" --- Src/Skins/Metro/SkinDescription.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Src/Skins/Metro/SkinDescription.txt b/Src/Skins/Metro/SkinDescription.txt index c5a19ea4e..93dbde7d3 100644 --- a/Src/Skins/Metro/SkinDescription.txt +++ b/Src/Skins/Metro/SkinDescription.txt @@ -105,7 +105,6 @@ Submenu_padding=2,2,2,2 ; These have the same meaning as the Main_... properties Submenu_opacity=region -Submenu_opacity=region Submenu_bitmap=$SystemAccentDark1|$StartBackground Submenu_bitmap_tint1=$StartHighlight Submenu_bitmap_mask=2 From 84909cf397f8dce8c54e03690b0d075a18b54898 Mon Sep 17 00:00:00 2001 From: bonzibudd <61938331+bonzibudd@users.noreply.github.com> Date: Tue, 4 May 2021 20:11:11 -0400 Subject: [PATCH 070/234] Skin: Retain list padding when using icon frames This will make the padding of list items stay the same regardless of if icon frames are enabled or not. List padding shouldn't change with the icon frame option because lists don't contain icon frames. --- Src/Skins/Metro7/SkinDescription.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Src/Skins/Metro7/SkinDescription.txt b/Src/Skins/Metro7/SkinDescription.txt index 9a5dbafd7..c579dc89e 100644 --- a/Src/Skins/Metro7/SkinDescription.txt +++ b/Src/Skins/Metro7/SkinDescription.txt @@ -143,6 +143,7 @@ Scrollbar_arrows_mask=17 ; LIST SECTION +List_icon_padding=3,3,3,3,100% List_text_padding=0,0,4,0,100% List_separator_font="Segoe UI",bold,-9 List_separator_text_padding=3,0,0,0,100% From 6e71d7c414fd6a2748b6caf5951b2aaadf02ed1f Mon Sep 17 00:00:00 2001 From: bonzibudd <61938331+bonzibudd@users.noreply.github.com> Date: Tue, 4 May 2021 20:20:39 -0400 Subject: [PATCH 071/234] Skin: Add "Back" arrow to programs button This can help distinguish when the programs list has been activated. --- Src/Skins/Metro7/programs.bmp | Bin 2648 -> 2646 bytes Src/Skins/Metro7/programs150.bmp | Bin 5056 -> 5054 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Src/Skins/Metro7/programs.bmp b/Src/Skins/Metro7/programs.bmp index 2601aea96d58334b0cc7495a2c1b009429bfe119..44830fdf20b9524de6a23e8245e0f796af3bce29 100644 GIT binary patch literal 2646 zcmZ?r4dY?}12Z700mMQ;tOCT03<^M!fk6Q%FT@SOV1ZGB>=5|>|NliG27#|Y98Qiw zKz+wS20%d`70j4SrWuQ2jsVh&$uwg!k{LuXvDpLENELHHW`q2K%U{$o cXEb~eb@pHj3vBM8R=iWo9Bgi+n-~KF0Ahny#sB~S diff --git a/Src/Skins/Metro7/programs150.bmp b/Src/Skins/Metro7/programs150.bmp index d63190b149d2e12fac2b31aa71732b0a3a3e1efa..c17dba2b5ac45997b919ff7a031e17cb573c6ddf 100644 GIT binary patch literal 5054 zcmeH{F%H5o5Clz42Ne~R)D%2`o|<3q4tk!zKWOhjm*Y(lH(}u3bA95|nSZ9Gh z`WTsiH~uo?`Y+M?bMtQzzskJ+m>-oJ{ITlmsr@?M-@(A18+&Usb?x3!pF_{qQzz?w zpw6i873#$MllA@mQYY*G9Cb!LuT-aK=|Jf~d+v6}wEEEn2}TSmG0K^Fy%%}OV d)&cfg1ZG|@29*ru%)DLVt7C99fe^vhum4!!?2n`?yTxzjP`o(eX~Pn zRS&~z2D!7Uhha5?+*#Gb7@c0x9lF51qcBFNSM-N2aPKIL(O$3qu{VEL{?A#}!?2n` z?yTxzSj`}JR`oDOd)@WE*`c$lhha5?+*#Gbu$n>ctm7E KcNE4hG~x@kx`So_ From 0ce76c9c364b2030f28499e8d0abeb37e9b67e31 Mon Sep 17 00:00:00 2001 From: bonzibudd <61938331+bonzibudd@users.noreply.github.com> Date: Wed, 5 May 2021 06:12:32 -0400 Subject: [PATCH 072/234] Skin: Tweak programs icon arrows --- Src/Skins/Metro7/programs.bmp | Bin 2646 -> 2646 bytes Src/Skins/Metro7/programs150.bmp | Bin 5054 -> 5054 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Src/Skins/Metro7/programs.bmp b/Src/Skins/Metro7/programs.bmp index 44830fdf20b9524de6a23e8245e0f796af3bce29..ab6c114e6a0a9a03e18ddc8e7406d77740275507 100644 GIT binary patch literal 2646 zcmZ?r4dY?}12Z700mMQ;tOCT03<^M!fk6Q%FT@SOV1ZGB;t+W7;K6?wCf6{Seh@vJ z%s}=RE;cUz;!=-G9G5vDab!LC)Da^$63ikd97fd)ObCF|AIxUtw1|%lQ;$qj%N%4g k2Lqd0{-TySgCR_i-9RmWQOg`;w+#k1wfsdba|Sw006CcMkN^Mx literal 2646 zcmZ?r4dY?}12Z700mMQ;tOCT03<^M!fk6Q%FT@SOV1ZGB>=5|>|NliG27#|Y98Qiw zKz+wS20%d`70j4SrWuQ2jsVh&$uwg!k{LuXvDpLENELHHW`q2KsZFm zE!IoSDdrlpE9Y2CdB*->|D7?&B^zioP-}fpr}1-pYswzJ+mObA}2bR5Fw^bG;Z;GL$oO zy%?!|4X|$!n7LjIDjCX|xn2w^8OoWtUX0Yf2H3X<%v>)9l?>&~TrUQd4CTyRFGgx# c1MFJ_X08{5N``V~t`~z!hH_@E7h@~>0WXWLG5`Po literal 5054 zcmeH{F%H5o5Clz42Ne~R)D%2`o|<3q4tk!zKWOhjm*Y(lH(}u3bA95|nSZ9Gh z`WTsiH~uo?`Y+M?bMtQzzskJ+m>-oJ{ITlmsr@?M-@(A18+&Usb?x3!pF_{qQzz?w zpw6i873#$MllA@mQYY*G9Cb!LuT-aK=|Jf~d+v6}wEEEn2}TSmG0K^Fy%%}OV d)&cfg1ZG|@29*ru%)DL Date: Sun, 9 May 2021 17:40:02 -0400 Subject: [PATCH 073/234] Scale menu icons up to 250% (240 DPI) This should allow for icons in the menu to scale better for higher DPI displays. Configurations above 250% will retain the sizes for 240DPI. --- Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index 69e6a4f99..dc7dd76a9 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -4659,11 +4659,19 @@ void UpdateSettings( void ) else if (dpi<96) dpi=96; else if (dpi>480) dpi=480; - int iconSize=24; - if (dpi<=96) - iconSize=16; - else if (dpi<=120) - iconSize=20; + int iconSize=16; + if (dpi>=240) + iconSize=40; // for 250% scaling + else if (dpi>=216) + iconSize=36; // for 225% scaling + else if (dpi>=192) + iconSize=32; // for 200% scaling + else if (dpi>=168) + iconSize=28; // for 175% scaling + else if (dpi>=144) + iconSize=24; // for 150% scaling + else if (dpi>=120) + iconSize=20; // for 125% scaling UpdateSetting(L"SmallIconSize",CComVariant(iconSize),false); UpdateSetting(L"LargeIconSize",CComVariant(iconSize*2),false); From 4b2688245f05b085cdf91ea006f143492af753f6 Mon Sep 17 00:00:00 2001 From: bonzibudd <61938331+bonzibudd@users.noreply.github.com> Date: Tue, 8 Jun 2021 12:00:24 -0400 Subject: [PATCH 074/234] Don't change Taskbar text color/texture until relaunch This will accurately represent when these changes are able to take effect. Currently, the settings don't make any immediate changes or are broken when applied, and this should fix that. Fixes #602. --- Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index dc7dd76a9..687877d07 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -4425,8 +4425,8 @@ CSetting g_Settings[]={ {L"AeroGlass",CSetting::TYPE_RADIO,IDS_TASK_AEROGLASS,IDS_TASK_AEROGLASS_TIP,0,CSetting::FLAG_HIDDEN}, {L"TaskbarOpacity",CSetting::TYPE_INT,IDS_TASK_OPACITY,IDS_TASK_OPACITY_TIP,DEFAULT_TASK_OPACITY10,CSetting::FLAG_CALLBACK,L"TaskbarLook",L"CustomTaskbar"}, {L"TaskbarColor",CSetting::TYPE_COLOR,IDS_TASK_COLOR,IDS_TASK_COLOR_TIP,0,CSetting::FLAG_CALLBACK,L"CustomTaskbar",L"CustomTaskbar"}, - {L"TaskbarTextColor",CSetting::TYPE_COLOR,IDS_TASK_TEXTCOLOR,IDS_TASK_TEXTCOLOR_TIP,0xFFFFFF,CSetting::FLAG_CALLBACK|(1<<24),L"CustomTaskbar",L"CustomTaskbar"}, - {L"TaskbarTexture",CSetting::TYPE_BITMAP_JPG,IDS_TASK_TEXTURE,IDS_TASK_TEXTURE_TIP,L"",CSetting::FLAG_CALLBACK,L"CustomTaskbar",L"CustomTaskbar"}, + {L"TaskbarTextColor",CSetting::TYPE_COLOR,IDS_TASK_TEXTCOLOR,IDS_TASK_TEXTCOLOR_TIP,0xFFFFFF,CSetting::FLAG_COLD|(1<<24),L"CustomTaskbar",L"CustomTaskbar"}, + {L"TaskbarTexture",CSetting::TYPE_BITMAP_JPG,IDS_TASK_TEXTURE,IDS_TASK_TEXTURE_TIP,L"",CSetting::FLAG_COLD,L"CustomTaskbar",L"CustomTaskbar"}, {L"TaskbarTileH",CSetting::TYPE_INT,IDS_TASK_STRETCHH,IDS_TASK_STRETCHH_TIP,1,CSetting::FLAG_CALLBACK,L"#TaskbarTexture",L"TaskbarTexture"}, {L"Tile",CSetting::TYPE_RADIO,IDS_TASK_TILE,IDS_TASK_TILE_TIP}, {L"Stretch",CSetting::TYPE_RADIO,IDS_TASK_STRETCH,IDS_TASK_STRETCH_TIP}, From 2e43d4c7a1f8202c6bc92ccedd5858005ce283f3 Mon Sep 17 00:00:00 2001 From: Ibuprophen Date: Tue, 10 May 2022 11:05:42 -0400 Subject: [PATCH 075/234] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dd1920add..de91f0959 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ If you just want to use it or looking for setup file, click here to download: 1. Download [language DLL](https://coddec.github.io/Classic-Shell/www.classicshell.net/translations/index.html) 2. Place it either in the Open-Shell's __install folder__ or in the `%ALLUSERSPROFILE%\OpenShell\Languages` folder ---- +---- *For archival reasons, we have a mirror of `www.classicshell.net` [here](https://coddec.github.io/Classic-Shell/www.classicshell.net/).* From 4f362760b6137417642a466ba352d24a2a2d47e6 Mon Sep 17 00:00:00 2001 From: germanaizek Date: Thu, 12 May 2022 16:36:15 +0300 Subject: [PATCH 076/234] Remove unused vars, usage '= default;' and fixed lower scope --- Src/Lib/DownloadHelper.cpp | 3 ++- Src/Lib/LanguageSettingsHelper.cpp | 3 --- Src/StartMenu/StartMenuDLL/Accessibility.cpp | 4 +--- Src/StartMenu/StartMenuDLL/DragDrop.h | 4 +--- Src/StartMenu/StartMenuDLL/SearchManager.h | 2 +- Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 1 - Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp | 2 +- 7 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Src/Lib/DownloadHelper.cpp b/Src/Lib/DownloadHelper.cpp index 19160d008..cecabdaf8 100644 --- a/Src/Lib/DownloadHelper.cpp +++ b/Src/Lib/DownloadHelper.cpp @@ -195,9 +195,10 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector &buf, { if (pProgress && pProgress->IsCanceled()) res=DOWNLOAD_CANCEL; - const wchar_t *accept[]={L"*/*",NULL}; + if (res==DOWNLOAD_OK) { + const wchar_t* accept[] = { L"*/*",NULL }; HINTERNET hRequest=HttpOpenRequest(hConnect,L"GET",file,NULL,NULL,accept,((components.nScheme==INTERNET_SCHEME_HTTPS)?INTERNET_FLAG_SECURE:0)|(bAcceptCached?0:INTERNET_FLAG_RELOAD),0); if (hRequest) { diff --git a/Src/Lib/LanguageSettingsHelper.cpp b/Src/Lib/LanguageSettingsHelper.cpp index bb3d43c43..09555397d 100644 --- a/Src/Lib/LanguageSettingsHelper.cpp +++ b/Src/Lib/LanguageSettingsHelper.cpp @@ -127,7 +127,6 @@ VersionData CLanguageSettingsDlg::s_VersionData; void CLanguageSettingsDlg::AddFlag( const wchar_t *langName, int langId, HBITMAP bmp ) { - std::vector::iterator it=m_LanguageIDs.begin()+1; int idx=1; for (;idx<(int)m_LanguageIDs.size();idx++) { @@ -205,8 +204,6 @@ void CLanguageSettingsDlg::UpdateFlags( void ) DoEnvironmentSubst(path,_countof(path)); } - CWindow list=GetDlgItem(IDC_LISTLANGUAGE); - wchar_t find[_MAX_PATH]; Sprintf(find,_countof(find),L"%s\\*.dll",path); WIN32_FIND_DATA data; diff --git a/Src/StartMenu/StartMenuDLL/Accessibility.cpp b/Src/StartMenu/StartMenuDLL/Accessibility.cpp index a7d57bf3d..aa8529543 100644 --- a/Src/StartMenu/StartMenuDLL/Accessibility.cpp +++ b/Src/StartMenu/StartMenuDLL/Accessibility.cpp @@ -16,9 +16,7 @@ CMenuAccessible::CMenuAccessible( CMenuContainer *pOwner ) CreateStdAccessibleObject(pOwner->m_hWnd,OBJID_CLIENT,IID_IAccessible,(void**)&m_pStdAccessible); } -CMenuAccessible::~CMenuAccessible( void ) -{ -} +CMenuAccessible::~CMenuAccessible( void ) = default; void CMenuAccessible::Reset( void ) { diff --git a/Src/StartMenu/StartMenuDLL/DragDrop.h b/Src/StartMenu/StartMenuDLL/DragDrop.h index 9b2e58476..bd27deca4 100644 --- a/Src/StartMenu/StartMenuDLL/DragDrop.h +++ b/Src/StartMenu/StartMenuDLL/DragDrop.h @@ -15,9 +15,7 @@ class CDropTargetProxy: public IDropTarget m_RefCount=0; } - ~CDropTargetProxy( void ) - { - } + ~CDropTargetProxy( void ) = default; void Reset( void ) { diff --git a/Src/StartMenu/StartMenuDLL/SearchManager.h b/Src/StartMenu/StartMenuDLL/SearchManager.h index c521eec17..6328b430a 100644 --- a/Src/StartMenu/StartMenuDLL/SearchManager.h +++ b/Src/StartMenu/StartMenuDLL/SearchManager.h @@ -36,7 +36,7 @@ class CSearchManager struct SearchCategory { - SearchCategory( void ) {} + SearchCategory( void ) = default; SearchCategory( const SearchCategory &cat ) { search.Clone(cat.search); diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index 687877d07..54007e93c 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -3155,7 +3155,6 @@ LRESULT CCustomMenuDlg7::CItemList::OnSelEndOk( WORD wNotifyCode, WORD wID, HWND if (m_Column==2) { // state - CString str; menuItem.settings&=~CEditMenuDlg7::SETTINGS_MASK; if (sel==0) menuItem.settings|=StdMenuItem::MENU_ITEM_DISABLED; diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp index 1ae435f12..fa5bc3e5c 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp @@ -3760,7 +3760,6 @@ if (!g_bTrimHooks) // context menu if (msg->message==WM_NCRBUTTONUP || msg->message==WM_RBUTTONUP) { - CPoint pt0(GetMessagePos()); TaskbarInfo *taskBar=FindTaskBarInfoButton(msg->hwnd); DWORD winVer=GetWinVersion(); if (!taskBar && winVer>=WIN_VER_WIN8) @@ -3771,6 +3770,7 @@ if (!g_bTrimHooks) } if (taskBar) { + CPoint pt0(GetMessagePos()); if (msg->message==WM_RBUTTONUP && msg->hwnd==taskBar->startButton && msg->lParam==MAKELPARAM(-1,-1)) { RECT rc; From a20215d9dad76f5a13eb741a474af3eb18c4d6c1 Mon Sep 17 00:00:00 2001 From: germanaizek Date: Thu, 12 May 2022 16:37:52 +0300 Subject: [PATCH 077/234] Replace 'push*' -> 'emplace*' if possible and use std::move() --- Src/Lib/LanguageSettingsHelper.cpp | 2 +- Src/Lib/Settings.cpp | 4 +-- Src/Lib/SettingsUIHelper.cpp | 2 +- Src/Setup/Utility/Utility.cpp | 2 +- Src/StartMenu/StartMenuDLL/ItemManager.cpp | 30 +++++++++---------- Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 2 +- Src/StartMenu/StartMenuDLL/SearchManager.cpp | 2 +- Src/StartMenu/StartMenuDLL/SkinManager.cpp | 2 +- .../StartMenuHelper/ModernSettings.cpp | 2 +- .../DesktopNotificationManagerCompat.cpp | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Src/Lib/LanguageSettingsHelper.cpp b/Src/Lib/LanguageSettingsHelper.cpp index 09555397d..ad35b04c0 100644 --- a/Src/Lib/LanguageSettingsHelper.cpp +++ b/Src/Lib/LanguageSettingsHelper.cpp @@ -405,7 +405,7 @@ LRESULT CLanguageSettingsDlg::OnSelChange( int idCtrl, LPNMHDR pnmh, BOOL& bHand CComVariant val(name); if (m_pSetting->value!=val) SetSettingsDirty(); - m_pSetting->value=val; + m_pSetting->value=std::move(val); if (_wcsicmp(m_pSetting->value.bstrVal,m_pSetting->defValue.bstrVal)==0) m_pSetting->flags|=CSetting::FLAG_DEFAULT; diff --git a/Src/Lib/Settings.cpp b/Src/Lib/Settings.cpp index 16afba7ad..df9646f4e 100644 --- a/Src/Lib/Settings.cpp +++ b/Src/Lib/Settings.cpp @@ -789,7 +789,7 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname ) } CComPtr next; child2->get_nextSibling(&next); - child2=next; + child2=std::move(next); } string.push_back(0); pSetting->value=CComVariant(&string[0]); @@ -839,7 +839,7 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname ) CComPtr next; if (child->get_nextSibling(&next)!=S_OK) break; - child=next; + child=std::move(next); } if (ver<0x03090000) UpgradeSettings(false); diff --git a/Src/Lib/SettingsUIHelper.cpp b/Src/Lib/SettingsUIHelper.cpp index 63a211bab..05e2c03ad 100644 --- a/Src/Lib/SettingsUIHelper.cpp +++ b/Src/Lib/SettingsUIHelper.cpp @@ -1156,7 +1156,7 @@ HRESULT STDMETHODCALLTYPE CBrowseLinkEvents::OnButtonClicked( IFileDialogCustomi { pfd->GetFolder(&pItem); } - m_pResult=pItem; + m_pResult=std::move(pItem); pfd->Close(S_FALSE); return S_OK; } diff --git a/Src/Setup/Utility/Utility.cpp b/Src/Setup/Utility/Utility.cpp index de9b7a6d4..003594935 100644 --- a/Src/Setup/Utility/Utility.cpp +++ b/Src/Setup/Utility/Utility.cpp @@ -943,7 +943,7 @@ static BOOL CALLBACK EnumResLangProc( HMODULE hModule, LPCTSTR lpszType, LPCTSTR if (IS_INTRESOURCE(lpszName)) { std::vector> &oldStrings=*(std::vector>*)lParam; - oldStrings.push_back(std::pair(PtrToInt(lpszName),wIDLanguage)); + oldStrings.emplace_back(PtrToInt(lpszName),wIDLanguage); } return TRUE; } diff --git a/Src/StartMenu/StartMenuDLL/ItemManager.cpp b/Src/StartMenu/StartMenuDLL/ItemManager.cpp index f21d969e3..3d756b57b 100644 --- a/Src/StartMenu/StartMenuDLL/ItemManager.cpp +++ b/Src/StartMenu/StartMenuDLL/ItemManager.cpp @@ -609,7 +609,7 @@ void CItemManager::Init( void ) { int width, height; pList->GetIconSize(&width,&height); - m_ListSizes.push_back(std::pair(width,i)); + m_ListSizes.emplace_back(width,i); } } std::sort(m_ListSizes.begin(),m_ListSizes.end()); @@ -617,7 +617,7 @@ void CItemManager::Init( void ) CreateDefaultIcons(); LoadCacheFile(); - ItemInfo &item=m_ItemInfos.insert(std::pair(0,ItemInfo()))->second; + ItemInfo &item=m_ItemInfos.emplace(0,ItemInfo())->second; item.bIconOnly=true; item.smallIcon=m_DefaultSmallIcon; item.largeIcon=m_DefaultLargeIcon; @@ -704,21 +704,21 @@ void CItemManager::CreateDefaultIcons( void ) icon.bitmap=BitmapFromIcon(LoadShellIcon(index,SMALL_ICON_SIZE),SMALL_ICON_SIZE); else icon.bitmap=NULL; - m_DefaultSmallIcon=&m_IconInfos.insert(std::pair(0,icon))->second; + m_DefaultSmallIcon=&m_IconInfos.emplace(0,icon)->second; icon.sizeType=ICON_SIZE_TYPE_LARGE; if (index>=0) icon.bitmap=BitmapFromIcon(LoadShellIcon(index,LARGE_ICON_SIZE),LARGE_ICON_SIZE); else icon.bitmap=NULL; - m_DefaultLargeIcon=&m_IconInfos.insert(std::pair(0,icon))->second; + m_DefaultLargeIcon=&m_IconInfos.emplace(0,icon)->second; icon.sizeType=ICON_SIZE_TYPE_EXTRA_LARGE; if (index>=0) icon.bitmap=BitmapFromIcon(LoadShellIcon(index,EXTRA_LARGE_ICON_SIZE),EXTRA_LARGE_ICON_SIZE); else icon.bitmap=NULL; - m_DefaultExtraLargeIcon=&m_IconInfos.insert(std::pair(0,icon))->second; + m_DefaultExtraLargeIcon=&m_IconInfos.emplace(0,icon)->second; } CItemManager::LoadIconData &CItemManager::GetLoadIconData( void ) @@ -896,7 +896,7 @@ const CItemManager::ItemInfo *CItemManager::GetItemInfo( IShellItem *pItem, PIDL } if (!pInfo) { - pInfo=&m_ItemInfos.insert(std::pair(hash,ItemInfo()))->second; + pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second; pInfo->pidl.Clone(pidl); pInfo->path=path; pInfo->PATH=PATH; @@ -978,7 +978,7 @@ const CItemManager::ItemInfo *CItemManager::GetItemInfo( CString path, int refre } if (!pInfo) { - pInfo=&m_ItemInfos.insert(std::pair(hash,ItemInfo()))->second; + pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second; if (!PATH.IsEmpty()) MenuParseDisplayName(path,&pInfo->pidl,NULL,NULL); if (pInfo->pidl) @@ -1076,7 +1076,7 @@ const CItemManager::ItemInfo *CItemManager::GetCustomIcon( const wchar_t *locati } if (!pInfo) { - pInfo=&m_ItemInfos.insert(std::pair(hash,ItemInfo()))->second; + pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second; pInfo->bIconOnly=true; pInfo->bTemp=bTemp; pInfo->iconPath=location; @@ -1907,7 +1907,7 @@ void CItemManager::RefreshItemInfo( ItemInfo *pInfo, int refreshFlags, IShellIte if (SUCCEEDED(store->GetValue(PKEY_MetroAppLauncher, &val)) && (val.vt == VT_I4 || val.vt == VT_UI4) && val.intVal) { newInfo.bLink = false; - pItem = target; + pItem = std::move(target); pStore = store; } PropVariantClear(&val); @@ -2597,7 +2597,7 @@ void CItemManager::StoreInCache( unsigned int hash, const wchar_t *path, HBITMAP if ((refreshFlags&INFO_SMALL_ICON) && hSmallBitmap) { - IconInfo *pInfo=&m_IconInfos.insert(std::pair(hash,IconInfo()))->second; + IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second; pInfo->sizeType=ICON_SIZE_TYPE_SMALL; pInfo->bTemp=bTemp; pInfo->bMetro=bMetro; @@ -2607,7 +2607,7 @@ void CItemManager::StoreInCache( unsigned int hash, const wchar_t *path, HBITMAP } if ((refreshFlags&INFO_LARGE_ICON) && hLargeBitmap) { - IconInfo *pInfo=&m_IconInfos.insert(std::pair(hash,IconInfo()))->second; + IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second; pInfo->sizeType=ICON_SIZE_TYPE_LARGE; pInfo->bTemp=bTemp; pInfo->bMetro=bMetro; @@ -2617,7 +2617,7 @@ void CItemManager::StoreInCache( unsigned int hash, const wchar_t *path, HBITMAP } if ((refreshFlags&INFO_EXTRA_LARGE_ICON) && hExtraLargeBitmap) { - IconInfo *pInfo=&m_IconInfos.insert(std::pair(hash,IconInfo()))->second; + IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second; pInfo->sizeType=ICON_SIZE_TYPE_EXTRA_LARGE; pInfo->bTemp=bTemp; pInfo->bMetro=bMetro; @@ -3273,7 +3273,7 @@ void CItemManager::LoadCacheFile( void ) bError=true; break; } - remapIcons.push_back(&m_IconInfos.insert(std::pair(data.key,info))->second); + remapIcons.push_back(&m_IconInfos.emplace(data.key,info)->second); } else { @@ -3304,7 +3304,7 @@ void CItemManager::LoadCacheFile( void ) bError=true; break; } - ItemInfo &info=m_ItemInfos.insert(std::pair(data.key,ItemInfo()))->second; + ItemInfo &info=m_ItemInfos.emplace(data.key,ItemInfo())->second; info.writestamp=data.writestamp; info.createstamp=data.createstamp; @@ -3568,7 +3568,7 @@ void CItemManager::ClearCache( void ) m_IconInfos.clear(); m_MetroItemInfos10.clear(); CreateDefaultIcons(); - ItemInfo &item=m_ItemInfos.insert(std::pair(0,ItemInfo()))->second; + ItemInfo &item=m_ItemInfos.emplace(0,ItemInfo())->second; item.bIconOnly=true; item.smallIcon=m_DefaultSmallIcon; item.largeIcon=m_DefaultLargeIcon; diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp index 8ad791b0e..efdeef848 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp @@ -2237,7 +2237,7 @@ void CMenuContainer::AddJumpListItems( std::vector &items ) { ILFree(item.pItem1); item.pItem1=pidl2.Detach(); - pItem=pItem2; + pItem=std::move(pItem2); } } } diff --git a/Src/StartMenu/StartMenuDLL/SearchManager.cpp b/Src/StartMenu/StartMenuDLL/SearchManager.cpp index 9e35c8a9a..50144d537 100644 --- a/Src/StartMenu/StartMenuDLL/SearchManager.cpp +++ b/Src/StartMenu/StartMenuDLL/SearchManager.cpp @@ -526,7 +526,7 @@ bool CSearchManager::SearchScope::ParseSearchConnector( const wchar_t *fname ) CComPtr pNext; if (pScopeItem->get_nextSibling(&pNext)!=S_OK) break; - pScopeItem=pNext; + pScopeItem=std::move(pNext); } return true; } diff --git a/Src/StartMenu/StartMenuDLL/SkinManager.cpp b/Src/StartMenu/StartMenuDLL/SkinManager.cpp index 71352a5f3..213a09d8e 100644 --- a/Src/StartMenu/StartMenuDLL/SkinManager.cpp +++ b/Src/StartMenu/StartMenuDLL/SkinManager.cpp @@ -1778,7 +1778,7 @@ bool MenuSkin::LoadSkin( HMODULE hMod, const wchar_t *variation, const wchar_t * var.label=token; if (var.labelEn.IsEmpty()) var.labelEn=var.label; - Variations.push_back(std::pair(res,var)); + Variations.emplace_back(res,var); LOG_MENU(LOG_OPEN,L"Variation found: name=%s, id=%d",token,res); } else diff --git a/Src/StartMenu/StartMenuHelper/ModernSettings.cpp b/Src/StartMenu/StartMenuHelper/ModernSettings.cpp index faa24b69b..ed0aa8d8b 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettings.cpp +++ b/Src/StartMenu/StartMenuHelper/ModernSettings.cpp @@ -280,7 +280,7 @@ static std::vector ParseModernSettings() CComPtr next; if (FAILED(node->get_nextSibling(&next))) break; - node = next; + node = std::move(next); } } } diff --git a/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp b/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp index 24d3088f1..0cce330aa 100644 --- a/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp +++ b/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp @@ -224,7 +224,7 @@ namespace DesktopNotificationManagerCompat DesktopNotificationHistoryCompat::DesktopNotificationHistoryCompat(const wchar_t *aumid, ComPtr history) { m_aumid = std::wstring(aumid); - m_history = history; + m_history = std::move(history); } HRESULT DesktopNotificationHistoryCompat::Clear() From 47cc2b2304915ee9346e3ff10aa5e61cde79227c Mon Sep 17 00:00:00 2001 From: Let's All Love Lain Date: Thu, 12 May 2022 16:40:43 +0300 Subject: [PATCH 078/234] Replacing 'scopeList' contiguous placement of elements in memory more efficient and std::make_unique c++17 Signed-off-by: germanaizek --- Src/StartMenu/StartMenuDLL/SearchManager.cpp | 6 +++--- .../DesktopToasts/DesktopNotificationManagerCompat.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/SearchManager.cpp b/Src/StartMenu/StartMenuDLL/SearchManager.cpp index 50144d537..b536d7eac 100644 --- a/Src/StartMenu/StartMenuDLL/SearchManager.cpp +++ b/Src/StartMenu/StartMenuDLL/SearchManager.cpp @@ -798,7 +798,7 @@ void CSearchManager::SearchThread( void ) CSession session; if (SUCCEEDED(dataSource.OpenFromInitializationString(L"provider=Search.CollatorDSO.1;EXTENDED PROPERTIES=\"Application=Windows\"")) && SUCCEEDED(session.Open(dataSource))) { - std::list scopeList; + std::vector scopeList; if (searchRequest.bSearchMetroSettings && !m_bMetroSettingsFound) { @@ -1104,7 +1104,7 @@ void CSearchManager::SearchThread( void ) command0.Close(); continue; } - for (std::list::iterator it=scopeList.begin();it!=scopeList.end();++it) + for (auto it=scopeList.begin();it!=scopeList.end();++it) { if (it->roots.empty()) continue; @@ -1122,7 +1122,7 @@ void CSearchManager::SearchThread( void ) else { len+=Strcpy(query+len,_countof(query)-len,L" AND System.Search.Store='FILE' AND System.ItemType!='.settingcontent-ms'"); - for (std::list::iterator it2=scopeList.begin();it2!=it;++it2) + for (auto it2=scopeList.begin();it2!=it;++it2) { if (it2->categoryHash==CATEGORY_METROSETTING) continue; diff --git a/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp b/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp index 0cce330aa..e537452f3 100644 --- a/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp +++ b/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp @@ -168,7 +168,7 @@ namespace DesktopNotificationManagerCompat ComPtr nativeHistory; RETURN_IF_FAILED(toastStatics2->get_History(&nativeHistory)); - *history = std::unique_ptr(new DesktopNotificationHistoryCompat(s_aumid.c_str(), nativeHistory)); + *history = std::make_unique(s_aumid.c_str(), nativeHistory); return S_OK; } From b89aaed7854212926729aabb4a05d5b517cb5549 Mon Sep 17 00:00:00 2001 From: among-us-official <110939205+among-us-official@users.noreply.github.com> Date: Thu, 11 Aug 2022 23:46:12 +0300 Subject: [PATCH 079/234] Fix corrupted icons in second column (#1088) When using skin with a different second column icon size, all of the icons in it would become blank. Because m_bTwoColumns is set after AddStandardItems, it is still false in the column break check. As a workaround, use the value it's assigned later in InitWindowInternal instead. Fix Open-Shell/Open-Shell-Menu#980 --- Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp index efdeef848..29413ddab 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp @@ -1084,7 +1084,8 @@ void CMenuContainer::AddStandardItems( void ) if (m_bSubMenu && pStdItem->id==s_ShutdownCommand) continue; - if (pStdItem->id==MENU_COLUMN_BREAK && m_bTwoColumns) + const bool bTwoColumns = (!m_bSubMenu && s_Skin.TwoColumns); + if (pStdItem->id==MENU_COLUMN_BREAK && bTwoColumns) mainIconSize=s_Skin.Main2_icon_size; int stdOptions=GetStdOptions(pStdItem->id); From 0cb43dd17c2be7364dd57e7c4b91c571bd9fe5b5 Mon Sep 17 00:00:00 2001 From: thisismy-github <48284263+thisismy-github@users.noreply.github.com> Date: Wed, 11 Aug 2021 23:58:33 -0400 Subject: [PATCH 080/234] Added option to always single-click folders Opens pinned items on both sides of the start menu in just one click, while preserving hover functionality. Ignores the All Programs button for now as the All Programs folder is rarely accessed and this option can obstruct its use, especially for the inline menu style. Fixes #692. --- Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 4 +++- Src/StartMenu/StartMenuDLL/MenuContainer.h | 1 + Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 1 + Src/StartMenu/StartMenuDLL/StartMenuDLL.rc | 6 ++++++ Src/StartMenu/StartMenuDLL/resource.h | 2 ++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp index 29413ddab..8fc20af43 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp @@ -315,6 +315,7 @@ bool CMenuContainer::s_bShowTopEmpty=false; bool CMenuContainer::s_bNoDragDrop=false; bool CMenuContainer::s_bNoContextMenu=false; bool CMenuContainer::s_bExpandLinks=false; +bool CMenuContainer::s_bSingleClickFolders=false; bool CMenuContainer::s_bLogicalSort=false; bool CMenuContainer::s_bExtensionSort=false; bool CMenuContainer::s_bAllPrograms=false; @@ -6823,7 +6824,7 @@ LRESULT CMenuContainer::OnLButtonUp( UINT uMsg, WPARAM wParam, LPARAM lParam, BO const MenuItem &item=m_Items[index]; POINT pt2=pt; ClientToScreen(&pt2); - if (!item.bFolder) + if (!item.bFolder || (s_bSingleClickFolders && item.id!=MENU_PROGRAMS)) // never open All Programs link with single click { if (item.jumpIndex>=0 && m_bHotArrow) { @@ -7672,6 +7673,7 @@ HWND CMenuContainer::ToggleStartMenu( int taskbarId, bool bKeyboard, bool bAllPr g_ItemManager.ResetTempIcons(); s_ScrollMenus=GetSettingInt(L"ScrollType"); s_bExpandLinks=GetSettingBool(L"ExpandFolderLinks"); + s_bSingleClickFolders=GetSettingBool(L"SingleClickFolders"); s_bLogicalSort=GetSettingBool(L"NumericSort"); s_MaxRecentDocuments=GetSettingInt(L"MaxRecentDocuments"); s_ShellFormat=RegisterClipboardFormat(CFSTR_SHELLIDLIST); diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.h b/Src/StartMenu/StartMenuDLL/MenuContainer.h index 696e8db48..ad34beb27 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.h +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.h @@ -876,6 +876,7 @@ class CMenuContainer: public IDropTarget, public IFrameworkInputPaneHandler, pub static bool s_bNoDragDrop; // disables drag/drop static bool s_bNoContextMenu; // disables the context menu static bool s_bExpandLinks; // expand links to folders + static bool s_bSingleClickFolders; // open links to folders with one click instead of two static bool s_bLogicalSort; // use StrCmpLogical instead of CompareString static bool s_bExtensionSort; // sort file names by extension static bool s_bAllPrograms; // this is the All Programs menu of the Windows start menu diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index 54007e93c..8a7b7b240 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -4313,6 +4313,7 @@ CSetting g_Settings[]={ {L"UserNameCommand",CSetting::TYPE_STRING,IDS_NAME_COMMAND,IDS_NAME_COMMAND_TIP,L"control nusrmgr.cpl"}, {L"SearchFilesCommand",CSetting::TYPE_STRING,IDS_SEARCH_COMMAND,IDS_SEARCH_COMMAND_TIP,L"search-ms:",CSetting::FLAG_MENU_CLASSIC_BOTH}, {L"ExpandFolderLinks",CSetting::TYPE_BOOL,IDS_EXPAND_LINKS,IDS_EXPAND_LINKS_TIP,1}, + {L"SingleClickFolders",CSetting::TYPE_BOOL,IDS_NO_DBLCLICK,IDS_NO_DBLCLICK_TIP,0}, {L"EnableTouch",CSetting::TYPE_BOOL,IDS_ENABLE_TOUCH,IDS_ENABLE_TOUCH_TIP,1}, {L"EnableAccessibility",CSetting::TYPE_BOOL,IDS_ACCESSIBILITY,IDS_ACCESSIBILITY_TIP,1}, {L"ShowNextToTaskbar",CSetting::TYPE_BOOL,IDS_NEXTTASKBAR,IDS_NEXTTASKBAR_TIP,0}, diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc index 405d5aa1f..6e35344b4 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc @@ -1295,6 +1295,12 @@ BEGIN IDS_CLEAR_CACHE "Clear cached information" END +STRINGTABLE +BEGIN + IDS_NO_DBLCLICK "Single-click to open folder shortcuts" + IDS_NO_DBLCLICK_TIP "When this is checked, single-clicking shortcuts (links) to folders will open them in explorer. Hovering over the shortcut will still expand sub-menus" +END + #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/Src/StartMenu/StartMenuDLL/resource.h b/Src/StartMenu/StartMenuDLL/resource.h index ca08926ca..2d365081c 100644 --- a/Src/StartMenu/StartMenuDLL/resource.h +++ b/Src/StartMenu/StartMenuDLL/resource.h @@ -760,6 +760,8 @@ #define IDS_HOR_OFFSET_TIP 3663 #define IDS_VERT_OFFSET 3664 #define IDS_VERT_OFFSET_TIP 3665 +#define IDS_NO_DBLCLICK 3666 +#define IDS_NO_DBLCLICK_TIP 3667 #define IDS_STRING7001 7001 #define IDS_STRING7002 7002 #define IDS_STRING7003 7003 From 998d83c15c1fe753526a43fb4c182a4b25e83252 Mon Sep 17 00:00:00 2001 From: thisismy-github <48284263+thisismy-github@users.noreply.github.com> Date: Thu, 12 Aug 2021 09:14:19 -0400 Subject: [PATCH 081/234] Auto-detect when setting is back to default value Intercepts *most* instances of FLAG_DEFAULT getting set, including when XML files are loaded and when Open-Shell starts, adding if-statements to those spots to check if a new value is actually different from the setting's default value. Ensures more consistency behind the scenes and gets rid of inaccurate bold highlights. --- Src/Lib/Settings.cpp | 20 +++++-- Src/Lib/SettingsUIHelper.cpp | 35 +++++++++--- Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 65 ++++++++++++++++++----- 3 files changed, 96 insertions(+), 24 deletions(-) diff --git a/Src/Lib/Settings.cpp b/Src/Lib/Settings.cpp index df9646f4e..7b0d456a1 100644 --- a/Src/Lib/Settings.cpp +++ b/Src/Lib/Settings.cpp @@ -793,7 +793,10 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname ) } string.push_back(0); pSetting->value=CComVariant(&string[0]); - pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (pSetting->value==pSetting->defValue) + pSetting->flags|=CSetting::FLAG_DEFAULT; + else + pSetting->flags&=~CSetting::FLAG_DEFAULT; } else { @@ -806,7 +809,10 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname ) if (pSetting->type>=CSetting::TYPE_STRING) { pSetting->value=value; - pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (pSetting->value==pSetting->defValue) + pSetting->flags|=CSetting::FLAG_DEFAULT; + else + pSetting->flags&=~CSetting::FLAG_DEFAULT; } else if (pSetting->type==CSetting::TYPE_BOOL || (pSetting->type==CSetting::TYPE_INT && pSetting[1].type!=CSetting::TYPE_RADIO) || pSetting->type==CSetting::TYPE_HOTKEY || pSetting->type==CSetting::TYPE_HOTKEY_ANY || pSetting->type==CSetting::TYPE_COLOR) { @@ -815,7 +821,10 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname ) pSetting->value=CComVariant(val?1:0); else pSetting->value=CComVariant(val); - pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (pSetting->value==pSetting->defValue) + pSetting->flags|=CSetting::FLAG_DEFAULT; + else + pSetting->flags&=~CSetting::FLAG_DEFAULT; } else if (pSetting->type==CSetting::TYPE_INT && pSetting[1].type==CSetting::TYPE_RADIO) { @@ -825,7 +834,10 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname ) if (_wcsicmp(pRadio->name,value.bstrVal)==0) { pSetting->value=CComVariant(val); - pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (pSetting->value==pSetting->defValue) + pSetting->flags|=CSetting::FLAG_DEFAULT; + else + pSetting->flags&=~CSetting::FLAG_DEFAULT; break; } } diff --git a/Src/Lib/SettingsUIHelper.cpp b/Src/Lib/SettingsUIHelper.cpp index 05e2c03ad..e201720a2 100644 --- a/Src/Lib/SettingsUIHelper.cpp +++ b/Src/Lib/SettingsUIHelper.cpp @@ -1822,7 +1822,10 @@ void CCustomTreeDlg::SerializeData( void ) if ((m_pSetting->flags&CSetting::FLAG_DEFAULT) || wcscmp(strNew,strOld)!=0) SetSettingsDirty(); m_pSetting->value=CComVariant(strNew); - m_pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (m_pSetting->value==m_pSetting->defValue) + m_pSetting->flags|=CSetting::FLAG_DEFAULT; + else + m_pSetting->flags&=~CSetting::FLAG_DEFAULT; ItemsChanged(); } @@ -2778,7 +2781,10 @@ void CTreeSettingsDlg::ToggleItem( HTREEITEM hItem, bool bDefault ) { CSettingsLockWrite lock; pSetting->value=CComVariant(state?0:1); - pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (pSetting->value==pSetting->defValue) + pSetting->flags|=CSetting::FLAG_DEFAULT; + else + pSetting->flags&=~CSetting::FLAG_DEFAULT; SetSettingsDirty(); } if (pSetting->flags&CSetting::FLAG_CALLBACK) @@ -2802,7 +2808,10 @@ void CTreeSettingsDlg::ToggleItem( HTREEITEM hItem, bool bDefault ) { CSettingsLockWrite lock; pTarget->value=CComVariant(val); - pTarget->flags&=~CSetting::FLAG_DEFAULT; + if (pTarget->value==pTarget->defValue) + pTarget->flags|=CSetting::FLAG_DEFAULT; + else + pTarget->flags&=~CSetting::FLAG_DEFAULT; SetSettingsDirty(); } if (pParent->flags&CSetting::FLAG_CALLBACK) @@ -3013,7 +3022,10 @@ void CTreeSettingsDlg::ApplyEditBox( void ) if (pSetting->value.vt!=VT_I4 || pSetting->value.intVal!=val) { pSetting->value=CComVariant(val); - pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (pSetting->value==pSetting->defValue) + pSetting->flags|=CSetting::FLAG_DEFAULT; + else + pSetting->flags&=~CSetting::FLAG_DEFAULT; } } else if (pSetting->type==CSetting::TYPE_COLOR) @@ -3023,7 +3035,10 @@ void CTreeSettingsDlg::ApplyEditBox( void ) if (pSetting->value.vt!=VT_I4 || pSetting->value.intVal!=val) { pSetting->value=CComVariant(val); - pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (pSetting->value==pSetting->defValue) + pSetting->flags|=CSetting::FLAG_DEFAULT; + else + pSetting->flags&=~CSetting::FLAG_DEFAULT; } } else if (pSetting->type==CSetting::TYPE_HOTKEY || pSetting->type==CSetting::TYPE_HOTKEY_ANY) @@ -3031,7 +3046,10 @@ void CTreeSettingsDlg::ApplyEditBox( void ) if (pSetting->value.vt!=VT_I4 || pSetting->value.intVal!=g_HotKey) { pSetting->value=CComVariant(g_HotKey); - pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (pSetting->value==pSetting->defValue) + pSetting->flags|=CSetting::FLAG_DEFAULT; + else + pSetting->flags&=~CSetting::FLAG_DEFAULT; } } else @@ -3039,7 +3057,10 @@ void CTreeSettingsDlg::ApplyEditBox( void ) if (pSetting->value.vt!=VT_BSTR || str!=pSetting->value.bstrVal) { pSetting->value=CComVariant(str); - pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (pSetting->value==pSetting->defValue) + pSetting->flags|=CSetting::FLAG_DEFAULT; + else + pSetting->flags&=~CSetting::FLAG_DEFAULT; } } SetSettingsDirty(); diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index 8a7b7b240..aa0ee5d83 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -3616,7 +3616,10 @@ void CCustomMenuDlg7::SerializeData( void ) stringBuilder.push_back(0); CSettingsLockWrite lock; m_pSetting->value=CComVariant(&stringBuilder[0]); - m_pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (m_pSetting->value==m_pSetting->defValue) + m_pSetting->flags|=CSetting::FLAG_DEFAULT; + else + m_pSetting->flags&=~CSetting::FLAG_DEFAULT; SetSettingsDirty(); } @@ -3843,7 +3846,10 @@ LRESULT CMenuStyleDlg::OnClick( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& CheckDlgButton(IDC_RADIO_CLASSIC,pSetting->value.intVal==MENU_CLASSIC1?BST_CHECKED:BST_UNCHECKED); CheckDlgButton(IDC_RADIO_TWO_COLUMNS,pSetting->value.intVal==MENU_CLASSIC2?BST_CHECKED:BST_UNCHECKED); CheckDlgButton(IDC_RADIO_WIN7,pSetting->value.intVal==MENU_WIN7?BST_CHECKED:BST_UNCHECKED); - pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (pSetting->value==pSetting->defValue) + pSetting->flags|=CSetting::FLAG_DEFAULT; + else + pSetting->flags&=~CSetting::FLAG_DEFAULT; SetSettingsDirty(); SetSettingsStyle(styleFlag,CSetting::FLAG_MENU_MASK); @@ -3861,7 +3867,10 @@ LRESULT CMenuStyleDlg::OnEnabled( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL CSettingsLockWrite lock; CSetting *pSetting=FindSetting(L"EnableStartButton"); pSetting->value=CComVariant(bEnabled); - pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (pSetting->value==pSetting->defValue) + pSetting->flags|=CSetting::FLAG_DEFAULT; + else + pSetting->flags&=~CSetting::FLAG_DEFAULT; SetSettingsDirty(); } Update(false); @@ -3900,7 +3909,10 @@ LRESULT CMenuStyleDlg::OnButtonStyle( WORD wNotifyCode, WORD wID, HWND hWndCtl, CSettingsLockWrite lock; CSetting *pSetting=FindSetting(L"StartButtonType"); pSetting->value=CComVariant(style); - pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (pSetting->value==pSetting->defValue) + pSetting->flags|=CSetting::FLAG_DEFAULT; + else + pSetting->flags&=~CSetting::FLAG_DEFAULT; SetSettingsDirty(); } Update(false); @@ -3924,7 +3936,10 @@ LRESULT CMenuStyleDlg::OnPick( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& b CSettingsLockWrite lock; CSetting *pSetting=FindSetting(L"StartButtonPath"); pSetting->value=CComVariant(path); - pSetting->flags&=~CSetting::FLAG_DEFAULT; + if (pSetting->value==pSetting->defValue) + pSetting->flags|=CSetting::FLAG_DEFAULT; + else + pSetting->flags&=~CSetting::FLAG_DEFAULT; SetSettingsDirty(); } Update(true); @@ -4545,7 +4560,10 @@ void UpgradeSettings( bool bShared ) items.Replace(L"Command=recent_items\n",L"Command=recent_programs\n"); items.Replace(L"Command=control_panel_categories\n",L"Command=control_panel\n"); pSettingItems->value=items; - pSettingItems->flags&=~CSetting::FLAG_DEFAULT; + if (pSettingItems->value==pSettingItems->defValue) + pSettingItems->flags|=CSetting::FLAG_DEFAULT; + else + pSettingItems->flags&=~CSetting::FLAG_DEFAULT; } // set initial menu style @@ -4553,7 +4571,10 @@ void UpgradeSettings( bool bShared ) if (!pSettingStyle->IsLocked()) { pSettingStyle->value=(bTwoColumns?1:0); - pSettingStyle->flags&=~CSetting::FLAG_DEFAULT; + if (pSettingStyle->value==pSettingStyle->defValue) + pSettingStyle->flags|=CSetting::FLAG_DEFAULT; + else + pSettingStyle->flags&=~CSetting::FLAG_DEFAULT; SetSettingsStyle(bTwoColumns?CSetting::FLAG_MENU_CLASSIC2:CSetting::FLAG_MENU_CLASSIC1,CSetting::FLAG_MENU_MASK); } @@ -4565,7 +4586,10 @@ void UpgradeSettings( bool bShared ) if (!pSetting->IsDefault()) { pSettingSkin->value=pSetting->value; - pSettingSkin->flags&=~CSetting::FLAG_DEFAULT; + if (pSettingSkin->value==pSettingSkin->defValue) + pSettingSkin->flags|=CSetting::FLAG_DEFAULT; + else + pSettingSkin->flags&=~CSetting::FLAG_DEFAULT; } } CSetting *pSettingOpt=FindSetting(bTwoColumns?L"SkinOptionsC2":L"SkinOptionsC1"); @@ -4575,7 +4599,10 @@ void UpgradeSettings( bool bShared ) if (!pSetting->IsDefault()) { pSettingOpt->value=pSetting->value; - pSettingOpt->flags&=~CSetting::FLAG_DEFAULT; + if (pSettingOpt->value==pSettingOpt->defValue) + pSettingOpt->flags|=CSetting::FLAG_DEFAULT; + else + pSettingOpt->flags&=~CSetting::FLAG_DEFAULT; } } CSetting *pSettingVar=FindSetting(bTwoColumns?L"SkinVariationC2":L"SkinVariationC1"); @@ -4585,7 +4612,10 @@ void UpgradeSettings( bool bShared ) if (!pSetting->IsDefault()) { pSettingVar->value=pSetting->value; - pSettingVar->flags&=~CSetting::FLAG_DEFAULT; + if (pSettingVar->value==pSettingVar->defValue) + pSettingVar->flags|=CSetting::FLAG_DEFAULT; + else + pSettingVar->flags&=~CSetting::FLAG_DEFAULT; } } @@ -4597,7 +4627,10 @@ void UpgradeSettings( bool bShared ) if (!pSetting->IsDefault()) { pSettingSkin->value=pSetting->value; - pSettingSkin->flags&=~CSetting::FLAG_DEFAULT; + if (pSettingSkin->value==pSettingSkin->defValue) + pSettingSkin->flags|=CSetting::FLAG_DEFAULT; + else + pSettingSkin->flags&=~CSetting::FLAG_DEFAULT; } } pSettingOpt=FindSetting(L"SkinOptionsA"); @@ -4607,7 +4640,10 @@ void UpgradeSettings( bool bShared ) if (!pSetting->IsDefault()) { pSettingOpt->value=pSetting->value; - pSettingOpt->flags&=~CSetting::FLAG_DEFAULT; + if (pSettingOpt->value==pSettingOpt->defValue) + pSettingOpt->flags|=CSetting::FLAG_DEFAULT; + else + pSettingOpt->flags&=~CSetting::FLAG_DEFAULT; } } pSettingVar=FindSetting(L"SkinVariationA"); @@ -4617,7 +4653,10 @@ void UpgradeSettings( bool bShared ) if (!pSetting->IsDefault()) { pSettingVar->value=pSetting->value; - pSettingVar->flags&=~CSetting::FLAG_DEFAULT; + if (pSettingVar->value==pSettingVar->defValue) + pSettingVar->flags|=CSetting::FLAG_DEFAULT; + else + pSettingVar->flags&=~CSetting::FLAG_DEFAULT; } } } From daa1d96f12be9c9d6d77865c0d1f6439b6f2f34b Mon Sep 17 00:00:00 2001 From: thisismy-github <48284263+thisismy-github@users.noreply.github.com> Date: Thu, 12 Aug 2021 14:28:07 -0400 Subject: [PATCH 082/234] Added option to never highlight modified settings Prevents settings from appearing in bold. Does not change the helper text at the bottom of the window. --- Src/Lib/SettingsUIHelper.cpp | 5 ++++- Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 1 + Src/StartMenu/StartMenuDLL/StartMenuDLL.rc | 2 ++ Src/StartMenu/StartMenuDLL/resource.h | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Src/Lib/SettingsUIHelper.cpp b/Src/Lib/SettingsUIHelper.cpp index e201720a2..0c3221223 100644 --- a/Src/Lib/SettingsUIHelper.cpp +++ b/Src/Lib/SettingsUIHelper.cpp @@ -3397,6 +3397,9 @@ void CTreeSettingsDlg::UpdateGroup( const CSetting *pModified ) bool bDefault=pSetting->IsDefault(); const CComVariant &valVar=pSetting->GetValue(); + // check if modified items should be bold + bool bBoldSettings=GetSettingBool(L"BoldSettings"); + // calculate text if (pSetting!=m_pEditSetting) { @@ -3479,7 +3482,7 @@ void CTreeSettingsDlg::UpdateGroup( const CSetting *pModified ) DeleteDC(hdc); DeleteDC(hdcMask); } - int state=bDefault?0:TVIS_BOLD; + int state=bDefault||!bBoldSettings?0:TVIS_BOLD; // check if item should be highlighted in bold if (!bEnabled) { if (pSetting->type!=CSetting::TYPE_COLOR) image|=SETTING_STATE_DISABLED; diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index aa0ee5d83..68eea85fd 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -4334,6 +4334,7 @@ CSetting g_Settings[]={ {L"ShowNextToTaskbar",CSetting::TYPE_BOOL,IDS_NEXTTASKBAR,IDS_NEXTTASKBAR_TIP,0}, {L"PreCacheIcons",CSetting::TYPE_BOOL,IDS_CACHE_ICONS,IDS_CACHE_ICONS_TIP,1,CSetting::FLAG_COLD}, {L"DelayIcons",CSetting::TYPE_BOOL,IDS_DELAY_ICONS,IDS_DELAY_ICONS_TIP,1,CSetting::FLAG_COLD}, + {L"BoldSettings",CSetting::TYPE_BOOL,IDS_BOLD_SETTINGS,IDS_BOLD_SETTINGS_TIP,1}, {L"ReportSkinErrors",CSetting::TYPE_BOOL,IDS_SKIN_ERRORS,IDS_SKIN_ERRORS_TIP,0}, {L"SearchBoxSettings",CSetting::TYPE_GROUP,IDS_SEARCH_BOX}, diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc index 6e35344b4..f8b56f6fc 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc @@ -1299,6 +1299,8 @@ STRINGTABLE BEGIN IDS_NO_DBLCLICK "Single-click to open folder shortcuts" IDS_NO_DBLCLICK_TIP "When this is checked, single-clicking shortcuts (links) to folders will open them in explorer. Hovering over the shortcut will still expand sub-menus" + IDS_BOLD_SETTINGS "Highlight modified settings" + IDS_BOLD_SETTINGS_TIP "When this is checked, settings that have been modified from their defaults will be highlighted in bold" END #endif // English (U.S.) resources diff --git a/Src/StartMenu/StartMenuDLL/resource.h b/Src/StartMenu/StartMenuDLL/resource.h index 2d365081c..0d33c1c15 100644 --- a/Src/StartMenu/StartMenuDLL/resource.h +++ b/Src/StartMenu/StartMenuDLL/resource.h @@ -762,6 +762,8 @@ #define IDS_VERT_OFFSET_TIP 3665 #define IDS_NO_DBLCLICK 3666 #define IDS_NO_DBLCLICK_TIP 3667 +#define IDS_BOLD_SETTINGS 3668 +#define IDS_BOLD_SETTINGS_TIP 3669 #define IDS_STRING7001 7001 #define IDS_STRING7002 7002 #define IDS_STRING7003 7003 From 68379f40985894b3baf5851cc6cf38caa577521d Mon Sep 17 00:00:00 2001 From: thisismy-github <48284263+thisismy-github@users.noreply.github.com> Date: Thu, 12 Aug 2021 15:31:42 -0400 Subject: [PATCH 083/234] Fixed bug between XML files and active edit boxes When loading XML files, settings with active edit boxes open will not be adjusted. This adds an additional tab-reload before the load begins to forcibly close any active edit boxes. --- Src/Lib/Settings.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/Lib/Settings.cpp b/Src/Lib/Settings.cpp index 7b0d456a1..fb312fc8b 100644 --- a/Src/Lib/Settings.cpp +++ b/Src/Lib/Settings.cpp @@ -1713,6 +1713,7 @@ LRESULT CSettingsDlg::OnBackup( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_NOCHANGEDIR; if (GetOpenFileName(&ofn)) { + SetCurTab(m_Index,true); // reload tab once to force-close any active edit boxes CString error=g_SettingsManager.LoadSettingsXml(path); if (!error.IsEmpty()) { @@ -1722,7 +1723,7 @@ LRESULT CSettingsDlg::OnBackup( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& ::MessageBox(m_hWnd,text,LoadStringEx(IDS_ERROR_TITLE),MB_OK|MB_ICONERROR); } SetSettingsDirty(); - SetCurTab(m_Index,true); + SetCurTab(m_Index,true); // reload tab again to show the new settings } } if (res==3) From 5399e3ad8cc05170c2d0c5e1bd06496f6c88b672 Mon Sep 17 00:00:00 2001 From: thisismy-github <48284263+thisismy-github@users.noreply.github.com> Date: Thu, 12 Aug 2021 17:32:15 -0400 Subject: [PATCH 084/234] Added option to use a custom search hint If set, intercepts the search hint's DrawText function and swaps out the default text for user-defined text. Leaving the text blank results in an empty search box. --- Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 5 ++++- Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 2 ++ Src/StartMenu/StartMenuDLL/StartMenuDLL.rc | 4 ++++ Src/StartMenu/StartMenuDLL/resource.h | 4 ++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp index 8fc20af43..78915f4c9 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp @@ -444,7 +444,10 @@ LRESULT CALLBACK CMenuContainer::SubclassSearchBox( HWND hWnd, UINT uMsg, WPARAM SetBkColor(hdc,GetSysColor(COLOR_WINDOW)); SetBkMode(hdc,TRANSPARENT); SetTextColor(hdc,s_Skin.Search_text_colors[1]); - DrawText(hdc,pParent->m_Items[pParent->m_SearchIndex].name,-1,&rc,DT_SINGLELINE|DT_EDITCONTROL|(s_bRTL?DT_RIGHT:DT_LEFT)); + if (GetSettingBool(L"SearchHint")) + DrawText(hdc,GetSettingString(L"SearchHintText"),-1,&rc,DT_SINGLELINE|DT_EDITCONTROL|(s_bRTL?DT_RIGHT:DT_LEFT)); + else + DrawText(hdc,pParent->m_Items[pParent->m_SearchIndex].name,-1,&rc,DT_SINGLELINE|DT_EDITCONTROL|(s_bRTL?DT_RIGHT:DT_LEFT)); SelectObject(hdc,font0); } return res; diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index 68eea85fd..de0b5157f 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -4343,6 +4343,8 @@ CSetting g_Settings[]={ {L"Normal",CSetting::TYPE_RADIO,IDS_SEARCH_BOX_SHOW,IDS_SEARCH_BOX_SHOW_TIP}, {L"Tab",CSetting::TYPE_RADIO,IDS_SEARCH_BOX_TAB,IDS_SEARCH_BOX_TAB_TIP}, {L"SearchSelect",CSetting::TYPE_BOOL,IDS_SEARCH_BOX_SEL,IDS_SEARCH_BOX_SEL_TIP,1,0,L"SearchBox=1",L"Normal"}, + {L"SearchHint",CSetting::TYPE_BOOL,IDS_SEARCH_HINT,IDS_SEARCH_HINT_TIP,0,0,L"SearchBox"}, + {L"SearchHintText",CSetting::TYPE_STRING,IDS_NEW_SEARCH_HINT,IDS_NEW_SEARCH_HINT_TIP,L"",0,L"#SearchHint",L"SearchHint"}, {L"SearchTrack",CSetting::TYPE_BOOL,IDS_SEARCH_TRACK,IDS_SEARCH_TRACK_TIP,1,0,L"SearchBox"}, {L"SearchResults",CSetting::TYPE_INT,IDS_SEARCH_MAX2,IDS_SEARCH_MAX_TIP2,5,CSetting::FLAG_MENU_CLASSIC_BOTH,L"SearchBox"}, {L"SearchResultsMax",CSetting::TYPE_INT,IDS_SEARCH_MAX3,IDS_SEARCH_MAX_TIP3,20,CSetting::FLAG_MENU_CLASSIC_BOTH,L"SearchBox"}, diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc index f8b56f6fc..daf0a68fe 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc @@ -1301,6 +1301,10 @@ BEGIN IDS_NO_DBLCLICK_TIP "When this is checked, single-clicking shortcuts (links) to folders will open them in explorer. Hovering over the shortcut will still expand sub-menus" IDS_BOLD_SETTINGS "Highlight modified settings" IDS_BOLD_SETTINGS_TIP "When this is checked, settings that have been modified from their defaults will be highlighted in bold" + IDS_SEARCH_HINT "Custom search hint" + IDS_SEARCH_HINT_TIP "When this is checked, the hint text in the search box will be replaced" + IDS_NEW_SEARCH_HINT "Custom search hint text" + IDS_NEW_SEARCH_HINT_TIP "The text to replace the search hint with. Empty text is a valid option" END #endif // English (U.S.) resources diff --git a/Src/StartMenu/StartMenuDLL/resource.h b/Src/StartMenu/StartMenuDLL/resource.h index 0d33c1c15..1adc21d8a 100644 --- a/Src/StartMenu/StartMenuDLL/resource.h +++ b/Src/StartMenu/StartMenuDLL/resource.h @@ -764,6 +764,10 @@ #define IDS_NO_DBLCLICK_TIP 3667 #define IDS_BOLD_SETTINGS 3668 #define IDS_BOLD_SETTINGS_TIP 3669 +#define IDS_SEARCH_HINT 3670 +#define IDS_SEARCH_HINT_TIP 3671 +#define IDS_NEW_SEARCH_HINT 3672 +#define IDS_NEW_SEARCH_HINT_TIP 3673 #define IDS_STRING7001 7001 #define IDS_STRING7002 7002 #define IDS_STRING7003 7003 From be8568ce0091a4573198e4f818a012621f8ae9e9 Mon Sep 17 00:00:00 2001 From: thisismy-github <48284263+thisismy-github@users.noreply.github.com> Date: Thu, 12 Aug 2021 17:59:00 -0400 Subject: [PATCH 085/234] Added option to hide "see more results" in search Hides the item in both start menu styles and adjusts search height to ensure the empty space is used. Partially fixes #660, but currently does not honor group policy settings. --- Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 39 +++++++++++--------- Src/StartMenu/StartMenuDLL/MenuContainer.h | 1 + Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 1 + Src/StartMenu/StartMenuDLL/StartMenuDLL.rc | 2 + Src/StartMenu/StartMenuDLL/resource.h | 2 + 5 files changed, 28 insertions(+), 17 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp index 78915f4c9..b20452a8c 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp @@ -335,6 +335,7 @@ bool CMenuContainer::s_bDragMovable; bool CMenuContainer::s_bRightDrag; bool CMenuContainer::s_bLockWorkArea; bool CMenuContainer::s_bPendingSearchEnter; +bool CMenuContainer::s_bMoreResults; std::vector CMenuContainer::s_Menus; volatile HWND CMenuContainer::s_FirstMenu, CMenuContainer::s_SearchMenu; CSearchManager::SearchResults CMenuContainer::s_SearchResults; @@ -2745,9 +2746,9 @@ bool CMenuContainer::InitSearchItems( void ) { sepHeight=s_Skin.ItemSettings[s_Skin.More_bitmap_Size.cx?MenuSkin::LIST_SEPARATOR_SPLIT:MenuSkin::LIST_SEPARATOR].itemHeight; itemHeight=s_Skin.ItemSettings[MenuSkin::LIST_ITEM].itemHeight; - // total height minus the search box and the "more results"/"search internet" + // total height minus the search box and the "more results"/"search internet", if present maxHeight=m_Items[m_SearchIndex].itemRect.top-s_Skin.Main_search_padding.top-s_Skin.Search_padding.top; - maxHeight-=itemHeight*(m_SearchItemCount-1); + maxHeight-=itemHeight*(m_SearchItemCount-(s_bMoreResults?1:2)); if (!s_SearchResults.bSearching && !HasMoreResults()) maxHeight+=itemHeight; } @@ -2941,25 +2942,28 @@ bool CMenuContainer::InitSearchItems( void ) if (s_bWin7Style) { UpdateAccelerators(m_OriginalCount,(int)m_Items.size()); - MenuItem &item=m_Items[m_SearchIndex-m_SearchItemCount+1]; - if (s_SearchResults.bSearching) + if (s_bMoreResults) { - item.id=MENU_SEARCH_EMPTY; - item.name=FindTranslation(L"Menu.Searching",L"Searching..."); - item.pItemInfo=g_ItemManager.GetCustomIcon(L"imageres.dll,8",CItemManager::ICON_SIZE_TYPE_SMALL); - } - else - { - item.id=MENU_MORE_RESULTS; - item.name=FindTranslation(L"Menu.MoreResults",L"See more results"); - item.pItemInfo=g_ItemManager.GetCustomIcon(L"imageres.dll,177",CItemManager::ICON_SIZE_TYPE_SMALL); + MenuItem &item=m_Items[m_SearchIndex-m_SearchItemCount+1]; + if (s_SearchResults.bSearching) + { + item.id=MENU_SEARCH_EMPTY; + item.name=FindTranslation(L"Menu.Searching",L"Searching..."); + item.pItemInfo=g_ItemManager.GetCustomIcon(L"imageres.dll,8",CItemManager::ICON_SIZE_TYPE_SMALL); + } + else + { + item.id=MENU_MORE_RESULTS; + item.name=FindTranslation(L"Menu.MoreResults",L"See more results"); + item.pItemInfo=g_ItemManager.GetCustomIcon(L"imageres.dll,177",CItemManager::ICON_SIZE_TYPE_SMALL); + } } } else { m_ScrollCount=(int)m_Items.size(); - bool bInternet=GetSettingBool(L"SearchInternet"); - if (s_SearchResults.bSearching) + bool bInternet=GetSettingBool(L"SearchInternet"); + if (s_bMoreResults && s_SearchResults.bSearching) { MenuItem item(MENU_SEARCH_EMPTY); item.name=FindTranslation(L"Menu.Searching",L"Searching..."); @@ -2974,7 +2978,7 @@ bool CMenuContainer::InitSearchItems( void ) item.name=FindTranslation(L"Menu.NoMatch",L"No items match your search."); m_Items.push_back(item); } - if (HasMoreResults()) + if (s_bMoreResults && HasMoreResults()) { { MenuItem item(MENU_SEPARATOR); @@ -5062,7 +5066,7 @@ void CMenuContainer::UpdateSearchResults( bool bForceShowAll ) g_SearchManager.BeginSearch(s_SearchResults.currentString); s_SearchResults.bSearching=true; s_bPendingSearchEnter=false; - if (s_bWin7Style) + if (s_bWin7Style && s_bMoreResults) { MenuItem &item=m_Items[m_SearchIndex-m_SearchItemCount+1]; item.id=MENU_SEARCH_EMPTY; @@ -7694,6 +7698,7 @@ HWND CMenuContainer::ToggleStartMenu( int taskbarId, bool bKeyboard, bool bAllPr s_bDisableHover=false; s_bDragClosed=false; s_bPendingSearchEnter=false; + s_bMoreResults=GetSettingBool(L"MoreResults"); InitTouchHelper(); bool bRemote=GetSystemMetrics(SM_REMOTESESSION)!=0; diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.h b/Src/StartMenu/StartMenuDLL/MenuContainer.h index ad34beb27..84e36931c 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.h +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.h @@ -896,6 +896,7 @@ class CMenuContainer: public IDropTarget, public IFrameworkInputPaneHandler, pub static bool s_bRightDrag; // dragging with the right mouse button static bool s_bLockWorkArea; // changes to the work area are ignored static bool s_bPendingSearchEnter; // Enter was pressed before the search results were ready + static bool s_bMoreResults; // shows the "Show More Results" item at the bottom of searches static RECT s_MenuLimits; // area of the main monitor accessible to all menus static RECT s_MainMenuLimits; // area of the main monitor accessible by the main menu static DWORD s_TaskbarState; // the state of the taskbar (ABS_AUTOHIDE and ABS_ALWAYSONTOP) diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index de0b5157f..a037dfe69 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -4359,6 +4359,7 @@ CSetting g_Settings[]={ {L"SearchContents",CSetting::TYPE_BOOL,IDS_SEARCH_CONTENTS,IDS_SEARCH_CONTENTS_TIP,1,0,L"#SearchFiles",L"SearchFiles"}, {L"SearchCategories",CSetting::TYPE_BOOL,IDS_SEARCH_CATEGORIES,IDS_SEARCH_CATEGORIES_TIP,1,0,L"#SearchFiles",L"SearchFiles"}, {L"SearchInternet",CSetting::TYPE_BOOL,IDS_SEARCH_INTERNET,IDS_SEARCH_INTERNET_TIP,1,0,L"SearchBox"}, + {L"MoreResults",CSetting::TYPE_BOOL,IDS_MORE_RESULTS,IDS_MORE_RESULTS_TIP,1,0,L"SearchBox"}, {L"Look",CSetting::TYPE_GROUP,IDS_LOOK_SETTINGS}, {L"SmallIconSize",CSetting::TYPE_INT,IDS_SMALL_SIZE_SM,IDS_SMALL_SIZE_SM_TIP,-1,CSetting::FLAG_COLD}, // 16 for DPI<=96, 20 for DPI<=120, 24 otherwise diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc index daf0a68fe..c857c0e20 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc @@ -1305,6 +1305,8 @@ BEGIN IDS_SEARCH_HINT_TIP "When this is checked, the hint text in the search box will be replaced" IDS_NEW_SEARCH_HINT "Custom search hint text" IDS_NEW_SEARCH_HINT_TIP "The text to replace the search hint with. Empty text is a valid option" + IDS_MORE_RESULTS "Enable ""See more results"" option" + IDS_MORE_RESULTS_TIP "When this is checked, the search results will include an option to do a more advanced search" END #endif // English (U.S.) resources diff --git a/Src/StartMenu/StartMenuDLL/resource.h b/Src/StartMenu/StartMenuDLL/resource.h index 1adc21d8a..daeabf246 100644 --- a/Src/StartMenu/StartMenuDLL/resource.h +++ b/Src/StartMenu/StartMenuDLL/resource.h @@ -768,6 +768,8 @@ #define IDS_SEARCH_HINT_TIP 3671 #define IDS_NEW_SEARCH_HINT 3672 #define IDS_NEW_SEARCH_HINT_TIP 3673 +#define IDS_MORE_RESULTS 3674 +#define IDS_MORE_RESULTS_TIP 3675 #define IDS_STRING7001 7001 #define IDS_STRING7002 7002 #define IDS_STRING7003 7003 From ef663d2051956ed7e6405b2be82cde2b4e4bf877 Mon Sep 17 00:00:00 2001 From: thisismy-github <48284263+thisismy-github@users.noreply.github.com> Date: Sat, 14 Aug 2021 21:19:32 -0400 Subject: [PATCH 086/234] Added option to set custom commands for controls Includes a unique option for each control and supports environment variables. --- Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 12 +++++ Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp | 51 +++++++++++++++++++++ Src/StartMenu/StartMenuDLL/StartMenuDLL.rc | 4 ++ Src/StartMenu/StartMenuDLL/resource.h | 4 ++ 4 files changed, 71 insertions(+) diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index a037dfe69..ac9c606d9 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -4154,38 +4154,50 @@ CSetting g_Settings[]={ {L"Nothing",CSetting::TYPE_RADIO,IDS_OPEN_NOTHING,IDS_OPEN_NOTHING_TIP}, {L"ClassicMenu",CSetting::TYPE_RADIO,IDS_OPEN_CSM,IDS_OPEN_CSM_TIP}, {L"WindowsMenu",CSetting::TYPE_RADIO,IDS_OPEN_WSM,IDS_OPEN_WSM_TIP}, + {L"Command",CSetting::TYPE_RADIO,IDS_OPEN_CMD,IDS_OPEN_CMD_TIP}, {L"Both",CSetting::TYPE_RADIO,IDS_OPEN_BOTH,IDS_OPEN_BOTH_TIP,0,CSetting::FLAG_HIDDEN}, + {L"MouseClickCommand",CSetting::TYPE_STRING,IDS_OPEN_CMD_TEXT,IDS_OPEN_CMD_TEXT_TIP,"%userprofile%",0,L"MouseClick=3",L"Command"}, {L"ShiftClick",CSetting::TYPE_INT,IDS_SHIFT_LCLICK,IDS_SHIFT_LCLICK_TIP,2,CSetting::FLAG_BASIC}, {L"Nothing",CSetting::TYPE_RADIO,IDS_OPEN_NOTHING,IDS_OPEN_NOTHING_TIP}, {L"ClassicMenu",CSetting::TYPE_RADIO,IDS_OPEN_CSM,IDS_OPEN_CSM_TIP}, {L"WindowsMenu",CSetting::TYPE_RADIO,IDS_OPEN_WSM,IDS_OPEN_WSM_TIP}, + {L"Command",CSetting::TYPE_RADIO,IDS_OPEN_CMD,IDS_OPEN_CMD_TIP}, {L"Both",CSetting::TYPE_RADIO,IDS_OPEN_BOTH,IDS_OPEN_BOTH_TIP,0,CSetting::FLAG_HIDDEN}, /* {L"Desktop",CSetting::TYPE_RADIO,IDS_OPEN_DESKTOP,IDS_OPEN_DESKTOP_TIP,0,CSetting::FLAG_HIDDEN}, {L"Cortana",CSetting::TYPE_RADIO,IDS_OPEN_CORTANA,IDS_OPEN_CORTANA_TIP},*/ + {L"ShiftClickCommand",CSetting::TYPE_STRING,IDS_OPEN_CMD_TEXT,IDS_OPEN_CMD_TEXT_TIP,"%systemdrive%",0,L"ShiftClick=3",L"Command"}, {L"WinKey",CSetting::TYPE_INT,IDS_WIN_KEY,IDS_WIN_KEY_TIP,1,CSetting::FLAG_BASIC}, {L"Nothing",CSetting::TYPE_RADIO,IDS_OPEN_NOTHING,IDS_OPEN_NOTHING_TIP}, {L"ClassicMenu",CSetting::TYPE_RADIO,IDS_OPEN_CSM,IDS_OPEN_CSM_TIP}, {L"WindowsMenu",CSetting::TYPE_RADIO,IDS_OPEN_WSM,IDS_OPEN_WSM_TIP}, + {L"Command",CSetting::TYPE_RADIO,IDS_OPEN_CMD,IDS_OPEN_CMD_TIP}, {L"Both",CSetting::TYPE_RADIO,IDS_OPEN_BOTH,IDS_OPEN_BOTH_TIP}, {L"Desktop",CSetting::TYPE_RADIO,IDS_OPEN_DESKTOP,IDS_OPEN_DESKTOP_TIP}, + {L"WinKeyCommand",CSetting::TYPE_STRING,IDS_OPEN_CMD_TEXT,IDS_OPEN_CMD_TEXT_TIP,"cmd",0,L"WinKey=3",L"Command"}, {L"ShiftWin",CSetting::TYPE_INT,IDS_SHIFT_WIN,IDS_SHIFT_WIN_TIP,2,CSetting::FLAG_BASIC}, {L"Nothing",CSetting::TYPE_RADIO,IDS_OPEN_NOTHING,IDS_OPEN_NOTHING_TIP}, {L"ClassicMenu",CSetting::TYPE_RADIO,IDS_OPEN_CSM,IDS_OPEN_CSM_TIP}, {L"WindowsMenu",CSetting::TYPE_RADIO,IDS_OPEN_WSM,IDS_OPEN_WSM_TIP}, + {L"Command",CSetting::TYPE_RADIO,IDS_OPEN_CMD,IDS_OPEN_CMD_TIP}, {L"Both",CSetting::TYPE_RADIO,IDS_OPEN_BOTH,IDS_OPEN_BOTH_TIP}, /* {L"Desktop",CSetting::TYPE_RADIO,IDS_OPEN_DESKTOP,IDS_OPEN_DESKTOP_TIP,0,CSetting::FLAG_HIDDEN}, {L"Cortana",CSetting::TYPE_RADIO,IDS_OPEN_CORTANA,IDS_OPEN_CORTANA_TIP},*/ + {L"ShiftWinCommand",CSetting::TYPE_STRING,IDS_OPEN_CMD_TEXT,IDS_OPEN_CMD_TEXT_TIP,"powershell",0,L"ShiftWin=3",L"Command"}, {L"MiddleClick",CSetting::TYPE_INT,IDS_MCLICK,IDS_MCLICK_TIP,0}, {L"Nothing",CSetting::TYPE_RADIO,IDS_OPEN_NOTHING,IDS_OPEN_NOTHING_TIP}, {L"ClassicMenu",CSetting::TYPE_RADIO,IDS_OPEN_CSM,IDS_OPEN_CSM_TIP}, {L"WindowsMenu",CSetting::TYPE_RADIO,IDS_OPEN_WSM,IDS_OPEN_WSM_TIP}, + {L"Command",CSetting::TYPE_RADIO,IDS_OPEN_CMD,IDS_OPEN_CMD_TIP}, /* {L"Both",CSetting::TYPE_RADIO,IDS_OPEN_BOTH,IDS_OPEN_BOTH_TIP,0,CSetting::FLAG_HIDDEN}, {L"Desktop",CSetting::TYPE_RADIO,IDS_OPEN_DESKTOP,IDS_OPEN_DESKTOP_TIP,0,CSetting::FLAG_HIDDEN}, {L"Cortana",CSetting::TYPE_RADIO,IDS_OPEN_CORTANA,IDS_OPEN_CORTANA_TIP},*/ + {L"MiddleClickCommand",CSetting::TYPE_STRING,IDS_OPEN_CMD_TEXT,IDS_OPEN_CMD_TEXT_TIP,"taskmgr",0,L"MiddleClick=3",L"Command"}, {L"Hover",CSetting::TYPE_INT,IDS_HOVER,IDS_HOVER_TIP,0}, {L"Nothing",CSetting::TYPE_RADIO,IDS_OPEN_NOTHING,IDS_OPEN_NOTHING_TIP}, {L"ClassicMenu",CSetting::TYPE_RADIO,IDS_OPEN_CSM,IDS_OPEN_CSM_TIP}, {L"WindowsMenu",CSetting::TYPE_RADIO,IDS_OPEN_WSM,IDS_OPEN_WSM_TIP}, + {L"Command",CSetting::TYPE_RADIO,IDS_OPEN_CMD,IDS_OPEN_CMD_TIP}, + {L"HoverCommand",CSetting::TYPE_STRING,IDS_OPEN_CMD_TEXT,IDS_OPEN_CMD_TEXT_TIP,"",0,L"Hover=3",L"Command"}, {L"StartHoverDelay",CSetting::TYPE_INT,IDS_HOVER_DELAY,IDS_HOVER_DELAY_TIP,1000,0,L"Hover",L"Hover"}, {L"ShiftRight",CSetting::TYPE_BOOL,IDS_RIGHT_SHIFT,IDS_RIGHT_SHIFT_TIP,0}, {L"CSMHotkey",CSetting::TYPE_HOTKEY,IDS_CSM_HOTKEY,IDS_CSM_HOTKEY_TIP,0}, diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp index fa5bc3e5c..feef6452d 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp @@ -79,6 +79,7 @@ enum OPEN_NOTHING, OPEN_CLASSIC, OPEN_WINDOWS, + OPEN_CUSTOM, OPEN_BOTH, OPEN_DESKTOP, OPEN_CORTANA, @@ -3348,6 +3349,16 @@ static LRESULT CALLBACK HookProgManThread( int code, WPARAM wParam, LPARAM lPara msg->message=WM_NULL; if (control==OPEN_CLASSIC) PostMessage(g_TaskBar,g_StartMenuMsg,MSG_TOGGLE,0); + else if (control==OPEN_CUSTOM) + { + CString commandText=GetSettingString(L"WinKeyCommand"); + if (!commandText.IsEmpty()) + { + wchar_t expandedCommand[_MAX_PATH]{}; + ::ExpandEnvironmentStrings(commandText, expandedCommand, _countof(expandedCommand)); + ShellExecute(NULL,NULL,expandedCommand,NULL,NULL,SW_SHOWNORMAL); + } + } } } } @@ -3431,6 +3442,16 @@ if (!g_bTrimHooks) PostMessage(g_ProgWin,WM_SYSCOMMAND,SC_TASKLIST,'WSMK'); else if (control==OPEN_CORTANA) OpenCortana(); + else if (control==OPEN_CUSTOM) + { + CString commandText=GetSettingString(L"ShiftWinCommand"); + if (!commandText.IsEmpty()) + { + wchar_t expandedCommand[_MAX_PATH]{}; + ::ExpandEnvironmentStrings(commandText, expandedCommand, _countof(expandedCommand)); + ShellExecute(NULL,NULL,expandedCommand,NULL,NULL,SW_SHOWNORMAL); + } + } } else if (msg->wParam==MSG_DRAG || msg->wParam==MSG_SHIFTDRAG) { @@ -3590,12 +3611,22 @@ if (!g_bTrimHooks) // left or middle click on start button FindWindowsMenu(); const wchar_t *name; + const wchar_t *command; if (bMiddle) + { name=L"MiddleClick"; + command=L"MiddleClickCommand"; + } else if (GetKeyState(VK_SHIFT)<0) + { name=L"ShiftClick"; + command=L"ShiftClickCommand"; + } else + { name=L"MouseClick"; + command=L"MouseClickCommand"; + } int control=GetSettingInt(name); if (control==OPEN_BOTH && GetWinVersion()>=WIN_VER_WIN10) @@ -3611,6 +3642,16 @@ if (!g_bTrimHooks) PostMessage(g_ProgWin,WM_SYSCOMMAND,SC_TASKLIST,'WSMM'); else if (control==OPEN_CORTANA) OpenCortana(); + else if (control==OPEN_CUSTOM) + { + CString commandText=GetSettingString(command); + if (!commandText.IsEmpty()) + { + wchar_t expandedCommand[_MAX_PATH]{}; + ::ExpandEnvironmentStrings(commandText, expandedCommand, _countof(expandedCommand)); + ShellExecute(NULL,NULL,expandedCommand,NULL,NULL,SW_SHOWNORMAL); + } + } msg->message=WM_NULL; } } @@ -3751,6 +3792,16 @@ if (!g_bTrimHooks) FindWindowsMenu(); PostMessage(g_ProgWin,WM_SYSCOMMAND,SC_TASKLIST,'WSMM'); } + else if (control==OPEN_CUSTOM) + { + CString commandText=GetSettingString(L"HoverCommand"); + if (!commandText.IsEmpty()) + { + wchar_t expandedCommand[_MAX_PATH]{}; + ::ExpandEnvironmentStrings(commandText, expandedCommand, _countof(expandedCommand)); + ShellExecute(NULL,NULL,expandedCommand,NULL,NULL,SW_SHOWNORMAL); + } + } } } taskBar->bTimer=false; diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc index c857c0e20..bb4c5727e 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc @@ -1307,6 +1307,10 @@ BEGIN IDS_NEW_SEARCH_HINT_TIP "The text to replace the search hint with. Empty text is a valid option" IDS_MORE_RESULTS "Enable ""See more results"" option" IDS_MORE_RESULTS_TIP "When this is checked, the search results will include an option to do a more advanced search" + IDS_OPEN_CMD "Custom command" + IDS_OPEN_CMD_TIP "The action will run a user-defined command" + IDS_OPEN_CMD_TEXT "Command to run" + IDS_OPEN_CMD_TEXT_TIP "Enter the command to run when you use this control" END #endif // English (U.S.) resources diff --git a/Src/StartMenu/StartMenuDLL/resource.h b/Src/StartMenu/StartMenuDLL/resource.h index daeabf246..be605837f 100644 --- a/Src/StartMenu/StartMenuDLL/resource.h +++ b/Src/StartMenu/StartMenuDLL/resource.h @@ -770,6 +770,10 @@ #define IDS_NEW_SEARCH_HINT_TIP 3673 #define IDS_MORE_RESULTS 3674 #define IDS_MORE_RESULTS_TIP 3675 +#define IDS_OPEN_CMD 3676 +#define IDS_OPEN_CMD_TIP 3677 +#define IDS_OPEN_CMD_TEXT 3678 +#define IDS_OPEN_CMD_TEXT_TIP 3679 #define IDS_STRING7001 7001 #define IDS_STRING7002 7002 #define IDS_STRING7003 7003 From bb26cec0ecbdca0350e7c1474eec32954d18d14d Mon Sep 17 00:00:00 2001 From: thisismy-github <48284263+thisismy-github@users.noreply.github.com> Date: Mon, 16 Aug 2021 12:41:06 -0400 Subject: [PATCH 087/234] Added option to single-expand any Win7 style item Expands the "display as a list of drives" option from This PC to work on almost any item in the Windows 7 style. Incompatible items have a new setting called ITEM_NODRIVES which blocks the option from appearing. This PC still uses the original "list of drives" text, while other items use "list of links" instead. Sorting has been updated to account for this option by adding a property called bFolderLink which marks any folder, even if it is not explicitly expandable. --- Src/StartMenu/StartMenuDLL/CustomMenu.cpp | 10 +++++----- Src/StartMenu/StartMenuDLL/CustomMenu.h | 1 + Src/StartMenu/StartMenuDLL/DragDrop.cpp | 2 +- Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 7 ++++--- Src/StartMenu/StartMenuDLL/MenuContainer.h | 16 +++++++++------- Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 16 ++++++++++++---- Src/StartMenu/StartMenuDLL/StartMenuDLL.rc | 2 ++ Src/StartMenu/StartMenuDLL/resource.h | 2 ++ 8 files changed, 36 insertions(+), 20 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/CustomMenu.cpp b/Src/StartMenu/StartMenuDLL/CustomMenu.cpp index 8d8785e38..574669c47 100644 --- a/Src/StartMenu/StartMenuDLL/CustomMenu.cpp +++ b/Src/StartMenu/StartMenuDLL/CustomMenu.cpp @@ -95,13 +95,13 @@ CStdCommand7 g_StdCommands7[]={ {L"user_videos",0,NULL,L"$Menu.UserVideosTip",NULL,&FOLDERID_Videos}, {L"control_panel",0,L"$Menu.ControlPanel",L"$Menu.ControlPanelTip",NULL,&FOLDERID_ControlPanelFolder,NULL,StdMenuItem::MENU_TRACK}, {L"pc_settings",IDS_PCSETTINGS,L"$Menu.PCSettings",L"",L"%windir%\\ImmersiveControlPanel\\SystemSettings.exe,10",NULL,NULL,StdMenuItem::MENU_TRACK,CStdCommand7::ITEM_SINGLE}, - {L"network_connections",0,NULL,L"$Menu.NetworkTip",NULL,&FOLDERID_ConnectionsFolder}, + {L"network_connections",0,NULL,L"$Menu.NetworkTip",NULL,&FOLDERID_ConnectionsFolder,NULL,0,CStdCommand7::ITEM_NODRIVES}, {L"network",0,NULL,NULL,NULL,&FOLDERID_NetworkFolder,NULL,0,CStdCommand7::ITEM_SINGLE}, - {L"printers",0,NULL,L"$Menu.PrintersTip",NULL,&FOLDERID_PrintersFolder}, + {L"printers",0,NULL,L"$Menu.PrintersTip",NULL,&FOLDERID_PrintersFolder,NULL,0,CStdCommand7::ITEM_NODRIVES}, {L"fonts",0,NULL,NULL,NULL,&FOLDERID_Fonts}, {L"desktop",0,NULL,NULL,NULL,&FOLDERID_Desktop}, - {L"admin",0,NULL,L"$Menu.AdminToolsTip",L"imageres.dll,114",&FOLDERID_CommonAdminTools,NULL,StdMenuItem::MENU_TRACK}, - {L"startup",0,NULL,NULL,NULL,&FOLDERID_Startup,NULL,StdMenuItem::MENU_TRACK}, + {L"admin",0,NULL,L"$Menu.AdminToolsTip",L"imageres.dll,114",&FOLDERID_CommonAdminTools,NULL,StdMenuItem::MENU_TRACK,CStdCommand7::ITEM_NODRIVES}, + {L"startup",0,NULL,NULL,NULL,&FOLDERID_Startup,NULL,StdMenuItem::MENU_TRACK,CStdCommand7::ITEM_NODRIVES}, {L"downloads",0,NULL,L"$Menu.DownloadTip",NULL,&FOLDERID_Downloads}, {L"games",0,NULL,L"$Menu.GamesTip",NULL,&FOLDERID_Games,NULL,StdMenuItem::MENU_TRACK}, {L"links",0,NULL,NULL,NULL,&FOLDERID_Links}, @@ -112,7 +112,7 @@ CStdCommand7 g_StdCommands7[]={ {L"lib_videos",IDS_LIB_VIDEOS_ITEM,NULL,L"$Menu.VideosLibTip",NULL,&FOLDERID_VideosLibrary}, {L"lib_tv",IDS_LIB_TV_ITEM,NULL,L"$Menu.RecordingsLibTip",NULL,&FOLDERID_RecordedTVLibrary}, {L"homegroup",0,NULL,L"$Menu.HomegroupTip",NULL,&FOLDERID_HomeGroup,NULL,0,CStdCommand7::ITEM_SINGLE}, - {L"devices",0,NULL,NULL,NULL,NULL,L"::{26EE0668-A00A-44D7-9371-BEB064C98683}\\0\\::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}, + {L"devices",0,NULL,NULL,NULL,NULL,L"::{26EE0668-A00A-44D7-9371-BEB064C98683}\\0\\::{A8A91A66-3A7D-4424-8D24-04E180695C7A}",0,CStdCommand7::ITEM_NODRIVES}, {L"defaults",0,NULL,NULL,NULL,NULL,L"::{26EE0668-A00A-44D7-9371-BEB064C98683}\\0\\::{17CD9488-1228-4B2F-88CE-4298E93E0966}",0,CStdCommand7::ITEM_SINGLE}, {L"apps",IDS_METRO_APPS,L"$Menu.Apps",NULL,L",2",NULL,NULL,StdMenuItem::MENU_TRACK,CStdCommand7::ITEM_FOLDER}, diff --git a/Src/StartMenu/StartMenuDLL/CustomMenu.h b/Src/StartMenu/StartMenuDLL/CustomMenu.h index f2cec3f44..8ecc02df4 100644 --- a/Src/StartMenu/StartMenuDLL/CustomMenu.h +++ b/Src/StartMenu/StartMenuDLL/CustomMenu.h @@ -15,6 +15,7 @@ struct CStdCommand7 ITEM_SINGLE=1, // this item never has sub-menu ITEM_FOLDER=2, // this item always has sub-menu ITEM_COMPUTER=4, // this item can be expanded only one level + ITEM_NODRIVES=8, // this item can never be expanded only one level }; const wchar_t *command; int nameID; diff --git a/Src/StartMenu/StartMenuDLL/DragDrop.cpp b/Src/StartMenu/StartMenuDLL/DragDrop.cpp index 7b3262db8..b59865eea 100644 --- a/Src/StartMenu/StartMenuDLL/DragDrop.cpp +++ b/Src/StartMenu/StartMenuDLL/DragDrop.cpp @@ -903,7 +903,7 @@ HRESULT STDMETHODCALLTYPE CMenuContainer::Drop( IDataObject *pDataObj, DWORD grf else if (i if (bLibrary) flags&=~SFGAO_STREAM; item.bLink=(flags&SFGAO_LINK)!=0; - item.bFolder=(!(options&CONTAINER_CONTROLPANEL) && !(options&CONTAINER_NOSUBFOLDERS) && (flags&SFGAO_FOLDER) && (!(flags&(SFGAO_STREAM|SFGAO_LINK)) || (s_bExpandLinks && item.bLink))); + item.bFolderLink=(flags&SFGAO_FOLDER && (!(flags&(SFGAO_STREAM|SFGAO_LINK)) || (s_bExpandLinks && item.bLink))); + item.bFolder=(!(options&CONTAINER_CONTROLPANEL) && !(options&CONTAINER_NOSUBFOLDERS) && item.bFolderLink); { CItemManager::RWLock lock(&g_ItemManager,false,CItemManager::RWLOCK_ITEMS); if (item.pItemInfo->IsMetroLink()) @@ -2505,9 +2506,9 @@ void CMenuContainer::InitItems( void ) m_Items.resize(MAX_MENU_ITEMS); } - if (m_Options&CONTAINER_CONTROLPANEL) + if (m_Options&CONTAINER_CONTROLPANEL && !(m_Options&CONTAINER_NOSUBFOLDERS)) { - // expand Administrative Tools. must be done after the sorting because we don't want the folder to jump to the top + // expand Administrative Tools when displaying as a menu. must be done after the sorting because we don't want the folder to jump to the top unsigned int AdminToolsHash=CalcFNVHash(L"::{D20EA4E1-3957-11D2-A40B-0C5020524153}"); for (std::vector::iterator it=m_Items.begin();it!=m_Items.end();++it) if (it->nameHash==AdminToolsHash) diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.h b/Src/StartMenu/StartMenuDLL/MenuContainer.h index 84e36931c..d98210934 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.h +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.h @@ -453,7 +453,7 @@ class CMenuContainer: public IDropTarget, public IFrameworkInputPaneHandler, pub drawType=MenuSkin::COLUMN1_ITEM; column=row=0; memset(&itemRect,0,sizeof(itemRect)); - bFolder=bLink=bPrograms=bAlignBottom=bBreak=bInline=bInlineFirst=bInlineLast=bSplit=bHasJumpList=bMetroLink=bMetroApp=bBlankSeparator=bNew=bStartScreen=bCustomAccelerator=false; + bFolder=bLink=bFolderLink=bPrograms=bAlignBottom=bBreak=bInline=bInlineFirst=bInlineLast=bSplit=bHasJumpList=bMetroLink=bMetroApp=bBlankSeparator=bNew=bStartScreen=bCustomAccelerator=false; priority=0; pItem1=pItem2=NULL; mfuHash=0; @@ -477,6 +477,7 @@ class CMenuContainer: public IDropTarget, public IFrameworkInputPaneHandler, pub RECT itemRect; bool bFolder:1; // this is a folder - draw arrow bool bLink:1; // this is a link (if a link to a folder is expanded it is always single-column) + bool bFolderLink:1; // this is a folder that is not explicitly expandable - used for sorting the list-of-links style bool bPrograms:1; // this item is part of the Start Menu folder hierarchy bool bAlignBottom:1; // two-column menu: this item is aligned to the bottom bool bBreak:1; // two-column menu: this item starts the second column @@ -512,8 +513,8 @@ class CMenuContainer: public IDropTarget, public IFrameworkInputPaneHandler, pub if (priority>item.priority) return false; if (rowitem.row) return false; - if ((bFolder && !bHasJumpList) && !(item.bFolder && !item.bHasJumpList)) return true; - if (!(bFolder && !bHasJumpList) && (item.bFolder && !item.bHasJumpList)) return false; + if (((bFolder || bFolderLink) && !bHasJumpList) && !((item.bFolder || item.bFolderLink) && !item.bHasJumpList)) return true; + if (!((bFolder || bFolderLink) && !bHasJumpList) && ((item.bFolder || item.bFolderLink) && !item.bHasJumpList)) return false; if (drive && !item.drive) return true; if (!drive && item.drive) return false; if (drive && item.drive) return drivex.priority) return false; - if ((bFolder && !bHasJumpList) && !(x.bFolder && !x.bHasJumpList)) return true; - if (!(bFolder && !bHasJumpList) && (x.bFolder && !x.bHasJumpList)) return false; + if (((bFolder || bFolderLink) && !bHasJumpList) && !((x.bFolder || x.bFolderLink) && !x.bHasJumpList)) return true; + if (!((bFolder || bFolderLink) && !bHasJumpList) && ((x.bFolder || x.bFolderLink) && !x.bHasJumpList)) return false; if (drive && !x.drive) return true; if (!drive && x.drive) return false; if (drive && x.drive) return drive Date: Thu, 19 Aug 2021 14:21:11 -0400 Subject: [PATCH 088/234] Added option to open folders to their true path Adds a new function called GetFakeFolder which attempts to find and get the target.lnk file from a fake folder (what Open-Shell uses to pin folders). If detected, InvokeCommand is swapped for a ShellExecute call to the target shortcut. Fixes #555, #653, and by extension, #691. --- Src/Lib/FileHelper.cpp | 14 ++++++++++ Src/Lib/FileHelper.h | 1 + Src/StartMenu/StartMenuDLL/MenuCommands.cpp | 31 +++++++++++++++++---- Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 1 + Src/StartMenu/StartMenuDLL/StartMenuDLL.rc | 6 ++++ Src/StartMenu/StartMenuDLL/resource.h | 2 ++ 6 files changed, 49 insertions(+), 6 deletions(-) diff --git a/Src/Lib/FileHelper.cpp b/Src/Lib/FileHelper.cpp index 2d928f849..7d6664edb 100644 --- a/Src/Lib/FileHelper.cpp +++ b/Src/Lib/FileHelper.cpp @@ -60,3 +60,17 @@ bool IsFakeFolder( const wchar_t *fname ) } return false; } + +bool GetFakeFolder( wchar_t *dst, int len, const wchar_t *src ) +{ + Sprintf(dst,len,L"%s\\target.lnk",src); + if (GetFileAttributes(dst)!=INVALID_FILE_ATTRIBUTES) + { + wchar_t path[_MAX_PATH]; + Sprintf(path,_countof(path),L"%s\\desktop.ini",src); + DWORD attrib=GetFileAttributes(path); + if (attrib!=INVALID_FILE_ATTRIBUTES && (attrib&FILE_ATTRIBUTE_SYSTEM)) + return true; + } + return false; +} diff --git a/Src/Lib/FileHelper.h b/Src/Lib/FileHelper.h index 4d33ffc6a..2a5b20bbd 100644 --- a/Src/Lib/FileHelper.h +++ b/Src/Lib/FileHelper.h @@ -7,3 +7,4 @@ bool CreateFakeFolder( const wchar_t *source, const wchar_t *fname ); void DeleteFakeFolder( const wchar_t *fname ); bool IsFakeFolder( const wchar_t *fname ); +bool GetFakeFolder( wchar_t *dst, int len, const wchar_t *src ); diff --git a/Src/StartMenu/StartMenuDLL/MenuCommands.cpp b/Src/StartMenu/StartMenuDLL/MenuCommands.cpp index 2f6acd026..3f949f27b 100644 --- a/Src/StartMenu/StartMenuDLL/MenuCommands.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuCommands.cpp @@ -11,6 +11,7 @@ #include "Settings.h" #include "SettingsUI.h" #include "SettingsUIHelper.h" +#include "FileHelper.h" #include "Translations.h" #include "LogManager.h" #include "FNVHash.h" @@ -2782,12 +2783,19 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p info.lpVerb=MAKEINTRESOURCEA(res-verbOffset); info.lpVerbW=MAKEINTRESOURCEW(res-verbOffset); info.nShow=SW_SHOWNORMAL; + bool bOpenTruePath=false; + wchar_t targetlnkPath[_MAX_PATH]; // path to target.lnk in a fake folder wchar_t dir[_MAX_PATH]; if (SHGetPathFromIDList(pItemPidl1,dir)) { - PathRemoveFileSpec(dir); - if (GetFileAttributes(dir)!=INVALID_FILE_ATTRIBUTES) - info.lpDirectoryW=dir; + if (_stricmp(command,"open")==0 && GetSettingBool(L"OpenTruePath") && GetFakeFolder(targetlnkPath,_countof(targetlnkPath),dir)) + bOpenTruePath=true; + else + { + PathRemoveFileSpec(dir); + if (GetFileAttributes(dir)!=INVALID_FILE_ATTRIBUTES) + info.lpDirectoryW=dir; + } } if (pPt) { @@ -2818,9 +2826,20 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p ::SetForegroundWindow(g_OwnerWindow); ::SetWindowPos(g_OwnerWindow,HWND_TOPMOST,rc.left,rc.top,rc.right-rc.left,rc.bottom-rc.top,0); LOG_MENU(LOG_EXECUTE,L"Invoke command, ptr=%p, command='%S'",this,command); - HRESULT hr=pInvokeMenu->InvokeCommand((LPCMINVOKECOMMANDINFO)&info); - LOG_MENU(LOG_EXECUTE,L"Invoke command, ptr=%p, res=%d",this,hr); - if (type==ACTIVATE_EXECUTE && SUCCEEDED(hr)) + bool executeSuccess; + if (bOpenTruePath) // we are trying to open a fake folder, directly open target.lnk instead + { + HINSTANCE hinst=ShellExecute(NULL,NULL,targetlnkPath,NULL,NULL,SW_SHOWNORMAL); + LOG_MENU(LOG_EXECUTE,L"Invoke command, ptr=%p, res=%d",this,hinst); + executeSuccess=static_cast(reinterpret_cast(hinst))>=32; + } + else + { + HRESULT hr=pInvokeMenu->InvokeCommand((LPCMINVOKECOMMANDINFO)&info); + LOG_MENU(LOG_EXECUTE,L"Invoke command, ptr=%p, res=%d",this,hr); + executeSuccess=SUCCEEDED(hr); + } + if (type==ACTIVATE_EXECUTE && executeSuccess) { if (bTrackRecent) { diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index 2473a36d5..98f563fac 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -4349,6 +4349,7 @@ CSetting g_Settings[]={ {L"SearchFilesCommand",CSetting::TYPE_STRING,IDS_SEARCH_COMMAND,IDS_SEARCH_COMMAND_TIP,L"search-ms:",CSetting::FLAG_MENU_CLASSIC_BOTH}, {L"ExpandFolderLinks",CSetting::TYPE_BOOL,IDS_EXPAND_LINKS,IDS_EXPAND_LINKS_TIP,1}, {L"SingleClickFolders",CSetting::TYPE_BOOL,IDS_NO_DBLCLICK,IDS_NO_DBLCLICK_TIP,0}, + {L"OpenTruePath",CSetting::TYPE_BOOL,IDS_OPEN_TRUE_PATH,IDS_OPEN_TRUE_PATH_TIP,1}, {L"EnableTouch",CSetting::TYPE_BOOL,IDS_ENABLE_TOUCH,IDS_ENABLE_TOUCH_TIP,1}, {L"EnableAccessibility",CSetting::TYPE_BOOL,IDS_ACCESSIBILITY,IDS_ACCESSIBILITY_TIP,1}, {L"ShowNextToTaskbar",CSetting::TYPE_BOOL,IDS_NEXTTASKBAR,IDS_NEXTTASKBAR_TIP,0}, diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc index 52fb7259c..57feae1a6 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc @@ -1315,6 +1315,12 @@ BEGIN IDS_ITEM_LINKS_TIP "This item will appear as a sub-menu showing only its top-level contents" END +STRINGTABLE +BEGIN + IDS_OPEN_TRUE_PATH "Open pinned folders to their true path" + IDS_OPEN_TRUE_PATH_TIP "When this is checked, pinned folders will open to their true path instead of the path to their shortcut in the Pinned Programs folder" +END + #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/Src/StartMenu/StartMenuDLL/resource.h b/Src/StartMenu/StartMenuDLL/resource.h index 8cdf1b0ec..e5fa09934 100644 --- a/Src/StartMenu/StartMenuDLL/resource.h +++ b/Src/StartMenu/StartMenuDLL/resource.h @@ -776,6 +776,8 @@ #define IDS_OPEN_CMD_TEXT_TIP 3679 #define IDS_ITEM_LINKS 3680 #define IDS_ITEM_LINKS_TIP 3681 +#define IDS_OPEN_TRUE_PATH 3682 +#define IDS_OPEN_TRUE_PATH_TIP 3683 #define IDS_STRING7001 7001 #define IDS_STRING7002 7002 #define IDS_STRING7003 7003 From 8031739110555868e596aa9118f25d9b11287caa Mon Sep 17 00:00:00 2001 From: thisismy-github <48284263+thisismy-github@users.noreply.github.com> Date: Thu, 19 Aug 2021 18:52:06 -0400 Subject: [PATCH 089/234] Added option to customize Pinned folder location Items can be pinned to directories that require administative privileges (such as Open-Shell's default installation directory), so long as users take ownership of the pinned folder. Also adds a command to Open-Shell's context menu that opens the current pinned folder. Adds general support for directory-based settings by creating a new setting type called TYPE_DIRECTORY which uses a new bool added to BrowseLinkHelper, called bFoldersOnly. START_MENU_PINNED_ROOT has been removed, and all instances of both it and BrowseLinkHelper have been adjusted accordingly. To create your own directory-based settings, use CSetting::TYPE_DIRECTORY. Empty directory paths are reset to their default value as they can cause unexpected behavior. --- Src/ClassicExplorer/SettingsUI.cpp | 2 +- Src/Lib/Settings.cpp | 10 +-- Src/Lib/Settings.h | 1 + Src/Lib/SettingsUIHelper.cpp | 71 +++++++++++++++---- Src/Lib/SettingsUIHelper.h | 2 +- Src/StartMenu/StartMenuDLL/ItemManager.cpp | 5 +- Src/StartMenu/StartMenuDLL/ItemManager.h | 1 - Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 6 +- Src/StartMenu/StartMenuDLL/SearchManager.cpp | 3 +- Src/StartMenu/StartMenuDLL/SettingsUI.cpp | 5 +- Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp | 13 ++++ Src/StartMenu/StartMenuDLL/StartMenuDLL.rc | 4 +- Src/StartMenu/StartMenuDLL/resource.h | 2 + .../StartMenuHelper/StartMenuExt.cpp | 2 +- Src/StartMenu/StartMenuHelper/dllmain.cpp | 1 + 15 files changed, 99 insertions(+), 29 deletions(-) diff --git a/Src/ClassicExplorer/SettingsUI.cpp b/Src/ClassicExplorer/SettingsUI.cpp index f70b77a5e..8be0eedad 100644 --- a/Src/ClassicExplorer/SettingsUI.cpp +++ b/Src/ClassicExplorer/SettingsUI.cpp @@ -380,7 +380,7 @@ LRESULT CEditToolbarDlg::OnBrowseLink( WORD wNotifyCode, WORD wID, HWND hWndCtl, { wchar_t text[_MAX_PATH]; GetDlgItemText(IDC_COMBOLINK,text,_countof(text)); - if (BrowseLinkHelper(m_hWnd,text)) + if (BrowseLinkHelper(m_hWnd,text,false)) { SetDlgItemText(IDC_COMBOLINK,text); SendMessage(WM_COMMAND,MAKEWPARAM(IDC_COMBOLINK,CBN_KILLFOCUS)); diff --git a/Src/Lib/Settings.cpp b/Src/Lib/Settings.cpp index fb312fc8b..00903e87b 100644 --- a/Src/Lib/Settings.cpp +++ b/Src/Lib/Settings.cpp @@ -125,7 +125,7 @@ bool CSetting::IsEnabled( void ) const if (operation=='>' && pSetting->GetValue().intVal<=val) return false; } - if ((pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG) && pSetting->GetValue().vt==VT_BSTR) + if ((pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_DIRECTORY) && pSetting->GetValue().vt==VT_BSTR) { if (operation=='~' && *pSetting->GetValue().bstrVal==0) return false; @@ -202,7 +202,7 @@ bool CSetting::ReadValue( CRegKey ®Key, const wchar_t *valName ) } // string - if (type>=CSetting::TYPE_STRING && type=CSetting::TYPE_STRING && type!=CSetting::TYPE_MULTISTRING) { ULONG len; if (regKey.QueryStringValue(valName,NULL,&len)==ERROR_SUCCESS) @@ -2221,7 +2221,7 @@ bool GetSettingBool( const CSetting &setting ) CString GetSettingString( const CSetting &setting ) { - Assert(setting.type==CSetting::TYPE_STRING); + Assert(setting.type==CSetting::TYPE_STRING || setting.type==CSetting::TYPE_DIRECTORY); if (setting.value.vt!=VT_BSTR) return CString(); return setting.value.bstrVal; @@ -2722,7 +2722,7 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a { fprintf_s(fAdmx,"\t\t\t\t\r\n",pSetting->name); } - else if (pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_ICON || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_SOUND || pSetting->type==CSetting::TYPE_FONT) + else if (pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_ICON || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_SOUND || pSetting->type==CSetting::TYPE_FONT || pSetting->type==CSetting::TYPE_DIRECTORY) { fprintf_s(fAdmx,"\t\t\t\t\r\n",pSetting->name); } @@ -2782,7 +2782,7 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a { fprintf_s(fAdml,"\t\t\t\t%s\r\n",(const char*)name); } - else if (pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_ICON || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_SOUND || pSetting->type==CSetting::TYPE_FONT) + else if (pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_ICON || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_SOUND || pSetting->type==CSetting::TYPE_FONT || pSetting->type==CSetting::TYPE_DIRECTORY) { fprintf_s(fAdml,"\t\t\t\t\r\n",(const char*)name); } diff --git a/Src/Lib/Settings.h b/Src/Lib/Settings.h index 0306a85d2..fd945e256 100644 --- a/Src/Lib/Settings.h +++ b/Src/Lib/Settings.h @@ -32,6 +32,7 @@ struct CSetting TYPE_SOUND, TYPE_FONT, TYPE_MULTISTRING, + TYPE_DIRECTORY, }; enum diff --git a/Src/Lib/SettingsUIHelper.cpp b/Src/Lib/SettingsUIHelper.cpp index 0c3221223..5c22f587d 100644 --- a/Src/Lib/SettingsUIHelper.cpp +++ b/Src/Lib/SettingsUIHelper.cpp @@ -1216,7 +1216,7 @@ bool BrowseCommandHelper( HWND parent, wchar_t *text ) return false; } -bool BrowseLinkHelper( HWND parent, wchar_t *text ) +bool BrowseLinkHelper( HWND parent, wchar_t *text, bool bFoldersOnly ) { DoEnvironmentSubst(text,_MAX_PATH); @@ -1227,16 +1227,22 @@ bool BrowseLinkHelper( HWND parent, wchar_t *text ) if (!pCustomize) return false; - pDialog->SetTitle(LoadStringEx(IDS_PICK_LINK_TITLE)); - pDialog->SetOkButtonLabel(LoadStringEx(IDS_PICK_LINK_FILE)); - wchar_t button[256]; - Sprintf(button,_countof(button),L" %s ",LoadStringEx(IDS_PICK_LINK_FOLDER)); - pCustomize->AddPushButton(101,button); + pDialog->SetTitle(LoadStringEx(bFoldersOnly?IDS_PICK_LINK_FOLDER:IDS_PICK_LINK_TITLE)); + if (!bFoldersOnly) // add separate buttons for selecting files/folders to the dialog + { + pDialog->SetOkButtonLabel(LoadStringEx(IDS_PICK_LINK_FILE)); + wchar_t button[256]; + Sprintf(button,_countof(button),L" %s ",LoadStringEx(IDS_PICK_LINK_FOLDER)); + pCustomize->AddPushButton(101,button); + } CBrowseLinkEvents events; DWORD cookie; pDialog->Advise(&events,&cookie); - pDialog->SetOptions(FOS_ALLNONSTORAGEITEMS|FOS_FILEMUSTEXIST|FOS_DONTADDTORECENT|FOS_DEFAULTNOMINIMODE|FOS_NODEREFERENCELINKS); + if (bFoldersOnly) // set FOS_PICKFOLDERS option to use dialog in folder-only mode + pDialog->SetOptions(FOS_PICKFOLDERS|FOS_ALLNONSTORAGEITEMS|FOS_DONTADDTORECENT|FOS_DEFAULTNOMINIMODE); + else + pDialog->SetOptions(FOS_ALLNONSTORAGEITEMS|FOS_FILEMUSTEXIST|FOS_DONTADDTORECENT|FOS_DEFAULTNOMINIMODE|FOS_NODEREFERENCELINKS); { const wchar_t *c=wcschr(text,'|'); if (c) @@ -2274,6 +2280,7 @@ class CTreeSettingsDlg: public CResizeableDlg EDIT_HOTKEY_ANY, EDIT_COLOR, EDIT_FONT, + EDIT_DIRECTORY, }; BEGIN_MSG_MAP( CTreeSettingsDlg ) @@ -2717,6 +2724,29 @@ LRESULT CTreeSettingsDlg::OnBrowse( WORD wNotifyCode, WORD wID, HWND hWndCtl, BO m_EditBox.SetFocus(); m_bIgnoreFocus=false; } + else if (m_EditMode==EDIT_DIRECTORY) + { + m_bIgnoreFocus=true; + CString str; + m_EditBox.GetWindowText(str); + str.TrimLeft(); str.TrimRight(); + wchar_t text[1024]; + DWORD dwAttrs=GetFileAttributes(str); // ensure directory exists before passing it to dialog + if (dwAttrs!=INVALID_FILE_ATTRIBUTES && dwAttrs&FILE_ATTRIBUTE_DIRECTORY) + { + Strcpy(text,_countof(text),str); + DoEnvironmentSubst(text,_countof(text)); + } + else + text[0]=0; + Strcpy(text,_countof(text),str); + DoEnvironmentSubst(text,_countof(text)); + if (BrowseLinkHelper(m_hWnd,text,true)) + m_EditBox.SetWindowText(text); + SendMessage(WM_NEXTDLGCTL,(LPARAM)m_EditBox.m_hWnd,TRUE); + m_EditBox.SetFocus(); + m_bIgnoreFocus=false; + } return 0; } @@ -3052,6 +3082,20 @@ void CTreeSettingsDlg::ApplyEditBox( void ) pSetting->flags&=~CSetting::FLAG_DEFAULT; } } + else if (pSetting->type==CSetting::TYPE_DIRECTORY) + { + if (pSetting->value.vt!=VT_BSTR || str!=pSetting->value.bstrVal) + { + if (str.IsEmpty()) // empty directory strings cause unexpected behavior, so we reset to avoid this + pSetting->value=pSetting->defValue; + else // otherwise we are very lenient about what users can input as a path + pSetting->value=CComVariant(str); + if (pSetting->value==pSetting->defValue) + pSetting->flags|=CSetting::FLAG_DEFAULT; + else + pSetting->flags&=~CSetting::FLAG_DEFAULT; + } + } else { if (pSetting->value.vt!=VT_BSTR || str!=pSetting->value.bstrVal) @@ -3095,7 +3139,7 @@ void CTreeSettingsDlg::ItemSelected( HTREEITEM hItem, CSetting *pSetting, bool b val=valVar.intVal; Sprintf(text,_countof(text),L"%d",val); } - else if (pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_ICON || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_SOUND || pSetting->type==CSetting::TYPE_FONT) + else if (pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_ICON || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_SOUND || pSetting->type==CSetting::TYPE_FONT || pSetting->type==CSetting::TYPE_DIRECTORY) { if (valVar.vt==VT_BSTR) Strcpy(text,_countof(text),valVar.bstrVal); @@ -3111,8 +3155,10 @@ void CTreeSettingsDlg::ItemSelected( HTREEITEM hItem, CSetting *pSetting, bool b mode=EDIT_BITMAP_JPG; else if (pSetting->type==CSetting::TYPE_SOUND) mode=EDIT_SOUND; - else + else if (pSetting->type==CSetting::TYPE_FONT) mode=EDIT_FONT; + else + mode=EDIT_DIRECTORY; } else if (pSetting->type==CSetting::TYPE_HOTKEY || pSetting->type==CSetting::TYPE_HOTKEY_ANY) { @@ -3152,7 +3198,7 @@ void CTreeSettingsDlg::ItemSelected( HTREEITEM hItem, CSetting *pSetting, bool b m_pEditSetting=pSetting; } - if (mode==EDIT_ICON || mode==EDIT_BITMAP || mode==EDIT_BITMAP_JPG || mode==EDIT_SOUND || mode==EDIT_FONT || mode==EDIT_COLOR) + if (mode==EDIT_ICON || mode==EDIT_BITMAP || mode==EDIT_BITMAP_JPG || mode==EDIT_SOUND || mode==EDIT_FONT || mode==EDIT_COLOR || mode==EDIT_DIRECTORY) { RECT rc2=rc; int width=(rc2.bottom-rc2.top)*3/2; @@ -3210,14 +3256,15 @@ void CTreeSettingsDlg::UpdateEditPosition( void ) DeleteDC(hdc); DWORD margins=(DWORD)m_EditBox.SendMessage(EM_GETMARGINS); size.cx+=HIWORD(margins)+LOWORD(margins)+12; - if (m_EditMode==EDIT_ICON || m_EditMode==EDIT_BITMAP || m_EditMode==EDIT_BITMAP_JPG || m_EditMode==EDIT_FONT || m_EditMode==EDIT_COLOR) + // adjust size and position of edit boxes for settings that use browse/play buttons + if (m_EditMode==EDIT_ICON || m_EditMode==EDIT_BITMAP || m_EditMode==EDIT_BITMAP_JPG || m_EditMode==EDIT_FONT || m_EditMode==EDIT_COLOR || m_EditMode==EDIT_DIRECTORY) size.cx+=width; if (m_EditMode==EDIT_SOUND) size.cx+=width*2; if (size.cx pFolder; if (SUCCEEDED(SHCreateItemFromParsingName(path,NULL,IID_IShellItem,(void**)&pFolder))) diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp index 98f563fac..008a009e8 100644 --- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp +++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp @@ -1742,7 +1742,7 @@ LRESULT CEditMenuDlg::OnBrowseLink( WORD wNotifyCode, WORD wID, HWND hWndCtl, BO { wchar_t text[_MAX_PATH]; GetDlgItemText(IDC_COMBOLINK,text,_countof(text)); - if (BrowseLinkHelper(m_hWnd,text)) + if (BrowseLinkHelper(m_hWnd,text,false)) { SetDlgItemText(IDC_COMBOLINK,text); SendMessage(WM_COMMAND,MAKEWPARAM(IDC_COMBOLINK,CBN_KILLFOCUS)); @@ -2437,7 +2437,7 @@ LRESULT CEditMenuDlg7::OnBrowseLink( WORD wNotifyCode, WORD wID, HWND hWndCtl, B { wchar_t text[_MAX_PATH]; GetDlgItemText(IDC_EDITLINK2,text,_countof(text)); - if (BrowseLinkHelper(m_hWnd,text)) + if (BrowseLinkHelper(m_hWnd,text,false)) { SetDlgItemText(IDC_EDITLINK2,text); SendMessage(WM_COMMAND,MAKEWPARAM(IDC_EDITLINK2,EN_KILLFOCUS)); @@ -4280,6 +4280,7 @@ CSetting g_Settings[]={ {L"PinnedPrograms",CSetting::TYPE_INT,IDS_PINNED_PROGRAMS,IDS_PINNED_PROGRAMS_TIP,PINNED_PROGRAMS_PINNED}, {L"FastItems",CSetting::TYPE_RADIO,IDS_FAST_ITEMS,IDS_FAST_ITEMS_TIP}, {L"PinnedItems",CSetting::TYPE_RADIO,IDS_PINNED_ITEMS,IDS_PINNED_ITEMS_TIP}, + {L"PinnedItemsPath",CSetting::TYPE_DIRECTORY,IDS_PINNED_PATH,IDS_PINNED_PATH_TIP,L"%APPDATA%\\OpenShell\\Pinned",0,L"PinnedPrograms=1",L"PinnedItems"}, {L"RecentPrograms",CSetting::TYPE_INT,IDS_RECENT_PROGRAMS,IDS_RECENT_PROGRAMS_TIP,RECENT_PROGRAMS_RECENT,CSetting::FLAG_BASIC}, {L"None",CSetting::TYPE_RADIO,IDS_NO_RECENT,IDS_NO_RECENT_TIP}, {L"Recent",CSetting::TYPE_RADIO,IDS_SHOW_RECENT,IDS_SHOW_RECENT_TIP}, diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp index feef6452d..e1aa81ab8 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp @@ -3856,6 +3856,7 @@ if (!g_bTrimHooks) CMD_OPEN, CMD_OPEN_ALL, CMD_EXPLORER, + CMD_OPEN_PINNED, }; // right-click on the start button - open the context menu (Settings, Help, Exit) @@ -3876,6 +3877,8 @@ if (!g_bTrimHooks) AppendMenu(menu,MF_STRING,CMD_OPEN,FindTranslation(L"Menu.Open",L"&Open")); if (!SHRestricted(REST_NOCOMMONGROUPS)) AppendMenu(menu,MF_STRING,CMD_OPEN_ALL,FindTranslation(L"Menu.OpenAll",L"O&pen All Users")); + if (GetSettingInt(L"PinnedPrograms")==PINNED_PROGRAMS_PINNED) + AppendMenu(menu,MF_STRING,CMD_OPEN_PINNED,FindTranslation(L"Menu.OpenPinned",L"O&pen Pinned")); AppendMenu(menu,MF_SEPARATOR,0,0); } if (GetSettingBool(L"EnableSettings")) @@ -3922,6 +3925,16 @@ if (!g_bTrimHooks) if (SUCCEEDED(ShGetKnownFolderPath((res==CMD_OPEN)?FOLDERID_StartMenu:FOLDERID_CommonStartMenu,&pPath))) ShellExecute(NULL,L"open",pPath,NULL,NULL,SW_SHOWNORMAL); } + if (res==CMD_OPEN_PINNED) // open pinned folder + { + SHELLEXECUTEINFO execute={sizeof(execute)}; + CString path=GetSettingString(L"PinnedItemsPath"); + execute.lpVerb=L"open"; + execute.lpFile=path; + execute.nShow=SW_SHOWNORMAL; + execute.fMask=SEE_MASK_DOENVSUBST; + ShellExecuteEx(&execute); + } if (res==CMD_EXPLORER) { CString path=GetSettingString(L"ExplorerPath"); diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc index 57feae1a6..6ca0538b4 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc @@ -1044,7 +1044,7 @@ BEGIN IDS_FOLDERS_FIRST "Show folders first" IDS_FOLDERS_FIRST_TIP "When this is checked, the All Programs tree will show the folders first and the programs last" IDS_PINNED_PROGRAMS "Pinned Programs folder" - IDS_PINNED_PROGRAMS_TIP "Select the location to store the pinned programs" + IDS_PINNED_PROGRAMS_TIP "Select the location to store pinned programs. After updating this setting, close this window in order to pin items through the context menu again" IDS_FAST_ITEMS "Use Start Menu folder" END @@ -1319,6 +1319,8 @@ STRINGTABLE BEGIN IDS_OPEN_TRUE_PATH "Open pinned folders to their true path" IDS_OPEN_TRUE_PATH_TIP "When this is checked, pinned folders will open to their true path instead of the path to their shortcut in the Pinned Programs folder" + IDS_PINNED_PATH "Pinned folder path" + IDS_PINNED_PATH_TIP "The path to use as the Pinned folder. If the path does not exist, it will be created (if possible) after opening the start menu. Close this window after updating this setting to update your context menu.\n\nNote: If you do not have permissions for the selected path, you will not be able to pin items until you take ownership of the new folder" END #endif // English (U.S.) resources diff --git a/Src/StartMenu/StartMenuDLL/resource.h b/Src/StartMenu/StartMenuDLL/resource.h index e5fa09934..ea115435d 100644 --- a/Src/StartMenu/StartMenuDLL/resource.h +++ b/Src/StartMenu/StartMenuDLL/resource.h @@ -778,6 +778,8 @@ #define IDS_ITEM_LINKS_TIP 3681 #define IDS_OPEN_TRUE_PATH 3682 #define IDS_OPEN_TRUE_PATH_TIP 3683 +#define IDS_PINNED_PATH 3684 +#define IDS_PINNED_PATH_TIP 3685 #define IDS_STRING7001 7001 #define IDS_STRING7002 7002 #define IDS_STRING7003 7003 diff --git a/Src/StartMenu/StartMenuHelper/StartMenuExt.cpp b/Src/StartMenu/StartMenuHelper/StartMenuExt.cpp index 10a3b3054..5cf4aff21 100644 --- a/Src/StartMenu/StartMenuHelper/StartMenuExt.cpp +++ b/Src/StartMenu/StartMenuHelper/StartMenuExt.cpp @@ -91,7 +91,7 @@ STDMETHODIMP CStartMenuExt::Initialize( PCIDLIST_ABSOLUTE pidlFolder, IDataObjec bUsePinned=(setting==1); if (bUsePinned) { - Strcpy(m_PinFolder1,_countof(m_PinFolder1),L"%APPDATA%\\OpenShell\\Pinned\\"); + Sprintf(m_PinFolder1,_countof(m_PinFolder1),L"%s\\",GetSettingString(L"PinnedItemsPath")); DoEnvironmentSubst(m_PinFolder1,_countof(m_PinFolder1)); m_PinFolder2[0]=0; } diff --git a/Src/StartMenu/StartMenuHelper/dllmain.cpp b/Src/StartMenu/StartMenuHelper/dllmain.cpp index 10c2ced4e..795032af0 100644 --- a/Src/StartMenu/StartMenuHelper/dllmain.cpp +++ b/Src/StartMenu/StartMenuHelper/dllmain.cpp @@ -57,6 +57,7 @@ CSetting g_Settings[]={ {L"DisablePinExt",CSetting::TYPE_BOOL,0,0,0}, {L"FolderStartMenu",CSetting::TYPE_STRING,0,0,L""}, {L"FolderCommonStartMenu",CSetting::TYPE_STRING,0,0,L""}, + {L"PinnedItemsPath",CSetting::TYPE_DIRECTORY,0,0,L"%APPDATA%\\OpenShell\\Pinned"}, {L"Language",CSetting::TYPE_GROUP}, {L"Language",CSetting::TYPE_STRING,0,0,L"",CSetting::FLAG_COLD|CSetting::FLAG_SHARED}, From 64259f73e89a6fa83ee222c87bd9ed42cc11ddcc Mon Sep 17 00:00:00 2001 From: thisismy-github <48284263+thisismy-github@users.noreply.github.com> Date: Fri, 20 Aug 2021 21:16:00 -0400 Subject: [PATCH 090/234] Various single-click option fixes Fixed single-click option ignoring split arrows Fixed Apps folder being clickable --- Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp index ef0a07891..bfcdedc11 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp @@ -6808,7 +6808,7 @@ LRESULT CMenuContainer::OnLButtonDblClick( UINT uMsg, WPARAM wParam, LPARAM lPar ClientToScreen(&pt); if (s_bWin7Style && item.id==MENU_PROGRAMS) // only single clicks for All Programs OnLButtonDown(WM_LBUTTONDOWN,wParam,lParam,bHandled); - else if (!bArrow) // ignore double-click on the split arrow + else if (!bArrow && item.id!=MENU_APPS) // ignore double-click on the split arrow and Apps folder ActivateItem(index,ACTIVATE_EXECUTE,&pt); return 0; } @@ -6832,7 +6832,7 @@ LRESULT CMenuContainer::OnLButtonUp( UINT uMsg, WPARAM wParam, LPARAM lParam, BO const MenuItem &item=m_Items[index]; POINT pt2=pt; ClientToScreen(&pt2); - if (!item.bFolder || (s_bSingleClickFolders && item.id!=MENU_PROGRAMS)) // never open All Programs link with single click + if (!item.bFolder || (s_bSingleClickFolders && item.id!=MENU_PROGRAMS && item.id!=MENU_APPS && !bArrow)) // never open All Programs, Apps folder, or jumplists with single click { if (item.jumpIndex>=0 && m_bHotArrow) { From 86447299b12fbd3d2a9cac83faca7850f4d62a29 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 21 Aug 2022 14:00:12 +0200 Subject: [PATCH 091/234] AppVeyor: build only from master We want to do official builds from master only. PR builds should be not affected by this. --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 9b62786a9..14442dfb7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,7 @@ version: 4.4.{build} +branches: + only: + - master pull_requests: do_not_increment_build_number: true skip_tags: true From 93245dc4d6d8f3ebdb46e50cbbdc65c4583835d0 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 21 Aug 2022 14:01:21 +0200 Subject: [PATCH 092/234] AppVeyor: deploy build to GitHub releases page --- appveyor.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 14442dfb7..b3227bd4f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,3 +14,10 @@ only_commits: files: - Src/ - Localization/ +deploy: +- provider: GitHub + tag: v$(APPVEYOR_BUILD_VERSION) + release: $(APPVEYOR_BUILD_VERSION) + auth_token: + secure: 01CsOFRdj9KFb1hp/RlFK/F1UzGhzwGQfok6OoqcL1ipbOwRF//Phbdm7iaFVWIx + prerelease: true From 3d1fa11973cc4330eccaf05e717a9744c71105e9 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 21 Aug 2022 22:20:32 +0200 Subject: [PATCH 093/234] Update README.md - Updated "release" badge to point to latest release version directly - Removed "Latest nightly build" link as nightly builds are now part of standard Releases page --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index de91f0959..874d71caa 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,10 @@ *Originally* **[Classic Shell](http://www.classicshell.net)** *by [Ivo Beltchev](https://sourceforge.net/u/ibeltchev/profile/)* -[![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![Build status](https://ci.appveyor.com/api/projects/status/2wj5x5qoypfjj0tr/branch/master?svg=true)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master) [![GitQ](https://gitq.com/badge.svg)](https://gitq.com/passionate-coder/Classic-Start) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/open-shell/Lobby) [![Discord](https://img.shields.io/discord/757701054782636082?color=%4E5D94&label=Discord&logo=discord&logoColor=white)](https://discord.gg/7H6arr5) +[![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases/latest) [![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![Build status](https://ci.appveyor.com/api/projects/status/2wj5x5qoypfjj0tr/branch/master?svg=true)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master) [![GitQ](https://gitq.com/badge.svg)](https://gitq.com/passionate-coder/Classic-Start) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/open-shell/Lobby) [![Discord](https://img.shields.io/discord/757701054782636082?color=%4E5D94&label=Discord&logo=discord&logoColor=white)](https://discord.gg/7H6arr5) [Home Page](https://open-shell.github.io/Open-Shell-Menu) [Gitter Discussion room](https://gitter.im/Open-Shell) -[Latest nightly build](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master/artifacts) ### Features - Classic style Start Menu for Windows 7, 8, 8.1, 10 From f01c126b3649fdfee90ba3bf6b41a0aa08966c1b Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 21 Aug 2022 22:46:02 +0200 Subject: [PATCH 094/234] AppVeyor: Deploy only if build was done under official account --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index b3227bd4f..bef9420e2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,6 +18,8 @@ deploy: - provider: GitHub tag: v$(APPVEYOR_BUILD_VERSION) release: $(APPVEYOR_BUILD_VERSION) + on: + APPVEYOR_ACCOUNT_NAME: passionate-coder auth_token: secure: 01CsOFRdj9KFb1hp/RlFK/F1UzGhzwGQfok6OoqcL1ipbOwRF//Phbdm7iaFVWIx prerelease: true From 5bee5ae143585b0e5b71681aed580fac25b7fe36 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 21 Aug 2022 19:24:58 +0200 Subject: [PATCH 095/234] Update JSON library to latest version (3.11.2) --- Src/Lib/json.hpp | 13861 +++++++++++++++++++++------------------------ 1 file changed, 6505 insertions(+), 7356 deletions(-) diff --git a/Src/Lib/json.hpp b/Src/Lib/json.hpp index a70aaf8cb..4d1a37ad7 100644 --- a/Src/Lib/json.hpp +++ b/Src/Lib/json.hpp @@ -1,44 +1,30 @@ -/* - __ _____ _____ _____ - __| | __| | | | JSON for Modern C++ -| | |__ | | | | | | version 3.9.1 -|_____|_____|_____|_|___| https://github.com/nlohmann/json - -Licensed under the MIT License . -SPDX-License-Identifier: MIT -Copyright (c) 2013-2019 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. -*/ +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT + +/****************************************************************************\ + * Note on documentation: The source files contain links to the online * + * documentation of the public API at https://json.nlohmann.me. This URL * + * contains the most recent documentation and should also be applicable to * + * previous versions; documentation for deprecated functions is not * + * removed, but marked deprecated. See "Generate documentation" section in * + * file docs/README.md. * +\****************************************************************************/ #ifndef INCLUDE_NLOHMANN_JSON_HPP_ #define INCLUDE_NLOHMANN_JSON_HPP_ -#define NLOHMANN_JSON_VERSION_MAJOR 3 -#define NLOHMANN_JSON_VERSION_MINOR 9 -#define NLOHMANN_JSON_VERSION_PATCH 1 - #include // all_of, find, for_each #include // nullptr_t, ptrdiff_t, size_t #include // hash, less #include // initializer_list -#include // istream, ostream +#ifndef JSON_NO_IO + #include // istream, ostream +#endif // JSON_NO_IO #include // random_access_iterator_tag #include // unique_ptr #include // accumulate @@ -47,11 +33,129 @@ SOFTWARE. #include // vector // #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT + #include +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +// This file contains all macro definitions affecting or depending on the ABI + +#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK + #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH) + #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 2 + #warning "Already included a different version of the library!" + #endif + #endif +#endif + +#define NLOHMANN_JSON_VERSION_MAJOR 3 // NOLINT(modernize-macro-to-enum) +#define NLOHMANN_JSON_VERSION_MINOR 11 // NOLINT(modernize-macro-to-enum) +#define NLOHMANN_JSON_VERSION_PATCH 2 // NOLINT(modernize-macro-to-enum) + +#ifndef JSON_DIAGNOSTICS + #define JSON_DIAGNOSTICS 0 +#endif + +#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON + #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0 +#endif + +#if JSON_DIAGNOSTICS + #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag +#else + #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS +#endif + +#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON + #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp +#else + #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON +#endif + +#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION + #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0 +#endif + +// Construct the namespace ABI tags component +#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b +#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \ + NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) + +#define NLOHMANN_JSON_ABI_TAGS \ + NLOHMANN_JSON_ABI_TAGS_CONCAT( \ + NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS, \ + NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON) + +// Construct the namespace version component +#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \ + _v ## major ## _ ## minor ## _ ## patch +#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \ + NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) + +#if NLOHMANN_JSON_NAMESPACE_NO_VERSION +#define NLOHMANN_JSON_NAMESPACE_VERSION +#else +#define NLOHMANN_JSON_NAMESPACE_VERSION \ + NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \ + NLOHMANN_JSON_VERSION_MINOR, \ + NLOHMANN_JSON_VERSION_PATCH) +#endif + +// Combine namespace components +#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b +#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \ + NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) + +#ifndef NLOHMANN_JSON_NAMESPACE +#define NLOHMANN_JSON_NAMESPACE \ + nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \ + NLOHMANN_JSON_ABI_TAGS, \ + NLOHMANN_JSON_NAMESPACE_VERSION) +#endif + +#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN +#define NLOHMANN_JSON_NAMESPACE_BEGIN \ + namespace nlohmann \ + { \ + inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \ + NLOHMANN_JSON_ABI_TAGS, \ + NLOHMANN_JSON_NAMESPACE_VERSION) \ + { +#endif + +#ifndef NLOHMANN_JSON_NAMESPACE_END +#define NLOHMANN_JSON_NAMESPACE_END \ + } /* namespace (inline namespace) NOLINT(readability/namespace) */ \ + } // namespace nlohmann +#endif + // #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT + #include // transform @@ -67,63 +171,169 @@ SOFTWARE. #include // valarray // #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT + +#include // nullptr_t #include // exception #include // runtime_error #include // to_string +#include // vector -// #include +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT + +#include // array #include // size_t +#include // uint8_t +#include // string + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +#include // declval, pair +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT + + -namespace nlohmann +#include + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +// #include + + +NLOHMANN_JSON_NAMESPACE_BEGIN +namespace detail +{ + +template struct make_void { + using type = void; +}; +template using void_t = typename make_void::type; + +} // namespace detail +NLOHMANN_JSON_NAMESPACE_END + + +NLOHMANN_JSON_NAMESPACE_BEGIN namespace detail { -/// struct to capture the start position of the current token -struct position_t + +// https://en.cppreference.com/w/cpp/experimental/is_detected +struct nonesuch { - /// the total number of characters read - std::size_t chars_read_total = 0; - /// the number of characters read in the current line - std::size_t chars_read_current_line = 0; - /// the number of lines read - std::size_t lines_read = 0; + nonesuch() = delete; + ~nonesuch() = delete; + nonesuch(nonesuch const&) = delete; + nonesuch(nonesuch const&&) = delete; + void operator=(nonesuch const&) = delete; + void operator=(nonesuch&&) = delete; +}; - /// conversion to size_t to preserve SAX interface - constexpr operator size_t() const - { - return chars_read_total; - } +template class Op, + class... Args> +struct detector +{ + using value_t = std::false_type; + using type = Default; }; -} // namespace detail -} // namespace nlohmann +template class Op, class... Args> +struct detector>, Op, Args...> +{ + using value_t = std::true_type; + using type = Op; +}; -// #include +template class Op, class... Args> +using is_detected = typename detector::value_t; +template class Op, class... Args> +struct is_detected_lazy : is_detected { }; + +template class Op, class... Args> +using detected_t = typename detector::type; + +template class Op, class... Args> +using detected_or = detector; + +template class Op, class... Args> +using detected_or_t = typename detected_or::type; + +template class Op, class... Args> +using is_detected_exact = std::is_same>; + +template class Op, class... Args> +using is_detected_convertible = + std::is_convertible, To>; + +} // namespace detail +NLOHMANN_JSON_NAMESPACE_END -#include // pair // #include + + +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-FileCopyrightText: 2016-2021 Evan Nemerson +// SPDX-License-Identifier: MIT + /* Hedley - https://nemequ.github.io/hedley * Created by Evan Nemerson - * - * To the extent possible under law, the author(s) have dedicated all - * copyright and related and neighboring rights to this software to - * the public domain worldwide. This software is distributed without - * any warranty. - * - * For details, see . - * SPDX-License-Identifier: CC0-1.0 */ -#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 13) +#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15) #if defined(JSON_HEDLEY_VERSION) #undef JSON_HEDLEY_VERSION #endif -#define JSON_HEDLEY_VERSION 13 +#define JSON_HEDLEY_VERSION 15 #if defined(JSON_HEDLEY_STRINGIFY_EX) #undef JSON_HEDLEY_STRINGIFY_EX @@ -196,18 +406,18 @@ struct position_t #if defined(JSON_HEDLEY_MSVC_VERSION) #undef JSON_HEDLEY_MSVC_VERSION #endif -#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) +#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) && !defined(__ICL) #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100) -#elif defined(_MSC_FULL_VER) +#elif defined(_MSC_FULL_VER) && !defined(__ICL) #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10) -#elif defined(_MSC_VER) +#elif defined(_MSC_VER) && !defined(__ICL) #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0) #endif #if defined(JSON_HEDLEY_MSVC_VERSION_CHECK) #undef JSON_HEDLEY_MSVC_VERSION_CHECK #endif -#if !defined(_MSC_VER) +#if !defined(JSON_HEDLEY_MSVC_VERSION) #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0) #elif defined(_MSC_VER) && (_MSC_VER >= 1400) #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch))) @@ -220,9 +430,9 @@ struct position_t #if defined(JSON_HEDLEY_INTEL_VERSION) #undef JSON_HEDLEY_INTEL_VERSION #endif -#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) +#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && !defined(__ICL) #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE) -#elif defined(__INTEL_COMPILER) +#elif defined(__INTEL_COMPILER) && !defined(__ICL) #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0) #endif @@ -235,6 +445,22 @@ struct position_t #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0) #endif +#if defined(JSON_HEDLEY_INTEL_CL_VERSION) + #undef JSON_HEDLEY_INTEL_CL_VERSION +#endif +#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && defined(__ICL) + #define JSON_HEDLEY_INTEL_CL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER, __INTEL_COMPILER_UPDATE, 0) +#endif + +#if defined(JSON_HEDLEY_INTEL_CL_VERSION_CHECK) + #undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_INTEL_CL_VERSION) + #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_CL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (0) +#endif + #if defined(JSON_HEDLEY_PGI_VERSION) #undef JSON_HEDLEY_PGI_VERSION #endif @@ -474,7 +700,7 @@ struct position_t #if __VER__ > 1000 #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000)) #else - #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(VER / 100, __VER__ % 100, 0) + #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(__VER__ / 100, __VER__ % 100, 0) #endif #endif @@ -551,6 +777,22 @@ struct position_t #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0) #endif +#if defined(JSON_HEDLEY_MCST_LCC_VERSION) + #undef JSON_HEDLEY_MCST_LCC_VERSION +#endif +#if defined(__LCC__) && defined(__LCC_MINOR__) + #define JSON_HEDLEY_MCST_LCC_VERSION JSON_HEDLEY_VERSION_ENCODE(__LCC__ / 100, __LCC__ % 100, __LCC_MINOR__) +#endif + +#if defined(JSON_HEDLEY_MCST_LCC_VERSION_CHECK) + #undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_MCST_LCC_VERSION) + #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_MCST_LCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (0) +#endif + #if defined(JSON_HEDLEY_GCC_VERSION) #undef JSON_HEDLEY_GCC_VERSION #endif @@ -560,6 +802,7 @@ struct position_t !defined(JSON_HEDLEY_INTEL_VERSION) && \ !defined(JSON_HEDLEY_PGI_VERSION) && \ !defined(JSON_HEDLEY_ARM_VERSION) && \ + !defined(JSON_HEDLEY_CRAY_VERSION) && \ !defined(JSON_HEDLEY_TI_VERSION) && \ !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \ !defined(JSON_HEDLEY_TI_CL430_VERSION) && \ @@ -567,7 +810,8 @@ struct position_t !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \ !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \ !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \ - !defined(__COMPCERT__) + !defined(__COMPCERT__) && \ + !defined(JSON_HEDLEY_MCST_LCC_VERSION) #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION #endif @@ -583,17 +827,21 @@ struct position_t #if defined(JSON_HEDLEY_HAS_ATTRIBUTE) #undef JSON_HEDLEY_HAS_ATTRIBUTE #endif -#if defined(__has_attribute) - #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute) +#if \ + defined(__has_attribute) && \ + ( \ + (!defined(JSON_HEDLEY_IAR_VERSION) || JSON_HEDLEY_IAR_VERSION_CHECK(8,5,9)) \ + ) +# define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute) #else - #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0) +# define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0) #endif #if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE) #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE #endif #if defined(__has_attribute) - #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute) + #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) #else #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) #endif @@ -602,7 +850,7 @@ struct position_t #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE #endif #if defined(__has_attribute) - #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute) + #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) #else #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) #endif @@ -787,6 +1035,72 @@ struct position_t #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) #endif +#if \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ + defined(__clang__) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \ + JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \ + (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR)) + #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value) +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) + #define JSON_HEDLEY_PRAGMA(value) __pragma(value) +#else + #define JSON_HEDLEY_PRAGMA(value) +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH) + #undef JSON_HEDLEY_DIAGNOSTIC_PUSH +#endif +#if defined(JSON_HEDLEY_DIAGNOSTIC_POP) + #undef JSON_HEDLEY_DIAGNOSTIC_POP +#endif +#if defined(__clang__) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop") +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push)) + #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop)) +#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop") +#elif \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop") +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") +#else + #define JSON_HEDLEY_DIAGNOSTIC_PUSH + #define JSON_HEDLEY_DIAGNOSTIC_POP +#endif + /* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for HEDLEY INTERNAL USE ONLY. API subject to change without notice. */ #if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_) @@ -795,12 +1109,22 @@ struct position_t #if defined(__cplusplus) # if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat") # if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions") -# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ +# if JSON_HEDLEY_HAS_WARNING("-Wc++1z-extensions") +# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ JSON_HEDLEY_DIAGNOSTIC_PUSH \ _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \ + _Pragma("clang diagnostic ignored \"-Wc++1z-extensions\"") \ xpr \ JSON_HEDLEY_DIAGNOSTIC_POP +# else +# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ + _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \ + xpr \ + JSON_HEDLEY_DIAGNOSTIC_POP +# endif # else # define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ JSON_HEDLEY_DIAGNOSTIC_PUSH \ @@ -865,7 +1189,7 @@ struct position_t # define JSON_HEDLEY_CPP_CAST(T, expr) \ JSON_HEDLEY_DIAGNOSTIC_PUSH \ _Pragma("diag_suppress=Pe137") \ - JSON_HEDLEY_DIAGNOSTIC_POP \ + JSON_HEDLEY_DIAGNOSTIC_POP # else # define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr)) # endif @@ -873,70 +1197,6 @@ struct position_t # define JSON_HEDLEY_CPP_CAST(T, expr) (expr) #endif -#if \ - (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ - defined(__clang__) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \ - JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \ - (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR)) - #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value) -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) - #define JSON_HEDLEY_PRAGMA(value) __pragma(value) -#else - #define JSON_HEDLEY_PRAGMA(value) -#endif - -#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH) - #undef JSON_HEDLEY_DIAGNOSTIC_PUSH -#endif -#if defined(JSON_HEDLEY_DIAGNOSTIC_POP) - #undef JSON_HEDLEY_DIAGNOSTIC_POP -#endif -#if defined(__clang__) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop") -#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") -#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop") -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push)) - #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop)) -#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop") -#elif \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop") -#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") -#else - #define JSON_HEDLEY_DIAGNOSTIC_PUSH - #define JSON_HEDLEY_DIAGNOSTIC_POP -#endif - #if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED) #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED #endif @@ -944,12 +1204,18 @@ struct position_t #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") #elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)") +#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:1478 1786)) +#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1216,1444,1445") #elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444") #elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") #elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996)) +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444") #elif \ JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ @@ -982,6 +1248,8 @@ struct position_t #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"") #elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)") +#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:161)) #elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675") #elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) @@ -998,6 +1266,8 @@ struct position_t #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163") #elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161") +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 161") #else #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS #endif @@ -1011,8 +1281,12 @@ struct position_t #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") #elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)") +#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:1292)) #elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030)) +#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097,1098") #elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097") #elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus) @@ -1024,6 +1298,8 @@ struct position_t #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173") #elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097") +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097") #else #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES #endif @@ -1041,20 +1317,34 @@ struct position_t #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL #endif +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunused-function") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("clang diagnostic ignored \"-Wunused-function\"") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("GCC diagnostic ignored \"-Wunused-function\"") +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(1,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION __pragma(warning(disable:4505)) +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("diag_suppress 3142") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION +#endif + #if defined(JSON_HEDLEY_DEPRECATED) #undef JSON_HEDLEY_DEPRECATED #endif #if defined(JSON_HEDLEY_DEPRECATED_FOR) #undef JSON_HEDLEY_DEPRECATED_FOR #endif -#if JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) +#if \ + JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since)) #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement)) -#elif defined(__cplusplus) && (__cplusplus >= 201402L) - #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]]) - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]]) #elif \ - JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) || \ + (JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) && !defined(JSON_HEDLEY_IAR_VERSION)) || \ JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \ @@ -1064,9 +1354,13 @@ struct position_t JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since))) #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement))) +#elif defined(__cplusplus) && (__cplusplus >= 201402L) + #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]]) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]]) #elif \ JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \ JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ @@ -1081,12 +1375,15 @@ struct position_t (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__)) #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__)) #elif \ JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ - JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) + JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated) #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated) #elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) @@ -1103,7 +1400,8 @@ struct position_t #if \ JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \ JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since))) #else #define JSON_HEDLEY_UNAVAILABLE(available_since) @@ -1115,13 +1413,7 @@ struct position_t #if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG) #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG #endif -#if (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L) - #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) - #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]]) -#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) - #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) - #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) -#elif \ +#if \ JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \ JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ @@ -1137,9 +1429,16 @@ struct position_t JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__)) #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__)) +#elif (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L) + #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]]) +#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) + #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) #elif defined(_Check_return_) /* SAL */ #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_ #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_ @@ -1155,7 +1454,8 @@ struct position_t JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \ JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) + JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position))) #else #define JSON_HEDLEY_SENTINEL(position) @@ -1166,7 +1466,9 @@ struct position_t #endif #if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) #define JSON_HEDLEY_NO_RETURN __noreturn -#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) +#elif \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__)) #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L #define JSON_HEDLEY_NO_RETURN _Noreturn @@ -1188,11 +1490,14 @@ struct position_t (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__)) #elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return") -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) #define JSON_HEDLEY_NO_RETURN __declspec(noreturn) #elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus) #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;") @@ -1224,7 +1529,8 @@ struct position_t #endif #if \ JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) #define JSON_HEDLEY_ASSUME(expr) __assume(expr) #elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume) #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr) @@ -1242,7 +1548,9 @@ struct position_t JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \ JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) + JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(10,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable() #elif defined(JSON_HEDLEY_ASSUME) #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0) @@ -1320,7 +1628,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check))) #elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0) #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check)) @@ -1356,15 +1665,16 @@ JSON_HEDLEY_DIAGNOSTIC_POP #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr)) #endif #if \ - JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) + (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) && !defined(JSON_HEDLEY_PGI_VERSION)) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) # define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability( (expr), (value), (probability)) # define JSON_HEDLEY_PREDICT_TRUE(expr, probability) __builtin_expect_with_probability(!!(expr), 1 , (probability)) # define JSON_HEDLEY_PREDICT_FALSE(expr, probability) __builtin_expect_with_probability(!!(expr), 0 , (probability)) # define JSON_HEDLEY_LIKELY(expr) __builtin_expect (!!(expr), 1 ) # define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect (!!(expr), 0 ) #elif \ - JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) || \ + (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \ JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \ @@ -1378,7 +1688,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) + JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) # define JSON_HEDLEY_PREDICT(expr, expected, probability) \ (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))) # define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \ @@ -1424,11 +1735,14 @@ JSON_HEDLEY_DIAGNOSTIC_POP (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_MALLOC __attribute__((__malloc__)) #elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory") -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(14, 0, 0) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) #define JSON_HEDLEY_MALLOC __declspec(restrict) #else #define JSON_HEDLEY_MALLOC @@ -1455,7 +1769,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) # define JSON_HEDLEY_PURE __attribute__((__pure__)) #elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) # define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data") @@ -1491,7 +1806,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_CONST __attribute__((__const__)) #elif \ JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) @@ -1509,6 +1825,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ @@ -1518,7 +1835,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \ JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ - defined(__clang__) + defined(__clang__) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_RESTRICT __restrict #elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus) #define JSON_HEDLEY_RESTRICT _Restrict @@ -1539,13 +1857,15 @@ JSON_HEDLEY_DIAGNOSTIC_POP #define JSON_HEDLEY_INLINE __inline__ #elif \ JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \ JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \ JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_INLINE __inline #else #define JSON_HEDLEY_INLINE @@ -1571,9 +1891,13 @@ JSON_HEDLEY_DIAGNOSTIC_POP (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) # define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) # define JSON_HEDLEY_ALWAYS_INLINE __forceinline #elif defined(__cplusplus) && \ ( \ @@ -1611,9 +1935,13 @@ JSON_HEDLEY_DIAGNOSTIC_POP (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__)) -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline) #elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0) #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline") @@ -1656,7 +1984,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \ ) \ - ) + ) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) # define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden"))) # define JSON_HEDLEY_PUBLIC __attribute__((__visibility__("default"))) # else @@ -1672,10 +2001,12 @@ JSON_HEDLEY_DIAGNOSTIC_POP #if \ JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \ JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__)) #elif \ JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) #define JSON_HEDLEY_NO_THROW __declspec(nothrow) #else @@ -1687,7 +2018,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP #endif #if \ JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) + JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__)) #elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough) #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]]) @@ -1704,7 +2036,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP #endif #if \ JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) + JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__)) #elif defined(_Ret_notnull_) /* SAL */ #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_ @@ -1746,7 +2079,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) + JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr) #endif #if !defined(__cplusplus) @@ -1770,7 +2104,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP !defined(JSON_HEDLEY_SUNPRO_VERSION) && \ !defined(JSON_HEDLEY_PGI_VERSION) && \ !defined(JSON_HEDLEY_IAR_VERSION)) || \ - JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) || \ + (JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) && !defined(JSON_HEDLEY_IAR_VERSION)) || \ JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \ JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \ @@ -1840,7 +2174,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP #if \ !defined(__cplusplus) && ( \ (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \ - JSON_HEDLEY_HAS_FEATURE(c_static_assert) || \ + (JSON_HEDLEY_HAS_FEATURE(c_static_assert) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \ JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ defined(_Static_assert) \ @@ -1848,7 +2182,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP # define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message) #elif \ (defined(__cplusplus) && (__cplusplus >= 201103L)) || \ - JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) + JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) # define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message)) #else # define JSON_HEDLEY_STATIC_ASSERT(expr, message) @@ -1908,7 +2243,9 @@ JSON_HEDLEY_DIAGNOSTIC_POP JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) # define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg) -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) # define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg)) #else # define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg) @@ -1944,8 +2281,10 @@ JSON_HEDLEY_DIAGNOSTIC_POP #if defined(JSON_HEDLEY_FLAGS) #undef JSON_HEDLEY_FLAGS #endif -#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) +#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) && (!defined(__cplusplus) || JSON_HEDLEY_HAS_WARNING("-Wbitfield-enum-conversion")) #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__)) +#else + #define JSON_HEDLEY_FLAGS #endif #if defined(JSON_HEDLEY_FLAGS_CAST) @@ -1965,7 +2304,9 @@ JSON_HEDLEY_DIAGNOSTIC_POP #if defined(JSON_HEDLEY_EMPTY_BASES) #undef JSON_HEDLEY_EMPTY_BASES #endif -#if JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0) +#if \ + (JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases) #else #define JSON_HEDLEY_EMPTY_BASES @@ -2020,9 +2361,12 @@ JSON_HEDLEY_DIAGNOSTIC_POP #endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */ -// This file contains all internal macro definitions +// This file contains all internal macro definitions (except those affecting ABI) // You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them +// #include + + // exclude unsupported compilers #if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK) #if defined(__clang__) @@ -2037,30 +2381,128 @@ JSON_HEDLEY_DIAGNOSTIC_POP #endif // C++ language standard detection -#if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L) - #define JSON_HAS_CPP_20 - #define JSON_HAS_CPP_17 - #define JSON_HAS_CPP_14 -#elif (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 +// if the user manually specified the used c++ version this is skipped +#if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11) + #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L) + #define JSON_HAS_CPP_20 + #define JSON_HAS_CPP_17 + #define JSON_HAS_CPP_14 + #elif (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 + // the cpp 11 flag is always specified because it is the minimal required version + #define JSON_HAS_CPP_11 +#endif + +#ifdef __has_include + #if __has_include() + #include + #endif +#endif + +#if !defined(JSON_HAS_FILESYSTEM) && !defined(JSON_HAS_EXPERIMENTAL_FILESYSTEM) + #ifdef JSON_HAS_CPP_17 + #if defined(__cpp_lib_filesystem) + #define JSON_HAS_FILESYSTEM 1 + #elif defined(__cpp_lib_experimental_filesystem) + #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 + #elif !defined(__has_include) + #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 + #elif __has_include() + #define JSON_HAS_FILESYSTEM 1 + #elif __has_include() + #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 + #endif + + // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/ + #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before GCC 8: https://en.cppreference.com/w/cpp/compiler_support + #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before Clang 7: https://en.cppreference.com/w/cpp/compiler_support + #if defined(__clang_major__) && __clang_major__ < 7 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support + #if defined(_MSC_VER) && _MSC_VER < 1914 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before iOS 13 + #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before macOS Catalina + #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + #endif +#endif + +#ifndef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 0 +#endif + +#ifndef JSON_HAS_FILESYSTEM + #define JSON_HAS_FILESYSTEM 0 +#endif + +#ifndef JSON_HAS_THREE_WAY_COMPARISON + #if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison >= 201907L \ + && defined(__cpp_lib_three_way_comparison) && __cpp_lib_three_way_comparison >= 201907L + #define JSON_HAS_THREE_WAY_COMPARISON 1 + #else + #define JSON_HAS_THREE_WAY_COMPARISON 0 + #endif +#endif + +#ifndef JSON_HAS_RANGES + // ranges header shipping in GCC 11.1.0 (released 2021-04-27) has syntax error + #if defined(__GLIBCXX__) && __GLIBCXX__ == 20210427 + #define JSON_HAS_RANGES 0 + #elif defined(__cpp_lib_ranges) + #define JSON_HAS_RANGES 1 + #else + #define JSON_HAS_RANGES 0 + #endif +#endif + +#ifdef JSON_HAS_CPP_17 + #define JSON_INLINE_VARIABLE inline +#else + #define JSON_INLINE_VARIABLE #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" +#if JSON_HEDLEY_HAS_ATTRIBUTE(no_unique_address) + #define JSON_NO_UNIQUE_ADDRESS [[no_unique_address]] +#else + #define JSON_NO_UNIQUE_ADDRESS #endif // disable documentation warnings on clang #if defined(__clang__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdocumentation" + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wdocumentation" + #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" #endif -// allow to disable exceptions +// allow disabling exceptions #if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION) #define JSON_THROW(exception) throw exception #define JSON_TRY try @@ -2094,12 +2536,19 @@ JSON_HEDLEY_DIAGNOSTIC_POP #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER #endif -// allow to override assert +// allow overriding assert #if !defined(JSON_ASSERT) #include // assert #define JSON_ASSERT(x) assert(x) #endif +// allow to access some private functions (needed by the test suite) +#if defined(JSON_TESTS_PRIVATE) + #define JSON_PRIVATE_UNLESS_TESTED public +#else + #define JSON_PRIVATE_UNLESS_TESTED private +#endif + /*! @brief macro to briefly define a mapping between an enum and JSON @def NLOHMANN_JSON_SERIALIZE_ENUM @@ -2283,6 +2732,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP #define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1; #define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1); +#define NLOHMANN_JSON_FROM_WITH_DEFAULT(v1) nlohmann_json_t.v1 = nlohmann_json_j.value(#v1, nlohmann_json_default_obj.v1); /*! @brief macro @@ -2293,6 +2743,10 @@ JSON_HEDLEY_DIAGNOSTIC_POP friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...) \ + friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ + friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { Type nlohmann_json_default_obj; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) } + /*! @brief macro @def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE @@ -2302,6 +2756,49 @@ JSON_HEDLEY_DIAGNOSTIC_POP inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...) \ + inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ + inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { Type nlohmann_json_default_obj; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) } + + +// inspired from https://stackoverflow.com/a/26745591 +// allows to call any std function as if (e.g. with begin): +// using std::begin; begin(x); +// +// it allows using the detected idiom to retrieve the return type +// of such an expression +#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name) \ + namespace detail { \ + using std::std_name; \ + \ + template \ + using result_of_##std_name = decltype(std_name(std::declval()...)); \ + } \ + \ + namespace detail2 { \ + struct std_name##_tag \ + { \ + }; \ + \ + template \ + std_name##_tag std_name(T&&...); \ + \ + template \ + using result_of_##std_name = decltype(std_name(std::declval()...)); \ + \ + template \ + struct would_call_std_##std_name \ + { \ + static constexpr auto const value = ::nlohmann::detail:: \ + is_detected_exact::value; \ + }; \ + } /* namespace detail2 */ \ + \ + template \ + struct would_call_std_##std_name : detail2::would_call_std_##std_name \ + { \ + } + #ifndef JSON_USE_IMPLICIT_CONVERSIONS #define JSON_USE_IMPLICIT_CONVERSIONS 1 #endif @@ -2312,406 +2809,383 @@ JSON_HEDLEY_DIAGNOSTIC_POP #define JSON_EXPLICIT explicit #endif +#ifndef JSON_DISABLE_ENUM_SERIALIZATION + #define JSON_DISABLE_ENUM_SERIALIZATION 0 +#endif -namespace nlohmann -{ +#ifndef JSON_USE_GLOBAL_UDLS + #define JSON_USE_GLOBAL_UDLS 1 +#endif + +#if JSON_HAS_THREE_WAY_COMPARISON + #include // partial_ordering +#endif + +NLOHMANN_JSON_NAMESPACE_BEGIN namespace detail { -//////////////// -// exceptions // -//////////////// + +/////////////////////////// +// JSON type enumeration // +/////////////////////////// /*! -@brief general exception of the @ref basic_json class +@brief the JSON type enumeration + +This enumeration collects the different JSON types. It is internally used to +distinguish the stored values, and the functions @ref basic_json::is_null(), +@ref basic_json::is_object(), @ref basic_json::is_array(), +@ref basic_json::is_string(), @ref basic_json::is_boolean(), +@ref basic_json::is_number() (with @ref basic_json::is_number_integer(), +@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()), +@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and +@ref basic_json::is_structured() rely on it. -This class is an extension of `std::exception` objects with a member @a id for -exception ids. It is used as the base class for all exceptions thrown by the -@ref basic_json class. This class can hence be used as "wildcard" to catch -exceptions. +@note There are three enumeration entries (number_integer, number_unsigned, and +number_float), because the library distinguishes these three types for numbers: +@ref basic_json::number_unsigned_t is used for unsigned integers, +@ref basic_json::number_integer_t is used for signed integers, and +@ref basic_json::number_float_t is used for floating-point numbers or to +approximate integers which do not fit in the limits of their respective type. -Subclasses: -- @ref parse_error for exceptions indicating a parse error -- @ref invalid_iterator for exceptions indicating errors with iterators -- @ref type_error for exceptions indicating executing a member function with - a wrong type -- @ref out_of_range for exceptions indicating access out of the defined range -- @ref other_error for exceptions indicating other library errors +@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON +value with the default value for a given type -@internal -@note To have nothrow-copy-constructible exceptions, we internally use - `std::runtime_error` which can cope with arbitrary-length error messages. - Intermediate strings are built with static functions and then passed to - the actual constructor. -@endinternal +@since version 1.0.0 +*/ +enum class value_t : std::uint8_t +{ + null, ///< null value + object, ///< object (unordered set of name/value pairs) + array, ///< array (ordered collection of values) + string, ///< string value + boolean, ///< boolean value + number_integer, ///< number value (signed integer) + number_unsigned, ///< number value (unsigned integer) + number_float, ///< number value (floating-point) + binary, ///< binary array (ordered collection of bytes) + discarded ///< discarded by the parser callback function +}; + +/*! +@brief comparison operator for JSON types -@liveexample{The following code shows how arbitrary library exceptions can be -caught.,exception} +Returns an ordering that is similar to Python: +- order: null < boolean < number < object < array < string < binary +- furthermore, each type is not smaller than itself +- discarded values are not comparable +- binary is represented as a b"" string in python and directly comparable to a + string; however, making a binary array directly comparable with a string would + be surprising behavior in a JSON file. -@since version 3.0.0 +@since version 1.0.0 */ -class exception : public std::exception +#if JSON_HAS_THREE_WAY_COMPARISON + inline std::partial_ordering operator<=>(const value_t lhs, const value_t rhs) noexcept // *NOPAD* +#else + inline bool operator<(const value_t lhs, const value_t rhs) noexcept +#endif { - public: - /// returns the explanatory string - JSON_HEDLEY_RETURNS_NON_NULL - const char* what() const noexcept override + static constexpr std::array order = {{ + 0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */, + 1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */, + 6 /* binary */ + } + }; + + const auto l_index = static_cast(lhs); + const auto r_index = static_cast(rhs); +#if JSON_HAS_THREE_WAY_COMPARISON + if (l_index < order.size() && r_index < order.size()) { - return m.what(); + return order[l_index] <=> order[r_index]; // *NOPAD* } + return std::partial_ordering::unordered; +#else + return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index]; +#endif +} - /// the id of the exception - const int id; +// GCC selects the built-in operator< over an operator rewritten from +// a user-defined spaceship operator +// Clang, MSVC, and ICC select the rewritten candidate +// (see GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105200) +#if JSON_HAS_THREE_WAY_COMPARISON && defined(__GNUC__) +inline bool operator<(const value_t lhs, const value_t rhs) noexcept +{ + return std::is_lt(lhs <=> rhs); // *NOPAD* +} +#endif - protected: - JSON_HEDLEY_NON_NULL(3) - exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} +} // namespace detail +NLOHMANN_JSON_NAMESPACE_END - static std::string name(const std::string& ename, int id_) - { - return "[json.exception." + ename + "." + std::to_string(id_) + "] "; - } +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT - private: - /// an exception object as storage for error messages - std::runtime_error m; -}; -/*! -@brief exception indicating a parse error - -This exception is thrown by the library when a parse error occurs. Parse errors -can occur during the deserialization of JSON text, CBOR, MessagePack, as well -as when using JSON Patch. - -Member @a byte holds the byte index of the last read character in the input -file. - -Exceptions have ids 1xx. - -name / id | example message | description ------------------------------- | --------------- | ------------------------- -json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position. -json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point. -json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid. -json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects. -json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors. -json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number without a leading `0`. -json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character. -json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences. -json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number. -json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read. -json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read. -json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read. -json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet). -json.exception.parse_error.115 | parse error at byte 5: syntax error while parsing UBJSON high-precision number: invalid number text: 1A | A UBJSON high-precision number could not be parsed. - -@note For an input with n bytes, 1 is the index of the first character and n+1 - is the index of the terminating null byte or the end of file. This also - holds true when reading a byte vector (CBOR or MessagePack). - -@liveexample{The following code shows how a `parse_error` exception can be -caught.,parse_error} - -@sa - @ref exception for the base class of the library exceptions -@sa - @ref invalid_iterator for exceptions indicating errors with iterators -@sa - @ref type_error for exceptions indicating executing a member function with - a wrong type -@sa - @ref out_of_range for exceptions indicating access out of the defined range -@sa - @ref other_error for exceptions indicating other library errors - -@since version 3.0.0 -*/ -class parse_error : public exception -{ - public: - /*! - @brief create a parse error exception - @param[in] id_ the id of the exception - @param[in] pos the position where the error occurred (or with - chars_read_total=0 if the position cannot be - determined) - @param[in] what_arg the explanatory string - @return parse_error object - */ - static parse_error create(int id_, const position_t& pos, const std::string& what_arg) - { - std::string w = exception::name("parse_error", id_) + "parse error" + - position_string(pos) + ": " + what_arg; - return parse_error(id_, pos.chars_read_total, w.c_str()); - } - static parse_error create(int id_, std::size_t byte_, const std::string& what_arg) - { - std::string w = exception::name("parse_error", id_) + "parse error" + - (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") + - ": " + what_arg; - return parse_error(id_, byte_, w.c_str()); - } +// #include - /*! - @brief byte index of the parse error - The byte index of the last read character in the input file. +NLOHMANN_JSON_NAMESPACE_BEGIN +namespace detail +{ - @note For an input with n bytes, 1 is the index of the first character and - n+1 is the index of the terminating null byte or the end of file. - This also holds true when reading a byte vector (CBOR or MessagePack). - */ - const std::size_t byte; +/*! +@brief replace all occurrences of a substring by another string - private: - parse_error(int id_, std::size_t byte_, const char* what_arg) - : exception(id_, what_arg), byte(byte_) {} +@param[in,out] s the string to manipulate; changed so that all + occurrences of @a f are replaced with @a t +@param[in] f the substring to replace with @a t +@param[in] t the string to replace @a f - static std::string position_string(const position_t& pos) - { - return " at line " + std::to_string(pos.lines_read + 1) + - ", column " + std::to_string(pos.chars_read_current_line); - } -}; +@pre The search string @a f must not be empty. **This precondition is +enforced with an assertion.** -/*! -@brief exception indicating errors with iterators - -This exception is thrown if iterators passed to a library function do not match -the expected semantics. - -Exceptions have ids 2xx. - -name / id | example message | description ------------------------------------ | --------------- | ------------------------- -json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid. -json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion. -json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from. -json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid. -json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid. -json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range. -json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key. -json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered. -json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered. -json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid. -json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to. -json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container. -json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered. -json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin(). - -@liveexample{The following code shows how an `invalid_iterator` exception can be -caught.,invalid_iterator} - -@sa - @ref exception for the base class of the library exceptions -@sa - @ref parse_error for exceptions indicating a parse error -@sa - @ref type_error for exceptions indicating executing a member function with - a wrong type -@sa - @ref out_of_range for exceptions indicating access out of the defined range -@sa - @ref other_error for exceptions indicating other library errors - -@since version 3.0.0 +@since version 2.0.0 */ -class invalid_iterator : public exception +template +inline void replace_substring(StringType& s, const StringType& f, + const StringType& t) { - public: - static invalid_iterator create(int id_, const std::string& what_arg) - { - std::string w = exception::name("invalid_iterator", id_) + what_arg; - return invalid_iterator(id_, w.c_str()); - } - - private: - JSON_HEDLEY_NON_NULL(3) - invalid_iterator(int id_, const char* what_arg) - : exception(id_, what_arg) {} -}; + JSON_ASSERT(!f.empty()); + for (auto pos = s.find(f); // find first occurrence of f + pos != StringType::npos; // make sure f was found + s.replace(pos, f.size(), t), // replace with t, and + pos = s.find(f, pos + t.size())) // find next occurrence of f + {} +} /*! -@brief exception indicating executing a member function with a wrong type - -This exception is thrown in case of a type error; that is, a library function is -executed on a JSON value whose type does not match the expected semantics. - -Exceptions have ids 3xx. - -name / id | example message | description ------------------------------ | --------------- | ------------------------- -json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead. -json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types. -json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t &. -json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types. -json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types. -json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types. -json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types. -json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types. -json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types. -json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types. -json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types. -json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types. -json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined. -json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers. -json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive. -json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. | -json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) | - -@liveexample{The following code shows how a `type_error` exception can be -caught.,type_error} - -@sa - @ref exception for the base class of the library exceptions -@sa - @ref parse_error for exceptions indicating a parse error -@sa - @ref invalid_iterator for exceptions indicating errors with iterators -@sa - @ref out_of_range for exceptions indicating access out of the defined range -@sa - @ref other_error for exceptions indicating other library errors - -@since version 3.0.0 -*/ -class type_error : public exception + * @brief string escaping as described in RFC 6901 (Sect. 4) + * @param[in] s string to escape + * @return escaped string + * + * Note the order of escaping "~" to "~0" and "/" to "~1" is important. + */ +template +inline StringType escape(StringType s) { - public: - static type_error create(int id_, const std::string& what_arg) - { - std::string w = exception::name("type_error", id_) + what_arg; - return type_error(id_, w.c_str()); - } - - private: - JSON_HEDLEY_NON_NULL(3) - type_error(int id_, const char* what_arg) : exception(id_, what_arg) {} -}; + replace_substring(s, StringType{"~"}, StringType{"~0"}); + replace_substring(s, StringType{"/"}, StringType{"~1"}); + return s; +} /*! -@brief exception indicating access out of the defined range - -This exception is thrown in case a library function is called on an input -parameter that exceeds the expected range, for instance in case of array -indices or nonexisting object keys. - -Exceptions have ids 4xx. - -name / id | example message | description -------------------------------- | --------------- | ------------------------- -json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1. -json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it. -json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object. -json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved. -json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value. -json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF. -json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. (until version 3.8.0) | -json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. | -json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string | - -@liveexample{The following code shows how an `out_of_range` exception can be -caught.,out_of_range} - -@sa - @ref exception for the base class of the library exceptions -@sa - @ref parse_error for exceptions indicating a parse error -@sa - @ref invalid_iterator for exceptions indicating errors with iterators -@sa - @ref type_error for exceptions indicating executing a member function with - a wrong type -@sa - @ref other_error for exceptions indicating other library errors - -@since version 3.0.0 -*/ -class out_of_range : public exception + * @brief string unescaping as described in RFC 6901 (Sect. 4) + * @param[in] s string to unescape + * @return unescaped string + * + * Note the order of escaping "~1" to "/" and "~0" to "~" is important. + */ +template +static void unescape(StringType& s) { - public: - static out_of_range create(int id_, const std::string& what_arg) - { - std::string w = exception::name("out_of_range", id_) + what_arg; - return out_of_range(id_, w.c_str()); - } + replace_substring(s, StringType{"~1"}, StringType{"/"}); + replace_substring(s, StringType{"~0"}, StringType{"~"}); +} - private: - JSON_HEDLEY_NON_NULL(3) - out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {} -}; +} // namespace detail +NLOHMANN_JSON_NAMESPACE_END -/*! -@brief exception indicating other library errors +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT -This exception is thrown in case of errors that cannot be classified with the -other exception types. -Exceptions have ids 5xx. -name / id | example message | description ------------------------------- | --------------- | ------------------------- -json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed. +#include // size_t -@sa - @ref exception for the base class of the library exceptions -@sa - @ref parse_error for exceptions indicating a parse error -@sa - @ref invalid_iterator for exceptions indicating errors with iterators -@sa - @ref type_error for exceptions indicating executing a member function with - a wrong type -@sa - @ref out_of_range for exceptions indicating access out of the defined range +// #include -@liveexample{The following code shows how an `other_error` exception can be -caught.,other_error} -@since version 3.0.0 -*/ -class other_error : public exception +NLOHMANN_JSON_NAMESPACE_BEGIN +namespace detail { - public: - static other_error create(int id_, const std::string& what_arg) + +/// struct to capture the start position of the current token +struct position_t +{ + /// the total number of characters read + std::size_t chars_read_total = 0; + /// the number of characters read in the current line + std::size_t chars_read_current_line = 0; + /// the number of lines read + std::size_t lines_read = 0; + + /// conversion to size_t to preserve SAX interface + constexpr operator size_t() const { - std::string w = exception::name("other_error", id_) + what_arg; - return other_error(id_, w.c_str()); + return chars_read_total; } - - private: - JSON_HEDLEY_NON_NULL(3) - other_error(int id_, const char* what_arg) : exception(id_, what_arg) {} }; + } // namespace detail -} // namespace nlohmann +NLOHMANN_JSON_NAMESPACE_END // #include // #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-FileCopyrightText: 2018 The Abseil Authors +// SPDX-License-Identifier: MIT + +#include // array #include // size_t #include // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type +#include // index_sequence, make_index_sequence, index_sequence_for -namespace nlohmann -{ +// #include + + +NLOHMANN_JSON_NAMESPACE_BEGIN namespace detail { + +template +using uncvref_t = typename std::remove_cv::type>::type; + +#ifdef JSON_HAS_CPP_14 + +// the following utilities are natively available in C++14 +using std::enable_if_t; +using std::index_sequence; +using std::make_index_sequence; +using std::index_sequence_for; + +#else + // 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; +// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h +// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0. + +//// START OF CODE FROM GOOGLE ABSEIL -// implementation of C++14 index_sequence and affiliates -// source: https://stackoverflow.com/a/32223343 -template -struct index_sequence +// integer_sequence +// +// Class template representing a compile-time integer sequence. An instantiation +// of `integer_sequence` has a sequence of integers encoded in its +// type through its template arguments (which is a common need when +// working with C++11 variadic templates). `absl::integer_sequence` is designed +// to be a drop-in replacement for C++14's `std::integer_sequence`. +// +// Example: +// +// template< class T, T... Ints > +// void user_function(integer_sequence); +// +// int main() +// { +// // user_function's `T` will be deduced to `int` and `Ints...` +// // will be deduced to `0, 1, 2, 3, 4`. +// user_function(make_integer_sequence()); +// } +template +struct integer_sequence { - using type = index_sequence; - using value_type = std::size_t; + using value_type = T; static constexpr std::size_t size() noexcept { return sizeof...(Ints); } }; -template -struct merge_and_renumber; +// index_sequence +// +// A helper template for an `integer_sequence` of `size_t`, +// `absl::index_sequence` is designed to be a drop-in replacement for C++14's +// `std::index_sequence`. +template +using index_sequence = integer_sequence; + +namespace utility_internal +{ + +template +struct Extend; + +// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency. +template +struct Extend, SeqSize, 0> +{ + using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >; +}; + +template +struct Extend, SeqSize, 1> +{ + using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >; +}; + +// Recursion helper for 'make_integer_sequence'. +// 'Gen::type' is an alias for 'integer_sequence'. +template +struct Gen +{ + using type = + typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type; +}; + +template +struct Gen +{ + using type = integer_sequence; +}; + +} // namespace utility_internal -template -struct merge_and_renumber, index_sequence> - : index_sequence < I1..., (sizeof...(I1) + I2)... > {}; +// Compile-time sequences of integers -template -struct make_index_sequence - : merge_and_renumber < typename make_index_sequence < N / 2 >::type, - typename make_index_sequence < N - N / 2 >::type > {}; +// make_integer_sequence +// +// This template alias is equivalent to +// `integer_sequence`, and is designed to be a drop-in +// replacement for C++14's `std::make_integer_sequence`. +template +using make_integer_sequence = typename utility_internal::Gen::type; -template<> struct make_index_sequence<0> : index_sequence<> {}; -template<> struct make_index_sequence<1> : index_sequence<0> {}; +// make_index_sequence +// +// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`, +// and is designed to be a drop-in replacement for C++14's +// `std::make_index_sequence`. +template +using make_index_sequence = make_integer_sequence; -template +// index_sequence_for +// +// Converts a typename pack into an index sequence of the same length, and +// is designed to be a drop-in replacement for C++14's +// `std::index_sequence_for()` +template using index_sequence_for = make_index_sequence; +//// END OF CODE FROM GOOGLE ABSEIL + +#endif + // dispatch utility (taken from ranges-v3) template struct priority_tag : priority_tag < N - 1 > {}; template<> struct priority_tag<0> {}; @@ -2720,48 +3194,63 @@ template<> struct priority_tag<0> {}; template struct static_const { - static constexpr T value{}; + static JSON_INLINE_VARIABLE constexpr T value{}; }; -template -constexpr T static_const::value; +#ifndef JSON_HAS_CPP_17 + template + constexpr T static_const::value; +#endif + +template +inline constexpr std::array make_array(Args&& ... args) +{ + return std::array {{static_cast(std::forward(args))...}}; +} + } // namespace detail -} // namespace nlohmann +NLOHMANN_JSON_NAMESPACE_END // #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT + #include // numeric_limits #include // false_type, is_constructible, is_integral, is_same, true_type #include // declval +#include // tuple // #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT -#include // random_access_iterator_tag -// #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 // #include -namespace nlohmann -{ +NLOHMANN_JSON_NAMESPACE_BEGIN namespace detail { + template struct iterator_types {}; @@ -2800,157 +3289,135 @@ struct iterator_traits::value>> using pointer = T*; using reference = T&; }; -} // namespace detail -} // namespace nlohmann + +} // namespace detail +NLOHMANN_JSON_NAMESPACE_END // #include -// #include +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT -// #include -#include +// #include -// #include +NLOHMANN_JSON_NAMESPACE_BEGIN -// https://en.cppreference.com/w/cpp/experimental/is_detected -namespace nlohmann -{ -namespace detail -{ -struct nonesuch -{ - nonesuch() = delete; - ~nonesuch() = delete; - nonesuch(nonesuch const&) = delete; - nonesuch(nonesuch const&&) = delete; - void operator=(nonesuch const&) = delete; - void operator=(nonesuch&&) = delete; -}; +NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin); -template class Op, - class... Args> -struct detector -{ - using value_t = std::false_type; - using type = Default; -}; +NLOHMANN_JSON_NAMESPACE_END -template class Op, class... Args> -struct detector>, Op, Args...> -{ - using value_t = std::true_type; - using type = Op; -}; +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT -template class Op, class... Args> -using is_detected = typename detector::value_t; -template class Op, class... Args> -using detected_t = typename detector::type; -template class Op, class... Args> -using detected_or = detector; +// #include -template class Op, class... Args> -using detected_or_t = typename detected_or::type; -template class Op, class... Args> -using is_detected_exact = std::is_same>; +NLOHMANN_JSON_NAMESPACE_BEGIN -template class Op, class... Args> -using is_detected_convertible = - std::is_convertible, To>; -} // namespace detail -} // namespace nlohmann +NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end); + +NLOHMANN_JSON_NAMESPACE_END + +// #include + +// #include // #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.2 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann +// SPDX-License-Identifier: MIT + #ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_ -#define INCLUDE_NLOHMANN_JSON_FWD_HPP_ + #define INCLUDE_NLOHMANN_JSON_FWD_HPP_ -#include // int64_t, uint64_t -#include // map -#include // allocator -#include // string -#include // vector + #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 + // #include -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 BinaryType = std::vector> -class basic_json; -/*! -@brief JSON Pointer + /*! + @brief namespace for Niels Lohmann + @see https://github.com/nlohmann + @since version 1.0.0 + */ + NLOHMANN_JSON_NAMESPACE_BEGIN -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. + /*! + @brief default JSONSerializer template argument -@sa [RFC 6901](https://tools.ietf.org/html/rfc6901) + 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; -@since version 2.0.0 -*/ -template -class json_pointer; + /// a class to store JSON values + /// @sa https://json.nlohmann.me/api/basic_json/ + 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 BinaryType = std::vector> + class basic_json; -/*! -@brief default JSON class + /// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document + /// @sa https://json.nlohmann.me/api/json_pointer/ + template + class json_pointer; -This type is the default specialization of the @ref basic_json class which -uses the standard template types. + /*! + @brief default specialization + @sa https://json.nlohmann.me/api/json/ + */ + using json = basic_json<>; -@since version 1.0.0 -*/ -using json = basic_json<>; + /// @brief a minimal map-like container that preserves insertion order + /// @sa https://json.nlohmann.me/api/ordered_map/ + template + struct ordered_map; -template -struct ordered_map; + /// @brief specialization that maintains the insertion order of object keys + /// @sa https://json.nlohmann.me/api/ordered_json/ + using ordered_json = basic_json; -/*! -@brief ordered JSON class - -This type preserves the insertion order of object keys. - -@since version 3.9.0 -*/ -using ordered_json = basic_json; - -} // namespace nlohmann + NLOHMANN_JSON_NAMESPACE_END #endif // INCLUDE_NLOHMANN_JSON_FWD_HPP_ -namespace nlohmann -{ +NLOHMANN_JSON_NAMESPACE_BEGIN /*! @brief detail namespace with internal helper functions @@ -2961,6 +3428,7 @@ implementations of some @ref basic_json methods, and meta-programming helpers. */ namespace detail { + ///////////// // helpers // ///////////// @@ -2979,6 +3447,16 @@ template struct is_basic_json : std::false_type {}; NLOHMANN_BASIC_JSON_TPL_DECLARATION struct is_basic_json : std::true_type {}; +// used by exceptions create() member functions +// true_type for pointer to possibly cv-qualified basic_json or std::nullptr_t +// false_type otherwise +template +struct is_basic_json_context : + std::integral_constant < bool, + is_basic_json::type>::type>::value + || std::is_same::value > +{}; + ////////////////////// // json_ref helpers // ////////////////////// @@ -3017,9 +3495,6 @@ using reference_t = typename T::reference; template using iterator_category_t = typename T::iterator_category; -template -using iterator_t = typename T::iterator; - template using to_json_function = decltype(T::to_json(std::declval()...)); @@ -3044,8 +3519,7 @@ struct is_getable }; template -struct has_from_json < BasicJsonType, T, - enable_if_t < !is_basic_json::value >> +struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> { using serializer = typename BasicJsonType::template json_serializer; @@ -3084,11 +3558,78 @@ struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> T>::value; }; +template +using detect_key_compare = typename T::key_compare; + +template +struct has_key_compare : std::integral_constant::value> {}; + +// obtains the actual object key comparator +template +struct actual_object_comparator +{ + using object_t = typename BasicJsonType::object_t; + using object_comparator_t = typename BasicJsonType::default_object_comparator_t; + using type = typename std::conditional < has_key_compare::value, + typename object_t::key_compare, object_comparator_t>::type; +}; + +template +using actual_object_comparator_t = typename actual_object_comparator::type; /////////////////// // is_ functions // /////////////////// +// https://en.cppreference.com/w/cpp/types/conjunction +template struct conjunction : std::true_type { }; +template struct conjunction : B { }; +template +struct conjunction +: std::conditional(B::value), conjunction, B>::type {}; + +// https://en.cppreference.com/w/cpp/types/negation +template struct negation : std::integral_constant < bool, !B::value > { }; + +// Reimplementation of is_constructible and is_default_constructible, due to them being broken for +// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367). +// This causes compile errors in e.g. clang 3.5 or gcc 4.9. +template +struct is_default_constructible : std::is_default_constructible {}; + +template +struct is_default_constructible> + : conjunction, is_default_constructible> {}; + +template +struct is_default_constructible> + : conjunction, is_default_constructible> {}; + +template +struct is_default_constructible> + : conjunction...> {}; + +template +struct is_default_constructible> + : conjunction...> {}; + + +template +struct is_constructible : std::is_constructible {}; + +template +struct is_constructible> : is_default_constructible> {}; + +template +struct is_constructible> : is_default_constructible> {}; + +template +struct is_constructible> : is_default_constructible> {}; + +template +struct is_constructible> : is_default_constructible> {}; + + template struct is_iterator_traits : std::false_type {}; @@ -3107,7 +3648,34 @@ struct is_iterator_traits> is_detected::value; }; -// source: https://stackoverflow.com/a/37193089/4116453 +template +struct is_range +{ + private: + using t_ref = typename std::add_lvalue_reference::type; + + using iterator = detected_t; + using sentinel = detected_t; + + // to be 100% correct, it should use https://en.cppreference.com/w/cpp/iterator/input_or_output_iterator + // and https://en.cppreference.com/w/cpp/iterator/sentinel_for + // but reimplementing these would be too much work, as a lot of other concepts are used underneath + static constexpr auto is_iterator_begin = + is_iterator_traits>::value; + + public: + static constexpr bool value = !std::is_same::value && !std::is_same::value && is_iterator_begin; +}; + +template +using iterator_t = enable_if_t::value, result_of_begin())>>; + +template +using range_value_t = value_type_t>>; + +// The following implementation of is_complete_type is taken from +// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/ +// and is written by Xiang Fan who agreed to using it in this library. template struct is_complete_type : std::false_type {}; @@ -3125,14 +3693,13 @@ struct is_compatible_object_type_impl < enable_if_t < is_detected::value&& is_detected::value >> { - using object_t = typename BasicJsonType::object_t; // macOS's is_constructible does not play well with nonesuch... static constexpr bool value = - std::is_constructible::value && - std::is_constructible::value; }; @@ -3153,10 +3720,10 @@ struct is_constructible_object_type_impl < using object_t = typename BasicJsonType::object_t; static constexpr bool value = - (std::is_default_constructible::value && + (is_default_constructible::value && (std::is_move_assignable::value || std::is_copy_assignable::value) && - (std::is_constructible::value && std::is_same < typename object_t::mapped_type, @@ -3173,60 +3740,46 @@ struct is_constructible_object_type : is_constructible_object_type_impl {}; -template -struct is_compatible_string_type_impl : std::false_type {}; - template -struct is_compatible_string_type_impl < - BasicJsonType, CompatibleStringType, - enable_if_t::value >> +struct is_compatible_string_type { static constexpr auto value = - std::is_constructible::value; + is_constructible::value; }; template -struct is_compatible_string_type - : is_compatible_string_type_impl {}; - -template -struct is_constructible_string_type_impl : std::false_type {}; - -template -struct is_constructible_string_type_impl < - BasicJsonType, ConstructibleStringType, - enable_if_t::value >> +struct is_constructible_string_type { + // launder type through decltype() to fix compilation failure on ICPC +#ifdef __INTEL_COMPILER + using laundered_type = decltype(std::declval()); +#else + using laundered_type = ConstructibleStringType; +#endif + static constexpr auto value = - std::is_constructible::value; + conjunction < + is_constructible, + is_detected_exact>::value; }; -template -struct is_constructible_string_type - : is_constructible_string_type_impl {}; - template struct is_compatible_array_type_impl : std::false_type {}; template struct is_compatible_array_type_impl < BasicJsonType, CompatibleArrayType, - enable_if_t < is_detected::value&& + enable_if_t < is_detected::value&& -// This is needed because json_reverse_iterator has a ::iterator type... -// Therefore it is detected as a CompatibleArrayType. -// The real fix would be to have an Iterable concept. - !is_iterator_traits < - iterator_traits>::value >> + is_iterator_traits>>::value&& +// special case for types like std::filesystem::path whose iterator's value_type are themselves +// c.f. https://github.com/nlohmann/json/pull/3073 + !std::is_same>::value >> { static constexpr bool value = - std::is_constructible::value; + is_constructible>::value; }; template @@ -3248,28 +3801,29 @@ struct is_constructible_array_type_impl < BasicJsonType, ConstructibleArrayType, enable_if_t < !std::is_same::value&& - std::is_default_constructible::value&& + !is_compatible_string_type::value&& + is_default_constructible::value&& (std::is_move_assignable::value || std::is_copy_assignable::value)&& -is_detected::value&& is_detected::value&& -is_complete_type < -detected_t>::value >> +is_iterator_traits>>::value&& +is_detected::value&& +// special case for types like std::filesystem::path whose iterator's value_type are themselves +// c.f. https://github.com/nlohmann/json/pull/3073 +!std::is_same>::value&& + is_complete_type < + detected_t>::value >> { + using value_type = range_value_t; + static constexpr bool value = - // This is needed because json_reverse_iterator has a ::iterator type, - // furthermore, std::back_insert_iterator (and other iterators) have a - // base class `iterator`... Therefore it is detected as a - // ConstructibleArrayType. The real fix would be to have an Iterable - // concept. - !is_iterator_traits>::value && - - (std::is_same::value || - has_from_json::value || - has_non_default_from_json < - BasicJsonType, typename ConstructibleArrayType::value_type >::value); + std::is_same::value || + has_from_json::value || + has_non_default_from_json < + BasicJsonType, + value_type >::value; }; template @@ -3292,7 +3846,7 @@ struct is_compatible_integer_type_impl < using CompatibleLimits = std::numeric_limits; static constexpr auto value = - std::is_constructible::value && CompatibleLimits::is_integer && RealLimits::is_signed == CompatibleLimits::is_signed; @@ -3319,221 +3873,843 @@ template struct is_compatible_type : is_compatible_type_impl {}; -// https://en.cppreference.com/w/cpp/types/conjunction -template struct conjunction : std::true_type { }; -template struct conjunction : B1 { }; -template -struct conjunction -: std::conditional, B1>::type {}; - template struct is_constructible_tuple : std::false_type {}; template -struct is_constructible_tuple> : conjunction...> {}; -} // namespace detail -} // namespace nlohmann +struct is_constructible_tuple> : conjunction...> {}; -// #include +template +struct is_json_iterator_of : std::false_type {}; +template +struct is_json_iterator_of : std::true_type {}; -#include // array -#include // size_t -#include // uint8_t -#include // string +template +struct is_json_iterator_of : std::true_type +{}; -namespace nlohmann -{ -namespace detail -{ -/////////////////////////// -// JSON type enumeration // -/////////////////////////// +// checks if a given type T is a template specialization of Primary +template

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�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 eS64Y)uKx#F63NaYB=9T%0000s0F literal 0 HcmV?d00001 From 62b949679bff76270228aecf86cb1109168ce0c5 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 30 Aug 2020 20:31:56 +0200 Subject: [PATCH 025/234] Respect `Use multiple columns` setting for all folder items Currently it was used only in some cases (like Programs/Apps folder). It will be more consistent to respect the setting for all folder items. Fixes #436. --- Src/StartMenu/StartMenuDLL/MenuCommands.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/StartMenu/StartMenuDLL/MenuCommands.cpp b/Src/StartMenu/StartMenuDLL/MenuCommands.cpp index bd89335cc..2f6acd026 100644 --- a/Src/StartMenu/StartMenuDLL/MenuCommands.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuCommands.cpp @@ -402,7 +402,7 @@ void CMenuContainer::OpenSubMenu( int index, TActivateType type, bool bShift ) if (m_Options&CONTAINER_NOEXTENSIONS) options|=CONTAINER_NOEXTENSIONS; - if (item.id==MENU_PROGRAMS || item.id==MENU_APPS || (m_Options&CONTAINER_MULTICOL_REC)) + if (item.id==MENU_PROGRAMS || item.id==MENU_APPS || item.bFolder || (m_Options&CONTAINER_MULTICOL_REC)) options|=CONTAINER_MULTICOL_REC; if ((options&CONTAINER_MULTICOL_REC) && !bShift) options|=CONTAINER_MULTICOLUMN; From 7ee668e4745c9d172a6d1515ea2344847221b68c Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 30 Aug 2020 21:39:28 +0200 Subject: [PATCH 026/234] Installer: Fix URLs Fixes #404 --- Src/Setup/Setup.wxs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Src/Setup/Setup.wxs b/Src/Setup/Setup.wxs index 4d414c2c8..bfbabfdf5 100644 --- a/Src/Setup/Setup.wxs +++ b/Src/Setup/Setup.wxs @@ -384,8 +384,8 @@ - ]]> + @@ -595,9 +595,9 @@ - + - + From 6581868336beab245ecad5e4b78bb55915dfa9c4 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Mon, 31 Aug 2020 19:20:09 +0200 Subject: [PATCH 027/234] ModernSettings: Add support for more settings Based on `HostId`: * {7E0522FC-1AC4-41CA-AFD0-3610417A9C41} execute `shell:::{PageId}` * {12B1697E-D3A0-4DBC-B568-CCF64A3F934D} execute command in `DeepLink` --- .../StartMenuHelper/ModernSettings.cpp | 6 +-- .../StartMenuHelper/ModernSettings.h | 2 +- .../ModernSettingsContextMenu.cpp | 46 ++++++++++++++++++- .../ModernSettingsShellFolder.cpp | 15 ++---- 4 files changed, 54 insertions(+), 15 deletions(-) diff --git a/Src/StartMenu/StartMenuHelper/ModernSettings.cpp b/Src/StartMenu/StartMenuHelper/ModernSettings.cpp index 1ef7bfdf1..faa24b69b 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettings.cpp +++ b/Src/StartMenu/StartMenuHelper/ModernSettings.cpp @@ -359,13 +359,13 @@ ModernSettings::Setting::Setting(const Blob& blob) }); } -std::vector ModernSettings::enumerate() const +std::vector ModernSettings::enumerate() const { - std::vector retval; + std::vector retval; retval.reserve(m_settings.size()); for (const auto& i : m_settings) - retval.emplace_back(i.second); + retval.emplace_back(i.first); return retval; } diff --git a/Src/StartMenu/StartMenuHelper/ModernSettings.h b/Src/StartMenu/StartMenuHelper/ModernSettings.h index 1795a3362..e1c4a1836 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettings.h +++ b/Src/StartMenu/StartMenuHelper/ModernSettings.h @@ -127,7 +127,7 @@ class ModernSettings } }; - std::vector enumerate() const; + std::vector enumerate() const; Setting get(const std::wstring_view& name) const; private: diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp index 549b774b6..6deee6713 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp @@ -70,6 +70,11 @@ static bool ActivateModernSettingPage(const WCHAR* page) extern ModernSettings::Setting GetModernSetting(LPCITEMIDLIST pidl); +static HRESULT Execute(const wchar_t* cmd) +{ + return (intptr_t)::ShellExecute(nullptr, L"open", cmd, nullptr, nullptr, SW_SHOWNORMAL) > 32 ? S_OK : E_FAIL; +} + static HRESULT OpenItemByPidl(LPCITEMIDLIST pidl) { auto child = ILFindLastID(pidl); @@ -80,10 +85,49 @@ static HRESULT OpenItemByPidl(LPCITEMIDLIST pidl) if (setting.hostId == L"{6E6DDBCB-9C89-434B-A994-D5F22239523B}") { + if (setting.deepLink.empty()) + return E_INVALIDARG; + std::wstring cmd(L"windowsdefender://"); cmd += setting.deepLink; - return (intptr_t)::ShellExecute(nullptr, L"open", cmd.c_str(), nullptr, nullptr, SW_SHOWNORMAL) > 32 ? S_OK : E_FAIL; + return Execute(cmd.c_str()); + } + + if (setting.hostId == L"{7E0522FC-1AC4-41CA-AFD0-3610417A9C41}") + { + if (setting.pageId.empty()) + return E_INVALIDARG; + + std::wstring cmd(L"shell:::"); + cmd += setting.pageId; + + return Execute(cmd.c_str()); + } + + if (setting.hostId == L"{12B1697E-D3A0-4DBC-B568-CCF64A3F934D}") + { + if (setting.deepLink.empty()) + return E_INVALIDARG; + + std::wstring cmd(setting.deepLink); + + if (cmd.compare(0, 8, L"shell:::") == 0) + return Execute(cmd.c_str()); + + cmd.resize(MAX_PATH); + DoEnvironmentSubst(cmd.data(), (UINT)cmd.size()); + + STARTUPINFO startupInfo = { sizeof(startupInfo) }; + PROCESS_INFORMATION processInfo{}; + + if (!CreateProcess(nullptr, cmd.data(), nullptr, nullptr, FALSE, 0, nullptr, nullptr, &startupInfo, &processInfo)) + return E_FAIL; + + CloseHandle(processInfo.hThread); + CloseHandle(processInfo.hProcess); + + return S_OK; } if (setting.pageId.empty()) diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.cpp b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.cpp index 21f944356..37ba9505b 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.cpp +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.cpp @@ -91,16 +91,11 @@ class ATL_NO_VTABLE CModernSettingsShellFolderEnumIDList : ULONG i = 0; while (SUCCEEDED(hr) && i < celt && m_item < m_items.size()) { - const auto& s = m_items[m_item]; - if ((s.hostId.empty() && s.deepLink.empty()) || - (s.hostId == L"{6E6DDBCB-9C89-434B-A994-D5F22239523B}" && !s.deepLink.empty())) + hr = m_parent->CreateChildID(m_items[m_item], &rgelt[i]); + if (SUCCEEDED(hr)) { - hr = m_parent->CreateChildID(s.fileName, &rgelt[i]); - if (SUCCEEDED(hr)) - { - celtFetched++; - i++; - } + celtFetched++; + i++; } m_item++; @@ -141,7 +136,7 @@ class ATL_NO_VTABLE CModernSettingsShellFolderEnumIDList : private: CComPtr m_parent; std::shared_ptr m_settings; - std::vector m_items; + std::vector m_items; DWORD m_item = 0; }; From e210b4a65a0cff5561f343f681a20052c808a0d7 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Mon, 31 Aug 2020 20:15:44 +0200 Subject: [PATCH 028/234] CAbsolutePidl: Allow copy from PCIDLIST_ABSOLUTE --- Src/Lib/ComHelper.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/Lib/ComHelper.h b/Src/Lib/ComHelper.h index 75fab1c15..3a2a4eb4c 100644 --- a/Src/Lib/ComHelper.h +++ b/Src/Lib/ComHelper.h @@ -14,6 +14,7 @@ class CAbsolutePidl CAbsolutePidl( const CAbsolutePidl &pidl ) { m_Pidl=pidl?ILCloneFull(pidl):NULL; } ~CAbsolutePidl( void ) { Clear(); } void operator=( const CAbsolutePidl &pidl ) { Clone(pidl); } + void operator=( PCIDLIST_ABSOLUTE pidl ) { Clone(pidl); } void Clear( void ) { if (m_Pidl) ILFree(m_Pidl); m_Pidl=NULL; } operator PIDLIST_ABSOLUTE( void ) const { return m_Pidl; } @@ -21,7 +22,7 @@ class CAbsolutePidl void Swap( CAbsolutePidl &pidl ) { PIDLIST_ABSOLUTE q=pidl.m_Pidl; pidl.m_Pidl=m_Pidl; m_Pidl=q; } void Attach( PIDLIST_ABSOLUTE pidl ) { Clear(); m_Pidl=pidl; } PIDLIST_ABSOLUTE Detach( void ) { PIDLIST_ABSOLUTE pidl=m_Pidl; m_Pidl=NULL; return pidl; } - void Clone( PIDLIST_ABSOLUTE pidl ) { Clear(); m_Pidl=pidl?ILCloneFull(pidl):NULL; } + void Clone( PCIDLIST_ABSOLUTE pidl ) { Clear(); m_Pidl=pidl?ILCloneFull(pidl):NULL; } private: PIDLIST_ABSOLUTE m_Pidl; From 9752afbebc27962946466c0a4f23f4ca2af34bb7 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Mon, 31 Aug 2020 20:11:50 +0200 Subject: [PATCH 029/234] ModernSettings: Use smart pointers --- .../StartMenuHelper/ModernSettingsContextMenu.cpp | 6 ++---- .../StartMenuHelper/ModernSettingsShellFolder.cpp | 11 +++-------- .../StartMenuHelper/ModernSettingsShellFolder.h | 3 ++- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp index 6deee6713..bf282fe79 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp @@ -5,6 +5,7 @@ #include "stdafx.h" #include "ModernSettings.h" #include "ModernSettingsContextMenu.h" +#include "ComHelper.h" #define MENUVERB_OPEN 0 @@ -177,13 +178,10 @@ HRESULT CModernSettingsContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO pici) { if (uID == MENUVERB_OPEN && m_pdtobj) { - LPITEMIDLIST pidl; + CAbsolutePidl pidl; hr = SHGetIDListFromObject(m_pdtobj, &pidl); if (SUCCEEDED(hr)) - { hr = OpenItemByPidl(pidl); - ILFree(pidl); - } } } diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.cpp b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.cpp index 37ba9505b..a9e973ee3 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.cpp +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.cpp @@ -341,7 +341,7 @@ HRESULT CModernSettingsShellFolder::GetUIObjectOf(HWND hwnd, UINT cidl, PCUITEMI { if (!s.icon.empty()) { - IDefaultExtractIconInit* pdxi; + CComPtr pdxi; hr = SHCreateDefaultExtractIcon(IID_PPV_ARGS(&pdxi)); if (SUCCEEDED(hr)) { @@ -353,8 +353,6 @@ HRESULT CModernSettingsShellFolder::GetUIObjectOf(HWND hwnd, UINT cidl, PCUITEMI hr = pdxi->SetNormalIcon(icon_path, location); if (SUCCEEDED(hr)) hr = pdxi->QueryInterface(riid, ppv); - - pdxi->Release(); } } else @@ -368,7 +366,6 @@ HRESULT CModernSettingsShellFolder::GetUIObjectOf(HWND hwnd, UINT cidl, PCUITEMI extract->SetGlyph(glyph); hr = extract->QueryInterface(riid, ppv); } - } } } @@ -409,7 +406,7 @@ HRESULT CModernSettingsShellFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, SHGDN else { WCHAR szDisplayName[MAX_PATH]; - PWSTR pszThisFolder; + CComString pszThisFolder; hr = SHGetNameFromIDList(m_pidl, (shgdnFlags & SHGDN_FORADDRESSBAR) ? SIGDN_DESKTOPABSOLUTEEDITING : SIGDN_DESKTOPABSOLUTEPARSING, &pszThisFolder); if (SUCCEEDED(hr)) { @@ -417,8 +414,6 @@ HRESULT CModernSettingsShellFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, SHGDN StringCchCat(szDisplayName, ARRAYSIZE(szDisplayName), L"\\"); StringCchCat(szDisplayName, ARRAYSIZE(szDisplayName), setting.fileName.data()); - CoTaskMemFree(pszThisFolder); - hr = StringToStrRet(szDisplayName, pName); } } @@ -535,7 +530,7 @@ HRESULT CModernSettingsShellFolder::GetClassID(CLSID* pClassID) // IPersistFolder method HRESULT CModernSettingsShellFolder::Initialize(PCIDLIST_ABSOLUTE pidl) { - m_pidl = ILCloneFull(pidl); + m_pidl = pidl; return m_pidl ? S_OK : E_FAIL; } diff --git a/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h index a6d84b489..e5d0a31ed 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h +++ b/Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h @@ -3,6 +3,7 @@ #pragma once #include "resource.h" +#include "ComHelper.h" #include "StartMenuHelper_i.h" #include #include @@ -78,7 +79,7 @@ END_COM_MAP() private: std::wstring_view GetColumnDisplayName(PCUITEMID_CHILD pidl, UINT iColumn); - PIDLIST_ABSOLUTE m_pidl = nullptr; // where this folder is in the name space + CAbsolutePidl m_pidl; // where this folder is in the name space }; OBJECT_ENTRY_AUTO(__uuidof(ModernSettingsShellFolder), CModernSettingsShellFolder) From 61d05b49c5398820666eb0b8e4a597f9a0c94e6e Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Mon, 31 Aug 2020 20:50:40 +0200 Subject: [PATCH 030/234] Improve search logging --- Src/StartMenu/StartMenuDLL/SearchManager.cpp | 25 +++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/SearchManager.cpp b/Src/StartMenu/StartMenuDLL/SearchManager.cpp index 12966670e..e215e8d2c 100644 --- a/Src/StartMenu/StartMenuDLL/SearchManager.cpp +++ b/Src/StartMenu/StartMenuDLL/SearchManager.cpp @@ -139,18 +139,25 @@ void CSearchManager::CloseMenu( void ) Lock lock(this,LOCK_DATA); m_LastRequestId++; m_LastProgramsRequestId=m_LastRequestId; - if (g_LogCategories&LOG_SEARCH) + if (g_LogCategories & LOG_SEARCH) { - for (std::vector::const_iterator it=m_ProgramItems.begin();it!=m_ProgramItems.end();++it) + for (const auto& item : m_ProgramItems) { - if (it->category==CATEGORY_PROGRAM) - LOG_MENU(LOG_SEARCH,L"Program: '%s', %d",it->name,it->rank); + if (item.category == CATEGORY_PROGRAM) + LOG_MENU(LOG_SEARCH, L"Program: '%s', %d", item.name, item.rank); } - std::sort(m_SettingsItems.begin(),m_SettingsItems.end()); - for (std::vector::const_iterator it=m_SettingsItems.begin();it!=m_SettingsItems.end();++it) + + std::sort(m_SettingsItems.begin(), m_SettingsItems.end()); + + for (const auto& item : m_SettingsItems) + { + if (item.category == CATEGORY_SETTING) + LOG_MENU(LOG_SEARCH, L"Setting: '%s', %d", item.name, item.rank); + } + for (const auto& item : m_SettingsItems) { - if (it->category==CATEGORY_SETTING) - LOG_MENU(LOG_SEARCH,L"Setting: '%s', %d",it->name,it->rank); + if (item.category == CATEGORY_METROSETTING) + LOG_MENU(LOG_SEARCH, L"MetroSetting: '%s', %d", item.name, item.rank); } } if (m_bProgramsFound) @@ -675,7 +682,7 @@ void CSearchManager::SearchThread( void ) if (GetWinVersion()>=WIN_VER_WIN8 && searchRequest.bSearchMetroApps) { std::vector links; - GetMetroLinks(links,false); + GetMetroLinks(links,true); for (std::vector::const_iterator it=links.begin();it!=links.end();++it) { if (GetWinVersion() Date: Mon, 21 Sep 2020 17:51:15 -0400 Subject: [PATCH 031/234] Add discord server badge :) (#462) Squashing because appveyor is stuck, also useless for a readme change --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9fd0bb4f5..c377403c1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ *Originally* **[Classic Shell](http://www.classicshell.net)** *by [Ivo Beltchev](https://sourceforge.net/u/ibeltchev/profile/)* -[![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![Build status](https://ci.appveyor.com/api/projects/status/2wj5x5qoypfjj0tr/branch/master?svg=true)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master) [![GitQ](https://gitq.com/badge.svg)](https://gitq.com/passionate-coder/Classic-Start) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/open-shell/Lobby) +[![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![Build status](https://ci.appveyor.com/api/projects/status/2wj5x5qoypfjj0tr/branch/master?svg=true)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master) [![GitQ](https://gitq.com/badge.svg)](https://gitq.com/passionate-coder/Classic-Start) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/open-shell/Lobby) [![Discord](https://img.shields.io/discord/757701054782636082?color=%4E5D94&label=Discord&logo=discord&logoColor=white)](https://discord.gg/7H6arr5) [Home Page](https://open-shell.github.io/Open-Shell-Menu) [Discussion room](https://gitter.im/Open-Shell) From cd8cc8cbc62c952fb34f4aec9f316d3b19ee23fe Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 20 Sep 2020 10:10:24 +0200 Subject: [PATCH 032/234] Skin: Add more DPI options Allow skin customizations for higher DPI displays by adding more DPI options: - 120_DPI - 144_DPI - 168_DPI - 192_DPI - 216_DPI - 240_DPI Fixes #458 . --- Src/StartMenu/StartMenuDLL/SkinManager.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Src/StartMenu/StartMenuDLL/SkinManager.cpp b/Src/StartMenu/StartMenuDLL/SkinManager.cpp index b3b1786d8..1a631d0f2 100644 --- a/Src/StartMenu/StartMenuDLL/SkinManager.cpp +++ b/Src/StartMenu/StartMenuDLL/SkinManager.cpp @@ -1495,8 +1495,21 @@ bool MenuSkin::ComputeOptionStates( const std::map &options, st values.push_back(L"ALL_PROGRAMS"); if (SkinType==SKIN_TYPE_CLASSIC2) values.push_back(L"TWO_COLUMNS"); + // for compatibility with existing skins if (Dpi>=144) values.push_back(L"HIGH_DPI"); + if (Dpi>=240) + values.push_back(L"240_DPI"); // 250% scaling + else if (Dpi>=216) + values.push_back(L"216_DPI"); // 225% scaling + else if (Dpi>=192) + values.push_back(L"192_DPI"); // 200% scaling + else if (Dpi>=168) + values.push_back(L"168_DPI"); // 175% scaling + else if (Dpi>=144) + values.push_back(L"144_DPI"); // 150% scaling + else if (Dpi>=120) + values.push_back(L"120_DPI"); // 125% scaling if (ForceTouch || (GetWinVersion()>=WIN_VER_WIN8 && GetSettingBool(L"EnableTouch") && (GetSystemMetrics(SM_DIGITIZER)&NID_INTEGRATED_TOUCH)!=0)) values.push_back(L"TOUCH_ENABLED"); if (GetSettingInt(L"SearchBox")!=SEARCHBOX_HIDDEN) From aa09a0dcc2ddc3f46efa35368c9ffe6911f677a8 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Mon, 21 Sep 2020 19:18:15 +0200 Subject: [PATCH 033/234] ItemManager: Keep metro name if already obtained --- Src/StartMenu/StartMenuDLL/ItemManager.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Src/StartMenu/StartMenuDLL/ItemManager.cpp b/Src/StartMenu/StartMenuDLL/ItemManager.cpp index 72df24c2c..8c2811483 100644 --- a/Src/StartMenu/StartMenuDLL/ItemManager.cpp +++ b/Src/StartMenu/StartMenuDLL/ItemManager.cpp @@ -1924,7 +1924,6 @@ void CItemManager::RefreshItemInfo( ItemInfo *pInfo, int refreshFlags, IShellIte { newInfo.targetPidl.Clear(); newInfo.targetPATH.Empty(); - newInfo.metroName.Empty(); newInfo.iconPath.Empty(); newInfo.bNoPin=newInfo.bNoNew=false; if (!newInfo.bMetroApp) From d3bf4b6207e51f78f72387249253e6b4cb4b6b48 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Mon, 21 Sep 2020 19:20:37 +0200 Subject: [PATCH 034/234] MenuContainer: Faster recent Metro apps enumeration It seems that `SHCreateItemInKnownFolder` is quite slow for Metro apps. Thus we should avoid it and use cached app info. --- Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp index a362c4d57..857561a58 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp @@ -1937,15 +1937,6 @@ void CMenuContainer::GetRecentPrograms( std::vector &items, int maxCou continue; } - { - CComPtr pAppItem; - if (FAILED(SHCreateItemInKnownFolder(FOLDERID_AppsFolder2,0,uaItem.name,IID_IShellItem,(void**)&pAppItem))) - continue; - CComString pName; - if (FAILED(pAppItem->GetDisplayName(SIGDN_NORMALDISPLAY,&pName)) || wcsncmp(pName,L"@{",2)==0) - continue; - } - uaItem.pLinkInfo=g_ItemManager.GetMetroAppInfo10(uaItem.name); if (!uaItem.pLinkInfo) { @@ -1956,6 +1947,11 @@ void CMenuContainer::GetRecentPrograms( std::vector &items, int maxCou LOG_MENU(LOG_MFU,L"UserAssist: '%s', %d, %.3f",uaItem.name,data.count,uaItem.rank); { CItemManager::RWLock lock(&g_ItemManager,false,CItemManager::RWLOCK_ITEMS); + if (uaItem.pLinkInfo->GetMetroName().IsEmpty() || wcsncmp(uaItem.pLinkInfo->GetMetroName(), L"@{",2)==0) + { + LOG_MENU(LOG_MFU, L"UserAssist: Dropping: No metro name"); + continue; + } if (uaItem.pLinkInfo->IsNoPin()) { LOG_MENU(LOG_MFU,L"UserAssist: Dropping: No pin"); From 935600a6d92ca316207b87c0363ab210c30e3f75 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Fri, 18 Sep 2020 12:14:06 +0200 Subject: [PATCH 035/234] Add LogPropertyStore helper --- Src/StartMenu/StartMenuDLL/LogManager.cpp | 30 +++++++++++++++++++++++ Src/StartMenu/StartMenuDLL/LogManager.h | 4 +++ 2 files changed, 34 insertions(+) diff --git a/Src/StartMenu/StartMenuDLL/LogManager.cpp b/Src/StartMenu/StartMenuDLL/LogManager.cpp index 84d9e142a..1d0651225 100644 --- a/Src/StartMenu/StartMenuDLL/LogManager.cpp +++ b/Src/StartMenu/StartMenuDLL/LogManager.cpp @@ -7,6 +7,8 @@ #include "stdafx.h" #include "LogManager.h" #include "ResourceHelper.h" +#include "ComHelper.h" +#include int g_LogCategories; static FILE *g_LogFile; @@ -51,3 +53,31 @@ void LogMessage( const wchar_t *text, ... ) fflush(g_LogFile); } + +void LogPropertyStore(TLogCategory category, IPropertyStore* store) +{ + if (!store) + return; + + DWORD count = 0; + store->GetCount(&count); + for (DWORD i = 0; i < count; i++) + { + PROPERTYKEY key{}; + store->GetAt(i, &key); + + PROPVARIANT val; + PropVariantInit(&val); + + store->GetValue(key, &val); + + CComString valueStr; + PropVariantToStringAlloc(val, &valueStr); + PropVariantClear(&val); + + wchar_t guidStr[100]{}; + StringFromGUID2(key.fmtid, guidStr, _countof(guidStr)); + + LOG_MENU(category, L"Property: {%s, %u} = %s", guidStr, key.pid, valueStr ? valueStr : L"???"); + } +} diff --git a/Src/StartMenu/StartMenuDLL/LogManager.h b/Src/StartMenu/StartMenuDLL/LogManager.h index a6e488534..6509889c5 100644 --- a/Src/StartMenu/StartMenuDLL/LogManager.h +++ b/Src/StartMenu/StartMenuDLL/LogManager.h @@ -4,6 +4,8 @@ #pragma once +#include + // LogManager.h - logging functionality (for debugging) // Logs different events in the start menu // Turn it on by setting the LogLevel setting in the registry @@ -33,3 +35,5 @@ void CloseLog( void ); void LogMessage( const wchar_t *text, ... ); #define STARTUP_LOG L"Software\\OpenShell\\StartMenu\\Settings|LogStartup|%LOCALAPPDATA%\\OpenShell\\StartupLog.txt" + +void LogPropertyStore(TLogCategory category, IPropertyStore* store); From 8a222821916f9ef2327672cf1e6d64638b7924df Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Fri, 18 Sep 2020 12:15:39 +0200 Subject: [PATCH 036/234] ItemManager: Better handling of modern application links Link to modern application will be treat as modern application itself. This fixes jump-lists and invert metro color option on modern apps pinned to start menu. --- Src/StartMenu/StartMenuDLL/ItemManager.cpp | 28 +++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/Src/StartMenu/StartMenuDLL/ItemManager.cpp b/Src/StartMenu/StartMenuDLL/ItemManager.cpp index 8c2811483..d568cd374 100644 --- a/Src/StartMenu/StartMenuDLL/ItemManager.cpp +++ b/Src/StartMenu/StartMenuDLL/ItemManager.cpp @@ -1824,7 +1824,11 @@ void CItemManager::RefreshItemInfo( ItemInfo *pInfo, int refreshFlags, IShellIte { newInfo.bLink=true; pStore=pLink; - +#ifdef _DEBUG + LOG_MENU(LOG_OPEN, L"Link: %s", newInfo.path); + LOG_MENU(LOG_OPEN, L"Link property store:"); + LogPropertyStore(LOG_OPEN, pStore); +#endif if (SUCCEEDED(pLink->GetIDList(&newInfo.targetPidl))) { wchar_t path[_MAX_PATH]; @@ -1833,6 +1837,28 @@ void CItemManager::RefreshItemInfo( ItemInfo *pInfo, int refreshFlags, IShellIte CharUpper(path); newInfo.targetPATH=path; } + + CComPtr target; + if (SUCCEEDED(SHCreateItemFromIDList(newInfo.targetPidl, IID_PPV_ARGS(&target)))) + { + CComPtr store; + if (SUCCEEDED(target->BindToHandler(nullptr, BHID_PropertyStore, IID_PPV_ARGS(&store)))) + { +#ifdef _DEBUG + LOG_MENU(LOG_OPEN, L"Target property store:"); + LogPropertyStore(LOG_OPEN, store); +#endif + PROPVARIANT val; + PropVariantInit(&val); + if (SUCCEEDED(store->GetValue(PKEY_MetroAppLauncher, &val)) && (val.vt == VT_I4 || val.vt == VT_UI4) && val.intVal) + { + newInfo.bLink = false; + pItem = target; + pStore = store; + } + PropVariantClear(&val); + } + } } } } From 2ca236c2911980b7dc22ee82fe9df5f4f7a9669d Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sat, 19 Sep 2020 20:30:53 +0200 Subject: [PATCH 037/234] Don't make metro icons smaller if `Invert metro icons` is enabled There should be no need to make icons smaller. --- Src/StartMenu/StartMenuDLL/ItemManager.cpp | 29 +++++----------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/ItemManager.cpp b/Src/StartMenu/StartMenuDLL/ItemManager.cpp index d568cd374..dc449f2b6 100644 --- a/Src/StartMenu/StartMenuDLL/ItemManager.cpp +++ b/Src/StartMenu/StartMenuDLL/ItemManager.cpp @@ -259,7 +259,6 @@ static HBITMAP BitmapFromMetroBitmap( HBITMAP hBitmap, int bitmapSize, DWORD met HGDIOBJ bmp0=SelectObject(hdc,bmp); HGDIOBJ bmp02=SelectObject(hsrc,hBitmap); int offset=(bitmapSize-info.bmWidth)/2; - bool bInvert=g_bInvertMetroIcons; if (g_bInvertMetroIcons && bGrayscale) { FillRect(hdc,&rc,(HBRUSH)GetStockObject(BLACK_BRUSH)); @@ -302,8 +301,7 @@ static HBITMAP BitmapFromMetroBitmap( HBITMAP hBitmap, int bitmapSize, DWORD met static HBITMAP LoadMetroBitmap0( const wchar_t *path, int bitmapSize, DWORD metroColor ) { - int iconSize=g_bInvertMetroIcons?bitmapSize:(bitmapSize-2); - SIZE size={-iconSize,iconSize}; + SIZE size={-bitmapSize,bitmapSize}; HBITMAP hBitmap=LoadImageFile(path,&size,true,true,NULL); if (hBitmap) { @@ -440,16 +438,8 @@ static HBITMAP LoadMetroBitmap2( const wchar_t *location, int bitmapSize, DWORD } if (iconSize) { - if (g_bInvertMetroIcons) - { - if (iconSize>bitmapSize) - iconSize=bitmapSize; - } - else - { - if (iconSize>bitmapSize-2) - iconSize=bitmapSize-2; - } + if (iconSize>bitmapSize) + iconSize=bitmapSize; SIZE size={iconSize,iconSize}; HBITMAP hBitmap=LoadImageFile(path,&size,true,true,NULL); if (hBitmap) @@ -2322,12 +2312,6 @@ void CItemManager::LoadShellIcon( IShellItem *pItem, int refreshFlags, const Ico int smallIconSize=SMALL_ICON_SIZE; int largeIconSize=LARGE_ICON_SIZE; int extraLargeIconSize=EXTRA_LARGE_ICON_SIZE; - if (pMetroColor) - { - smallIconSize-=2; - largeIconSize-=2; - extraLargeIconSize-=2; - } HICON hSmallIcon=NULL, hLargeIcon=NULL, hExtraLargeIcon=NULL; if (bNotFileName) { @@ -2446,8 +2430,7 @@ void CItemManager::LoadMetroIcon( IShellItem *pItem, int &refreshFlags, const Ic if (FAILED(pResManager->GetDefaultContext(IID_ResourceContext,(void**)&pResContext))) return; int iconFlags=0; - int delta=g_bInvertMetroIcons?0:2; - if ((refreshFlags&INFO_SMALL_ICON) && SetResContextTargetSize(pResContext,SMALL_ICON_SIZE-delta)) + if ((refreshFlags&INFO_SMALL_ICON) && SetResContextTargetSize(pResContext,SMALL_ICON_SIZE)) { CComString pLocation; if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation))) @@ -2457,7 +2440,7 @@ void CItemManager::LoadMetroIcon( IShellItem *pItem, int &refreshFlags, const Ic StoreInCache(hash,L"",hSmallBitmap,NULL,NULL,INFO_SMALL_ICON,smallIcon,largeIcon,extraLargeIcon,false,true); } } - if ((refreshFlags&INFO_LARGE_ICON) && SetResContextTargetSize(pResContext,LARGE_ICON_SIZE-delta)) + if ((refreshFlags&INFO_LARGE_ICON) && SetResContextTargetSize(pResContext,LARGE_ICON_SIZE)) { CComString pLocation; if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation))) @@ -2467,7 +2450,7 @@ void CItemManager::LoadMetroIcon( IShellItem *pItem, int &refreshFlags, const Ic StoreInCache(hash,L"",NULL,hLargeBitmap,NULL,INFO_LARGE_ICON,smallIcon,largeIcon,extraLargeIcon,false,true); } } - if ((refreshFlags&INFO_EXTRA_LARGE_ICON) && SetResContextTargetSize(pResContext,EXTRA_LARGE_ICON_SIZE-delta)) + if ((refreshFlags&INFO_EXTRA_LARGE_ICON) && SetResContextTargetSize(pResContext,EXTRA_LARGE_ICON_SIZE)) { CComString pLocation; if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation))) From 728f98231076b4046dadbf83efb720716250fbed Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Fri, 18 Sep 2020 14:12:04 +0200 Subject: [PATCH 038/234] Modernize CItemManager::LoadCustomIcon --- Src/StartMenu/StartMenuDLL/ItemManager.cpp | 58 ++++++++++------------ 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/ItemManager.cpp b/Src/StartMenu/StartMenuDLL/ItemManager.cpp index dc449f2b6..4ecf2f0bf 100644 --- a/Src/StartMenu/StartMenuDLL/ItemManager.cpp +++ b/Src/StartMenu/StartMenuDLL/ItemManager.cpp @@ -2595,49 +2595,41 @@ void CItemManager::IconInfo::SetPath( const wchar_t *path ) timestamp.dwHighDateTime=timestamp.dwLowDateTime=0; } -void CItemManager::LoadCustomIcon( const wchar_t *iconPath, int iconIndex, int refreshFlags, const IconInfo *&smallIcon, const IconInfo *&largeIcon, const IconInfo *&extraLargeIcon, bool bTemp ) +void CItemManager::LoadCustomIcon(const wchar_t *iconPath, int iconIndex, int refreshFlags, const IconInfo *&smallIcon, const IconInfo *&largeIcon, const IconInfo *&extraLargeIcon, bool bTemp) { - unsigned int hash=CalcFNVHash(iconPath,CalcFNVHash(&iconIndex,4)); + unsigned int hash = CalcFNVHash(iconPath, CalcFNVHash(&iconIndex, 4)); - FindInCache(hash,refreshFlags,smallIcon,largeIcon,extraLargeIcon); - if (!refreshFlags) return; + FindInCache(hash, refreshFlags, smallIcon, largeIcon, extraLargeIcon); + if (!refreshFlags) + return; - // extract icon - HBITMAP hSmallBitmap=NULL, hLargeBitmap=NULL, hExtraLargeBitmap=NULL; - if (refreshFlags&INFO_SMALL_ICON) - { + auto ExtractIconAsBitmap = [&](int iconSize) -> HBITMAP { HICON hIcon; - if (!*iconPath) - hIcon=(HICON)LoadImage(g_Instance,MAKEINTRESOURCE(-iconIndex),IMAGE_ICON,SMALL_ICON_SIZE,SMALL_ICON_SIZE,LR_DEFAULTCOLOR); - else - hIcon=ShExtractIcon(iconPath,iconIndex==-1?0:iconIndex,SMALL_ICON_SIZE); - if (hIcon) - hSmallBitmap=BitmapFromIcon(hIcon,SMALL_ICON_SIZE); - } - if (refreshFlags&INFO_LARGE_ICON) - { - HICON hIcon; if (!*iconPath) - hIcon=(HICON)LoadImage(g_Instance,MAKEINTRESOURCE(-iconIndex),IMAGE_ICON,LARGE_ICON_SIZE,LARGE_ICON_SIZE,LR_DEFAULTCOLOR); + hIcon = (HICON)LoadImage(g_Instance, MAKEINTRESOURCE(-iconIndex), IMAGE_ICON, iconSize, iconSize, LR_DEFAULTCOLOR); else - hIcon=ShExtractIcon(iconPath,iconIndex==-1?0:iconIndex,LARGE_ICON_SIZE); - if (hIcon) - hLargeBitmap=BitmapFromIcon(hIcon,LARGE_ICON_SIZE); - } + hIcon = ShExtractIcon(iconPath, iconIndex == -1 ? 0 : iconIndex, iconSize); - if (refreshFlags&INFO_EXTRA_LARGE_ICON) - { - HICON hIcon; - if (!*iconPath) - hIcon=(HICON)LoadImage(g_Instance,MAKEINTRESOURCE(-iconIndex),IMAGE_ICON,EXTRA_LARGE_ICON_SIZE,EXTRA_LARGE_ICON_SIZE,LR_DEFAULTCOLOR); - else - hIcon=ShExtractIcon(iconPath,iconIndex==-1?0:iconIndex,EXTRA_LARGE_ICON_SIZE); if (hIcon) - hExtraLargeBitmap=BitmapFromIcon(hIcon,EXTRA_LARGE_ICON_SIZE); - } + return BitmapFromIcon(hIcon, iconSize); + + return nullptr; + }; + + // extract icon + HBITMAP hSmallBitmap = nullptr, hLargeBitmap = nullptr, hExtraLargeBitmap = nullptr; + + if (refreshFlags & INFO_SMALL_ICON) + hSmallBitmap = ExtractIconAsBitmap(SMALL_ICON_SIZE); + + if (refreshFlags & INFO_LARGE_ICON) + hLargeBitmap = ExtractIconAsBitmap(LARGE_ICON_SIZE); + + if (refreshFlags & INFO_EXTRA_LARGE_ICON) + hExtraLargeBitmap = ExtractIconAsBitmap(EXTRA_LARGE_ICON_SIZE); - StoreInCache(hash,bTemp?NULL:iconPath,hSmallBitmap,hLargeBitmap,hExtraLargeBitmap,refreshFlags,smallIcon,largeIcon,extraLargeIcon,bTemp,false); + StoreInCache(hash, bTemp ? nullptr : iconPath, hSmallBitmap, hLargeBitmap, hExtraLargeBitmap, refreshFlags, smallIcon, largeIcon, extraLargeIcon, bTemp, false); } // Recursive function to preload the items for a folder From 95f3a4b09ab5faa888c8983681e106509f646520 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 20 Sep 2020 08:20:34 +0200 Subject: [PATCH 039/234] Add GetPackageFullName helper --- .../StartMenuDLL/MetroLinkManager.cpp | 32 +++++++++++-------- Src/StartMenu/StartMenuDLL/MetroLinkManager.h | 3 ++ 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/MetroLinkManager.cpp b/Src/StartMenu/StartMenuDLL/MetroLinkManager.cpp index 3aac7e2c5..67406b678 100644 --- a/Src/StartMenu/StartMenuDLL/MetroLinkManager.cpp +++ b/Src/StartMenu/StartMenuDLL/MetroLinkManager.cpp @@ -301,21 +301,12 @@ bool CanUninstallMetroApp( const wchar_t *appid ) // Uninstalls the app with the given id void UninstallMetroApp( const wchar_t *appid ) { - CComPtr pAppItem; - if (SUCCEEDED(SHCreateItemInKnownFolder(FOLDERID_AppsFolder2,0,appid,IID_IShellItem,(void**)&pAppItem))) + auto packageName = GetPackageFullName(appid); + if (!packageName.IsEmpty()) { - CComPtr pStore; - pAppItem->BindToHandler(NULL,BHID_PropertyStore,IID_IPropertyStore,(void**)&pStore); - if (pStore) - { - CString packageName=GetPropertyStoreString(pStore,PKEY_MetroPackageName); - if (!packageName.IsEmpty()) - { - wchar_t command[1024]; - Sprintf(command,_countof(command),L"Remove-AppxPackage %s",packageName); - ShellExecute(NULL,L"open",L"powershell.exe",command,NULL,SW_HIDE); - } - } + wchar_t command[1024]; + Sprintf(command, _countof(command), L"Remove-AppxPackage %s", packageName); + ShellExecute(NULL, L"open", L"powershell.exe", command, NULL, SW_HIDE); } } @@ -381,3 +372,16 @@ bool IsEdgeDefaultBrowser( void ) } return false; } + +CString GetPackageFullName(const wchar_t* appId) +{ + CComPtr item; + if (SUCCEEDED(SHCreateItemInKnownFolder(FOLDERID_AppsFolder, 0, appId, IID_PPV_ARGS(&item)))) + { + CComPtr store; + if (SUCCEEDED(item->BindToHandler(nullptr, BHID_PropertyStore, IID_PPV_ARGS(&store)))) + return GetPropertyStoreString(store, PKEY_MetroPackageName); + } + + return {}; +} diff --git a/Src/StartMenu/StartMenuDLL/MetroLinkManager.h b/Src/StartMenu/StartMenuDLL/MetroLinkManager.h index e2b2a2c38..83b41886f 100644 --- a/Src/StartMenu/StartMenuDLL/MetroLinkManager.h +++ b/Src/StartMenu/StartMenuDLL/MetroLinkManager.h @@ -53,3 +53,6 @@ CComPtr GetMetroPinMenu( const wchar_t *appid ); // Determines if Edge is the default browser bool IsEdgeDefaultBrowser( void ); + +// Returns full package name for given App ID +CString GetPackageFullName(const wchar_t* appId); From 7d59f5ebfbe748b954d23e03014033af69b22972 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Fri, 18 Sep 2020 12:16:03 +0200 Subject: [PATCH 040/234] Support for modern app jump-list tasks Task jump-list items for modern apps require special handling. First of all they don't provide icon directly. Icon location is stored in `PKEY_AppUserModel_DestListLogoUri` property. And then has to be resolved for given application package. Next, context menu of provided `IShellLink` item doesn't seem to be able to start actual link target. Thus we need to obtain context menu of target item. Fixes #375. --- Src/StartMenu/StartMenuDLL/ItemManager.cpp | 61 ++++++++- Src/StartMenu/StartMenuDLL/ItemManager.h | 1 + Src/StartMenu/StartMenuDLL/JumpLists.cpp | 132 +++++++------------ Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 8 +- 4 files changed, 108 insertions(+), 94 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/ItemManager.cpp b/Src/StartMenu/StartMenuDLL/ItemManager.cpp index 4ecf2f0bf..0530070c5 100644 --- a/Src/StartMenu/StartMenuDLL/ItemManager.cpp +++ b/Src/StartMenu/StartMenuDLL/ItemManager.cpp @@ -55,8 +55,8 @@ GUID IID_IApplicationResolver8={0xde25675a,0x72de,0x44b4,{0x93,0x73,0x05,0x17,0x interface IResourceContext; -const GUID IID_IResourceMap={0x6e21e72b, 0xb9b0, 0x42ae, {0xa6, 0x86, 0x98, 0x3c, 0xf7, 0x84, 0xed, 0xcd}}; -interface IResourceMap : public IUnknown +MIDL_INTERFACE("6e21e72b-b9b0-42ae-a686-983cf784edcd") +IResourceMap : public IUnknown { virtual HRESULT STDMETHODCALLTYPE GetUri(const wchar_t **pUri ) = 0; virtual HRESULT STDMETHODCALLTYPE GetSubtree(const wchar_t *propName, IResourceMap **pSubTree ) = 0; @@ -76,8 +76,8 @@ enum RESOURCE_SCALE RES_SCALE_80 =3, }; -const GUID IID_ResourceContext={0xe3c22b30, 0x8502, 0x4b2f, {0x91, 0x33, 0x55, 0x96, 0x74, 0x58, 0x7e, 0x51}}; -interface IResourceContext : public IUnknown +MIDL_INTERFACE("e3c22b30-8502-4b2f-9133-559674587e51") +IResourceContext : public IUnknown { virtual HRESULT STDMETHODCALLTYPE GetLanguage( void ) = 0; virtual HRESULT STDMETHODCALLTYPE GetHomeRegion( wchar_t *pRegion ) = 0; @@ -299,7 +299,7 @@ static HBITMAP BitmapFromMetroBitmap( HBITMAP hBitmap, int bitmapSize, DWORD met /////////////////////////////////////////////////////////////////////////////// -static HBITMAP LoadMetroBitmap0( const wchar_t *path, int bitmapSize, DWORD metroColor ) +static HBITMAP LoadMetroBitmap0(const wchar_t *path, int bitmapSize, DWORD metroColor = 0xFFFFFFFF) { SIZE size={-bitmapSize,bitmapSize}; HBITMAP hBitmap=LoadImageFile(path,&size,true,true,NULL); @@ -1104,6 +1104,49 @@ const CItemManager::ItemInfo *CItemManager::GetCustomIcon( const wchar_t *path, return GetCustomIcon(text,index,iconSizeType,false); } +const CItemManager::ItemInfo* CItemManager::GetLinkIcon(IShellLink* link, TIconSizeType iconSizeType) +{ + wchar_t location[_MAX_PATH]; + int index; + + if (link->GetIconLocation(location, _countof(location), &index) == S_OK && location[0]) + return GetCustomIcon(location, index, iconSizeType, (index == 0)); // assuming that if index!=0 the icon comes from a permanent location like a dll or exe + + CComQIPtr store(link); + if (store) + { + // Name: System.AppUserModel.DestListLogoUri -- PKEY_AppUserModel_DestListLogoUri + // Type: String -- VT_LPWSTR + // FormatID: {9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}, 29 + static const PROPERTYKEY PKEY_AppUserModel_DestListLogoUri = { {0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 29 }; + + auto logoUri = GetPropertyStoreString(store, PKEY_AppUserModel_DestListLogoUri); + if (!logoUri.IsEmpty()) + { + auto appId = GetPropertyStoreString(store, PKEY_AppUserModel_ID); + if (!appId.IsEmpty()) + { + CComPtr resManager; + if (SUCCEEDED(resManager.CoCreateInstance(CLSID_ResourceManager))) + { + if (SUCCEEDED(resManager->InitializeForPackage(GetPackageFullName(appId)))) + { + CComPtr resMap; + if (SUCCEEDED(resManager->GetMainResourceMap(IID_PPV_ARGS(&resMap)))) + { + CComString location; + if (SUCCEEDED(resMap->GetFilePath(logoUri, &location))) + return GetCustomIcon(location, -65536, iconSizeType, true); + } + } + } + } + } + } + + return nullptr; +} + const CItemManager::ItemInfo *CItemManager::GetMetroAppInfo10( const wchar_t *appid ) { wchar_t APPID[256]; @@ -2424,10 +2467,10 @@ void CItemManager::LoadMetroIcon( IShellItem *pItem, int &refreshFlags, const Ic if (FAILED(pResManager->InitializeForPackage(packageName))) return; CComPtr pResMap; - if (FAILED(pResManager->GetMainResourceMap(IID_IResourceMap,(void**)&pResMap))) + if (FAILED(pResManager->GetMainResourceMap(IID_PPV_ARGS(&pResMap)))) return; CComPtr pResContext; - if (FAILED(pResManager->GetDefaultContext(IID_ResourceContext,(void**)&pResContext))) + if (FAILED(pResManager->GetDefaultContext(IID_PPV_ARGS(&pResContext)))) return; int iconFlags=0; if ((refreshFlags&INFO_SMALL_ICON) && SetResContextTargetSize(pResContext,SMALL_ICON_SIZE)) @@ -2604,6 +2647,10 @@ void CItemManager::LoadCustomIcon(const wchar_t *iconPath, int iconIndex, int re return; auto ExtractIconAsBitmap = [&](int iconSize) -> HBITMAP { + + if (iconIndex == -65536) + return LoadMetroBitmap0(iconPath, iconSize); + HICON hIcon; if (!*iconPath) diff --git a/Src/StartMenu/StartMenuDLL/ItemManager.h b/Src/StartMenu/StartMenuDLL/ItemManager.h index 42c625015..a4795e087 100644 --- a/Src/StartMenu/StartMenuDLL/ItemManager.h +++ b/Src/StartMenu/StartMenuDLL/ItemManager.h @@ -173,6 +173,7 @@ class CItemManager const ItemInfo *GetItemInfo( CString path, int refreshFlags, TLocation location=LOCATION_UNKNOWN ); const ItemInfo *GetCustomIcon( const wchar_t *location, int index, TIconSizeType iconSizeType, bool bTemp ); const ItemInfo *GetCustomIcon( const wchar_t *path, TIconSizeType iconSizeType ); + const ItemInfo* GetLinkIcon(IShellLink* link, TIconSizeType iconSizeType); const ItemInfo *GetMetroAppInfo10( const wchar_t *appid ); void UpdateItemInfo( const ItemInfo *pInfo, int refreshFlags, bool bHasWriteLock=false ); void WaitForShortcuts( const POINT &balloonPos ); diff --git a/Src/StartMenu/StartMenuDLL/JumpLists.cpp b/Src/StartMenu/StartMenuDLL/JumpLists.cpp index e03a0ca13..6a91b7d44 100644 --- a/Src/StartMenu/StartMenuDLL/JumpLists.cpp +++ b/Src/StartMenu/StartMenuDLL/JumpLists.cpp @@ -322,6 +322,9 @@ static void AddJumpItem( CJumpGroup &group, IUnknown *pUnknown, std::vector=WIN_VER_WIN7); - if (!item.pItem) return false; + if (!item.pItem) + return false; + if (item.type==CJumpItem::TYPE_ITEM) { -/* CString appid; - { - CItemManager::RWLock lock(&g_ItemManager,false,CItemManager::RWLOCK_ITEMS); - appid=pAppInfo->GetAppid(); - } - LOG_MENU(LOG_OPEN,L"Execute Item: name=%s, appid=%s",item.name,appid);*/ CComQIPtr pItem(item.pItem); if (!pItem) return false; -/* CComString pName; - if (FAILED(pItem->GetDisplayName(SIGDN_DESKTOPABSOLUTEPARSING,&pName))) - return false; - wchar_t ext[_MAX_EXT]; - Strcpy(ext,_countof(ext),PathFindExtension(pName)); - // find the correct association handler by appid and invoke it on the item - CComPtr pEnumHandlers; - if (ext[0] && SUCCEEDED(SHAssocEnumHandlers(ext,ASSOC_FILTER_RECOMMENDED,&pEnumHandlers))) - { - CComPtr pHandler; - ULONG count; - while (SUCCEEDED(pEnumHandlers->Next(1,&pHandler,&count)) && count==1) - { - CComQIPtr pObject=pHandler; - if (pObject) - { - CComString pID; - if (SUCCEEDED(pObject->GetAppID(&pID))) - { - // found explicit appid - if (_wcsicmp(appid,pID)==0) - { - LOG_MENU(LOG_OPEN,L"Found handler appid"); - CComPtr pDataObject; - if (SUCCEEDED(pItem->BindToHandler(NULL,BHID_DataObject,IID_IDataObject,(void**)&pDataObject)) && SUCCEEDED(pHandler->Invoke(pDataObject))) - return true; - break; - } - } - } - pHandler=NULL; - } - pEnumHandlers=NULL; - - // find the correct association handler by exe name and invoke it on the item - wchar_t targetPath[_MAX_PATH]; - targetPath[0]=0; - { - CComPtr pItem; - SHCreateItemFromIDList(pAppInfo->GetPidl(),IID_IShellItem,(void**)&pItem); - CComPtr pLink; - if (pItem) - pItem->BindToHandler(NULL,BHID_SFUIObject,IID_IShellLink,(void**)&pLink); - CAbsolutePidl target; - if (pLink && SUCCEEDED(pLink->Resolve(NULL,SLR_INVOKE_MSI|SLR_NO_UI|SLR_NOUPDATE)) && SUCCEEDED(pLink->GetIDList(&target))) - { - if (FAILED(SHGetPathFromIDList(target,targetPath))) - targetPath[0]=0; - } - } - if (targetPath[0] && SUCCEEDED(SHAssocEnumHandlers(ext,ASSOC_FILTER_RECOMMENDED,&pEnumHandlers))) - { - while (SUCCEEDED(pEnumHandlers->Next(1,&pHandler,&count)) && count==1) - { - CComString pExe; - if (SUCCEEDED(pHandler->GetName(&pExe))) - { - if (_wcsicmp(targetPath,pExe)==0) - { - LOG_MENU(LOG_OPEN,L"Found handler appexe %s",targetPath); - CComPtr pDataObject; - if (SUCCEEDED(pItem->BindToHandler(NULL,BHID_DataObject,IID_IDataObject,(void**)&pDataObject)) && SUCCEEDED(pHandler->Invoke(pDataObject))) - return true; - break; - } - } - pHandler=NULL; - } - } - } -*/ - // couldn't find a handler, execute the old way SHELLEXECUTEINFO execute={sizeof(execute),SEE_MASK_IDLIST|SEE_MASK_FLAG_LOG_USAGE}; execute.nShow=SW_SHOWNORMAL; CAbsolutePidl pidl; @@ -617,9 +544,50 @@ bool ExecuteJumpItem( const CItemManager::ItemInfo *pAppInfo, const CJumpItem &i if (item.type==CJumpItem::TYPE_LINK) { - // invoke the link through its context menu + // Name: System.AppUserModel.HostEnvironment -- PKEY_AppUserModel_HostEnvironment + // Type: UInt32 -- VT_UI4 + // FormatID: {9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}, 14 + static const PROPERTYKEY PKEY_AppUserModel_HostEnvironment = { {0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 14 }; + + // Name: System.AppUserModel.ActivationContext -- PKEY_AppUserModel_ActivationContext + // Type: String -- VT_LPWSTR + // FormatID: {9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}, 20 + static const PROPERTYKEY PKEY_AppUserModel_ActivationContext = { {0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 20 }; + CComQIPtr pMenu(item.pItem); - if (!pMenu) return false; + CStringA params; + + CComQIPtr pLink(item.pItem); + if (pLink) + { + CComQIPtr store(pLink); + if (store) + { + auto appId = GetPropertyStoreString(store, PKEY_AppUserModel_ID); + if (!appId.IsEmpty()) + { + CComPtr target; + if (SUCCEEDED(SHCreateItemInKnownFolder(FOLDERID_AppsFolder, 0, appId, IID_PPV_ARGS(&target)))) + { + ULONG modern = 0; + if (SUCCEEDED(target->GetUInt32(PKEY_AppUserModel_HostEnvironment, &modern)) && modern) + { + CComQIPtr targetMenu; + if (SUCCEEDED(target->BindToHandler(nullptr, BHID_SFUIObject, IID_PPV_ARGS(&targetMenu)))) + { + pMenu = targetMenu; + params = CT2CA(GetPropertyStoreString(store, PKEY_AppUserModel_ActivationContext)); + } + } + } + } + } + } + + // invoke the link through its context menu + if (!pMenu) + return false; + HRESULT hr; HMENU menu=CreatePopupMenu(); hr=pMenu->QueryContextMenu(menu,0,1,1000,CMF_DEFAULTONLY); @@ -633,6 +601,8 @@ bool ExecuteJumpItem( const CItemManager::ItemInfo *pAppInfo, const CJumpItem &i { CMINVOKECOMMANDINFO command={sizeof(command),CMIC_MASK_FLAG_LOG_USAGE}; command.lpVerb=MAKEINTRESOURCEA(id-1); + if (!params.IsEmpty()) + command.lpParameters = params; wchar_t path[_MAX_PATH]; GetModuleFileName(NULL,path,_countof(path)); if (_wcsicmp(PathFindFileName(path),L"explorer.exe")==0) diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp index 857561a58..a27f49a54 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp @@ -2203,10 +2203,7 @@ void CMenuContainer::AddJumpListItems( std::vector &items ) if (pLink) { pLink->GetIDList(&item.pItem1); - wchar_t location[_MAX_PATH]; - int index; - if (pLink->GetIconLocation(location,_countof(location),&index)==S_OK && location[0]) - item.pItemInfo=g_ItemManager.GetCustomIcon(location,index,CItemManager::ICON_SIZE_TYPE_SMALL,(index==0)); // assuming that if index!=0 the icon comes from a permanent location like a dll or exe + item.pItemInfo = g_ItemManager.GetLinkIcon(pLink, CItemManager::ICON_SIZE_TYPE_SMALL); } } else if (jumpItem.type==CJumpItem::TYPE_ITEM) @@ -6668,8 +6665,7 @@ bool CMenuContainer::GetDescription( int index, wchar_t *text, int size ) { if (SUCCEEDED(pLink->GetDescription(text,size)) && text[0]) return true; - wchar_t args[256]; - if (SUCCEEDED(pLink->GetArguments(args,_countof(args))) && args[0]) + if (jumpItem.bHasArguments) { // don't use default tip for items with arguments Strcpy(text,size,item.name); From ba131ff14b5d2a1a0d1575043e26a45bcbb013e7 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 13 Sep 2020 10:27:53 +0200 Subject: [PATCH 041/234] Update build instructions --- Src/BUILDME.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/BUILDME.txt b/Src/BUILDME.txt index 95b90347c..4e9384964 100644 --- a/Src/BUILDME.txt +++ b/Src/BUILDME.txt @@ -5,9 +5,9 @@ for other languages. The final files (installers, archives) are saved to the Setup\Final folder. You need the following tools: -Visual Studio 2017 (Community Edition is enough) +Visual Studio 2019 (Community Edition is enough) - Desktop development with C++ workload - - Windows 10 SDK (10.0.17134.0) for Desktop C++ + - Windows 10 SDK (10.0.19041.0) for Desktop C++ - Visual C++ ATL support HTML Help Workshop WiX 3.7 From 96423b8918c5fa97b4d433e471ff829dd5019f88 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Tue, 22 Sep 2020 17:36:29 +0200 Subject: [PATCH 042/234] Log: More precise timing --- Src/StartMenu/StartMenuDLL/LogManager.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/LogManager.cpp b/Src/StartMenu/StartMenuDLL/LogManager.cpp index 1d0651225..fa6994d86 100644 --- a/Src/StartMenu/StartMenuDLL/LogManager.cpp +++ b/Src/StartMenu/StartMenuDLL/LogManager.cpp @@ -9,10 +9,11 @@ #include "ResourceHelper.h" #include "ComHelper.h" #include +#include int g_LogCategories; static FILE *g_LogFile; -static int g_LogTime; +static std::chrono::time_point g_LogTime; void InitLog( int categories, const wchar_t *fname ) { @@ -23,7 +24,7 @@ void InitLog( int categories, const wchar_t *fname ) wchar_t bom=0xFEFF; fwrite(&bom,2,1,g_LogFile); g_LogCategories=categories; - g_LogTime=GetTickCount(); + g_LogTime=std::chrono::steady_clock::now(); LogMessage(L"version=%x, PID=%d, TID=%d, Categories=%08x\r\n",GetWinVersion(),GetCurrentProcessId(),GetCurrentThreadId(),categories); } } @@ -40,7 +41,7 @@ void LogMessage( const wchar_t *text, ... ) if (!g_LogFile) return; wchar_t buf[2048]; - int len=Sprintf(buf,_countof(buf),L"%8d: ",GetTickCount()-g_LogTime); + int len=Sprintf(buf,_countof(buf),L"%8d: ",std::chrono::duration_cast(std::chrono::steady_clock::now()-g_LogTime).count()); fwrite(buf,2,len,g_LogFile); va_list args; From a422105c61e0409f03465e7ac8ba65881e8708ec Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Mon, 7 Sep 2020 19:14:54 +0200 Subject: [PATCH 043/234] Proper support for HTTPS in DownloadFile Use secure connection right from the beginning. --- Src/Lib/DownloadHelper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/Lib/DownloadHelper.cpp b/Src/Lib/DownloadHelper.cpp index e3575b8fe..b38c6b0c3 100644 --- a/Src/Lib/DownloadHelper.cpp +++ b/Src/Lib/DownloadHelper.cpp @@ -211,7 +211,7 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector &buf, int time=GetTickCount(); if (pProgress) pProgress->SetText(LoadStringEx(IDS_PROGRESS_CONNECT)); - HINTERNET hConnect=InternetConnect(hInternet,host,INTERNET_DEFAULT_HTTP_PORT,L"",L"",INTERNET_SERVICE_HTTP,0,0); + HINTERNET hConnect=InternetConnect(hInternet,host,components.nPort,L"",L"",INTERNET_SERVICE_HTTP,0,0); if (hConnect) { if (pProgress && pProgress->IsCanceled()) @@ -219,7 +219,7 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector &buf, const wchar_t *accept[]={L"*/*",NULL}; if (res==DOWNLOAD_OK) { - HINTERNET hRequest=HttpOpenRequest(hConnect,L"GET",file,NULL,NULL,accept,bAcceptCached?0:INTERNET_FLAG_RELOAD,0); + HINTERNET hRequest=HttpOpenRequest(hConnect,L"GET",file,NULL,NULL,accept,((components.nScheme==INTERNET_SCHEME_HTTPS)?INTERNET_FLAG_SECURE:0)|(bAcceptCached?0:INTERNET_FLAG_RELOAD),0); if (hRequest) { if (pProgress && pProgress->IsCanceled()) From b094ddc5f93343098559ae1f98e747a83462904b Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Tue, 22 Sep 2020 19:35:27 +0200 Subject: [PATCH 044/234] Add Json library https://github.com/nlohmann/json Will be used to parse REST API responses from Github/Appveyor. --- Src/Lib/json.hpp | 25447 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 25447 insertions(+) create mode 100644 Src/Lib/json.hpp diff --git a/Src/Lib/json.hpp b/Src/Lib/json.hpp new file mode 100644 index 000000000..a70aaf8cb --- /dev/null +++ b/Src/Lib/json.hpp @@ -0,0 +1,25447 @@ +/* + __ _____ _____ _____ + __| | __| | | | JSON for Modern C++ +| | |__ | | | | | | version 3.9.1 +|_____|_____|_____|_|___| https://github.com/nlohmann/json + +Licensed under the MIT License . +SPDX-License-Identifier: MIT +Copyright (c) 2013-2019 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 INCLUDE_NLOHMANN_JSON_HPP_ +#define INCLUDE_NLOHMANN_JSON_HPP_ + +#define NLOHMANN_JSON_VERSION_MAJOR 3 +#define NLOHMANN_JSON_VERSION_MINOR 9 +#define NLOHMANN_JSON_VERSION_PATCH 1 + +#include // all_of, find, for_each +#include // nullptr_t, ptrdiff_t, size_t +#include // hash, less +#include // initializer_list +#include // istream, ostream +#include // random_access_iterator_tag +#include // unique_ptr +#include // accumulate +#include // string, stoi, to_string +#include // declval, forward, move, pair, swap +#include // vector + +// #include + + +#include + +// #include + + +#include // transform +#include // array +#include // forward_list +#include // inserter, front_inserter, end +#include // map +#include // string +#include // tuple, make_tuple +#include // is_arithmetic, is_same, is_enum, underlying_type, is_convertible +#include // unordered_map +#include // pair, declval +#include // valarray + +// #include + + +#include // exception +#include // runtime_error +#include // to_string + +// #include + + +#include // size_t + +namespace nlohmann +{ +namespace detail +{ +/// struct to capture the start position of the current token +struct position_t +{ + /// the total number of characters read + std::size_t chars_read_total = 0; + /// the number of characters read in the current line + std::size_t chars_read_current_line = 0; + /// the number of lines read + std::size_t lines_read = 0; + + /// conversion to size_t to preserve SAX interface + constexpr operator size_t() const + { + return chars_read_total; + } +}; + +} // namespace detail +} // namespace nlohmann + +// #include + + +#include // pair +// #include +/* Hedley - https://nemequ.github.io/hedley + * Created by Evan Nemerson + * + * To the extent possible under law, the author(s) have dedicated all + * copyright and related and neighboring rights to this software to + * the public domain worldwide. This software is distributed without + * any warranty. + * + * For details, see . + * SPDX-License-Identifier: CC0-1.0 + */ + +#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 13) +#if defined(JSON_HEDLEY_VERSION) + #undef JSON_HEDLEY_VERSION +#endif +#define JSON_HEDLEY_VERSION 13 + +#if defined(JSON_HEDLEY_STRINGIFY_EX) + #undef JSON_HEDLEY_STRINGIFY_EX +#endif +#define JSON_HEDLEY_STRINGIFY_EX(x) #x + +#if defined(JSON_HEDLEY_STRINGIFY) + #undef JSON_HEDLEY_STRINGIFY +#endif +#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x) + +#if defined(JSON_HEDLEY_CONCAT_EX) + #undef JSON_HEDLEY_CONCAT_EX +#endif +#define JSON_HEDLEY_CONCAT_EX(a,b) a##b + +#if defined(JSON_HEDLEY_CONCAT) + #undef JSON_HEDLEY_CONCAT +#endif +#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b) + +#if defined(JSON_HEDLEY_CONCAT3_EX) + #undef JSON_HEDLEY_CONCAT3_EX +#endif +#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c + +#if defined(JSON_HEDLEY_CONCAT3) + #undef JSON_HEDLEY_CONCAT3 +#endif +#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c) + +#if defined(JSON_HEDLEY_VERSION_ENCODE) + #undef JSON_HEDLEY_VERSION_ENCODE +#endif +#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision)) + +#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR) + #undef JSON_HEDLEY_VERSION_DECODE_MAJOR +#endif +#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000) + +#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR) + #undef JSON_HEDLEY_VERSION_DECODE_MINOR +#endif +#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000) + +#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION) + #undef JSON_HEDLEY_VERSION_DECODE_REVISION +#endif +#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000) + +#if defined(JSON_HEDLEY_GNUC_VERSION) + #undef JSON_HEDLEY_GNUC_VERSION +#endif +#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__) + #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) +#elif defined(__GNUC__) + #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0) +#endif + +#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK) + #undef JSON_HEDLEY_GNUC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_GNUC_VERSION) + #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_MSVC_VERSION) + #undef JSON_HEDLEY_MSVC_VERSION +#endif +#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) + #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100) +#elif defined(_MSC_FULL_VER) + #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10) +#elif defined(_MSC_VER) + #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0) +#endif + +#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK) + #undef JSON_HEDLEY_MSVC_VERSION_CHECK +#endif +#if !defined(_MSC_VER) + #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0) +#elif defined(_MSC_VER) && (_MSC_VER >= 1400) + #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch))) +#elif defined(_MSC_VER) && (_MSC_VER >= 1200) + #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch))) +#else + #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor))) +#endif + +#if defined(JSON_HEDLEY_INTEL_VERSION) + #undef JSON_HEDLEY_INTEL_VERSION +#endif +#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) + #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE) +#elif defined(__INTEL_COMPILER) + #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0) +#endif + +#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK) + #undef JSON_HEDLEY_INTEL_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_INTEL_VERSION) + #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_PGI_VERSION) + #undef JSON_HEDLEY_PGI_VERSION +#endif +#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__) + #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__) +#endif + +#if defined(JSON_HEDLEY_PGI_VERSION_CHECK) + #undef JSON_HEDLEY_PGI_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_PGI_VERSION) + #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_SUNPRO_VERSION) + #undef JSON_HEDLEY_SUNPRO_VERSION +#endif +#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000) + #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10) +#elif defined(__SUNPRO_C) + #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf) +#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000) + #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10) +#elif defined(__SUNPRO_CC) + #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf) +#endif + +#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK) + #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_SUNPRO_VERSION) + #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION) + #undef JSON_HEDLEY_EMSCRIPTEN_VERSION +#endif +#if defined(__EMSCRIPTEN__) + #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__) +#endif + +#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK) + #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION) + #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_ARM_VERSION) + #undef JSON_HEDLEY_ARM_VERSION +#endif +#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION) + #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100) +#elif defined(__CC_ARM) && defined(__ARMCC_VERSION) + #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100) +#endif + +#if defined(JSON_HEDLEY_ARM_VERSION_CHECK) + #undef JSON_HEDLEY_ARM_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_ARM_VERSION) + #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_IBM_VERSION) + #undef JSON_HEDLEY_IBM_VERSION +#endif +#if defined(__ibmxl__) + #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__) +#elif defined(__xlC__) && defined(__xlC_ver__) + #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff) +#elif defined(__xlC__) + #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0) +#endif + +#if defined(JSON_HEDLEY_IBM_VERSION_CHECK) + #undef JSON_HEDLEY_IBM_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_IBM_VERSION) + #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_VERSION) + #undef JSON_HEDLEY_TI_VERSION +#endif +#if \ + defined(__TI_COMPILER_VERSION__) && \ + ( \ + defined(__TMS470__) || defined(__TI_ARM__) || \ + defined(__MSP430__) || \ + defined(__TMS320C2000__) \ + ) +#if (__TI_COMPILER_VERSION__ >= 16000000) + #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif +#endif + +#if defined(JSON_HEDLEY_TI_VERSION_CHECK) + #undef JSON_HEDLEY_TI_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_VERSION) + #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CL2000_VERSION) + #undef JSON_HEDLEY_TI_CL2000_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__) + #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CL2000_VERSION) + #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CL430_VERSION) + #undef JSON_HEDLEY_TI_CL430_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__) + #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CL430_VERSION) + #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_ARMCL_VERSION) + #undef JSON_HEDLEY_TI_ARMCL_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__)) + #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK) + #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_ARMCL_VERSION) + #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CL6X_VERSION) + #undef JSON_HEDLEY_TI_CL6X_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__) + #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CL6X_VERSION) + #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CL7X_VERSION) + #undef JSON_HEDLEY_TI_CL7X_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__) + #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CL7X_VERSION) + #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CLPRU_VERSION) + #undef JSON_HEDLEY_TI_CLPRU_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__) + #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CLPRU_VERSION) + #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_CRAY_VERSION) + #undef JSON_HEDLEY_CRAY_VERSION +#endif +#if defined(_CRAYC) + #if defined(_RELEASE_PATCHLEVEL) + #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL) + #else + #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0) + #endif +#endif + +#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK) + #undef JSON_HEDLEY_CRAY_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_CRAY_VERSION) + #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_IAR_VERSION) + #undef JSON_HEDLEY_IAR_VERSION +#endif +#if defined(__IAR_SYSTEMS_ICC__) + #if __VER__ > 1000 + #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000)) + #else + #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(VER / 100, __VER__ % 100, 0) + #endif +#endif + +#if defined(JSON_HEDLEY_IAR_VERSION_CHECK) + #undef JSON_HEDLEY_IAR_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_IAR_VERSION) + #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TINYC_VERSION) + #undef JSON_HEDLEY_TINYC_VERSION +#endif +#if defined(__TINYC__) + #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100) +#endif + +#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK) + #undef JSON_HEDLEY_TINYC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TINYC_VERSION) + #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_DMC_VERSION) + #undef JSON_HEDLEY_DMC_VERSION +#endif +#if defined(__DMC__) + #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf) +#endif + +#if defined(JSON_HEDLEY_DMC_VERSION_CHECK) + #undef JSON_HEDLEY_DMC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_DMC_VERSION) + #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_COMPCERT_VERSION) + #undef JSON_HEDLEY_COMPCERT_VERSION +#endif +#if defined(__COMPCERT_VERSION__) + #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100) +#endif + +#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK) + #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_COMPCERT_VERSION) + #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_PELLES_VERSION) + #undef JSON_HEDLEY_PELLES_VERSION +#endif +#if defined(__POCC__) + #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0) +#endif + +#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK) + #undef JSON_HEDLEY_PELLES_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_PELLES_VERSION) + #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_GCC_VERSION) + #undef JSON_HEDLEY_GCC_VERSION +#endif +#if \ + defined(JSON_HEDLEY_GNUC_VERSION) && \ + !defined(__clang__) && \ + !defined(JSON_HEDLEY_INTEL_VERSION) && \ + !defined(JSON_HEDLEY_PGI_VERSION) && \ + !defined(JSON_HEDLEY_ARM_VERSION) && \ + !defined(JSON_HEDLEY_TI_VERSION) && \ + !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \ + !defined(JSON_HEDLEY_TI_CL430_VERSION) && \ + !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \ + !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \ + !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \ + !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \ + !defined(__COMPCERT__) + #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION +#endif + +#if defined(JSON_HEDLEY_GCC_VERSION_CHECK) + #undef JSON_HEDLEY_GCC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_GCC_VERSION) + #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_HAS_ATTRIBUTE) + #undef JSON_HEDLEY_HAS_ATTRIBUTE +#endif +#if defined(__has_attribute) + #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute) +#else + #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE) + #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE +#endif +#if defined(__has_attribute) + #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute) +#else + #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE) + #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE +#endif +#if defined(__has_attribute) + #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute) +#else + #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE) + #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE +#endif +#if \ + defined(__has_cpp_attribute) && \ + defined(__cplusplus) && \ + (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute) +#else + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0) +#endif + +#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS) + #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS +#endif +#if !defined(__cplusplus) || !defined(__has_cpp_attribute) + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0) +#elif \ + !defined(JSON_HEDLEY_PGI_VERSION) && \ + !defined(JSON_HEDLEY_IAR_VERSION) && \ + (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \ + (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0)) + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute) +#else + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE) + #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE +#endif +#if defined(__has_cpp_attribute) && defined(__cplusplus) + #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute) +#else + #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE) + #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE +#endif +#if defined(__has_cpp_attribute) && defined(__cplusplus) + #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute) +#else + #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_BUILTIN) + #undef JSON_HEDLEY_HAS_BUILTIN +#endif +#if defined(__has_builtin) + #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin) +#else + #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN) + #undef JSON_HEDLEY_GNUC_HAS_BUILTIN +#endif +#if defined(__has_builtin) + #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin) +#else + #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN) + #undef JSON_HEDLEY_GCC_HAS_BUILTIN +#endif +#if defined(__has_builtin) + #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin) +#else + #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_FEATURE) + #undef JSON_HEDLEY_HAS_FEATURE +#endif +#if defined(__has_feature) + #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature) +#else + #define JSON_HEDLEY_HAS_FEATURE(feature) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE) + #undef JSON_HEDLEY_GNUC_HAS_FEATURE +#endif +#if defined(__has_feature) + #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature) +#else + #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_FEATURE) + #undef JSON_HEDLEY_GCC_HAS_FEATURE +#endif +#if defined(__has_feature) + #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature) +#else + #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_EXTENSION) + #undef JSON_HEDLEY_HAS_EXTENSION +#endif +#if defined(__has_extension) + #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension) +#else + #define JSON_HEDLEY_HAS_EXTENSION(extension) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION) + #undef JSON_HEDLEY_GNUC_HAS_EXTENSION +#endif +#if defined(__has_extension) + #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension) +#else + #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION) + #undef JSON_HEDLEY_GCC_HAS_EXTENSION +#endif +#if defined(__has_extension) + #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension) +#else + #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE) + #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE +#endif +#if defined(__has_declspec_attribute) + #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute) +#else + #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE) + #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE +#endif +#if defined(__has_declspec_attribute) + #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute) +#else + #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE) + #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE +#endif +#if defined(__has_declspec_attribute) + #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute) +#else + #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_WARNING) + #undef JSON_HEDLEY_HAS_WARNING +#endif +#if defined(__has_warning) + #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning) +#else + #define JSON_HEDLEY_HAS_WARNING(warning) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_WARNING) + #undef JSON_HEDLEY_GNUC_HAS_WARNING +#endif +#if defined(__has_warning) + #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning) +#else + #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_WARNING) + #undef JSON_HEDLEY_GCC_HAS_WARNING +#endif +#if defined(__has_warning) + #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning) +#else + #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for + HEDLEY INTERNAL USE ONLY. API subject to change without notice. */ +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ +#endif +#if defined(__cplusplus) +# if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat") +# if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions") +# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ + _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \ + xpr \ + JSON_HEDLEY_DIAGNOSTIC_POP +# else +# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ + xpr \ + JSON_HEDLEY_DIAGNOSTIC_POP +# endif +# endif +#endif +#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x +#endif + +#if defined(JSON_HEDLEY_CONST_CAST) + #undef JSON_HEDLEY_CONST_CAST +#endif +#if defined(__cplusplus) +# define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast(expr)) +#elif \ + JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) +# define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \ + ((T) (expr)); \ + JSON_HEDLEY_DIAGNOSTIC_POP \ + })) +#else +# define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr)) +#endif + +#if defined(JSON_HEDLEY_REINTERPRET_CAST) + #undef JSON_HEDLEY_REINTERPRET_CAST +#endif +#if defined(__cplusplus) + #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast(expr)) +#else + #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr)) +#endif + +#if defined(JSON_HEDLEY_STATIC_CAST) + #undef JSON_HEDLEY_STATIC_CAST +#endif +#if defined(__cplusplus) + #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast(expr)) +#else + #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr)) +#endif + +#if defined(JSON_HEDLEY_CPP_CAST) + #undef JSON_HEDLEY_CPP_CAST +#endif +#if defined(__cplusplus) +# if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast") +# define JSON_HEDLEY_CPP_CAST(T, expr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \ + ((T) (expr)) \ + JSON_HEDLEY_DIAGNOSTIC_POP +# elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0) +# define JSON_HEDLEY_CPP_CAST(T, expr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("diag_suppress=Pe137") \ + JSON_HEDLEY_DIAGNOSTIC_POP \ +# else +# define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr)) +# endif +#else +# define JSON_HEDLEY_CPP_CAST(T, expr) (expr) +#endif + +#if \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ + defined(__clang__) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \ + JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \ + (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR)) + #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value) +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) + #define JSON_HEDLEY_PRAGMA(value) __pragma(value) +#else + #define JSON_HEDLEY_PRAGMA(value) +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH) + #undef JSON_HEDLEY_DIAGNOSTIC_PUSH +#endif +#if defined(JSON_HEDLEY_DIAGNOSTIC_POP) + #undef JSON_HEDLEY_DIAGNOSTIC_POP +#endif +#if defined(__clang__) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop") +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push)) + #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop)) +#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop") +#elif \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop") +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") +#else + #define JSON_HEDLEY_DIAGNOSTIC_PUSH + #define JSON_HEDLEY_DIAGNOSTIC_POP +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)") +#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996)) +#elif \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718") +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)") +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215") +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)") +#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"") +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068)) +#elif \ + JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163") +#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)") +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030)) +#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097") +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)") +#elif \ + JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL +#endif + +#if defined(JSON_HEDLEY_DEPRECATED) + #undef JSON_HEDLEY_DEPRECATED +#endif +#if defined(JSON_HEDLEY_DEPRECATED_FOR) + #undef JSON_HEDLEY_DEPRECATED_FOR +#endif +#if JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) + #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since)) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement)) +#elif defined(__cplusplus) && (__cplusplus >= 201402L) + #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]]) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]]) +#elif \ + JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) + #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since))) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement))) +#elif \ + JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__)) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__)) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ + JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) + #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated) +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated") + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated") +#else + #define JSON_HEDLEY_DEPRECATED(since) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) +#endif + +#if defined(JSON_HEDLEY_UNAVAILABLE) + #undef JSON_HEDLEY_UNAVAILABLE +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since))) +#else + #define JSON_HEDLEY_UNAVAILABLE(available_since) +#endif + +#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT) + #undef JSON_HEDLEY_WARN_UNUSED_RESULT +#endif +#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG) + #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG +#endif +#if (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L) + #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]]) +#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) + #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) +#elif \ + JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__)) + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__)) +#elif defined(_Check_return_) /* SAL */ + #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_ + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_ +#else + #define JSON_HEDLEY_WARN_UNUSED_RESULT + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) +#endif + +#if defined(JSON_HEDLEY_SENTINEL) + #undef JSON_HEDLEY_SENTINEL +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) + #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position))) +#else + #define JSON_HEDLEY_SENTINEL(position) +#endif + +#if defined(JSON_HEDLEY_NO_RETURN) + #undef JSON_HEDLEY_NO_RETURN +#endif +#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_NO_RETURN __noreturn +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__)) +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L + #define JSON_HEDLEY_NO_RETURN _Noreturn +#elif defined(__cplusplus) && (__cplusplus >= 201103L) + #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]]) +#elif \ + JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__)) +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) + #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return") +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) + #define JSON_HEDLEY_NO_RETURN __declspec(noreturn) +#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus) + #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;") +#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0) + #define JSON_HEDLEY_NO_RETURN __attribute((noreturn)) +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0) + #define JSON_HEDLEY_NO_RETURN __declspec(noreturn) +#else + #define JSON_HEDLEY_NO_RETURN +#endif + +#if defined(JSON_HEDLEY_NO_ESCAPE) + #undef JSON_HEDLEY_NO_ESCAPE +#endif +#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape) + #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__)) +#else + #define JSON_HEDLEY_NO_ESCAPE +#endif + +#if defined(JSON_HEDLEY_UNREACHABLE) + #undef JSON_HEDLEY_UNREACHABLE +#endif +#if defined(JSON_HEDLEY_UNREACHABLE_RETURN) + #undef JSON_HEDLEY_UNREACHABLE_RETURN +#endif +#if defined(JSON_HEDLEY_ASSUME) + #undef JSON_HEDLEY_ASSUME +#endif +#if \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_ASSUME(expr) __assume(expr) +#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume) + #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr) +#elif \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) + #if defined(__cplusplus) + #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr) + #else + #define JSON_HEDLEY_ASSUME(expr) _nassert(expr) + #endif +#endif +#if \ + (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) + #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable() +#elif defined(JSON_HEDLEY_ASSUME) + #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0) +#endif +#if !defined(JSON_HEDLEY_ASSUME) + #if defined(JSON_HEDLEY_UNREACHABLE) + #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1))) + #else + #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr) + #endif +#endif +#if defined(JSON_HEDLEY_UNREACHABLE) + #if \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) + #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value)) + #else + #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE() + #endif +#else + #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value) +#endif +#if !defined(JSON_HEDLEY_UNREACHABLE) + #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0) +#endif + +JSON_HEDLEY_DIAGNOSTIC_PUSH +#if JSON_HEDLEY_HAS_WARNING("-Wpedantic") + #pragma clang diagnostic ignored "-Wpedantic" +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus) + #pragma clang diagnostic ignored "-Wc++98-compat-pedantic" +#endif +#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wvariadic-macros" + #elif defined(JSON_HEDLEY_GCC_VERSION) + #pragma GCC diagnostic ignored "-Wvariadic-macros" + #endif +#endif +#if defined(JSON_HEDLEY_NON_NULL) + #undef JSON_HEDLEY_NON_NULL +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) + #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__))) +#else + #define JSON_HEDLEY_NON_NULL(...) +#endif +JSON_HEDLEY_DIAGNOSTIC_POP + +#if defined(JSON_HEDLEY_PRINTF_FORMAT) + #undef JSON_HEDLEY_PRINTF_FORMAT +#endif +#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO) + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check))) +#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO) + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check))) +#elif \ + JSON_HEDLEY_HAS_ATTRIBUTE(format) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check))) +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0) + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check)) +#else + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) +#endif + +#if defined(JSON_HEDLEY_CONSTEXPR) + #undef JSON_HEDLEY_CONSTEXPR +#endif +#if defined(__cplusplus) + #if __cplusplus >= 201103L + #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr) + #endif +#endif +#if !defined(JSON_HEDLEY_CONSTEXPR) + #define JSON_HEDLEY_CONSTEXPR +#endif + +#if defined(JSON_HEDLEY_PREDICT) + #undef JSON_HEDLEY_PREDICT +#endif +#if defined(JSON_HEDLEY_LIKELY) + #undef JSON_HEDLEY_LIKELY +#endif +#if defined(JSON_HEDLEY_UNLIKELY) + #undef JSON_HEDLEY_UNLIKELY +#endif +#if defined(JSON_HEDLEY_UNPREDICTABLE) + #undef JSON_HEDLEY_UNPREDICTABLE +#endif +#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable) + #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr)) +#endif +#if \ + JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) +# define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability( (expr), (value), (probability)) +# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) __builtin_expect_with_probability(!!(expr), 1 , (probability)) +# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) __builtin_expect_with_probability(!!(expr), 0 , (probability)) +# define JSON_HEDLEY_LIKELY(expr) __builtin_expect (!!(expr), 1 ) +# define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect (!!(expr), 0 ) +#elif \ + JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) +# define JSON_HEDLEY_PREDICT(expr, expected, probability) \ + (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))) +# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \ + (__extension__ ({ \ + double hedley_probability_ = (probability); \ + ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \ + })) +# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \ + (__extension__ ({ \ + double hedley_probability_ = (probability); \ + ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \ + })) +# define JSON_HEDLEY_LIKELY(expr) __builtin_expect(!!(expr), 1) +# define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0) +#else +# define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)) +# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr)) +# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr)) +# define JSON_HEDLEY_LIKELY(expr) (!!(expr)) +# define JSON_HEDLEY_UNLIKELY(expr) (!!(expr)) +#endif +#if !defined(JSON_HEDLEY_UNPREDICTABLE) + #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5) +#endif + +#if defined(JSON_HEDLEY_MALLOC) + #undef JSON_HEDLEY_MALLOC +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + #define JSON_HEDLEY_MALLOC __attribute__((__malloc__)) +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) + #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory") +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(14, 0, 0) + #define JSON_HEDLEY_MALLOC __declspec(restrict) +#else + #define JSON_HEDLEY_MALLOC +#endif + +#if defined(JSON_HEDLEY_PURE) + #undef JSON_HEDLEY_PURE +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) +# define JSON_HEDLEY_PURE __attribute__((__pure__)) +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) +# define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data") +#elif defined(__cplusplus) && \ + ( \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \ + ) +# define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;") +#else +# define JSON_HEDLEY_PURE +#endif + +#if defined(JSON_HEDLEY_CONST) + #undef JSON_HEDLEY_CONST +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(const) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + #define JSON_HEDLEY_CONST __attribute__((__const__)) +#elif \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) + #define JSON_HEDLEY_CONST _Pragma("no_side_effect") +#else + #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE +#endif + +#if defined(JSON_HEDLEY_RESTRICT) + #undef JSON_HEDLEY_RESTRICT +#endif +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus) + #define JSON_HEDLEY_RESTRICT restrict +#elif \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ + defined(__clang__) + #define JSON_HEDLEY_RESTRICT __restrict +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus) + #define JSON_HEDLEY_RESTRICT _Restrict +#else + #define JSON_HEDLEY_RESTRICT +#endif + +#if defined(JSON_HEDLEY_INLINE) + #undef JSON_HEDLEY_INLINE +#endif +#if \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ + (defined(__cplusplus) && (__cplusplus >= 199711L)) + #define JSON_HEDLEY_INLINE inline +#elif \ + defined(JSON_HEDLEY_GCC_VERSION) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0) + #define JSON_HEDLEY_INLINE __inline__ +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + #define JSON_HEDLEY_INLINE __inline +#else + #define JSON_HEDLEY_INLINE +#endif + +#if defined(JSON_HEDLEY_ALWAYS_INLINE) + #undef JSON_HEDLEY_ALWAYS_INLINE +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) +# define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) +# define JSON_HEDLEY_ALWAYS_INLINE __forceinline +#elif defined(__cplusplus) && \ + ( \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \ + ) +# define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) +# define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced") +#else +# define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE +#endif + +#if defined(JSON_HEDLEY_NEVER_INLINE) + #undef JSON_HEDLEY_NEVER_INLINE +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__)) +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) + #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline) +#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0) + #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline") +#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus) + #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never") +#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0) + #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline)) +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0) + #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline) +#else + #define JSON_HEDLEY_NEVER_INLINE +#endif + +#if defined(JSON_HEDLEY_PRIVATE) + #undef JSON_HEDLEY_PRIVATE +#endif +#if defined(JSON_HEDLEY_PUBLIC) + #undef JSON_HEDLEY_PUBLIC +#endif +#if defined(JSON_HEDLEY_IMPORT) + #undef JSON_HEDLEY_IMPORT +#endif +#if defined(_WIN32) || defined(__CYGWIN__) +# define JSON_HEDLEY_PRIVATE +# define JSON_HEDLEY_PUBLIC __declspec(dllexport) +# define JSON_HEDLEY_IMPORT __declspec(dllimport) +#else +# if \ + JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ + ( \ + defined(__TI_EABI__) && \ + ( \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \ + ) \ + ) +# define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden"))) +# define JSON_HEDLEY_PUBLIC __attribute__((__visibility__("default"))) +# else +# define JSON_HEDLEY_PRIVATE +# define JSON_HEDLEY_PUBLIC +# endif +# define JSON_HEDLEY_IMPORT extern +#endif + +#if defined(JSON_HEDLEY_NO_THROW) + #undef JSON_HEDLEY_NO_THROW +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__)) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) + #define JSON_HEDLEY_NO_THROW __declspec(nothrow) +#else + #define JSON_HEDLEY_NO_THROW +#endif + +#if defined(JSON_HEDLEY_FALL_THROUGH) + #undef JSON_HEDLEY_FALL_THROUGH +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) + #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__)) +#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough) + #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]]) +#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough) + #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]]) +#elif defined(__fallthrough) /* SAL */ + #define JSON_HEDLEY_FALL_THROUGH __fallthrough +#else + #define JSON_HEDLEY_FALL_THROUGH +#endif + +#if defined(JSON_HEDLEY_RETURNS_NON_NULL) + #undef JSON_HEDLEY_RETURNS_NON_NULL +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) + #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__)) +#elif defined(_Ret_notnull_) /* SAL */ + #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_ +#else + #define JSON_HEDLEY_RETURNS_NON_NULL +#endif + +#if defined(JSON_HEDLEY_ARRAY_PARAM) + #undef JSON_HEDLEY_ARRAY_PARAM +#endif +#if \ + defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \ + !defined(__STDC_NO_VLA__) && \ + !defined(__cplusplus) && \ + !defined(JSON_HEDLEY_PGI_VERSION) && \ + !defined(JSON_HEDLEY_TINYC_VERSION) + #define JSON_HEDLEY_ARRAY_PARAM(name) (name) +#else + #define JSON_HEDLEY_ARRAY_PARAM(name) +#endif + +#if defined(JSON_HEDLEY_IS_CONSTANT) + #undef JSON_HEDLEY_IS_CONSTANT +#endif +#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR) + #undef JSON_HEDLEY_REQUIRE_CONSTEXPR +#endif +/* JSON_HEDLEY_IS_CONSTEXPR_ is for + HEDLEY INTERNAL USE ONLY. API subject to change without notice. */ +#if defined(JSON_HEDLEY_IS_CONSTEXPR_) + #undef JSON_HEDLEY_IS_CONSTEXPR_ +#endif +#if \ + JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ + (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) + #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr) +#endif +#if !defined(__cplusplus) +# if \ + JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \ + JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24) +#if defined(__INTPTR_TYPE__) + #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*) +#else + #include + #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*) +#endif +# elif \ + ( \ + defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \ + !defined(JSON_HEDLEY_SUNPRO_VERSION) && \ + !defined(JSON_HEDLEY_PGI_VERSION) && \ + !defined(JSON_HEDLEY_IAR_VERSION)) || \ + JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0) +#if defined(__INTPTR_TYPE__) + #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0) +#else + #include + #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0) +#endif +# elif \ + defined(JSON_HEDLEY_GCC_VERSION) || \ + defined(JSON_HEDLEY_INTEL_VERSION) || \ + defined(JSON_HEDLEY_TINYC_VERSION) || \ + defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \ + defined(JSON_HEDLEY_TI_CL2000_VERSION) || \ + defined(JSON_HEDLEY_TI_CL6X_VERSION) || \ + defined(JSON_HEDLEY_TI_CL7X_VERSION) || \ + defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \ + defined(__clang__) +# define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \ + sizeof(void) != \ + sizeof(*( \ + 1 ? \ + ((void*) ((expr) * 0L) ) : \ +((struct { char v[sizeof(void) * 2]; } *) 1) \ + ) \ + ) \ + ) +# endif +#endif +#if defined(JSON_HEDLEY_IS_CONSTEXPR_) + #if !defined(JSON_HEDLEY_IS_CONSTANT) + #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr) + #endif + #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1)) +#else + #if !defined(JSON_HEDLEY_IS_CONSTANT) + #define JSON_HEDLEY_IS_CONSTANT(expr) (0) + #endif + #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr) +#endif + +#if defined(JSON_HEDLEY_BEGIN_C_DECLS) + #undef JSON_HEDLEY_BEGIN_C_DECLS +#endif +#if defined(JSON_HEDLEY_END_C_DECLS) + #undef JSON_HEDLEY_END_C_DECLS +#endif +#if defined(JSON_HEDLEY_C_DECL) + #undef JSON_HEDLEY_C_DECL +#endif +#if defined(__cplusplus) + #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" { + #define JSON_HEDLEY_END_C_DECLS } + #define JSON_HEDLEY_C_DECL extern "C" +#else + #define JSON_HEDLEY_BEGIN_C_DECLS + #define JSON_HEDLEY_END_C_DECLS + #define JSON_HEDLEY_C_DECL +#endif + +#if defined(JSON_HEDLEY_STATIC_ASSERT) + #undef JSON_HEDLEY_STATIC_ASSERT +#endif +#if \ + !defined(__cplusplus) && ( \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \ + JSON_HEDLEY_HAS_FEATURE(c_static_assert) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + defined(_Static_assert) \ + ) +# define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message) +#elif \ + (defined(__cplusplus) && (__cplusplus >= 201103L)) || \ + JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) +# define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message)) +#else +# define JSON_HEDLEY_STATIC_ASSERT(expr, message) +#endif + +#if defined(JSON_HEDLEY_NULL) + #undef JSON_HEDLEY_NULL +#endif +#if defined(__cplusplus) + #if __cplusplus >= 201103L + #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr) + #elif defined(NULL) + #define JSON_HEDLEY_NULL NULL + #else + #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0) + #endif +#elif defined(NULL) + #define JSON_HEDLEY_NULL NULL +#else + #define JSON_HEDLEY_NULL ((void*) 0) +#endif + +#if defined(JSON_HEDLEY_MESSAGE) + #undef JSON_HEDLEY_MESSAGE +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") +# define JSON_HEDLEY_MESSAGE(msg) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \ + JSON_HEDLEY_PRAGMA(message msg) \ + JSON_HEDLEY_DIAGNOSTIC_POP +#elif \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) +# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg) +#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) +# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg) +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) +# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg)) +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0) +# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg)) +#else +# define JSON_HEDLEY_MESSAGE(msg) +#endif + +#if defined(JSON_HEDLEY_WARNING) + #undef JSON_HEDLEY_WARNING +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") +# define JSON_HEDLEY_WARNING(msg) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \ + JSON_HEDLEY_PRAGMA(clang warning msg) \ + JSON_HEDLEY_DIAGNOSTIC_POP +#elif \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) +# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg) +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) +# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg)) +#else +# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg) +#endif + +#if defined(JSON_HEDLEY_REQUIRE) + #undef JSON_HEDLEY_REQUIRE +#endif +#if defined(JSON_HEDLEY_REQUIRE_MSG) + #undef JSON_HEDLEY_REQUIRE_MSG +#endif +#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if) +# if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat") +# define JSON_HEDLEY_REQUIRE(expr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \ + __attribute__((diagnose_if(!(expr), #expr, "error"))) \ + JSON_HEDLEY_DIAGNOSTIC_POP +# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \ + __attribute__((diagnose_if(!(expr), msg, "error"))) \ + JSON_HEDLEY_DIAGNOSTIC_POP +# else +# define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error"))) +# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error"))) +# endif +#else +# define JSON_HEDLEY_REQUIRE(expr) +# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) +#endif + +#if defined(JSON_HEDLEY_FLAGS) + #undef JSON_HEDLEY_FLAGS +#endif +#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) + #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__)) +#endif + +#if defined(JSON_HEDLEY_FLAGS_CAST) + #undef JSON_HEDLEY_FLAGS_CAST +#endif +#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0) +# define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("warning(disable:188)") \ + ((T) (expr)); \ + JSON_HEDLEY_DIAGNOSTIC_POP \ + })) +#else +# define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr) +#endif + +#if defined(JSON_HEDLEY_EMPTY_BASES) + #undef JSON_HEDLEY_EMPTY_BASES +#endif +#if JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0) + #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases) +#else + #define JSON_HEDLEY_EMPTY_BASES +#endif + +/* Remaining macros are deprecated. */ + +#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK) + #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK +#endif +#if defined(__clang__) + #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0) +#else + #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE) + #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE +#endif +#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) + +#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE) + #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE +#endif +#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) + +#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN) + #undef JSON_HEDLEY_CLANG_HAS_BUILTIN +#endif +#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin) + +#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE) + #undef JSON_HEDLEY_CLANG_HAS_FEATURE +#endif +#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature) + +#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION) + #undef JSON_HEDLEY_CLANG_HAS_EXTENSION +#endif +#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension) + +#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE) + #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE +#endif +#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) + +#if defined(JSON_HEDLEY_CLANG_HAS_WARNING) + #undef JSON_HEDLEY_CLANG_HAS_WARNING +#endif +#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning) + +#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */ + + +// 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 + +// C++ language standard detection +#if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L) + #define JSON_HAS_CPP_20 + #define JSON_HAS_CPP_17 + #define JSON_HAS_CPP_14 +#elif (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 + +// 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 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 + #include + #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 + +// allow to override assert +#if !defined(JSON_ASSERT) + #include // assert + #define JSON_ASSERT(x) assert(x) +#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, \ + class BinaryType> + +#define NLOHMANN_BASIC_JSON_TPL \ + basic_json + +// Macros to simplify conversion from/to types + +#define NLOHMANN_JSON_EXPAND( x ) x +#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME +#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \ + NLOHMANN_JSON_PASTE64, \ + NLOHMANN_JSON_PASTE63, \ + NLOHMANN_JSON_PASTE62, \ + NLOHMANN_JSON_PASTE61, \ + NLOHMANN_JSON_PASTE60, \ + NLOHMANN_JSON_PASTE59, \ + NLOHMANN_JSON_PASTE58, \ + NLOHMANN_JSON_PASTE57, \ + NLOHMANN_JSON_PASTE56, \ + NLOHMANN_JSON_PASTE55, \ + NLOHMANN_JSON_PASTE54, \ + NLOHMANN_JSON_PASTE53, \ + NLOHMANN_JSON_PASTE52, \ + NLOHMANN_JSON_PASTE51, \ + NLOHMANN_JSON_PASTE50, \ + NLOHMANN_JSON_PASTE49, \ + NLOHMANN_JSON_PASTE48, \ + NLOHMANN_JSON_PASTE47, \ + NLOHMANN_JSON_PASTE46, \ + NLOHMANN_JSON_PASTE45, \ + NLOHMANN_JSON_PASTE44, \ + NLOHMANN_JSON_PASTE43, \ + NLOHMANN_JSON_PASTE42, \ + NLOHMANN_JSON_PASTE41, \ + NLOHMANN_JSON_PASTE40, \ + NLOHMANN_JSON_PASTE39, \ + NLOHMANN_JSON_PASTE38, \ + NLOHMANN_JSON_PASTE37, \ + NLOHMANN_JSON_PASTE36, \ + NLOHMANN_JSON_PASTE35, \ + NLOHMANN_JSON_PASTE34, \ + NLOHMANN_JSON_PASTE33, \ + NLOHMANN_JSON_PASTE32, \ + NLOHMANN_JSON_PASTE31, \ + NLOHMANN_JSON_PASTE30, \ + NLOHMANN_JSON_PASTE29, \ + NLOHMANN_JSON_PASTE28, \ + NLOHMANN_JSON_PASTE27, \ + NLOHMANN_JSON_PASTE26, \ + NLOHMANN_JSON_PASTE25, \ + NLOHMANN_JSON_PASTE24, \ + NLOHMANN_JSON_PASTE23, \ + NLOHMANN_JSON_PASTE22, \ + NLOHMANN_JSON_PASTE21, \ + NLOHMANN_JSON_PASTE20, \ + NLOHMANN_JSON_PASTE19, \ + NLOHMANN_JSON_PASTE18, \ + NLOHMANN_JSON_PASTE17, \ + NLOHMANN_JSON_PASTE16, \ + NLOHMANN_JSON_PASTE15, \ + NLOHMANN_JSON_PASTE14, \ + NLOHMANN_JSON_PASTE13, \ + NLOHMANN_JSON_PASTE12, \ + NLOHMANN_JSON_PASTE11, \ + NLOHMANN_JSON_PASTE10, \ + NLOHMANN_JSON_PASTE9, \ + NLOHMANN_JSON_PASTE8, \ + NLOHMANN_JSON_PASTE7, \ + NLOHMANN_JSON_PASTE6, \ + NLOHMANN_JSON_PASTE5, \ + NLOHMANN_JSON_PASTE4, \ + NLOHMANN_JSON_PASTE3, \ + NLOHMANN_JSON_PASTE2, \ + NLOHMANN_JSON_PASTE1)(__VA_ARGS__)) +#define NLOHMANN_JSON_PASTE2(func, v1) func(v1) +#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2) +#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3) +#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4) +#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5) +#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6) +#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7) +#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8) +#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9) +#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10) +#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) +#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) +#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) +#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) +#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) +#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) +#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) +#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) +#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) +#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) +#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) +#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) +#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) +#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) +#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) +#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) +#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) +#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) +#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) +#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) +#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) +#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) +#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) +#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) +#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) +#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) +#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) +#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) +#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) +#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) +#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) +#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) +#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) +#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) +#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) +#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) +#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) +#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) +#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) +#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) +#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) +#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) +#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) +#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) +#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) +#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) +#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) +#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) +#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) +#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) +#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) +#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) +#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) + +#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1; +#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1); + +/*! +@brief macro +@def NLOHMANN_DEFINE_TYPE_INTRUSIVE +@since version 3.9.0 +*/ +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...) \ + friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ + friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } + +/*! +@brief macro +@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE +@since version 3.9.0 +*/ +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...) \ + inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ + inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } + +#ifndef JSON_USE_IMPLICIT_CONVERSIONS + #define JSON_USE_IMPLICIT_CONVERSIONS 1 +#endif + +#if JSON_USE_IMPLICIT_CONVERSIONS + #define JSON_EXPLICIT +#else + #define JSON_EXPLICIT explicit +#endif + + +namespace nlohmann +{ +namespace detail +{ +//////////////// +// exceptions // +//////////////// + +/*! +@brief general exception of the @ref basic_json class + +This class is an extension of `std::exception` objects with a member @a id for +exception ids. It is used as the base class for all exceptions thrown by the +@ref basic_json class. This class can hence be used as "wildcard" to catch +exceptions. + +Subclasses: +- @ref parse_error for exceptions indicating a parse error +- @ref invalid_iterator for exceptions indicating errors with iterators +- @ref type_error for exceptions indicating executing a member function with + a wrong type +- @ref out_of_range for exceptions indicating access out of the defined range +- @ref other_error for exceptions indicating other library errors + +@internal +@note To have nothrow-copy-constructible exceptions, we internally use + `std::runtime_error` which can cope with arbitrary-length error messages. + Intermediate strings are built with static functions and then passed to + the actual constructor. +@endinternal + +@liveexample{The following code shows how arbitrary library exceptions can be +caught.,exception} + +@since version 3.0.0 +*/ +class exception : public std::exception +{ + public: + /// returns the explanatory string + JSON_HEDLEY_RETURNS_NON_NULL + const char* what() const noexcept override + { + return m.what(); + } + + /// the id of the exception + const int id; + + protected: + JSON_HEDLEY_NON_NULL(3) + exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} + + static std::string name(const std::string& ename, int id_) + { + return "[json.exception." + ename + "." + std::to_string(id_) + "] "; + } + + private: + /// an exception object as storage for error messages + std::runtime_error m; +}; + +/*! +@brief exception indicating a parse error + +This exception is thrown by the library when a parse error occurs. Parse errors +can occur during the deserialization of JSON text, CBOR, MessagePack, as well +as when using JSON Patch. + +Member @a byte holds the byte index of the last read character in the input +file. + +Exceptions have ids 1xx. + +name / id | example message | description +------------------------------ | --------------- | ------------------------- +json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position. +json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point. +json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid. +json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects. +json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors. +json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number without a leading `0`. +json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character. +json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences. +json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number. +json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read. +json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read. +json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read. +json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet). +json.exception.parse_error.115 | parse error at byte 5: syntax error while parsing UBJSON high-precision number: invalid number text: 1A | A UBJSON high-precision number could not be parsed. + +@note For an input with n bytes, 1 is the index of the first character and n+1 + is the index of the terminating null byte or the end of file. This also + holds true when reading a byte vector (CBOR or MessagePack). + +@liveexample{The following code shows how a `parse_error` exception can be +caught.,parse_error} + +@sa - @ref exception for the base class of the library exceptions +@sa - @ref invalid_iterator for exceptions indicating errors with iterators +@sa - @ref type_error for exceptions indicating executing a member function with + a wrong type +@sa - @ref out_of_range for exceptions indicating access out of the defined range +@sa - @ref other_error for exceptions indicating other library errors + +@since version 3.0.0 +*/ +class parse_error : public exception +{ + public: + /*! + @brief create a parse error exception + @param[in] id_ the id of the exception + @param[in] pos the position where the error occurred (or with + chars_read_total=0 if the position cannot be + determined) + @param[in] what_arg the explanatory string + @return parse_error object + */ + static parse_error create(int id_, const position_t& pos, const std::string& what_arg) + { + std::string w = exception::name("parse_error", id_) + "parse error" + + position_string(pos) + ": " + what_arg; + return parse_error(id_, pos.chars_read_total, w.c_str()); + } + + static parse_error create(int id_, std::size_t byte_, const std::string& what_arg) + { + std::string w = exception::name("parse_error", id_) + "parse error" + + (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") + + ": " + what_arg; + return parse_error(id_, byte_, w.c_str()); + } + + /*! + @brief byte index of the parse error + + The byte index of the last read character in the input file. + + @note For an input with n bytes, 1 is the index of the first character and + n+1 is the index of the terminating null byte or the end of file. + This also holds true when reading a byte vector (CBOR or MessagePack). + */ + const std::size_t byte; + + private: + parse_error(int id_, std::size_t byte_, const char* what_arg) + : exception(id_, what_arg), byte(byte_) {} + + static std::string position_string(const position_t& pos) + { + return " at line " + std::to_string(pos.lines_read + 1) + + ", column " + std::to_string(pos.chars_read_current_line); + } +}; + +/*! +@brief exception indicating errors with iterators + +This exception is thrown if iterators passed to a library function do not match +the expected semantics. + +Exceptions have ids 2xx. + +name / id | example message | description +----------------------------------- | --------------- | ------------------------- +json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid. +json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion. +json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from. +json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid. +json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid. +json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range. +json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key. +json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered. +json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered. +json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid. +json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to. +json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container. +json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered. +json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin(). + +@liveexample{The following code shows how an `invalid_iterator` exception can be +caught.,invalid_iterator} + +@sa - @ref exception for the base class of the library exceptions +@sa - @ref parse_error for exceptions indicating a parse error +@sa - @ref type_error for exceptions indicating executing a member function with + a wrong type +@sa - @ref out_of_range for exceptions indicating access out of the defined range +@sa - @ref other_error for exceptions indicating other library errors + +@since version 3.0.0 +*/ +class invalid_iterator : public exception +{ + public: + static invalid_iterator create(int id_, const std::string& what_arg) + { + std::string w = exception::name("invalid_iterator", id_) + what_arg; + return invalid_iterator(id_, w.c_str()); + } + + private: + JSON_HEDLEY_NON_NULL(3) + invalid_iterator(int id_, const char* what_arg) + : exception(id_, what_arg) {} +}; + +/*! +@brief exception indicating executing a member function with a wrong type + +This exception is thrown in case of a type error; that is, a library function is +executed on a JSON value whose type does not match the expected semantics. + +Exceptions have ids 3xx. + +name / id | example message | description +----------------------------- | --------------- | ------------------------- +json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead. +json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types. +json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t &. +json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types. +json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types. +json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types. +json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types. +json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types. +json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types. +json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types. +json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types. +json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types. +json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined. +json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers. +json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive. +json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. | +json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) | + +@liveexample{The following code shows how a `type_error` exception can be +caught.,type_error} + +@sa - @ref exception for the base class of the library exceptions +@sa - @ref parse_error for exceptions indicating a parse error +@sa - @ref invalid_iterator for exceptions indicating errors with iterators +@sa - @ref out_of_range for exceptions indicating access out of the defined range +@sa - @ref other_error for exceptions indicating other library errors + +@since version 3.0.0 +*/ +class type_error : public exception +{ + public: + static type_error create(int id_, const std::string& what_arg) + { + std::string w = exception::name("type_error", id_) + what_arg; + return type_error(id_, w.c_str()); + } + + private: + JSON_HEDLEY_NON_NULL(3) + type_error(int id_, const char* what_arg) : exception(id_, what_arg) {} +}; + +/*! +@brief exception indicating access out of the defined range + +This exception is thrown in case a library function is called on an input +parameter that exceeds the expected range, for instance in case of array +indices or nonexisting object keys. + +Exceptions have ids 4xx. + +name / id | example message | description +------------------------------- | --------------- | ------------------------- +json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1. +json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it. +json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object. +json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved. +json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value. +json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF. +json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. (until version 3.8.0) | +json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. | +json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string | + +@liveexample{The following code shows how an `out_of_range` exception can be +caught.,out_of_range} + +@sa - @ref exception for the base class of the library exceptions +@sa - @ref parse_error for exceptions indicating a parse error +@sa - @ref invalid_iterator for exceptions indicating errors with iterators +@sa - @ref type_error for exceptions indicating executing a member function with + a wrong type +@sa - @ref other_error for exceptions indicating other library errors + +@since version 3.0.0 +*/ +class out_of_range : public exception +{ + public: + static out_of_range create(int id_, const std::string& what_arg) + { + std::string w = exception::name("out_of_range", id_) + what_arg; + return out_of_range(id_, w.c_str()); + } + + private: + JSON_HEDLEY_NON_NULL(3) + out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {} +}; + +/*! +@brief exception indicating other library errors + +This exception is thrown in case of errors that cannot be classified with the +other exception types. + +Exceptions have ids 5xx. + +name / id | example message | description +------------------------------ | --------------- | ------------------------- +json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed. + +@sa - @ref exception for the base class of the library exceptions +@sa - @ref parse_error for exceptions indicating a parse error +@sa - @ref invalid_iterator for exceptions indicating errors with iterators +@sa - @ref type_error for exceptions indicating executing a member function with + a wrong type +@sa - @ref out_of_range for exceptions indicating access out of the defined range + +@liveexample{The following code shows how an `other_error` exception can be +caught.,other_error} + +@since version 3.0.0 +*/ +class other_error : public exception +{ + public: + static other_error create(int id_, const std::string& what_arg) + { + std::string w = exception::name("other_error", id_) + what_arg; + return other_error(id_, w.c_str()); + } + + private: + JSON_HEDLEY_NON_NULL(3) + other_error(int id_, const char* what_arg) : exception(id_, what_arg) {} +}; +} // namespace detail +} // namespace nlohmann + +// #include + +// #include + + +#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 // numeric_limits +#include // false_type, is_constructible, is_integral, is_same, true_type +#include // declval + +// #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&; +}; +} // namespace detail +} // namespace nlohmann + +// #include + +// #include + +// #include + + +#include + +// #include + + +// https://en.cppreference.com/w/cpp/experimental/is_detected +namespace nlohmann +{ +namespace detail +{ +struct nonesuch +{ + nonesuch() = delete; + ~nonesuch() = delete; + nonesuch(nonesuch const&) = delete; + nonesuch(nonesuch const&&) = delete; + void operator=(nonesuch const&) = delete; + void operator=(nonesuch&&) = 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 class Op, class... Args> +using is_detected = typename detector::value_t; + +template class Op, class... Args> +using detected_t = typename detector::type; + +template class Op, class... Args> +using detected_or = detector; + +template class Op, class... Args> +using detected_or_t = typename detected_or::type; + +template class Op, class... Args> +using is_detected_exact = std::is_same>; + +template class Op, class... Args> +using is_detected_convertible = + std::is_convertible, To>; +} // namespace detail +} // namespace nlohmann + +// #include +#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_ +#define INCLUDE_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 BinaryType = std::vector> +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<>; + +template +struct ordered_map; + +/*! +@brief ordered JSON class + +This type preserves the insertion order of object keys. + +@since version 3.9.0 +*/ +using ordered_json = basic_json; + +} // namespace nlohmann + +#endif // INCLUDE_NLOHMANN_JSON_FWD_HPP_ + + +namespace nlohmann +{ +/*! +@brief detail namespace with internal helper functions + +This namespace collects functions that should not be exposed, +implementations of some @ref basic_json methods, and meta-programming helpers. + +@since version 2.1.0 +*/ +namespace detail +{ +///////////// +// helpers // +///////////// + +// Note to maintainers: +// +// Every trait in this file expects a non CV-qualified type. +// The only exceptions are in the 'aliases for detected' section +// (i.e. those of the form: decltype(T::member_function(std::declval()))) +// +// In this case, T has to be properly CV-qualified to constraint the function arguments +// (e.g. to_json(BasicJsonType&, const T&)) + +template struct is_basic_json : std::false_type {}; + +NLOHMANN_BASIC_JSON_TPL_DECLARATION +struct is_basic_json : std::true_type {}; + +////////////////////// +// json_ref helpers // +////////////////////// + +template +class json_ref; + +template +struct is_json_ref : std::false_type {}; + +template +struct is_json_ref> : std::true_type {}; + +////////////////////////// +// aliases for detected // +////////////////////////// + +template +using mapped_type_t = typename T::mapped_type; + +template +using key_type_t = typename T::key_type; + +template +using value_type_t = typename T::value_type; + +template +using difference_type_t = typename T::difference_type; + +template +using pointer_t = typename T::pointer; + +template +using reference_t = typename T::reference; + +template +using iterator_category_t = typename T::iterator_category; + +template +using iterator_t = typename T::iterator; + +template +using to_json_function = decltype(T::to_json(std::declval()...)); + +template +using from_json_function = decltype(T::from_json(std::declval()...)); + +template +using get_template_function = decltype(std::declval().template get()); + +// trait checking if JSONSerializer::from_json(json const&, udt&) exists +template +struct has_from_json : std::false_type {}; + +// trait checking if j.get is valid +// use this trait instead of std::is_constructible or std::is_convertible, +// both rely on, or make use of implicit conversions, and thus fail when T +// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958) +template +struct is_getable +{ + static constexpr bool value = is_detected::value; +}; + +template +struct has_from_json < BasicJsonType, T, + enable_if_t < !is_basic_json::value >> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + +// This trait checks if JSONSerializer::from_json(json const&) exists +// this overload is used for non-default-constructible user-defined-types +template +struct has_non_default_from_json : std::false_type {}; + +template +struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + +// This trait checks if BasicJsonType::json_serializer::to_json exists +// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion. +template +struct has_to_json : std::false_type {}; + +template +struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + + +/////////////////// +// is_ functions // +/////////////////// + +template +struct is_iterator_traits : std::false_type {}; + +template +struct is_iterator_traits> +{ + private: + using traits = iterator_traits; + + public: + static constexpr auto value = + is_detected::value && + is_detected::value && + is_detected::value && + is_detected::value && + is_detected::value; +}; + +// source: https://stackoverflow.com/a/37193089/4116453 + +template +struct is_complete_type : std::false_type {}; + +template +struct is_complete_type : std::true_type {}; + +template +struct is_compatible_object_type_impl : std::false_type {}; + +template +struct is_compatible_object_type_impl < + BasicJsonType, CompatibleObjectType, + enable_if_t < is_detected::value&& + is_detected::value >> +{ + + using object_t = typename BasicJsonType::object_t; + + // macOS's is_constructible does not play well with nonesuch... + static constexpr bool value = + std::is_constructible::value && + std::is_constructible::value; +}; + +template +struct is_compatible_object_type + : is_compatible_object_type_impl {}; + +template +struct is_constructible_object_type_impl : std::false_type {}; + +template +struct is_constructible_object_type_impl < + BasicJsonType, ConstructibleObjectType, + enable_if_t < is_detected::value&& + is_detected::value >> +{ + using object_t = typename BasicJsonType::object_t; + + static constexpr bool value = + (std::is_default_constructible::value && + (std::is_move_assignable::value || + std::is_copy_assignable::value) && + (std::is_constructible::value && + std::is_same < + typename object_t::mapped_type, + typename ConstructibleObjectType::mapped_type >::value)) || + (has_from_json::value || + has_non_default_from_json < + BasicJsonType, + typename ConstructibleObjectType::mapped_type >::value); +}; + +template +struct is_constructible_object_type + : is_constructible_object_type_impl {}; + +template +struct is_compatible_string_type_impl : std::false_type {}; + +template +struct is_compatible_string_type_impl < + BasicJsonType, CompatibleStringType, + enable_if_t::value >> +{ + static constexpr auto value = + std::is_constructible::value; +}; + +template +struct is_compatible_string_type + : is_compatible_string_type_impl {}; + +template +struct is_constructible_string_type_impl : std::false_type {}; + +template +struct is_constructible_string_type_impl < + BasicJsonType, ConstructibleStringType, + enable_if_t::value >> +{ + static constexpr auto value = + std::is_constructible::value; +}; + +template +struct is_constructible_string_type + : is_constructible_string_type_impl {}; + +template +struct is_compatible_array_type_impl : std::false_type {}; + +template +struct is_compatible_array_type_impl < + BasicJsonType, CompatibleArrayType, + enable_if_t < is_detected::value&& + is_detected::value&& +// This is needed because json_reverse_iterator has a ::iterator type... +// Therefore it is detected as a CompatibleArrayType. +// The real fix would be to have an Iterable concept. + !is_iterator_traits < + iterator_traits>::value >> +{ + static constexpr bool value = + std::is_constructible::value; +}; + +template +struct is_compatible_array_type + : is_compatible_array_type_impl {}; + +template +struct is_constructible_array_type_impl : std::false_type {}; + +template +struct is_constructible_array_type_impl < + BasicJsonType, ConstructibleArrayType, + enable_if_t::value >> + : std::true_type {}; + +template +struct is_constructible_array_type_impl < + BasicJsonType, ConstructibleArrayType, + enable_if_t < !std::is_same::value&& + std::is_default_constructible::value&& +(std::is_move_assignable::value || + std::is_copy_assignable::value)&& +is_detected::value&& +is_detected::value&& +is_complete_type < +detected_t>::value >> +{ + static constexpr bool value = + // This is needed because json_reverse_iterator has a ::iterator type, + // furthermore, std::back_insert_iterator (and other iterators) have a + // base class `iterator`... Therefore it is detected as a + // ConstructibleArrayType. The real fix would be to have an Iterable + // concept. + !is_iterator_traits>::value && + + (std::is_same::value || + has_from_json::value || + has_non_default_from_json < + BasicJsonType, typename ConstructibleArrayType::value_type >::value); +}; + +template +struct is_constructible_array_type + : is_constructible_array_type_impl {}; + +template +struct is_compatible_integer_type_impl : std::false_type {}; + +template +struct is_compatible_integer_type_impl < + RealIntegerType, CompatibleNumberIntegerType, + enable_if_t < std::is_integral::value&& + std::is_integral::value&& + !std::is_same::value >> +{ + // is there an assert somewhere on overflows? + using RealLimits = std::numeric_limits; + using CompatibleLimits = std::numeric_limits; + + static constexpr auto value = + std::is_constructible::value && + CompatibleLimits::is_integer && + RealLimits::is_signed == CompatibleLimits::is_signed; +}; + +template +struct is_compatible_integer_type + : is_compatible_integer_type_impl {}; + +template +struct is_compatible_type_impl: std::false_type {}; + +template +struct is_compatible_type_impl < + BasicJsonType, CompatibleType, + enable_if_t::value >> +{ + static constexpr bool value = + has_to_json::value; +}; + +template +struct is_compatible_type + : is_compatible_type_impl {}; + +// https://en.cppreference.com/w/cpp/types/conjunction +template struct conjunction : std::true_type { }; +template struct conjunction : B1 { }; +template +struct conjunction +: std::conditional, B1>::type {}; + +template +struct is_constructible_tuple : std::false_type {}; + +template +struct is_constructible_tuple> : conjunction...> {}; +} // namespace detail +} // namespace nlohmann + +// #include + + +#include // array +#include // size_t +#include // uint8_t +#include // string + +namespace nlohmann +{ +namespace detail +{ +/////////////////////////// +// JSON type enumeration // +/////////////////////////// + +/*! +@brief the JSON type enumeration + +This enumeration collects the different JSON types. It is internally used to +distinguish the stored values, and the functions @ref basic_json::is_null(), +@ref basic_json::is_object(), @ref basic_json::is_array(), +@ref basic_json::is_string(), @ref basic_json::is_boolean(), +@ref basic_json::is_number() (with @ref basic_json::is_number_integer(), +@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()), +@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and +@ref basic_json::is_structured() rely on it. + +@note There are three enumeration entries (number_integer, number_unsigned, and +number_float), because the library distinguishes these three types for numbers: +@ref basic_json::number_unsigned_t is used for unsigned integers, +@ref basic_json::number_integer_t is used for signed integers, and +@ref basic_json::number_float_t is used for floating-point numbers or to +approximate integers which do not fit in the limits of their respective type. + +@sa @ref basic_json::basic_json(const value_t value_type) -- create a JSON +value with the default value for a given type + +@since version 1.0.0 +*/ +enum class value_t : std::uint8_t +{ + null, ///< null value + object, ///< object (unordered set of name/value pairs) + array, ///< array (ordered collection of values) + string, ///< string value + boolean, ///< boolean value + number_integer, ///< number value (signed integer) + number_unsigned, ///< number value (unsigned integer) + number_float, ///< number value (floating-point) + binary, ///< binary array (ordered collection of bytes) + discarded ///< discarded by the parser callback function +}; + +/*! +@brief comparison operator for JSON types + +Returns an ordering that is similar to Python: +- order: null < boolean < number < object < array < string < binary +- furthermore, each type is not smaller than itself +- discarded values are not comparable +- binary is represented as a b"" string in python and directly comparable to a + string; however, making a binary array directly comparable with a string would + be surprising behavior in a JSON file. + +@since version 1.0.0 +*/ +inline bool operator<(const value_t lhs, const value_t rhs) noexcept +{ + static constexpr std::array order = {{ + 0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */, + 1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */, + 6 /* binary */ + } + }; + + const auto l_index = static_cast(lhs); + const auto r_index = static_cast(rhs); + return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index]; +} +} // namespace detail +} // namespace nlohmann + + +namespace nlohmann +{ +namespace detail +{ +template +void from_json(const BasicJsonType& j, typename std::nullptr_t& n) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_null())) + { + JSON_THROW(type_error::create(302, "type must be null, but is " + std::string(j.type_name()))); + } + n = nullptr; +} + +// overloads for basic_json template parameters +template < typename BasicJsonType, typename ArithmeticType, + enable_if_t < std::is_arithmetic::value&& + !std::is_same::value, + int > = 0 > +void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val) +{ + switch (static_cast(j)) + { + case value_t::number_unsigned: + { + val = static_cast(*j.template get_ptr()); + break; + } + case value_t::number_integer: + { + val = static_cast(*j.template get_ptr()); + break; + } + case value_t::number_float: + { + val = static_cast(*j.template get_ptr()); + break; + } + + default: + JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name()))); + } +} + +template +void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_boolean())) + { + JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name()))); + } + b = *j.template get_ptr(); +} + +template +void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_string())) + { + JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()))); + } + s = *j.template get_ptr(); +} + +template < + typename BasicJsonType, typename ConstructibleStringType, + enable_if_t < + is_constructible_string_type::value&& + !std::is_same::value, + int > = 0 > +void from_json(const BasicJsonType& j, ConstructibleStringType& s) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_string())) + { + JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()))); + } + + s = *j.template get_ptr(); +} + +template +void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val) +{ + get_arithmetic_value(j, val); +} + +template +void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val) +{ + get_arithmetic_value(j, val); +} + +template +void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val) +{ + get_arithmetic_value(j, val); +} + +template::value, int> = 0> +void from_json(const BasicJsonType& j, EnumType& e) +{ + typename std::underlying_type::type val; + get_arithmetic_value(j, val); + e = static_cast(val); +} + +// forward_list doesn't have an insert method +template::value, int> = 0> +void from_json(const BasicJsonType& j, std::forward_list& l) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()))); + } + l.clear(); + std::transform(j.rbegin(), j.rend(), + std::front_inserter(l), [](const BasicJsonType & i) + { + return i.template get(); + }); +} + +// valarray doesn't have an insert method +template::value, int> = 0> +void from_json(const BasicJsonType& j, std::valarray& l) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()))); + } + l.resize(j.size()); + std::transform(j.begin(), j.end(), std::begin(l), + [](const BasicJsonType & elem) + { + return elem.template get(); + }); +} + +template +auto from_json(const BasicJsonType& j, T (&arr)[N]) +-> decltype(j.template get(), void()) +{ + for (std::size_t i = 0; i < N; ++i) + { + arr[i] = j.at(i).template get(); + } +} + +template +void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/) +{ + arr = *j.template get_ptr(); +} + +template +auto from_json_array_impl(const BasicJsonType& j, std::array& arr, + priority_tag<2> /*unused*/) +-> decltype(j.template get(), void()) +{ + for (std::size_t i = 0; i < N; ++i) + { + arr[i] = j.at(i).template get(); + } +} + +template +auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/) +-> decltype( + arr.reserve(std::declval()), + j.template get(), + void()) +{ + using std::end; + + ConstructibleArrayType ret; + ret.reserve(j.size()); + std::transform(j.begin(), j.end(), + std::inserter(ret, end(ret)), [](const BasicJsonType & i) + { + // get() returns *this, this won't call a from_json + // method when value_type is BasicJsonType + return i.template get(); + }); + arr = std::move(ret); +} + +template +void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, + priority_tag<0> /*unused*/) +{ + using std::end; + + ConstructibleArrayType ret; + std::transform( + j.begin(), j.end(), std::inserter(ret, end(ret)), + [](const BasicJsonType & i) + { + // get() returns *this, this won't call a from_json + // method when value_type is BasicJsonType + return i.template get(); + }); + arr = std::move(ret); +} + +template < typename BasicJsonType, typename ConstructibleArrayType, + enable_if_t < + is_constructible_array_type::value&& + !is_constructible_object_type::value&& + !is_constructible_string_type::value&& + !std::is_same::value&& + !is_basic_json::value, + int > = 0 > +auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr) +-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}), +j.template get(), +void()) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + + std::string(j.type_name()))); + } + + from_json_array_impl(j, arr, priority_tag<3> {}); +} + +template +void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_binary())) + { + JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(j.type_name()))); + } + + bin = *j.template get_ptr(); +} + +template::value, int> = 0> +void from_json(const BasicJsonType& j, ConstructibleObjectType& obj) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_object())) + { + JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name()))); + } + + ConstructibleObjectType ret; + auto inner_object = j.template get_ptr(); + using value_type = typename ConstructibleObjectType::value_type; + std::transform( + inner_object->begin(), inner_object->end(), + std::inserter(ret, ret.begin()), + [](typename BasicJsonType::object_t::value_type const & p) + { + return value_type(p.first, p.second.template get()); + }); + obj = std::move(ret); +} + +// overload for arithmetic types, not chosen for basic_json template arguments +// (BooleanType, etc..); note: Is it really necessary to provide explicit +// overloads for boolean_t etc. in case of a custom BooleanType which is not +// an arithmetic type? +template < typename BasicJsonType, typename ArithmeticType, + enable_if_t < + std::is_arithmetic::value&& + !std::is_same::value&& + !std::is_same::value&& + !std::is_same::value&& + !std::is_same::value, + int > = 0 > +void from_json(const BasicJsonType& j, ArithmeticType& val) +{ + switch (static_cast(j)) + { + case value_t::number_unsigned: + { + val = static_cast(*j.template get_ptr()); + break; + } + case value_t::number_integer: + { + val = static_cast(*j.template get_ptr()); + break; + } + case value_t::number_float: + { + val = static_cast(*j.template get_ptr()); + break; + } + case value_t::boolean: + { + val = static_cast(*j.template get_ptr()); + break; + } + + default: + JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name()))); + } +} + +template +void from_json(const BasicJsonType& j, std::pair& p) +{ + p = {j.at(0).template get(), j.at(1).template get()}; +} + +template +void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence /*unused*/) +{ + t = std::make_tuple(j.at(Idx).template get::type>()...); +} + +template +void from_json(const BasicJsonType& j, std::tuple& t) +{ + from_json_tuple_impl(j, t, index_sequence_for {}); +} + +template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator, + typename = enable_if_t < !std::is_constructible < + typename BasicJsonType::string_t, Key >::value >> +void from_json(const BasicJsonType& j, std::map& m) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()))); + } + m.clear(); + for (const auto& p : j) + { + if (JSON_HEDLEY_UNLIKELY(!p.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name()))); + } + m.emplace(p.at(0).template get(), p.at(1).template get()); + } +} + +template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator, + typename = enable_if_t < !std::is_constructible < + typename BasicJsonType::string_t, Key >::value >> +void from_json(const BasicJsonType& j, std::unordered_map& m) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()))); + } + m.clear(); + for (const auto& p : j) + { + if (JSON_HEDLEY_UNLIKELY(!p.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name()))); + } + m.emplace(p.at(0).template get(), p.at(1).template get()); + } +} + +struct from_json_fn +{ + template + auto operator()(const BasicJsonType& j, T& val) const + noexcept(noexcept(from_json(j, val))) + -> decltype(from_json(j, val), void()) + { + return from_json(j, val); + } +}; +} // namespace detail + +/// namespace to hold default `from_json` function +/// to see why this is required: +/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html +namespace +{ +constexpr const auto& from_json = detail::static_const::value; +} // namespace +} // namespace nlohmann + +// #include + + +#include // copy +#include // begin, end +#include // string +#include // tuple, get +#include // is_same, is_constructible, is_floating_point, is_enum, underlying_type +#include // move, forward, declval, pair +#include // valarray +#include // vector + +// #include + + +#include // size_t +#include // input_iterator_tag +#include // string, to_string +#include // tuple_size, get, tuple_element + +// #include + +// #include + + +namespace nlohmann +{ +namespace detail +{ +template +void int_to_string( string_type& target, std::size_t value ) +{ + // For ADL + using std::to_string; + target = to_string(value); +} +template class iteration_proxy_value +{ + public: + using difference_type = std::ptrdiff_t; + using value_type = iteration_proxy_value; + using pointer = value_type * ; + using reference = value_type & ; + using iterator_category = std::input_iterator_tag; + using string_type = typename std::remove_cv< typename std::remove_reference().key() ) >::type >::type; + + private: + /// the iterator + IteratorType anchor; + /// an index for arrays (used to create key names) + std::size_t array_index = 0; + /// last stringified array index + mutable std::size_t array_index_last = 0; + /// a string representation of the array index + mutable string_type array_index_str = "0"; + /// an empty string (to return a reference for primitive values) + const string_type empty_str = ""; + + public: + explicit iteration_proxy_value(IteratorType it) noexcept : anchor(it) {} + + /// dereference operator (needed for range-based for) + iteration_proxy_value& operator*() + { + return *this; + } + + /// increment operator (needed for range-based for) + iteration_proxy_value& operator++() + { + ++anchor; + ++array_index; + + return *this; + } + + /// equality operator (needed for InputIterator) + bool operator==(const iteration_proxy_value& o) const + { + return anchor == o.anchor; + } + + /// inequality operator (needed for range-based for) + bool operator!=(const iteration_proxy_value& o) const + { + return anchor != o.anchor; + } + + /// return key of the iterator + const string_type& key() const + { + JSON_ASSERT(anchor.m_object != nullptr); + + switch (anchor.m_object->type()) + { + // use integer array index as key + case value_t::array: + { + if (array_index != array_index_last) + { + int_to_string( array_index_str, array_index ); + array_index_last = array_index; + } + return array_index_str; + } + + // use key from the object + case value_t::object: + return anchor.key(); + + // use an empty key for all primitive types + default: + return empty_str; + } + } + + /// return value of the iterator + typename IteratorType::reference value() const + { + return anchor.value(); + } +}; + +/// proxy class for the items() function +template class iteration_proxy +{ + private: + /// the container to iterate + typename IteratorType::reference container; + + public: + /// construct iteration proxy from a container + explicit iteration_proxy(typename IteratorType::reference cont) noexcept + : container(cont) {} + + /// return iterator begin (needed for range-based for) + iteration_proxy_value begin() noexcept + { + return iteration_proxy_value(container.begin()); + } + + /// return iterator end (needed for range-based for) + iteration_proxy_value end() noexcept + { + return iteration_proxy_value(container.end()); + } +}; +// Structured Bindings Support +// For further reference see https://blog.tartanllama.xyz/structured-bindings/ +// And see https://github.com/nlohmann/json/pull/1391 +template = 0> +auto get(const nlohmann::detail::iteration_proxy_value& i) -> decltype(i.key()) +{ + return i.key(); +} +// Structured Bindings Support +// For further reference see https://blog.tartanllama.xyz/structured-bindings/ +// And see https://github.com/nlohmann/json/pull/1391 +template = 0> +auto get(const nlohmann::detail::iteration_proxy_value& i) -> decltype(i.value()) +{ + return i.value(); +} +} // namespace detail +} // namespace nlohmann + +// The Addition to the STD Namespace is required to add +// Structured Bindings Support to the iteration_proxy_value class +// For further reference see https://blog.tartanllama.xyz/structured-bindings/ +// And see https://github.com/nlohmann/json/pull/1391 +namespace std +{ +#if defined(__clang__) + // Fix: https://github.com/nlohmann/json/issues/1401 + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wmismatched-tags" +#endif +template +class tuple_size<::nlohmann::detail::iteration_proxy_value> + : public std::integral_constant {}; + +template +class tuple_element> +{ + public: + using type = decltype( + get(std::declval < + ::nlohmann::detail::iteration_proxy_value> ())); +}; +#if defined(__clang__) + #pragma clang diagnostic pop +#endif +} // namespace std + +// #include + +// #include + +// #include + + +namespace nlohmann +{ +namespace detail +{ +////////////////// +// constructors // +////////////////// + +template struct external_constructor; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept + { + j.m_type = value_t::boolean; + j.m_value = b; + j.assert_invariant(); + } +}; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s) + { + j.m_type = value_t::string; + j.m_value = s; + j.assert_invariant(); + } + + template + static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s) + { + j.m_type = value_t::string; + j.m_value = std::move(s); + j.assert_invariant(); + } + + template < typename BasicJsonType, typename CompatibleStringType, + enable_if_t < !std::is_same::value, + int > = 0 > + static void construct(BasicJsonType& j, const CompatibleStringType& str) + { + j.m_type = value_t::string; + j.m_value.string = j.template create(str); + j.assert_invariant(); + } +}; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, const typename BasicJsonType::binary_t& b) + { + j.m_type = value_t::binary; + typename BasicJsonType::binary_t value{b}; + j.m_value = value; + j.assert_invariant(); + } + + template + static void construct(BasicJsonType& j, typename BasicJsonType::binary_t&& b) + { + j.m_type = value_t::binary; + typename BasicJsonType::binary_t value{std::move(b)}; + j.m_value = value; + j.assert_invariant(); + } +}; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept + { + j.m_type = value_t::number_float; + j.m_value = val; + j.assert_invariant(); + } +}; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept + { + j.m_type = value_t::number_unsigned; + j.m_value = val; + j.assert_invariant(); + } +}; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept + { + j.m_type = value_t::number_integer; + j.m_value = val; + j.assert_invariant(); + } +}; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr) + { + j.m_type = value_t::array; + j.m_value = arr; + j.assert_invariant(); + } + + template + static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr) + { + j.m_type = value_t::array; + j.m_value = std::move(arr); + j.assert_invariant(); + } + + template < typename BasicJsonType, typename CompatibleArrayType, + enable_if_t < !std::is_same::value, + int > = 0 > + static void construct(BasicJsonType& j, const CompatibleArrayType& arr) + { + using std::begin; + using std::end; + j.m_type = value_t::array; + j.m_value.array = j.template create(begin(arr), end(arr)); + j.assert_invariant(); + } + + template + static void construct(BasicJsonType& j, const std::vector& arr) + { + j.m_type = value_t::array; + j.m_value = value_t::array; + j.m_value.array->reserve(arr.size()); + for (const bool x : arr) + { + j.m_value.array->push_back(x); + } + j.assert_invariant(); + } + + template::value, int> = 0> + static void construct(BasicJsonType& j, const std::valarray& arr) + { + j.m_type = value_t::array; + j.m_value = value_t::array; + j.m_value.array->resize(arr.size()); + if (arr.size() > 0) + { + std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin()); + } + j.assert_invariant(); + } +}; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj) + { + j.m_type = value_t::object; + j.m_value = obj; + j.assert_invariant(); + } + + template + static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj) + { + j.m_type = value_t::object; + j.m_value = std::move(obj); + j.assert_invariant(); + } + + template < typename BasicJsonType, typename CompatibleObjectType, + enable_if_t < !std::is_same::value, int > = 0 > + static void construct(BasicJsonType& j, const CompatibleObjectType& obj) + { + using std::begin; + using std::end; + + j.m_type = value_t::object; + j.m_value.object = j.template create(begin(obj), end(obj)); + j.assert_invariant(); + } +}; + +///////////// +// to_json // +///////////// + +template::value, int> = 0> +void to_json(BasicJsonType& j, T b) noexcept +{ + external_constructor::construct(j, b); +} + +template::value, int> = 0> +void to_json(BasicJsonType& j, const CompatibleString& s) +{ + external_constructor::construct(j, s); +} + +template +void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s) +{ + external_constructor::construct(j, std::move(s)); +} + +template::value, int> = 0> +void to_json(BasicJsonType& j, FloatType val) noexcept +{ + external_constructor::construct(j, static_cast(val)); +} + +template::value, int> = 0> +void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept +{ + external_constructor::construct(j, static_cast(val)); +} + +template::value, int> = 0> +void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept +{ + external_constructor::construct(j, static_cast(val)); +} + +template::value, int> = 0> +void to_json(BasicJsonType& j, EnumType e) noexcept +{ + using underlying_type = typename std::underlying_type::type; + external_constructor::construct(j, static_cast(e)); +} + +template +void to_json(BasicJsonType& j, const std::vector& e) +{ + external_constructor::construct(j, e); +} + +template < typename BasicJsonType, typename CompatibleArrayType, + enable_if_t < is_compatible_array_type::value&& + !is_compatible_object_type::value&& + !is_compatible_string_type::value&& + !std::is_same::value&& + !is_basic_json::value, + int > = 0 > +void to_json(BasicJsonType& j, const CompatibleArrayType& arr) +{ + external_constructor::construct(j, arr); +} + +template +void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin) +{ + external_constructor::construct(j, bin); +} + +template::value, int> = 0> +void to_json(BasicJsonType& j, const std::valarray& arr) +{ + external_constructor::construct(j, std::move(arr)); +} + +template +void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr) +{ + external_constructor::construct(j, std::move(arr)); +} + +template < typename BasicJsonType, typename CompatibleObjectType, + enable_if_t < is_compatible_object_type::value&& !is_basic_json::value, int > = 0 > +void to_json(BasicJsonType& j, const CompatibleObjectType& obj) +{ + external_constructor::construct(j, obj); +} + +template +void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj) +{ + external_constructor::construct(j, std::move(obj)); +} + +template < + typename BasicJsonType, typename T, std::size_t N, + enable_if_t < !std::is_constructible::value, + int > = 0 > +void to_json(BasicJsonType& j, const T(&arr)[N]) +{ + external_constructor::construct(j, arr); +} + +template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible::value&& std::is_constructible::value, int > = 0 > +void to_json(BasicJsonType& j, const std::pair& p) +{ + j = { p.first, p.second }; +} + +// for https://github.com/nlohmann/json/pull/1134 +template>::value, int> = 0> +void to_json(BasicJsonType& j, const T& b) +{ + j = { {b.key(), b.value()} }; +} + +template +void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence /*unused*/) +{ + j = { std::get(t)... }; +} + +template::value, int > = 0> +void to_json(BasicJsonType& j, const T& t) +{ + to_json_tuple_impl(j, t, make_index_sequence::value> {}); +} + +struct to_json_fn +{ + template + auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward(val)))) + -> decltype(to_json(j, std::forward(val)), void()) + { + return to_json(j, std::forward(val)); + } +}; +} // namespace detail + +/// namespace to hold default `to_json` function +namespace +{ +constexpr const auto& to_json = detail::static_const::value; +} // namespace +} // namespace nlohmann + + +namespace nlohmann +{ + +template +struct adl_serializer +{ + /*! + @brief convert a JSON value to any value type + + This function is usually called by the `get()` function of the + @ref basic_json class (either explicit or via conversion operators). + + @param[in] j JSON value to read from + @param[in,out] val value to write to + */ + template + static auto from_json(BasicJsonType&& j, ValueType& val) noexcept( + noexcept(::nlohmann::from_json(std::forward(j), val))) + -> decltype(::nlohmann::from_json(std::forward(j), val), void()) + { + ::nlohmann::from_json(std::forward(j), val); + } + + /*! + @brief convert any value type to a JSON value + + This function is usually called by the constructors of the @ref basic_json + class. + + @param[in,out] j JSON value to write to + @param[in] val value to read from + */ + template + static auto to_json(BasicJsonType& j, ValueType&& val) noexcept( + noexcept(::nlohmann::to_json(j, std::forward(val)))) + -> decltype(::nlohmann::to_json(j, std::forward(val)), void()) + { + ::nlohmann::to_json(j, std::forward(val)); + } +}; + +} // namespace nlohmann + +// #include + + +#include // uint8_t +#include // tie +#include // move + +namespace nlohmann +{ + +/*! +@brief an internal type for a backed binary type + +This type extends the template parameter @a BinaryType provided to `basic_json` +with a subtype used by BSON and MessagePack. This type exists so that the user +does not have to specify a type themselves with a specific naming scheme in +order to override the binary type. + +@tparam BinaryType container to store bytes (`std::vector` by + default) + +@since version 3.8.0 +*/ +template +class byte_container_with_subtype : public BinaryType +{ + public: + /// the type of the underlying container + using container_type = BinaryType; + + byte_container_with_subtype() noexcept(noexcept(container_type())) + : container_type() + {} + + byte_container_with_subtype(const container_type& b) noexcept(noexcept(container_type(b))) + : container_type(b) + {} + + byte_container_with_subtype(container_type&& b) noexcept(noexcept(container_type(std::move(b)))) + : container_type(std::move(b)) + {} + + byte_container_with_subtype(const container_type& b, std::uint8_t subtype) noexcept(noexcept(container_type(b))) + : container_type(b) + , m_subtype(subtype) + , m_has_subtype(true) + {} + + byte_container_with_subtype(container_type&& b, std::uint8_t subtype) noexcept(noexcept(container_type(std::move(b)))) + : container_type(std::move(b)) + , m_subtype(subtype) + , m_has_subtype(true) + {} + + bool operator==(const byte_container_with_subtype& rhs) const + { + return std::tie(static_cast(*this), m_subtype, m_has_subtype) == + std::tie(static_cast(rhs), rhs.m_subtype, rhs.m_has_subtype); + } + + bool operator!=(const byte_container_with_subtype& rhs) const + { + return !(rhs == *this); + } + + /*! + @brief sets the binary subtype + + Sets the binary subtype of the value, also flags a binary JSON value as + having a subtype, which has implications for serialization. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @sa @ref subtype() -- return the binary subtype + @sa @ref clear_subtype() -- clears the binary subtype + @sa @ref has_subtype() -- returns whether or not the binary value has a + subtype + + @since version 3.8.0 + */ + void set_subtype(std::uint8_t subtype) noexcept + { + m_subtype = subtype; + m_has_subtype = true; + } + + /*! + @brief return the binary subtype + + Returns the numerical subtype of the value if it has a subtype. If it does + not have a subtype, this function will return size_t(-1) as a sentinel + value. + + @return the numerical subtype of the binary value + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @sa @ref set_subtype() -- sets the binary subtype + @sa @ref clear_subtype() -- clears the binary subtype + @sa @ref has_subtype() -- returns whether or not the binary value has a + subtype + + @since version 3.8.0 + */ + constexpr std::uint8_t subtype() const noexcept + { + return m_subtype; + } + + /*! + @brief return whether the value has a subtype + + @return whether the value has a subtype + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @sa @ref subtype() -- return the binary subtype + @sa @ref set_subtype() -- sets the binary subtype + @sa @ref clear_subtype() -- clears the binary subtype + + @since version 3.8.0 + */ + constexpr bool has_subtype() const noexcept + { + return m_has_subtype; + } + + /*! + @brief clears the binary subtype + + Clears the binary subtype and flags the value as not having a subtype, which + has implications for serialization; for instance MessagePack will prefer the + bin family over the ext family. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @sa @ref subtype() -- return the binary subtype + @sa @ref set_subtype() -- sets the binary subtype + @sa @ref has_subtype() -- returns whether or not the binary value has a + subtype + + @since version 3.8.0 + */ + void clear_subtype() noexcept + { + m_subtype = 0; + m_has_subtype = false; + } + + private: + std::uint8_t m_subtype = 0; + bool m_has_subtype = false; +}; + +} // namespace nlohmann + +// #include + +// #include + +// #include + +// #include + + +#include // size_t, uint8_t +#include // hash + +namespace nlohmann +{ +namespace detail +{ + +// boost::hash_combine +inline std::size_t combine(std::size_t seed, std::size_t h) noexcept +{ + seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U); + return seed; +} + +/*! +@brief hash a JSON value + +The hash function tries to rely on std::hash where possible. Furthermore, the +type of the JSON value is taken into account to have different hash values for +null, 0, 0U, and false, etc. + +@tparam BasicJsonType basic_json specialization +@param j JSON value to hash +@return hash value of j +*/ +template +std::size_t hash(const BasicJsonType& j) +{ + using string_t = typename BasicJsonType::string_t; + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + + const auto type = static_cast(j.type()); + switch (j.type()) + { + case BasicJsonType::value_t::null: + case BasicJsonType::value_t::discarded: + { + return combine(type, 0); + } + + case BasicJsonType::value_t::object: + { + auto seed = combine(type, j.size()); + for (const auto& element : j.items()) + { + const auto h = std::hash {}(element.key()); + seed = combine(seed, h); + seed = combine(seed, hash(element.value())); + } + return seed; + } + + case BasicJsonType::value_t::array: + { + auto seed = combine(type, j.size()); + for (const auto& element : j) + { + seed = combine(seed, hash(element)); + } + return seed; + } + + case BasicJsonType::value_t::string: + { + const auto h = std::hash {}(j.template get_ref()); + return combine(type, h); + } + + case BasicJsonType::value_t::boolean: + { + const auto h = std::hash {}(j.template get()); + return combine(type, h); + } + + case BasicJsonType::value_t::number_integer: + { + const auto h = std::hash {}(j.template get()); + return combine(type, h); + } + + case nlohmann::detail::value_t::number_unsigned: + { + const auto h = std::hash {}(j.template get()); + return combine(type, h); + } + + case nlohmann::detail::value_t::number_float: + { + const auto h = std::hash {}(j.template get()); + return combine(type, h); + } + + case nlohmann::detail::value_t::binary: + { + auto seed = combine(type, j.get_binary().size()); + const auto h = std::hash {}(j.get_binary().has_subtype()); + seed = combine(seed, h); + seed = combine(seed, j.get_binary().subtype()); + for (const auto byte : j.get_binary()) + { + seed = combine(seed, std::hash {}(byte)); + } + return seed; + } + + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // LCOV_EXCL_LINE + } +} + +} // namespace detail +} // namespace nlohmann + +// #include + + +#include // generate_n +#include // array +#include // ldexp +#include // size_t +#include // uint8_t, uint16_t, uint32_t, uint64_t +#include // snprintf +#include // memcpy +#include // back_inserter +#include // numeric_limits +#include // char_traits, string +#include // make_pair, move + +// #include + +// #include + + +#include // array +#include // size_t +#include //FILE * +#include // strlen +#include // istream +#include // begin, end, iterator_traits, random_access_iterator_tag, distance, next +#include // shared_ptr, make_shared, addressof +#include // accumulate +#include // string, char_traits +#include // enable_if, is_base_of, is_pointer, is_integral, remove_pointer +#include // pair, declval + +// #include + +// #include + + +namespace nlohmann +{ +namespace detail +{ +/// the supported input formats +enum class input_format_t { json, cbor, msgpack, ubjson, bson }; + +//////////////////// +// input adapters // +//////////////////// + +/*! +Input adapter for stdio file access. This adapter read only 1 byte and do not use any + buffer. This adapter is a very low level adapter. +*/ +class file_input_adapter +{ + public: + using char_type = char; + + JSON_HEDLEY_NON_NULL(2) + explicit file_input_adapter(std::FILE* f) noexcept + : m_file(f) + {} + + // make class move-only + file_input_adapter(const file_input_adapter&) = delete; + file_input_adapter(file_input_adapter&&) = default; + file_input_adapter& operator=(const file_input_adapter&) = delete; + file_input_adapter& operator=(file_input_adapter&&) = delete; + + std::char_traits::int_type get_character() noexcept + { + return std::fgetc(m_file); + } + + private: + /// the file pointer to read from + std::FILE* m_file; +}; + + +/*! +Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at +beginning of input. Does not support changing the underlying std::streambuf +in mid-input. Maintains underlying std::istream and std::streambuf to support +subsequent use of standard std::istream operations to process any input +characters following those used in parsing the JSON input. Clears the +std::istream flags; any input errors (e.g., EOF) will be detected by the first +subsequent call for input from the std::istream. +*/ +class input_stream_adapter +{ + public: + using char_type = char; + + ~input_stream_adapter() + { + // clear stream flags; we use underlying streambuf I/O, do not + // maintain ifstream flags, except eof + if (is != nullptr) + { + is->clear(is->rdstate() & std::ios::eofbit); + } + } + + explicit input_stream_adapter(std::istream& i) + : is(&i), sb(i.rdbuf()) + {} + + // delete because of pointer members + input_stream_adapter(const input_stream_adapter&) = delete; + input_stream_adapter& operator=(input_stream_adapter&) = delete; + input_stream_adapter& operator=(input_stream_adapter&& rhs) = delete; + + input_stream_adapter(input_stream_adapter&& rhs) noexcept : is(rhs.is), sb(rhs.sb) + { + rhs.is = nullptr; + rhs.sb = nullptr; + } + + // std::istream/std::streambuf use std::char_traits::to_int_type, to + // ensure that std::char_traits::eof() and the character 0xFF do not + // end up as the same value, eg. 0xFFFFFFFF. + std::char_traits::int_type get_character() + { + auto res = sb->sbumpc(); + // set eof manually, as we don't use the istream interface. + if (JSON_HEDLEY_UNLIKELY(res == EOF)) + { + is->clear(is->rdstate() | std::ios::eofbit); + } + return res; + } + + private: + /// the associated input stream + std::istream* is = nullptr; + std::streambuf* sb = nullptr; +}; + +// General-purpose iterator-based adapter. It might not be as fast as +// theoretically possible for some containers, but it is extremely versatile. +template +class iterator_input_adapter +{ + public: + using char_type = typename std::iterator_traits::value_type; + + iterator_input_adapter(IteratorType first, IteratorType last) + : current(std::move(first)), end(std::move(last)) {} + + typename std::char_traits::int_type get_character() + { + if (JSON_HEDLEY_LIKELY(current != end)) + { + auto result = std::char_traits::to_int_type(*current); + std::advance(current, 1); + return result; + } + else + { + return std::char_traits::eof(); + } + } + + private: + IteratorType current; + IteratorType end; + + template + friend struct wide_string_input_helper; + + bool empty() const + { + return current == end; + } + +}; + + +template +struct wide_string_input_helper; + +template +struct wide_string_input_helper +{ + // UTF-32 + static void fill_buffer(BaseInputAdapter& input, + std::array::int_type, 4>& utf8_bytes, + size_t& utf8_bytes_index, + size_t& utf8_bytes_filled) + { + utf8_bytes_index = 0; + + if (JSON_HEDLEY_UNLIKELY(input.empty())) + { + utf8_bytes[0] = std::char_traits::eof(); + utf8_bytes_filled = 1; + } + else + { + // get the current character + const auto wc = input.get_character(); + + // UTF-32 to UTF-8 encoding + if (wc < 0x80) + { + utf8_bytes[0] = static_cast::int_type>(wc); + utf8_bytes_filled = 1; + } + else if (wc <= 0x7FF) + { + utf8_bytes[0] = static_cast::int_type>(0xC0u | ((static_cast(wc) >> 6u) & 0x1Fu)); + utf8_bytes[1] = static_cast::int_type>(0x80u | (static_cast(wc) & 0x3Fu)); + utf8_bytes_filled = 2; + } + else if (wc <= 0xFFFF) + { + utf8_bytes[0] = static_cast::int_type>(0xE0u | ((static_cast(wc) >> 12u) & 0x0Fu)); + utf8_bytes[1] = static_cast::int_type>(0x80u | ((static_cast(wc) >> 6u) & 0x3Fu)); + utf8_bytes[2] = static_cast::int_type>(0x80u | (static_cast(wc) & 0x3Fu)); + utf8_bytes_filled = 3; + } + else if (wc <= 0x10FFFF) + { + utf8_bytes[0] = static_cast::int_type>(0xF0u | ((static_cast(wc) >> 18u) & 0x07u)); + utf8_bytes[1] = static_cast::int_type>(0x80u | ((static_cast(wc) >> 12u) & 0x3Fu)); + utf8_bytes[2] = static_cast::int_type>(0x80u | ((static_cast(wc) >> 6u) & 0x3Fu)); + utf8_bytes[3] = static_cast::int_type>(0x80u | (static_cast(wc) & 0x3Fu)); + utf8_bytes_filled = 4; + } + else + { + // unknown character + utf8_bytes[0] = static_cast::int_type>(wc); + utf8_bytes_filled = 1; + } + } + } +}; + +template +struct wide_string_input_helper +{ + // UTF-16 + static void fill_buffer(BaseInputAdapter& input, + std::array::int_type, 4>& utf8_bytes, + size_t& utf8_bytes_index, + size_t& utf8_bytes_filled) + { + utf8_bytes_index = 0; + + if (JSON_HEDLEY_UNLIKELY(input.empty())) + { + utf8_bytes[0] = std::char_traits::eof(); + utf8_bytes_filled = 1; + } + else + { + // get the current character + const auto wc = input.get_character(); + + // UTF-16 to UTF-8 encoding + if (wc < 0x80) + { + utf8_bytes[0] = static_cast::int_type>(wc); + utf8_bytes_filled = 1; + } + else if (wc <= 0x7FF) + { + utf8_bytes[0] = static_cast::int_type>(0xC0u | ((static_cast(wc) >> 6u))); + utf8_bytes[1] = static_cast::int_type>(0x80u | (static_cast(wc) & 0x3Fu)); + utf8_bytes_filled = 2; + } + else if (0xD800 > wc || wc >= 0xE000) + { + utf8_bytes[0] = static_cast::int_type>(0xE0u | ((static_cast(wc) >> 12u))); + utf8_bytes[1] = static_cast::int_type>(0x80u | ((static_cast(wc) >> 6u) & 0x3Fu)); + utf8_bytes[2] = static_cast::int_type>(0x80u | (static_cast(wc) & 0x3Fu)); + utf8_bytes_filled = 3; + } + else + { + if (JSON_HEDLEY_UNLIKELY(!input.empty())) + { + const auto wc2 = static_cast(input.get_character()); + const auto charcode = 0x10000u + (((static_cast(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu)); + utf8_bytes[0] = static_cast::int_type>(0xF0u | (charcode >> 18u)); + utf8_bytes[1] = static_cast::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu)); + utf8_bytes[2] = static_cast::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu)); + utf8_bytes[3] = static_cast::int_type>(0x80u | (charcode & 0x3Fu)); + utf8_bytes_filled = 4; + } + else + { + utf8_bytes[0] = static_cast::int_type>(wc); + utf8_bytes_filled = 1; + } + } + } + } +}; + +// Wraps another input apdater to convert wide character types into individual bytes. +template +class wide_string_input_adapter +{ + public: + using char_type = char; + + wide_string_input_adapter(BaseInputAdapter base) + : base_adapter(base) {} + + typename std::char_traits::int_type get_character() noexcept + { + // check if buffer needs to be filled + if (utf8_bytes_index == utf8_bytes_filled) + { + fill_buffer(); + + JSON_ASSERT(utf8_bytes_filled > 0); + JSON_ASSERT(utf8_bytes_index == 0); + } + + // use buffer + JSON_ASSERT(utf8_bytes_filled > 0); + JSON_ASSERT(utf8_bytes_index < utf8_bytes_filled); + return utf8_bytes[utf8_bytes_index++]; + } + + private: + BaseInputAdapter base_adapter; + + template + void fill_buffer() + { + wide_string_input_helper::fill_buffer(base_adapter, utf8_bytes, utf8_bytes_index, utf8_bytes_filled); + } + + /// a buffer for UTF-8 bytes + std::array::int_type, 4> utf8_bytes = {{0, 0, 0, 0}}; + + /// index to the utf8_codes array for the next valid byte + std::size_t utf8_bytes_index = 0; + /// number of valid bytes in the utf8_codes array + std::size_t utf8_bytes_filled = 0; +}; + + +template +struct iterator_input_adapter_factory +{ + using iterator_type = IteratorType; + using char_type = typename std::iterator_traits::value_type; + using adapter_type = iterator_input_adapter; + + static adapter_type create(IteratorType first, IteratorType last) + { + return adapter_type(std::move(first), std::move(last)); + } +}; + +template +struct is_iterator_of_multibyte +{ + using value_type = typename std::iterator_traits::value_type; + enum + { + value = sizeof(value_type) > 1 + }; +}; + +template +struct iterator_input_adapter_factory::value>> +{ + using iterator_type = IteratorType; + using char_type = typename std::iterator_traits::value_type; + using base_adapter_type = iterator_input_adapter; + using adapter_type = wide_string_input_adapter; + + static adapter_type create(IteratorType first, IteratorType last) + { + return adapter_type(base_adapter_type(std::move(first), std::move(last))); + } +}; + +// General purpose iterator-based input +template +typename iterator_input_adapter_factory::adapter_type input_adapter(IteratorType first, IteratorType last) +{ + using factory_type = iterator_input_adapter_factory; + return factory_type::create(first, last); +} + +// Convenience shorthand from container to iterator +template +auto input_adapter(const ContainerType& container) -> decltype(input_adapter(begin(container), end(container))) +{ + // Enable ADL + using std::begin; + using std::end; + + return input_adapter(begin(container), end(container)); +} + +// Special cases with fast paths +inline file_input_adapter input_adapter(std::FILE* file) +{ + return file_input_adapter(file); +} + +inline input_stream_adapter input_adapter(std::istream& stream) +{ + return input_stream_adapter(stream); +} + +inline input_stream_adapter input_adapter(std::istream&& stream) +{ + return input_stream_adapter(stream); +} + +using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval(), std::declval())); + +// Null-delimited strings, and the like. +template < typename CharT, + typename std::enable_if < + std::is_pointer::value&& + !std::is_array::value&& + std::is_integral::type>::value&& + sizeof(typename std::remove_pointer::type) == 1, + int >::type = 0 > +contiguous_bytes_input_adapter input_adapter(CharT b) +{ + auto length = std::strlen(reinterpret_cast(b)); + const auto* ptr = reinterpret_cast(b); + return input_adapter(ptr, ptr + length); +} + +template +auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N)) +{ + return input_adapter(array, array + N); +} + +// This class only handles inputs of input_buffer_adapter type. +// It's required so that expressions like {ptr, len} can be implicitely casted +// to the correct adapter. +class span_input_adapter +{ + public: + template < typename CharT, + typename std::enable_if < + std::is_pointer::value&& + std::is_integral::type>::value&& + sizeof(typename std::remove_pointer::type) == 1, + int >::type = 0 > + span_input_adapter(CharT b, std::size_t l) + : ia(reinterpret_cast(b), reinterpret_cast(b) + l) {} + + template::iterator_category, std::random_access_iterator_tag>::value, + int>::type = 0> + span_input_adapter(IteratorType first, IteratorType last) + : ia(input_adapter(first, last)) {} + + contiguous_bytes_input_adapter&& get() + { + return std::move(ia); + } + + private: + contiguous_bytes_input_adapter ia; +}; +} // namespace detail +} // namespace nlohmann + +// #include + + +#include +#include // string +#include // move +#include // vector + +// #include + +// #include + + +namespace nlohmann +{ + +/*! +@brief SAX interface + +This class describes the SAX interface used by @ref nlohmann::json::sax_parse. +Each function is called in different situations while the input is parsed. The +boolean return value informs the parser whether to continue processing the +input. +*/ +template +struct json_sax +{ + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + + /*! + @brief a null value was read + @return whether parsing should proceed + */ + virtual bool null() = 0; + + /*! + @brief a boolean value was read + @param[in] val boolean value + @return whether parsing should proceed + */ + virtual bool boolean(bool val) = 0; + + /*! + @brief an integer number was read + @param[in] val integer value + @return whether parsing should proceed + */ + virtual bool number_integer(number_integer_t val) = 0; + + /*! + @brief an unsigned integer number was read + @param[in] val unsigned integer value + @return whether parsing should proceed + */ + virtual bool number_unsigned(number_unsigned_t val) = 0; + + /*! + @brief an floating-point number was read + @param[in] val floating-point value + @param[in] s raw token value + @return whether parsing should proceed + */ + virtual bool number_float(number_float_t val, const string_t& s) = 0; + + /*! + @brief a string was read + @param[in] val string value + @return whether parsing should proceed + @note It is safe to move the passed string. + */ + virtual bool string(string_t& val) = 0; + + /*! + @brief a binary string was read + @param[in] val binary value + @return whether parsing should proceed + @note It is safe to move the passed binary. + */ + virtual bool binary(binary_t& val) = 0; + + /*! + @brief the beginning of an object was read + @param[in] elements number of object elements or -1 if unknown + @return whether parsing should proceed + @note binary formats may report the number of elements + */ + virtual bool start_object(std::size_t elements) = 0; + + /*! + @brief an object key was read + @param[in] val object key + @return whether parsing should proceed + @note It is safe to move the passed string. + */ + virtual bool key(string_t& val) = 0; + + /*! + @brief the end of an object was read + @return whether parsing should proceed + */ + virtual bool end_object() = 0; + + /*! + @brief the beginning of an array was read + @param[in] elements number of array elements or -1 if unknown + @return whether parsing should proceed + @note binary formats may report the number of elements + */ + virtual bool start_array(std::size_t elements) = 0; + + /*! + @brief the end of an array was read + @return whether parsing should proceed + */ + virtual bool end_array() = 0; + + /*! + @brief a parse error occurred + @param[in] position the position in the input where the error occurs + @param[in] last_token the last read token + @param[in] ex an exception object describing the error + @return whether parsing should proceed (must return false) + */ + virtual bool parse_error(std::size_t position, + const std::string& last_token, + const detail::exception& ex) = 0; + + virtual ~json_sax() = default; +}; + + +namespace detail +{ +/*! +@brief SAX implementation to create a JSON value from SAX events + +This class implements the @ref json_sax interface and processes the SAX events +to create a JSON value which makes it basically a DOM parser. The structure or +hierarchy of the JSON value is managed by the stack `ref_stack` which contains +a pointer to the respective array or object for each recursion depth. + +After successful parsing, the value that is passed by reference to the +constructor contains the parsed value. + +@tparam BasicJsonType the JSON type +*/ +template +class json_sax_dom_parser +{ + public: + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + + /*! + @param[in, out] r reference to a JSON value that is manipulated while + parsing + @param[in] allow_exceptions_ whether parse errors yield exceptions + */ + explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true) + : root(r), allow_exceptions(allow_exceptions_) + {} + + // make class move-only + json_sax_dom_parser(const json_sax_dom_parser&) = delete; + json_sax_dom_parser(json_sax_dom_parser&&) = default; + json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete; + json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default; + ~json_sax_dom_parser() = default; + + bool null() + { + handle_value(nullptr); + return true; + } + + bool boolean(bool val) + { + handle_value(val); + return true; + } + + bool number_integer(number_integer_t val) + { + handle_value(val); + return true; + } + + bool number_unsigned(number_unsigned_t val) + { + handle_value(val); + return true; + } + + bool number_float(number_float_t val, const string_t& /*unused*/) + { + handle_value(val); + return true; + } + + bool string(string_t& val) + { + handle_value(val); + return true; + } + + bool binary(binary_t& val) + { + handle_value(std::move(val)); + return true; + } + + bool start_object(std::size_t len) + { + ref_stack.push_back(handle_value(BasicJsonType::value_t::object)); + + if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size())) + { + JSON_THROW(out_of_range::create(408, + "excessive object size: " + std::to_string(len))); + } + + return true; + } + + bool key(string_t& val) + { + // add null at given key and store the reference for later + object_element = &(ref_stack.back()->m_value.object->operator[](val)); + return true; + } + + bool end_object() + { + ref_stack.pop_back(); + return true; + } + + bool start_array(std::size_t len) + { + ref_stack.push_back(handle_value(BasicJsonType::value_t::array)); + + if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size())) + { + JSON_THROW(out_of_range::create(408, + "excessive array size: " + std::to_string(len))); + } + + return true; + } + + bool end_array() + { + ref_stack.pop_back(); + return true; + } + + template + bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, + const Exception& ex) + { + errored = true; + static_cast(ex); + if (allow_exceptions) + { + JSON_THROW(ex); + } + return false; + } + + constexpr bool is_errored() const + { + return errored; + } + + private: + /*! + @invariant If the ref stack is empty, then the passed value will be the new + root. + @invariant If the ref stack contains a value, then it is an array or an + object to which we can add elements + */ + template + JSON_HEDLEY_RETURNS_NON_NULL + BasicJsonType* handle_value(Value&& v) + { + if (ref_stack.empty()) + { + root = BasicJsonType(std::forward(v)); + return &root; + } + + JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object()); + + if (ref_stack.back()->is_array()) + { + ref_stack.back()->m_value.array->emplace_back(std::forward(v)); + return &(ref_stack.back()->m_value.array->back()); + } + + JSON_ASSERT(ref_stack.back()->is_object()); + JSON_ASSERT(object_element); + *object_element = BasicJsonType(std::forward(v)); + return object_element; + } + + /// the parsed JSON value + BasicJsonType& root; + /// stack to model hierarchy of values + std::vector ref_stack {}; + /// helper to hold the reference for the next object element + BasicJsonType* object_element = nullptr; + /// whether a syntax error occurred + bool errored = false; + /// whether to throw exceptions in case of errors + const bool allow_exceptions = true; +}; + +template +class json_sax_dom_callback_parser +{ + public: + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + using parser_callback_t = typename BasicJsonType::parser_callback_t; + using parse_event_t = typename BasicJsonType::parse_event_t; + + json_sax_dom_callback_parser(BasicJsonType& r, + const parser_callback_t cb, + const bool allow_exceptions_ = true) + : root(r), callback(cb), allow_exceptions(allow_exceptions_) + { + keep_stack.push_back(true); + } + + // make class move-only + json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete; + json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default; + json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete; + json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default; + ~json_sax_dom_callback_parser() = default; + + bool null() + { + handle_value(nullptr); + return true; + } + + bool boolean(bool val) + { + handle_value(val); + return true; + } + + bool number_integer(number_integer_t val) + { + handle_value(val); + return true; + } + + bool number_unsigned(number_unsigned_t val) + { + handle_value(val); + return true; + } + + bool number_float(number_float_t val, const string_t& /*unused*/) + { + handle_value(val); + return true; + } + + bool string(string_t& val) + { + handle_value(val); + return true; + } + + bool binary(binary_t& val) + { + handle_value(std::move(val)); + return true; + } + + bool start_object(std::size_t len) + { + // check callback for object start + const bool keep = callback(static_cast(ref_stack.size()), parse_event_t::object_start, discarded); + keep_stack.push_back(keep); + + auto val = handle_value(BasicJsonType::value_t::object, true); + ref_stack.push_back(val.second); + + // check object limit + if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size())) + { + JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len))); + } + + return true; + } + + bool key(string_t& val) + { + BasicJsonType k = BasicJsonType(val); + + // check callback for key + const bool keep = callback(static_cast(ref_stack.size()), parse_event_t::key, k); + key_keep_stack.push_back(keep); + + // add discarded value at given key and store the reference for later + if (keep && ref_stack.back()) + { + object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded); + } + + return true; + } + + bool end_object() + { + if (ref_stack.back() && !callback(static_cast(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back())) + { + // discard object + *ref_stack.back() = discarded; + } + + JSON_ASSERT(!ref_stack.empty()); + JSON_ASSERT(!keep_stack.empty()); + ref_stack.pop_back(); + keep_stack.pop_back(); + + if (!ref_stack.empty() && ref_stack.back() && ref_stack.back()->is_structured()) + { + // remove discarded value + for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it) + { + if (it->is_discarded()) + { + ref_stack.back()->erase(it); + break; + } + } + } + + return true; + } + + bool start_array(std::size_t len) + { + const bool keep = callback(static_cast(ref_stack.size()), parse_event_t::array_start, discarded); + keep_stack.push_back(keep); + + auto val = handle_value(BasicJsonType::value_t::array, true); + ref_stack.push_back(val.second); + + // check array limit + if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size())) + { + JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len))); + } + + return true; + } + + bool end_array() + { + bool keep = true; + + if (ref_stack.back()) + { + keep = callback(static_cast(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back()); + if (!keep) + { + // discard array + *ref_stack.back() = discarded; + } + } + + JSON_ASSERT(!ref_stack.empty()); + JSON_ASSERT(!keep_stack.empty()); + ref_stack.pop_back(); + keep_stack.pop_back(); + + // remove discarded value + if (!keep && !ref_stack.empty() && ref_stack.back()->is_array()) + { + ref_stack.back()->m_value.array->pop_back(); + } + + return true; + } + + template + bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, + const Exception& ex) + { + errored = true; + static_cast(ex); + if (allow_exceptions) + { + JSON_THROW(ex); + } + return false; + } + + constexpr bool is_errored() const + { + return errored; + } + + private: + /*! + @param[in] v value to add to the JSON value we build during parsing + @param[in] skip_callback whether we should skip calling the callback + function; this is required after start_array() and + start_object() SAX events, because otherwise we would call the + callback function with an empty array or object, respectively. + + @invariant If the ref stack is empty, then the passed value will be the new + root. + @invariant If the ref stack contains a value, then it is an array or an + object to which we can add elements + + @return pair of boolean (whether value should be kept) and pointer (to the + passed value in the ref_stack hierarchy; nullptr if not kept) + */ + template + std::pair handle_value(Value&& v, const bool skip_callback = false) + { + JSON_ASSERT(!keep_stack.empty()); + + // do not handle this value if we know it would be added to a discarded + // container + if (!keep_stack.back()) + { + return {false, nullptr}; + } + + // create value + auto value = BasicJsonType(std::forward(v)); + + // check callback + const bool keep = skip_callback || callback(static_cast(ref_stack.size()), parse_event_t::value, value); + + // do not handle this value if we just learnt it shall be discarded + if (!keep) + { + return {false, nullptr}; + } + + if (ref_stack.empty()) + { + root = std::move(value); + return {true, &root}; + } + + // skip this value if we already decided to skip the parent + // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360) + if (!ref_stack.back()) + { + return {false, nullptr}; + } + + // we now only expect arrays and objects + JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object()); + + // array + if (ref_stack.back()->is_array()) + { + ref_stack.back()->m_value.array->push_back(std::move(value)); + return {true, &(ref_stack.back()->m_value.array->back())}; + } + + // object + JSON_ASSERT(ref_stack.back()->is_object()); + // check if we should store an element for the current key + JSON_ASSERT(!key_keep_stack.empty()); + const bool store_element = key_keep_stack.back(); + key_keep_stack.pop_back(); + + if (!store_element) + { + return {false, nullptr}; + } + + JSON_ASSERT(object_element); + *object_element = std::move(value); + return {true, object_element}; + } + + /// the parsed JSON value + BasicJsonType& root; + /// stack to model hierarchy of values + std::vector ref_stack {}; + /// stack to manage which values to keep + std::vector keep_stack {}; + /// stack to manage which object keys to keep + std::vector key_keep_stack {}; + /// helper to hold the reference for the next object element + BasicJsonType* object_element = nullptr; + /// whether a syntax error occurred + bool errored = false; + /// callback function + const parser_callback_t callback = nullptr; + /// whether to throw exceptions in case of errors + const bool allow_exceptions = true; + /// a discarded value for the callback + BasicJsonType discarded = BasicJsonType::value_t::discarded; +}; + +template +class json_sax_acceptor +{ + public: + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + + bool null() + { + return true; + } + + bool boolean(bool /*unused*/) + { + return true; + } + + bool number_integer(number_integer_t /*unused*/) + { + return true; + } + + bool number_unsigned(number_unsigned_t /*unused*/) + { + return true; + } + + bool number_float(number_float_t /*unused*/, const string_t& /*unused*/) + { + return true; + } + + bool string(string_t& /*unused*/) + { + return true; + } + + bool binary(binary_t& /*unused*/) + { + return true; + } + + bool start_object(std::size_t /*unused*/ = std::size_t(-1)) + { + return true; + } + + bool key(string_t& /*unused*/) + { + return true; + } + + bool end_object() + { + return true; + } + + bool start_array(std::size_t /*unused*/ = std::size_t(-1)) + { + return true; + } + + bool end_array() + { + return true; + } + + bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/) + { + return false; + } +}; +} // namespace detail + +} // namespace nlohmann + +// #include + + +#include // array +#include // localeconv +#include // size_t +#include // snprintf +#include // strtof, strtod, strtold, strtoll, strtoull +#include // initializer_list +#include // char_traits, string +#include // move +#include // vector + +// #include + +// #include + +// #include + + +namespace nlohmann +{ +namespace detail +{ +/////////// +// lexer // +/////////// + +template +class lexer_base +{ + public: + /// token types for the parser + enum class token_type + { + uninitialized, ///< indicating the scanner is uninitialized + literal_true, ///< the `true` literal + literal_false, ///< the `false` literal + literal_null, ///< the `null` literal + value_string, ///< a string -- use get_string() for actual value + value_unsigned, ///< an unsigned integer -- use get_number_unsigned() for actual value + value_integer, ///< a signed integer -- use get_number_integer() for actual value + value_float, ///< an floating point number -- use get_number_float() for actual value + begin_array, ///< the character for array begin `[` + begin_object, ///< the character for object begin `{` + end_array, ///< the character for array end `]` + end_object, ///< the character for object end `}` + name_separator, ///< the name separator `:` + value_separator, ///< the value separator `,` + parse_error, ///< indicating a parse error + end_of_input, ///< indicating the end of the input buffer + literal_or_value ///< a literal or the begin of a value (only for diagnostics) + }; + + /// return name of values of type token_type (only used for errors) + JSON_HEDLEY_RETURNS_NON_NULL + JSON_HEDLEY_CONST + static const char* token_type_name(const token_type t) noexcept + { + switch (t) + { + case token_type::uninitialized: + return ""; + case token_type::literal_true: + return "true literal"; + case token_type::literal_false: + return "false literal"; + case token_type::literal_null: + return "null literal"; + case token_type::value_string: + return "string literal"; + case token_type::value_unsigned: + case token_type::value_integer: + case token_type::value_float: + return "number literal"; + case token_type::begin_array: + return "'['"; + case token_type::begin_object: + return "'{'"; + case token_type::end_array: + return "']'"; + case token_type::end_object: + return "'}'"; + case token_type::name_separator: + return "':'"; + case token_type::value_separator: + return "','"; + case token_type::parse_error: + return ""; + case token_type::end_of_input: + return "end of input"; + case token_type::literal_or_value: + return "'[', '{', or a literal"; + // LCOV_EXCL_START + default: // catch non-enum values + return "unknown token"; + // LCOV_EXCL_STOP + } + } +}; +/*! +@brief lexical analysis + +This class organizes the lexical analysis during JSON deserialization. +*/ +template +class lexer : public lexer_base +{ + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using char_type = typename InputAdapterType::char_type; + using char_int_type = typename std::char_traits::int_type; + + public: + using token_type = typename lexer_base::token_type; + + explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false) + : ia(std::move(adapter)) + , ignore_comments(ignore_comments_) + , decimal_point_char(static_cast(get_decimal_point())) + {} + + // delete because of pointer members + lexer(const lexer&) = delete; + lexer(lexer&&) = default; + lexer& operator=(lexer&) = delete; + lexer& operator=(lexer&&) = default; + ~lexer() = default; + + private: + ///////////////////// + // locales + ///////////////////// + + /// return the locale-dependent decimal point + JSON_HEDLEY_PURE + static char get_decimal_point() noexcept + { + const auto* loc = localeconv(); + JSON_ASSERT(loc != nullptr); + return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point); + } + + ///////////////////// + // scan functions + ///////////////////// + + /*! + @brief get codepoint from 4 hex characters following `\u` + + For input "\u c1 c2 c3 c4" the codepoint is: + (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4 + = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0) + + Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f' + must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The + conversion is done by subtracting the offset (0x30, 0x37, and 0x57) + between the ASCII value of the character and the desired integer value. + + @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or + non-hex character) + */ + int get_codepoint() + { + // this function only makes sense after reading `\u` + JSON_ASSERT(current == 'u'); + int codepoint = 0; + + const auto factors = { 12u, 8u, 4u, 0u }; + for (const auto factor : factors) + { + get(); + + if (current >= '0' && current <= '9') + { + codepoint += static_cast((static_cast(current) - 0x30u) << factor); + } + else if (current >= 'A' && current <= 'F') + { + codepoint += static_cast((static_cast(current) - 0x37u) << factor); + } + else if (current >= 'a' && current <= 'f') + { + codepoint += static_cast((static_cast(current) - 0x57u) << factor); + } + else + { + return -1; + } + } + + JSON_ASSERT(0x0000 <= codepoint && codepoint <= 0xFFFF); + return codepoint; + } + + /*! + @brief check if the next byte(s) are inside a given range + + Adds the current byte and, for each passed range, reads a new byte and + checks if it is inside the range. If a violation was detected, set up an + error message and return false. Otherwise, return true. + + @param[in] ranges list of integers; interpreted as list of pairs of + inclusive lower and upper bound, respectively + + @pre The passed list @a ranges must have 2, 4, or 6 elements; that is, + 1, 2, or 3 pairs. This precondition is enforced by an assertion. + + @return true if and only if no range violation was detected + */ + bool next_byte_in_range(std::initializer_list ranges) + { + JSON_ASSERT(ranges.size() == 2 || ranges.size() == 4 || ranges.size() == 6); + add(current); + + for (auto range = ranges.begin(); range != ranges.end(); ++range) + { + get(); + if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range))) + { + add(current); + } + else + { + error_message = "invalid string: ill-formed UTF-8 byte"; + return false; + } + } + + return true; + } + + /*! + @brief scan a string literal + + This function scans a string according to Sect. 7 of RFC 7159. While + scanning, bytes are escaped and copied into buffer token_buffer. Then the + function returns successfully, token_buffer is *not* null-terminated (as it + may contain \0 bytes), and token_buffer.size() is the number of bytes in the + string. + + @return token_type::value_string if string could be successfully scanned, + token_type::parse_error otherwise + + @note In case of errors, variable error_message contains a textual + description. + */ + token_type scan_string() + { + // reset token_buffer (ignore opening quote) + reset(); + + // we entered the function by reading an open quote + JSON_ASSERT(current == '\"'); + + while (true) + { + // get next character + switch (get()) + { + // end of file while parsing string + case std::char_traits::eof(): + { + error_message = "invalid string: missing closing quote"; + return token_type::parse_error; + } + + // closing quote + case '\"': + { + return token_type::value_string; + } + + // escapes + case '\\': + { + switch (get()) + { + // quotation mark + case '\"': + add('\"'); + break; + // reverse solidus + case '\\': + add('\\'); + break; + // solidus + case '/': + add('/'); + break; + // backspace + case 'b': + add('\b'); + break; + // form feed + case 'f': + add('\f'); + break; + // line feed + case 'n': + add('\n'); + break; + // carriage return + case 'r': + add('\r'); + break; + // tab + case 't': + add('\t'); + break; + + // unicode escapes + case 'u': + { + const int codepoint1 = get_codepoint(); + int codepoint = codepoint1; // start with codepoint1 + + if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1)) + { + error_message = "invalid string: '\\u' must be followed by 4 hex digits"; + return token_type::parse_error; + } + + // check if code point is a high surrogate + if (0xD800 <= codepoint1 && codepoint1 <= 0xDBFF) + { + // expect next \uxxxx entry + if (JSON_HEDLEY_LIKELY(get() == '\\' && get() == 'u')) + { + const int codepoint2 = get_codepoint(); + + if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1)) + { + error_message = "invalid string: '\\u' must be followed by 4 hex digits"; + return token_type::parse_error; + } + + // check if codepoint2 is a low surrogate + if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 && codepoint2 <= 0xDFFF)) + { + // overwrite codepoint + codepoint = static_cast( + // high surrogate occupies the most significant 22 bits + (static_cast(codepoint1) << 10u) + // low surrogate occupies the least significant 15 bits + + static_cast(codepoint2) + // there is still the 0xD800, 0xDC00 and 0x10000 noise + // in the result so we have to subtract with: + // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00 + - 0x35FDC00u); + } + else + { + error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF"; + return token_type::parse_error; + } + } + else + { + error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF"; + return token_type::parse_error; + } + } + else + { + if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 && codepoint1 <= 0xDFFF)) + { + error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF"; + return token_type::parse_error; + } + } + + // result of the above calculation yields a proper codepoint + JSON_ASSERT(0x00 <= codepoint && codepoint <= 0x10FFFF); + + // translate codepoint into bytes + if (codepoint < 0x80) + { + // 1-byte characters: 0xxxxxxx (ASCII) + add(static_cast(codepoint)); + } + else if (codepoint <= 0x7FF) + { + // 2-byte characters: 110xxxxx 10xxxxxx + add(static_cast(0xC0u | (static_cast(codepoint) >> 6u))); + add(static_cast(0x80u | (static_cast(codepoint) & 0x3Fu))); + } + else if (codepoint <= 0xFFFF) + { + // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx + add(static_cast(0xE0u | (static_cast(codepoint) >> 12u))); + add(static_cast(0x80u | ((static_cast(codepoint) >> 6u) & 0x3Fu))); + add(static_cast(0x80u | (static_cast(codepoint) & 0x3Fu))); + } + else + { + // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx + add(static_cast(0xF0u | (static_cast(codepoint) >> 18u))); + add(static_cast(0x80u | ((static_cast(codepoint) >> 12u) & 0x3Fu))); + add(static_cast(0x80u | ((static_cast(codepoint) >> 6u) & 0x3Fu))); + add(static_cast(0x80u | (static_cast(codepoint) & 0x3Fu))); + } + + break; + } + + // other characters after escape + default: + error_message = "invalid string: forbidden character after backslash"; + return token_type::parse_error; + } + + break; + } + + // invalid control characters + case 0x00: + { + error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000"; + return token_type::parse_error; + } + + case 0x01: + { + error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001"; + return token_type::parse_error; + } + + case 0x02: + { + error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002"; + return token_type::parse_error; + } + + case 0x03: + { + error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003"; + return token_type::parse_error; + } + + case 0x04: + { + error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004"; + return token_type::parse_error; + } + + case 0x05: + { + error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005"; + return token_type::parse_error; + } + + case 0x06: + { + error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006"; + return token_type::parse_error; + } + + case 0x07: + { + error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007"; + return token_type::parse_error; + } + + case 0x08: + { + error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b"; + return token_type::parse_error; + } + + case 0x09: + { + error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t"; + return token_type::parse_error; + } + + case 0x0A: + { + error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n"; + return token_type::parse_error; + } + + case 0x0B: + { + error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B"; + return token_type::parse_error; + } + + case 0x0C: + { + error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f"; + return token_type::parse_error; + } + + case 0x0D: + { + error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r"; + return token_type::parse_error; + } + + case 0x0E: + { + error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E"; + return token_type::parse_error; + } + + case 0x0F: + { + error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F"; + return token_type::parse_error; + } + + case 0x10: + { + error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010"; + return token_type::parse_error; + } + + case 0x11: + { + error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011"; + return token_type::parse_error; + } + + case 0x12: + { + error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012"; + return token_type::parse_error; + } + + case 0x13: + { + error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013"; + return token_type::parse_error; + } + + case 0x14: + { + error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014"; + return token_type::parse_error; + } + + case 0x15: + { + error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015"; + return token_type::parse_error; + } + + case 0x16: + { + error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016"; + return token_type::parse_error; + } + + case 0x17: + { + error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017"; + return token_type::parse_error; + } + + case 0x18: + { + error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018"; + return token_type::parse_error; + } + + case 0x19: + { + error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019"; + return token_type::parse_error; + } + + case 0x1A: + { + error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A"; + return token_type::parse_error; + } + + case 0x1B: + { + error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B"; + return token_type::parse_error; + } + + case 0x1C: + { + error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C"; + return token_type::parse_error; + } + + case 0x1D: + { + error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D"; + return token_type::parse_error; + } + + case 0x1E: + { + error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E"; + return token_type::parse_error; + } + + case 0x1F: + { + error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F"; + return token_type::parse_error; + } + + // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace)) + case 0x20: + case 0x21: + case 0x23: + case 0x24: + case 0x25: + case 0x26: + case 0x27: + case 0x28: + case 0x29: + case 0x2A: + case 0x2B: + case 0x2C: + case 0x2D: + case 0x2E: + case 0x2F: + case 0x30: + case 0x31: + case 0x32: + case 0x33: + case 0x34: + case 0x35: + case 0x36: + case 0x37: + case 0x38: + case 0x39: + case 0x3A: + case 0x3B: + case 0x3C: + case 0x3D: + case 0x3E: + case 0x3F: + case 0x40: + case 0x41: + case 0x42: + case 0x43: + case 0x44: + case 0x45: + case 0x46: + case 0x47: + case 0x48: + case 0x49: + case 0x4A: + case 0x4B: + case 0x4C: + case 0x4D: + case 0x4E: + case 0x4F: + case 0x50: + case 0x51: + case 0x52: + case 0x53: + case 0x54: + case 0x55: + case 0x56: + case 0x57: + case 0x58: + case 0x59: + case 0x5A: + case 0x5B: + case 0x5D: + case 0x5E: + case 0x5F: + case 0x60: + case 0x61: + case 0x62: + case 0x63: + case 0x64: + case 0x65: + case 0x66: + case 0x67: + case 0x68: + case 0x69: + case 0x6A: + case 0x6B: + case 0x6C: + case 0x6D: + case 0x6E: + case 0x6F: + case 0x70: + case 0x71: + case 0x72: + case 0x73: + case 0x74: + case 0x75: + case 0x76: + case 0x77: + case 0x78: + case 0x79: + case 0x7A: + case 0x7B: + case 0x7C: + case 0x7D: + case 0x7E: + case 0x7F: + { + add(current); + break; + } + + // U+0080..U+07FF: bytes C2..DF 80..BF + case 0xC2: + case 0xC3: + case 0xC4: + case 0xC5: + case 0xC6: + case 0xC7: + case 0xC8: + case 0xC9: + case 0xCA: + case 0xCB: + case 0xCC: + case 0xCD: + case 0xCE: + case 0xCF: + case 0xD0: + case 0xD1: + case 0xD2: + case 0xD3: + case 0xD4: + case 0xD5: + case 0xD6: + case 0xD7: + case 0xD8: + case 0xD9: + case 0xDA: + case 0xDB: + case 0xDC: + case 0xDD: + case 0xDE: + case 0xDF: + { + if (JSON_HEDLEY_UNLIKELY(!next_byte_in_range({0x80, 0xBF}))) + { + return token_type::parse_error; + } + break; + } + + // U+0800..U+0FFF: bytes E0 A0..BF 80..BF + case 0xE0: + { + if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF})))) + { + return token_type::parse_error; + } + break; + } + + // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF + // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF + case 0xE1: + case 0xE2: + case 0xE3: + case 0xE4: + case 0xE5: + case 0xE6: + case 0xE7: + case 0xE8: + case 0xE9: + case 0xEA: + case 0xEB: + case 0xEC: + case 0xEE: + case 0xEF: + { + if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF})))) + { + return token_type::parse_error; + } + break; + } + + // U+D000..U+D7FF: bytes ED 80..9F 80..BF + case 0xED: + { + if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x9F, 0x80, 0xBF})))) + { + return token_type::parse_error; + } + break; + } + + // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF + case 0xF0: + { + if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF})))) + { + return token_type::parse_error; + } + break; + } + + // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF + case 0xF1: + case 0xF2: + case 0xF3: + { + if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF})))) + { + return token_type::parse_error; + } + break; + } + + // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF + case 0xF4: + { + if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF})))) + { + return token_type::parse_error; + } + break; + } + + // remaining bytes (80..C1 and F5..FF) are ill-formed + default: + { + error_message = "invalid string: ill-formed UTF-8 byte"; + return token_type::parse_error; + } + } + } + } + + /*! + * @brief scan a comment + * @return whether comment could be scanned successfully + */ + bool scan_comment() + { + switch (get()) + { + // single-line comments skip input until a newline or EOF is read + case '/': + { + while (true) + { + switch (get()) + { + case '\n': + case '\r': + case std::char_traits::eof(): + case '\0': + return true; + + default: + break; + } + } + } + + // multi-line comments skip input until */ is read + case '*': + { + while (true) + { + switch (get()) + { + case std::char_traits::eof(): + case '\0': + { + error_message = "invalid comment; missing closing '*/'"; + return false; + } + + case '*': + { + switch (get()) + { + case '/': + return true; + + default: + { + unget(); + continue; + } + } + } + + default: + continue; + } + } + } + + // unexpected character after reading '/' + default: + { + error_message = "invalid comment; expecting '/' or '*' after '/'"; + return false; + } + } + } + + JSON_HEDLEY_NON_NULL(2) + static void strtof(float& f, const char* str, char** endptr) noexcept + { + f = std::strtof(str, endptr); + } + + JSON_HEDLEY_NON_NULL(2) + static void strtof(double& f, const char* str, char** endptr) noexcept + { + f = std::strtod(str, endptr); + } + + JSON_HEDLEY_NON_NULL(2) + static void strtof(long double& f, const char* str, char** endptr) noexcept + { + f = std::strtold(str, endptr); + } + + /*! + @brief scan a number literal + + This function scans a string according to Sect. 6 of RFC 7159. + + The function is realized with a deterministic finite state machine derived + from the grammar described in RFC 7159. Starting in state "init", the + input is read and used to determined the next state. Only state "done" + accepts the number. State "error" is a trap state to model errors. In the + table below, "anything" means any character but the ones listed before. + + state | 0 | 1-9 | e E | + | - | . | anything + ---------|----------|----------|----------|---------|---------|----------|----------- + init | zero | any1 | [error] | [error] | minus | [error] | [error] + minus | zero | any1 | [error] | [error] | [error] | [error] | [error] + zero | done | done | exponent | done | done | decimal1 | done + any1 | any1 | any1 | exponent | done | done | decimal1 | done + decimal1 | decimal2 | decimal2 | [error] | [error] | [error] | [error] | [error] + decimal2 | decimal2 | decimal2 | exponent | done | done | done | done + exponent | any2 | any2 | [error] | sign | sign | [error] | [error] + sign | any2 | any2 | [error] | [error] | [error] | [error] | [error] + any2 | any2 | any2 | done | done | done | done | done + + The state machine is realized with one label per state (prefixed with + "scan_number_") and `goto` statements between them. The state machine + contains cycles, but any cycle can be left when EOF is read. Therefore, + the function is guaranteed to terminate. + + During scanning, the read bytes are stored in token_buffer. This string is + then converted to a signed integer, an unsigned integer, or a + floating-point number. + + @return token_type::value_unsigned, token_type::value_integer, or + token_type::value_float if number could be successfully scanned, + token_type::parse_error otherwise + + @note The scanner is independent of the current locale. Internally, the + locale's decimal point is used instead of `.` to work with the + locale-dependent converters. + */ + token_type scan_number() // lgtm [cpp/use-of-goto] + { + // reset token_buffer to store the number's bytes + reset(); + + // the type of the parsed number; initially set to unsigned; will be + // changed if minus sign, decimal point or exponent is read + token_type number_type = token_type::value_unsigned; + + // state (init): we just found out we need to scan a number + switch (current) + { + case '-': + { + add(current); + goto scan_number_minus; + } + + case '0': + { + add(current); + goto scan_number_zero; + } + + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_any1; + } + + // all other characters are rejected outside scan_number() + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // LCOV_EXCL_LINE + } + +scan_number_minus: + // state: we just parsed a leading minus sign + number_type = token_type::value_integer; + switch (get()) + { + case '0': + { + add(current); + goto scan_number_zero; + } + + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_any1; + } + + default: + { + error_message = "invalid number; expected digit after '-'"; + return token_type::parse_error; + } + } + +scan_number_zero: + // state: we just parse a zero (maybe with a leading minus sign) + switch (get()) + { + case '.': + { + add(decimal_point_char); + goto scan_number_decimal1; + } + + case 'e': + case 'E': + { + add(current); + goto scan_number_exponent; + } + + default: + goto scan_number_done; + } + +scan_number_any1: + // state: we just parsed a number 0-9 (maybe with a leading minus sign) + switch (get()) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_any1; + } + + case '.': + { + add(decimal_point_char); + goto scan_number_decimal1; + } + + case 'e': + case 'E': + { + add(current); + goto scan_number_exponent; + } + + default: + goto scan_number_done; + } + +scan_number_decimal1: + // state: we just parsed a decimal point + number_type = token_type::value_float; + switch (get()) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_decimal2; + } + + default: + { + error_message = "invalid number; expected digit after '.'"; + return token_type::parse_error; + } + } + +scan_number_decimal2: + // we just parsed at least one number after a decimal point + switch (get()) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_decimal2; + } + + case 'e': + case 'E': + { + add(current); + goto scan_number_exponent; + } + + default: + goto scan_number_done; + } + +scan_number_exponent: + // we just parsed an exponent + number_type = token_type::value_float; + switch (get()) + { + case '+': + case '-': + { + add(current); + goto scan_number_sign; + } + + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_any2; + } + + default: + { + error_message = + "invalid number; expected '+', '-', or digit after exponent"; + return token_type::parse_error; + } + } + +scan_number_sign: + // we just parsed an exponent sign + switch (get()) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_any2; + } + + default: + { + error_message = "invalid number; expected digit after exponent sign"; + return token_type::parse_error; + } + } + +scan_number_any2: + // we just parsed a number after the exponent or exponent sign + switch (get()) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_any2; + } + + default: + goto scan_number_done; + } + +scan_number_done: + // unget the character after the number (we only read it to know that + // we are done scanning a number) + unget(); + + char* endptr = nullptr; + errno = 0; + + // try to parse integers first and fall back to floats + if (number_type == token_type::value_unsigned) + { + const auto x = std::strtoull(token_buffer.data(), &endptr, 10); + + // we checked the number format before + JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size()); + + if (errno == 0) + { + value_unsigned = static_cast(x); + if (value_unsigned == x) + { + return token_type::value_unsigned; + } + } + } + else if (number_type == token_type::value_integer) + { + const auto x = std::strtoll(token_buffer.data(), &endptr, 10); + + // we checked the number format before + JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size()); + + if (errno == 0) + { + value_integer = static_cast(x); + if (value_integer == x) + { + return token_type::value_integer; + } + } + } + + // this code is reached if we parse a floating-point number or if an + // integer conversion above failed + strtof(value_float, token_buffer.data(), &endptr); + + // we checked the number format before + JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size()); + + return token_type::value_float; + } + + /*! + @param[in] literal_text the literal text to expect + @param[in] length the length of the passed literal text + @param[in] return_type the token type to return on success + */ + JSON_HEDLEY_NON_NULL(2) + token_type scan_literal(const char_type* literal_text, const std::size_t length, + token_type return_type) + { + JSON_ASSERT(std::char_traits::to_char_type(current) == literal_text[0]); + for (std::size_t i = 1; i < length; ++i) + { + if (JSON_HEDLEY_UNLIKELY(std::char_traits::to_char_type(get()) != literal_text[i])) + { + error_message = "invalid literal"; + return token_type::parse_error; + } + } + return return_type; + } + + ///////////////////// + // input management + ///////////////////// + + /// reset token_buffer; current character is beginning of token + void reset() noexcept + { + token_buffer.clear(); + token_string.clear(); + token_string.push_back(std::char_traits::to_char_type(current)); + } + + /* + @brief get next character from the input + + This function provides the interface to the used input adapter. It does + not throw in case the input reached EOF, but returns a + `std::char_traits::eof()` in that case. Stores the scanned characters + for use in error messages. + + @return character read from the input + */ + char_int_type get() + { + ++position.chars_read_total; + ++position.chars_read_current_line; + + if (next_unget) + { + // just reset the next_unget variable and work with current + next_unget = false; + } + else + { + current = ia.get_character(); + } + + if (JSON_HEDLEY_LIKELY(current != std::char_traits::eof())) + { + token_string.push_back(std::char_traits::to_char_type(current)); + } + + if (current == '\n') + { + ++position.lines_read; + position.chars_read_current_line = 0; + } + + return current; + } + + /*! + @brief unget current character (read it again on next get) + + We implement unget by setting variable next_unget to true. The input is not + changed - we just simulate ungetting by modifying chars_read_total, + chars_read_current_line, and token_string. The next call to get() will + behave as if the unget character is read again. + */ + void unget() + { + next_unget = true; + + --position.chars_read_total; + + // in case we "unget" a newline, we have to also decrement the lines_read + if (position.chars_read_current_line == 0) + { + if (position.lines_read > 0) + { + --position.lines_read; + } + } + else + { + --position.chars_read_current_line; + } + + if (JSON_HEDLEY_LIKELY(current != std::char_traits::eof())) + { + JSON_ASSERT(!token_string.empty()); + token_string.pop_back(); + } + } + + /// add a character to token_buffer + void add(char_int_type c) + { + token_buffer.push_back(static_cast(c)); + } + + public: + ///////////////////// + // value getters + ///////////////////// + + /// return integer value + constexpr number_integer_t get_number_integer() const noexcept + { + return value_integer; + } + + /// return unsigned integer value + constexpr number_unsigned_t get_number_unsigned() const noexcept + { + return value_unsigned; + } + + /// return floating-point value + constexpr number_float_t get_number_float() const noexcept + { + return value_float; + } + + /// return current string value (implicitly resets the token; useful only once) + string_t& get_string() + { + return token_buffer; + } + + ///////////////////// + // diagnostics + ///////////////////// + + /// return position of last read token + constexpr position_t get_position() const noexcept + { + return position; + } + + /// return the last read token (for errors only). Will never contain EOF + /// (an arbitrary value that is not a valid char value, often -1), because + /// 255 may legitimately occur. May contain NUL, which should be escaped. + std::string get_token_string() const + { + // escape control characters + std::string result; + for (const auto c : token_string) + { + if (static_cast(c) <= '\x1F') + { + // escape control characters + std::array cs{{}}; + (std::snprintf)(cs.data(), cs.size(), "", static_cast(c)); + result += cs.data(); + } + else + { + // add character as is + result.push_back(static_cast(c)); + } + } + + return result; + } + + /// return syntax error message + JSON_HEDLEY_RETURNS_NON_NULL + constexpr const char* get_error_message() const noexcept + { + return error_message; + } + + ///////////////////// + // actual scanner + ///////////////////// + + /*! + @brief skip the UTF-8 byte order mark + @return true iff there is no BOM or the correct BOM has been skipped + */ + bool skip_bom() + { + if (get() == 0xEF) + { + // check if we completely parse the BOM + return get() == 0xBB && get() == 0xBF; + } + + // the first character is not the beginning of the BOM; unget it to + // process is later + unget(); + return true; + } + + void skip_whitespace() + { + do + { + get(); + } + while (current == ' ' || current == '\t' || current == '\n' || current == '\r'); + } + + token_type scan() + { + // initially, skip the BOM + if (position.chars_read_total == 0 && !skip_bom()) + { + error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given"; + return token_type::parse_error; + } + + // read next character and ignore whitespace + skip_whitespace(); + + // ignore comments + while (ignore_comments && current == '/') + { + if (!scan_comment()) + { + return token_type::parse_error; + } + + // skip following whitespace + skip_whitespace(); + } + + switch (current) + { + // structural characters + case '[': + return token_type::begin_array; + case ']': + return token_type::end_array; + case '{': + return token_type::begin_object; + case '}': + return token_type::end_object; + case ':': + return token_type::name_separator; + case ',': + return token_type::value_separator; + + // literals + case 't': + { + std::array true_literal = {{'t', 'r', 'u', 'e'}}; + return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true); + } + case 'f': + { + std::array false_literal = {{'f', 'a', 'l', 's', 'e'}}; + return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false); + } + case 'n': + { + std::array null_literal = {{'n', 'u', 'l', 'l'}}; + return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null); + } + + // string + case '\"': + return scan_string(); + + // number + case '-': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + return scan_number(); + + // end of input (the null byte is needed when parsing from + // string literals) + case '\0': + case std::char_traits::eof(): + return token_type::end_of_input; + + // error + default: + error_message = "invalid literal"; + return token_type::parse_error; + } + } + + private: + /// input adapter + InputAdapterType ia; + + /// whether comments should be ignored (true) or signaled as errors (false) + const bool ignore_comments = false; + + /// the current character + char_int_type current = std::char_traits::eof(); + + /// whether the next get() call should just return current + bool next_unget = false; + + /// the start position of the current token + position_t position {}; + + /// raw input token string (for error messages) + std::vector token_string {}; + + /// buffer for variable-length tokens (numbers, strings) + string_t token_buffer {}; + + /// a description of occurred lexer errors + const char* error_message = ""; + + // number values + number_integer_t value_integer = 0; + number_unsigned_t value_unsigned = 0; + number_float_t value_float = 0; + + /// the decimal point + const char_int_type decimal_point_char = '.'; +}; +} // namespace detail +} // namespace nlohmann + +// #include + +// #include + + +#include // size_t +#include // declval +#include // string + +// #include + +// #include + + +namespace nlohmann +{ +namespace detail +{ +template +using null_function_t = decltype(std::declval().null()); + +template +using boolean_function_t = + decltype(std::declval().boolean(std::declval())); + +template +using number_integer_function_t = + decltype(std::declval().number_integer(std::declval())); + +template +using number_unsigned_function_t = + decltype(std::declval().number_unsigned(std::declval())); + +template +using number_float_function_t = decltype(std::declval().number_float( + std::declval(), std::declval())); + +template +using string_function_t = + decltype(std::declval().string(std::declval())); + +template +using binary_function_t = + decltype(std::declval().binary(std::declval())); + +template +using start_object_function_t = + decltype(std::declval().start_object(std::declval())); + +template +using key_function_t = + decltype(std::declval().key(std::declval())); + +template +using end_object_function_t = decltype(std::declval().end_object()); + +template +using start_array_function_t = + decltype(std::declval().start_array(std::declval())); + +template +using end_array_function_t = decltype(std::declval().end_array()); + +template +using parse_error_function_t = decltype(std::declval().parse_error( + std::declval(), std::declval(), + std::declval())); + +template +struct is_sax +{ + private: + static_assert(is_basic_json::value, + "BasicJsonType must be of type basic_json<...>"); + + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + using exception_t = typename BasicJsonType::exception; + + public: + static constexpr bool value = + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value; +}; + +template +struct is_sax_static_asserts +{ + private: + static_assert(is_basic_json::value, + "BasicJsonType must be of type basic_json<...>"); + + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + using exception_t = typename BasicJsonType::exception; + + public: + static_assert(is_detected_exact::value, + "Missing/invalid function: bool null()"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool boolean(bool)"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool boolean(bool)"); + static_assert( + is_detected_exact::value, + "Missing/invalid function: bool number_integer(number_integer_t)"); + static_assert( + is_detected_exact::value, + "Missing/invalid function: bool number_unsigned(number_unsigned_t)"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool number_float(number_float_t, const string_t&)"); + static_assert( + is_detected_exact::value, + "Missing/invalid function: bool string(string_t&)"); + static_assert( + is_detected_exact::value, + "Missing/invalid function: bool binary(binary_t&)"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool start_object(std::size_t)"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool key(string_t&)"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool end_object()"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool start_array(std::size_t)"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool end_array()"); + static_assert( + is_detected_exact::value, + "Missing/invalid function: bool parse_error(std::size_t, const " + "std::string&, const exception&)"); +}; +} // namespace detail +} // namespace nlohmann + +// #include + + +namespace nlohmann +{ +namespace detail +{ + +/// how to treat CBOR tags +enum class cbor_tag_handler_t +{ + error, ///< throw a parse_error exception in case of a tag + ignore ///< ignore tags +}; + +/*! +@brief determine system byte order + +@return true if and only if system's byte order is little endian + +@note from https://stackoverflow.com/a/1001328/266378 +*/ +static inline bool little_endianess(int num = 1) noexcept +{ + return *reinterpret_cast(&num) == 1; +} + + +/////////////////// +// binary reader // +/////////////////// + +/*! +@brief deserialization of CBOR, MessagePack, and UBJSON values +*/ +template> +class binary_reader +{ + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + using json_sax_t = SAX; + using char_type = typename InputAdapterType::char_type; + using char_int_type = typename std::char_traits::int_type; + + public: + /*! + @brief create a binary reader + + @param[in] adapter input adapter to read from + */ + explicit binary_reader(InputAdapterType&& adapter) : ia(std::move(adapter)) + { + (void)detail::is_sax_static_asserts {}; + } + + // make class move-only + binary_reader(const binary_reader&) = delete; + binary_reader(binary_reader&&) = default; + binary_reader& operator=(const binary_reader&) = delete; + binary_reader& operator=(binary_reader&&) = default; + ~binary_reader() = default; + + /*! + @param[in] format the binary format to parse + @param[in] sax_ a SAX event processor + @param[in] strict whether to expect the input to be consumed completed + @param[in] tag_handler how to treat CBOR tags + + @return + */ + JSON_HEDLEY_NON_NULL(3) + bool sax_parse(const input_format_t format, + json_sax_t* sax_, + const bool strict = true, + const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error) + { + sax = sax_; + bool result = false; + + switch (format) + { + case input_format_t::bson: + result = parse_bson_internal(); + break; + + case input_format_t::cbor: + result = parse_cbor_internal(true, tag_handler); + break; + + case input_format_t::msgpack: + result = parse_msgpack_internal(); + break; + + case input_format_t::ubjson: + result = parse_ubjson_internal(); + break; + + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // LCOV_EXCL_LINE + } + + // strict mode: next byte must be EOF + if (result && strict) + { + if (format == input_format_t::ubjson) + { + get_ignore_noop(); + } + else + { + get(); + } + + if (JSON_HEDLEY_UNLIKELY(current != std::char_traits::eof())) + { + return sax->parse_error(chars_read, get_token_string(), + parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value"))); + } + } + + return result; + } + + private: + ////////// + // BSON // + ////////// + + /*! + @brief Reads in a BSON-object and passes it to the SAX-parser. + @return whether a valid BSON-value was passed to the SAX parser + */ + bool parse_bson_internal() + { + std::int32_t document_size{}; + get_number(input_format_t::bson, document_size); + + if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1)))) + { + return false; + } + + if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/false))) + { + return false; + } + + return sax->end_object(); + } + + /*! + @brief Parses a C-style string from the BSON input. + @param[in, out] result A reference to the string variable where the read + string is to be stored. + @return `true` if the \x00-byte indicating the end of the string was + encountered before the EOF; false` indicates an unexpected EOF. + */ + bool get_bson_cstr(string_t& result) + { + auto out = std::back_inserter(result); + while (true) + { + get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "cstring"))) + { + return false; + } + if (current == 0x00) + { + return true; + } + *out++ = static_cast(current); + } + } + + /*! + @brief Parses a zero-terminated string of length @a len from the BSON + input. + @param[in] len The length (including the zero-byte at the end) of the + string to be read. + @param[in, out] result A reference to the string variable where the read + string is to be stored. + @tparam NumberType The type of the length @a len + @pre len >= 1 + @return `true` if the string was successfully parsed + */ + template + bool get_bson_string(const NumberType len, string_t& result) + { + if (JSON_HEDLEY_UNLIKELY(len < 1)) + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string"))); + } + + return get_string(input_format_t::bson, len - static_cast(1), result) && get() != std::char_traits::eof(); + } + + /*! + @brief Parses a byte array input of length @a len from the BSON input. + @param[in] len The length of the byte array to be read. + @param[in, out] result A reference to the binary variable where the read + array is to be stored. + @tparam NumberType The type of the length @a len + @pre len >= 0 + @return `true` if the byte array was successfully parsed + */ + template + bool get_bson_binary(const NumberType len, binary_t& result) + { + if (JSON_HEDLEY_UNLIKELY(len < 0)) + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "byte array length cannot be negative, is " + std::to_string(len), "binary"))); + } + + // All BSON binary values have a subtype + std::uint8_t subtype{}; + get_number(input_format_t::bson, subtype); + result.set_subtype(subtype); + + return get_binary(input_format_t::bson, len, result); + } + + /*! + @brief Read a BSON document element of the given @a element_type. + @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html + @param[in] element_type_parse_position The position in the input stream, + where the `element_type` was read. + @warning Not all BSON element types are supported yet. An unsupported + @a element_type will give rise to a parse_error.114: + Unsupported BSON record type 0x... + @return whether a valid BSON-object/array was passed to the SAX parser + */ + bool parse_bson_element_internal(const char_int_type element_type, + const std::size_t element_type_parse_position) + { + switch (element_type) + { + case 0x01: // double + { + double number{}; + return get_number(input_format_t::bson, number) && sax->number_float(static_cast(number), ""); + } + + case 0x02: // string + { + std::int32_t len{}; + string_t value; + return get_number(input_format_t::bson, len) && get_bson_string(len, value) && sax->string(value); + } + + case 0x03: // object + { + return parse_bson_internal(); + } + + case 0x04: // array + { + return parse_bson_array(); + } + + case 0x05: // binary + { + std::int32_t len{}; + binary_t value; + return get_number(input_format_t::bson, len) && get_bson_binary(len, value) && sax->binary(value); + } + + case 0x08: // boolean + { + return sax->boolean(get() != 0); + } + + case 0x0A: // null + { + return sax->null(); + } + + case 0x10: // int32 + { + std::int32_t value{}; + return get_number(input_format_t::bson, value) && sax->number_integer(value); + } + + case 0x12: // int64 + { + std::int64_t value{}; + return get_number(input_format_t::bson, value) && sax->number_integer(value); + } + + default: // anything else not supported (yet) + { + std::array cr{{}}; + (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast(element_type)); + return sax->parse_error(element_type_parse_position, std::string(cr.data()), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr.data()))); + } + } + } + + /*! + @brief Read a BSON element list (as specified in the BSON-spec) + + The same binary layout is used for objects and arrays, hence it must be + indicated with the argument @a is_array which one is expected + (true --> array, false --> object). + + @param[in] is_array Determines if the element list being read is to be + treated as an object (@a is_array == false), or as an + array (@a is_array == true). + @return whether a valid BSON-object/array was passed to the SAX parser + */ + bool parse_bson_element_list(const bool is_array) + { + string_t key; + + while (auto element_type = get()) + { + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "element list"))) + { + return false; + } + + const std::size_t element_type_parse_position = chars_read; + if (JSON_HEDLEY_UNLIKELY(!get_bson_cstr(key))) + { + return false; + } + + if (!is_array && !sax->key(key)) + { + return false; + } + + if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_internal(element_type, element_type_parse_position))) + { + return false; + } + + // get_bson_cstr only appends + key.clear(); + } + + return true; + } + + /*! + @brief Reads an array from the BSON input and passes it to the SAX-parser. + @return whether a valid BSON-array was passed to the SAX parser + */ + bool parse_bson_array() + { + std::int32_t document_size{}; + get_number(input_format_t::bson, document_size); + + if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1)))) + { + return false; + } + + if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/true))) + { + return false; + } + + return sax->end_array(); + } + + ////////// + // CBOR // + ////////// + + /*! + @param[in] get_char whether a new character should be retrieved from the + input (true) or whether the last read character should + be considered instead (false) + @param[in] tag_handler how CBOR tags should be treated + + @return whether a valid CBOR value was passed to the SAX parser + */ + bool parse_cbor_internal(const bool get_char, + const cbor_tag_handler_t tag_handler) + { + switch (get_char ? get() : current) + { + // EOF + case std::char_traits::eof(): + return unexpect_eof(input_format_t::cbor, "value"); + + // Integer 0x00..0x17 (0..23) + case 0x00: + case 0x01: + case 0x02: + case 0x03: + case 0x04: + case 0x05: + case 0x06: + case 0x07: + case 0x08: + case 0x09: + case 0x0A: + case 0x0B: + case 0x0C: + case 0x0D: + case 0x0E: + case 0x0F: + case 0x10: + case 0x11: + case 0x12: + case 0x13: + case 0x14: + case 0x15: + case 0x16: + case 0x17: + return sax->number_unsigned(static_cast(current)); + + case 0x18: // Unsigned integer (one-byte uint8_t follows) + { + std::uint8_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_unsigned(number); + } + + case 0x19: // Unsigned integer (two-byte uint16_t follows) + { + std::uint16_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_unsigned(number); + } + + case 0x1A: // Unsigned integer (four-byte uint32_t follows) + { + std::uint32_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_unsigned(number); + } + + case 0x1B: // Unsigned integer (eight-byte uint64_t follows) + { + std::uint64_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_unsigned(number); + } + + // Negative integer -1-0x00..-1-0x17 (-1..-24) + case 0x20: + case 0x21: + case 0x22: + case 0x23: + case 0x24: + case 0x25: + case 0x26: + case 0x27: + case 0x28: + case 0x29: + case 0x2A: + case 0x2B: + case 0x2C: + case 0x2D: + case 0x2E: + case 0x2F: + case 0x30: + case 0x31: + case 0x32: + case 0x33: + case 0x34: + case 0x35: + case 0x36: + case 0x37: + return sax->number_integer(static_cast(0x20 - 1 - current)); + + case 0x38: // Negative integer (one-byte uint8_t follows) + { + std::uint8_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast(-1) - number); + } + + case 0x39: // Negative integer -1-n (two-byte uint16_t follows) + { + std::uint16_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast(-1) - number); + } + + case 0x3A: // Negative integer -1-n (four-byte uint32_t follows) + { + std::uint32_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast(-1) - number); + } + + case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows) + { + std::uint64_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast(-1) + - static_cast(number)); + } + + // Binary data (0x00..0x17 bytes follow) + case 0x40: + case 0x41: + case 0x42: + case 0x43: + case 0x44: + case 0x45: + case 0x46: + case 0x47: + case 0x48: + case 0x49: + case 0x4A: + case 0x4B: + case 0x4C: + case 0x4D: + case 0x4E: + case 0x4F: + case 0x50: + case 0x51: + case 0x52: + case 0x53: + case 0x54: + case 0x55: + case 0x56: + case 0x57: + case 0x58: // Binary data (one-byte uint8_t for n follows) + case 0x59: // Binary data (two-byte uint16_t for n follow) + case 0x5A: // Binary data (four-byte uint32_t for n follow) + case 0x5B: // Binary data (eight-byte uint64_t for n follow) + case 0x5F: // Binary data (indefinite length) + { + binary_t b; + return get_cbor_binary(b) && sax->binary(b); + } + + // UTF-8 string (0x00..0x17 bytes follow) + case 0x60: + case 0x61: + case 0x62: + case 0x63: + case 0x64: + case 0x65: + case 0x66: + case 0x67: + case 0x68: + case 0x69: + case 0x6A: + case 0x6B: + case 0x6C: + case 0x6D: + case 0x6E: + case 0x6F: + case 0x70: + case 0x71: + case 0x72: + case 0x73: + case 0x74: + case 0x75: + case 0x76: + case 0x77: + case 0x78: // UTF-8 string (one-byte uint8_t for n follows) + case 0x79: // UTF-8 string (two-byte uint16_t for n follow) + case 0x7A: // UTF-8 string (four-byte uint32_t for n follow) + case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow) + case 0x7F: // UTF-8 string (indefinite length) + { + string_t s; + return get_cbor_string(s) && sax->string(s); + } + + // array (0x00..0x17 data items follow) + case 0x80: + case 0x81: + case 0x82: + case 0x83: + case 0x84: + case 0x85: + case 0x86: + case 0x87: + case 0x88: + case 0x89: + case 0x8A: + case 0x8B: + case 0x8C: + case 0x8D: + case 0x8E: + case 0x8F: + case 0x90: + case 0x91: + case 0x92: + case 0x93: + case 0x94: + case 0x95: + case 0x96: + case 0x97: + return get_cbor_array(static_cast(static_cast(current) & 0x1Fu), tag_handler); + + case 0x98: // array (one-byte uint8_t for n follows) + { + std::uint8_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast(len), tag_handler); + } + + case 0x99: // array (two-byte uint16_t for n follow) + { + std::uint16_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast(len), tag_handler); + } + + case 0x9A: // array (four-byte uint32_t for n follow) + { + std::uint32_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast(len), tag_handler); + } + + case 0x9B: // array (eight-byte uint64_t for n follow) + { + std::uint64_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast(len), tag_handler); + } + + case 0x9F: // array (indefinite length) + return get_cbor_array(std::size_t(-1), tag_handler); + + // map (0x00..0x17 pairs of data items follow) + case 0xA0: + case 0xA1: + case 0xA2: + case 0xA3: + case 0xA4: + case 0xA5: + case 0xA6: + case 0xA7: + case 0xA8: + case 0xA9: + case 0xAA: + case 0xAB: + case 0xAC: + case 0xAD: + case 0xAE: + case 0xAF: + case 0xB0: + case 0xB1: + case 0xB2: + case 0xB3: + case 0xB4: + case 0xB5: + case 0xB6: + case 0xB7: + return get_cbor_object(static_cast(static_cast(current) & 0x1Fu), tag_handler); + + case 0xB8: // map (one-byte uint8_t for n follows) + { + std::uint8_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast(len), tag_handler); + } + + case 0xB9: // map (two-byte uint16_t for n follow) + { + std::uint16_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast(len), tag_handler); + } + + case 0xBA: // map (four-byte uint32_t for n follow) + { + std::uint32_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast(len), tag_handler); + } + + case 0xBB: // map (eight-byte uint64_t for n follow) + { + std::uint64_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast(len), tag_handler); + } + + case 0xBF: // map (indefinite length) + return get_cbor_object(std::size_t(-1), tag_handler); + + case 0xC6: // tagged item + case 0xC7: + case 0xC8: + case 0xC9: + case 0xCA: + case 0xCB: + case 0xCC: + case 0xCD: + case 0xCE: + case 0xCF: + case 0xD0: + case 0xD1: + case 0xD2: + case 0xD3: + case 0xD4: + case 0xD8: // tagged item (1 bytes follow) + case 0xD9: // tagged item (2 bytes follow) + case 0xDA: // tagged item (4 bytes follow) + case 0xDB: // tagged item (8 bytes follow) + { + switch (tag_handler) + { + case cbor_tag_handler_t::error: + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"))); + } + + case cbor_tag_handler_t::ignore: + { + switch (current) + { + case 0xD8: + { + std::uint8_t len{}; + get_number(input_format_t::cbor, len); + break; + } + case 0xD9: + { + std::uint16_t len{}; + get_number(input_format_t::cbor, len); + break; + } + case 0xDA: + { + std::uint32_t len{}; + get_number(input_format_t::cbor, len); + break; + } + case 0xDB: + { + std::uint64_t len{}; + get_number(input_format_t::cbor, len); + break; + } + default: + break; + } + return parse_cbor_internal(true, tag_handler); + } + + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // LCOV_EXCL_LINE + } + } + + case 0xF4: // false + return sax->boolean(false); + + case 0xF5: // true + return sax->boolean(true); + + case 0xF6: // null + return sax->null(); + + case 0xF9: // Half-Precision Float (two-byte IEEE 754) + { + const auto byte1_raw = get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number"))) + { + return false; + } + const auto byte2_raw = get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number"))) + { + return false; + } + + const auto byte1 = static_cast(byte1_raw); + const auto byte2 = static_cast(byte2_raw); + + // code from RFC 7049, Appendix D, Figure 3: + // As half-precision floating-point numbers were only added + // to IEEE 754 in 2008, today's programming platforms often + // still only have limited support for them. It is very + // easy to include at least decoding support for them even + // without such support. An example of a small decoder for + // half-precision floating-point numbers in the C language + // is shown in Fig. 3. + const auto half = static_cast((byte1 << 8u) + byte2); + const double val = [&half] + { + const int exp = (half >> 10u) & 0x1Fu; + const unsigned int mant = half & 0x3FFu; + JSON_ASSERT(0 <= exp&& exp <= 32); + JSON_ASSERT(mant <= 1024); + switch (exp) + { + case 0: + return std::ldexp(mant, -24); + case 31: + return (mant == 0) + ? std::numeric_limits::infinity() + : std::numeric_limits::quiet_NaN(); + default: + return std::ldexp(mant + 1024, exp - 25); + } + }(); + return sax->number_float((half & 0x8000u) != 0 + ? static_cast(-val) + : static_cast(val), ""); + } + + case 0xFA: // Single-Precision Float (four-byte IEEE 754) + { + float number{}; + return get_number(input_format_t::cbor, number) && sax->number_float(static_cast(number), ""); + } + + case 0xFB: // Double-Precision Float (eight-byte IEEE 754) + { + double number{}; + return get_number(input_format_t::cbor, number) && sax->number_float(static_cast(number), ""); + } + + default: // anything else (0xFF is handled inside the other types) + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"))); + } + } + } + + /*! + @brief reads a CBOR string + + This function first reads starting bytes to determine the expected + string length and then copies this number of bytes into a string. + Additionally, CBOR's strings with indefinite lengths are supported. + + @param[out] result created string + + @return whether string creation completed + */ + bool get_cbor_string(string_t& result) + { + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "string"))) + { + return false; + } + + switch (current) + { + // UTF-8 string (0x00..0x17 bytes follow) + case 0x60: + case 0x61: + case 0x62: + case 0x63: + case 0x64: + case 0x65: + case 0x66: + case 0x67: + case 0x68: + case 0x69: + case 0x6A: + case 0x6B: + case 0x6C: + case 0x6D: + case 0x6E: + case 0x6F: + case 0x70: + case 0x71: + case 0x72: + case 0x73: + case 0x74: + case 0x75: + case 0x76: + case 0x77: + { + return get_string(input_format_t::cbor, static_cast(current) & 0x1Fu, result); + } + + case 0x78: // UTF-8 string (one-byte uint8_t for n follows) + { + std::uint8_t len{}; + return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result); + } + + case 0x79: // UTF-8 string (two-byte uint16_t for n follow) + { + std::uint16_t len{}; + return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result); + } + + case 0x7A: // UTF-8 string (four-byte uint32_t for n follow) + { + std::uint32_t len{}; + return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result); + } + + case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow) + { + std::uint64_t len{}; + return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result); + } + + case 0x7F: // UTF-8 string (indefinite length) + { + while (get() != 0xFF) + { + string_t chunk; + if (!get_cbor_string(chunk)) + { + return false; + } + result.append(chunk); + } + return true; + } + + default: + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string"))); + } + } + } + + /*! + @brief reads a CBOR byte array + + This function first reads starting bytes to determine the expected + byte array length and then copies this number of bytes into the byte array. + Additionally, CBOR's byte arrays with indefinite lengths are supported. + + @param[out] result created byte array + + @return whether byte array creation completed + */ + bool get_cbor_binary(binary_t& result) + { + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "binary"))) + { + return false; + } + + switch (current) + { + // Binary data (0x00..0x17 bytes follow) + case 0x40: + case 0x41: + case 0x42: + case 0x43: + case 0x44: + case 0x45: + case 0x46: + case 0x47: + case 0x48: + case 0x49: + case 0x4A: + case 0x4B: + case 0x4C: + case 0x4D: + case 0x4E: + case 0x4F: + case 0x50: + case 0x51: + case 0x52: + case 0x53: + case 0x54: + case 0x55: + case 0x56: + case 0x57: + { + return get_binary(input_format_t::cbor, static_cast(current) & 0x1Fu, result); + } + + case 0x58: // Binary data (one-byte uint8_t for n follows) + { + std::uint8_t len{}; + return get_number(input_format_t::cbor, len) && + get_binary(input_format_t::cbor, len, result); + } + + case 0x59: // Binary data (two-byte uint16_t for n follow) + { + std::uint16_t len{}; + return get_number(input_format_t::cbor, len) && + get_binary(input_format_t::cbor, len, result); + } + + case 0x5A: // Binary data (four-byte uint32_t for n follow) + { + std::uint32_t len{}; + return get_number(input_format_t::cbor, len) && + get_binary(input_format_t::cbor, len, result); + } + + case 0x5B: // Binary data (eight-byte uint64_t for n follow) + { + std::uint64_t len{}; + return get_number(input_format_t::cbor, len) && + get_binary(input_format_t::cbor, len, result); + } + + case 0x5F: // Binary data (indefinite length) + { + while (get() != 0xFF) + { + binary_t chunk; + if (!get_cbor_binary(chunk)) + { + return false; + } + result.insert(result.end(), chunk.begin(), chunk.end()); + } + return true; + } + + default: + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x" + last_token, "binary"))); + } + } + } + + /*! + @param[in] len the length of the array or std::size_t(-1) for an + array of indefinite size + @param[in] tag_handler how CBOR tags should be treated + @return whether array creation completed + */ + bool get_cbor_array(const std::size_t len, + const cbor_tag_handler_t tag_handler) + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len))) + { + return false; + } + + if (len != std::size_t(-1)) + { + for (std::size_t i = 0; i < len; ++i) + { + if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler))) + { + return false; + } + } + } + else + { + while (get() != 0xFF) + { + if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(false, tag_handler))) + { + return false; + } + } + } + + return sax->end_array(); + } + + /*! + @param[in] len the length of the object or std::size_t(-1) for an + object of indefinite size + @param[in] tag_handler how CBOR tags should be treated + @return whether object creation completed + */ + bool get_cbor_object(const std::size_t len, + const cbor_tag_handler_t tag_handler) + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len))) + { + return false; + } + + string_t key; + if (len != std::size_t(-1)) + { + for (std::size_t i = 0; i < len; ++i) + { + get(); + if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key))) + { + return false; + } + + if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler))) + { + return false; + } + key.clear(); + } + } + else + { + while (get() != 0xFF) + { + if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key))) + { + return false; + } + + if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler))) + { + return false; + } + key.clear(); + } + } + + return sax->end_object(); + } + + ///////////// + // MsgPack // + ///////////// + + /*! + @return whether a valid MessagePack value was passed to the SAX parser + */ + bool parse_msgpack_internal() + { + switch (get()) + { + // EOF + case std::char_traits::eof(): + return unexpect_eof(input_format_t::msgpack, "value"); + + // positive fixint + case 0x00: + case 0x01: + case 0x02: + case 0x03: + case 0x04: + case 0x05: + case 0x06: + case 0x07: + case 0x08: + case 0x09: + case 0x0A: + case 0x0B: + case 0x0C: + case 0x0D: + case 0x0E: + case 0x0F: + case 0x10: + case 0x11: + case 0x12: + case 0x13: + case 0x14: + case 0x15: + case 0x16: + case 0x17: + case 0x18: + case 0x19: + case 0x1A: + case 0x1B: + case 0x1C: + case 0x1D: + case 0x1E: + case 0x1F: + case 0x20: + case 0x21: + case 0x22: + case 0x23: + case 0x24: + case 0x25: + case 0x26: + case 0x27: + case 0x28: + case 0x29: + case 0x2A: + case 0x2B: + case 0x2C: + case 0x2D: + case 0x2E: + case 0x2F: + case 0x30: + case 0x31: + case 0x32: + case 0x33: + case 0x34: + case 0x35: + case 0x36: + case 0x37: + case 0x38: + case 0x39: + case 0x3A: + case 0x3B: + case 0x3C: + case 0x3D: + case 0x3E: + case 0x3F: + case 0x40: + case 0x41: + case 0x42: + case 0x43: + case 0x44: + case 0x45: + case 0x46: + case 0x47: + case 0x48: + case 0x49: + case 0x4A: + case 0x4B: + case 0x4C: + case 0x4D: + case 0x4E: + case 0x4F: + case 0x50: + case 0x51: + case 0x52: + case 0x53: + case 0x54: + case 0x55: + case 0x56: + case 0x57: + case 0x58: + case 0x59: + case 0x5A: + case 0x5B: + case 0x5C: + case 0x5D: + case 0x5E: + case 0x5F: + case 0x60: + case 0x61: + case 0x62: + case 0x63: + case 0x64: + case 0x65: + case 0x66: + case 0x67: + case 0x68: + case 0x69: + case 0x6A: + case 0x6B: + case 0x6C: + case 0x6D: + case 0x6E: + case 0x6F: + case 0x70: + case 0x71: + case 0x72: + case 0x73: + case 0x74: + case 0x75: + case 0x76: + case 0x77: + case 0x78: + case 0x79: + case 0x7A: + case 0x7B: + case 0x7C: + case 0x7D: + case 0x7E: + case 0x7F: + return sax->number_unsigned(static_cast(current)); + + // fixmap + case 0x80: + case 0x81: + case 0x82: + case 0x83: + case 0x84: + case 0x85: + case 0x86: + case 0x87: + case 0x88: + case 0x89: + case 0x8A: + case 0x8B: + case 0x8C: + case 0x8D: + case 0x8E: + case 0x8F: + return get_msgpack_object(static_cast(static_cast(current) & 0x0Fu)); + + // fixarray + case 0x90: + case 0x91: + case 0x92: + case 0x93: + case 0x94: + case 0x95: + case 0x96: + case 0x97: + case 0x98: + case 0x99: + case 0x9A: + case 0x9B: + case 0x9C: + case 0x9D: + case 0x9E: + case 0x9F: + return get_msgpack_array(static_cast(static_cast(current) & 0x0Fu)); + + // fixstr + case 0xA0: + case 0xA1: + case 0xA2: + case 0xA3: + case 0xA4: + case 0xA5: + case 0xA6: + case 0xA7: + case 0xA8: + case 0xA9: + case 0xAA: + case 0xAB: + case 0xAC: + case 0xAD: + case 0xAE: + case 0xAF: + case 0xB0: + case 0xB1: + case 0xB2: + case 0xB3: + case 0xB4: + case 0xB5: + case 0xB6: + case 0xB7: + case 0xB8: + case 0xB9: + case 0xBA: + case 0xBB: + case 0xBC: + case 0xBD: + case 0xBE: + case 0xBF: + case 0xD9: // str 8 + case 0xDA: // str 16 + case 0xDB: // str 32 + { + string_t s; + return get_msgpack_string(s) && sax->string(s); + } + + case 0xC0: // nil + return sax->null(); + + case 0xC2: // false + return sax->boolean(false); + + case 0xC3: // true + return sax->boolean(true); + + case 0xC4: // bin 8 + case 0xC5: // bin 16 + case 0xC6: // bin 32 + case 0xC7: // ext 8 + case 0xC8: // ext 16 + case 0xC9: // ext 32 + case 0xD4: // fixext 1 + case 0xD5: // fixext 2 + case 0xD6: // fixext 4 + case 0xD7: // fixext 8 + case 0xD8: // fixext 16 + { + binary_t b; + return get_msgpack_binary(b) && sax->binary(b); + } + + case 0xCA: // float 32 + { + float number{}; + return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast(number), ""); + } + + case 0xCB: // float 64 + { + double number{}; + return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast(number), ""); + } + + case 0xCC: // uint 8 + { + std::uint8_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number); + } + + case 0xCD: // uint 16 + { + std::uint16_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number); + } + + case 0xCE: // uint 32 + { + std::uint32_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number); + } + + case 0xCF: // uint 64 + { + std::uint64_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number); + } + + case 0xD0: // int 8 + { + std::int8_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_integer(number); + } + + case 0xD1: // int 16 + { + std::int16_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_integer(number); + } + + case 0xD2: // int 32 + { + std::int32_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_integer(number); + } + + case 0xD3: // int 64 + { + std::int64_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_integer(number); + } + + case 0xDC: // array 16 + { + std::uint16_t len{}; + return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast(len)); + } + + case 0xDD: // array 32 + { + std::uint32_t len{}; + return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast(len)); + } + + case 0xDE: // map 16 + { + std::uint16_t len{}; + return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast(len)); + } + + case 0xDF: // map 32 + { + std::uint32_t len{}; + return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast(len)); + } + + // negative fixint + case 0xE0: + case 0xE1: + case 0xE2: + case 0xE3: + case 0xE4: + case 0xE5: + case 0xE6: + case 0xE7: + case 0xE8: + case 0xE9: + case 0xEA: + case 0xEB: + case 0xEC: + case 0xED: + case 0xEE: + case 0xEF: + case 0xF0: + case 0xF1: + case 0xF2: + case 0xF3: + case 0xF4: + case 0xF5: + case 0xF6: + case 0xF7: + case 0xF8: + case 0xF9: + case 0xFA: + case 0xFB: + case 0xFC: + case 0xFD: + case 0xFE: + case 0xFF: + return sax->number_integer(static_cast(current)); + + default: // anything else + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value"))); + } + } + } + + /*! + @brief reads a MessagePack string + + This function first reads starting bytes to determine the expected + string length and then copies this number of bytes into a string. + + @param[out] result created string + + @return whether string creation completed + */ + bool get_msgpack_string(string_t& result) + { + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::msgpack, "string"))) + { + return false; + } + + switch (current) + { + // fixstr + case 0xA0: + case 0xA1: + case 0xA2: + case 0xA3: + case 0xA4: + case 0xA5: + case 0xA6: + case 0xA7: + case 0xA8: + case 0xA9: + case 0xAA: + case 0xAB: + case 0xAC: + case 0xAD: + case 0xAE: + case 0xAF: + case 0xB0: + case 0xB1: + case 0xB2: + case 0xB3: + case 0xB4: + case 0xB5: + case 0xB6: + case 0xB7: + case 0xB8: + case 0xB9: + case 0xBA: + case 0xBB: + case 0xBC: + case 0xBD: + case 0xBE: + case 0xBF: + { + return get_string(input_format_t::msgpack, static_cast(current) & 0x1Fu, result); + } + + case 0xD9: // str 8 + { + std::uint8_t len{}; + return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result); + } + + case 0xDA: // str 16 + { + std::uint16_t len{}; + return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result); + } + + case 0xDB: // str 32 + { + std::uint32_t len{}; + return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result); + } + + default: + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string"))); + } + } + } + + /*! + @brief reads a MessagePack byte array + + This function first reads starting bytes to determine the expected + byte array length and then copies this number of bytes into a byte array. + + @param[out] result created byte array + + @return whether byte array creation completed + */ + bool get_msgpack_binary(binary_t& result) + { + // helper function to set the subtype + auto assign_and_return_true = [&result](std::int8_t subtype) + { + result.set_subtype(static_cast(subtype)); + return true; + }; + + switch (current) + { + case 0xC4: // bin 8 + { + std::uint8_t len{}; + return get_number(input_format_t::msgpack, len) && + get_binary(input_format_t::msgpack, len, result); + } + + case 0xC5: // bin 16 + { + std::uint16_t len{}; + return get_number(input_format_t::msgpack, len) && + get_binary(input_format_t::msgpack, len, result); + } + + case 0xC6: // bin 32 + { + std::uint32_t len{}; + return get_number(input_format_t::msgpack, len) && + get_binary(input_format_t::msgpack, len, result); + } + + case 0xC7: // ext 8 + { + std::uint8_t len{}; + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, len) && + get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, len, result) && + assign_and_return_true(subtype); + } + + case 0xC8: // ext 16 + { + std::uint16_t len{}; + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, len) && + get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, len, result) && + assign_and_return_true(subtype); + } + + case 0xC9: // ext 32 + { + std::uint32_t len{}; + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, len) && + get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, len, result) && + assign_and_return_true(subtype); + } + + case 0xD4: // fixext 1 + { + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, 1, result) && + assign_and_return_true(subtype); + } + + case 0xD5: // fixext 2 + { + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, 2, result) && + assign_and_return_true(subtype); + } + + case 0xD6: // fixext 4 + { + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, 4, result) && + assign_and_return_true(subtype); + } + + case 0xD7: // fixext 8 + { + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, 8, result) && + assign_and_return_true(subtype); + } + + case 0xD8: // fixext 16 + { + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, 16, result) && + assign_and_return_true(subtype); + } + + default: // LCOV_EXCL_LINE + return false; // LCOV_EXCL_LINE + } + } + + /*! + @param[in] len the length of the array + @return whether array creation completed + */ + bool get_msgpack_array(const std::size_t len) + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len))) + { + return false; + } + + for (std::size_t i = 0; i < len; ++i) + { + if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal())) + { + return false; + } + } + + return sax->end_array(); + } + + /*! + @param[in] len the length of the object + @return whether object creation completed + */ + bool get_msgpack_object(const std::size_t len) + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len))) + { + return false; + } + + string_t key; + for (std::size_t i = 0; i < len; ++i) + { + get(); + if (JSON_HEDLEY_UNLIKELY(!get_msgpack_string(key) || !sax->key(key))) + { + return false; + } + + if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal())) + { + return false; + } + key.clear(); + } + + return sax->end_object(); + } + + //////////// + // UBJSON // + //////////// + + /*! + @param[in] get_char whether a new character should be retrieved from the + input (true, default) or whether the last read + character should be considered instead + + @return whether a valid UBJSON value was passed to the SAX parser + */ + bool parse_ubjson_internal(const bool get_char = true) + { + return get_ubjson_value(get_char ? get_ignore_noop() : current); + } + + /*! + @brief reads a UBJSON string + + This function is either called after reading the 'S' byte explicitly + indicating a string, or in case of an object key where the 'S' byte can be + left out. + + @param[out] result created string + @param[in] get_char whether a new character should be retrieved from the + input (true, default) or whether the last read + character should be considered instead + + @return whether string creation completed + */ + bool get_ubjson_string(string_t& result, const bool get_char = true) + { + if (get_char) + { + get(); // TODO(niels): may we ignore N here? + } + + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value"))) + { + return false; + } + + switch (current) + { + case 'U': + { + std::uint8_t len{}; + return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result); + } + + case 'i': + { + std::int8_t len{}; + return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result); + } + + case 'I': + { + std::int16_t len{}; + return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result); + } + + case 'l': + { + std::int32_t len{}; + return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result); + } + + case 'L': + { + std::int64_t len{}; + return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result); + } + + default: + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string"))); + } + } + + /*! + @param[out] result determined size + @return whether size determination completed + */ + bool get_ubjson_size_value(std::size_t& result) + { + switch (get_ignore_noop()) + { + case 'U': + { + std::uint8_t number{}; + if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number))) + { + return false; + } + result = static_cast(number); + return true; + } + + case 'i': + { + std::int8_t number{}; + if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number))) + { + return false; + } + result = static_cast(number); + return true; + } + + case 'I': + { + std::int16_t number{}; + if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number))) + { + return false; + } + result = static_cast(number); + return true; + } + + case 'l': + { + std::int32_t number{}; + if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number))) + { + return false; + } + result = static_cast(number); + return true; + } + + case 'L': + { + std::int64_t number{}; + if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number))) + { + return false; + } + result = static_cast(number); + return true; + } + + default: + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size"))); + } + } + } + + /*! + @brief determine the type and size for a container + + In the optimized UBJSON format, a type and a size can be provided to allow + for a more compact representation. + + @param[out] result pair of the size and the type + + @return whether pair creation completed + */ + bool get_ubjson_size_type(std::pair& result) + { + result.first = string_t::npos; // size + result.second = 0; // type + + get_ignore_noop(); + + if (current == '$') + { + result.second = get(); // must not ignore 'N', because 'N' maybe the type + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "type"))) + { + return false; + } + + get_ignore_noop(); + if (JSON_HEDLEY_UNLIKELY(current != '#')) + { + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value"))) + { + return false; + } + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size"))); + } + + return get_ubjson_size_value(result.first); + } + + if (current == '#') + { + return get_ubjson_size_value(result.first); + } + + return true; + } + + /*! + @param prefix the previously read or set type prefix + @return whether value creation completed + */ + bool get_ubjson_value(const char_int_type prefix) + { + switch (prefix) + { + case std::char_traits::eof(): // EOF + return unexpect_eof(input_format_t::ubjson, "value"); + + case 'T': // true + return sax->boolean(true); + case 'F': // false + return sax->boolean(false); + + case 'Z': // null + return sax->null(); + + case 'U': + { + std::uint8_t number{}; + return get_number(input_format_t::ubjson, number) && sax->number_unsigned(number); + } + + case 'i': + { + std::int8_t number{}; + return get_number(input_format_t::ubjson, number) && sax->number_integer(number); + } + + case 'I': + { + std::int16_t number{}; + return get_number(input_format_t::ubjson, number) && sax->number_integer(number); + } + + case 'l': + { + std::int32_t number{}; + return get_number(input_format_t::ubjson, number) && sax->number_integer(number); + } + + case 'L': + { + std::int64_t number{}; + return get_number(input_format_t::ubjson, number) && sax->number_integer(number); + } + + case 'd': + { + float number{}; + return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast(number), ""); + } + + case 'D': + { + double number{}; + return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast(number), ""); + } + + case 'H': + { + return get_ubjson_high_precision_number(); + } + + case 'C': // char + { + get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "char"))) + { + return false; + } + if (JSON_HEDLEY_UNLIKELY(current > 127)) + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char"))); + } + string_t s(1, static_cast(current)); + return sax->string(s); + } + + case 'S': // string + { + string_t s; + return get_ubjson_string(s) && sax->string(s); + } + + case '[': // array + return get_ubjson_array(); + + case '{': // object + return get_ubjson_object(); + + default: // anything else + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value"))); + } + } + } + + /*! + @return whether array creation completed + */ + bool get_ubjson_array() + { + std::pair size_and_type; + if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type))) + { + return false; + } + + if (size_and_type.first != string_t::npos) + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_array(size_and_type.first))) + { + return false; + } + + if (size_and_type.second != 0) + { + if (size_and_type.second != 'N') + { + for (std::size_t i = 0; i < size_and_type.first; ++i) + { + if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second))) + { + return false; + } + } + } + } + else + { + for (std::size_t i = 0; i < size_and_type.first; ++i) + { + if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal())) + { + return false; + } + } + } + } + else + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1)))) + { + return false; + } + + while (current != ']') + { + if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal(false))) + { + return false; + } + get_ignore_noop(); + } + } + + return sax->end_array(); + } + + /*! + @return whether object creation completed + */ + bool get_ubjson_object() + { + std::pair size_and_type; + if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type))) + { + return false; + } + + string_t key; + if (size_and_type.first != string_t::npos) + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_object(size_and_type.first))) + { + return false; + } + + if (size_and_type.second != 0) + { + for (std::size_t i = 0; i < size_and_type.first; ++i) + { + if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key))) + { + return false; + } + if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second))) + { + return false; + } + key.clear(); + } + } + else + { + for (std::size_t i = 0; i < size_and_type.first; ++i) + { + if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key))) + { + return false; + } + if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal())) + { + return false; + } + key.clear(); + } + } + } + else + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1)))) + { + return false; + } + + while (current != '}') + { + if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key, false) || !sax->key(key))) + { + return false; + } + if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal())) + { + return false; + } + get_ignore_noop(); + key.clear(); + } + } + + return sax->end_object(); + } + + // Note, no reader for UBJSON binary types is implemented because they do + // not exist + + bool get_ubjson_high_precision_number() + { + // get size of following number string + std::size_t size{}; + auto res = get_ubjson_size_value(size); + if (JSON_HEDLEY_UNLIKELY(!res)) + { + return res; + } + + // get number string + std::vector number_vector; + for (std::size_t i = 0; i < size; ++i) + { + get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "number"))) + { + return false; + } + number_vector.push_back(static_cast(current)); + } + + // parse number string + auto number_ia = detail::input_adapter(std::forward(number_vector)); + auto number_lexer = detail::lexer(std::move(number_ia), false); + const auto result_number = number_lexer.scan(); + const auto number_string = number_lexer.get_token_string(); + const auto result_remainder = number_lexer.scan(); + + using token_type = typename detail::lexer_base::token_type; + + if (JSON_HEDLEY_UNLIKELY(result_remainder != token_type::end_of_input)) + { + return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number"))); + } + + switch (result_number) + { + case token_type::value_integer: + return sax->number_integer(number_lexer.get_number_integer()); + case token_type::value_unsigned: + return sax->number_unsigned(number_lexer.get_number_unsigned()); + case token_type::value_float: + return sax->number_float(number_lexer.get_number_float(), std::move(number_string)); + default: + return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number"))); + } + } + + /////////////////////// + // Utility functions // + /////////////////////// + + /*! + @brief get next character from the input + + This function provides the interface to the used input adapter. It does + not throw in case the input reached EOF, but returns a -'ve valued + `std::char_traits::eof()` in that case. + + @return character read from the input + */ + char_int_type get() + { + ++chars_read; + return current = ia.get_character(); + } + + /*! + @return character read from the input after ignoring all 'N' entries + */ + char_int_type get_ignore_noop() + { + do + { + get(); + } + while (current == 'N'); + + return current; + } + + /* + @brief read a number from the input + + @tparam NumberType the type of the number + @param[in] format the current format (for diagnostics) + @param[out] result number of type @a NumberType + + @return whether conversion completed + + @note This function needs to respect the system's endianess, because + bytes in CBOR, MessagePack, and UBJSON are stored in network order + (big endian) and therefore need reordering on little endian systems. + */ + template + bool get_number(const input_format_t format, NumberType& result) + { + // step 1: read input into array with system's byte order + std::array vec; + for (std::size_t i = 0; i < sizeof(NumberType); ++i) + { + get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "number"))) + { + return false; + } + + // reverse byte order prior to conversion if necessary + if (is_little_endian != InputIsLittleEndian) + { + vec[sizeof(NumberType) - i - 1] = static_cast(current); + } + else + { + vec[i] = static_cast(current); // LCOV_EXCL_LINE + } + } + + // step 2: convert array into number of type T and return + std::memcpy(&result, vec.data(), sizeof(NumberType)); + return true; + } + + /*! + @brief create a string by reading characters from the input + + @tparam NumberType the type of the number + @param[in] format the current format (for diagnostics) + @param[in] len number of characters to read + @param[out] result string created by reading @a len bytes + + @return whether string creation completed + + @note We can not reserve @a len bytes for the result, because @a len + may be too large. Usually, @ref unexpect_eof() detects the end of + the input before we run out of string memory. + */ + template + bool get_string(const input_format_t format, + const NumberType len, + string_t& result) + { + bool success = true; + for (NumberType i = 0; i < len; i++) + { + get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "string"))) + { + success = false; + break; + } + result.push_back(static_cast(current)); + }; + return success; + } + + /*! + @brief create a byte array by reading bytes from the input + + @tparam NumberType the type of the number + @param[in] format the current format (for diagnostics) + @param[in] len number of bytes to read + @param[out] result byte array created by reading @a len bytes + + @return whether byte array creation completed + + @note We can not reserve @a len bytes for the result, because @a len + may be too large. Usually, @ref unexpect_eof() detects the end of + the input before we run out of memory. + */ + template + bool get_binary(const input_format_t format, + const NumberType len, + binary_t& result) + { + bool success = true; + for (NumberType i = 0; i < len; i++) + { + get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "binary"))) + { + success = false; + break; + } + result.push_back(static_cast(current)); + } + return success; + } + + /*! + @param[in] format the current format (for diagnostics) + @param[in] context further context information (for diagnostics) + @return whether the last read character is not EOF + */ + JSON_HEDLEY_NON_NULL(3) + bool unexpect_eof(const input_format_t format, const char* context) const + { + if (JSON_HEDLEY_UNLIKELY(current == std::char_traits::eof())) + { + return sax->parse_error(chars_read, "", + parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context))); + } + return true; + } + + /*! + @return a string representation of the last read byte + */ + std::string get_token_string() const + { + std::array cr{{}}; + (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast(current)); + return std::string{cr.data()}; + } + + /*! + @param[in] format the current format + @param[in] detail a detailed error message + @param[in] context further context information + @return a message string to use in the parse_error exceptions + */ + std::string exception_message(const input_format_t format, + const std::string& detail, + const std::string& context) const + { + std::string error_msg = "syntax error while parsing "; + + switch (format) + { + case input_format_t::cbor: + error_msg += "CBOR"; + break; + + case input_format_t::msgpack: + error_msg += "MessagePack"; + break; + + case input_format_t::ubjson: + error_msg += "UBJSON"; + break; + + case input_format_t::bson: + error_msg += "BSON"; + break; + + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // LCOV_EXCL_LINE + } + + return error_msg + " " + context + ": " + detail; + } + + private: + /// input adapter + InputAdapterType ia; + + /// the current character + char_int_type current = std::char_traits::eof(); + + /// the number of characters read + std::size_t chars_read = 0; + + /// whether we can assume little endianess + const bool is_little_endian = little_endianess(); + + /// the SAX parser + json_sax_t* sax = nullptr; +}; +} // namespace detail +} // namespace nlohmann + +// #include + +// #include + +// #include + + +#include // isfinite +#include // uint8_t +#include // function +#include // string +#include // move +#include // vector + +// #include + +// #include + +// #include + +// #include + +// #include + +// #include + +// #include + + +namespace nlohmann +{ +namespace detail +{ +//////////// +// parser // +//////////// + +enum class parse_event_t : uint8_t +{ + /// the parser read `{` and started to process a JSON object + object_start, + /// the parser read `}` and finished processing a JSON object + object_end, + /// the parser read `[` and started to process a JSON array + array_start, + /// the parser read `]` and finished processing a JSON array + array_end, + /// the parser read a key of a value in an object + key, + /// the parser finished reading a JSON value + value +}; + +template +using parser_callback_t = + std::function; + +/*! +@brief syntax analysis + +This class implements a recursive descent parser. +*/ +template +class parser +{ + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using lexer_t = lexer; + using token_type = typename lexer_t::token_type; + + public: + /// a parser reading from an input adapter + explicit parser(InputAdapterType&& adapter, + const parser_callback_t cb = nullptr, + const bool allow_exceptions_ = true, + const bool skip_comments = false) + : callback(cb) + , m_lexer(std::move(adapter), skip_comments) + , allow_exceptions(allow_exceptions_) + { + // read first token + get_token(); + } + + /*! + @brief public parser interface + + @param[in] strict whether to expect the last token to be EOF + @param[in,out] result parsed JSON value + + @throw parse_error.101 in case of an unexpected token + @throw parse_error.102 if to_unicode fails or surrogate error + @throw parse_error.103 if to_unicode fails + */ + void parse(const bool strict, BasicJsonType& result) + { + if (callback) + { + json_sax_dom_callback_parser sdp(result, callback, allow_exceptions); + sax_parse_internal(&sdp); + result.assert_invariant(); + + // in strict mode, input must be completely read + if (strict && (get_token() != token_type::end_of_input)) + { + sdp.parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_of_input, "value"))); + } + + // in case of an error, return discarded value + if (sdp.is_errored()) + { + result = value_t::discarded; + return; + } + + // set top-level value to null if it was discarded by the callback + // function + if (result.is_discarded()) + { + result = nullptr; + } + } + else + { + json_sax_dom_parser sdp(result, allow_exceptions); + sax_parse_internal(&sdp); + result.assert_invariant(); + + // in strict mode, input must be completely read + if (strict && (get_token() != token_type::end_of_input)) + { + sdp.parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_of_input, "value"))); + } + + // in case of an error, return discarded value + if (sdp.is_errored()) + { + result = value_t::discarded; + return; + } + } + } + + /*! + @brief public accept interface + + @param[in] strict whether to expect the last token to be EOF + @return whether the input is a proper JSON text + */ + bool accept(const bool strict = true) + { + json_sax_acceptor sax_acceptor; + return sax_parse(&sax_acceptor, strict); + } + + template + JSON_HEDLEY_NON_NULL(2) + bool sax_parse(SAX* sax, const bool strict = true) + { + (void)detail::is_sax_static_asserts {}; + const bool result = sax_parse_internal(sax); + + // strict mode: next byte must be EOF + if (result && strict && (get_token() != token_type::end_of_input)) + { + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_of_input, "value"))); + } + + return result; + } + + private: + template + JSON_HEDLEY_NON_NULL(2) + bool sax_parse_internal(SAX* sax) + { + // stack to remember the hierarchy of structured values we are parsing + // true = array; false = object + std::vector states; + // value to avoid a goto (see comment where set to true) + bool skip_to_state_evaluation = false; + + while (true) + { + if (!skip_to_state_evaluation) + { + // invariant: get_token() was called before each iteration + switch (last_token) + { + case token_type::begin_object: + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1)))) + { + return false; + } + + // closing } -> we are done + if (get_token() == token_type::end_object) + { + if (JSON_HEDLEY_UNLIKELY(!sax->end_object())) + { + return false; + } + break; + } + + // parse key + if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string)) + { + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::value_string, "object key"))); + } + if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string()))) + { + return false; + } + + // parse separator (:) + if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator)) + { + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::name_separator, "object separator"))); + } + + // remember we are now inside an object + states.push_back(false); + + // parse values + get_token(); + continue; + } + + case token_type::begin_array: + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1)))) + { + return false; + } + + // closing ] -> we are done + if (get_token() == token_type::end_array) + { + if (JSON_HEDLEY_UNLIKELY(!sax->end_array())) + { + return false; + } + break; + } + + // remember we are now inside an array + states.push_back(true); + + // parse values (no need to call get_token) + continue; + } + + case token_type::value_float: + { + const auto res = m_lexer.get_number_float(); + + if (JSON_HEDLEY_UNLIKELY(!std::isfinite(res))) + { + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'")); + } + + if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string()))) + { + return false; + } + + break; + } + + case token_type::literal_false: + { + if (JSON_HEDLEY_UNLIKELY(!sax->boolean(false))) + { + return false; + } + break; + } + + case token_type::literal_null: + { + if (JSON_HEDLEY_UNLIKELY(!sax->null())) + { + return false; + } + break; + } + + case token_type::literal_true: + { + if (JSON_HEDLEY_UNLIKELY(!sax->boolean(true))) + { + return false; + } + break; + } + + case token_type::value_integer: + { + if (JSON_HEDLEY_UNLIKELY(!sax->number_integer(m_lexer.get_number_integer()))) + { + return false; + } + break; + } + + case token_type::value_string: + { + if (JSON_HEDLEY_UNLIKELY(!sax->string(m_lexer.get_string()))) + { + return false; + } + break; + } + + case token_type::value_unsigned: + { + if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(m_lexer.get_number_unsigned()))) + { + return false; + } + break; + } + + case token_type::parse_error: + { + // using "uninitialized" to avoid "expected" message + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::uninitialized, "value"))); + } + + default: // the last token was unexpected + { + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::literal_or_value, "value"))); + } + } + } + else + { + skip_to_state_evaluation = false; + } + + // we reached this line after we successfully parsed a value + if (states.empty()) + { + // empty stack: we reached the end of the hierarchy: done + return true; + } + + if (states.back()) // array + { + // comma -> next value + if (get_token() == token_type::value_separator) + { + // parse a new value + get_token(); + continue; + } + + // closing ] + if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array)) + { + if (JSON_HEDLEY_UNLIKELY(!sax->end_array())) + { + return false; + } + + // We are done with this array. Before we can parse a + // new value, we need to evaluate the new state first. + // By setting skip_to_state_evaluation to false, we + // are effectively jumping to the beginning of this if. + JSON_ASSERT(!states.empty()); + states.pop_back(); + skip_to_state_evaluation = true; + continue; + } + + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_array, "array"))); + } + else // object + { + // comma -> next value + if (get_token() == token_type::value_separator) + { + // parse key + if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string)) + { + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::value_string, "object key"))); + } + + if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string()))) + { + return false; + } + + // parse separator (:) + if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator)) + { + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::name_separator, "object separator"))); + } + + // parse values + get_token(); + continue; + } + + // closing } + if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object)) + { + if (JSON_HEDLEY_UNLIKELY(!sax->end_object())) + { + return false; + } + + // We are done with this object. Before we can parse a + // new value, we need to evaluate the new state first. + // By setting skip_to_state_evaluation to false, we + // are effectively jumping to the beginning of this if. + JSON_ASSERT(!states.empty()); + states.pop_back(); + skip_to_state_evaluation = true; + continue; + } + + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_object, "object"))); + } + } + } + + /// get next token from lexer + token_type get_token() + { + return last_token = m_lexer.scan(); + } + + std::string exception_message(const token_type expected, const std::string& context) + { + std::string error_msg = "syntax error "; + + if (!context.empty()) + { + error_msg += "while parsing " + context + " "; + } + + error_msg += "- "; + + if (last_token == token_type::parse_error) + { + error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" + + m_lexer.get_token_string() + "'"; + } + else + { + error_msg += "unexpected " + std::string(lexer_t::token_type_name(last_token)); + } + + if (expected != token_type::uninitialized) + { + error_msg += "; expected " + std::string(lexer_t::token_type_name(expected)); + } + + return error_msg; + } + + private: + /// callback function + const parser_callback_t callback = nullptr; + /// the type of the last read token + token_type last_token = token_type::uninitialized; + /// the lexer + lexer_t m_lexer; + /// whether to throw exceptions in case of errors + const bool allow_exceptions = true; +}; +} // namespace detail +} // namespace nlohmann + +// #include + + +// #include + + +#include // ptrdiff_t +#include // numeric_limits + +namespace nlohmann +{ +namespace detail +{ +/* +@brief an iterator for primitive JSON types + +This class models an iterator for primitive JSON types (boolean, number, +string). It's only purpose is to allow the iterator/const_iterator classes +to "iterate" over primitive values. Internally, the iterator is modeled by +a `difference_type` variable. Value begin_value (`0`) models the begin, +end_value (`1`) models past the end. +*/ +class primitive_iterator_t +{ + private: + using difference_type = std::ptrdiff_t; + static constexpr difference_type begin_value = 0; + static constexpr difference_type end_value = begin_value + 1; + + /// iterator as signed integer type + difference_type m_it = (std::numeric_limits::min)(); + + public: + constexpr difference_type get_value() const noexcept + { + return m_it; + } + + /// set iterator to a defined beginning + void set_begin() noexcept + { + m_it = begin_value; + } + + /// set iterator to a defined past the end + void set_end() noexcept + { + m_it = end_value; + } + + /// return whether the iterator can be dereferenced + constexpr bool is_begin() const noexcept + { + return m_it == begin_value; + } + + /// return whether the iterator is at end + constexpr bool is_end() const noexcept + { + return m_it == end_value; + } + + friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept + { + return lhs.m_it == rhs.m_it; + } + + friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept + { + return lhs.m_it < rhs.m_it; + } + + primitive_iterator_t operator+(difference_type n) noexcept + { + auto result = *this; + result += n; + return result; + } + + friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept + { + return lhs.m_it - rhs.m_it; + } + + primitive_iterator_t& operator++() noexcept + { + ++m_it; + return *this; + } + + primitive_iterator_t const operator++(int) noexcept + { + auto result = *this; + ++m_it; + return result; + } + + primitive_iterator_t& operator--() noexcept + { + --m_it; + return *this; + } + + primitive_iterator_t const operator--(int) noexcept + { + auto result = *this; + --m_it; + return result; + } + + primitive_iterator_t& operator+=(difference_type n) noexcept + { + m_it += n; + return *this; + } + + primitive_iterator_t& operator-=(difference_type n) noexcept + { + m_it -= n; + return *this; + } +}; +} // namespace detail +} // namespace nlohmann + + +namespace nlohmann +{ +namespace detail +{ +/*! +@brief an iterator value + +@note This structure could easily be a union, but MSVC currently does not allow +unions members with complex constructors, see https://github.com/nlohmann/json/pull/105. +*/ +template struct internal_iterator +{ + /// iterator for JSON objects + typename BasicJsonType::object_t::iterator object_iterator {}; + /// iterator for JSON arrays + typename BasicJsonType::array_t::iterator array_iterator {}; + /// generic iterator for all other types + primitive_iterator_t primitive_iterator {}; +}; +} // namespace detail +} // namespace nlohmann + +// #include + + +#include // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next +#include // conditional, is_const, remove_const + +// #include + +// #include + +// #include + +// #include + +// #include + +// #include + +// #include + + +namespace nlohmann +{ +namespace detail +{ +// forward declare, to be able to friend it later on +template class iteration_proxy; +template class iteration_proxy_value; + +/*! +@brief a template for a bidirectional iterator for the @ref basic_json class +This class implements a both iterators (iterator and const_iterator) for the +@ref basic_json class. +@note An iterator is called *initialized* when a pointer to a JSON value has + been set (e.g., by a constructor or a copy assignment). If the iterator is + default-constructed, it is *uninitialized* and most methods are undefined. + **The library uses assertions to detect calls on uninitialized iterators.** +@requirement The class satisfies the following concept requirements: +- +[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator): + The iterator that can be moved can be moved in both directions (i.e. + incremented and decremented). +@since version 1.0.0, simplified in version 2.0.9, change to bidirectional + iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593) +*/ +template +class iter_impl +{ + /// allow basic_json to access private members + friend iter_impl::value, typename std::remove_const::type, const BasicJsonType>::type>; + friend BasicJsonType; + friend iteration_proxy; + friend iteration_proxy_value; + + using object_t = typename BasicJsonType::object_t; + using array_t = typename BasicJsonType::array_t; + // make sure BasicJsonType is basic_json or const basic_json + static_assert(is_basic_json::type>::value, + "iter_impl only accepts (const) basic_json"); + + public: + + /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17. + /// The C++ Standard has never required user-defined iterators to derive from std::iterator. + /// A user-defined iterator should provide publicly accessible typedefs named + /// iterator_category, value_type, difference_type, pointer, and reference. + /// Note that value_type is required to be non-const, even for constant iterators. + using iterator_category = std::bidirectional_iterator_tag; + + /// the type of the values when the iterator is dereferenced + using value_type = typename BasicJsonType::value_type; + /// a type to represent differences between iterators + using difference_type = typename BasicJsonType::difference_type; + /// defines a pointer to the type iterated over (value_type) + using pointer = typename std::conditional::value, + typename BasicJsonType::const_pointer, + typename BasicJsonType::pointer>::type; + /// defines a reference to the type iterated over (value_type) + using reference = + typename std::conditional::value, + typename BasicJsonType::const_reference, + typename BasicJsonType::reference>::type; + + /// default constructor + iter_impl() = default; + + /*! + @brief constructor for a given JSON instance + @param[in] object pointer to a JSON object for this iterator + @pre object != nullptr + @post The iterator is initialized; i.e. `m_object != nullptr`. + */ + explicit iter_impl(pointer object) noexcept : m_object(object) + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + { + m_it.object_iterator = typename object_t::iterator(); + break; + } + + case value_t::array: + { + m_it.array_iterator = typename array_t::iterator(); + break; + } + + default: + { + m_it.primitive_iterator = primitive_iterator_t(); + break; + } + } + } + + /*! + @note The conventional copy constructor and copy assignment are implicitly + defined. Combined with the following converting constructor and + assignment, they support: (1) copy from iterator to iterator, (2) + copy from const iterator to const iterator, and (3) conversion from + iterator to const iterator. However conversion from const iterator + to iterator is not defined. + */ + + /*! + @brief const copy constructor + @param[in] other const iterator to copy from + @note This copy constructor had to be defined explicitly to circumvent a bug + occurring on msvc v19.0 compiler (VS 2015) debug build. For more + information refer to: https://github.com/nlohmann/json/issues/1608 + */ + iter_impl(const iter_impl& other) noexcept + : m_object(other.m_object), m_it(other.m_it) + {} + + /*! + @brief converting assignment + @param[in] other const iterator to copy from + @return const/non-const iterator + @note It is not checked whether @a other is initialized. + */ + iter_impl& operator=(const iter_impl& other) noexcept + { + m_object = other.m_object; + m_it = other.m_it; + return *this; + } + + /*! + @brief converting constructor + @param[in] other non-const iterator to copy from + @note It is not checked whether @a other is initialized. + */ + iter_impl(const iter_impl::type>& other) noexcept + : m_object(other.m_object), m_it(other.m_it) + {} + + /*! + @brief converting assignment + @param[in] other non-const iterator to copy from + @return const/non-const iterator + @note It is not checked whether @a other is initialized. + */ + iter_impl& operator=(const iter_impl::type>& other) noexcept + { + m_object = other.m_object; + m_it = other.m_it; + return *this; + } + + private: + /*! + @brief set the iterator to the first value + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + void set_begin() noexcept + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + { + m_it.object_iterator = m_object->m_value.object->begin(); + break; + } + + case value_t::array: + { + m_it.array_iterator = m_object->m_value.array->begin(); + break; + } + + case value_t::null: + { + // set to end so begin()==end() is true: null is empty + m_it.primitive_iterator.set_end(); + break; + } + + default: + { + m_it.primitive_iterator.set_begin(); + break; + } + } + } + + /*! + @brief set the iterator past the last value + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + void set_end() noexcept + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + { + m_it.object_iterator = m_object->m_value.object->end(); + break; + } + + case value_t::array: + { + m_it.array_iterator = m_object->m_value.array->end(); + break; + } + + default: + { + m_it.primitive_iterator.set_end(); + break; + } + } + } + + public: + /*! + @brief return a reference to the value pointed to by the iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + reference operator*() const + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + { + JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end()); + return m_it.object_iterator->second; + } + + case value_t::array: + { + JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end()); + return *m_it.array_iterator; + } + + case value_t::null: + JSON_THROW(invalid_iterator::create(214, "cannot get value")); + + default: + { + if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin())) + { + return *m_object; + } + + JSON_THROW(invalid_iterator::create(214, "cannot get value")); + } + } + } + + /*! + @brief dereference the iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + pointer operator->() const + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + { + JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end()); + return &(m_it.object_iterator->second); + } + + case value_t::array: + { + JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end()); + return &*m_it.array_iterator; + } + + default: + { + if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin())) + { + return m_object; + } + + JSON_THROW(invalid_iterator::create(214, "cannot get value")); + } + } + } + + /*! + @brief post-increment (it++) + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl const operator++(int) + { + auto result = *this; + ++(*this); + return result; + } + + /*! + @brief pre-increment (++it) + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl& operator++() + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + { + std::advance(m_it.object_iterator, 1); + break; + } + + case value_t::array: + { + std::advance(m_it.array_iterator, 1); + break; + } + + default: + { + ++m_it.primitive_iterator; + break; + } + } + + return *this; + } + + /*! + @brief post-decrement (it--) + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl const operator--(int) + { + auto result = *this; + --(*this); + return result; + } + + /*! + @brief pre-decrement (--it) + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl& operator--() + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + { + std::advance(m_it.object_iterator, -1); + break; + } + + case value_t::array: + { + std::advance(m_it.array_iterator, -1); + break; + } + + default: + { + --m_it.primitive_iterator; + break; + } + } + + return *this; + } + + /*! + @brief comparison: equal + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + bool operator==(const iter_impl& other) const + { + // if objects are not the same, the comparison is undefined + if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object)) + { + JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers")); + } + + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + return (m_it.object_iterator == other.m_it.object_iterator); + + case value_t::array: + return (m_it.array_iterator == other.m_it.array_iterator); + + default: + return (m_it.primitive_iterator == other.m_it.primitive_iterator); + } + } + + /*! + @brief comparison: not equal + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + bool operator!=(const iter_impl& other) const + { + return !operator==(other); + } + + /*! + @brief comparison: smaller + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + bool operator<(const iter_impl& other) const + { + // if objects are not the same, the comparison is undefined + if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object)) + { + JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers")); + } + + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators")); + + case value_t::array: + return (m_it.array_iterator < other.m_it.array_iterator); + + default: + return (m_it.primitive_iterator < other.m_it.primitive_iterator); + } + } + + /*! + @brief comparison: less than or equal + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + bool operator<=(const iter_impl& other) const + { + return !other.operator < (*this); + } + + /*! + @brief comparison: greater than + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + bool operator>(const iter_impl& other) const + { + return !operator<=(other); + } + + /*! + @brief comparison: greater than or equal + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + bool operator>=(const iter_impl& other) const + { + return !operator<(other); + } + + /*! + @brief add to iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl& operator+=(difference_type i) + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators")); + + case value_t::array: + { + std::advance(m_it.array_iterator, i); + break; + } + + default: + { + m_it.primitive_iterator += i; + break; + } + } + + return *this; + } + + /*! + @brief subtract from iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl& operator-=(difference_type i) + { + return operator+=(-i); + } + + /*! + @brief add to iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl operator+(difference_type i) const + { + auto result = *this; + result += i; + return result; + } + + /*! + @brief addition of distance and iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + friend iter_impl operator+(difference_type i, const iter_impl& it) + { + auto result = it; + result += i; + return result; + } + + /*! + @brief subtract from iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl operator-(difference_type i) const + { + auto result = *this; + result -= i; + return result; + } + + /*! + @brief return difference + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + difference_type operator-(const iter_impl& other) const + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators")); + + case value_t::array: + return m_it.array_iterator - other.m_it.array_iterator; + + default: + return m_it.primitive_iterator - other.m_it.primitive_iterator; + } + } + + /*! + @brief access to successor + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + reference operator[](difference_type n) const + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators")); + + case value_t::array: + return *std::next(m_it.array_iterator, n); + + case value_t::null: + JSON_THROW(invalid_iterator::create(214, "cannot get value")); + + default: + { + if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n)) + { + return *m_object; + } + + JSON_THROW(invalid_iterator::create(214, "cannot get value")); + } + } + } + + /*! + @brief return the key of an object iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + const typename object_t::key_type& key() const + { + JSON_ASSERT(m_object != nullptr); + + if (JSON_HEDLEY_LIKELY(m_object->is_object())) + { + return m_it.object_iterator->first; + } + + JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators")); + } + + /*! + @brief return the value of an iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + reference value() const + { + return operator*(); + } + + private: + /// associated JSON instance + pointer m_object = nullptr; + /// the actual iterator of the associated instance + internal_iterator::type> m_it {}; +}; +} // namespace detail +} // namespace nlohmann + +// #include + +// #include + + +#include // ptrdiff_t +#include // reverse_iterator +#include // declval + +namespace nlohmann +{ +namespace detail +{ +////////////////////// +// reverse_iterator // +////////////////////// + +/*! +@brief a template for a reverse iterator class + +@tparam Base the base iterator type to reverse. Valid types are @ref +iterator (to create @ref reverse_iterator) and @ref const_iterator (to +create @ref const_reverse_iterator). + +@requirement The class satisfies the following concept requirements: +- +[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator): + The iterator that can be moved can be moved in both directions (i.e. + incremented and decremented). +- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator): + It is possible to write to the pointed-to element (only if @a Base is + @ref iterator). + +@since version 1.0.0 +*/ +template +class json_reverse_iterator : public std::reverse_iterator +{ + public: + using difference_type = std::ptrdiff_t; + /// shortcut to the reverse iterator adapter + using base_iterator = std::reverse_iterator; + /// the reference type for the pointed-to element + using reference = typename Base::reference; + + /// create reverse iterator from iterator + explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept + : base_iterator(it) {} + + /// create reverse iterator from base class + explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {} + + /// post-increment (it++) + json_reverse_iterator const operator++(int) + { + return static_cast(base_iterator::operator++(1)); + } + + /// pre-increment (++it) + json_reverse_iterator& operator++() + { + return static_cast(base_iterator::operator++()); + } + + /// post-decrement (it--) + json_reverse_iterator const operator--(int) + { + return static_cast(base_iterator::operator--(1)); + } + + /// pre-decrement (--it) + json_reverse_iterator& operator--() + { + return static_cast(base_iterator::operator--()); + } + + /// add to iterator + json_reverse_iterator& operator+=(difference_type i) + { + return static_cast(base_iterator::operator+=(i)); + } + + /// add to iterator + json_reverse_iterator operator+(difference_type i) const + { + return static_cast(base_iterator::operator+(i)); + } + + /// subtract from iterator + json_reverse_iterator operator-(difference_type i) const + { + return static_cast(base_iterator::operator-(i)); + } + + /// return difference + difference_type operator-(const json_reverse_iterator& other) const + { + return base_iterator(*this) - base_iterator(other); + } + + /// access to successor + reference operator[](difference_type n) const + { + return *(this->operator+(n)); + } + + /// return the key of an object iterator + auto key() const -> decltype(std::declval().key()) + { + auto it = --this->base(); + return it.key(); + } + + /// return the value of an iterator + reference value() const + { + auto it = --this->base(); + return it.operator * (); + } +}; +} // namespace detail +} // namespace nlohmann + +// #include + +// #include + + +#include // all_of +#include // isdigit +#include // max +#include // accumulate +#include // string +#include // move +#include // vector + +// #include + +// #include + +// #include + + +namespace nlohmann +{ +template +class json_pointer +{ + // allow basic_json to access private members + NLOHMANN_BASIC_JSON_TPL_DECLARATION + friend class basic_json; + + public: + /*! + @brief create JSON pointer + + Create a JSON pointer according to the syntax described in + [Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3). + + @param[in] s string representing the JSON pointer; if omitted, the empty + string is assumed which references the whole JSON value + + @throw parse_error.107 if the given JSON pointer @a s is nonempty and does + not begin with a slash (`/`); see example below + + @throw parse_error.108 if a tilde (`~`) in the given JSON pointer @a s is + not followed by `0` (representing `~`) or `1` (representing `/`); see + example below + + @liveexample{The example shows the construction several valid JSON pointers + as well as the exceptional behavior.,json_pointer} + + @since version 2.0.0 + */ + explicit json_pointer(const std::string& s = "") + : reference_tokens(split(s)) + {} + + /*! + @brief return a string representation of the JSON pointer + + @invariant For each JSON pointer `ptr`, it holds: + @code {.cpp} + ptr == json_pointer(ptr.to_string()); + @endcode + + @return a string representation of the JSON pointer + + @liveexample{The example shows the result of `to_string`.,json_pointer__to_string} + + @since version 2.0.0 + */ + std::string to_string() const + { + return std::accumulate(reference_tokens.begin(), reference_tokens.end(), + std::string{}, + [](const std::string & a, const std::string & b) + { + return a + "/" + escape(b); + }); + } + + /// @copydoc to_string() + operator std::string() const + { + return to_string(); + } + + /*! + @brief append another JSON pointer at the end of this JSON pointer + + @param[in] ptr JSON pointer to append + @return JSON pointer with @a ptr appended + + @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add} + + @complexity Linear in the length of @a ptr. + + @sa @ref operator/=(std::string) to append a reference token + @sa @ref operator/=(std::size_t) to append an array index + @sa @ref operator/(const json_pointer&, const json_pointer&) for a binary operator + + @since version 3.6.0 + */ + json_pointer& operator/=(const json_pointer& ptr) + { + reference_tokens.insert(reference_tokens.end(), + ptr.reference_tokens.begin(), + ptr.reference_tokens.end()); + return *this; + } + + /*! + @brief append an unescaped reference token at the end of this JSON pointer + + @param[in] token reference token to append + @return JSON pointer with @a token appended without escaping @a token + + @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add} + + @complexity Amortized constant. + + @sa @ref operator/=(const json_pointer&) to append a JSON pointer + @sa @ref operator/=(std::size_t) to append an array index + @sa @ref operator/(const json_pointer&, std::size_t) for a binary operator + + @since version 3.6.0 + */ + json_pointer& operator/=(std::string token) + { + push_back(std::move(token)); + return *this; + } + + /*! + @brief append an array index at the end of this JSON pointer + + @param[in] array_idx array index to append + @return JSON pointer with @a array_idx appended + + @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add} + + @complexity Amortized constant. + + @sa @ref operator/=(const json_pointer&) to append a JSON pointer + @sa @ref operator/=(std::string) to append a reference token + @sa @ref operator/(const json_pointer&, std::string) for a binary operator + + @since version 3.6.0 + */ + json_pointer& operator/=(std::size_t array_idx) + { + return *this /= std::to_string(array_idx); + } + + /*! + @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer + + @param[in] lhs JSON pointer + @param[in] rhs JSON pointer + @return a new JSON pointer with @a rhs appended to @a lhs + + @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary} + + @complexity Linear in the length of @a lhs and @a rhs. + + @sa @ref operator/=(const json_pointer&) to append a JSON pointer + + @since version 3.6.0 + */ + friend json_pointer operator/(const json_pointer& lhs, + const json_pointer& rhs) + { + return json_pointer(lhs) /= rhs; + } + + /*! + @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer + + @param[in] ptr JSON pointer + @param[in] token reference token + @return a new JSON pointer with unescaped @a token appended to @a ptr + + @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary} + + @complexity Linear in the length of @a ptr. + + @sa @ref operator/=(std::string) to append a reference token + + @since version 3.6.0 + */ + friend json_pointer operator/(const json_pointer& ptr, std::string token) + { + return json_pointer(ptr) /= std::move(token); + } + + /*! + @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer + + @param[in] ptr JSON pointer + @param[in] array_idx array index + @return a new JSON pointer with @a array_idx appended to @a ptr + + @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary} + + @complexity Linear in the length of @a ptr. + + @sa @ref operator/=(std::size_t) to append an array index + + @since version 3.6.0 + */ + friend json_pointer operator/(const json_pointer& ptr, std::size_t array_idx) + { + return json_pointer(ptr) /= array_idx; + } + + /*! + @brief returns the parent of this JSON pointer + + @return parent of this JSON pointer; in case this JSON pointer is the root, + the root itself is returned + + @complexity Linear in the length of the JSON pointer. + + @liveexample{The example shows the result of `parent_pointer` for different + JSON Pointers.,json_pointer__parent_pointer} + + @since version 3.6.0 + */ + json_pointer parent_pointer() const + { + if (empty()) + { + return *this; + } + + json_pointer res = *this; + res.pop_back(); + return res; + } + + /*! + @brief remove last reference token + + @pre not `empty()` + + @liveexample{The example shows the usage of `pop_back`.,json_pointer__pop_back} + + @complexity Constant. + + @throw out_of_range.405 if JSON pointer has no parent + + @since version 3.6.0 + */ + void pop_back() + { + if (JSON_HEDLEY_UNLIKELY(empty())) + { + JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent")); + } + + reference_tokens.pop_back(); + } + + /*! + @brief return last reference token + + @pre not `empty()` + @return last reference token + + @liveexample{The example shows the usage of `back`.,json_pointer__back} + + @complexity Constant. + + @throw out_of_range.405 if JSON pointer has no parent + + @since version 3.6.0 + */ + const std::string& back() const + { + if (JSON_HEDLEY_UNLIKELY(empty())) + { + JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent")); + } + + return reference_tokens.back(); + } + + /*! + @brief append an unescaped token at the end of the reference pointer + + @param[in] token token to add + + @complexity Amortized constant. + + @liveexample{The example shows the result of `push_back` for different + JSON Pointers.,json_pointer__push_back} + + @since version 3.6.0 + */ + void push_back(const std::string& token) + { + reference_tokens.push_back(token); + } + + /// @copydoc push_back(const std::string&) + void push_back(std::string&& token) + { + reference_tokens.push_back(std::move(token)); + } + + /*! + @brief return whether pointer points to the root document + + @return true iff the JSON pointer points to the root document + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @liveexample{The example shows the result of `empty` for different JSON + Pointers.,json_pointer__empty} + + @since version 3.6.0 + */ + bool empty() const noexcept + { + return reference_tokens.empty(); + } + + private: + /*! + @param[in] s reference token to be converted into an array index + + @return integer representation of @a s + + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index begins not with a digit + @throw out_of_range.404 if string @a s could not be converted to an integer + @throw out_of_range.410 if an array index exceeds size_type + */ + static typename BasicJsonType::size_type array_index(const std::string& s) + { + using size_type = typename BasicJsonType::size_type; + + // error condition (cf. RFC 6901, Sect. 4) + if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && s[0] == '0')) + { + JSON_THROW(detail::parse_error::create(106, 0, + "array index '" + s + + "' must not begin with '0'")); + } + + // error condition (cf. RFC 6901, Sect. 4) + if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && !(s[0] >= '1' && s[0] <= '9'))) + { + JSON_THROW(detail::parse_error::create(109, 0, "array index '" + s + "' is not a number")); + } + + std::size_t processed_chars = 0; + unsigned long long res = 0; + JSON_TRY + { + res = std::stoull(s, &processed_chars); + } + JSON_CATCH(std::out_of_range&) + { + JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'")); + } + + // check if the string was completely read + if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size())) + { + JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'")); + } + + // only triggered on special platforms (like 32bit), see also + // https://github.com/nlohmann/json/pull/2203 + if (res >= static_cast((std::numeric_limits::max)())) + { + JSON_THROW(detail::out_of_range::create(410, "array index " + s + " exceeds size_type")); // LCOV_EXCL_LINE + } + + return static_cast(res); + } + + json_pointer top() const + { + if (JSON_HEDLEY_UNLIKELY(empty())) + { + JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent")); + } + + json_pointer result = *this; + result.reference_tokens = {reference_tokens[0]}; + return result; + } + + /*! + @brief create and return a reference to the pointed to value + + @complexity Linear in the number of reference tokens. + + @throw parse_error.109 if array index is not a number + @throw type_error.313 if value cannot be unflattened + */ + BasicJsonType& get_and_create(BasicJsonType& j) const + { + auto result = &j; + + // in case no reference tokens exist, return a reference to the JSON value + // j which will be overwritten by a primitive value + for (const auto& reference_token : reference_tokens) + { + switch (result->type()) + { + case detail::value_t::null: + { + if (reference_token == "0") + { + // start a new array if reference token is 0 + result = &result->operator[](0); + } + else + { + // start a new object otherwise + result = &result->operator[](reference_token); + } + break; + } + + case detail::value_t::object: + { + // create an entry in the object + result = &result->operator[](reference_token); + break; + } + + case detail::value_t::array: + { + // create an entry in the array + result = &result->operator[](array_index(reference_token)); + break; + } + + /* + The following code is only reached if there exists a reference + token _and_ the current value is primitive. In this case, we have + an error situation, because primitive values may only occur as + single value; that is, with an empty list of reference tokens. + */ + default: + JSON_THROW(detail::type_error::create(313, "invalid value to unflatten")); + } + } + + return *result; + } + + /*! + @brief return a reference to the pointed to value + + @note This version does not throw if a value is not present, but tries to + create nested values instead. For instance, calling this function + with pointer `"/this/that"` on a null value is equivalent to calling + `operator[]("this").operator[]("that")` on that value, effectively + changing the null value to an object. + + @param[in] ptr a JSON value + + @return reference to the JSON value pointed to by the JSON pointer + + @complexity Linear in the length of the JSON pointer. + + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + @throw out_of_range.404 if the JSON pointer can not be resolved + */ + BasicJsonType& get_unchecked(BasicJsonType* ptr) const + { + for (const auto& reference_token : reference_tokens) + { + // convert null values to arrays or objects before continuing + if (ptr->is_null()) + { + // check if reference token is a number + const bool nums = + std::all_of(reference_token.begin(), reference_token.end(), + [](const unsigned char x) + { + return std::isdigit(x); + }); + + // change value to array for numbers or "-" or to object otherwise + *ptr = (nums || reference_token == "-") + ? detail::value_t::array + : detail::value_t::object; + } + + switch (ptr->type()) + { + case detail::value_t::object: + { + // use unchecked object access + ptr = &ptr->operator[](reference_token); + break; + } + + case detail::value_t::array: + { + if (reference_token == "-") + { + // explicitly treat "-" as index beyond the end + ptr = &ptr->operator[](ptr->m_value.array->size()); + } + else + { + // convert array index to number; unchecked access + ptr = &ptr->operator[](array_index(reference_token)); + } + break; + } + + default: + JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'")); + } + } + + return *ptr; + } + + /*! + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + @throw out_of_range.402 if the array index '-' is used + @throw out_of_range.404 if the JSON pointer can not be resolved + */ + BasicJsonType& get_checked(BasicJsonType* ptr) const + { + for (const auto& reference_token : reference_tokens) + { + switch (ptr->type()) + { + case detail::value_t::object: + { + // note: at performs range check + ptr = &ptr->at(reference_token); + break; + } + + case detail::value_t::array: + { + if (JSON_HEDLEY_UNLIKELY(reference_token == "-")) + { + // "-" always fails the range check + JSON_THROW(detail::out_of_range::create(402, + "array index '-' (" + std::to_string(ptr->m_value.array->size()) + + ") is out of range")); + } + + // note: at performs range check + ptr = &ptr->at(array_index(reference_token)); + break; + } + + default: + JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'")); + } + } + + return *ptr; + } + + /*! + @brief return a const reference to the pointed to value + + @param[in] ptr a JSON value + + @return const reference to the JSON value pointed to by the JSON + pointer + + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + @throw out_of_range.402 if the array index '-' is used + @throw out_of_range.404 if the JSON pointer can not be resolved + */ + const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const + { + for (const auto& reference_token : reference_tokens) + { + switch (ptr->type()) + { + case detail::value_t::object: + { + // use unchecked object access + ptr = &ptr->operator[](reference_token); + break; + } + + case detail::value_t::array: + { + if (JSON_HEDLEY_UNLIKELY(reference_token == "-")) + { + // "-" cannot be used for const access + JSON_THROW(detail::out_of_range::create(402, + "array index '-' (" + std::to_string(ptr->m_value.array->size()) + + ") is out of range")); + } + + // use unchecked array access + ptr = &ptr->operator[](array_index(reference_token)); + break; + } + + default: + JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'")); + } + } + + return *ptr; + } + + /*! + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + @throw out_of_range.402 if the array index '-' is used + @throw out_of_range.404 if the JSON pointer can not be resolved + */ + const BasicJsonType& get_checked(const BasicJsonType* ptr) const + { + for (const auto& reference_token : reference_tokens) + { + switch (ptr->type()) + { + case detail::value_t::object: + { + // note: at performs range check + ptr = &ptr->at(reference_token); + break; + } + + case detail::value_t::array: + { + if (JSON_HEDLEY_UNLIKELY(reference_token == "-")) + { + // "-" always fails the range check + JSON_THROW(detail::out_of_range::create(402, + "array index '-' (" + std::to_string(ptr->m_value.array->size()) + + ") is out of range")); + } + + // note: at performs range check + ptr = &ptr->at(array_index(reference_token)); + break; + } + + default: + JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'")); + } + } + + return *ptr; + } + + /*! + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + */ + bool contains(const BasicJsonType* ptr) const + { + for (const auto& reference_token : reference_tokens) + { + switch (ptr->type()) + { + case detail::value_t::object: + { + if (!ptr->contains(reference_token)) + { + // we did not find the key in the object + return false; + } + + ptr = &ptr->operator[](reference_token); + break; + } + + case detail::value_t::array: + { + if (JSON_HEDLEY_UNLIKELY(reference_token == "-")) + { + // "-" always fails the range check + return false; + } + if (JSON_HEDLEY_UNLIKELY(reference_token.size() == 1 && !("0" <= reference_token && reference_token <= "9"))) + { + // invalid char + return false; + } + if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1)) + { + if (JSON_HEDLEY_UNLIKELY(!('1' <= reference_token[0] && reference_token[0] <= '9'))) + { + // first char should be between '1' and '9' + return false; + } + for (std::size_t i = 1; i < reference_token.size(); i++) + { + if (JSON_HEDLEY_UNLIKELY(!('0' <= reference_token[i] && reference_token[i] <= '9'))) + { + // other char should be between '0' and '9' + return false; + } + } + } + + const auto idx = array_index(reference_token); + if (idx >= ptr->size()) + { + // index out of range + return false; + } + + ptr = &ptr->operator[](idx); + break; + } + + default: + { + // we do not expect primitive values if there is still a + // reference token to process + return false; + } + } + } + + // no reference token left means we found a primitive value + return true; + } + + /*! + @brief split the string input to reference tokens + + @note This function is only called by the json_pointer constructor. + All exceptions below are documented there. + + @throw parse_error.107 if the pointer is not empty or begins with '/' + @throw parse_error.108 if character '~' is not followed by '0' or '1' + */ + static std::vector split(const std::string& reference_string) + { + std::vector result; + + // special case: empty reference string -> no reference tokens + if (reference_string.empty()) + { + return result; + } + + // check if nonempty reference string begins with slash + if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/')) + { + JSON_THROW(detail::parse_error::create(107, 1, + "JSON pointer must be empty or begin with '/' - was: '" + + reference_string + "'")); + } + + // extract the reference tokens: + // - slash: position of the last read slash (or end of string) + // - start: position after the previous slash + for ( + // search for the first slash after the first character + std::size_t slash = reference_string.find_first_of('/', 1), + // set the beginning of the first reference token + start = 1; + // we can stop if start == 0 (if slash == std::string::npos) + start != 0; + // set the beginning of the next reference token + // (will eventually be 0 if slash == std::string::npos) + start = (slash == std::string::npos) ? 0 : slash + 1, + // find next slash + slash = reference_string.find_first_of('/', start)) + { + // use the text between the beginning of the reference token + // (start) and the last slash (slash). + auto reference_token = reference_string.substr(start, slash - start); + + // check reference tokens are properly escaped + for (std::size_t pos = reference_token.find_first_of('~'); + pos != std::string::npos; + pos = reference_token.find_first_of('~', pos + 1)) + { + JSON_ASSERT(reference_token[pos] == '~'); + + // ~ must be followed by 0 or 1 + if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 || + (reference_token[pos + 1] != '0' && + reference_token[pos + 1] != '1'))) + { + JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'")); + } + } + + // finally, store the reference token + unescape(reference_token); + result.push_back(reference_token); + } + + return result; + } + + /*! + @brief replace all occurrences of a substring by another string + + @param[in,out] s the string to manipulate; changed so that all + occurrences of @a f are replaced with @a t + @param[in] f the substring to replace with @a t + @param[in] t the string to replace @a f + + @pre The search string @a f must not be empty. **This precondition is + enforced with an assertion.** + + @since version 2.0.0 + */ + static void replace_substring(std::string& s, const std::string& f, + const std::string& t) + { + JSON_ASSERT(!f.empty()); + for (auto pos = s.find(f); // find first occurrence of f + pos != std::string::npos; // make sure f was found + s.replace(pos, f.size(), t), // replace with t, and + pos = s.find(f, pos + t.size())) // find next occurrence of f + {} + } + + /// escape "~" to "~0" and "/" to "~1" + static std::string escape(std::string s) + { + replace_substring(s, "~", "~0"); + replace_substring(s, "/", "~1"); + return s; + } + + /// unescape "~1" to tilde and "~0" to slash (order is important!) + static void unescape(std::string& s) + { + replace_substring(s, "~1", "/"); + replace_substring(s, "~0", "~"); + } + + /*! + @param[in] reference_string the reference string to the current value + @param[in] value the value to consider + @param[in,out] result the result object to insert values to + + @note Empty objects or arrays are flattened to `null`. + */ + static void flatten(const std::string& reference_string, + const BasicJsonType& value, + BasicJsonType& result) + { + switch (value.type()) + { + case detail::value_t::array: + { + if (value.m_value.array->empty()) + { + // flatten empty array as null + result[reference_string] = nullptr; + } + else + { + // iterate array and use index as reference string + for (std::size_t i = 0; i < value.m_value.array->size(); ++i) + { + flatten(reference_string + "/" + std::to_string(i), + value.m_value.array->operator[](i), result); + } + } + break; + } + + case detail::value_t::object: + { + if (value.m_value.object->empty()) + { + // flatten empty object as null + result[reference_string] = nullptr; + } + else + { + // iterate object and use keys as reference string + for (const auto& element : *value.m_value.object) + { + flatten(reference_string + "/" + escape(element.first), element.second, result); + } + } + break; + } + + default: + { + // add primitive value with its reference string + result[reference_string] = value; + break; + } + } + } + + /*! + @param[in] value flattened JSON + + @return unflattened JSON + + @throw parse_error.109 if array index is not a number + @throw type_error.314 if value is not an object + @throw type_error.315 if object values are not primitive + @throw type_error.313 if value cannot be unflattened + */ + static BasicJsonType + unflatten(const BasicJsonType& value) + { + if (JSON_HEDLEY_UNLIKELY(!value.is_object())) + { + JSON_THROW(detail::type_error::create(314, "only objects can be unflattened")); + } + + BasicJsonType result; + + // iterate the JSON object values + for (const auto& element : *value.m_value.object) + { + if (JSON_HEDLEY_UNLIKELY(!element.second.is_primitive())) + { + JSON_THROW(detail::type_error::create(315, "values in object must be primitive")); + } + + // assign value to reference pointed to by JSON pointer; Note that if + // the JSON pointer is "" (i.e., points to the whole value), function + // get_and_create returns a reference to result itself. An assignment + // will then create a primitive value. + json_pointer(element.first).get_and_create(result) = element.second; + } + + return result; + } + + /*! + @brief compares two JSON pointers for equality + + @param[in] lhs JSON pointer to compare + @param[in] rhs JSON pointer to compare + @return whether @a lhs is equal to @a rhs + + @complexity Linear in the length of the JSON pointer + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + */ + friend bool operator==(json_pointer const& lhs, + json_pointer const& rhs) noexcept + { + return lhs.reference_tokens == rhs.reference_tokens; + } + + /*! + @brief compares two JSON pointers for inequality + + @param[in] lhs JSON pointer to compare + @param[in] rhs JSON pointer to compare + @return whether @a lhs is not equal @a rhs + + @complexity Linear in the length of the JSON pointer + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + */ + friend bool operator!=(json_pointer const& lhs, + json_pointer const& rhs) noexcept + { + return !(lhs == rhs); + } + + /// the reference tokens + std::vector reference_tokens; +}; +} // namespace nlohmann + +// #include + + +#include +#include + +// #include + + +namespace nlohmann +{ +namespace detail +{ +template +class json_ref +{ + public: + using value_type = BasicJsonType; + + json_ref(value_type&& value) + : owned_value(std::move(value)) + , value_ref(&owned_value) + , is_rvalue(true) + {} + + json_ref(const value_type& value) + : value_ref(const_cast(&value)) + , is_rvalue(false) + {} + + json_ref(std::initializer_list init) + : owned_value(init) + , value_ref(&owned_value) + , is_rvalue(true) + {} + + template < + class... Args, + enable_if_t::value, int> = 0 > + json_ref(Args && ... args) + : owned_value(std::forward(args)...) + , value_ref(&owned_value) + , is_rvalue(true) + {} + + // class should be movable only + json_ref(json_ref&&) = default; + json_ref(const json_ref&) = delete; + json_ref& operator=(const json_ref&) = delete; + json_ref& operator=(json_ref&&) = delete; + ~json_ref() = default; + + value_type moved_or_copied() const + { + if (is_rvalue) + { + return std::move(*value_ref); + } + return *value_ref; + } + + value_type const& operator*() const + { + return *static_cast(value_ref); + } + + value_type const* operator->() const + { + return static_cast(value_ref); + } + + private: + mutable value_type owned_value = nullptr; + value_type* value_ref = nullptr; + const bool is_rvalue = true; +}; +} // namespace detail +} // namespace nlohmann + +// #include + +// #include + +// #include + +// #include + + +#include // reverse +#include // array +#include // uint8_t, uint16_t, uint32_t, uint64_t +#include // memcpy +#include // numeric_limits +#include // string +#include // isnan, isinf + +// #include + +// #include + +// #include + + +#include // copy +#include // size_t +#include // streamsize +#include // back_inserter +#include // shared_ptr, make_shared +#include // basic_ostream +#include // basic_string +#include // vector +// #include + + +namespace nlohmann +{ +namespace detail +{ +/// abstract output adapter interface +template struct output_adapter_protocol +{ + virtual void write_character(CharType c) = 0; + virtual void write_characters(const CharType* s, std::size_t length) = 0; + virtual ~output_adapter_protocol() = default; +}; + +/// a type to simplify interfaces +template +using output_adapter_t = std::shared_ptr>; + +/// output adapter for byte vectors +template +class output_vector_adapter : public output_adapter_protocol +{ + public: + explicit output_vector_adapter(std::vector& vec) noexcept + : v(vec) + {} + + void write_character(CharType c) override + { + v.push_back(c); + } + + JSON_HEDLEY_NON_NULL(2) + void write_characters(const CharType* s, std::size_t length) override + { + std::copy(s, s + length, std::back_inserter(v)); + } + + private: + std::vector& v; +}; + +/// output adapter for output streams +template +class output_stream_adapter : public output_adapter_protocol +{ + public: + explicit output_stream_adapter(std::basic_ostream& s) noexcept + : stream(s) + {} + + void write_character(CharType c) override + { + stream.put(c); + } + + JSON_HEDLEY_NON_NULL(2) + void write_characters(const CharType* s, std::size_t length) override + { + stream.write(s, static_cast(length)); + } + + private: + std::basic_ostream& stream; +}; + +/// output adapter for basic_string +template> +class output_string_adapter : public output_adapter_protocol +{ + public: + explicit output_string_adapter(StringType& s) noexcept + : str(s) + {} + + void write_character(CharType c) override + { + str.push_back(c); + } + + JSON_HEDLEY_NON_NULL(2) + void write_characters(const CharType* s, std::size_t length) override + { + str.append(s, length); + } + + private: + StringType& str; +}; + +template> +class output_adapter +{ + public: + output_adapter(std::vector& vec) + : oa(std::make_shared>(vec)) {} + + output_adapter(std::basic_ostream& s) + : oa(std::make_shared>(s)) {} + + output_adapter(StringType& s) + : oa(std::make_shared>(s)) {} + + operator output_adapter_t() + { + return oa; + } + + private: + output_adapter_t oa = nullptr; +}; +} // namespace detail +} // namespace nlohmann + + +namespace nlohmann +{ +namespace detail +{ +/////////////////// +// binary writer // +/////////////////// + +/*! +@brief serialization to CBOR and MessagePack values +*/ +template +class binary_writer +{ + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + using number_float_t = typename BasicJsonType::number_float_t; + + public: + /*! + @brief create a binary writer + + @param[in] adapter output adapter to write to + */ + explicit binary_writer(output_adapter_t adapter) : oa(adapter) + { + JSON_ASSERT(oa); + } + + /*! + @param[in] j JSON value to serialize + @pre j.type() == value_t::object + */ + void write_bson(const BasicJsonType& j) + { + switch (j.type()) + { + case value_t::object: + { + write_bson_object(*j.m_value.object); + break; + } + + default: + { + JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()))); + } + } + } + + /*! + @param[in] j JSON value to serialize + */ + void write_cbor(const BasicJsonType& j) + { + switch (j.type()) + { + case value_t::null: + { + oa->write_character(to_char_type(0xF6)); + break; + } + + case value_t::boolean: + { + oa->write_character(j.m_value.boolean + ? to_char_type(0xF5) + : to_char_type(0xF4)); + break; + } + + case value_t::number_integer: + { + if (j.m_value.number_integer >= 0) + { + // CBOR does not differentiate between positive signed + // integers and unsigned integers. Therefore, we used the + // code from the value_t::number_unsigned case here. + if (j.m_value.number_integer <= 0x17) + { + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_integer <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x18)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_integer <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x19)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_integer <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x1A)); + write_number(static_cast(j.m_value.number_integer)); + } + else + { + oa->write_character(to_char_type(0x1B)); + write_number(static_cast(j.m_value.number_integer)); + } + } + else + { + // The conversions below encode the sign in the first + // byte, and the value is converted to a positive number. + const auto positive_number = -1 - j.m_value.number_integer; + if (j.m_value.number_integer >= -24) + { + write_number(static_cast(0x20 + positive_number)); + } + else if (positive_number <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x38)); + write_number(static_cast(positive_number)); + } + else if (positive_number <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x39)); + write_number(static_cast(positive_number)); + } + else if (positive_number <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x3A)); + write_number(static_cast(positive_number)); + } + else + { + oa->write_character(to_char_type(0x3B)); + write_number(static_cast(positive_number)); + } + } + break; + } + + case value_t::number_unsigned: + { + if (j.m_value.number_unsigned <= 0x17) + { + write_number(static_cast(j.m_value.number_unsigned)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x18)); + write_number(static_cast(j.m_value.number_unsigned)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x19)); + write_number(static_cast(j.m_value.number_unsigned)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x1A)); + write_number(static_cast(j.m_value.number_unsigned)); + } + else + { + oa->write_character(to_char_type(0x1B)); + write_number(static_cast(j.m_value.number_unsigned)); + } + break; + } + + case value_t::number_float: + { + if (std::isnan(j.m_value.number_float)) + { + // NaN is 0xf97e00 in CBOR + oa->write_character(to_char_type(0xF9)); + oa->write_character(to_char_type(0x7E)); + oa->write_character(to_char_type(0x00)); + } + else if (std::isinf(j.m_value.number_float)) + { + // Infinity is 0xf97c00, -Infinity is 0xf9fc00 + oa->write_character(to_char_type(0xf9)); + oa->write_character(j.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC)); + oa->write_character(to_char_type(0x00)); + } + else + { + write_compact_float(j.m_value.number_float, detail::input_format_t::cbor); + } + break; + } + + case value_t::string: + { + // step 1: write control byte and the string length + const auto N = j.m_value.string->size(); + if (N <= 0x17) + { + write_number(static_cast(0x60 + N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x78)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x79)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x7A)); + write_number(static_cast(N)); + } + // LCOV_EXCL_START + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x7B)); + write_number(static_cast(N)); + } + // LCOV_EXCL_STOP + + // step 2: write the string + oa->write_characters( + reinterpret_cast(j.m_value.string->c_str()), + j.m_value.string->size()); + break; + } + + case value_t::array: + { + // step 1: write control byte and the array size + const auto N = j.m_value.array->size(); + if (N <= 0x17) + { + write_number(static_cast(0x80 + N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x98)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x99)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x9A)); + write_number(static_cast(N)); + } + // LCOV_EXCL_START + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x9B)); + write_number(static_cast(N)); + } + // LCOV_EXCL_STOP + + // step 2: write each element + for (const auto& el : *j.m_value.array) + { + write_cbor(el); + } + break; + } + + case value_t::binary: + { + if (j.m_value.binary->has_subtype()) + { + write_number(static_cast(0xd8)); + write_number(j.m_value.binary->subtype()); + } + + // step 1: write control byte and the binary array size + const auto N = j.m_value.binary->size(); + if (N <= 0x17) + { + write_number(static_cast(0x40 + N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x58)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x59)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x5A)); + write_number(static_cast(N)); + } + // LCOV_EXCL_START + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x5B)); + write_number(static_cast(N)); + } + // LCOV_EXCL_STOP + + // step 2: write each element + oa->write_characters( + reinterpret_cast(j.m_value.binary->data()), + N); + + break; + } + + case value_t::object: + { + // step 1: write control byte and the object size + const auto N = j.m_value.object->size(); + if (N <= 0x17) + { + write_number(static_cast(0xA0 + N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0xB8)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0xB9)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0xBA)); + write_number(static_cast(N)); + } + // LCOV_EXCL_START + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0xBB)); + write_number(static_cast(N)); + } + // LCOV_EXCL_STOP + + // step 2: write each element + for (const auto& el : *j.m_value.object) + { + write_cbor(el.first); + write_cbor(el.second); + } + break; + } + + default: + break; + } + } + + /*! + @param[in] j JSON value to serialize + */ + void write_msgpack(const BasicJsonType& j) + { + switch (j.type()) + { + case value_t::null: // nil + { + oa->write_character(to_char_type(0xC0)); + break; + } + + case value_t::boolean: // true and false + { + oa->write_character(j.m_value.boolean + ? to_char_type(0xC3) + : to_char_type(0xC2)); + break; + } + + case value_t::number_integer: + { + if (j.m_value.number_integer >= 0) + { + // MessagePack does not differentiate between positive + // signed integers and unsigned integers. Therefore, we used + // the code from the value_t::number_unsigned case here. + if (j.m_value.number_unsigned < 128) + { + // positive fixnum + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 8 + oa->write_character(to_char_type(0xCC)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 16 + oa->write_character(to_char_type(0xCD)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 32 + oa->write_character(to_char_type(0xCE)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 64 + oa->write_character(to_char_type(0xCF)); + write_number(static_cast(j.m_value.number_integer)); + } + } + else + { + if (j.m_value.number_integer >= -32) + { + // negative fixnum + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_integer >= (std::numeric_limits::min)() && + j.m_value.number_integer <= (std::numeric_limits::max)()) + { + // int 8 + oa->write_character(to_char_type(0xD0)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_integer >= (std::numeric_limits::min)() && + j.m_value.number_integer <= (std::numeric_limits::max)()) + { + // int 16 + oa->write_character(to_char_type(0xD1)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_integer >= (std::numeric_limits::min)() && + j.m_value.number_integer <= (std::numeric_limits::max)()) + { + // int 32 + oa->write_character(to_char_type(0xD2)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_integer >= (std::numeric_limits::min)() && + j.m_value.number_integer <= (std::numeric_limits::max)()) + { + // int 64 + oa->write_character(to_char_type(0xD3)); + write_number(static_cast(j.m_value.number_integer)); + } + } + break; + } + + case value_t::number_unsigned: + { + if (j.m_value.number_unsigned < 128) + { + // positive fixnum + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 8 + oa->write_character(to_char_type(0xCC)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 16 + oa->write_character(to_char_type(0xCD)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 32 + oa->write_character(to_char_type(0xCE)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 64 + oa->write_character(to_char_type(0xCF)); + write_number(static_cast(j.m_value.number_integer)); + } + break; + } + + case value_t::number_float: + { + write_compact_float(j.m_value.number_float, detail::input_format_t::msgpack); + break; + } + + case value_t::string: + { + // step 1: write control byte and the string length + const auto N = j.m_value.string->size(); + if (N <= 31) + { + // fixstr + write_number(static_cast(0xA0 | N)); + } + else if (N <= (std::numeric_limits::max)()) + { + // str 8 + oa->write_character(to_char_type(0xD9)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + // str 16 + oa->write_character(to_char_type(0xDA)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + // str 32 + oa->write_character(to_char_type(0xDB)); + write_number(static_cast(N)); + } + + // step 2: write the string + oa->write_characters( + reinterpret_cast(j.m_value.string->c_str()), + j.m_value.string->size()); + break; + } + + case value_t::array: + { + // step 1: write control byte and the array size + const auto N = j.m_value.array->size(); + if (N <= 15) + { + // fixarray + write_number(static_cast(0x90 | N)); + } + else if (N <= (std::numeric_limits::max)()) + { + // array 16 + oa->write_character(to_char_type(0xDC)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + // array 32 + oa->write_character(to_char_type(0xDD)); + write_number(static_cast(N)); + } + + // step 2: write each element + for (const auto& el : *j.m_value.array) + { + write_msgpack(el); + } + break; + } + + case value_t::binary: + { + // step 0: determine if the binary type has a set subtype to + // determine whether or not to use the ext or fixext types + const bool use_ext = j.m_value.binary->has_subtype(); + + // step 1: write control byte and the byte string length + const auto N = j.m_value.binary->size(); + if (N <= (std::numeric_limits::max)()) + { + std::uint8_t output_type{}; + bool fixed = true; + if (use_ext) + { + switch (N) + { + case 1: + output_type = 0xD4; // fixext 1 + break; + case 2: + output_type = 0xD5; // fixext 2 + break; + case 4: + output_type = 0xD6; // fixext 4 + break; + case 8: + output_type = 0xD7; // fixext 8 + break; + case 16: + output_type = 0xD8; // fixext 16 + break; + default: + output_type = 0xC7; // ext 8 + fixed = false; + break; + } + + } + else + { + output_type = 0xC4; // bin 8 + fixed = false; + } + + oa->write_character(to_char_type(output_type)); + if (!fixed) + { + write_number(static_cast(N)); + } + } + else if (N <= (std::numeric_limits::max)()) + { + std::uint8_t output_type = use_ext + ? 0xC8 // ext 16 + : 0xC5; // bin 16 + + oa->write_character(to_char_type(output_type)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + std::uint8_t output_type = use_ext + ? 0xC9 // ext 32 + : 0xC6; // bin 32 + + oa->write_character(to_char_type(output_type)); + write_number(static_cast(N)); + } + + // step 1.5: if this is an ext type, write the subtype + if (use_ext) + { + write_number(static_cast(j.m_value.binary->subtype())); + } + + // step 2: write the byte string + oa->write_characters( + reinterpret_cast(j.m_value.binary->data()), + N); + + break; + } + + case value_t::object: + { + // step 1: write control byte and the object size + const auto N = j.m_value.object->size(); + if (N <= 15) + { + // fixmap + write_number(static_cast(0x80 | (N & 0xF))); + } + else if (N <= (std::numeric_limits::max)()) + { + // map 16 + oa->write_character(to_char_type(0xDE)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + // map 32 + oa->write_character(to_char_type(0xDF)); + write_number(static_cast(N)); + } + + // step 2: write each element + for (const auto& el : *j.m_value.object) + { + write_msgpack(el.first); + write_msgpack(el.second); + } + break; + } + + default: + break; + } + } + + /*! + @param[in] j JSON value to serialize + @param[in] use_count whether to use '#' prefixes (optimized format) + @param[in] use_type whether to use '$' prefixes (optimized format) + @param[in] add_prefix whether prefixes need to be used for this value + */ + void write_ubjson(const BasicJsonType& j, const bool use_count, + const bool use_type, const bool add_prefix = true) + { + switch (j.type()) + { + case value_t::null: + { + if (add_prefix) + { + oa->write_character(to_char_type('Z')); + } + break; + } + + case value_t::boolean: + { + if (add_prefix) + { + oa->write_character(j.m_value.boolean + ? to_char_type('T') + : to_char_type('F')); + } + break; + } + + case value_t::number_integer: + { + write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix); + break; + } + + case value_t::number_unsigned: + { + write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix); + break; + } + + case value_t::number_float: + { + write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix); + break; + } + + case value_t::string: + { + if (add_prefix) + { + oa->write_character(to_char_type('S')); + } + write_number_with_ubjson_prefix(j.m_value.string->size(), true); + oa->write_characters( + reinterpret_cast(j.m_value.string->c_str()), + j.m_value.string->size()); + break; + } + + case value_t::array: + { + if (add_prefix) + { + oa->write_character(to_char_type('[')); + } + + bool prefix_required = true; + if (use_type && !j.m_value.array->empty()) + { + JSON_ASSERT(use_count); + const CharType first_prefix = ubjson_prefix(j.front()); + const bool same_prefix = std::all_of(j.begin() + 1, j.end(), + [this, first_prefix](const BasicJsonType & v) + { + return ubjson_prefix(v) == first_prefix; + }); + + if (same_prefix) + { + prefix_required = false; + oa->write_character(to_char_type('$')); + oa->write_character(first_prefix); + } + } + + if (use_count) + { + oa->write_character(to_char_type('#')); + write_number_with_ubjson_prefix(j.m_value.array->size(), true); + } + + for (const auto& el : *j.m_value.array) + { + write_ubjson(el, use_count, use_type, prefix_required); + } + + if (!use_count) + { + oa->write_character(to_char_type(']')); + } + + break; + } + + case value_t::binary: + { + if (add_prefix) + { + oa->write_character(to_char_type('[')); + } + + if (use_type && !j.m_value.binary->empty()) + { + JSON_ASSERT(use_count); + oa->write_character(to_char_type('$')); + oa->write_character('U'); + } + + if (use_count) + { + oa->write_character(to_char_type('#')); + write_number_with_ubjson_prefix(j.m_value.binary->size(), true); + } + + if (use_type) + { + oa->write_characters( + reinterpret_cast(j.m_value.binary->data()), + j.m_value.binary->size()); + } + else + { + for (size_t i = 0; i < j.m_value.binary->size(); ++i) + { + oa->write_character(to_char_type('U')); + oa->write_character(j.m_value.binary->data()[i]); + } + } + + if (!use_count) + { + oa->write_character(to_char_type(']')); + } + + break; + } + + case value_t::object: + { + if (add_prefix) + { + oa->write_character(to_char_type('{')); + } + + bool prefix_required = true; + if (use_type && !j.m_value.object->empty()) + { + JSON_ASSERT(use_count); + const CharType first_prefix = ubjson_prefix(j.front()); + const bool same_prefix = std::all_of(j.begin(), j.end(), + [this, first_prefix](const BasicJsonType & v) + { + return ubjson_prefix(v) == first_prefix; + }); + + if (same_prefix) + { + prefix_required = false; + oa->write_character(to_char_type('$')); + oa->write_character(first_prefix); + } + } + + if (use_count) + { + oa->write_character(to_char_type('#')); + write_number_with_ubjson_prefix(j.m_value.object->size(), true); + } + + for (const auto& el : *j.m_value.object) + { + write_number_with_ubjson_prefix(el.first.size(), true); + oa->write_characters( + reinterpret_cast(el.first.c_str()), + el.first.size()); + write_ubjson(el.second, use_count, use_type, prefix_required); + } + + if (!use_count) + { + oa->write_character(to_char_type('}')); + } + + break; + } + + default: + break; + } + } + + private: + ////////// + // BSON // + ////////// + + /*! + @return The size of a BSON document entry header, including the id marker + and the entry name size (and its null-terminator). + */ + static std::size_t calc_bson_entry_header_size(const string_t& name) + { + const auto it = name.find(static_cast(0)); + if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos)) + { + JSON_THROW(out_of_range::create(409, + "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")")); + } + + return /*id*/ 1ul + name.size() + /*zero-terminator*/1u; + } + + /*! + @brief Writes the given @a element_type and @a name to the output adapter + */ + void write_bson_entry_header(const string_t& name, + const std::uint8_t element_type) + { + oa->write_character(to_char_type(element_type)); // boolean + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + } + + /*! + @brief Writes a BSON element with key @a name and boolean value @a value + */ + void write_bson_boolean(const string_t& name, + const bool value) + { + write_bson_entry_header(name, 0x08); + oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00)); + } + + /*! + @brief Writes a BSON element with key @a name and double value @a value + */ + void write_bson_double(const string_t& name, + const double value) + { + write_bson_entry_header(name, 0x01); + write_number(value); + } + + /*! + @return The size of the BSON-encoded string in @a value + */ + static std::size_t calc_bson_string_size(const string_t& value) + { + return sizeof(std::int32_t) + value.size() + 1ul; + } + + /*! + @brief Writes a BSON element with key @a name and string value @a value + */ + void write_bson_string(const string_t& name, + const string_t& value) + { + write_bson_entry_header(name, 0x02); + + write_number(static_cast(value.size() + 1ul)); + oa->write_characters( + reinterpret_cast(value.c_str()), + value.size() + 1); + } + + /*! + @brief Writes a BSON element with key @a name and null value + */ + void write_bson_null(const string_t& name) + { + write_bson_entry_header(name, 0x0A); + } + + /*! + @return The size of the BSON-encoded integer @a value + */ + static std::size_t calc_bson_integer_size(const std::int64_t value) + { + return (std::numeric_limits::min)() <= value && value <= (std::numeric_limits::max)() + ? sizeof(std::int32_t) + : sizeof(std::int64_t); + } + + /*! + @brief Writes a BSON element with key @a name and integer @a value + */ + void write_bson_integer(const string_t& name, + const std::int64_t value) + { + if ((std::numeric_limits::min)() <= value && value <= (std::numeric_limits::max)()) + { + write_bson_entry_header(name, 0x10); // int32 + write_number(static_cast(value)); + } + else + { + write_bson_entry_header(name, 0x12); // int64 + write_number(static_cast(value)); + } + } + + /*! + @return The size of the BSON-encoded unsigned integer in @a j + */ + static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept + { + return (value <= static_cast((std::numeric_limits::max)())) + ? sizeof(std::int32_t) + : sizeof(std::int64_t); + } + + /*! + @brief Writes a BSON element with key @a name and unsigned @a value + */ + void write_bson_unsigned(const string_t& name, + const std::uint64_t value) + { + if (value <= static_cast((std::numeric_limits::max)())) + { + write_bson_entry_header(name, 0x10 /* int32 */); + write_number(static_cast(value)); + } + else if (value <= static_cast((std::numeric_limits::max)())) + { + write_bson_entry_header(name, 0x12 /* int64 */); + write_number(static_cast(value)); + } + else + { + JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(value) + " cannot be represented by BSON as it does not fit int64")); + } + } + + /*! + @brief Writes a BSON element with key @a name and object @a value + */ + void write_bson_object_entry(const string_t& name, + const typename BasicJsonType::object_t& value) + { + write_bson_entry_header(name, 0x03); // object + write_bson_object(value); + } + + /*! + @return The size of the BSON-encoded array @a value + */ + static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value) + { + std::size_t array_index = 0ul; + + const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), std::size_t(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el) + { + return result + calc_bson_element_size(std::to_string(array_index++), el); + }); + + return sizeof(std::int32_t) + embedded_document_size + 1ul; + } + + /*! + @return The size of the BSON-encoded binary array @a value + */ + static std::size_t calc_bson_binary_size(const typename BasicJsonType::binary_t& value) + { + return sizeof(std::int32_t) + value.size() + 1ul; + } + + /*! + @brief Writes a BSON element with key @a name and array @a value + */ + void write_bson_array(const string_t& name, + const typename BasicJsonType::array_t& value) + { + write_bson_entry_header(name, 0x04); // array + write_number(static_cast(calc_bson_array_size(value))); + + std::size_t array_index = 0ul; + + for (const auto& el : value) + { + write_bson_element(std::to_string(array_index++), el); + } + + oa->write_character(to_char_type(0x00)); + } + + /*! + @brief Writes a BSON element with key @a name and binary value @a value + */ + void write_bson_binary(const string_t& name, + const binary_t& value) + { + write_bson_entry_header(name, 0x05); + + write_number(static_cast(value.size())); + write_number(value.has_subtype() ? value.subtype() : std::uint8_t(0x00)); + + oa->write_characters(reinterpret_cast(value.data()), value.size()); + } + + /*! + @brief Calculates the size necessary to serialize the JSON value @a j with its @a name + @return The calculated size for the BSON document entry for @a j with the given @a name. + */ + static std::size_t calc_bson_element_size(const string_t& name, + const BasicJsonType& j) + { + const auto header_size = calc_bson_entry_header_size(name); + switch (j.type()) + { + case value_t::object: + return header_size + calc_bson_object_size(*j.m_value.object); + + case value_t::array: + return header_size + calc_bson_array_size(*j.m_value.array); + + case value_t::binary: + return header_size + calc_bson_binary_size(*j.m_value.binary); + + case value_t::boolean: + return header_size + 1ul; + + case value_t::number_float: + return header_size + 8ul; + + case value_t::number_integer: + return header_size + calc_bson_integer_size(j.m_value.number_integer); + + case value_t::number_unsigned: + return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned); + + case value_t::string: + return header_size + calc_bson_string_size(*j.m_value.string); + + case value_t::null: + return header_size + 0ul; + + // LCOV_EXCL_START + default: + JSON_ASSERT(false); + return 0ul; + // LCOV_EXCL_STOP + } + } + + /*! + @brief Serializes the JSON value @a j to BSON and associates it with the + key @a name. + @param name The name to associate with the JSON entity @a j within the + current BSON document + @return The size of the BSON entry + */ + void write_bson_element(const string_t& name, + const BasicJsonType& j) + { + switch (j.type()) + { + case value_t::object: + return write_bson_object_entry(name, *j.m_value.object); + + case value_t::array: + return write_bson_array(name, *j.m_value.array); + + case value_t::binary: + return write_bson_binary(name, *j.m_value.binary); + + case value_t::boolean: + return write_bson_boolean(name, j.m_value.boolean); + + case value_t::number_float: + return write_bson_double(name, j.m_value.number_float); + + case value_t::number_integer: + return write_bson_integer(name, j.m_value.number_integer); + + case value_t::number_unsigned: + return write_bson_unsigned(name, j.m_value.number_unsigned); + + case value_t::string: + return write_bson_string(name, *j.m_value.string); + + case value_t::null: + return write_bson_null(name); + + // LCOV_EXCL_START + default: + JSON_ASSERT(false); + return; + // LCOV_EXCL_STOP + } + } + + /*! + @brief Calculates the size of the BSON serialization of the given + JSON-object @a j. + @param[in] j JSON value to serialize + @pre j.type() == value_t::object + */ + static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value) + { + std::size_t document_size = std::accumulate(value.begin(), value.end(), std::size_t(0), + [](size_t result, const typename BasicJsonType::object_t::value_type & el) + { + return result += calc_bson_element_size(el.first, el.second); + }); + + return sizeof(std::int32_t) + document_size + 1ul; + } + + /*! + @param[in] j JSON value to serialize + @pre j.type() == value_t::object + */ + void write_bson_object(const typename BasicJsonType::object_t& value) + { + write_number(static_cast(calc_bson_object_size(value))); + + for (const auto& el : value) + { + write_bson_element(el.first, el.second); + } + + oa->write_character(to_char_type(0x00)); + } + + ////////// + // CBOR // + ////////// + + static constexpr CharType get_cbor_float_prefix(float /*unused*/) + { + return to_char_type(0xFA); // Single-Precision Float + } + + static constexpr CharType get_cbor_float_prefix(double /*unused*/) + { + return to_char_type(0xFB); // Double-Precision Float + } + + ///////////// + // MsgPack // + ///////////// + + static constexpr CharType get_msgpack_float_prefix(float /*unused*/) + { + return to_char_type(0xCA); // float 32 + } + + static constexpr CharType get_msgpack_float_prefix(double /*unused*/) + { + return to_char_type(0xCB); // float 64 + } + + //////////// + // UBJSON // + //////////// + + // UBJSON: write number (floating point) + template::value, int>::type = 0> + void write_number_with_ubjson_prefix(const NumberType n, + const bool add_prefix) + { + if (add_prefix) + { + oa->write_character(get_ubjson_float_prefix(n)); + } + write_number(n); + } + + // UBJSON: write number (unsigned integer) + template::value, int>::type = 0> + void write_number_with_ubjson_prefix(const NumberType n, + const bool add_prefix) + { + if (n <= static_cast((std::numeric_limits::max)())) + { + if (add_prefix) + { + oa->write_character(to_char_type('i')); // int8 + } + write_number(static_cast(n)); + } + else if (n <= (std::numeric_limits::max)()) + { + if (add_prefix) + { + oa->write_character(to_char_type('U')); // uint8 + } + write_number(static_cast(n)); + } + else if (n <= static_cast((std::numeric_limits::max)())) + { + if (add_prefix) + { + oa->write_character(to_char_type('I')); // int16 + } + write_number(static_cast(n)); + } + else if (n <= static_cast((std::numeric_limits::max)())) + { + if (add_prefix) + { + oa->write_character(to_char_type('l')); // int32 + } + write_number(static_cast(n)); + } + else if (n <= static_cast((std::numeric_limits::max)())) + { + if (add_prefix) + { + oa->write_character(to_char_type('L')); // int64 + } + write_number(static_cast(n)); + } + else + { + if (add_prefix) + { + oa->write_character(to_char_type('H')); // high-precision number + } + + const auto number = BasicJsonType(n).dump(); + write_number_with_ubjson_prefix(number.size(), true); + for (std::size_t i = 0; i < number.size(); ++i) + { + oa->write_character(to_char_type(static_cast(number[i]))); + } + } + } + + // UBJSON: write number (signed integer) + template < typename NumberType, typename std::enable_if < + std::is_signed::value&& + !std::is_floating_point::value, int >::type = 0 > + void write_number_with_ubjson_prefix(const NumberType n, + const bool add_prefix) + { + if ((std::numeric_limits::min)() <= n && n <= (std::numeric_limits::max)()) + { + if (add_prefix) + { + oa->write_character(to_char_type('i')); // int8 + } + write_number(static_cast(n)); + } + else if (static_cast((std::numeric_limits::min)()) <= n && n <= static_cast((std::numeric_limits::max)())) + { + if (add_prefix) + { + oa->write_character(to_char_type('U')); // uint8 + } + write_number(static_cast(n)); + } + else if ((std::numeric_limits::min)() <= n && n <= (std::numeric_limits::max)()) + { + if (add_prefix) + { + oa->write_character(to_char_type('I')); // int16 + } + write_number(static_cast(n)); + } + else if ((std::numeric_limits::min)() <= n && n <= (std::numeric_limits::max)()) + { + if (add_prefix) + { + oa->write_character(to_char_type('l')); // int32 + } + write_number(static_cast(n)); + } + else if ((std::numeric_limits::min)() <= n && n <= (std::numeric_limits::max)()) + { + if (add_prefix) + { + oa->write_character(to_char_type('L')); // int64 + } + write_number(static_cast(n)); + } + // LCOV_EXCL_START + else + { + if (add_prefix) + { + oa->write_character(to_char_type('H')); // high-precision number + } + + const auto number = BasicJsonType(n).dump(); + write_number_with_ubjson_prefix(number.size(), true); + for (std::size_t i = 0; i < number.size(); ++i) + { + oa->write_character(to_char_type(static_cast(number[i]))); + } + } + // LCOV_EXCL_STOP + } + + /*! + @brief determine the type prefix of container values + */ + CharType ubjson_prefix(const BasicJsonType& j) const noexcept + { + switch (j.type()) + { + case value_t::null: + return 'Z'; + + case value_t::boolean: + return j.m_value.boolean ? 'T' : 'F'; + + case value_t::number_integer: + { + if ((std::numeric_limits::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits::max)()) + { + return 'i'; + } + if ((std::numeric_limits::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits::max)()) + { + return 'U'; + } + if ((std::numeric_limits::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits::max)()) + { + return 'I'; + } + if ((std::numeric_limits::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits::max)()) + { + return 'l'; + } + if ((std::numeric_limits::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits::max)()) + { + return 'L'; + } + // anything else is treated as high-precision number + return 'H'; // LCOV_EXCL_LINE + } + + case value_t::number_unsigned: + { + if (j.m_value.number_unsigned <= static_cast((std::numeric_limits::max)())) + { + return 'i'; + } + if (j.m_value.number_unsigned <= static_cast((std::numeric_limits::max)())) + { + return 'U'; + } + if (j.m_value.number_unsigned <= static_cast((std::numeric_limits::max)())) + { + return 'I'; + } + if (j.m_value.number_unsigned <= static_cast((std::numeric_limits::max)())) + { + return 'l'; + } + if (j.m_value.number_unsigned <= static_cast((std::numeric_limits::max)())) + { + return 'L'; + } + // anything else is treated as high-precision number + return 'H'; // LCOV_EXCL_LINE + } + + case value_t::number_float: + return get_ubjson_float_prefix(j.m_value.number_float); + + case value_t::string: + return 'S'; + + case value_t::array: // fallthrough + case value_t::binary: + return '['; + + case value_t::object: + return '{'; + + default: // discarded values + return 'N'; + } + } + + static constexpr CharType get_ubjson_float_prefix(float /*unused*/) + { + return 'd'; // float 32 + } + + static constexpr CharType get_ubjson_float_prefix(double /*unused*/) + { + return 'D'; // float 64 + } + + /////////////////////// + // Utility functions // + /////////////////////// + + /* + @brief write a number to output input + @param[in] n number of type @a NumberType + @tparam NumberType the type of the number + @tparam OutputIsLittleEndian Set to true if output data is + required to be little endian + + @note This function needs to respect the system's endianess, because bytes + in CBOR, MessagePack, and UBJSON are stored in network order (big + endian) and therefore need reordering on little endian systems. + */ + template + void write_number(const NumberType n) + { + // step 1: write number to array of length NumberType + std::array vec; + std::memcpy(vec.data(), &n, sizeof(NumberType)); + + // step 2: write array to output (with possible reordering) + if (is_little_endian != OutputIsLittleEndian) + { + // reverse byte order prior to conversion if necessary + std::reverse(vec.begin(), vec.end()); + } + + oa->write_characters(vec.data(), sizeof(NumberType)); + } + + void write_compact_float(const number_float_t n, detail::input_format_t format) + { + if (static_cast(n) >= static_cast(std::numeric_limits::lowest()) && + static_cast(n) <= static_cast((std::numeric_limits::max)()) && + static_cast(static_cast(n)) == static_cast(n)) + { + oa->write_character(format == detail::input_format_t::cbor + ? get_cbor_float_prefix(static_cast(n)) + : get_msgpack_float_prefix(static_cast(n))); + write_number(static_cast(n)); + } + else + { + oa->write_character(format == detail::input_format_t::cbor + ? get_cbor_float_prefix(n) + : get_msgpack_float_prefix(n)); + write_number(n); + } + } + + public: + // The following to_char_type functions are implement the conversion + // between uint8_t and CharType. In case CharType is not unsigned, + // such a conversion is required to allow values greater than 128. + // See for a discussion. + template < typename C = CharType, + enable_if_t < std::is_signed::value && std::is_signed::value > * = nullptr > + static constexpr CharType to_char_type(std::uint8_t x) noexcept + { + return *reinterpret_cast(&x); + } + + template < typename C = CharType, + enable_if_t < std::is_signed::value && std::is_unsigned::value > * = nullptr > + static CharType to_char_type(std::uint8_t x) noexcept + { + static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t"); + static_assert(std::is_trivial::value, "CharType must be trivial"); + CharType result; + std::memcpy(&result, &x, sizeof(x)); + return result; + } + + template::value>* = nullptr> + static constexpr CharType to_char_type(std::uint8_t x) noexcept + { + return x; + } + + template < typename InputCharType, typename C = CharType, + enable_if_t < + std::is_signed::value && + std::is_signed::value && + std::is_same::type>::value + > * = nullptr > + static constexpr CharType to_char_type(InputCharType x) noexcept + { + return x; + } + + private: + /// whether we can assume little endianess + const bool is_little_endian = little_endianess(); + + /// the output + output_adapter_t oa = nullptr; +}; +} // namespace detail +} // namespace nlohmann + +// #include + +// #include + + +#include // reverse, remove, fill, find, none_of +#include // array +#include // localeconv, lconv +#include // labs, isfinite, isnan, signbit +#include // size_t, ptrdiff_t +#include // uint8_t +#include // snprintf +#include // numeric_limits +#include // string, char_traits +#include // is_same +#include // move + +// #include + + +#include // array +#include // signbit, isfinite +#include // intN_t, uintN_t +#include // memcpy, memmove +#include // numeric_limits +#include // conditional + +// #include + + +namespace nlohmann +{ +namespace detail +{ + +/*! +@brief implements the Grisu2 algorithm for binary to decimal floating-point +conversion. + +This implementation is a slightly modified version of the reference +implementation which may be obtained from +http://florian.loitsch.com/publications (bench.tar.gz). + +The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch. + +For a detailed description of the algorithm see: + +[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with + Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming + Language Design and Implementation, PLDI 2010 +[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately", + Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language + Design and Implementation, PLDI 1996 +*/ +namespace dtoa_impl +{ + +template +Target reinterpret_bits(const Source source) +{ + static_assert(sizeof(Target) == sizeof(Source), "size mismatch"); + + Target target; + std::memcpy(&target, &source, sizeof(Source)); + return target; +} + +struct diyfp // f * 2^e +{ + static constexpr int kPrecision = 64; // = q + + std::uint64_t f = 0; + int e = 0; + + constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {} + + /*! + @brief returns x - y + @pre x.e == y.e and x.f >= y.f + */ + static diyfp sub(const diyfp& x, const diyfp& y) noexcept + { + JSON_ASSERT(x.e == y.e); + JSON_ASSERT(x.f >= y.f); + + return {x.f - y.f, x.e}; + } + + /*! + @brief returns x * y + @note The result is rounded. (Only the upper q bits are returned.) + */ + static diyfp mul(const diyfp& x, const diyfp& y) noexcept + { + static_assert(kPrecision == 64, "internal error"); + + // Computes: + // f = round((x.f * y.f) / 2^q) + // e = x.e + y.e + q + + // Emulate the 64-bit * 64-bit multiplication: + // + // p = u * v + // = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi) + // = (u_lo v_lo ) + 2^32 ((u_lo v_hi ) + (u_hi v_lo )) + 2^64 (u_hi v_hi ) + // = (p0 ) + 2^32 ((p1 ) + (p2 )) + 2^64 (p3 ) + // = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3 ) + // = (p0_lo ) + 2^32 (p0_hi + p1_lo + p2_lo ) + 2^64 (p1_hi + p2_hi + p3) + // = (p0_lo ) + 2^32 (Q ) + 2^64 (H ) + // = (p0_lo ) + 2^32 (Q_lo + 2^32 Q_hi ) + 2^64 (H ) + // + // (Since Q might be larger than 2^32 - 1) + // + // = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H) + // + // (Q_hi + H does not overflow a 64-bit int) + // + // = p_lo + 2^64 p_hi + + const std::uint64_t u_lo = x.f & 0xFFFFFFFFu; + const std::uint64_t u_hi = x.f >> 32u; + const std::uint64_t v_lo = y.f & 0xFFFFFFFFu; + const std::uint64_t v_hi = y.f >> 32u; + + const std::uint64_t p0 = u_lo * v_lo; + const std::uint64_t p1 = u_lo * v_hi; + const std::uint64_t p2 = u_hi * v_lo; + const std::uint64_t p3 = u_hi * v_hi; + + const std::uint64_t p0_hi = p0 >> 32u; + const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu; + const std::uint64_t p1_hi = p1 >> 32u; + const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu; + const std::uint64_t p2_hi = p2 >> 32u; + + std::uint64_t Q = p0_hi + p1_lo + p2_lo; + + // The full product might now be computed as + // + // p_hi = p3 + p2_hi + p1_hi + (Q >> 32) + // p_lo = p0_lo + (Q << 32) + // + // But in this particular case here, the full p_lo is not required. + // Effectively we only need to add the highest bit in p_lo to p_hi (and + // Q_hi + 1 does not overflow). + + Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up + + const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u); + + return {h, x.e + y.e + 64}; + } + + /*! + @brief normalize x such that the significand is >= 2^(q-1) + @pre x.f != 0 + */ + static diyfp normalize(diyfp x) noexcept + { + JSON_ASSERT(x.f != 0); + + while ((x.f >> 63u) == 0) + { + x.f <<= 1u; + x.e--; + } + + return x; + } + + /*! + @brief normalize x such that the result has the exponent E + @pre e >= x.e and the upper e - x.e bits of x.f must be zero. + */ + static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept + { + const int delta = x.e - target_exponent; + + JSON_ASSERT(delta >= 0); + JSON_ASSERT(((x.f << delta) >> delta) == x.f); + + return {x.f << delta, target_exponent}; + } +}; + +struct boundaries +{ + diyfp w; + diyfp minus; + diyfp plus; +}; + +/*! +Compute the (normalized) diyfp representing the input number 'value' and its +boundaries. + +@pre value must be finite and positive +*/ +template +boundaries compute_boundaries(FloatType value) +{ + JSON_ASSERT(std::isfinite(value)); + JSON_ASSERT(value > 0); + + // Convert the IEEE representation into a diyfp. + // + // If v is denormal: + // value = 0.F * 2^(1 - bias) = ( F) * 2^(1 - bias - (p-1)) + // If v is normalized: + // value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1)) + + static_assert(std::numeric_limits::is_iec559, + "internal error: dtoa_short requires an IEEE-754 floating-point implementation"); + + constexpr int kPrecision = std::numeric_limits::digits; // = p (includes the hidden bit) + constexpr int kBias = std::numeric_limits::max_exponent - 1 + (kPrecision - 1); + constexpr int kMinExp = 1 - kBias; + constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1) + + using bits_type = typename std::conditional::type; + + const std::uint64_t bits = reinterpret_bits(value); + const std::uint64_t E = bits >> (kPrecision - 1); + const std::uint64_t F = bits & (kHiddenBit - 1); + + const bool is_denormal = E == 0; + const diyfp v = is_denormal + ? diyfp(F, kMinExp) + : diyfp(F + kHiddenBit, static_cast(E) - kBias); + + // Compute the boundaries m- and m+ of the floating-point value + // v = f * 2^e. + // + // Determine v- and v+, the floating-point predecessor and successor if v, + // respectively. + // + // v- = v - 2^e if f != 2^(p-1) or e == e_min (A) + // = v - 2^(e-1) if f == 2^(p-1) and e > e_min (B) + // + // v+ = v + 2^e + // + // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_ + // between m- and m+ round to v, regardless of how the input rounding + // algorithm breaks ties. + // + // ---+-------------+-------------+-------------+-------------+--- (A) + // v- m- v m+ v+ + // + // -----------------+------+------+-------------+-------------+--- (B) + // v- m- v m+ v+ + + const bool lower_boundary_is_closer = F == 0 && E > 1; + const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1); + const diyfp m_minus = lower_boundary_is_closer + ? diyfp(4 * v.f - 1, v.e - 2) // (B) + : diyfp(2 * v.f - 1, v.e - 1); // (A) + + // Determine the normalized w+ = m+. + const diyfp w_plus = diyfp::normalize(m_plus); + + // Determine w- = m- such that e_(w-) = e_(w+). + const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e); + + return {diyfp::normalize(v), w_minus, w_plus}; +} + +// Given normalized diyfp w, Grisu needs to find a (normalized) cached +// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies +// within a certain range [alpha, gamma] (Definition 3.2 from [1]) +// +// alpha <= e = e_c + e_w + q <= gamma +// +// or +// +// f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q +// <= f_c * f_w * 2^gamma +// +// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies +// +// 2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma +// +// or +// +// 2^(q - 2 + alpha) <= c * w < 2^(q + gamma) +// +// The choice of (alpha,gamma) determines the size of the table and the form of +// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well +// in practice: +// +// The idea is to cut the number c * w = f * 2^e into two parts, which can be +// processed independently: An integral part p1, and a fractional part p2: +// +// f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e +// = (f div 2^-e) + (f mod 2^-e) * 2^e +// = p1 + p2 * 2^e +// +// The conversion of p1 into decimal form requires a series of divisions and +// modulos by (a power of) 10. These operations are faster for 32-bit than for +// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be +// achieved by choosing +// +// -e >= 32 or e <= -32 := gamma +// +// In order to convert the fractional part +// +// p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ... +// +// into decimal form, the fraction is repeatedly multiplied by 10 and the digits +// d[-i] are extracted in order: +// +// (10 * p2) div 2^-e = d[-1] +// (10 * p2) mod 2^-e = d[-2] / 10^1 + ... +// +// The multiplication by 10 must not overflow. It is sufficient to choose +// +// 10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64. +// +// Since p2 = f mod 2^-e < 2^-e, +// +// -e <= 60 or e >= -60 := alpha + +constexpr int kAlpha = -60; +constexpr int kGamma = -32; + +struct cached_power // c = f * 2^e ~= 10^k +{ + std::uint64_t f; + int e; + int k; +}; + +/*! +For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached +power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c +satisfies (Definition 3.2 from [1]) + + alpha <= e_c + e + q <= gamma. +*/ +inline cached_power get_cached_power_for_binary_exponent(int e) +{ + // Now + // + // alpha <= e_c + e + q <= gamma (1) + // ==> f_c * 2^alpha <= c * 2^e * 2^q + // + // and since the c's are normalized, 2^(q-1) <= f_c, + // + // ==> 2^(q - 1 + alpha) <= c * 2^(e + q) + // ==> 2^(alpha - e - 1) <= c + // + // If c were an exact power of ten, i.e. c = 10^k, one may determine k as + // + // k = ceil( log_10( 2^(alpha - e - 1) ) ) + // = ceil( (alpha - e - 1) * log_10(2) ) + // + // From the paper: + // "In theory the result of the procedure could be wrong since c is rounded, + // and the computation itself is approximated [...]. In practice, however, + // this simple function is sufficient." + // + // For IEEE double precision floating-point numbers converted into + // normalized diyfp's w = f * 2^e, with q = 64, + // + // e >= -1022 (min IEEE exponent) + // -52 (p - 1) + // -52 (p - 1, possibly normalize denormal IEEE numbers) + // -11 (normalize the diyfp) + // = -1137 + // + // and + // + // e <= +1023 (max IEEE exponent) + // -52 (p - 1) + // -11 (normalize the diyfp) + // = 960 + // + // This binary exponent range [-1137,960] results in a decimal exponent + // range [-307,324]. One does not need to store a cached power for each + // k in this range. For each such k it suffices to find a cached power + // such that the exponent of the product lies in [alpha,gamma]. + // This implies that the difference of the decimal exponents of adjacent + // table entries must be less than or equal to + // + // floor( (gamma - alpha) * log_10(2) ) = 8. + // + // (A smaller distance gamma-alpha would require a larger table.) + + // NB: + // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34. + + constexpr int kCachedPowersMinDecExp = -300; + constexpr int kCachedPowersDecStep = 8; + + static constexpr std::array kCachedPowers = + { + { + { 0xAB70FE17C79AC6CA, -1060, -300 }, + { 0xFF77B1FCBEBCDC4F, -1034, -292 }, + { 0xBE5691EF416BD60C, -1007, -284 }, + { 0x8DD01FAD907FFC3C, -980, -276 }, + { 0xD3515C2831559A83, -954, -268 }, + { 0x9D71AC8FADA6C9B5, -927, -260 }, + { 0xEA9C227723EE8BCB, -901, -252 }, + { 0xAECC49914078536D, -874, -244 }, + { 0x823C12795DB6CE57, -847, -236 }, + { 0xC21094364DFB5637, -821, -228 }, + { 0x9096EA6F3848984F, -794, -220 }, + { 0xD77485CB25823AC7, -768, -212 }, + { 0xA086CFCD97BF97F4, -741, -204 }, + { 0xEF340A98172AACE5, -715, -196 }, + { 0xB23867FB2A35B28E, -688, -188 }, + { 0x84C8D4DFD2C63F3B, -661, -180 }, + { 0xC5DD44271AD3CDBA, -635, -172 }, + { 0x936B9FCEBB25C996, -608, -164 }, + { 0xDBAC6C247D62A584, -582, -156 }, + { 0xA3AB66580D5FDAF6, -555, -148 }, + { 0xF3E2F893DEC3F126, -529, -140 }, + { 0xB5B5ADA8AAFF80B8, -502, -132 }, + { 0x87625F056C7C4A8B, -475, -124 }, + { 0xC9BCFF6034C13053, -449, -116 }, + { 0x964E858C91BA2655, -422, -108 }, + { 0xDFF9772470297EBD, -396, -100 }, + { 0xA6DFBD9FB8E5B88F, -369, -92 }, + { 0xF8A95FCF88747D94, -343, -84 }, + { 0xB94470938FA89BCF, -316, -76 }, + { 0x8A08F0F8BF0F156B, -289, -68 }, + { 0xCDB02555653131B6, -263, -60 }, + { 0x993FE2C6D07B7FAC, -236, -52 }, + { 0xE45C10C42A2B3B06, -210, -44 }, + { 0xAA242499697392D3, -183, -36 }, + { 0xFD87B5F28300CA0E, -157, -28 }, + { 0xBCE5086492111AEB, -130, -20 }, + { 0x8CBCCC096F5088CC, -103, -12 }, + { 0xD1B71758E219652C, -77, -4 }, + { 0x9C40000000000000, -50, 4 }, + { 0xE8D4A51000000000, -24, 12 }, + { 0xAD78EBC5AC620000, 3, 20 }, + { 0x813F3978F8940984, 30, 28 }, + { 0xC097CE7BC90715B3, 56, 36 }, + { 0x8F7E32CE7BEA5C70, 83, 44 }, + { 0xD5D238A4ABE98068, 109, 52 }, + { 0x9F4F2726179A2245, 136, 60 }, + { 0xED63A231D4C4FB27, 162, 68 }, + { 0xB0DE65388CC8ADA8, 189, 76 }, + { 0x83C7088E1AAB65DB, 216, 84 }, + { 0xC45D1DF942711D9A, 242, 92 }, + { 0x924D692CA61BE758, 269, 100 }, + { 0xDA01EE641A708DEA, 295, 108 }, + { 0xA26DA3999AEF774A, 322, 116 }, + { 0xF209787BB47D6B85, 348, 124 }, + { 0xB454E4A179DD1877, 375, 132 }, + { 0x865B86925B9BC5C2, 402, 140 }, + { 0xC83553C5C8965D3D, 428, 148 }, + { 0x952AB45CFA97A0B3, 455, 156 }, + { 0xDE469FBD99A05FE3, 481, 164 }, + { 0xA59BC234DB398C25, 508, 172 }, + { 0xF6C69A72A3989F5C, 534, 180 }, + { 0xB7DCBF5354E9BECE, 561, 188 }, + { 0x88FCF317F22241E2, 588, 196 }, + { 0xCC20CE9BD35C78A5, 614, 204 }, + { 0x98165AF37B2153DF, 641, 212 }, + { 0xE2A0B5DC971F303A, 667, 220 }, + { 0xA8D9D1535CE3B396, 694, 228 }, + { 0xFB9B7CD9A4A7443C, 720, 236 }, + { 0xBB764C4CA7A44410, 747, 244 }, + { 0x8BAB8EEFB6409C1A, 774, 252 }, + { 0xD01FEF10A657842C, 800, 260 }, + { 0x9B10A4E5E9913129, 827, 268 }, + { 0xE7109BFBA19C0C9D, 853, 276 }, + { 0xAC2820D9623BF429, 880, 284 }, + { 0x80444B5E7AA7CF85, 907, 292 }, + { 0xBF21E44003ACDD2D, 933, 300 }, + { 0x8E679C2F5E44FF8F, 960, 308 }, + { 0xD433179D9C8CB841, 986, 316 }, + { 0x9E19DB92B4E31BA9, 1013, 324 }, + } + }; + + // This computation gives exactly the same results for k as + // k = ceil((kAlpha - e - 1) * 0.30102999566398114) + // for |e| <= 1500, but doesn't require floating-point operations. + // NB: log_10(2) ~= 78913 / 2^18 + JSON_ASSERT(e >= -1500); + JSON_ASSERT(e <= 1500); + const int f = kAlpha - e - 1; + const int k = (f * 78913) / (1 << 18) + static_cast(f > 0); + + const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep; + JSON_ASSERT(index >= 0); + JSON_ASSERT(static_cast(index) < kCachedPowers.size()); + + const cached_power cached = kCachedPowers[static_cast(index)]; + JSON_ASSERT(kAlpha <= cached.e + e + 64); + JSON_ASSERT(kGamma >= cached.e + e + 64); + + return cached; +} + +/*! +For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k. +For n == 0, returns 1 and sets pow10 := 1. +*/ +inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10) +{ + // LCOV_EXCL_START + if (n >= 1000000000) + { + pow10 = 1000000000; + return 10; + } + // LCOV_EXCL_STOP + else if (n >= 100000000) + { + pow10 = 100000000; + return 9; + } + else if (n >= 10000000) + { + pow10 = 10000000; + return 8; + } + else if (n >= 1000000) + { + pow10 = 1000000; + return 7; + } + else if (n >= 100000) + { + pow10 = 100000; + return 6; + } + else if (n >= 10000) + { + pow10 = 10000; + return 5; + } + else if (n >= 1000) + { + pow10 = 1000; + return 4; + } + else if (n >= 100) + { + pow10 = 100; + return 3; + } + else if (n >= 10) + { + pow10 = 10; + return 2; + } + else + { + pow10 = 1; + return 1; + } +} + +inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta, + std::uint64_t rest, std::uint64_t ten_k) +{ + JSON_ASSERT(len >= 1); + JSON_ASSERT(dist <= delta); + JSON_ASSERT(rest <= delta); + JSON_ASSERT(ten_k > 0); + + // <--------------------------- delta ----> + // <---- dist ---------> + // --------------[------------------+-------------------]-------------- + // M- w M+ + // + // ten_k + // <------> + // <---- rest ----> + // --------------[------------------+----+--------------]-------------- + // w V + // = buf * 10^k + // + // ten_k represents a unit-in-the-last-place in the decimal representation + // stored in buf. + // Decrement buf by ten_k while this takes buf closer to w. + + // The tests are written in this order to avoid overflow in unsigned + // integer arithmetic. + + while (rest < dist + && delta - rest >= ten_k + && (rest + ten_k < dist || dist - rest > rest + ten_k - dist)) + { + JSON_ASSERT(buf[len - 1] != '0'); + buf[len - 1]--; + rest += ten_k; + } +} + +/*! +Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+. +M- and M+ must be normalized and share the same exponent -60 <= e <= -32. +*/ +inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent, + diyfp M_minus, diyfp w, diyfp M_plus) +{ + static_assert(kAlpha >= -60, "internal error"); + static_assert(kGamma <= -32, "internal error"); + + // Generates the digits (and the exponent) of a decimal floating-point + // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's + // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma. + // + // <--------------------------- delta ----> + // <---- dist ---------> + // --------------[------------------+-------------------]-------------- + // M- w M+ + // + // Grisu2 generates the digits of M+ from left to right and stops as soon as + // V is in [M-,M+]. + + JSON_ASSERT(M_plus.e >= kAlpha); + JSON_ASSERT(M_plus.e <= kGamma); + + std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e) + std::uint64_t dist = diyfp::sub(M_plus, w ).f; // (significand of (M+ - w ), implicit exponent is e) + + // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0): + // + // M+ = f * 2^e + // = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e + // = ((p1 ) * 2^-e + (p2 )) * 2^e + // = p1 + p2 * 2^e + + const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e); + + auto p1 = static_cast(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.) + std::uint64_t p2 = M_plus.f & (one.f - 1); // p2 = f mod 2^-e + + // 1) + // + // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0] + + JSON_ASSERT(p1 > 0); + + std::uint32_t pow10; + const int k = find_largest_pow10(p1, pow10); + + // 10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1) + // + // p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1)) + // = (d[k-1] ) * 10^(k-1) + (p1 mod 10^(k-1)) + // + // M+ = p1 + p2 * 2^e + // = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1)) + p2 * 2^e + // = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e + // = d[k-1] * 10^(k-1) + ( rest) * 2^e + // + // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0) + // + // p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0] + // + // but stop as soon as + // + // rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e + + int n = k; + while (n > 0) + { + // Invariants: + // M+ = buffer * 10^n + (p1 + p2 * 2^e) (buffer = 0 for n = k) + // pow10 = 10^(n-1) <= p1 < 10^n + // + const std::uint32_t d = p1 / pow10; // d = p1 div 10^(n-1) + const std::uint32_t r = p1 % pow10; // r = p1 mod 10^(n-1) + // + // M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e + // = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e) + // + JSON_ASSERT(d <= 9); + buffer[length++] = static_cast('0' + d); // buffer := buffer * 10 + d + // + // M+ = buffer * 10^(n-1) + (r + p2 * 2^e) + // + p1 = r; + n--; + // + // M+ = buffer * 10^n + (p1 + p2 * 2^e) + // pow10 = 10^n + // + + // Now check if enough digits have been generated. + // Compute + // + // p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e + // + // Note: + // Since rest and delta share the same exponent e, it suffices to + // compare the significands. + const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2; + if (rest <= delta) + { + // V = buffer * 10^n, with M- <= V <= M+. + + decimal_exponent += n; + + // We may now just stop. But instead look if the buffer could be + // decremented to bring V closer to w. + // + // pow10 = 10^n is now 1 ulp in the decimal representation V. + // The rounding procedure works with diyfp's with an implicit + // exponent of e. + // + // 10^n = (10^n * 2^-e) * 2^e = ulp * 2^e + // + const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e; + grisu2_round(buffer, length, dist, delta, rest, ten_n); + + return; + } + + pow10 /= 10; + // + // pow10 = 10^(n-1) <= p1 < 10^n + // Invariants restored. + } + + // 2) + // + // The digits of the integral part have been generated: + // + // M+ = d[k-1]...d[1]d[0] + p2 * 2^e + // = buffer + p2 * 2^e + // + // Now generate the digits of the fractional part p2 * 2^e. + // + // Note: + // No decimal point is generated: the exponent is adjusted instead. + // + // p2 actually represents the fraction + // + // p2 * 2^e + // = p2 / 2^-e + // = d[-1] / 10^1 + d[-2] / 10^2 + ... + // + // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...) + // + // p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m + // + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...) + // + // using + // + // 10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e) + // = ( d) * 2^-e + ( r) + // + // or + // 10^m * p2 * 2^e = d + r * 2^e + // + // i.e. + // + // M+ = buffer + p2 * 2^e + // = buffer + 10^-m * (d + r * 2^e) + // = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e + // + // and stop as soon as 10^-m * r * 2^e <= delta * 2^e + + JSON_ASSERT(p2 > delta); + + int m = 0; + for (;;) + { + // Invariant: + // M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e + // = buffer * 10^-m + 10^-m * (p2 ) * 2^e + // = buffer * 10^-m + 10^-m * (1/10 * (10 * p2) ) * 2^e + // = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e + // + JSON_ASSERT(p2 <= (std::numeric_limits::max)() / 10); + p2 *= 10; + const std::uint64_t d = p2 >> -one.e; // d = (10 * p2) div 2^-e + const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e + // + // M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e + // = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e)) + // = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e + // + JSON_ASSERT(d <= 9); + buffer[length++] = static_cast('0' + d); // buffer := buffer * 10 + d + // + // M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e + // + p2 = r; + m++; + // + // M+ = buffer * 10^-m + 10^-m * p2 * 2^e + // Invariant restored. + + // Check if enough digits have been generated. + // + // 10^-m * p2 * 2^e <= delta * 2^e + // p2 * 2^e <= 10^m * delta * 2^e + // p2 <= 10^m * delta + delta *= 10; + dist *= 10; + if (p2 <= delta) + { + break; + } + } + + // V = buffer * 10^-m, with M- <= V <= M+. + + decimal_exponent -= m; + + // 1 ulp in the decimal representation is now 10^-m. + // Since delta and dist are now scaled by 10^m, we need to do the + // same with ulp in order to keep the units in sync. + // + // 10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e + // + const std::uint64_t ten_m = one.f; + grisu2_round(buffer, length, dist, delta, p2, ten_m); + + // By construction this algorithm generates the shortest possible decimal + // number (Loitsch, Theorem 6.2) which rounds back to w. + // For an input number of precision p, at least + // + // N = 1 + ceil(p * log_10(2)) + // + // decimal digits are sufficient to identify all binary floating-point + // numbers (Matula, "In-and-Out conversions"). + // This implies that the algorithm does not produce more than N decimal + // digits. + // + // N = 17 for p = 53 (IEEE double precision) + // N = 9 for p = 24 (IEEE single precision) +} + +/*! +v = buf * 10^decimal_exponent +len is the length of the buffer (number of decimal digits) +The buffer must be large enough, i.e. >= max_digits10. +*/ +JSON_HEDLEY_NON_NULL(1) +inline void grisu2(char* buf, int& len, int& decimal_exponent, + diyfp m_minus, diyfp v, diyfp m_plus) +{ + JSON_ASSERT(m_plus.e == m_minus.e); + JSON_ASSERT(m_plus.e == v.e); + + // --------(-----------------------+-----------------------)-------- (A) + // m- v m+ + // + // --------------------(-----------+-----------------------)-------- (B) + // m- v m+ + // + // First scale v (and m- and m+) such that the exponent is in the range + // [alpha, gamma]. + + const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e); + + const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k + + // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma] + const diyfp w = diyfp::mul(v, c_minus_k); + const diyfp w_minus = diyfp::mul(m_minus, c_minus_k); + const diyfp w_plus = diyfp::mul(m_plus, c_minus_k); + + // ----(---+---)---------------(---+---)---------------(---+---)---- + // w- w w+ + // = c*m- = c*v = c*m+ + // + // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and + // w+ are now off by a small amount. + // In fact: + // + // w - v * 10^k < 1 ulp + // + // To account for this inaccuracy, add resp. subtract 1 ulp. + // + // --------+---[---------------(---+---)---------------]---+-------- + // w- M- w M+ w+ + // + // Now any number in [M-, M+] (bounds included) will round to w when input, + // regardless of how the input rounding algorithm breaks ties. + // + // And digit_gen generates the shortest possible such number in [M-, M+]. + // Note that this does not mean that Grisu2 always generates the shortest + // possible number in the interval (m-, m+). + const diyfp M_minus(w_minus.f + 1, w_minus.e); + const diyfp M_plus (w_plus.f - 1, w_plus.e ); + + decimal_exponent = -cached.k; // = -(-k) = k + + grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus); +} + +/*! +v = buf * 10^decimal_exponent +len is the length of the buffer (number of decimal digits) +The buffer must be large enough, i.e. >= max_digits10. +*/ +template +JSON_HEDLEY_NON_NULL(1) +void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value) +{ + static_assert(diyfp::kPrecision >= std::numeric_limits::digits + 3, + "internal error: not enough precision"); + + JSON_ASSERT(std::isfinite(value)); + JSON_ASSERT(value > 0); + + // If the neighbors (and boundaries) of 'value' are always computed for double-precision + // numbers, all float's can be recovered using strtod (and strtof). However, the resulting + // decimal representations are not exactly "short". + // + // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars) + // says "value is converted to a string as if by std::sprintf in the default ("C") locale" + // and since sprintf promotes float's to double's, I think this is exactly what 'std::to_chars' + // does. + // On the other hand, the documentation for 'std::to_chars' requires that "parsing the + // representation using the corresponding std::from_chars function recovers value exactly". That + // indicates that single precision floating-point numbers should be recovered using + // 'std::strtof'. + // + // NB: If the neighbors are computed for single-precision numbers, there is a single float + // (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision + // value is off by 1 ulp. +#if 0 + const boundaries w = compute_boundaries(static_cast(value)); +#else + const boundaries w = compute_boundaries(value); +#endif + + grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus); +} + +/*! +@brief appends a decimal representation of e to buf +@return a pointer to the element following the exponent. +@pre -1000 < e < 1000 +*/ +JSON_HEDLEY_NON_NULL(1) +JSON_HEDLEY_RETURNS_NON_NULL +inline char* append_exponent(char* buf, int e) +{ + JSON_ASSERT(e > -1000); + JSON_ASSERT(e < 1000); + + if (e < 0) + { + e = -e; + *buf++ = '-'; + } + else + { + *buf++ = '+'; + } + + auto k = static_cast(e); + if (k < 10) + { + // Always print at least two digits in the exponent. + // This is for compatibility with printf("%g"). + *buf++ = '0'; + *buf++ = static_cast('0' + k); + } + else if (k < 100) + { + *buf++ = static_cast('0' + k / 10); + k %= 10; + *buf++ = static_cast('0' + k); + } + else + { + *buf++ = static_cast('0' + k / 100); + k %= 100; + *buf++ = static_cast('0' + k / 10); + k %= 10; + *buf++ = static_cast('0' + k); + } + + return buf; +} + +/*! +@brief prettify v = buf * 10^decimal_exponent + +If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point +notation. Otherwise it will be printed in exponential notation. + +@pre min_exp < 0 +@pre max_exp > 0 +*/ +JSON_HEDLEY_NON_NULL(1) +JSON_HEDLEY_RETURNS_NON_NULL +inline char* format_buffer(char* buf, int len, int decimal_exponent, + int min_exp, int max_exp) +{ + JSON_ASSERT(min_exp < 0); + JSON_ASSERT(max_exp > 0); + + const int k = len; + const int n = len + decimal_exponent; + + // v = buf * 10^(n-k) + // k is the length of the buffer (number of decimal digits) + // n is the position of the decimal point relative to the start of the buffer. + + if (k <= n && n <= max_exp) + { + // digits[000] + // len <= max_exp + 2 + + std::memset(buf + k, '0', static_cast(n) - static_cast(k)); + // Make it look like a floating-point number (#362, #378) + buf[n + 0] = '.'; + buf[n + 1] = '0'; + return buf + (static_cast(n) + 2); + } + + if (0 < n && n <= max_exp) + { + // dig.its + // len <= max_digits10 + 1 + + JSON_ASSERT(k > n); + + std::memmove(buf + (static_cast(n) + 1), buf + n, static_cast(k) - static_cast(n)); + buf[n] = '.'; + return buf + (static_cast(k) + 1U); + } + + if (min_exp < n && n <= 0) + { + // 0.[000]digits + // len <= 2 + (-min_exp - 1) + max_digits10 + + std::memmove(buf + (2 + static_cast(-n)), buf, static_cast(k)); + buf[0] = '0'; + buf[1] = '.'; + std::memset(buf + 2, '0', static_cast(-n)); + return buf + (2U + static_cast(-n) + static_cast(k)); + } + + if (k == 1) + { + // dE+123 + // len <= 1 + 5 + + buf += 1; + } + else + { + // d.igitsE+123 + // len <= max_digits10 + 1 + 5 + + std::memmove(buf + 2, buf + 1, static_cast(k) - 1); + buf[1] = '.'; + buf += 1 + static_cast(k); + } + + *buf++ = 'e'; + return append_exponent(buf, n - 1); +} + +} // namespace dtoa_impl + +/*! +@brief generates a decimal representation of the floating-point number value in [first, last). + +The format of the resulting decimal representation is similar to printf's %g +format. Returns an iterator pointing past-the-end of the decimal representation. + +@note The input number must be finite, i.e. NaN's and Inf's are not supported. +@note The buffer must be large enough. +@note The result is NOT null-terminated. +*/ +template +JSON_HEDLEY_NON_NULL(1, 2) +JSON_HEDLEY_RETURNS_NON_NULL +char* to_chars(char* first, const char* last, FloatType value) +{ + static_cast(last); // maybe unused - fix warning + JSON_ASSERT(std::isfinite(value)); + + // Use signbit(value) instead of (value < 0) since signbit works for -0. + if (std::signbit(value)) + { + value = -value; + *first++ = '-'; + } + + if (value == 0) // +-0 + { + *first++ = '0'; + // Make it look like a floating-point number (#362, #378) + *first++ = '.'; + *first++ = '0'; + return first; + } + + JSON_ASSERT(last - first >= std::numeric_limits::max_digits10); + + // Compute v = buffer * 10^decimal_exponent. + // The decimal digits are stored in the buffer, which needs to be interpreted + // as an unsigned decimal integer. + // len is the length of the buffer, i.e. the number of decimal digits. + int len = 0; + int decimal_exponent = 0; + dtoa_impl::grisu2(first, len, decimal_exponent, value); + + JSON_ASSERT(len <= std::numeric_limits::max_digits10); + + // Format the buffer like printf("%.*g", prec, value) + constexpr int kMinExp = -4; + // Use digits10 here to increase compatibility with version 2. + constexpr int kMaxExp = std::numeric_limits::digits10; + + JSON_ASSERT(last - first >= kMaxExp + 2); + JSON_ASSERT(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits::max_digits10); + JSON_ASSERT(last - first >= std::numeric_limits::max_digits10 + 6); + + return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp); +} + +} // namespace detail +} // namespace nlohmann + +// #include + +// #include + +// #include + +// #include + +// #include + +// #include + + +namespace nlohmann +{ +namespace detail +{ +/////////////////// +// serialization // +/////////////////// + +/// how to treat decoding errors +enum class error_handler_t +{ + strict, ///< throw a type_error exception in case of invalid UTF-8 + replace, ///< replace invalid UTF-8 sequences with U+FFFD + ignore ///< ignore invalid UTF-8 sequences +}; + +template +class serializer +{ + using string_t = typename BasicJsonType::string_t; + using number_float_t = typename BasicJsonType::number_float_t; + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using binary_char_t = typename BasicJsonType::binary_t::value_type; + static constexpr std::uint8_t UTF8_ACCEPT = 0; + static constexpr std::uint8_t UTF8_REJECT = 1; + + public: + /*! + @param[in] s output stream to serialize to + @param[in] ichar indentation character to use + @param[in] error_handler_ how to react on decoding errors + */ + serializer(output_adapter_t s, const char ichar, + error_handler_t error_handler_ = error_handler_t::strict) + : o(std::move(s)) + , loc(std::localeconv()) + , thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits::to_char_type(* (loc->thousands_sep))) + , decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits::to_char_type(* (loc->decimal_point))) + , indent_char(ichar) + , indent_string(512, indent_char) + , error_handler(error_handler_) + {} + + // delete because of pointer members + serializer(const serializer&) = delete; + serializer& operator=(const serializer&) = delete; + serializer(serializer&&) = delete; + serializer& operator=(serializer&&) = delete; + ~serializer() = default; + + /*! + @brief internal implementation of the serialization function + + This function is called by the public member function dump and organizes + the serialization internally. The indentation level is propagated as + additional parameter. In case of arrays and objects, the function is + called recursively. + + - strings and object keys are escaped using `escape_string()` + - integer numbers are converted implicitly via `operator<<` + - floating-point numbers are converted to a string using `"%g"` format + - binary values are serialized as objects containing the subtype and the + byte array + + @param[in] val value to serialize + @param[in] pretty_print whether the output shall be pretty-printed + @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters + in the output are escaped with `\uXXXX` sequences, and the result consists + of ASCII characters only. + @param[in] indent_step the indent level + @param[in] current_indent the current indent level (only used internally) + */ + void dump(const BasicJsonType& val, + const bool pretty_print, + const bool ensure_ascii, + const unsigned int indent_step, + const unsigned int current_indent = 0) + { + switch (val.m_type) + { + case value_t::object: + { + if (val.m_value.object->empty()) + { + o->write_characters("{}", 2); + return; + } + + if (pretty_print) + { + o->write_characters("{\n", 2); + + // variable to hold indentation for recursive calls + const auto new_indent = current_indent + indent_step; + if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) + { + indent_string.resize(indent_string.size() * 2, ' '); + } + + // first n-1 elements + auto i = val.m_value.object->cbegin(); + for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i) + { + o->write_characters(indent_string.c_str(), new_indent); + o->write_character('\"'); + dump_escaped(i->first, ensure_ascii); + o->write_characters("\": ", 3); + dump(i->second, true, ensure_ascii, indent_step, new_indent); + o->write_characters(",\n", 2); + } + + // last element + JSON_ASSERT(i != val.m_value.object->cend()); + JSON_ASSERT(std::next(i) == val.m_value.object->cend()); + o->write_characters(indent_string.c_str(), new_indent); + o->write_character('\"'); + dump_escaped(i->first, ensure_ascii); + o->write_characters("\": ", 3); + dump(i->second, true, ensure_ascii, indent_step, new_indent); + + o->write_character('\n'); + o->write_characters(indent_string.c_str(), current_indent); + o->write_character('}'); + } + else + { + o->write_character('{'); + + // first n-1 elements + auto i = val.m_value.object->cbegin(); + for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i) + { + o->write_character('\"'); + dump_escaped(i->first, ensure_ascii); + o->write_characters("\":", 2); + dump(i->second, false, ensure_ascii, indent_step, current_indent); + o->write_character(','); + } + + // last element + JSON_ASSERT(i != val.m_value.object->cend()); + JSON_ASSERT(std::next(i) == val.m_value.object->cend()); + o->write_character('\"'); + dump_escaped(i->first, ensure_ascii); + o->write_characters("\":", 2); + dump(i->second, false, ensure_ascii, indent_step, current_indent); + + o->write_character('}'); + } + + return; + } + + case value_t::array: + { + if (val.m_value.array->empty()) + { + o->write_characters("[]", 2); + return; + } + + if (pretty_print) + { + o->write_characters("[\n", 2); + + // variable to hold indentation for recursive calls + const auto new_indent = current_indent + indent_step; + if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) + { + indent_string.resize(indent_string.size() * 2, ' '); + } + + // first n-1 elements + for (auto i = val.m_value.array->cbegin(); + i != val.m_value.array->cend() - 1; ++i) + { + o->write_characters(indent_string.c_str(), new_indent); + dump(*i, true, ensure_ascii, indent_step, new_indent); + o->write_characters(",\n", 2); + } + + // last element + JSON_ASSERT(!val.m_value.array->empty()); + o->write_characters(indent_string.c_str(), new_indent); + dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent); + + o->write_character('\n'); + o->write_characters(indent_string.c_str(), current_indent); + o->write_character(']'); + } + else + { + o->write_character('['); + + // first n-1 elements + for (auto i = val.m_value.array->cbegin(); + i != val.m_value.array->cend() - 1; ++i) + { + dump(*i, false, ensure_ascii, indent_step, current_indent); + o->write_character(','); + } + + // last element + JSON_ASSERT(!val.m_value.array->empty()); + dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent); + + o->write_character(']'); + } + + return; + } + + case value_t::string: + { + o->write_character('\"'); + dump_escaped(*val.m_value.string, ensure_ascii); + o->write_character('\"'); + return; + } + + case value_t::binary: + { + if (pretty_print) + { + o->write_characters("{\n", 2); + + // variable to hold indentation for recursive calls + const auto new_indent = current_indent + indent_step; + if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) + { + indent_string.resize(indent_string.size() * 2, ' '); + } + + o->write_characters(indent_string.c_str(), new_indent); + + o->write_characters("\"bytes\": [", 10); + + if (!val.m_value.binary->empty()) + { + for (auto i = val.m_value.binary->cbegin(); + i != val.m_value.binary->cend() - 1; ++i) + { + dump_integer(*i); + o->write_characters(", ", 2); + } + dump_integer(val.m_value.binary->back()); + } + + o->write_characters("],\n", 3); + o->write_characters(indent_string.c_str(), new_indent); + + o->write_characters("\"subtype\": ", 11); + if (val.m_value.binary->has_subtype()) + { + dump_integer(val.m_value.binary->subtype()); + } + else + { + o->write_characters("null", 4); + } + o->write_character('\n'); + o->write_characters(indent_string.c_str(), current_indent); + o->write_character('}'); + } + else + { + o->write_characters("{\"bytes\":[", 10); + + if (!val.m_value.binary->empty()) + { + for (auto i = val.m_value.binary->cbegin(); + i != val.m_value.binary->cend() - 1; ++i) + { + dump_integer(*i); + o->write_character(','); + } + dump_integer(val.m_value.binary->back()); + } + + o->write_characters("],\"subtype\":", 12); + if (val.m_value.binary->has_subtype()) + { + dump_integer(val.m_value.binary->subtype()); + o->write_character('}'); + } + else + { + o->write_characters("null}", 5); + } + } + return; + } + + case value_t::boolean: + { + if (val.m_value.boolean) + { + o->write_characters("true", 4); + } + else + { + o->write_characters("false", 5); + } + return; + } + + case value_t::number_integer: + { + dump_integer(val.m_value.number_integer); + return; + } + + case value_t::number_unsigned: + { + dump_integer(val.m_value.number_unsigned); + return; + } + + case value_t::number_float: + { + dump_float(val.m_value.number_float); + return; + } + + case value_t::discarded: + { + o->write_characters("", 11); + return; + } + + case value_t::null: + { + o->write_characters("null", 4); + return; + } + + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // LCOV_EXCL_LINE + } + } + + private: + /*! + @brief dump escaped string + + Escape a string by replacing certain special characters by a sequence of an + escape character (backslash) and another character and other control + characters by a sequence of "\u" followed by a four-digit hex + representation. The escaped string is written to output stream @a o. + + @param[in] s the string to escape + @param[in] ensure_ascii whether to escape non-ASCII characters with + \uXXXX sequences + + @complexity Linear in the length of string @a s. + */ + void dump_escaped(const string_t& s, const bool ensure_ascii) + { + std::uint32_t codepoint; + std::uint8_t state = UTF8_ACCEPT; + std::size_t bytes = 0; // number of bytes written to string_buffer + + // number of bytes written at the point of the last valid byte + std::size_t bytes_after_last_accept = 0; + std::size_t undumped_chars = 0; + + for (std::size_t i = 0; i < s.size(); ++i) + { + const auto byte = static_cast(s[i]); + + switch (decode(state, codepoint, byte)) + { + case UTF8_ACCEPT: // decode found a new code point + { + switch (codepoint) + { + case 0x08: // backspace + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'b'; + break; + } + + case 0x09: // horizontal tab + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 't'; + break; + } + + case 0x0A: // newline + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'n'; + break; + } + + case 0x0C: // formfeed + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'f'; + break; + } + + case 0x0D: // carriage return + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'r'; + break; + } + + case 0x22: // quotation mark + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = '\"'; + break; + } + + case 0x5C: // reverse solidus + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = '\\'; + break; + } + + default: + { + // escape control characters (0x00..0x1F) or, if + // ensure_ascii parameter is used, non-ASCII characters + if ((codepoint <= 0x1F) || (ensure_ascii && (codepoint >= 0x7F))) + { + if (codepoint <= 0xFFFF) + { + (std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x", + static_cast(codepoint)); + bytes += 6; + } + else + { + (std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x", + static_cast(0xD7C0u + (codepoint >> 10u)), + static_cast(0xDC00u + (codepoint & 0x3FFu))); + bytes += 12; + } + } + else + { + // copy byte to buffer (all previous bytes + // been copied have in default case above) + string_buffer[bytes++] = s[i]; + } + break; + } + } + + // write buffer and reset index; there must be 13 bytes + // left, as this is the maximal number of bytes to be + // written ("\uxxxx\uxxxx\0") for one code point + if (string_buffer.size() - bytes < 13) + { + o->write_characters(string_buffer.data(), bytes); + bytes = 0; + } + + // remember the byte position of this accept + bytes_after_last_accept = bytes; + undumped_chars = 0; + break; + } + + case UTF8_REJECT: // decode found invalid UTF-8 byte + { + switch (error_handler) + { + case error_handler_t::strict: + { + std::string sn(3, '\0'); + (std::snprintf)(&sn[0], sn.size(), "%.2X", byte); + JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn)); + } + + case error_handler_t::ignore: + case error_handler_t::replace: + { + // in case we saw this character the first time, we + // would like to read it again, because the byte + // may be OK for itself, but just not OK for the + // previous sequence + if (undumped_chars > 0) + { + --i; + } + + // reset length buffer to the last accepted index; + // thus removing/ignoring the invalid characters + bytes = bytes_after_last_accept; + + if (error_handler == error_handler_t::replace) + { + // add a replacement character + if (ensure_ascii) + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'u'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'd'; + } + else + { + string_buffer[bytes++] = detail::binary_writer::to_char_type('\xEF'); + string_buffer[bytes++] = detail::binary_writer::to_char_type('\xBF'); + string_buffer[bytes++] = detail::binary_writer::to_char_type('\xBD'); + } + + // write buffer and reset index; there must be 13 bytes + // left, as this is the maximal number of bytes to be + // written ("\uxxxx\uxxxx\0") for one code point + if (string_buffer.size() - bytes < 13) + { + o->write_characters(string_buffer.data(), bytes); + bytes = 0; + } + + bytes_after_last_accept = bytes; + } + + undumped_chars = 0; + + // continue processing the string + state = UTF8_ACCEPT; + break; + } + + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // LCOV_EXCL_LINE + } + break; + } + + default: // decode found yet incomplete multi-byte code point + { + if (!ensure_ascii) + { + // code point will not be escaped - copy byte to buffer + string_buffer[bytes++] = s[i]; + } + ++undumped_chars; + break; + } + } + } + + // we finished processing the string + if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT)) + { + // write buffer + if (bytes > 0) + { + o->write_characters(string_buffer.data(), bytes); + } + } + else + { + // we finish reading, but do not accept: string was incomplete + switch (error_handler) + { + case error_handler_t::strict: + { + std::string sn(3, '\0'); + (std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast(s.back())); + JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn)); + } + + case error_handler_t::ignore: + { + // write all accepted bytes + o->write_characters(string_buffer.data(), bytes_after_last_accept); + break; + } + + case error_handler_t::replace: + { + // write all accepted bytes + o->write_characters(string_buffer.data(), bytes_after_last_accept); + // add a replacement character + if (ensure_ascii) + { + o->write_characters("\\ufffd", 6); + } + else + { + o->write_characters("\xEF\xBF\xBD", 3); + } + break; + } + + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // LCOV_EXCL_LINE + } + } + } + + /*! + @brief count digits + + Count the number of decimal (base 10) digits for an input unsigned integer. + + @param[in] x unsigned integer number to count its digits + @return number of decimal digits + */ + inline unsigned int count_digits(number_unsigned_t x) noexcept + { + unsigned int n_digits = 1; + for (;;) + { + if (x < 10) + { + return n_digits; + } + if (x < 100) + { + return n_digits + 1; + } + if (x < 1000) + { + return n_digits + 2; + } + if (x < 10000) + { + return n_digits + 3; + } + x = x / 10000u; + n_digits += 4; + } + } + + /*! + @brief dump an integer + + Dump a given integer to output stream @a o. Works internally with + @a number_buffer. + + @param[in] x integer number (signed or unsigned) to dump + @tparam NumberType either @a number_integer_t or @a number_unsigned_t + */ + template < typename NumberType, detail::enable_if_t < + std::is_same::value || + std::is_same::value || + std::is_same::value, + int > = 0 > + void dump_integer(NumberType x) + { + static constexpr std::array, 100> digits_to_99 + { + { + {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}}, + {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}}, + {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}}, + {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}}, + {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}}, + {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}}, + {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}}, + {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}}, + {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}}, + {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}}, + } + }; + + // special case for "0" + if (x == 0) + { + o->write_character('0'); + return; + } + + // use a pointer to fill the buffer + auto buffer_ptr = number_buffer.begin(); + + const bool is_negative = std::is_same::value && !(x >= 0); // see issue #755 + number_unsigned_t abs_value; + + unsigned int n_chars; + + if (is_negative) + { + *buffer_ptr = '-'; + abs_value = remove_sign(static_cast(x)); + + // account one more byte for the minus sign + n_chars = 1 + count_digits(abs_value); + } + else + { + abs_value = static_cast(x); + n_chars = count_digits(abs_value); + } + + // spare 1 byte for '\0' + JSON_ASSERT(n_chars < number_buffer.size() - 1); + + // jump to the end to generate the string from backward + // so we later avoid reversing the result + buffer_ptr += n_chars; + + // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu + // See: https://www.youtube.com/watch?v=o4-CwDo2zpg + while (abs_value >= 100) + { + const auto digits_index = static_cast((abs_value % 100)); + abs_value /= 100; + *(--buffer_ptr) = digits_to_99[digits_index][1]; + *(--buffer_ptr) = digits_to_99[digits_index][0]; + } + + if (abs_value >= 10) + { + const auto digits_index = static_cast(abs_value); + *(--buffer_ptr) = digits_to_99[digits_index][1]; + *(--buffer_ptr) = digits_to_99[digits_index][0]; + } + else + { + *(--buffer_ptr) = static_cast('0' + abs_value); + } + + o->write_characters(number_buffer.data(), n_chars); + } + + /*! + @brief dump a floating-point number + + Dump a given floating-point number to output stream @a o. Works internally + with @a number_buffer. + + @param[in] x floating-point number to dump + */ + void dump_float(number_float_t x) + { + // NaN / inf + if (!std::isfinite(x)) + { + o->write_characters("null", 4); + return; + } + + // If number_float_t is an IEEE-754 single or double precision number, + // use the Grisu2 algorithm to produce short numbers which are + // guaranteed to round-trip, using strtof and strtod, resp. + // + // NB: The test below works if == . + static constexpr bool is_ieee_single_or_double + = (std::numeric_limits::is_iec559 && std::numeric_limits::digits == 24 && std::numeric_limits::max_exponent == 128) || + (std::numeric_limits::is_iec559 && std::numeric_limits::digits == 53 && std::numeric_limits::max_exponent == 1024); + + dump_float(x, std::integral_constant()); + } + + void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/) + { + char* begin = number_buffer.data(); + char* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x); + + o->write_characters(begin, static_cast(end - begin)); + } + + void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/) + { + // get number of digits for a float -> text -> float round-trip + static constexpr auto d = std::numeric_limits::max_digits10; + + // the actual conversion + std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x); + + // negative value indicates an error + JSON_ASSERT(len > 0); + // check if buffer was large enough + JSON_ASSERT(static_cast(len) < number_buffer.size()); + + // erase thousands separator + if (thousands_sep != '\0') + { + const auto end = std::remove(number_buffer.begin(), + number_buffer.begin() + len, thousands_sep); + std::fill(end, number_buffer.end(), '\0'); + JSON_ASSERT((end - number_buffer.begin()) <= len); + len = (end - number_buffer.begin()); + } + + // convert decimal point to '.' + if (decimal_point != '\0' && decimal_point != '.') + { + const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point); + if (dec_pos != number_buffer.end()) + { + *dec_pos = '.'; + } + } + + o->write_characters(number_buffer.data(), static_cast(len)); + + // determine if need to append ".0" + const bool value_is_int_like = + std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1, + [](char c) + { + return c == '.' || c == 'e'; + }); + + if (value_is_int_like) + { + o->write_characters(".0", 2); + } + } + + /*! + @brief check whether a string is UTF-8 encoded + + The function checks each byte of a string whether it is UTF-8 encoded. The + result of the check is stored in the @a state parameter. The function must + be called initially with state 0 (accept). State 1 means the string must + be rejected, because the current byte is not allowed. If the string is + completely processed, but the state is non-zero, the string ended + prematurely; that is, the last byte indicated more bytes should have + followed. + + @param[in,out] state the state of the decoding + @param[in,out] codep codepoint (valid only if resulting state is UTF8_ACCEPT) + @param[in] byte next byte to decode + @return new state + + @note The function has been edited: a std::array is used. + + @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann + @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ + */ + static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept + { + static const std::array utf8d = + { + { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF + 8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF + 0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF + 0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF + 0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2 + 1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4 + 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6 + 1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8 + } + }; + + const std::uint8_t type = utf8d[byte]; + + codep = (state != UTF8_ACCEPT) + ? (byte & 0x3fu) | (codep << 6u) + : (0xFFu >> type) & (byte); + + std::size_t index = 256u + static_cast(state) * 16u + static_cast(type); + JSON_ASSERT(index < 400); + state = utf8d[index]; + return state; + } + + /* + * Overload to make the compiler happy while it is instantiating + * dump_integer for number_unsigned_t. + * Must never be called. + */ + number_unsigned_t remove_sign(number_unsigned_t x) + { + JSON_ASSERT(false); // LCOV_EXCL_LINE + return x; // LCOV_EXCL_LINE + } + + /* + * Helper function for dump_integer + * + * This function takes a negative signed integer and returns its absolute + * value as unsigned integer. The plus/minus shuffling is necessary as we can + * not directly remove the sign of an arbitrary signed integer as the + * absolute values of INT_MIN and INT_MAX are usually not the same. See + * #1708 for details. + */ + inline number_unsigned_t remove_sign(number_integer_t x) noexcept + { + JSON_ASSERT(x < 0 && x < (std::numeric_limits::max)()); + return static_cast(-(x + 1)) + 1; + } + + private: + /// the output of the serializer + output_adapter_t o = nullptr; + + /// a (hopefully) large enough character buffer + std::array number_buffer{{}}; + + /// the locale + const std::lconv* loc = nullptr; + /// the locale's thousand separator character + const char thousands_sep = '\0'; + /// the locale's decimal point character + const char decimal_point = '\0'; + + /// string buffer + std::array string_buffer{{}}; + + /// the indentation character + const char indent_char; + /// the indentation string + string_t indent_string; + + /// error_handler how to react on decoding errors + const error_handler_t error_handler; +}; +} // namespace detail +} // namespace nlohmann + +// #include + +// #include + +// #include + + +#include // less +#include // allocator +#include // pair +#include // vector + +namespace nlohmann +{ + +/// ordered_map: a minimal map-like container that preserves insertion order +/// for use within nlohmann::basic_json +template , + class Allocator = std::allocator>> + struct ordered_map : std::vector, Allocator> +{ + using key_type = Key; + using mapped_type = T; + using Container = std::vector, Allocator>; + using typename Container::iterator; + using typename Container::const_iterator; + using typename Container::size_type; + using typename Container::value_type; + + // Explicit constructors instead of `using Container::Container` + // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4) + ordered_map(const Allocator& alloc = Allocator()) : Container{alloc} {} + template + ordered_map(It first, It last, const Allocator& alloc = Allocator()) + : Container{first, last, alloc} {} + ordered_map(std::initializer_list init, const Allocator& alloc = Allocator() ) + : Container{init, alloc} {} + + std::pair emplace(const key_type& key, T&& t) + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == key) + { + return {it, false}; + } + } + Container::emplace_back(key, t); + return {--this->end(), true}; + } + + T& operator[](const Key& key) + { + return emplace(key, T{}).first->second; + } + + const T& operator[](const Key& key) const + { + return at(key); + } + + T& at(const Key& key) + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == key) + { + return it->second; + } + } + + throw std::out_of_range("key not found"); + } + + const T& at(const Key& key) const + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == key) + { + return it->second; + } + } + + throw std::out_of_range("key not found"); + } + + size_type erase(const Key& key) + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == key) + { + // Since we cannot move const Keys, re-construct them in place + for (auto next = it; ++next != this->end(); ++it) + { + it->~value_type(); // Destroy but keep allocation + new (&*it) value_type{std::move(*next)}; + } + Container::pop_back(); + return 1; + } + } + return 0; + } + + iterator erase(iterator pos) + { + auto it = pos; + + // Since we cannot move const Keys, re-construct them in place + for (auto next = it; ++next != this->end(); ++it) + { + it->~value_type(); // Destroy but keep allocation + new (&*it) value_type{std::move(*next)}; + } + Container::pop_back(); + return pos; + } + + size_type count(const Key& key) const + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == key) + { + return 1; + } + } + return 0; + } + + iterator find(const Key& key) + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == key) + { + return it; + } + } + return Container::end(); + } + + const_iterator find(const Key& key) const + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == key) + { + return it; + } + } + return Container::end(); + } + + std::pair insert( value_type&& value ) + { + return emplace(value.first, std::move(value.second)); + } + + std::pair insert( const value_type& value ) + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == value.first) + { + return {it, false}; + } + } + Container::push_back(value); + return {--this->end(), true}; + } +}; + +} // namespace nlohmann + + +/*! +@brief namespace for Niels Lohmann +@see https://github.com/nlohmann +@since version 1.0.0 +*/ +namespace nlohmann +{ + +/*! +@brief a class to store JSON values + +@tparam ObjectType type for JSON objects (`std::map` by default; will be used +in @ref object_t) +@tparam ArrayType type for JSON arrays (`std::vector` by default; will be used +in @ref array_t) +@tparam StringType type for JSON strings and object keys (`std::string` by +default; will be used in @ref string_t) +@tparam BooleanType type for JSON booleans (`bool` by default; will be used +in @ref boolean_t) +@tparam NumberIntegerType type for JSON integer numbers (`int64_t` by +default; will be used in @ref number_integer_t) +@tparam NumberUnsignedType type for JSON unsigned integer numbers (@c +`uint64_t` by default; will be used in @ref number_unsigned_t) +@tparam NumberFloatType type for JSON floating-point numbers (`double` by +default; will be used in @ref number_float_t) +@tparam BinaryType type for packed binary data for compatibility with binary +serialization formats (`std::vector` by default; will be used in +@ref binary_t) +@tparam AllocatorType type of the allocator to use (`std::allocator` by +default) +@tparam JSONSerializer the serializer to resolve internal calls to `to_json()` +and `from_json()` (@ref adl_serializer by default) + +@requirement The class satisfies the following concept requirements: +- Basic + - [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible): + JSON values can be default constructed. The result will be a JSON null + value. + - [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible): + A JSON value can be constructed from an rvalue argument. + - [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible): + A JSON value can be copy-constructed from an lvalue expression. + - [MoveAssignable](https://en.cppreference.com/w/cpp/named_req/MoveAssignable): + A JSON value van be assigned from an rvalue argument. + - [CopyAssignable](https://en.cppreference.com/w/cpp/named_req/CopyAssignable): + A JSON value can be copy-assigned from an lvalue expression. + - [Destructible](https://en.cppreference.com/w/cpp/named_req/Destructible): + JSON values can be destructed. +- Layout + - [StandardLayoutType](https://en.cppreference.com/w/cpp/named_req/StandardLayoutType): + JSON values have + [standard layout](https://en.cppreference.com/w/cpp/language/data_members#Standard_layout): + All non-static data members are private and standard layout types, the + class has no virtual functions or (virtual) base classes. +- Library-wide + - [EqualityComparable](https://en.cppreference.com/w/cpp/named_req/EqualityComparable): + JSON values can be compared with `==`, see @ref + operator==(const_reference,const_reference). + - [LessThanComparable](https://en.cppreference.com/w/cpp/named_req/LessThanComparable): + JSON values can be compared with `<`, see @ref + operator<(const_reference,const_reference). + - [Swappable](https://en.cppreference.com/w/cpp/named_req/Swappable): + Any JSON lvalue or rvalue of can be swapped with any lvalue or rvalue of + other compatible types, using unqualified function call @ref swap(). + - [NullablePointer](https://en.cppreference.com/w/cpp/named_req/NullablePointer): + JSON values can be compared against `std::nullptr_t` objects which are used + to model the `null` value. +- Container + - [Container](https://en.cppreference.com/w/cpp/named_req/Container): + JSON values can be used like STL containers and provide iterator access. + - [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer); + JSON values can be used like STL containers and provide reverse iterator + access. + +@invariant The member variables @a m_value and @a m_type have the following +relationship: +- If `m_type == value_t::object`, then `m_value.object != nullptr`. +- If `m_type == value_t::array`, then `m_value.array != nullptr`. +- If `m_type == value_t::string`, then `m_value.string != nullptr`. +The invariants are checked by member function assert_invariant(). + +@internal +@note ObjectType trick from https://stackoverflow.com/a/9860911 +@endinternal + +@see [RFC 7159: The JavaScript Object Notation (JSON) Data Interchange +Format](http://rfc7159.net/rfc7159) + +@since version 1.0.0 + +@nosubgrouping +*/ +NLOHMANN_BASIC_JSON_TPL_DECLARATION +class basic_json +{ + private: + template friend struct detail::external_constructor; + friend ::nlohmann::json_pointer; + + template + friend class ::nlohmann::detail::parser; + friend ::nlohmann::detail::serializer; + template + friend class ::nlohmann::detail::iter_impl; + template + friend class ::nlohmann::detail::binary_writer; + template + friend class ::nlohmann::detail::binary_reader; + template + friend class ::nlohmann::detail::json_sax_dom_parser; + template + friend class ::nlohmann::detail::json_sax_dom_callback_parser; + + /// workaround type for MSVC + using basic_json_t = NLOHMANN_BASIC_JSON_TPL; + + // convenience aliases for types residing in namespace detail; + using lexer = ::nlohmann::detail::lexer_base; + + template + static ::nlohmann::detail::parser parser( + InputAdapterType adapter, + detail::parser_callback_tcb = nullptr, + const bool allow_exceptions = true, + const bool ignore_comments = false + ) + { + return ::nlohmann::detail::parser(std::move(adapter), + std::move(cb), allow_exceptions, ignore_comments); + } + + using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t; + template + using internal_iterator = ::nlohmann::detail::internal_iterator; + template + using iter_impl = ::nlohmann::detail::iter_impl; + template + using iteration_proxy = ::nlohmann::detail::iteration_proxy; + template using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator; + + template + using output_adapter_t = ::nlohmann::detail::output_adapter_t; + + template + using binary_reader = ::nlohmann::detail::binary_reader; + template using binary_writer = ::nlohmann::detail::binary_writer; + + using serializer = ::nlohmann::detail::serializer; + + public: + using value_t = detail::value_t; + /// JSON Pointer, see @ref nlohmann::json_pointer + using json_pointer = ::nlohmann::json_pointer; + template + using json_serializer = JSONSerializer; + /// how to treat decoding errors + using error_handler_t = detail::error_handler_t; + /// how to treat CBOR tags + using cbor_tag_handler_t = detail::cbor_tag_handler_t; + /// helper type for initializer lists of basic_json values + using initializer_list_t = std::initializer_list>; + + using input_format_t = detail::input_format_t; + /// SAX interface type, see @ref nlohmann::json_sax + using json_sax_t = json_sax; + + //////////////// + // exceptions // + //////////////// + + /// @name exceptions + /// Classes to implement user-defined exceptions. + /// @{ + + /// @copydoc detail::exception + using exception = detail::exception; + /// @copydoc detail::parse_error + using parse_error = detail::parse_error; + /// @copydoc detail::invalid_iterator + using invalid_iterator = detail::invalid_iterator; + /// @copydoc detail::type_error + using type_error = detail::type_error; + /// @copydoc detail::out_of_range + using out_of_range = detail::out_of_range; + /// @copydoc detail::other_error + using other_error = detail::other_error; + + /// @} + + + ///////////////////// + // container types // + ///////////////////// + + /// @name container types + /// The canonic container types to use @ref basic_json like any other STL + /// container. + /// @{ + + /// the type of elements in a basic_json container + using value_type = basic_json; + + /// the type of an element reference + using reference = value_type&; + /// the type of an element const reference + using const_reference = const value_type&; + + /// a type to represent differences between iterators + using difference_type = std::ptrdiff_t; + /// a type to represent container sizes + using size_type = std::size_t; + + /// the allocator type + using allocator_type = AllocatorType; + + /// the type of an element pointer + using pointer = typename std::allocator_traits::pointer; + /// the type of an element const pointer + using const_pointer = typename std::allocator_traits::const_pointer; + + /// an iterator for a basic_json container + using iterator = iter_impl; + /// a const iterator for a basic_json container + using const_iterator = iter_impl; + /// a reverse iterator for a basic_json container + using reverse_iterator = json_reverse_iterator; + /// a const reverse iterator for a basic_json container + using const_reverse_iterator = json_reverse_iterator; + + /// @} + + + /*! + @brief returns the allocator associated with the container + */ + static allocator_type get_allocator() + { + return allocator_type(); + } + + /*! + @brief returns version information on the library + + This function returns a JSON object with information about the library, + including the version number and information on the platform and compiler. + + @return JSON object holding version information + key | description + ----------- | --------------- + `compiler` | Information on the used compiler. It is an object with the following keys: `c++` (the used C++ standard), `family` (the compiler family; possible values are `clang`, `icc`, `gcc`, `ilecpp`, `msvc`, `pgcpp`, `sunpro`, and `unknown`), and `version` (the compiler version). + `copyright` | The copyright line for the library as string. + `name` | The name of the library as string. + `platform` | The used platform as string. Possible values are `win32`, `linux`, `apple`, `unix`, and `unknown`. + `url` | The URL of the project as string. + `version` | The version of the library. It is an object with the following keys: `major`, `minor`, and `patch` as defined by [Semantic Versioning](http://semver.org), and `string` (the version string). + + @liveexample{The following code shows an example output of the `meta()` + function.,meta} + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @complexity Constant. + + @since 2.1.0 + */ + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json meta() + { + basic_json result; + + result["copyright"] = "(C) 2013-2020 Niels Lohmann"; + result["name"] = "JSON for Modern C++"; + result["url"] = "https://github.com/nlohmann/json"; + result["version"]["string"] = + std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." + + std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." + + std::to_string(NLOHMANN_JSON_VERSION_PATCH); + result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR; + result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR; + result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH; + +#ifdef _WIN32 + result["platform"] = "win32"; +#elif defined __linux__ + result["platform"] = "linux"; +#elif defined __APPLE__ + result["platform"] = "apple"; +#elif defined __unix__ + result["platform"] = "unix"; +#else + result["platform"] = "unknown"; +#endif + +#if defined(__ICC) || defined(__INTEL_COMPILER) + result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}}; +#elif defined(__clang__) + result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}}; +#elif defined(__GNUC__) || defined(__GNUG__) + result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}}; +#elif defined(__HP_cc) || defined(__HP_aCC) + result["compiler"] = "hp" +#elif defined(__IBMCPP__) + result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}}; +#elif defined(_MSC_VER) + result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}}; +#elif defined(__PGI) + result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}}; +#elif defined(__SUNPRO_CC) + result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}}; +#else + result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}}; +#endif + +#ifdef __cplusplus + result["compiler"]["c++"] = std::to_string(__cplusplus); +#else + result["compiler"]["c++"] = "unknown"; +#endif + return result; + } + + + /////////////////////////// + // JSON value data types // + /////////////////////////// + + /// @name JSON value data types + /// The data types to store a JSON value. These types are derived from + /// the template arguments passed to class @ref basic_json. + /// @{ + +#if defined(JSON_HAS_CPP_14) + // Use transparent comparator if possible, combined with perfect forwarding + // on find() and count() calls prevents unnecessary string construction. + using object_comparator_t = std::less<>; +#else + using object_comparator_t = std::less; +#endif + + /*! + @brief a type for an object + + [RFC 7159](http://rfc7159.net/rfc7159) describes JSON objects as follows: + > An object is an unordered collection of zero or more name/value pairs, + > where a name is a string and a value is a string, number, boolean, null, + > object, or array. + + To store objects in C++, a type is defined by the template parameters + described below. + + @tparam ObjectType the container to store objects (e.g., `std::map` or + `std::unordered_map`) + @tparam StringType the type of the keys or names (e.g., `std::string`). + The comparison function `std::less` is used to order elements + inside the container. + @tparam AllocatorType the allocator to use for objects (e.g., + `std::allocator`) + + #### Default type + + With the default values for @a ObjectType (`std::map`), @a StringType + (`std::string`), and @a AllocatorType (`std::allocator`), the default + value for @a object_t is: + + @code {.cpp} + std::map< + std::string, // key_type + basic_json, // value_type + std::less, // key_compare + std::allocator> // allocator_type + > + @endcode + + #### Behavior + + The choice of @a object_t influences the behavior of the JSON class. With + the default type, objects have the following behavior: + + - When all names are unique, objects will be interoperable in the sense + that all software implementations receiving that object will agree on + the name-value mappings. + - When the names within an object are not unique, it is unspecified which + one of the values for a given key will be chosen. For instance, + `{"key": 2, "key": 1}` could be equal to either `{"key": 1}` or + `{"key": 2}`. + - Internally, name/value pairs are stored in lexicographical order of the + names. Objects will also be serialized (see @ref dump) in this order. + For instance, `{"b": 1, "a": 2}` and `{"a": 2, "b": 1}` will be stored + and serialized as `{"a": 2, "b": 1}`. + - When comparing objects, the order of the name/value pairs is irrelevant. + This makes objects interoperable in the sense that they will not be + affected by these differences. For instance, `{"b": 1, "a": 2}` and + `{"a": 2, "b": 1}` will be treated as equal. + + #### Limits + + [RFC 7159](http://rfc7159.net/rfc7159) specifies: + > An implementation may set limits on the maximum depth of nesting. + + In this class, the object's limit of nesting is not explicitly constrained. + However, a maximum depth of nesting may be introduced by the compiler or + runtime environment. A theoretical limit can be queried by calling the + @ref max_size function of a JSON object. + + #### Storage + + Objects are stored as pointers in a @ref basic_json type. That is, for any + access to object values, a pointer of type `object_t*` must be + dereferenced. + + @sa @ref array_t -- type for an array value + + @since version 1.0.0 + + @note The order name/value pairs are added to the object is *not* + preserved by the library. Therefore, iterating an object may return + name/value pairs in a different order than they were originally stored. In + fact, keys will be traversed in alphabetical order as `std::map` with + `std::less` is used by default. Please note this behavior conforms to [RFC + 7159](http://rfc7159.net/rfc7159), because any order implements the + specified "unordered" nature of JSON objects. + */ + using object_t = ObjectType>>; + + /*! + @brief a type for an array + + [RFC 7159](http://rfc7159.net/rfc7159) describes JSON arrays as follows: + > An array is an ordered sequence of zero or more values. + + To store objects in C++, a type is defined by the template parameters + explained below. + + @tparam ArrayType container type to store arrays (e.g., `std::vector` or + `std::list`) + @tparam AllocatorType allocator to use for arrays (e.g., `std::allocator`) + + #### Default type + + With the default values for @a ArrayType (`std::vector`) and @a + AllocatorType (`std::allocator`), the default value for @a array_t is: + + @code {.cpp} + std::vector< + basic_json, // value_type + std::allocator // allocator_type + > + @endcode + + #### Limits + + [RFC 7159](http://rfc7159.net/rfc7159) specifies: + > An implementation may set limits on the maximum depth of nesting. + + In this class, the array's limit of nesting is not explicitly constrained. + However, a maximum depth of nesting may be introduced by the compiler or + runtime environment. A theoretical limit can be queried by calling the + @ref max_size function of a JSON array. + + #### Storage + + Arrays are stored as pointers in a @ref basic_json type. That is, for any + access to array values, a pointer of type `array_t*` must be dereferenced. + + @sa @ref object_t -- type for an object value + + @since version 1.0.0 + */ + using array_t = ArrayType>; + + /*! + @brief a type for a string + + [RFC 7159](http://rfc7159.net/rfc7159) describes JSON strings as follows: + > A string is a sequence of zero or more Unicode characters. + + To store objects in C++, a type is defined by the template parameter + described below. Unicode values are split by the JSON class into + byte-sized characters during deserialization. + + @tparam StringType the container to store strings (e.g., `std::string`). + Note this container is used for keys/names in objects, see @ref object_t. + + #### Default type + + With the default values for @a StringType (`std::string`), the default + value for @a string_t is: + + @code {.cpp} + std::string + @endcode + + #### Encoding + + Strings are stored in UTF-8 encoding. Therefore, functions like + `std::string::size()` or `std::string::length()` return the number of + bytes in the string rather than the number of characters or glyphs. + + #### String comparison + + [RFC 7159](http://rfc7159.net/rfc7159) states: + > Software implementations are typically required to test names of object + > members for equality. Implementations that transform the textual + > representation into sequences of Unicode code units and then perform the + > comparison numerically, code unit by code unit, are interoperable in the + > sense that implementations will agree in all cases on equality or + > inequality of two strings. For example, implementations that compare + > strings with escaped characters unconverted may incorrectly find that + > `"a\\b"` and `"a\u005Cb"` are not equal. + + This implementation is interoperable as it does compare strings code unit + by code unit. + + #### Storage + + String values are stored as pointers in a @ref basic_json type. That is, + for any access to string values, a pointer of type `string_t*` must be + dereferenced. + + @since version 1.0.0 + */ + using string_t = StringType; + + /*! + @brief a type for a boolean + + [RFC 7159](http://rfc7159.net/rfc7159) implicitly describes a boolean as a + type which differentiates the two literals `true` and `false`. + + To store objects in C++, a type is defined by the template parameter @a + BooleanType which chooses the type to use. + + #### Default type + + With the default values for @a BooleanType (`bool`), the default value for + @a boolean_t is: + + @code {.cpp} + bool + @endcode + + #### Storage + + Boolean values are stored directly inside a @ref basic_json type. + + @since version 1.0.0 + */ + using boolean_t = BooleanType; + + /*! + @brief a type for a number (integer) + + [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows: + > The representation of numbers is similar to that used in most + > programming languages. A number is represented in base 10 using decimal + > digits. It contains an integer component that may be prefixed with an + > optional minus sign, which may be followed by a fraction part and/or an + > exponent part. Leading zeros are not allowed. (...) Numeric values that + > cannot be represented in the grammar below (such as Infinity and NaN) + > are not permitted. + + This description includes both integer and floating-point numbers. + However, C++ allows more precise storage if it is known whether the number + is a signed integer, an unsigned integer or a floating-point number. + Therefore, three different types, @ref number_integer_t, @ref + number_unsigned_t and @ref number_float_t are used. + + To store integer numbers in C++, a type is defined by the template + parameter @a NumberIntegerType which chooses the type to use. + + #### Default type + + With the default values for @a NumberIntegerType (`int64_t`), the default + value for @a number_integer_t is: + + @code {.cpp} + int64_t + @endcode + + #### Default behavior + + - The restrictions about leading zeros is not enforced in C++. Instead, + leading zeros in integer literals lead to an interpretation as octal + number. Internally, the value will be stored as decimal number. For + instance, the C++ integer literal `010` will be serialized to `8`. + During deserialization, leading zeros yield an error. + - Not-a-number (NaN) values will be serialized to `null`. + + #### Limits + + [RFC 7159](http://rfc7159.net/rfc7159) specifies: + > An implementation may set limits on the range and precision of numbers. + + When the default type is used, the maximal integer number that can be + stored is `9223372036854775807` (INT64_MAX) and the minimal integer number + that can be stored is `-9223372036854775808` (INT64_MIN). Integer numbers + that are out of range will yield over/underflow when used in a + constructor. During deserialization, too large or small integer numbers + will be automatically be stored as @ref number_unsigned_t or @ref + number_float_t. + + [RFC 7159](http://rfc7159.net/rfc7159) further states: + > Note that when such software is used, numbers that are integers and are + > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense + > that implementations will agree exactly on their numeric values. + + As this range is a subrange of the exactly supported range [INT64_MIN, + INT64_MAX], this class's integer type is interoperable. + + #### Storage + + Integer number values are stored directly inside a @ref basic_json type. + + @sa @ref number_float_t -- type for number values (floating-point) + + @sa @ref number_unsigned_t -- type for number values (unsigned integer) + + @since version 1.0.0 + */ + using number_integer_t = NumberIntegerType; + + /*! + @brief a type for a number (unsigned) + + [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows: + > The representation of numbers is similar to that used in most + > programming languages. A number is represented in base 10 using decimal + > digits. It contains an integer component that may be prefixed with an + > optional minus sign, which may be followed by a fraction part and/or an + > exponent part. Leading zeros are not allowed. (...) Numeric values that + > cannot be represented in the grammar below (such as Infinity and NaN) + > are not permitted. + + This description includes both integer and floating-point numbers. + However, C++ allows more precise storage if it is known whether the number + is a signed integer, an unsigned integer or a floating-point number. + Therefore, three different types, @ref number_integer_t, @ref + number_unsigned_t and @ref number_float_t are used. + + To store unsigned integer numbers in C++, a type is defined by the + template parameter @a NumberUnsignedType which chooses the type to use. + + #### Default type + + With the default values for @a NumberUnsignedType (`uint64_t`), the + default value for @a number_unsigned_t is: + + @code {.cpp} + uint64_t + @endcode + + #### Default behavior + + - The restrictions about leading zeros is not enforced in C++. Instead, + leading zeros in integer literals lead to an interpretation as octal + number. Internally, the value will be stored as decimal number. For + instance, the C++ integer literal `010` will be serialized to `8`. + During deserialization, leading zeros yield an error. + - Not-a-number (NaN) values will be serialized to `null`. + + #### Limits + + [RFC 7159](http://rfc7159.net/rfc7159) specifies: + > An implementation may set limits on the range and precision of numbers. + + When the default type is used, the maximal integer number that can be + stored is `18446744073709551615` (UINT64_MAX) and the minimal integer + number that can be stored is `0`. Integer numbers that are out of range + will yield over/underflow when used in a constructor. During + deserialization, too large or small integer numbers will be automatically + be stored as @ref number_integer_t or @ref number_float_t. + + [RFC 7159](http://rfc7159.net/rfc7159) further states: + > Note that when such software is used, numbers that are integers and are + > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense + > that implementations will agree exactly on their numeric values. + + As this range is a subrange (when considered in conjunction with the + number_integer_t type) of the exactly supported range [0, UINT64_MAX], + this class's integer type is interoperable. + + #### Storage + + Integer number values are stored directly inside a @ref basic_json type. + + @sa @ref number_float_t -- type for number values (floating-point) + @sa @ref number_integer_t -- type for number values (integer) + + @since version 2.0.0 + */ + using number_unsigned_t = NumberUnsignedType; + + /*! + @brief a type for a number (floating-point) + + [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows: + > The representation of numbers is similar to that used in most + > programming languages. A number is represented in base 10 using decimal + > digits. It contains an integer component that may be prefixed with an + > optional minus sign, which may be followed by a fraction part and/or an + > exponent part. Leading zeros are not allowed. (...) Numeric values that + > cannot be represented in the grammar below (such as Infinity and NaN) + > are not permitted. + + This description includes both integer and floating-point numbers. + However, C++ allows more precise storage if it is known whether the number + is a signed integer, an unsigned integer or a floating-point number. + Therefore, three different types, @ref number_integer_t, @ref + number_unsigned_t and @ref number_float_t are used. + + To store floating-point numbers in C++, a type is defined by the template + parameter @a NumberFloatType which chooses the type to use. + + #### Default type + + With the default values for @a NumberFloatType (`double`), the default + value for @a number_float_t is: + + @code {.cpp} + double + @endcode + + #### Default behavior + + - The restrictions about leading zeros is not enforced in C++. Instead, + leading zeros in floating-point literals will be ignored. Internally, + the value will be stored as decimal number. For instance, the C++ + floating-point literal `01.2` will be serialized to `1.2`. During + deserialization, leading zeros yield an error. + - Not-a-number (NaN) values will be serialized to `null`. + + #### Limits + + [RFC 7159](http://rfc7159.net/rfc7159) states: + > This specification allows implementations to set limits on the range and + > precision of numbers accepted. Since software that implements IEEE + > 754-2008 binary64 (double precision) numbers is generally available and + > widely used, good interoperability can be achieved by implementations + > that expect no more precision or range than these provide, in the sense + > that implementations will approximate JSON numbers within the expected + > precision. + + This implementation does exactly follow this approach, as it uses double + precision floating-point numbers. Note values smaller than + `-1.79769313486232e+308` and values greater than `1.79769313486232e+308` + will be stored as NaN internally and be serialized to `null`. + + #### Storage + + Floating-point number values are stored directly inside a @ref basic_json + type. + + @sa @ref number_integer_t -- type for number values (integer) + + @sa @ref number_unsigned_t -- type for number values (unsigned integer) + + @since version 1.0.0 + */ + using number_float_t = NumberFloatType; + + /*! + @brief a type for a packed binary type + + This type is a type designed to carry binary data that appears in various + serialized formats, such as CBOR's Major Type 2, MessagePack's bin, and + BSON's generic binary subtype. This type is NOT a part of standard JSON and + exists solely for compatibility with these binary types. As such, it is + simply defined as an ordered sequence of zero or more byte values. + + Additionally, as an implementation detail, the subtype of the binary data is + carried around as a `std::uint8_t`, which is compatible with both of the + binary data formats that use binary subtyping, (though the specific + numbering is incompatible with each other, and it is up to the user to + translate between them). + + [CBOR's RFC 7049](https://tools.ietf.org/html/rfc7049) describes this type + as: + > Major type 2: a byte string. The string's length in bytes is represented + > following the rules for positive integers (major type 0). + + [MessagePack's documentation on the bin type + family](https://github.com/msgpack/msgpack/blob/master/spec.md#bin-format-family) + describes this type as: + > Bin format family stores an byte array in 2, 3, or 5 bytes of extra bytes + > in addition to the size of the byte array. + + [BSON's specifications](http://bsonspec.org/spec.html) describe several + binary types; however, this type is intended to represent the generic binary + type which has the description: + > Generic binary subtype - This is the most commonly used binary subtype and + > should be the 'default' for drivers and tools. + + None of these impose any limitations on the internal representation other + than the basic unit of storage be some type of array whose parts are + decomposable into bytes. + + The default representation of this binary format is a + `std::vector`, which is a very common way to represent a byte + array in modern C++. + + #### Default type + + The default values for @a BinaryType is `std::vector` + + #### Storage + + Binary Arrays are stored as pointers in a @ref basic_json type. That is, + for any access to array values, a pointer of the type `binary_t*` must be + dereferenced. + + #### Notes on subtypes + + - CBOR + - Binary values are represented as byte strings. No subtypes are + supported and will be ignored when CBOR is written. + - MessagePack + - If a subtype is given and the binary array contains exactly 1, 2, 4, 8, + or 16 elements, the fixext family (fixext1, fixext2, fixext4, fixext8) + is used. For other sizes, the ext family (ext8, ext16, ext32) is used. + The subtype is then added as singed 8-bit integer. + - If no subtype is given, the bin family (bin8, bin16, bin32) is used. + - BSON + - If a subtype is given, it is used and added as unsigned 8-bit integer. + - If no subtype is given, the generic binary subtype 0x00 is used. + + @sa @ref binary -- create a binary array + + @since version 3.8.0 + */ + using binary_t = nlohmann::byte_container_with_subtype; + /// @} + + private: + + /// helper for exception-safe object creation + template + JSON_HEDLEY_RETURNS_NON_NULL + static T* create(Args&& ... args) + { + AllocatorType alloc; + using AllocatorTraits = std::allocator_traits>; + + auto deleter = [&](T * object) + { + AllocatorTraits::deallocate(alloc, object, 1); + }; + std::unique_ptr object(AllocatorTraits::allocate(alloc, 1), deleter); + AllocatorTraits::construct(alloc, object.get(), std::forward(args)...); + JSON_ASSERT(object != nullptr); + return object.release(); + } + + //////////////////////// + // JSON value storage // + //////////////////////// + + /*! + @brief a JSON value + + The actual storage for a JSON value of the @ref basic_json class. This + union combines the different storage types for the JSON value types + defined in @ref value_t. + + JSON type | value_t type | used type + --------- | --------------- | ------------------------ + object | object | pointer to @ref object_t + array | array | pointer to @ref array_t + string | string | pointer to @ref string_t + boolean | boolean | @ref boolean_t + number | number_integer | @ref number_integer_t + number | number_unsigned | @ref number_unsigned_t + number | number_float | @ref number_float_t + binary | binary | pointer to @ref binary_t + null | null | *no value is stored* + + @note Variable-length types (objects, arrays, and strings) are stored as + pointers. The size of the union should not exceed 64 bits if the default + value types are used. + + @since version 1.0.0 + */ + union json_value + { + /// object (stored with pointer to save storage) + object_t* object; + /// array (stored with pointer to save storage) + array_t* array; + /// string (stored with pointer to save storage) + string_t* string; + /// binary (stored with pointer to save storage) + binary_t* binary; + /// boolean + boolean_t boolean; + /// number (integer) + number_integer_t number_integer; + /// number (unsigned integer) + number_unsigned_t number_unsigned; + /// number (floating-point) + number_float_t number_float; + + /// default constructor (for null values) + json_value() = default; + /// constructor for booleans + json_value(boolean_t v) noexcept : boolean(v) {} + /// constructor for numbers (integer) + json_value(number_integer_t v) noexcept : number_integer(v) {} + /// constructor for numbers (unsigned) + json_value(number_unsigned_t v) noexcept : number_unsigned(v) {} + /// constructor for numbers (floating-point) + json_value(number_float_t v) noexcept : number_float(v) {} + /// constructor for empty values of a given type + json_value(value_t t) + { + switch (t) + { + case value_t::object: + { + object = create(); + break; + } + + case value_t::array: + { + array = create(); + break; + } + + case value_t::string: + { + string = create(""); + break; + } + + case value_t::binary: + { + binary = create(); + break; + } + + case value_t::boolean: + { + boolean = boolean_t(false); + break; + } + + case value_t::number_integer: + { + number_integer = number_integer_t(0); + break; + } + + case value_t::number_unsigned: + { + number_unsigned = number_unsigned_t(0); + break; + } + + case value_t::number_float: + { + number_float = number_float_t(0.0); + break; + } + + case value_t::null: + { + object = nullptr; // silence warning, see #821 + break; + } + + default: + { + object = nullptr; // silence warning, see #821 + if (JSON_HEDLEY_UNLIKELY(t == value_t::null)) + { + JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.9.1")); // LCOV_EXCL_LINE + } + break; + } + } + } + + /// constructor for strings + json_value(const string_t& value) + { + string = create(value); + } + + /// constructor for rvalue strings + json_value(string_t&& value) + { + string = create(std::move(value)); + } + + /// constructor for objects + json_value(const object_t& value) + { + object = create(value); + } + + /// constructor for rvalue objects + json_value(object_t&& value) + { + object = create(std::move(value)); + } + + /// constructor for arrays + json_value(const array_t& value) + { + array = create(value); + } + + /// constructor for rvalue arrays + json_value(array_t&& value) + { + array = create(std::move(value)); + } + + /// constructor for binary arrays + json_value(const typename binary_t::container_type& value) + { + binary = create(value); + } + + /// constructor for rvalue binary arrays + json_value(typename binary_t::container_type&& value) + { + binary = create(std::move(value)); + } + + /// constructor for binary arrays (internal type) + json_value(const binary_t& value) + { + binary = create(value); + } + + /// constructor for rvalue binary arrays (internal type) + json_value(binary_t&& value) + { + binary = create(std::move(value)); + } + + void destroy(value_t t) noexcept + { + // flatten the current json_value to a heap-allocated stack + std::vector stack; + + // move the top-level items to stack + if (t == value_t::array) + { + stack.reserve(array->size()); + std::move(array->begin(), array->end(), std::back_inserter(stack)); + } + else if (t == value_t::object) + { + stack.reserve(object->size()); + for (auto&& it : *object) + { + stack.push_back(std::move(it.second)); + } + } + + while (!stack.empty()) + { + // move the last item to local variable to be processed + basic_json current_item(std::move(stack.back())); + stack.pop_back(); + + // if current_item is array/object, move + // its children to the stack to be processed later + if (current_item.is_array()) + { + std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(), + std::back_inserter(stack)); + + current_item.m_value.array->clear(); + } + else if (current_item.is_object()) + { + for (auto&& it : *current_item.m_value.object) + { + stack.push_back(std::move(it.second)); + } + + current_item.m_value.object->clear(); + } + + // it's now safe that current_item get destructed + // since it doesn't have any children + } + + switch (t) + { + case value_t::object: + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, object); + std::allocator_traits::deallocate(alloc, object, 1); + break; + } + + case value_t::array: + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, array); + std::allocator_traits::deallocate(alloc, array, 1); + break; + } + + case value_t::string: + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, string); + std::allocator_traits::deallocate(alloc, string, 1); + break; + } + + case value_t::binary: + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, binary); + std::allocator_traits::deallocate(alloc, binary, 1); + break; + } + + default: + { + break; + } + } + } + }; + + /*! + @brief checks the class invariants + + This function asserts the class invariants. It needs to be called at the + end of every constructor to make sure that created objects respect the + invariant. Furthermore, it has to be called each time the type of a JSON + value is changed, because the invariant expresses a relationship between + @a m_type and @a m_value. + */ + void assert_invariant() const noexcept + { + JSON_ASSERT(m_type != value_t::object || m_value.object != nullptr); + JSON_ASSERT(m_type != value_t::array || m_value.array != nullptr); + JSON_ASSERT(m_type != value_t::string || m_value.string != nullptr); + JSON_ASSERT(m_type != value_t::binary || m_value.binary != nullptr); + } + + public: + ////////////////////////// + // JSON parser callback // + ////////////////////////// + + /*! + @brief parser event types + + The parser callback distinguishes the following events: + - `object_start`: the parser read `{` and started to process a JSON object + - `key`: the parser read a key of a value in an object + - `object_end`: the parser read `}` and finished processing a JSON object + - `array_start`: the parser read `[` and started to process a JSON array + - `array_end`: the parser read `]` and finished processing a JSON array + - `value`: the parser finished reading a JSON value + + @image html callback_events.png "Example when certain parse events are triggered" + + @sa @ref parser_callback_t for more information and examples + */ + using parse_event_t = detail::parse_event_t; + + /*! + @brief per-element parser callback type + + With a parser callback function, the result of parsing a JSON text can be + influenced. When passed to @ref parse, it is called on certain events + (passed as @ref parse_event_t via parameter @a event) with a set recursion + depth @a depth and context JSON value @a parsed. The return value of the + callback function is a boolean indicating whether the element that emitted + the callback shall be kept or not. + + We distinguish six scenarios (determined by the event type) in which the + callback function can be called. The following table describes the values + of the parameters @a depth, @a event, and @a parsed. + + parameter @a event | description | parameter @a depth | parameter @a parsed + ------------------ | ----------- | ------------------ | ------------------- + parse_event_t::object_start | the parser read `{` and started to process a JSON object | depth of the parent of the JSON object | a JSON value with type discarded + parse_event_t::key | the parser read a key of a value in an object | depth of the currently parsed JSON object | a JSON string containing the key + parse_event_t::object_end | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object | the parsed JSON object + parse_event_t::array_start | the parser read `[` and started to process a JSON array | depth of the parent of the JSON array | a JSON value with type discarded + parse_event_t::array_end | the parser read `]` and finished processing a JSON array | depth of the parent of the JSON array | the parsed JSON array + parse_event_t::value | the parser finished reading a JSON value | depth of the value | the parsed JSON value + + @image html callback_events.png "Example when certain parse events are triggered" + + Discarding a value (i.e., returning `false`) has different effects + depending on the context in which function was called: + + - Discarded values in structured types are skipped. That is, the parser + will behave as if the discarded value was never read. + - In case a value outside a structured type is skipped, it is replaced + with `null`. This case happens if the top-level element is skipped. + + @param[in] depth the depth of the recursion during parsing + + @param[in] event an event of type parse_event_t indicating the context in + the callback function has been called + + @param[in,out] parsed the current intermediate parse result; note that + writing to this value has no effect for parse_event_t::key events + + @return Whether the JSON value which called the function during parsing + should be kept (`true`) or not (`false`). In the latter case, it is either + skipped completely or replaced by an empty discarded object. + + @sa @ref parse for examples + + @since version 1.0.0 + */ + using parser_callback_t = detail::parser_callback_t; + + ////////////////// + // constructors // + ////////////////// + + /// @name constructors and destructors + /// Constructors of class @ref basic_json, copy/move constructor, copy + /// assignment, static functions creating objects, and the destructor. + /// @{ + + /*! + @brief create an empty value with a given type + + Create an empty JSON value with a given type. The value will be default + initialized with an empty value which depends on the type: + + Value type | initial value + ----------- | ------------- + null | `null` + boolean | `false` + string | `""` + number | `0` + object | `{}` + array | `[]` + binary | empty array + + @param[in] v the type of the value to create + + @complexity Constant. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @liveexample{The following code shows the constructor for different @ref + value_t values,basic_json__value_t} + + @sa @ref clear() -- restores the postcondition of this constructor + + @since version 1.0.0 + */ + basic_json(const value_t v) + : m_type(v), m_value(v) + { + assert_invariant(); + } + + /*! + @brief create a null object + + Create a `null` JSON value. It either takes a null pointer as parameter + (explicitly creating `null`) or no parameter (implicitly creating `null`). + The passed null pointer itself is not read -- it is only used to choose + the right constructor. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this constructor never throws + exceptions. + + @liveexample{The following code shows the constructor with and without a + null pointer parameter.,basic_json__nullptr_t} + + @since version 1.0.0 + */ + basic_json(std::nullptr_t = nullptr) noexcept + : basic_json(value_t::null) + { + assert_invariant(); + } + + /*! + @brief create a JSON value + + This is a "catch all" constructor for all compatible JSON types; that is, + types for which a `to_json()` method exists. The constructor forwards the + parameter @a val to that method (to `json_serializer::to_json` method + with `U = uncvref_t`, to be exact). + + Template type @a CompatibleType includes, but is not limited to, the + following types: + - **arrays**: @ref array_t and all kinds of compatible containers such as + `std::vector`, `std::deque`, `std::list`, `std::forward_list`, + `std::array`, `std::valarray`, `std::set`, `std::unordered_set`, + `std::multiset`, and `std::unordered_multiset` with a `value_type` from + which a @ref basic_json value can be constructed. + - **objects**: @ref object_t and all kinds of compatible associative + containers such as `std::map`, `std::unordered_map`, `std::multimap`, + and `std::unordered_multimap` with a `key_type` compatible to + @ref string_t and a `value_type` from which a @ref basic_json value can + be constructed. + - **strings**: @ref string_t, string literals, and all compatible string + containers can be used. + - **numbers**: @ref number_integer_t, @ref number_unsigned_t, + @ref number_float_t, and all convertible number types such as `int`, + `size_t`, `int64_t`, `float` or `double` can be used. + - **boolean**: @ref boolean_t / `bool` can be used. + - **binary**: @ref binary_t / `std::vector` may be used, + unfortunately because string literals cannot be distinguished from binary + character arrays by the C++ type system, all types compatible with `const + char*` will be directed to the string constructor instead. This is both + for backwards compatibility, and due to the fact that a binary type is not + a standard JSON type. + + See the examples below. + + @tparam CompatibleType a type such that: + - @a CompatibleType is not derived from `std::istream`, + - @a CompatibleType is not @ref basic_json (to avoid hijacking copy/move + constructors), + - @a CompatibleType is not a different @ref basic_json type (i.e. with different template arguments) + - @a CompatibleType is not a @ref basic_json nested type (e.g., + @ref json_pointer, @ref iterator, etc ...) + - @ref @ref json_serializer has a + `to_json(basic_json_t&, CompatibleType&&)` method + + @tparam U = `uncvref_t` + + @param[in] val the value to be forwarded to the respective constructor + + @complexity Usually linear in the size of the passed @a val, also + depending on the implementation of the called `to_json()` + method. + + @exceptionsafety Depends on the called constructor. For types directly + supported by the library (i.e., all types for which no `to_json()` function + was provided), strong guarantee holds: if an exception is thrown, there are + no changes to any JSON value. + + @liveexample{The following code shows the constructor with several + compatible types.,basic_json__CompatibleType} + + @since version 2.1.0 + */ + template < typename CompatibleType, + typename U = detail::uncvref_t, + detail::enable_if_t < + !detail::is_basic_json::value && detail::is_compatible_type::value, int > = 0 > + basic_json(CompatibleType && val) noexcept(noexcept( + JSONSerializer::to_json(std::declval(), + std::forward(val)))) + { + JSONSerializer::to_json(*this, std::forward(val)); + assert_invariant(); + } + + /*! + @brief create a JSON value from an existing one + + This is a constructor for existing @ref basic_json types. + It does not hijack copy/move constructors, since the parameter has different + template arguments than the current ones. + + The constructor tries to convert the internal @ref m_value of the parameter. + + @tparam BasicJsonType a type such that: + - @a BasicJsonType is a @ref basic_json type. + - @a BasicJsonType has different template arguments than @ref basic_json_t. + + @param[in] val the @ref basic_json value to be converted. + + @complexity Usually linear in the size of the passed @a val, also + depending on the implementation of the called `to_json()` + method. + + @exceptionsafety Depends on the called constructor. For types directly + supported by the library (i.e., all types for which no `to_json()` function + was provided), strong guarantee holds: if an exception is thrown, there are + no changes to any JSON value. + + @since version 3.2.0 + */ + template < typename BasicJsonType, + detail::enable_if_t < + detail::is_basic_json::value&& !std::is_same::value, int > = 0 > + basic_json(const BasicJsonType& val) + { + using other_boolean_t = typename BasicJsonType::boolean_t; + using other_number_float_t = typename BasicJsonType::number_float_t; + using other_number_integer_t = typename BasicJsonType::number_integer_t; + using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using other_string_t = typename BasicJsonType::string_t; + using other_object_t = typename BasicJsonType::object_t; + using other_array_t = typename BasicJsonType::array_t; + using other_binary_t = typename BasicJsonType::binary_t; + + switch (val.type()) + { + case value_t::boolean: + JSONSerializer::to_json(*this, val.template get()); + break; + case value_t::number_float: + JSONSerializer::to_json(*this, val.template get()); + break; + case value_t::number_integer: + JSONSerializer::to_json(*this, val.template get()); + break; + case value_t::number_unsigned: + JSONSerializer::to_json(*this, val.template get()); + break; + case value_t::string: + JSONSerializer::to_json(*this, val.template get_ref()); + break; + case value_t::object: + JSONSerializer::to_json(*this, val.template get_ref()); + break; + case value_t::array: + JSONSerializer::to_json(*this, val.template get_ref()); + break; + case value_t::binary: + JSONSerializer::to_json(*this, val.template get_ref()); + break; + case value_t::null: + *this = nullptr; + break; + case value_t::discarded: + m_type = value_t::discarded; + break; + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // LCOV_EXCL_LINE + } + assert_invariant(); + } + + /*! + @brief create a container (array or object) from an initializer list + + Creates a JSON value of type array or object from the passed initializer + list @a init. In case @a type_deduction is `true` (default), the type of + the JSON value to be created is deducted from the initializer list @a init + according to the following rules: + + 1. If the list is empty, an empty JSON object value `{}` is created. + 2. If the list consists of pairs whose first element is a string, a JSON + object value is created where the first elements of the pairs are + treated as keys and the second elements are as values. + 3. In all other cases, an array is created. + + The rules aim to create the best fit between a C++ initializer list and + JSON values. The rationale is as follows: + + 1. The empty initializer list is written as `{}` which is exactly an empty + JSON object. + 2. C++ has no way of describing mapped types other than to list a list of + pairs. As JSON requires that keys must be of type string, rule 2 is the + weakest constraint one can pose on initializer lists to interpret them + as an object. + 3. In all other cases, the initializer list could not be interpreted as + JSON object type, so interpreting it as JSON array type is safe. + + With the rules described above, the following JSON values cannot be + expressed by an initializer list: + + - the empty array (`[]`): use @ref array(initializer_list_t) + with an empty initializer list in this case + - arrays whose elements satisfy rule 2: use @ref + array(initializer_list_t) with the same initializer list + in this case + + @note When used without parentheses around an empty initializer list, @ref + basic_json() is called instead of this function, yielding the JSON null + value. + + @param[in] init initializer list with JSON values + + @param[in] type_deduction internal parameter; when set to `true`, the type + of the JSON value is deducted from the initializer list @a init; when set + to `false`, the type provided via @a manual_type is forced. This mode is + used by the functions @ref array(initializer_list_t) and + @ref object(initializer_list_t). + + @param[in] manual_type internal parameter; when @a type_deduction is set + to `false`, the created JSON value will use the provided type (only @ref + value_t::array and @ref value_t::object are valid); when @a type_deduction + is set to `true`, this parameter has no effect + + @throw type_error.301 if @a type_deduction is `false`, @a manual_type is + `value_t::object`, but @a init contains an element which is not a pair + whose first element is a string. In this case, the constructor could not + create an object. If @a type_deduction would have be `true`, an array + would have been created. See @ref object(initializer_list_t) + for an example. + + @complexity Linear in the size of the initializer list @a init. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @liveexample{The example below shows how JSON values are created from + initializer lists.,basic_json__list_init_t} + + @sa @ref array(initializer_list_t) -- create a JSON array + value from an initializer list + @sa @ref object(initializer_list_t) -- create a JSON object + value from an initializer list + + @since version 1.0.0 + */ + basic_json(initializer_list_t init, + bool type_deduction = true, + value_t manual_type = value_t::array) + { + // check if each element is an array with two elements whose first + // element is a string + bool is_an_object = std::all_of(init.begin(), init.end(), + [](const detail::json_ref& element_ref) + { + return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[0].is_string(); + }); + + // adjust type if type deduction is not wanted + if (!type_deduction) + { + // if array is wanted, do not create an object though possible + if (manual_type == value_t::array) + { + is_an_object = false; + } + + // if object is wanted but impossible, throw an exception + if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object && !is_an_object)) + { + JSON_THROW(type_error::create(301, "cannot create object from initializer list")); + } + } + + if (is_an_object) + { + // the initializer list is a list of pairs -> create object + m_type = value_t::object; + m_value = value_t::object; + + std::for_each(init.begin(), init.end(), [this](const detail::json_ref& element_ref) + { + auto element = element_ref.moved_or_copied(); + m_value.object->emplace( + std::move(*((*element.m_value.array)[0].m_value.string)), + std::move((*element.m_value.array)[1])); + }); + } + else + { + // the initializer list describes an array -> create array + m_type = value_t::array; + m_value.array = create(init.begin(), init.end()); + } + + assert_invariant(); + } + + /*! + @brief explicitly create a binary array (without subtype) + + Creates a JSON binary array value from a given binary container. Binary + values are part of various binary formats, such as CBOR, MessagePack, and + BSON. This constructor is used to create a value for serialization to those + formats. + + @note Note, this function exists because of the difficulty in correctly + specifying the correct template overload in the standard value ctor, as both + JSON arrays and JSON binary arrays are backed with some form of a + `std::vector`. Because JSON binary arrays are a non-standard extension it + was decided that it would be best to prevent automatic initialization of a + binary array type, for backwards compatibility and so it does not happen on + accident. + + @param[in] init container containing bytes to use as binary type + + @return JSON binary array value + + @complexity Linear in the size of @a init. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @since version 3.8.0 + */ + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json binary(const typename binary_t::container_type& init) + { + auto res = basic_json(); + res.m_type = value_t::binary; + res.m_value = init; + return res; + } + + /*! + @brief explicitly create a binary array (with subtype) + + Creates a JSON binary array value from a given binary container. Binary + values are part of various binary formats, such as CBOR, MessagePack, and + BSON. This constructor is used to create a value for serialization to those + formats. + + @note Note, this function exists because of the difficulty in correctly + specifying the correct template overload in the standard value ctor, as both + JSON arrays and JSON binary arrays are backed with some form of a + `std::vector`. Because JSON binary arrays are a non-standard extension it + was decided that it would be best to prevent automatic initialization of a + binary array type, for backwards compatibility and so it does not happen on + accident. + + @param[in] init container containing bytes to use as binary type + @param[in] subtype subtype to use in MessagePack and BSON + + @return JSON binary array value + + @complexity Linear in the size of @a init. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @since version 3.8.0 + */ + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json binary(const typename binary_t::container_type& init, std::uint8_t subtype) + { + auto res = basic_json(); + res.m_type = value_t::binary; + res.m_value = binary_t(init, subtype); + return res; + } + + /// @copydoc binary(const typename binary_t::container_type&) + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json binary(typename binary_t::container_type&& init) + { + auto res = basic_json(); + res.m_type = value_t::binary; + res.m_value = std::move(init); + return res; + } + + /// @copydoc binary(const typename binary_t::container_type&, std::uint8_t) + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json binary(typename binary_t::container_type&& init, std::uint8_t subtype) + { + auto res = basic_json(); + res.m_type = value_t::binary; + res.m_value = binary_t(std::move(init), subtype); + return res; + } + + /*! + @brief explicitly create an array from an initializer list + + Creates a JSON array value from a given initializer list. That is, given a + list of values `a, b, c`, creates the JSON value `[a, b, c]`. If the + initializer list is empty, the empty array `[]` is created. + + @note This function is only needed to express two edge cases that cannot + be realized with the initializer list constructor (@ref + basic_json(initializer_list_t, bool, value_t)). These cases + are: + 1. creating an array whose elements are all pairs whose first element is a + string -- in this case, the initializer list constructor would create an + object, taking the first elements as keys + 2. creating an empty array -- passing the empty initializer list to the + initializer list constructor yields an empty object + + @param[in] init initializer list with JSON values to create an array from + (optional) + + @return JSON array value + + @complexity Linear in the size of @a init. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @liveexample{The following code shows an example for the `array` + function.,array} + + @sa @ref basic_json(initializer_list_t, bool, value_t) -- + create a JSON value from an initializer list + @sa @ref object(initializer_list_t) -- create a JSON object + value from an initializer list + + @since version 1.0.0 + */ + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json array(initializer_list_t init = {}) + { + return basic_json(init, false, value_t::array); + } + + /*! + @brief explicitly create an object from an initializer list + + Creates a JSON object value from a given initializer list. The initializer + lists elements must be pairs, and their first elements must be strings. If + the initializer list is empty, the empty object `{}` is created. + + @note This function is only added for symmetry reasons. In contrast to the + related function @ref array(initializer_list_t), there are + no cases which can only be expressed by this function. That is, any + initializer list @a init can also be passed to the initializer list + constructor @ref basic_json(initializer_list_t, bool, value_t). + + @param[in] init initializer list to create an object from (optional) + + @return JSON object value + + @throw type_error.301 if @a init is not a list of pairs whose first + elements are strings. In this case, no object can be created. When such a + value is passed to @ref basic_json(initializer_list_t, bool, value_t), + an array would have been created from the passed initializer list @a init. + See example below. + + @complexity Linear in the size of @a init. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @liveexample{The following code shows an example for the `object` + function.,object} + + @sa @ref basic_json(initializer_list_t, bool, value_t) -- + create a JSON value from an initializer list + @sa @ref array(initializer_list_t) -- create a JSON array + value from an initializer list + + @since version 1.0.0 + */ + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json object(initializer_list_t init = {}) + { + return basic_json(init, false, value_t::object); + } + + /*! + @brief construct an array with count copies of given value + + Constructs a JSON array value by creating @a cnt copies of a passed value. + In case @a cnt is `0`, an empty array is created. + + @param[in] cnt the number of JSON copies of @a val to create + @param[in] val the JSON value to copy + + @post `std::distance(begin(),end()) == cnt` holds. + + @complexity Linear in @a cnt. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @liveexample{The following code shows examples for the @ref + basic_json(size_type\, const basic_json&) + constructor.,basic_json__size_type_basic_json} + + @since version 1.0.0 + */ + basic_json(size_type cnt, const basic_json& val) + : m_type(value_t::array) + { + m_value.array = create(cnt, val); + assert_invariant(); + } + + /*! + @brief construct a JSON container given an iterator range + + Constructs the JSON value with the contents of the range `[first, last)`. + The semantics depends on the different types a JSON value can have: + - In case of a null type, invalid_iterator.206 is thrown. + - In case of other primitive types (number, boolean, or string), @a first + must be `begin()` and @a last must be `end()`. In this case, the value is + copied. Otherwise, invalid_iterator.204 is thrown. + - In case of structured types (array, object), the constructor behaves as + similar versions for `std::vector` or `std::map`; that is, a JSON array + or object is constructed from the values in the range. + + @tparam InputIT an input iterator type (@ref iterator or @ref + const_iterator) + + @param[in] first begin of the range to copy from (included) + @param[in] last end of the range to copy from (excluded) + + @pre Iterators @a first and @a last must be initialized. **This + precondition is enforced with an assertion (see warning).** If + assertions are switched off, a violation of this precondition yields + undefined behavior. + + @pre Range `[first, last)` is valid. Usually, this precondition cannot be + checked efficiently. Only certain edge cases are detected; see the + description of the exceptions below. A violation of this precondition + yields undefined behavior. + + @warning A precondition is enforced with a runtime assertion that will + result in calling `std::abort` if this precondition is not met. + Assertions can be disabled by defining `NDEBUG` at compile time. + See https://en.cppreference.com/w/cpp/error/assert for more + information. + + @throw invalid_iterator.201 if iterators @a first and @a last are not + compatible (i.e., do not belong to the same JSON value). In this case, + the range `[first, last)` is undefined. + @throw invalid_iterator.204 if iterators @a first and @a last belong to a + primitive type (number, boolean, or string), but @a first does not point + to the first element any more. In this case, the range `[first, last)` is + undefined. See example code below. + @throw invalid_iterator.206 if iterators @a first and @a last belong to a + null value. In this case, the range `[first, last)` is undefined. + + @complexity Linear in distance between @a first and @a last. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @liveexample{The example below shows several ways to create JSON values by + specifying a subrange with iterators.,basic_json__InputIt_InputIt} + + @since version 1.0.0 + */ + template < class InputIT, typename std::enable_if < + std::is_same::value || + std::is_same::value, int >::type = 0 > + basic_json(InputIT first, InputIT last) + { + JSON_ASSERT(first.m_object != nullptr); + JSON_ASSERT(last.m_object != nullptr); + + // make sure iterator fits the current value + if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object)) + { + JSON_THROW(invalid_iterator::create(201, "iterators are not compatible")); + } + + // copy type from first iterator + m_type = first.m_object->m_type; + + // check if iterator range is complete for primitive values + switch (m_type) + { + case value_t::boolean: + case value_t::number_float: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::string: + { + if (JSON_HEDLEY_UNLIKELY(!first.m_it.primitive_iterator.is_begin() + || !last.m_it.primitive_iterator.is_end())) + { + JSON_THROW(invalid_iterator::create(204, "iterators out of range")); + } + break; + } + + default: + break; + } + + switch (m_type) + { + case value_t::number_integer: + { + m_value.number_integer = first.m_object->m_value.number_integer; + break; + } + + case value_t::number_unsigned: + { + m_value.number_unsigned = first.m_object->m_value.number_unsigned; + break; + } + + case value_t::number_float: + { + m_value.number_float = first.m_object->m_value.number_float; + break; + } + + case value_t::boolean: + { + m_value.boolean = first.m_object->m_value.boolean; + break; + } + + case value_t::string: + { + m_value = *first.m_object->m_value.string; + break; + } + + case value_t::object: + { + m_value.object = create(first.m_it.object_iterator, + last.m_it.object_iterator); + break; + } + + case value_t::array: + { + m_value.array = create(first.m_it.array_iterator, + last.m_it.array_iterator); + break; + } + + case value_t::binary: + { + m_value = *first.m_object->m_value.binary; + break; + } + + default: + JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " + + std::string(first.m_object->type_name()))); + } + + assert_invariant(); + } + + + /////////////////////////////////////// + // other constructors and destructor // + /////////////////////////////////////// + + template, + std::is_same>::value, int> = 0 > + basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {} + + /*! + @brief copy constructor + + Creates a copy of a given JSON value. + + @param[in] other the JSON value to copy + + @post `*this == other` + + @complexity Linear in the size of @a other. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is linear. + - As postcondition, it holds: `other == basic_json(other)`. + + @liveexample{The following code shows an example for the copy + constructor.,basic_json__basic_json} + + @since version 1.0.0 + */ + basic_json(const basic_json& other) + : m_type(other.m_type) + { + // check of passed value is valid + other.assert_invariant(); + + switch (m_type) + { + case value_t::object: + { + m_value = *other.m_value.object; + break; + } + + case value_t::array: + { + m_value = *other.m_value.array; + break; + } + + case value_t::string: + { + m_value = *other.m_value.string; + break; + } + + case value_t::boolean: + { + m_value = other.m_value.boolean; + break; + } + + case value_t::number_integer: + { + m_value = other.m_value.number_integer; + break; + } + + case value_t::number_unsigned: + { + m_value = other.m_value.number_unsigned; + break; + } + + case value_t::number_float: + { + m_value = other.m_value.number_float; + break; + } + + case value_t::binary: + { + m_value = *other.m_value.binary; + break; + } + + default: + break; + } + + assert_invariant(); + } + + /*! + @brief move constructor + + Move constructor. Constructs a JSON value with the contents of the given + value @a other using move semantics. It "steals" the resources from @a + other and leaves it as JSON null value. + + @param[in,out] other value to move to this object + + @post `*this` has the same value as @a other before the call. + @post @a other is a JSON null value. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this constructor never throws + exceptions. + + @requirement This function helps `basic_json` satisfying the + [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible) + requirements. + + @liveexample{The code below shows the move constructor explicitly called + via std::move.,basic_json__moveconstructor} + + @since version 1.0.0 + */ + basic_json(basic_json&& other) noexcept + : m_type(std::move(other.m_type)), + m_value(std::move(other.m_value)) + { + // check that passed value is valid + other.assert_invariant(); + + // invalidate payload + other.m_type = value_t::null; + other.m_value = {}; + + assert_invariant(); + } + + /*! + @brief copy assignment + + Copy assignment operator. Copies a JSON value via the "copy and swap" + strategy: It is expressed in terms of the copy constructor, destructor, + and the `swap()` member function. + + @param[in] other value to copy from + + @complexity Linear. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is linear. + + @liveexample{The code below shows and example for the copy assignment. It + creates a copy of value `a` which is then swapped with `b`. Finally\, the + copy of `a` (which is the null value after the swap) is + destroyed.,basic_json__copyassignment} + + @since version 1.0.0 + */ + basic_json& operator=(basic_json other) noexcept ( + std::is_nothrow_move_constructible::value&& + std::is_nothrow_move_assignable::value&& + std::is_nothrow_move_constructible::value&& + std::is_nothrow_move_assignable::value + ) + { + // check that passed value is valid + other.assert_invariant(); + + using std::swap; + swap(m_type, other.m_type); + swap(m_value, other.m_value); + + assert_invariant(); + return *this; + } + + /*! + @brief destructor + + Destroys the JSON value and frees all allocated memory. + + @complexity Linear. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is linear. + - All stored elements are destroyed and all memory is freed. + + @since version 1.0.0 + */ + ~basic_json() noexcept + { + assert_invariant(); + m_value.destroy(m_type); + } + + /// @} + + public: + /////////////////////// + // object inspection // + /////////////////////// + + /// @name object inspection + /// Functions to inspect the type of a JSON value. + /// @{ + + /*! + @brief serialization + + Serialization function for JSON values. The function tries to mimic + Python's `json.dumps()` function, and currently supports its @a indent + and @a ensure_ascii parameters. + + @param[in] indent If indent is nonnegative, then array elements and object + members will be pretty-printed with that indent level. An indent level of + `0` will only insert newlines. `-1` (the default) selects the most compact + representation. + @param[in] indent_char The character to use for indentation if @a indent is + greater than `0`. The default is ` ` (space). + @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters + in the output are escaped with `\uXXXX` sequences, and the result consists + of ASCII characters only. + @param[in] error_handler how to react on decoding errors; there are three + possible values: `strict` (throws and exception in case a decoding error + occurs; default), `replace` (replace invalid UTF-8 sequences with U+FFFD), + and `ignore` (ignore invalid UTF-8 sequences during serialization; all + bytes are copied to the output unchanged). + + @return string containing the serialization of the JSON value + + @throw type_error.316 if a string stored inside the JSON value is not + UTF-8 encoded and @a error_handler is set to strict + + @note Binary values are serialized as object containing two keys: + - "bytes": an array of bytes as integers + - "subtype": the subtype as integer or "null" if the binary has no subtype + + @complexity Linear. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @liveexample{The following example shows the effect of different @a indent\, + @a indent_char\, and @a ensure_ascii parameters to the result of the + serialization.,dump} + + @see https://docs.python.org/2/library/json.html#json.dump + + @since version 1.0.0; indentation character @a indent_char, option + @a ensure_ascii and exceptions added in version 3.0.0; error + handlers added in version 3.4.0; serialization of binary values added + in version 3.8.0. + */ + string_t dump(const int indent = -1, + const char indent_char = ' ', + const bool ensure_ascii = false, + const error_handler_t error_handler = error_handler_t::strict) const + { + string_t result; + serializer s(detail::output_adapter(result), indent_char, error_handler); + + if (indent >= 0) + { + s.dump(*this, true, ensure_ascii, static_cast(indent)); + } + else + { + s.dump(*this, false, ensure_ascii, 0); + } + + return result; + } + + /*! + @brief return the type of the JSON value (explicit) + + Return the type of the JSON value as a value from the @ref value_t + enumeration. + + @return the type of the JSON value + Value type | return value + ------------------------- | ------------------------- + null | value_t::null + boolean | value_t::boolean + string | value_t::string + number (integer) | value_t::number_integer + number (unsigned integer) | value_t::number_unsigned + number (floating-point) | value_t::number_float + object | value_t::object + array | value_t::array + binary | value_t::binary + discarded | value_t::discarded + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `type()` for all JSON + types.,type} + + @sa @ref operator value_t() -- return the type of the JSON value (implicit) + @sa @ref type_name() -- return the type as string + + @since version 1.0.0 + */ + constexpr value_t type() const noexcept + { + return m_type; + } + + /*! + @brief return whether type is primitive + + This function returns true if and only if the JSON type is primitive + (string, number, boolean, or null). + + @return `true` if type is primitive (string, number, boolean, or null), + `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_primitive()` for all JSON + types.,is_primitive} + + @sa @ref is_structured() -- returns whether JSON value is structured + @sa @ref is_null() -- returns whether JSON value is `null` + @sa @ref is_string() -- returns whether JSON value is a string + @sa @ref is_boolean() -- returns whether JSON value is a boolean + @sa @ref is_number() -- returns whether JSON value is a number + @sa @ref is_binary() -- returns whether JSON value is a binary array + + @since version 1.0.0 + */ + constexpr bool is_primitive() const noexcept + { + return is_null() || is_string() || is_boolean() || is_number() || is_binary(); + } + + /*! + @brief return whether type is structured + + This function returns true if and only if the JSON type is structured + (array or object). + + @return `true` if type is structured (array or object), `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_structured()` for all JSON + types.,is_structured} + + @sa @ref is_primitive() -- returns whether value is primitive + @sa @ref is_array() -- returns whether value is an array + @sa @ref is_object() -- returns whether value is an object + + @since version 1.0.0 + */ + constexpr bool is_structured() const noexcept + { + return is_array() || is_object(); + } + + /*! + @brief return whether value is null + + This function returns true if and only if the JSON value is null. + + @return `true` if type is null, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_null()` for all JSON + types.,is_null} + + @since version 1.0.0 + */ + constexpr bool is_null() const noexcept + { + return m_type == value_t::null; + } + + /*! + @brief return whether value is a boolean + + This function returns true if and only if the JSON value is a boolean. + + @return `true` if type is boolean, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_boolean()` for all JSON + types.,is_boolean} + + @since version 1.0.0 + */ + constexpr bool is_boolean() const noexcept + { + return m_type == value_t::boolean; + } + + /*! + @brief return whether value is a number + + This function returns true if and only if the JSON value is a number. This + includes both integer (signed and unsigned) and floating-point values. + + @return `true` if type is number (regardless whether integer, unsigned + integer or floating-type), `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_number()` for all JSON + types.,is_number} + + @sa @ref is_number_integer() -- check if value is an integer or unsigned + integer number + @sa @ref is_number_unsigned() -- check if value is an unsigned integer + number + @sa @ref is_number_float() -- check if value is a floating-point number + + @since version 1.0.0 + */ + constexpr bool is_number() const noexcept + { + return is_number_integer() || is_number_float(); + } + + /*! + @brief return whether value is an integer number + + This function returns true if and only if the JSON value is a signed or + unsigned integer number. This excludes floating-point values. + + @return `true` if type is an integer or unsigned integer number, `false` + otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_number_integer()` for all + JSON types.,is_number_integer} + + @sa @ref is_number() -- check if value is a number + @sa @ref is_number_unsigned() -- check if value is an unsigned integer + number + @sa @ref is_number_float() -- check if value is a floating-point number + + @since version 1.0.0 + */ + constexpr bool is_number_integer() const noexcept + { + return m_type == value_t::number_integer || m_type == value_t::number_unsigned; + } + + /*! + @brief return whether value is an unsigned integer number + + This function returns true if and only if the JSON value is an unsigned + integer number. This excludes floating-point and signed integer values. + + @return `true` if type is an unsigned integer number, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_number_unsigned()` for all + JSON types.,is_number_unsigned} + + @sa @ref is_number() -- check if value is a number + @sa @ref is_number_integer() -- check if value is an integer or unsigned + integer number + @sa @ref is_number_float() -- check if value is a floating-point number + + @since version 2.0.0 + */ + constexpr bool is_number_unsigned() const noexcept + { + return m_type == value_t::number_unsigned; + } + + /*! + @brief return whether value is a floating-point number + + This function returns true if and only if the JSON value is a + floating-point number. This excludes signed and unsigned integer values. + + @return `true` if type is a floating-point number, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_number_float()` for all + JSON types.,is_number_float} + + @sa @ref is_number() -- check if value is number + @sa @ref is_number_integer() -- check if value is an integer number + @sa @ref is_number_unsigned() -- check if value is an unsigned integer + number + + @since version 1.0.0 + */ + constexpr bool is_number_float() const noexcept + { + return m_type == value_t::number_float; + } + + /*! + @brief return whether value is an object + + This function returns true if and only if the JSON value is an object. + + @return `true` if type is object, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_object()` for all JSON + types.,is_object} + + @since version 1.0.0 + */ + constexpr bool is_object() const noexcept + { + return m_type == value_t::object; + } + + /*! + @brief return whether value is an array + + This function returns true if and only if the JSON value is an array. + + @return `true` if type is array, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_array()` for all JSON + types.,is_array} + + @since version 1.0.0 + */ + constexpr bool is_array() const noexcept + { + return m_type == value_t::array; + } + + /*! + @brief return whether value is a string + + This function returns true if and only if the JSON value is a string. + + @return `true` if type is string, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_string()` for all JSON + types.,is_string} + + @since version 1.0.0 + */ + constexpr bool is_string() const noexcept + { + return m_type == value_t::string; + } + + /*! + @brief return whether value is a binary array + + This function returns true if and only if the JSON value is a binary array. + + @return `true` if type is binary array, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_binary()` for all JSON + types.,is_binary} + + @since version 3.8.0 + */ + constexpr bool is_binary() const noexcept + { + return m_type == value_t::binary; + } + + /*! + @brief return whether value is discarded + + This function returns true if and only if the JSON value was discarded + during parsing with a callback function (see @ref parser_callback_t). + + @note This function will always be `false` for JSON values after parsing. + That is, discarded values can only occur during parsing, but will be + removed when inside a structured value or replaced by null in other cases. + + @return `true` if type is discarded, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_discarded()` for all JSON + types.,is_discarded} + + @since version 1.0.0 + */ + constexpr bool is_discarded() const noexcept + { + return m_type == value_t::discarded; + } + + /*! + @brief return the type of the JSON value (implicit) + + Implicitly return the type of the JSON value as a value from the @ref + value_t enumeration. + + @return the type of the JSON value + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies the @ref value_t operator for + all JSON types.,operator__value_t} + + @sa @ref type() -- return the type of the JSON value (explicit) + @sa @ref type_name() -- return the type as string + + @since version 1.0.0 + */ + constexpr operator value_t() const noexcept + { + return m_type; + } + + /// @} + + private: + ////////////////// + // value access // + ////////////////// + + /// get a boolean (explicit) + boolean_t get_impl(boolean_t* /*unused*/) const + { + if (JSON_HEDLEY_LIKELY(is_boolean())) + { + return m_value.boolean; + } + + JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(type_name()))); + } + + /// get a pointer to the value (object) + object_t* get_impl_ptr(object_t* /*unused*/) noexcept + { + return is_object() ? m_value.object : nullptr; + } + + /// get a pointer to the value (object) + constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept + { + return is_object() ? m_value.object : nullptr; + } + + /// get a pointer to the value (array) + array_t* get_impl_ptr(array_t* /*unused*/) noexcept + { + return is_array() ? m_value.array : nullptr; + } + + /// get a pointer to the value (array) + constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept + { + return is_array() ? m_value.array : nullptr; + } + + /// get a pointer to the value (string) + string_t* get_impl_ptr(string_t* /*unused*/) noexcept + { + return is_string() ? m_value.string : nullptr; + } + + /// get a pointer to the value (string) + constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept + { + return is_string() ? m_value.string : nullptr; + } + + /// get a pointer to the value (boolean) + boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept + { + return is_boolean() ? &m_value.boolean : nullptr; + } + + /// get a pointer to the value (boolean) + constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept + { + return is_boolean() ? &m_value.boolean : nullptr; + } + + /// get a pointer to the value (integer number) + number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept + { + return is_number_integer() ? &m_value.number_integer : nullptr; + } + + /// get a pointer to the value (integer number) + constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept + { + return is_number_integer() ? &m_value.number_integer : nullptr; + } + + /// get a pointer to the value (unsigned number) + number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept + { + return is_number_unsigned() ? &m_value.number_unsigned : nullptr; + } + + /// get a pointer to the value (unsigned number) + constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept + { + return is_number_unsigned() ? &m_value.number_unsigned : nullptr; + } + + /// get a pointer to the value (floating-point number) + number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept + { + return is_number_float() ? &m_value.number_float : nullptr; + } + + /// get a pointer to the value (floating-point number) + constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept + { + return is_number_float() ? &m_value.number_float : nullptr; + } + + /// get a pointer to the value (binary) + binary_t* get_impl_ptr(binary_t* /*unused*/) noexcept + { + return is_binary() ? m_value.binary : nullptr; + } + + /// get a pointer to the value (binary) + constexpr const binary_t* get_impl_ptr(const binary_t* /*unused*/) const noexcept + { + return is_binary() ? m_value.binary : nullptr; + } + + /*! + @brief helper function to implement get_ref() + + This function helps to implement get_ref() without code duplication for + const and non-const overloads + + @tparam ThisType will be deduced as `basic_json` or `const basic_json` + + @throw type_error.303 if ReferenceType does not match underlying value + type of the current JSON + */ + template + static ReferenceType get_ref_impl(ThisType& obj) + { + // delegate the call to get_ptr<>() + auto ptr = obj.template get_ptr::type>(); + + if (JSON_HEDLEY_LIKELY(ptr != nullptr)) + { + return *ptr; + } + + JSON_THROW(type_error::create(303, "incompatible ReferenceType for get_ref, actual type is " + std::string(obj.type_name()))); + } + + public: + /// @name value access + /// Direct access to the stored value of a JSON value. + /// @{ + + /*! + @brief get special-case overload + + This overloads avoids a lot of template boilerplate, it can be seen as the + identity method + + @tparam BasicJsonType == @ref basic_json + + @return a copy of *this + + @complexity Constant. + + @since version 2.1.0 + */ + template::type, basic_json_t>::value, + int> = 0> + basic_json get() const + { + return *this; + } + + /*! + @brief get special-case overload + + This overloads converts the current @ref basic_json in a different + @ref basic_json type + + @tparam BasicJsonType == @ref basic_json + + @return a copy of *this, converted into @tparam BasicJsonType + + @complexity Depending on the implementation of the called `from_json()` + method. + + @since version 3.2.0 + */ + template < typename BasicJsonType, detail::enable_if_t < + !std::is_same::value&& + detail::is_basic_json::value, int > = 0 > + BasicJsonType get() const + { + return *this; + } + + /*! + @brief get a value (explicit) + + Explicit type conversion between the JSON value and a compatible value + which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible) + and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible). + The value is converted by calling the @ref json_serializer + `from_json()` method. + + The function is equivalent to executing + @code {.cpp} + ValueType ret; + JSONSerializer::from_json(*this, ret); + return ret; + @endcode + + This overloads is chosen if: + - @a ValueType is not @ref basic_json, + - @ref json_serializer has a `from_json()` method of the form + `void from_json(const basic_json&, ValueType&)`, and + - @ref json_serializer does not have a `from_json()` method of + the form `ValueType from_json(const basic_json&)` + + @tparam ValueTypeCV the provided value type + @tparam ValueType the returned value type + + @return copy of the JSON value, converted to @a ValueType + + @throw what @ref json_serializer `from_json()` method throws + + @liveexample{The example below shows several conversions from JSON values + to other types. There a few things to note: (1) Floating-point numbers can + be converted to integers\, (2) A JSON array can be converted to a standard + `std::vector`\, (3) A JSON object can be converted to C++ + associative containers such as `std::unordered_map`.,get__ValueType_const} + + @since version 2.1.0 + */ + template < typename ValueTypeCV, typename ValueType = detail::uncvref_t, + detail::enable_if_t < + !detail::is_basic_json::value && + detail::has_from_json::value && + !detail::has_non_default_from_json::value, + int > = 0 > + ValueType get() const noexcept(noexcept( + JSONSerializer::from_json(std::declval(), std::declval()))) + { + // we cannot static_assert on ValueTypeCV being non-const, because + // there is support for get(), which is why we + // still need the uncvref + static_assert(!std::is_reference::value, + "get() cannot be used with reference types, you might want to use get_ref()"); + static_assert(std::is_default_constructible::value, + "types must be DefaultConstructible when used with get()"); + + ValueType ret; + JSONSerializer::from_json(*this, ret); + return ret; + } + + /*! + @brief get a value (explicit); special case + + Explicit type conversion between the JSON value and a compatible value + which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible) + and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible). + The value is converted by calling the @ref json_serializer + `from_json()` method. + + The function is equivalent to executing + @code {.cpp} + return JSONSerializer::from_json(*this); + @endcode + + This overloads is chosen if: + - @a ValueType is not @ref basic_json and + - @ref json_serializer has a `from_json()` method of the form + `ValueType from_json(const basic_json&)` + + @note If @ref json_serializer has both overloads of + `from_json()`, this one is chosen. + + @tparam ValueTypeCV the provided value type + @tparam ValueType the returned value type + + @return copy of the JSON value, converted to @a ValueType + + @throw what @ref json_serializer `from_json()` method throws + + @since version 2.1.0 + */ + template < typename ValueTypeCV, typename ValueType = detail::uncvref_t, + detail::enable_if_t < !std::is_same::value && + detail::has_non_default_from_json::value, + int > = 0 > + ValueType get() const noexcept(noexcept( + JSONSerializer::from_json(std::declval()))) + { + static_assert(!std::is_reference::value, + "get() cannot be used with reference types, you might want to use get_ref()"); + return JSONSerializer::from_json(*this); + } + + /*! + @brief get a value (explicit) + + Explicit type conversion between the JSON value and a compatible value. + The value is filled into the input parameter by calling the @ref json_serializer + `from_json()` method. + + The function is equivalent to executing + @code {.cpp} + ValueType v; + JSONSerializer::from_json(*this, v); + @endcode + + This overloads is chosen if: + - @a ValueType is not @ref basic_json, + - @ref json_serializer has a `from_json()` method of the form + `void from_json(const basic_json&, ValueType&)`, and + + @tparam ValueType the input parameter type. + + @return the input parameter, allowing chaining calls. + + @throw what @ref json_serializer `from_json()` method throws + + @liveexample{The example below shows several conversions from JSON values + to other types. There a few things to note: (1) Floating-point numbers can + be converted to integers\, (2) A JSON array can be converted to a standard + `std::vector`\, (3) A JSON object can be converted to C++ + associative containers such as `std::unordered_map`.,get_to} + + @since version 3.3.0 + */ + template < typename ValueType, + detail::enable_if_t < + !detail::is_basic_json::value&& + detail::has_from_json::value, + int > = 0 > + ValueType & get_to(ValueType& v) const noexcept(noexcept( + JSONSerializer::from_json(std::declval(), v))) + { + JSONSerializer::from_json(*this, v); + return v; + } + + // specialization to allow to call get_to with a basic_json value + // see https://github.com/nlohmann/json/issues/2175 + template::value, + int> = 0> + ValueType & get_to(ValueType& v) const + { + v = *this; + return v; + } + + template < + typename T, std::size_t N, + typename Array = T (&)[N], + detail::enable_if_t < + detail::has_from_json::value, int > = 0 > + Array get_to(T (&v)[N]) const + noexcept(noexcept(JSONSerializer::from_json( + std::declval(), v))) + { + JSONSerializer::from_json(*this, v); + return v; + } + + + /*! + @brief get a pointer value (implicit) + + Implicit pointer access to the internally stored JSON value. No copies are + made. + + @warning Writing data to the pointee of the result yields an undefined + state. + + @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref + object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, + @ref number_unsigned_t, or @ref number_float_t. Enforced by a static + assertion. + + @return pointer to the internally stored JSON value if the requested + pointer type @a PointerType fits to the JSON value; `nullptr` otherwise + + @complexity Constant. + + @liveexample{The example below shows how pointers to internal values of a + JSON value can be requested. Note that no type conversions are made and a + `nullptr` is returned if the value and the requested pointer type does not + match.,get_ptr} + + @since version 1.0.0 + */ + template::value, int>::type = 0> + auto get_ptr() noexcept -> decltype(std::declval().get_impl_ptr(std::declval())) + { + // delegate the call to get_impl_ptr<>() + return get_impl_ptr(static_cast(nullptr)); + } + + /*! + @brief get a pointer value (implicit) + @copydoc get_ptr() + */ + template < typename PointerType, typename std::enable_if < + std::is_pointer::value&& + std::is_const::type>::value, int >::type = 0 > + constexpr auto get_ptr() const noexcept -> decltype(std::declval().get_impl_ptr(std::declval())) + { + // delegate the call to get_impl_ptr<>() const + return get_impl_ptr(static_cast(nullptr)); + } + + /*! + @brief get a pointer value (explicit) + + Explicit pointer access to the internally stored JSON value. No copies are + made. + + @warning The pointer becomes invalid if the underlying JSON object + changes. + + @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref + object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, + @ref number_unsigned_t, or @ref number_float_t. + + @return pointer to the internally stored JSON value if the requested + pointer type @a PointerType fits to the JSON value; `nullptr` otherwise + + @complexity Constant. + + @liveexample{The example below shows how pointers to internal values of a + JSON value can be requested. Note that no type conversions are made and a + `nullptr` is returned if the value and the requested pointer type does not + match.,get__PointerType} + + @sa @ref get_ptr() for explicit pointer-member access + + @since version 1.0.0 + */ + template::value, int>::type = 0> + auto get() noexcept -> decltype(std::declval().template get_ptr()) + { + // delegate the call to get_ptr + return get_ptr(); + } + + /*! + @brief get a pointer value (explicit) + @copydoc get() + */ + template::value, int>::type = 0> + constexpr auto get() const noexcept -> decltype(std::declval().template get_ptr()) + { + // delegate the call to get_ptr + return get_ptr(); + } + + /*! + @brief get a reference value (implicit) + + Implicit reference access to the internally stored JSON value. No copies + are made. + + @warning Writing data to the referee of the result yields an undefined + state. + + @tparam ReferenceType reference type; must be a reference to @ref array_t, + @ref object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, or + @ref number_float_t. Enforced by static assertion. + + @return reference to the internally stored JSON value if the requested + reference type @a ReferenceType fits to the JSON value; throws + type_error.303 otherwise + + @throw type_error.303 in case passed type @a ReferenceType is incompatible + with the stored JSON value; see example below + + @complexity Constant. + + @liveexample{The example shows several calls to `get_ref()`.,get_ref} + + @since version 1.1.0 + */ + template::value, int>::type = 0> + ReferenceType get_ref() + { + // delegate call to get_ref_impl + return get_ref_impl(*this); + } + + /*! + @brief get a reference value (implicit) + @copydoc get_ref() + */ + template < typename ReferenceType, typename std::enable_if < + std::is_reference::value&& + std::is_const::type>::value, int >::type = 0 > + ReferenceType get_ref() const + { + // delegate call to get_ref_impl + return get_ref_impl(*this); + } + + /*! + @brief get a value (implicit) + + Implicit type conversion between the JSON value and a compatible value. + The call is realized by calling @ref get() const. + + @tparam ValueType non-pointer type compatible to the JSON value, for + instance `int` for JSON integer numbers, `bool` for JSON booleans, or + `std::vector` types for JSON arrays. The character type of @ref string_t + as well as an initializer list of this type is excluded to avoid + ambiguities as these types implicitly convert to `std::string`. + + @return copy of the JSON value, converted to type @a ValueType + + @throw type_error.302 in case passed type @a ValueType is incompatible + to the JSON value type (e.g., the JSON value is of type boolean, but a + string is requested); see example below + + @complexity Linear in the size of the JSON value. + + @liveexample{The example below shows several conversions from JSON values + to other types. There a few things to note: (1) Floating-point numbers can + be converted to integers\, (2) A JSON array can be converted to a standard + `std::vector`\, (3) A JSON object can be converted to C++ + associative containers such as `std::unordered_map`.,operator__ValueType} + + @since version 1.0.0 + */ + template < typename ValueType, typename std::enable_if < + !std::is_pointer::value&& + !std::is_same>::value&& + !std::is_same::value&& + !detail::is_basic_json::value + && !std::is_same>::value +#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914)) + && !std::is_same::value +#endif + && detail::is_detected::value + , int >::type = 0 > + JSON_EXPLICIT operator ValueType() const + { + // delegate the call to get<>() const + return get(); + } + + /*! + @return reference to the binary value + + @throw type_error.302 if the value is not binary + + @sa @ref is_binary() to check if the value is binary + + @since version 3.8.0 + */ + binary_t& get_binary() + { + if (!is_binary()) + { + JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name()))); + } + + return *get_ptr(); + } + + /// @copydoc get_binary() + const binary_t& get_binary() const + { + if (!is_binary()) + { + JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name()))); + } + + return *get_ptr(); + } + + /// @} + + + //////////////////// + // element access // + //////////////////// + + /// @name element access + /// Access to the JSON value. + /// @{ + + /*! + @brief access specified array element with bounds checking + + Returns a reference to the element at specified location @a idx, with + bounds checking. + + @param[in] idx index of the element to access + + @return reference to the element at index @a idx + + @throw type_error.304 if the JSON value is not an array; in this case, + calling `at` with an index makes no sense. See example below. + @throw out_of_range.401 if the index @a idx is out of range of the array; + that is, `idx >= size()`. See example below. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Constant. + + @since version 1.0.0 + + @liveexample{The example below shows how array elements can be read and + written using `at()`. It also demonstrates the different exceptions that + can be thrown.,at__size_type} + */ + reference at(size_type idx) + { + // at only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + JSON_TRY + { + return m_value.array->at(idx); + } + JSON_CATCH (std::out_of_range&) + { + // create better exception explanation + JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range")); + } + } + else + { + JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()))); + } + } + + /*! + @brief access specified array element with bounds checking + + Returns a const reference to the element at specified location @a idx, + with bounds checking. + + @param[in] idx index of the element to access + + @return const reference to the element at index @a idx + + @throw type_error.304 if the JSON value is not an array; in this case, + calling `at` with an index makes no sense. See example below. + @throw out_of_range.401 if the index @a idx is out of range of the array; + that is, `idx >= size()`. See example below. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Constant. + + @since version 1.0.0 + + @liveexample{The example below shows how array elements can be read using + `at()`. It also demonstrates the different exceptions that can be thrown., + at__size_type_const} + */ + const_reference at(size_type idx) const + { + // at only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + JSON_TRY + { + return m_value.array->at(idx); + } + JSON_CATCH (std::out_of_range&) + { + // create better exception explanation + JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range")); + } + } + else + { + JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()))); + } + } + + /*! + @brief access specified object element with bounds checking + + Returns a reference to the element at with specified key @a key, with + bounds checking. + + @param[in] key key of the element to access + + @return reference to the element at key @a key + + @throw type_error.304 if the JSON value is not an object; in this case, + calling `at` with a key makes no sense. See example below. + @throw out_of_range.403 if the key @a key is is not stored in the object; + that is, `find(key) == end()`. See example below. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Logarithmic in the size of the container. + + @sa @ref operator[](const typename object_t::key_type&) for unchecked + access by reference + @sa @ref value() for access by value with a default value + + @since version 1.0.0 + + @liveexample{The example below shows how object elements can be read and + written using `at()`. It also demonstrates the different exceptions that + can be thrown.,at__object_t_key_type} + */ + reference at(const typename object_t::key_type& key) + { + // at only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + JSON_TRY + { + return m_value.object->at(key); + } + JSON_CATCH (std::out_of_range&) + { + // create better exception explanation + JSON_THROW(out_of_range::create(403, "key '" + key + "' not found")); + } + } + else + { + JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()))); + } + } + + /*! + @brief access specified object element with bounds checking + + Returns a const reference to the element at with specified key @a key, + with bounds checking. + + @param[in] key key of the element to access + + @return const reference to the element at key @a key + + @throw type_error.304 if the JSON value is not an object; in this case, + calling `at` with a key makes no sense. See example below. + @throw out_of_range.403 if the key @a key is is not stored in the object; + that is, `find(key) == end()`. See example below. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Logarithmic in the size of the container. + + @sa @ref operator[](const typename object_t::key_type&) for unchecked + access by reference + @sa @ref value() for access by value with a default value + + @since version 1.0.0 + + @liveexample{The example below shows how object elements can be read using + `at()`. It also demonstrates the different exceptions that can be thrown., + at__object_t_key_type_const} + */ + const_reference at(const typename object_t::key_type& key) const + { + // at only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + JSON_TRY + { + return m_value.object->at(key); + } + JSON_CATCH (std::out_of_range&) + { + // create better exception explanation + JSON_THROW(out_of_range::create(403, "key '" + key + "' not found")); + } + } + else + { + JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()))); + } + } + + /*! + @brief access specified array element + + Returns a reference to the element at specified location @a idx. + + @note If @a idx is beyond the range of the array (i.e., `idx >= size()`), + then the array is silently filled up with `null` values to make `idx` a + valid reference to the last stored element. + + @param[in] idx index of the element to access + + @return reference to the element at index @a idx + + @throw type_error.305 if the JSON value is not an array or null; in that + cases, using the [] operator with an index makes no sense. + + @complexity Constant if @a idx is in the range of the array. Otherwise + linear in `idx - size()`. + + @liveexample{The example below shows how array elements can be read and + written using `[]` operator. Note the addition of `null` + values.,operatorarray__size_type} + + @since version 1.0.0 + */ + reference operator[](size_type idx) + { + // implicitly convert null value to an empty array + if (is_null()) + { + m_type = value_t::array; + m_value.array = create(); + assert_invariant(); + } + + // operator[] only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + // fill up array with null values if given idx is outside range + if (idx >= m_value.array->size()) + { + m_value.array->insert(m_value.array->end(), + idx - m_value.array->size() + 1, + basic_json()); + } + + return m_value.array->operator[](idx); + } + + JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name()))); + } + + /*! + @brief access specified array element + + Returns a const reference to the element at specified location @a idx. + + @param[in] idx index of the element to access + + @return const reference to the element at index @a idx + + @throw type_error.305 if the JSON value is not an array; in that case, + using the [] operator with an index makes no sense. + + @complexity Constant. + + @liveexample{The example below shows how array elements can be read using + the `[]` operator.,operatorarray__size_type_const} + + @since version 1.0.0 + */ + const_reference operator[](size_type idx) const + { + // const operator[] only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + return m_value.array->operator[](idx); + } + + JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name()))); + } + + /*! + @brief access specified object element + + Returns a reference to the element at with specified key @a key. + + @note If @a key is not found in the object, then it is silently added to + the object and filled with a `null` value to make `key` a valid reference. + In case the value was `null` before, it is converted to an object. + + @param[in] key key of the element to access + + @return reference to the element at key @a key + + @throw type_error.305 if the JSON value is not an object or null; in that + cases, using the [] operator with a key makes no sense. + + @complexity Logarithmic in the size of the container. + + @liveexample{The example below shows how object elements can be read and + written using the `[]` operator.,operatorarray__key_type} + + @sa @ref at(const typename object_t::key_type&) for access by reference + with range checking + @sa @ref value() for access by value with a default value + + @since version 1.0.0 + */ + reference operator[](const typename object_t::key_type& key) + { + // implicitly convert null value to an empty object + if (is_null()) + { + m_type = value_t::object; + m_value.object = create(); + assert_invariant(); + } + + // operator[] only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + return m_value.object->operator[](key); + } + + JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()))); + } + + /*! + @brief read-only access specified object element + + Returns a const reference to the element at with specified key @a key. No + bounds checking is performed. + + @warning If the element with key @a key does not exist, the behavior is + undefined. + + @param[in] key key of the element to access + + @return const reference to the element at key @a key + + @pre The element with key @a key must exist. **This precondition is + enforced with an assertion.** + + @throw type_error.305 if the JSON value is not an object; in that case, + using the [] operator with a key makes no sense. + + @complexity Logarithmic in the size of the container. + + @liveexample{The example below shows how object elements can be read using + the `[]` operator.,operatorarray__key_type_const} + + @sa @ref at(const typename object_t::key_type&) for access by reference + with range checking + @sa @ref value() for access by value with a default value + + @since version 1.0.0 + */ + const_reference operator[](const typename object_t::key_type& key) const + { + // const operator[] only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + JSON_ASSERT(m_value.object->find(key) != m_value.object->end()); + return m_value.object->find(key)->second; + } + + JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()))); + } + + /*! + @brief access specified object element + + Returns a reference to the element at with specified key @a key. + + @note If @a key is not found in the object, then it is silently added to + the object and filled with a `null` value to make `key` a valid reference. + In case the value was `null` before, it is converted to an object. + + @param[in] key key of the element to access + + @return reference to the element at key @a key + + @throw type_error.305 if the JSON value is not an object or null; in that + cases, using the [] operator with a key makes no sense. + + @complexity Logarithmic in the size of the container. + + @liveexample{The example below shows how object elements can be read and + written using the `[]` operator.,operatorarray__key_type} + + @sa @ref at(const typename object_t::key_type&) for access by reference + with range checking + @sa @ref value() for access by value with a default value + + @since version 1.1.0 + */ + template + JSON_HEDLEY_NON_NULL(2) + reference operator[](T* key) + { + // implicitly convert null to object + if (is_null()) + { + m_type = value_t::object; + m_value = value_t::object; + assert_invariant(); + } + + // at only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + return m_value.object->operator[](key); + } + + JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()))); + } + + /*! + @brief read-only access specified object element + + Returns a const reference to the element at with specified key @a key. No + bounds checking is performed. + + @warning If the element with key @a key does not exist, the behavior is + undefined. + + @param[in] key key of the element to access + + @return const reference to the element at key @a key + + @pre The element with key @a key must exist. **This precondition is + enforced with an assertion.** + + @throw type_error.305 if the JSON value is not an object; in that case, + using the [] operator with a key makes no sense. + + @complexity Logarithmic in the size of the container. + + @liveexample{The example below shows how object elements can be read using + the `[]` operator.,operatorarray__key_type_const} + + @sa @ref at(const typename object_t::key_type&) for access by reference + with range checking + @sa @ref value() for access by value with a default value + + @since version 1.1.0 + */ + template + JSON_HEDLEY_NON_NULL(2) + const_reference operator[](T* key) const + { + // at only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + JSON_ASSERT(m_value.object->find(key) != m_value.object->end()); + return m_value.object->find(key)->second; + } + + JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()))); + } + + /*! + @brief access specified object element with default value + + Returns either a copy of an object's element at the specified key @a key + or a given default value if no element with key @a key exists. + + The function is basically equivalent to executing + @code {.cpp} + try { + return at(key); + } catch(out_of_range) { + return default_value; + } + @endcode + + @note Unlike @ref at(const typename object_t::key_type&), this function + does not throw if the given key @a key was not found. + + @note Unlike @ref operator[](const typename object_t::key_type& key), this + function does not implicitly add an element to the position defined by @a + key. This function is furthermore also applicable to const objects. + + @param[in] key key of the element to access + @param[in] default_value the value to return if @a key is not found + + @tparam ValueType type compatible to JSON values, for instance `int` for + JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for + JSON arrays. Note the type of the expected value at @a key and the default + value @a default_value must be compatible. + + @return copy of the element at key @a key or @a default_value if @a key + is not found + + @throw type_error.302 if @a default_value does not match the type of the + value at @a key + @throw type_error.306 if the JSON value is not an object; in that case, + using `value()` with a key makes no sense. + + @complexity Logarithmic in the size of the container. + + @liveexample{The example below shows how object elements can be queried + with a default value.,basic_json__value} + + @sa @ref at(const typename object_t::key_type&) for access by reference + with range checking + @sa @ref operator[](const typename object_t::key_type&) for unchecked + access by reference + + @since version 1.0.0 + */ + // using std::is_convertible in a std::enable_if will fail when using explicit conversions + template < class ValueType, typename std::enable_if < + detail::is_getable::value + && !std::is_same::value, int >::type = 0 > + ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const + { + // at only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + // if key is found, return value and given default value otherwise + const auto it = find(key); + if (it != end()) + { + return it->template get(); + } + + return default_value; + } + + JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name()))); + } + + /*! + @brief overload for a default value of type const char* + @copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const + */ + string_t value(const typename object_t::key_type& key, const char* default_value) const + { + return value(key, string_t(default_value)); + } + + /*! + @brief access specified object element via JSON Pointer with default value + + Returns either a copy of an object's element at the specified key @a key + or a given default value if no element with key @a key exists. + + The function is basically equivalent to executing + @code {.cpp} + try { + return at(ptr); + } catch(out_of_range) { + return default_value; + } + @endcode + + @note Unlike @ref at(const json_pointer&), this function does not throw + if the given key @a key was not found. + + @param[in] ptr a JSON pointer to the element to access + @param[in] default_value the value to return if @a ptr found no value + + @tparam ValueType type compatible to JSON values, for instance `int` for + JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for + JSON arrays. Note the type of the expected value at @a key and the default + value @a default_value must be compatible. + + @return copy of the element at key @a key or @a default_value if @a key + is not found + + @throw type_error.302 if @a default_value does not match the type of the + value at @a ptr + @throw type_error.306 if the JSON value is not an object; in that case, + using `value()` with a key makes no sense. + + @complexity Logarithmic in the size of the container. + + @liveexample{The example below shows how object elements can be queried + with a default value.,basic_json__value_ptr} + + @sa @ref operator[](const json_pointer&) for unchecked access by reference + + @since version 2.0.2 + */ + template::value, int>::type = 0> + ValueType value(const json_pointer& ptr, const ValueType& default_value) const + { + // at only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + // if pointer resolves a value, return it or use default value + JSON_TRY + { + return ptr.get_checked(this).template get(); + } + JSON_INTERNAL_CATCH (out_of_range&) + { + return default_value; + } + } + + JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name()))); + } + + /*! + @brief overload for a default value of type const char* + @copydoc basic_json::value(const json_pointer&, ValueType) const + */ + JSON_HEDLEY_NON_NULL(3) + string_t value(const json_pointer& ptr, const char* default_value) const + { + return value(ptr, string_t(default_value)); + } + + /*! + @brief access the first element + + Returns a reference to the first element in the container. For a JSON + container `c`, the expression `c.front()` is equivalent to `*c.begin()`. + + @return In case of a structured type (array or object), a reference to the + first element is returned. In case of number, string, boolean, or binary + values, a reference to the value is returned. + + @complexity Constant. + + @pre The JSON value must not be `null` (would throw `std::out_of_range`) + or an empty array or object (undefined behavior, **guarded by + assertions**). + @post The JSON value remains unchanged. + + @throw invalid_iterator.214 when called on `null` value + + @liveexample{The following code shows an example for `front()`.,front} + + @sa @ref back() -- access the last element + + @since version 1.0.0 + */ + reference front() + { + return *begin(); + } + + /*! + @copydoc basic_json::front() + */ + const_reference front() const + { + return *cbegin(); + } + + /*! + @brief access the last element + + Returns a reference to the last element in the container. For a JSON + container `c`, the expression `c.back()` is equivalent to + @code {.cpp} + auto tmp = c.end(); + --tmp; + return *tmp; + @endcode + + @return In case of a structured type (array or object), a reference to the + last element is returned. In case of number, string, boolean, or binary + values, a reference to the value is returned. + + @complexity Constant. + + @pre The JSON value must not be `null` (would throw `std::out_of_range`) + or an empty array or object (undefined behavior, **guarded by + assertions**). + @post The JSON value remains unchanged. + + @throw invalid_iterator.214 when called on a `null` value. See example + below. + + @liveexample{The following code shows an example for `back()`.,back} + + @sa @ref front() -- access the first element + + @since version 1.0.0 + */ + reference back() + { + auto tmp = end(); + --tmp; + return *tmp; + } + + /*! + @copydoc basic_json::back() + */ + const_reference back() const + { + auto tmp = cend(); + --tmp; + return *tmp; + } + + /*! + @brief remove element given an iterator + + Removes the element specified by iterator @a pos. The iterator @a pos must + be valid and dereferenceable. Thus the `end()` iterator (which is valid, + but is not dereferenceable) cannot be used as a value for @a pos. + + If called on a primitive type other than `null`, the resulting JSON value + will be `null`. + + @param[in] pos iterator to the element to remove + @return Iterator following the last removed element. If the iterator @a + pos refers to the last element, the `end()` iterator is returned. + + @tparam IteratorType an @ref iterator or @ref const_iterator + + @post Invalidates iterators and references at or after the point of the + erase, including the `end()` iterator. + + @throw type_error.307 if called on a `null` value; example: `"cannot use + erase() with null"` + @throw invalid_iterator.202 if called on an iterator which does not belong + to the current JSON value; example: `"iterator does not fit current + value"` + @throw invalid_iterator.205 if called on a primitive type with invalid + iterator (i.e., any iterator which is not `begin()`); example: `"iterator + out of range"` + + @complexity The complexity depends on the type: + - objects: amortized constant + - arrays: linear in distance between @a pos and the end of the container + - strings and binary: linear in the length of the member + - other types: constant + + @liveexample{The example shows the result of `erase()` for different JSON + types.,erase__IteratorType} + + @sa @ref erase(IteratorType, IteratorType) -- removes the elements in + the given range + @sa @ref erase(const typename object_t::key_type&) -- removes the element + from an object at the given key + @sa @ref erase(const size_type) -- removes the element from an array at + the given index + + @since version 1.0.0 + */ + template < class IteratorType, typename std::enable_if < + std::is_same::value || + std::is_same::value, int >::type + = 0 > + IteratorType erase(IteratorType pos) + { + // make sure iterator fits the current value + if (JSON_HEDLEY_UNLIKELY(this != pos.m_object)) + { + JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value")); + } + + IteratorType result = end(); + + switch (m_type) + { + case value_t::boolean: + case value_t::number_float: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::string: + case value_t::binary: + { + if (JSON_HEDLEY_UNLIKELY(!pos.m_it.primitive_iterator.is_begin())) + { + JSON_THROW(invalid_iterator::create(205, "iterator out of range")); + } + + if (is_string()) + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, m_value.string); + std::allocator_traits::deallocate(alloc, m_value.string, 1); + m_value.string = nullptr; + } + else if (is_binary()) + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, m_value.binary); + std::allocator_traits::deallocate(alloc, m_value.binary, 1); + m_value.binary = nullptr; + } + + m_type = value_t::null; + assert_invariant(); + break; + } + + case value_t::object: + { + result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator); + break; + } + + case value_t::array: + { + result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator); + break; + } + + default: + JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()))); + } + + return result; + } + + /*! + @brief remove elements given an iterator range + + Removes the element specified by the range `[first; last)`. The iterator + @a first does not need to be dereferenceable if `first == last`: erasing + an empty range is a no-op. + + If called on a primitive type other than `null`, the resulting JSON value + will be `null`. + + @param[in] first iterator to the beginning of the range to remove + @param[in] last iterator past the end of the range to remove + @return Iterator following the last removed element. If the iterator @a + second refers to the last element, the `end()` iterator is returned. + + @tparam IteratorType an @ref iterator or @ref const_iterator + + @post Invalidates iterators and references at or after the point of the + erase, including the `end()` iterator. + + @throw type_error.307 if called on a `null` value; example: `"cannot use + erase() with null"` + @throw invalid_iterator.203 if called on iterators which does not belong + to the current JSON value; example: `"iterators do not fit current value"` + @throw invalid_iterator.204 if called on a primitive type with invalid + iterators (i.e., if `first != begin()` and `last != end()`); example: + `"iterators out of range"` + + @complexity The complexity depends on the type: + - objects: `log(size()) + std::distance(first, last)` + - arrays: linear in the distance between @a first and @a last, plus linear + in the distance between @a last and end of the container + - strings and binary: linear in the length of the member + - other types: constant + + @liveexample{The example shows the result of `erase()` for different JSON + types.,erase__IteratorType_IteratorType} + + @sa @ref erase(IteratorType) -- removes the element at a given position + @sa @ref erase(const typename object_t::key_type&) -- removes the element + from an object at the given key + @sa @ref erase(const size_type) -- removes the element from an array at + the given index + + @since version 1.0.0 + */ + template < class IteratorType, typename std::enable_if < + std::is_same::value || + std::is_same::value, int >::type + = 0 > + IteratorType erase(IteratorType first, IteratorType last) + { + // make sure iterator fits the current value + if (JSON_HEDLEY_UNLIKELY(this != first.m_object || this != last.m_object)) + { + JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value")); + } + + IteratorType result = end(); + + switch (m_type) + { + case value_t::boolean: + case value_t::number_float: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::string: + case value_t::binary: + { + if (JSON_HEDLEY_LIKELY(!first.m_it.primitive_iterator.is_begin() + || !last.m_it.primitive_iterator.is_end())) + { + JSON_THROW(invalid_iterator::create(204, "iterators out of range")); + } + + if (is_string()) + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, m_value.string); + std::allocator_traits::deallocate(alloc, m_value.string, 1); + m_value.string = nullptr; + } + else if (is_binary()) + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, m_value.binary); + std::allocator_traits::deallocate(alloc, m_value.binary, 1); + m_value.binary = nullptr; + } + + m_type = value_t::null; + assert_invariant(); + break; + } + + case value_t::object: + { + result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator, + last.m_it.object_iterator); + break; + } + + case value_t::array: + { + result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator, + last.m_it.array_iterator); + break; + } + + default: + JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()))); + } + + return result; + } + + /*! + @brief remove element from a JSON object given a key + + Removes elements from a JSON object with the key value @a key. + + @param[in] key value of the elements to remove + + @return Number of elements removed. If @a ObjectType is the default + `std::map` type, the return value will always be `0` (@a key was not + found) or `1` (@a key was found). + + @post References and iterators to the erased elements are invalidated. + Other references and iterators are not affected. + + @throw type_error.307 when called on a type other than JSON object; + example: `"cannot use erase() with null"` + + @complexity `log(size()) + count(key)` + + @liveexample{The example shows the effect of `erase()`.,erase__key_type} + + @sa @ref erase(IteratorType) -- removes the element at a given position + @sa @ref erase(IteratorType, IteratorType) -- removes the elements in + the given range + @sa @ref erase(const size_type) -- removes the element from an array at + the given index + + @since version 1.0.0 + */ + size_type erase(const typename object_t::key_type& key) + { + // this erase only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + return m_value.object->erase(key); + } + + JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()))); + } + + /*! + @brief remove element from a JSON array given an index + + Removes element from a JSON array at the index @a idx. + + @param[in] idx index of the element to remove + + @throw type_error.307 when called on a type other than JSON object; + example: `"cannot use erase() with null"` + @throw out_of_range.401 when `idx >= size()`; example: `"array index 17 + is out of range"` + + @complexity Linear in distance between @a idx and the end of the container. + + @liveexample{The example shows the effect of `erase()`.,erase__size_type} + + @sa @ref erase(IteratorType) -- removes the element at a given position + @sa @ref erase(IteratorType, IteratorType) -- removes the elements in + the given range + @sa @ref erase(const typename object_t::key_type&) -- removes the element + from an object at the given key + + @since version 1.0.0 + */ + void erase(const size_type idx) + { + // this erase only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + if (JSON_HEDLEY_UNLIKELY(idx >= size())) + { + JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range")); + } + + m_value.array->erase(m_value.array->begin() + static_cast(idx)); + } + else + { + JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()))); + } + } + + /// @} + + + //////////// + // lookup // + //////////// + + /// @name lookup + /// @{ + + /*! + @brief find an element in a JSON object + + Finds an element in a JSON object with key equivalent to @a key. If the + element is not found or the JSON value is not an object, end() is + returned. + + @note This method always returns @ref end() when executed on a JSON type + that is not an object. + + @param[in] key key value of the element to search for. + + @return Iterator to an element with key equivalent to @a key. If no such + element is found or the JSON value is not an object, past-the-end (see + @ref end()) iterator is returned. + + @complexity Logarithmic in the size of the JSON object. + + @liveexample{The example shows how `find()` is used.,find__key_type} + + @sa @ref contains(KeyT&&) const -- checks whether a key exists + + @since version 1.0.0 + */ + template + iterator find(KeyT&& key) + { + auto result = end(); + + if (is_object()) + { + result.m_it.object_iterator = m_value.object->find(std::forward(key)); + } + + return result; + } + + /*! + @brief find an element in a JSON object + @copydoc find(KeyT&&) + */ + template + const_iterator find(KeyT&& key) const + { + auto result = cend(); + + if (is_object()) + { + result.m_it.object_iterator = m_value.object->find(std::forward(key)); + } + + return result; + } + + /*! + @brief returns the number of occurrences of a key in a JSON object + + Returns the number of elements with key @a key. If ObjectType is the + default `std::map` type, the return value will always be `0` (@a key was + not found) or `1` (@a key was found). + + @note This method always returns `0` when executed on a JSON type that is + not an object. + + @param[in] key key value of the element to count + + @return Number of elements with key @a key. If the JSON value is not an + object, the return value will be `0`. + + @complexity Logarithmic in the size of the JSON object. + + @liveexample{The example shows how `count()` is used.,count} + + @since version 1.0.0 + */ + template + size_type count(KeyT&& key) const + { + // return 0 for all nonobject types + return is_object() ? m_value.object->count(std::forward(key)) : 0; + } + + /*! + @brief check the existence of an element in a JSON object + + Check whether an element exists in a JSON object with key equivalent to + @a key. If the element is not found or the JSON value is not an object, + false is returned. + + @note This method always returns false when executed on a JSON type + that is not an object. + + @param[in] key key value to check its existence. + + @return true if an element with specified @a key exists. If no such + element with such key is found or the JSON value is not an object, + false is returned. + + @complexity Logarithmic in the size of the JSON object. + + @liveexample{The following code shows an example for `contains()`.,contains} + + @sa @ref find(KeyT&&) -- returns an iterator to an object element + @sa @ref contains(const json_pointer&) const -- checks the existence for a JSON pointer + + @since version 3.6.0 + */ + template < typename KeyT, typename std::enable_if < + !std::is_same::type, json_pointer>::value, int >::type = 0 > + bool contains(KeyT && key) const + { + return is_object() && m_value.object->find(std::forward(key)) != m_value.object->end(); + } + + /*! + @brief check the existence of an element in a JSON object given a JSON pointer + + Check whether the given JSON pointer @a ptr can be resolved in the current + JSON value. + + @note This method can be executed on any JSON value type. + + @param[in] ptr JSON pointer to check its existence. + + @return true if the JSON pointer can be resolved to a stored value, false + otherwise. + + @post If `j.contains(ptr)` returns true, it is safe to call `j[ptr]`. + + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + + @complexity Logarithmic in the size of the JSON object. + + @liveexample{The following code shows an example for `contains()`.,contains_json_pointer} + + @sa @ref contains(KeyT &&) const -- checks the existence of a key + + @since version 3.7.0 + */ + bool contains(const json_pointer& ptr) const + { + return ptr.contains(this); + } + + /// @} + + + /////////////// + // iterators // + /////////////// + + /// @name iterators + /// @{ + + /*! + @brief returns an iterator to the first element + + Returns an iterator to the first element. + + @image html range-begin-end.svg "Illustration from cppreference.com" + + @return iterator to the first element + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is constant. + + @liveexample{The following code shows an example for `begin()`.,begin} + + @sa @ref cbegin() -- returns a const iterator to the beginning + @sa @ref end() -- returns an iterator to the end + @sa @ref cend() -- returns a const iterator to the end + + @since version 1.0.0 + */ + iterator begin() noexcept + { + iterator result(this); + result.set_begin(); + return result; + } + + /*! + @copydoc basic_json::cbegin() + */ + const_iterator begin() const noexcept + { + return cbegin(); + } + + /*! + @brief returns a const iterator to the first element + + Returns a const iterator to the first element. + + @image html range-begin-end.svg "Illustration from cppreference.com" + + @return const iterator to the first element + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is constant. + - Has the semantics of `const_cast(*this).begin()`. + + @liveexample{The following code shows an example for `cbegin()`.,cbegin} + + @sa @ref begin() -- returns an iterator to the beginning + @sa @ref end() -- returns an iterator to the end + @sa @ref cend() -- returns a const iterator to the end + + @since version 1.0.0 + */ + const_iterator cbegin() const noexcept + { + const_iterator result(this); + result.set_begin(); + return result; + } + + /*! + @brief returns an iterator to one past the last element + + Returns an iterator to one past the last element. + + @image html range-begin-end.svg "Illustration from cppreference.com" + + @return iterator one past the last element + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is constant. + + @liveexample{The following code shows an example for `end()`.,end} + + @sa @ref cend() -- returns a const iterator to the end + @sa @ref begin() -- returns an iterator to the beginning + @sa @ref cbegin() -- returns a const iterator to the beginning + + @since version 1.0.0 + */ + iterator end() noexcept + { + iterator result(this); + result.set_end(); + return result; + } + + /*! + @copydoc basic_json::cend() + */ + const_iterator end() const noexcept + { + return cend(); + } + + /*! + @brief returns a const iterator to one past the last element + + Returns a const iterator to one past the last element. + + @image html range-begin-end.svg "Illustration from cppreference.com" + + @return const iterator one past the last element + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is constant. + - Has the semantics of `const_cast(*this).end()`. + + @liveexample{The following code shows an example for `cend()`.,cend} + + @sa @ref end() -- returns an iterator to the end + @sa @ref begin() -- returns an iterator to the beginning + @sa @ref cbegin() -- returns a const iterator to the beginning + + @since version 1.0.0 + */ + const_iterator cend() const noexcept + { + const_iterator result(this); + result.set_end(); + return result; + } + + /*! + @brief returns an iterator to the reverse-beginning + + Returns an iterator to the reverse-beginning; that is, the last element. + + @image html range-rbegin-rend.svg "Illustration from cppreference.com" + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer) + requirements: + - The complexity is constant. + - Has the semantics of `reverse_iterator(end())`. + + @liveexample{The following code shows an example for `rbegin()`.,rbegin} + + @sa @ref crbegin() -- returns a const reverse iterator to the beginning + @sa @ref rend() -- returns a reverse iterator to the end + @sa @ref crend() -- returns a const reverse iterator to the end + + @since version 1.0.0 + */ + reverse_iterator rbegin() noexcept + { + return reverse_iterator(end()); + } + + /*! + @copydoc basic_json::crbegin() + */ + const_reverse_iterator rbegin() const noexcept + { + return crbegin(); + } + + /*! + @brief returns an iterator to the reverse-end + + Returns an iterator to the reverse-end; that is, one before the first + element. + + @image html range-rbegin-rend.svg "Illustration from cppreference.com" + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer) + requirements: + - The complexity is constant. + - Has the semantics of `reverse_iterator(begin())`. + + @liveexample{The following code shows an example for `rend()`.,rend} + + @sa @ref crend() -- returns a const reverse iterator to the end + @sa @ref rbegin() -- returns a reverse iterator to the beginning + @sa @ref crbegin() -- returns a const reverse iterator to the beginning + + @since version 1.0.0 + */ + reverse_iterator rend() noexcept + { + return reverse_iterator(begin()); + } + + /*! + @copydoc basic_json::crend() + */ + const_reverse_iterator rend() const noexcept + { + return crend(); + } + + /*! + @brief returns a const reverse iterator to the last element + + Returns a const iterator to the reverse-beginning; that is, the last + element. + + @image html range-rbegin-rend.svg "Illustration from cppreference.com" + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer) + requirements: + - The complexity is constant. + - Has the semantics of `const_cast(*this).rbegin()`. + + @liveexample{The following code shows an example for `crbegin()`.,crbegin} + + @sa @ref rbegin() -- returns a reverse iterator to the beginning + @sa @ref rend() -- returns a reverse iterator to the end + @sa @ref crend() -- returns a const reverse iterator to the end + + @since version 1.0.0 + */ + const_reverse_iterator crbegin() const noexcept + { + return const_reverse_iterator(cend()); + } + + /*! + @brief returns a const reverse iterator to one before the first + + Returns a const reverse iterator to the reverse-end; that is, one before + the first element. + + @image html range-rbegin-rend.svg "Illustration from cppreference.com" + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer) + requirements: + - The complexity is constant. + - Has the semantics of `const_cast(*this).rend()`. + + @liveexample{The following code shows an example for `crend()`.,crend} + + @sa @ref rend() -- returns a reverse iterator to the end + @sa @ref rbegin() -- returns a reverse iterator to the beginning + @sa @ref crbegin() -- returns a const reverse iterator to the beginning + + @since version 1.0.0 + */ + const_reverse_iterator crend() const noexcept + { + return const_reverse_iterator(cbegin()); + } + + public: + /*! + @brief wrapper to access iterator member functions in range-based for + + This function allows to access @ref iterator::key() and @ref + iterator::value() during range-based for loops. In these loops, a + reference to the JSON values is returned, so there is no access to the + underlying iterator. + + For loop without iterator_wrapper: + + @code{cpp} + for (auto it = j_object.begin(); it != j_object.end(); ++it) + { + std::cout << "key: " << it.key() << ", value:" << it.value() << '\n'; + } + @endcode + + Range-based for loop without iterator proxy: + + @code{cpp} + for (auto it : j_object) + { + // "it" is of type json::reference and has no key() member + std::cout << "value: " << it << '\n'; + } + @endcode + + Range-based for loop with iterator proxy: + + @code{cpp} + for (auto it : json::iterator_wrapper(j_object)) + { + std::cout << "key: " << it.key() << ", value:" << it.value() << '\n'; + } + @endcode + + @note When iterating over an array, `key()` will return the index of the + element as string (see example). + + @param[in] ref reference to a JSON value + @return iteration proxy object wrapping @a ref with an interface to use in + range-based for loops + + @liveexample{The following code shows how the wrapper is used,iterator_wrapper} + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Constant. + + @note The name of this function is not yet final and may change in the + future. + + @deprecated This stream operator is deprecated and will be removed in + future 4.0.0 of the library. Please use @ref items() instead; + that is, replace `json::iterator_wrapper(j)` with `j.items()`. + */ + JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items()) + static iteration_proxy iterator_wrapper(reference ref) noexcept + { + return ref.items(); + } + + /*! + @copydoc iterator_wrapper(reference) + */ + JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items()) + static iteration_proxy iterator_wrapper(const_reference ref) noexcept + { + return ref.items(); + } + + /*! + @brief helper to access iterator member functions in range-based for + + This function allows to access @ref iterator::key() and @ref + iterator::value() during range-based for loops. In these loops, a + reference to the JSON values is returned, so there is no access to the + underlying iterator. + + For loop without `items()` function: + + @code{cpp} + for (auto it = j_object.begin(); it != j_object.end(); ++it) + { + std::cout << "key: " << it.key() << ", value:" << it.value() << '\n'; + } + @endcode + + Range-based for loop without `items()` function: + + @code{cpp} + for (auto it : j_object) + { + // "it" is of type json::reference and has no key() member + std::cout << "value: " << it << '\n'; + } + @endcode + + Range-based for loop with `items()` function: + + @code{cpp} + for (auto& el : j_object.items()) + { + std::cout << "key: " << el.key() << ", value:" << el.value() << '\n'; + } + @endcode + + The `items()` function also allows to use + [structured bindings](https://en.cppreference.com/w/cpp/language/structured_binding) + (C++17): + + @code{cpp} + for (auto& [key, val] : j_object.items()) + { + std::cout << "key: " << key << ", value:" << val << '\n'; + } + @endcode + + @note When iterating over an array, `key()` will return the index of the + element as string (see example). For primitive types (e.g., numbers), + `key()` returns an empty string. + + @warning Using `items()` on temporary objects is dangerous. Make sure the + object's lifetime exeeds the iteration. See + for more + information. + + @return iteration proxy object wrapping @a ref with an interface to use in + range-based for loops + + @liveexample{The following code shows how the function is used.,items} + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Constant. + + @since version 3.1.0, structured bindings support since 3.5.0. + */ + iteration_proxy items() noexcept + { + return iteration_proxy(*this); + } + + /*! + @copydoc items() + */ + iteration_proxy items() const noexcept + { + return iteration_proxy(*this); + } + + /// @} + + + ////////////// + // capacity // + ////////////// + + /// @name capacity + /// @{ + + /*! + @brief checks whether the container is empty. + + Checks if a JSON value has no elements (i.e. whether its @ref size is `0`). + + @return The return value depends on the different types and is + defined as follows: + Value type | return value + ----------- | ------------- + null | `true` + boolean | `false` + string | `false` + number | `false` + binary | `false` + object | result of function `object_t::empty()` + array | result of function `array_t::empty()` + + @liveexample{The following code uses `empty()` to check if a JSON + object contains any elements.,empty} + + @complexity Constant, as long as @ref array_t and @ref object_t satisfy + the Container concept; that is, their `empty()` functions have constant + complexity. + + @iterators No changes. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @note This function does not return whether a string stored as JSON value + is empty - it returns whether the JSON container itself is empty which is + false in the case of a string. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is constant. + - Has the semantics of `begin() == end()`. + + @sa @ref size() -- returns the number of elements + + @since version 1.0.0 + */ + bool empty() const noexcept + { + switch (m_type) + { + case value_t::null: + { + // null values are empty + return true; + } + + case value_t::array: + { + // delegate call to array_t::empty() + return m_value.array->empty(); + } + + case value_t::object: + { + // delegate call to object_t::empty() + return m_value.object->empty(); + } + + default: + { + // all other types are nonempty + return false; + } + } + } + + /*! + @brief returns the number of elements + + Returns the number of elements in a JSON value. + + @return The return value depends on the different types and is + defined as follows: + Value type | return value + ----------- | ------------- + null | `0` + boolean | `1` + string | `1` + number | `1` + binary | `1` + object | result of function object_t::size() + array | result of function array_t::size() + + @liveexample{The following code calls `size()` on the different value + types.,size} + + @complexity Constant, as long as @ref array_t and @ref object_t satisfy + the Container concept; that is, their size() functions have constant + complexity. + + @iterators No changes. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @note This function does not return the length of a string stored as JSON + value - it returns the number of elements in the JSON value which is 1 in + the case of a string. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is constant. + - Has the semantics of `std::distance(begin(), end())`. + + @sa @ref empty() -- checks whether the container is empty + @sa @ref max_size() -- returns the maximal number of elements + + @since version 1.0.0 + */ + size_type size() const noexcept + { + switch (m_type) + { + case value_t::null: + { + // null values are empty + return 0; + } + + case value_t::array: + { + // delegate call to array_t::size() + return m_value.array->size(); + } + + case value_t::object: + { + // delegate call to object_t::size() + return m_value.object->size(); + } + + default: + { + // all other types have size 1 + return 1; + } + } + } + + /*! + @brief returns the maximum possible number of elements + + Returns the maximum number of elements a JSON value is able to hold due to + system or library implementation limitations, i.e. `std::distance(begin(), + end())` for the JSON value. + + @return The return value depends on the different types and is + defined as follows: + Value type | return value + ----------- | ------------- + null | `0` (same as `size()`) + boolean | `1` (same as `size()`) + string | `1` (same as `size()`) + number | `1` (same as `size()`) + binary | `1` (same as `size()`) + object | result of function `object_t::max_size()` + array | result of function `array_t::max_size()` + + @liveexample{The following code calls `max_size()` on the different value + types. Note the output is implementation specific.,max_size} + + @complexity Constant, as long as @ref array_t and @ref object_t satisfy + the Container concept; that is, their `max_size()` functions have constant + complexity. + + @iterators No changes. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is constant. + - Has the semantics of returning `b.size()` where `b` is the largest + possible JSON value. + + @sa @ref size() -- returns the number of elements + + @since version 1.0.0 + */ + size_type max_size() const noexcept + { + switch (m_type) + { + case value_t::array: + { + // delegate call to array_t::max_size() + return m_value.array->max_size(); + } + + case value_t::object: + { + // delegate call to object_t::max_size() + return m_value.object->max_size(); + } + + default: + { + // all other types have max_size() == size() + return size(); + } + } + } + + /// @} + + + /////////////// + // modifiers // + /////////////// + + /// @name modifiers + /// @{ + + /*! + @brief clears the contents + + Clears the content of a JSON value and resets it to the default value as + if @ref basic_json(value_t) would have been called with the current value + type from @ref type(): + + Value type | initial value + ----------- | ------------- + null | `null` + boolean | `false` + string | `""` + number | `0` + binary | An empty byte vector + object | `{}` + array | `[]` + + @post Has the same effect as calling + @code {.cpp} + *this = basic_json(type()); + @endcode + + @liveexample{The example below shows the effect of `clear()` to different + JSON types.,clear} + + @complexity Linear in the size of the JSON value. + + @iterators All iterators, pointers and references related to this container + are invalidated. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @sa @ref basic_json(value_t) -- constructor that creates an object with the + same value than calling `clear()` + + @since version 1.0.0 + */ + void clear() noexcept + { + switch (m_type) + { + case value_t::number_integer: + { + m_value.number_integer = 0; + break; + } + + case value_t::number_unsigned: + { + m_value.number_unsigned = 0; + break; + } + + case value_t::number_float: + { + m_value.number_float = 0.0; + break; + } + + case value_t::boolean: + { + m_value.boolean = false; + break; + } + + case value_t::string: + { + m_value.string->clear(); + break; + } + + case value_t::binary: + { + m_value.binary->clear(); + break; + } + + case value_t::array: + { + m_value.array->clear(); + break; + } + + case value_t::object: + { + m_value.object->clear(); + break; + } + + default: + break; + } + } + + /*! + @brief add an object to an array + + Appends the given element @a val to the end of the JSON value. If the + function is called on a JSON null value, an empty array is created before + appending @a val. + + @param[in] val the value to add to the JSON array + + @throw type_error.308 when called on a type other than JSON array or + null; example: `"cannot use push_back() with number"` + + @complexity Amortized constant. + + @liveexample{The example shows how `push_back()` and `+=` can be used to + add elements to a JSON array. Note how the `null` value was silently + converted to a JSON array.,push_back} + + @since version 1.0.0 + */ + void push_back(basic_json&& val) + { + // push_back only works for null objects or arrays + if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array()))) + { + JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()))); + } + + // transform null object into an array + if (is_null()) + { + m_type = value_t::array; + m_value = value_t::array; + assert_invariant(); + } + + // add element to array (move semantics) + m_value.array->push_back(std::move(val)); + // if val is moved from, basic_json move constructor marks it null so we do not call the destructor + } + + /*! + @brief add an object to an array + @copydoc push_back(basic_json&&) + */ + reference operator+=(basic_json&& val) + { + push_back(std::move(val)); + return *this; + } + + /*! + @brief add an object to an array + @copydoc push_back(basic_json&&) + */ + void push_back(const basic_json& val) + { + // push_back only works for null objects or arrays + if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array()))) + { + JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()))); + } + + // transform null object into an array + if (is_null()) + { + m_type = value_t::array; + m_value = value_t::array; + assert_invariant(); + } + + // add element to array + m_value.array->push_back(val); + } + + /*! + @brief add an object to an array + @copydoc push_back(basic_json&&) + */ + reference operator+=(const basic_json& val) + { + push_back(val); + return *this; + } + + /*! + @brief add an object to an object + + Inserts the given element @a val to the JSON object. If the function is + called on a JSON null value, an empty object is created before inserting + @a val. + + @param[in] val the value to add to the JSON object + + @throw type_error.308 when called on a type other than JSON object or + null; example: `"cannot use push_back() with number"` + + @complexity Logarithmic in the size of the container, O(log(`size()`)). + + @liveexample{The example shows how `push_back()` and `+=` can be used to + add elements to a JSON object. Note how the `null` value was silently + converted to a JSON object.,push_back__object_t__value} + + @since version 1.0.0 + */ + void push_back(const typename object_t::value_type& val) + { + // push_back only works for null objects or objects + if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object()))) + { + JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()))); + } + + // transform null object into an object + if (is_null()) + { + m_type = value_t::object; + m_value = value_t::object; + assert_invariant(); + } + + // add element to array + m_value.object->insert(val); + } + + /*! + @brief add an object to an object + @copydoc push_back(const typename object_t::value_type&) + */ + reference operator+=(const typename object_t::value_type& val) + { + push_back(val); + return *this; + } + + /*! + @brief add an object to an object + + This function allows to use `push_back` with an initializer list. In case + + 1. the current value is an object, + 2. the initializer list @a init contains only two elements, and + 3. the first element of @a init is a string, + + @a init is converted into an object element and added using + @ref push_back(const typename object_t::value_type&). Otherwise, @a init + is converted to a JSON value and added using @ref push_back(basic_json&&). + + @param[in] init an initializer list + + @complexity Linear in the size of the initializer list @a init. + + @note This function is required to resolve an ambiguous overload error, + because pairs like `{"key", "value"}` can be both interpreted as + `object_t::value_type` or `std::initializer_list`, see + https://github.com/nlohmann/json/issues/235 for more information. + + @liveexample{The example shows how initializer lists are treated as + objects when possible.,push_back__initializer_list} + */ + void push_back(initializer_list_t init) + { + if (is_object() && init.size() == 2 && (*init.begin())->is_string()) + { + basic_json&& key = init.begin()->moved_or_copied(); + push_back(typename object_t::value_type( + std::move(key.get_ref()), (init.begin() + 1)->moved_or_copied())); + } + else + { + push_back(basic_json(init)); + } + } + + /*! + @brief add an object to an object + @copydoc push_back(initializer_list_t) + */ + reference operator+=(initializer_list_t init) + { + push_back(init); + return *this; + } + + /*! + @brief add an object to an array + + Creates a JSON value from the passed parameters @a args to the end of the + JSON value. If the function is called on a JSON null value, an empty array + is created before appending the value created from @a args. + + @param[in] args arguments to forward to a constructor of @ref basic_json + @tparam Args compatible types to create a @ref basic_json object + + @return reference to the inserted element + + @throw type_error.311 when called on a type other than JSON array or + null; example: `"cannot use emplace_back() with number"` + + @complexity Amortized constant. + + @liveexample{The example shows how `push_back()` can be used to add + elements to a JSON array. Note how the `null` value was silently converted + to a JSON array.,emplace_back} + + @since version 2.0.8, returns reference since 3.7.0 + */ + template + reference emplace_back(Args&& ... args) + { + // emplace_back only works for null objects or arrays + if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array()))) + { + JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name()))); + } + + // transform null object into an array + if (is_null()) + { + m_type = value_t::array; + m_value = value_t::array; + assert_invariant(); + } + + // add element to array (perfect forwarding) +#ifdef JSON_HAS_CPP_17 + return m_value.array->emplace_back(std::forward(args)...); +#else + m_value.array->emplace_back(std::forward(args)...); + return m_value.array->back(); +#endif + } + + /*! + @brief add an object to an object if key does not exist + + Inserts a new element into a JSON object constructed in-place with the + given @a args if there is no element with the key in the container. If the + function is called on a JSON null value, an empty object is created before + appending the value created from @a args. + + @param[in] args arguments to forward to a constructor of @ref basic_json + @tparam Args compatible types to create a @ref basic_json object + + @return a pair consisting of an iterator to the inserted element, or the + already-existing element if no insertion happened, and a bool + denoting whether the insertion took place. + + @throw type_error.311 when called on a type other than JSON object or + null; example: `"cannot use emplace() with number"` + + @complexity Logarithmic in the size of the container, O(log(`size()`)). + + @liveexample{The example shows how `emplace()` can be used to add elements + to a JSON object. Note how the `null` value was silently converted to a + JSON object. Further note how no value is added if there was already one + value stored with the same key.,emplace} + + @since version 2.0.8 + */ + template + std::pair emplace(Args&& ... args) + { + // emplace only works for null objects or arrays + if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object()))) + { + JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name()))); + } + + // transform null object into an object + if (is_null()) + { + m_type = value_t::object; + m_value = value_t::object; + assert_invariant(); + } + + // add element to array (perfect forwarding) + auto res = m_value.object->emplace(std::forward(args)...); + // create result iterator and set iterator to the result of emplace + auto it = begin(); + it.m_it.object_iterator = res.first; + + // return pair of iterator and boolean + return {it, res.second}; + } + + /// Helper for insertion of an iterator + /// @note: This uses std::distance to support GCC 4.8, + /// see https://github.com/nlohmann/json/pull/1257 + template + iterator insert_iterator(const_iterator pos, Args&& ... args) + { + iterator result(this); + JSON_ASSERT(m_value.array != nullptr); + + auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator); + m_value.array->insert(pos.m_it.array_iterator, std::forward(args)...); + result.m_it.array_iterator = m_value.array->begin() + insert_pos; + + // This could have been written as: + // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val); + // but the return value of insert is missing in GCC 4.8, so it is written this way instead. + + return result; + } + + /*! + @brief inserts element + + Inserts element @a val before iterator @a pos. + + @param[in] pos iterator before which the content will be inserted; may be + the end() iterator + @param[in] val element to insert + @return iterator pointing to the inserted @a val. + + @throw type_error.309 if called on JSON values other than arrays; + example: `"cannot use insert() with string"` + @throw invalid_iterator.202 if @a pos is not an iterator of *this; + example: `"iterator does not fit current value"` + + @complexity Constant plus linear in the distance between @a pos and end of + the container. + + @liveexample{The example shows how `insert()` is used.,insert} + + @since version 1.0.0 + */ + iterator insert(const_iterator pos, const basic_json& val) + { + // insert only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + // check if iterator pos fits to this JSON value + if (JSON_HEDLEY_UNLIKELY(pos.m_object != this)) + { + JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value")); + } + + // insert to array and return iterator + return insert_iterator(pos, val); + } + + JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()))); + } + + /*! + @brief inserts element + @copydoc insert(const_iterator, const basic_json&) + */ + iterator insert(const_iterator pos, basic_json&& val) + { + return insert(pos, val); + } + + /*! + @brief inserts elements + + Inserts @a cnt copies of @a val before iterator @a pos. + + @param[in] pos iterator before which the content will be inserted; may be + the end() iterator + @param[in] cnt number of copies of @a val to insert + @param[in] val element to insert + @return iterator pointing to the first element inserted, or @a pos if + `cnt==0` + + @throw type_error.309 if called on JSON values other than arrays; example: + `"cannot use insert() with string"` + @throw invalid_iterator.202 if @a pos is not an iterator of *this; + example: `"iterator does not fit current value"` + + @complexity Linear in @a cnt plus linear in the distance between @a pos + and end of the container. + + @liveexample{The example shows how `insert()` is used.,insert__count} + + @since version 1.0.0 + */ + iterator insert(const_iterator pos, size_type cnt, const basic_json& val) + { + // insert only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + // check if iterator pos fits to this JSON value + if (JSON_HEDLEY_UNLIKELY(pos.m_object != this)) + { + JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value")); + } + + // insert to array and return iterator + return insert_iterator(pos, cnt, val); + } + + JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()))); + } + + /*! + @brief inserts elements + + Inserts elements from range `[first, last)` before iterator @a pos. + + @param[in] pos iterator before which the content will be inserted; may be + the end() iterator + @param[in] first begin of the range of elements to insert + @param[in] last end of the range of elements to insert + + @throw type_error.309 if called on JSON values other than arrays; example: + `"cannot use insert() with string"` + @throw invalid_iterator.202 if @a pos is not an iterator of *this; + example: `"iterator does not fit current value"` + @throw invalid_iterator.210 if @a first and @a last do not belong to the + same JSON value; example: `"iterators do not fit"` + @throw invalid_iterator.211 if @a first or @a last are iterators into + container for which insert is called; example: `"passed iterators may not + belong to container"` + + @return iterator pointing to the first element inserted, or @a pos if + `first==last` + + @complexity Linear in `std::distance(first, last)` plus linear in the + distance between @a pos and end of the container. + + @liveexample{The example shows how `insert()` is used.,insert__range} + + @since version 1.0.0 + */ + iterator insert(const_iterator pos, const_iterator first, const_iterator last) + { + // insert only works for arrays + if (JSON_HEDLEY_UNLIKELY(!is_array())) + { + JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()))); + } + + // check if iterator pos fits to this JSON value + if (JSON_HEDLEY_UNLIKELY(pos.m_object != this)) + { + JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value")); + } + + // check if range iterators belong to the same JSON object + if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object)) + { + JSON_THROW(invalid_iterator::create(210, "iterators do not fit")); + } + + if (JSON_HEDLEY_UNLIKELY(first.m_object == this)) + { + JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container")); + } + + // insert to array and return iterator + return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator); + } + + /*! + @brief inserts elements + + Inserts elements from initializer list @a ilist before iterator @a pos. + + @param[in] pos iterator before which the content will be inserted; may be + the end() iterator + @param[in] ilist initializer list to insert the values from + + @throw type_error.309 if called on JSON values other than arrays; example: + `"cannot use insert() with string"` + @throw invalid_iterator.202 if @a pos is not an iterator of *this; + example: `"iterator does not fit current value"` + + @return iterator pointing to the first element inserted, or @a pos if + `ilist` is empty + + @complexity Linear in `ilist.size()` plus linear in the distance between + @a pos and end of the container. + + @liveexample{The example shows how `insert()` is used.,insert__ilist} + + @since version 1.0.0 + */ + iterator insert(const_iterator pos, initializer_list_t ilist) + { + // insert only works for arrays + if (JSON_HEDLEY_UNLIKELY(!is_array())) + { + JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()))); + } + + // check if iterator pos fits to this JSON value + if (JSON_HEDLEY_UNLIKELY(pos.m_object != this)) + { + JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value")); + } + + // insert to array and return iterator + return insert_iterator(pos, ilist.begin(), ilist.end()); + } + + /*! + @brief inserts elements + + Inserts elements from range `[first, last)`. + + @param[in] first begin of the range of elements to insert + @param[in] last end of the range of elements to insert + + @throw type_error.309 if called on JSON values other than objects; example: + `"cannot use insert() with string"` + @throw invalid_iterator.202 if iterator @a first or @a last does does not + point to an object; example: `"iterators first and last must point to + objects"` + @throw invalid_iterator.210 if @a first and @a last do not belong to the + same JSON value; example: `"iterators do not fit"` + + @complexity Logarithmic: `O(N*log(size() + N))`, where `N` is the number + of elements to insert. + + @liveexample{The example shows how `insert()` is used.,insert__range_object} + + @since version 3.0.0 + */ + void insert(const_iterator first, const_iterator last) + { + // insert only works for objects + if (JSON_HEDLEY_UNLIKELY(!is_object())) + { + JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()))); + } + + // check if range iterators belong to the same JSON object + if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object)) + { + JSON_THROW(invalid_iterator::create(210, "iterators do not fit")); + } + + // passed iterators must belong to objects + if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object())) + { + JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects")); + } + + m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator); + } + + /*! + @brief updates a JSON object from another object, overwriting existing keys + + Inserts all values from JSON object @a j and overwrites existing keys. + + @param[in] j JSON object to read values from + + @throw type_error.312 if called on JSON values other than objects; example: + `"cannot use update() with string"` + + @complexity O(N*log(size() + N)), where N is the number of elements to + insert. + + @liveexample{The example shows how `update()` is used.,update} + + @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update + + @since version 3.0.0 + */ + void update(const_reference j) + { + // implicitly convert null value to an empty object + if (is_null()) + { + m_type = value_t::object; + m_value.object = create(); + assert_invariant(); + } + + if (JSON_HEDLEY_UNLIKELY(!is_object())) + { + JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name()))); + } + if (JSON_HEDLEY_UNLIKELY(!j.is_object())) + { + JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(j.type_name()))); + } + + for (auto it = j.cbegin(); it != j.cend(); ++it) + { + m_value.object->operator[](it.key()) = it.value(); + } + } + + /*! + @brief updates a JSON object from another object, overwriting existing keys + + Inserts all values from from range `[first, last)` and overwrites existing + keys. + + @param[in] first begin of the range of elements to insert + @param[in] last end of the range of elements to insert + + @throw type_error.312 if called on JSON values other than objects; example: + `"cannot use update() with string"` + @throw invalid_iterator.202 if iterator @a first or @a last does does not + point to an object; example: `"iterators first and last must point to + objects"` + @throw invalid_iterator.210 if @a first and @a last do not belong to the + same JSON value; example: `"iterators do not fit"` + + @complexity O(N*log(size() + N)), where N is the number of elements to + insert. + + @liveexample{The example shows how `update()` is used__range.,update} + + @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update + + @since version 3.0.0 + */ + void update(const_iterator first, const_iterator last) + { + // implicitly convert null value to an empty object + if (is_null()) + { + m_type = value_t::object; + m_value.object = create(); + assert_invariant(); + } + + if (JSON_HEDLEY_UNLIKELY(!is_object())) + { + JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name()))); + } + + // check if range iterators belong to the same JSON object + if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object)) + { + JSON_THROW(invalid_iterator::create(210, "iterators do not fit")); + } + + // passed iterators must belong to objects + if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object() + || !last.m_object->is_object())) + { + JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects")); + } + + for (auto it = first; it != last; ++it) + { + m_value.object->operator[](it.key()) = it.value(); + } + } + + /*! + @brief exchanges the values + + Exchanges the contents of the JSON value with those of @a other. Does not + invoke any move, copy, or swap operations on individual elements. All + iterators and references remain valid. The past-the-end iterator is + invalidated. + + @param[in,out] other JSON value to exchange the contents with + + @complexity Constant. + + @liveexample{The example below shows how JSON values can be swapped with + `swap()`.,swap__reference} + + @since version 1.0.0 + */ + void swap(reference other) noexcept ( + std::is_nothrow_move_constructible::value&& + std::is_nothrow_move_assignable::value&& + std::is_nothrow_move_constructible::value&& + std::is_nothrow_move_assignable::value + ) + { + std::swap(m_type, other.m_type); + std::swap(m_value, other.m_value); + assert_invariant(); + } + + /*! + @brief exchanges the values + + Exchanges the contents of the JSON value from @a left with those of @a right. Does not + invoke any move, copy, or swap operations on individual elements. All + iterators and references remain valid. The past-the-end iterator is + invalidated. implemented as a friend function callable via ADL. + + @param[in,out] left JSON value to exchange the contents with + @param[in,out] right JSON value to exchange the contents with + + @complexity Constant. + + @liveexample{The example below shows how JSON values can be swapped with + `swap()`.,swap__reference} + + @since version 1.0.0 + */ + friend void swap(reference left, reference right) noexcept ( + std::is_nothrow_move_constructible::value&& + std::is_nothrow_move_assignable::value&& + std::is_nothrow_move_constructible::value&& + std::is_nothrow_move_assignable::value + ) + { + left.swap(right); + } + + /*! + @brief exchanges the values + + Exchanges the contents of a JSON array with those of @a other. Does not + invoke any move, copy, or swap operations on individual elements. All + iterators and references remain valid. The past-the-end iterator is + invalidated. + + @param[in,out] other array to exchange the contents with + + @throw type_error.310 when JSON value is not an array; example: `"cannot + use swap() with string"` + + @complexity Constant. + + @liveexample{The example below shows how arrays can be swapped with + `swap()`.,swap__array_t} + + @since version 1.0.0 + */ + void swap(array_t& other) + { + // swap only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + std::swap(*(m_value.array), other); + } + else + { + JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()))); + } + } + + /*! + @brief exchanges the values + + Exchanges the contents of a JSON object with those of @a other. Does not + invoke any move, copy, or swap operations on individual elements. All + iterators and references remain valid. The past-the-end iterator is + invalidated. + + @param[in,out] other object to exchange the contents with + + @throw type_error.310 when JSON value is not an object; example: + `"cannot use swap() with string"` + + @complexity Constant. + + @liveexample{The example below shows how objects can be swapped with + `swap()`.,swap__object_t} + + @since version 1.0.0 + */ + void swap(object_t& other) + { + // swap only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + std::swap(*(m_value.object), other); + } + else + { + JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()))); + } + } + + /*! + @brief exchanges the values + + Exchanges the contents of a JSON string with those of @a other. Does not + invoke any move, copy, or swap operations on individual elements. All + iterators and references remain valid. The past-the-end iterator is + invalidated. + + @param[in,out] other string to exchange the contents with + + @throw type_error.310 when JSON value is not a string; example: `"cannot + use swap() with boolean"` + + @complexity Constant. + + @liveexample{The example below shows how strings can be swapped with + `swap()`.,swap__string_t} + + @since version 1.0.0 + */ + void swap(string_t& other) + { + // swap only works for strings + if (JSON_HEDLEY_LIKELY(is_string())) + { + std::swap(*(m_value.string), other); + } + else + { + JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()))); + } + } + + /*! + @brief exchanges the values + + Exchanges the contents of a JSON string with those of @a other. Does not + invoke any move, copy, or swap operations on individual elements. All + iterators and references remain valid. The past-the-end iterator is + invalidated. + + @param[in,out] other binary to exchange the contents with + + @throw type_error.310 when JSON value is not a string; example: `"cannot + use swap() with boolean"` + + @complexity Constant. + + @liveexample{The example below shows how strings can be swapped with + `swap()`.,swap__binary_t} + + @since version 3.8.0 + */ + void swap(binary_t& other) + { + // swap only works for strings + if (JSON_HEDLEY_LIKELY(is_binary())) + { + std::swap(*(m_value.binary), other); + } + else + { + JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()))); + } + } + + /// @copydoc swap(binary_t) + void swap(typename binary_t::container_type& other) + { + // swap only works for strings + if (JSON_HEDLEY_LIKELY(is_binary())) + { + std::swap(*(m_value.binary), other); + } + else + { + JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()))); + } + } + + /// @} + + public: + ////////////////////////////////////////// + // lexicographical comparison operators // + ////////////////////////////////////////// + + /// @name lexicographical comparison operators + /// @{ + + /*! + @brief comparison: equal + + Compares two JSON values for equality according to the following rules: + - Two JSON values are equal if (1) they are from the same type and (2) + their stored values are the same according to their respective + `operator==`. + - Integer and floating-point numbers are automatically converted before + comparison. Note that two NaN values are always treated as unequal. + - Two JSON null values are equal. + + @note Floating-point inside JSON values numbers are compared with + `json::number_float_t::operator==` which is `double::operator==` by + default. To compare floating-point while respecting an epsilon, an alternative + [comparison function](https://github.com/mariokonrad/marnav/blob/master/include/marnav/math/floatingpoint.hpp#L34-#L39) + could be used, for instance + @code {.cpp} + template::value, T>::type> + inline bool is_same(T a, T b, T epsilon = std::numeric_limits::epsilon()) noexcept + { + return std::abs(a - b) <= epsilon; + } + @endcode + Or you can self-defined operator equal function like this: + @code {.cpp} + bool my_equal(const_reference lhs, const_reference rhs) { + const auto lhs_type lhs.type(); + const auto rhs_type rhs.type(); + if (lhs_type == rhs_type) { + switch(lhs_type) + // self_defined case + case value_t::number_float: + return std::abs(lhs - rhs) <= std::numeric_limits::epsilon(); + // other cases remain the same with the original + ... + } + ... + } + @endcode + + @note NaN values never compare equal to themselves or to other NaN values. + + @param[in] lhs first JSON value to consider + @param[in] rhs second JSON value to consider + @return whether the values @a lhs and @a rhs are equal + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @complexity Linear. + + @liveexample{The example demonstrates comparing several JSON + types.,operator__equal} + + @since version 1.0.0 + */ + friend bool operator==(const_reference lhs, const_reference rhs) noexcept + { + const auto lhs_type = lhs.type(); + const auto rhs_type = rhs.type(); + + if (lhs_type == rhs_type) + { + switch (lhs_type) + { + case value_t::array: + return *lhs.m_value.array == *rhs.m_value.array; + + case value_t::object: + return *lhs.m_value.object == *rhs.m_value.object; + + case value_t::null: + return true; + + case value_t::string: + return *lhs.m_value.string == *rhs.m_value.string; + + case value_t::boolean: + return lhs.m_value.boolean == rhs.m_value.boolean; + + case value_t::number_integer: + return lhs.m_value.number_integer == rhs.m_value.number_integer; + + case value_t::number_unsigned: + return lhs.m_value.number_unsigned == rhs.m_value.number_unsigned; + + case value_t::number_float: + return lhs.m_value.number_float == rhs.m_value.number_float; + + case value_t::binary: + return *lhs.m_value.binary == *rhs.m_value.binary; + + default: + return false; + } + } + else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float) + { + return static_cast(lhs.m_value.number_integer) == rhs.m_value.number_float; + } + else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer) + { + return lhs.m_value.number_float == static_cast(rhs.m_value.number_integer); + } + else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float) + { + return static_cast(lhs.m_value.number_unsigned) == rhs.m_value.number_float; + } + else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned) + { + return lhs.m_value.number_float == static_cast(rhs.m_value.number_unsigned); + } + else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer) + { + return static_cast(lhs.m_value.number_unsigned) == rhs.m_value.number_integer; + } + else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned) + { + return lhs.m_value.number_integer == static_cast(rhs.m_value.number_unsigned); + } + + return false; + } + + /*! + @brief comparison: equal + @copydoc operator==(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept + { + return lhs == basic_json(rhs); + } + + /*! + @brief comparison: equal + @copydoc operator==(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept + { + return basic_json(lhs) == rhs; + } + + /*! + @brief comparison: not equal + + Compares two JSON values for inequality by calculating `not (lhs == rhs)`. + + @param[in] lhs first JSON value to consider + @param[in] rhs second JSON value to consider + @return whether the values @a lhs and @a rhs are not equal + + @complexity Linear. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @liveexample{The example demonstrates comparing several JSON + types.,operator__notequal} + + @since version 1.0.0 + */ + friend bool operator!=(const_reference lhs, const_reference rhs) noexcept + { + return !(lhs == rhs); + } + + /*! + @brief comparison: not equal + @copydoc operator!=(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator!=(const_reference lhs, const ScalarType rhs) noexcept + { + return lhs != basic_json(rhs); + } + + /*! + @brief comparison: not equal + @copydoc operator!=(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator!=(const ScalarType lhs, const_reference rhs) noexcept + { + return basic_json(lhs) != rhs; + } + + /*! + @brief comparison: less than + + Compares whether one JSON value @a lhs is less than another JSON value @a + rhs according to the following rules: + - If @a lhs and @a rhs have the same type, the values are compared using + the default `<` operator. + - Integer and floating-point numbers are automatically converted before + comparison + - In case @a lhs and @a rhs have different types, the values are ignored + and the order of the types is considered, see + @ref operator<(const value_t, const value_t). + + @param[in] lhs first JSON value to consider + @param[in] rhs second JSON value to consider + @return whether @a lhs is less than @a rhs + + @complexity Linear. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @liveexample{The example demonstrates comparing several JSON + types.,operator__less} + + @since version 1.0.0 + */ + friend bool operator<(const_reference lhs, const_reference rhs) noexcept + { + const auto lhs_type = lhs.type(); + const auto rhs_type = rhs.type(); + + if (lhs_type == rhs_type) + { + switch (lhs_type) + { + case value_t::array: + // note parentheses are necessary, see + // https://github.com/nlohmann/json/issues/1530 + return (*lhs.m_value.array) < (*rhs.m_value.array); + + case value_t::object: + return (*lhs.m_value.object) < (*rhs.m_value.object); + + case value_t::null: + return false; + + case value_t::string: + return (*lhs.m_value.string) < (*rhs.m_value.string); + + case value_t::boolean: + return (lhs.m_value.boolean) < (rhs.m_value.boolean); + + case value_t::number_integer: + return (lhs.m_value.number_integer) < (rhs.m_value.number_integer); + + case value_t::number_unsigned: + return (lhs.m_value.number_unsigned) < (rhs.m_value.number_unsigned); + + case value_t::number_float: + return (lhs.m_value.number_float) < (rhs.m_value.number_float); + + case value_t::binary: + return (*lhs.m_value.binary) < (*rhs.m_value.binary); + + default: + return false; + } + } + else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float) + { + return static_cast(lhs.m_value.number_integer) < rhs.m_value.number_float; + } + else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer) + { + return lhs.m_value.number_float < static_cast(rhs.m_value.number_integer); + } + else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float) + { + return static_cast(lhs.m_value.number_unsigned) < rhs.m_value.number_float; + } + else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned) + { + return lhs.m_value.number_float < static_cast(rhs.m_value.number_unsigned); + } + else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned) + { + return lhs.m_value.number_integer < static_cast(rhs.m_value.number_unsigned); + } + else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer) + { + return static_cast(lhs.m_value.number_unsigned) < rhs.m_value.number_integer; + } + + // We only reach this line if we cannot compare values. In that case, + // we compare types. Note we have to call the operator explicitly, + // because MSVC has problems otherwise. + return operator<(lhs_type, rhs_type); + } + + /*! + @brief comparison: less than + @copydoc operator<(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator<(const_reference lhs, const ScalarType rhs) noexcept + { + return lhs < basic_json(rhs); + } + + /*! + @brief comparison: less than + @copydoc operator<(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator<(const ScalarType lhs, const_reference rhs) noexcept + { + return basic_json(lhs) < rhs; + } + + /*! + @brief comparison: less than or equal + + Compares whether one JSON value @a lhs is less than or equal to another + JSON value by calculating `not (rhs < lhs)`. + + @param[in] lhs first JSON value to consider + @param[in] rhs second JSON value to consider + @return whether @a lhs is less than or equal to @a rhs + + @complexity Linear. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @liveexample{The example demonstrates comparing several JSON + types.,operator__greater} + + @since version 1.0.0 + */ + friend bool operator<=(const_reference lhs, const_reference rhs) noexcept + { + return !(rhs < lhs); + } + + /*! + @brief comparison: less than or equal + @copydoc operator<=(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator<=(const_reference lhs, const ScalarType rhs) noexcept + { + return lhs <= basic_json(rhs); + } + + /*! + @brief comparison: less than or equal + @copydoc operator<=(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator<=(const ScalarType lhs, const_reference rhs) noexcept + { + return basic_json(lhs) <= rhs; + } + + /*! + @brief comparison: greater than + + Compares whether one JSON value @a lhs is greater than another + JSON value by calculating `not (lhs <= rhs)`. + + @param[in] lhs first JSON value to consider + @param[in] rhs second JSON value to consider + @return whether @a lhs is greater than to @a rhs + + @complexity Linear. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @liveexample{The example demonstrates comparing several JSON + types.,operator__lessequal} + + @since version 1.0.0 + */ + friend bool operator>(const_reference lhs, const_reference rhs) noexcept + { + return !(lhs <= rhs); + } + + /*! + @brief comparison: greater than + @copydoc operator>(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator>(const_reference lhs, const ScalarType rhs) noexcept + { + return lhs > basic_json(rhs); + } + + /*! + @brief comparison: greater than + @copydoc operator>(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator>(const ScalarType lhs, const_reference rhs) noexcept + { + return basic_json(lhs) > rhs; + } + + /*! + @brief comparison: greater than or equal + + Compares whether one JSON value @a lhs is greater than or equal to another + JSON value by calculating `not (lhs < rhs)`. + + @param[in] lhs first JSON value to consider + @param[in] rhs second JSON value to consider + @return whether @a lhs is greater than or equal to @a rhs + + @complexity Linear. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @liveexample{The example demonstrates comparing several JSON + types.,operator__greaterequal} + + @since version 1.0.0 + */ + friend bool operator>=(const_reference lhs, const_reference rhs) noexcept + { + return !(lhs < rhs); + } + + /*! + @brief comparison: greater than or equal + @copydoc operator>=(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator>=(const_reference lhs, const ScalarType rhs) noexcept + { + return lhs >= basic_json(rhs); + } + + /*! + @brief comparison: greater than or equal + @copydoc operator>=(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator>=(const ScalarType lhs, const_reference rhs) noexcept + { + return basic_json(lhs) >= rhs; + } + + /// @} + + /////////////////// + // serialization // + /////////////////// + + /// @name serialization + /// @{ + + /*! + @brief serialize to stream + + Serialize the given JSON value @a j to the output stream @a o. The JSON + value will be serialized using the @ref dump member function. + + - The indentation of the output can be controlled with the member variable + `width` of the output stream @a o. For instance, using the manipulator + `std::setw(4)` on @a o sets the indentation level to `4` and the + serialization result is the same as calling `dump(4)`. + + - The indentation character can be controlled with the member variable + `fill` of the output stream @a o. For instance, the manipulator + `std::setfill('\\t')` sets indentation to use a tab character rather than + the default space character. + + @param[in,out] o stream to serialize to + @param[in] j JSON value to serialize + + @return the stream @a o + + @throw type_error.316 if a string stored inside the JSON value is not + UTF-8 encoded + + @complexity Linear. + + @liveexample{The example below shows the serialization with different + parameters to `width` to adjust the indentation level.,operator_serialize} + + @since version 1.0.0; indentation character added in version 3.0.0 + */ + friend std::ostream& operator<<(std::ostream& o, const basic_json& j) + { + // read width member and use it as indentation parameter if nonzero + const bool pretty_print = o.width() > 0; + const auto indentation = pretty_print ? o.width() : 0; + + // reset width to 0 for subsequent calls to this stream + o.width(0); + + // do the actual serialization + serializer s(detail::output_adapter(o), o.fill()); + s.dump(j, pretty_print, false, static_cast(indentation)); + return o; + } + + /*! + @brief serialize to stream + @deprecated This stream operator is deprecated and will be removed in + future 4.0.0 of the library. Please use + @ref operator<<(std::ostream&, const basic_json&) + instead; that is, replace calls like `j >> o;` with `o << j;`. + @since version 1.0.0; deprecated since version 3.0.0 + */ + JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator<<(std::ostream&, const basic_json&)) + friend std::ostream& operator>>(const basic_json& j, std::ostream& o) + { + return o << j; + } + + /// @} + + + ///////////////////// + // deserialization // + ///////////////////// + + /// @name deserialization + /// @{ + + /*! + @brief deserialize from a compatible input + + @tparam InputType A compatible input, for instance + - an std::istream object + - a FILE pointer + - a C-style array of characters + - a pointer to a null-terminated string of single byte characters + - an object obj for which begin(obj) and end(obj) produces a valid pair of + iterators. + + @param[in] i input to read from + @param[in] cb a parser callback function of type @ref parser_callback_t + which is used to control the deserialization by filtering unwanted values + (optional) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) + @param[in] ignore_comments whether comments should be ignored and treated + like whitespace (true) or yield a parse error (true); (optional, false by + default) + + @return deserialized JSON value; in case of a parse error and + @a allow_exceptions set to `false`, the return value will be + value_t::discarded. + + @throw parse_error.101 if a parse error occurs; example: `""unexpected end + of input; expected string literal""` + @throw parse_error.102 if to_unicode fails or surrogate error + @throw parse_error.103 if to_unicode fails + + @complexity Linear in the length of the input. The parser is a predictive + LL(1) parser. The complexity can be higher if the parser callback function + @a cb or reading from the input @a i has a super-linear complexity. + + @note A UTF-8 byte order mark is silently ignored. + + @liveexample{The example below demonstrates the `parse()` function reading + from an array.,parse__array__parser_callback_t} + + @liveexample{The example below demonstrates the `parse()` function with + and without callback function.,parse__string__parser_callback_t} + + @liveexample{The example below demonstrates the `parse()` function with + and without callback function.,parse__istream__parser_callback_t} + + @liveexample{The example below demonstrates the `parse()` function reading + from a contiguous container.,parse__contiguouscontainer__parser_callback_t} + + @since version 2.0.3 (contiguous containers); version 3.9.0 allowed to + ignore comments. + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json parse(InputType&& i, + const parser_callback_t cb = nullptr, + const bool allow_exceptions = true, + const bool ignore_comments = false) + { + basic_json result; + parser(detail::input_adapter(std::forward(i)), cb, allow_exceptions, ignore_comments).parse(true, result); + return result; + } + + /*! + @brief deserialize from a pair of character iterators + + The value_type of the iterator must be a integral type with size of 1, 2 or + 4 bytes, which will be interpreted respectively as UTF-8, UTF-16 and UTF-32. + + @param[in] first iterator to start of character range + @param[in] last iterator to end of character range + @param[in] cb a parser callback function of type @ref parser_callback_t + which is used to control the deserialization by filtering unwanted values + (optional) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) + @param[in] ignore_comments whether comments should be ignored and treated + like whitespace (true) or yield a parse error (true); (optional, false by + default) + + @return deserialized JSON value; in case of a parse error and + @a allow_exceptions set to `false`, the return value will be + value_t::discarded. + + @throw parse_error.101 if a parse error occurs; example: `""unexpected end + of input; expected string literal""` + @throw parse_error.102 if to_unicode fails or surrogate error + @throw parse_error.103 if to_unicode fails + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json parse(IteratorType first, + IteratorType last, + const parser_callback_t cb = nullptr, + const bool allow_exceptions = true, + const bool ignore_comments = false) + { + basic_json result; + parser(detail::input_adapter(std::move(first), std::move(last)), cb, allow_exceptions, ignore_comments).parse(true, result); + return result; + } + + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, parse(ptr, ptr + len)) + static basic_json parse(detail::span_input_adapter&& i, + const parser_callback_t cb = nullptr, + const bool allow_exceptions = true, + const bool ignore_comments = false) + { + basic_json result; + parser(i.get(), cb, allow_exceptions, ignore_comments).parse(true, result); + return result; + } + + /*! + @brief check if the input is valid JSON + + Unlike the @ref parse(InputType&&, const parser_callback_t,const bool) + function, this function neither throws an exception in case of invalid JSON + input (i.e., a parse error) nor creates diagnostic information. + + @tparam InputType A compatible input, for instance + - an std::istream object + - a FILE pointer + - a C-style array of characters + - a pointer to a null-terminated string of single byte characters + - an object obj for which begin(obj) and end(obj) produces a valid pair of + iterators. + + @param[in] i input to read from + @param[in] ignore_comments whether comments should be ignored and treated + like whitespace (true) or yield a parse error (true); (optional, false by + default) + + @return Whether the input read from @a i is valid JSON. + + @complexity Linear in the length of the input. The parser is a predictive + LL(1) parser. + + @note A UTF-8 byte order mark is silently ignored. + + @liveexample{The example below demonstrates the `accept()` function reading + from a string.,accept__string} + */ + template + static bool accept(InputType&& i, + const bool ignore_comments = false) + { + return parser(detail::input_adapter(std::forward(i)), nullptr, false, ignore_comments).accept(true); + } + + template + static bool accept(IteratorType first, IteratorType last, + const bool ignore_comments = false) + { + return parser(detail::input_adapter(std::move(first), std::move(last)), nullptr, false, ignore_comments).accept(true); + } + + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, accept(ptr, ptr + len)) + static bool accept(detail::span_input_adapter&& i, + const bool ignore_comments = false) + { + return parser(i.get(), nullptr, false, ignore_comments).accept(true); + } + + /*! + @brief generate SAX events + + The SAX event lister must follow the interface of @ref json_sax. + + This function reads from a compatible input. Examples are: + - an std::istream object + - a FILE pointer + - a C-style array of characters + - a pointer to a null-terminated string of single byte characters + - an object obj for which begin(obj) and end(obj) produces a valid pair of + iterators. + + @param[in] i input to read from + @param[in,out] sax SAX event listener + @param[in] format the format to parse (JSON, CBOR, MessagePack, or UBJSON) + @param[in] strict whether the input has to be consumed completely + @param[in] ignore_comments whether comments should be ignored and treated + like whitespace (true) or yield a parse error (true); (optional, false by + default); only applies to the JSON file format. + + @return return value of the last processed SAX event + + @throw parse_error.101 if a parse error occurs; example: `""unexpected end + of input; expected string literal""` + @throw parse_error.102 if to_unicode fails or surrogate error + @throw parse_error.103 if to_unicode fails + + @complexity Linear in the length of the input. The parser is a predictive + LL(1) parser. The complexity can be higher if the SAX consumer @a sax has + a super-linear complexity. + + @note A UTF-8 byte order mark is silently ignored. + + @liveexample{The example below demonstrates the `sax_parse()` function + reading from string and processing the events with a user-defined SAX + event consumer.,sax_parse} + + @since version 3.2.0 + */ + template + JSON_HEDLEY_NON_NULL(2) + static bool sax_parse(InputType&& i, SAX* sax, + input_format_t format = input_format_t::json, + const bool strict = true, + const bool ignore_comments = false) + { + auto ia = detail::input_adapter(std::forward(i)); + return format == input_format_t::json + ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict) + : detail::binary_reader(std::move(ia)).sax_parse(format, sax, strict); + } + + template + JSON_HEDLEY_NON_NULL(3) + static bool sax_parse(IteratorType first, IteratorType last, SAX* sax, + input_format_t format = input_format_t::json, + const bool strict = true, + const bool ignore_comments = false) + { + auto ia = detail::input_adapter(std::move(first), std::move(last)); + return format == input_format_t::json + ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict) + : detail::binary_reader(std::move(ia)).sax_parse(format, sax, strict); + } + + template + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, sax_parse(ptr, ptr + len, ...)) + JSON_HEDLEY_NON_NULL(2) + static bool sax_parse(detail::span_input_adapter&& i, SAX* sax, + input_format_t format = input_format_t::json, + const bool strict = true, + const bool ignore_comments = false) + { + auto ia = i.get(); + return format == input_format_t::json + ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict) + : detail::binary_reader(std::move(ia)).sax_parse(format, sax, strict); + } + + /*! + @brief deserialize from stream + @deprecated This stream operator is deprecated and will be removed in + version 4.0.0 of the library. Please use + @ref operator>>(std::istream&, basic_json&) + instead; that is, replace calls like `j << i;` with `i >> j;`. + @since version 1.0.0; deprecated since version 3.0.0 + */ + JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator>>(std::istream&, basic_json&)) + friend std::istream& operator<<(basic_json& j, std::istream& i) + { + return operator>>(i, j); + } + + /*! + @brief deserialize from stream + + Deserializes an input stream to a JSON value. + + @param[in,out] i input stream to read a serialized JSON value from + @param[in,out] j JSON value to write the deserialized input to + + @throw parse_error.101 in case of an unexpected token + @throw parse_error.102 if to_unicode fails or surrogate error + @throw parse_error.103 if to_unicode fails + + @complexity Linear in the length of the input. The parser is a predictive + LL(1) parser. + + @note A UTF-8 byte order mark is silently ignored. + + @liveexample{The example below shows how a JSON value is constructed by + reading a serialization from a stream.,operator_deserialize} + + @sa parse(std::istream&, const parser_callback_t) for a variant with a + parser callback function to filter values while parsing + + @since version 1.0.0 + */ + friend std::istream& operator>>(std::istream& i, basic_json& j) + { + parser(detail::input_adapter(i)).parse(false, j); + return i; + } + + /// @} + + /////////////////////////// + // convenience functions // + /////////////////////////// + + /*! + @brief return the type as string + + Returns the type name as string to be used in error messages - usually to + indicate that a function was called on a wrong JSON type. + + @return a string representation of a the @a m_type member: + Value type | return value + ----------- | ------------- + null | `"null"` + boolean | `"boolean"` + string | `"string"` + number | `"number"` (for all number types) + object | `"object"` + array | `"array"` + binary | `"binary"` + discarded | `"discarded"` + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @complexity Constant. + + @liveexample{The following code exemplifies `type_name()` for all JSON + types.,type_name} + + @sa @ref type() -- return the type of the JSON value + @sa @ref operator value_t() -- return the type of the JSON value (implicit) + + @since version 1.0.0, public since 2.1.0, `const char*` and `noexcept` + since 3.0.0 + */ + JSON_HEDLEY_RETURNS_NON_NULL + const char* type_name() const noexcept + { + { + switch (m_type) + { + case value_t::null: + return "null"; + case value_t::object: + return "object"; + case value_t::array: + return "array"; + case value_t::string: + return "string"; + case value_t::boolean: + return "boolean"; + case value_t::binary: + return "binary"; + case value_t::discarded: + return "discarded"; + default: + return "number"; + } + } + } + + + private: + ////////////////////// + // member variables // + ////////////////////// + + /// the type of the current element + value_t m_type = value_t::null; + + /// the value of the current element + json_value m_value = {}; + + ////////////////////////////////////////// + // binary serialization/deserialization // + ////////////////////////////////////////// + + /// @name binary serialization/deserialization support + /// @{ + + public: + /*! + @brief create a CBOR serialization of a given JSON value + + Serializes a given JSON value @a j to a byte vector using the CBOR (Concise + Binary Object Representation) serialization format. CBOR is a binary + serialization format which aims to be more compact than JSON itself, yet + more efficient to parse. + + The library uses the following mapping from JSON values types to + CBOR types according to the CBOR specification (RFC 7049): + + JSON value type | value/range | CBOR type | first byte + --------------- | ------------------------------------------ | ---------------------------------- | --------------- + null | `null` | Null | 0xF6 + boolean | `true` | True | 0xF5 + boolean | `false` | False | 0xF4 + number_integer | -9223372036854775808..-2147483649 | Negative integer (8 bytes follow) | 0x3B + number_integer | -2147483648..-32769 | Negative integer (4 bytes follow) | 0x3A + number_integer | -32768..-129 | Negative integer (2 bytes follow) | 0x39 + number_integer | -128..-25 | Negative integer (1 byte follow) | 0x38 + number_integer | -24..-1 | Negative integer | 0x20..0x37 + number_integer | 0..23 | Integer | 0x00..0x17 + number_integer | 24..255 | Unsigned integer (1 byte follow) | 0x18 + number_integer | 256..65535 | Unsigned integer (2 bytes follow) | 0x19 + number_integer | 65536..4294967295 | Unsigned integer (4 bytes follow) | 0x1A + number_integer | 4294967296..18446744073709551615 | Unsigned integer (8 bytes follow) | 0x1B + number_unsigned | 0..23 | Integer | 0x00..0x17 + number_unsigned | 24..255 | Unsigned integer (1 byte follow) | 0x18 + number_unsigned | 256..65535 | Unsigned integer (2 bytes follow) | 0x19 + number_unsigned | 65536..4294967295 | Unsigned integer (4 bytes follow) | 0x1A + number_unsigned | 4294967296..18446744073709551615 | Unsigned integer (8 bytes follow) | 0x1B + number_float | *any value representable by a float* | Single-Precision Float | 0xFA + number_float | *any value NOT representable by a float* | Double-Precision Float | 0xFB + string | *length*: 0..23 | UTF-8 string | 0x60..0x77 + string | *length*: 23..255 | UTF-8 string (1 byte follow) | 0x78 + string | *length*: 256..65535 | UTF-8 string (2 bytes follow) | 0x79 + string | *length*: 65536..4294967295 | UTF-8 string (4 bytes follow) | 0x7A + string | *length*: 4294967296..18446744073709551615 | UTF-8 string (8 bytes follow) | 0x7B + array | *size*: 0..23 | array | 0x80..0x97 + array | *size*: 23..255 | array (1 byte follow) | 0x98 + array | *size*: 256..65535 | array (2 bytes follow) | 0x99 + array | *size*: 65536..4294967295 | array (4 bytes follow) | 0x9A + array | *size*: 4294967296..18446744073709551615 | array (8 bytes follow) | 0x9B + object | *size*: 0..23 | map | 0xA0..0xB7 + object | *size*: 23..255 | map (1 byte follow) | 0xB8 + object | *size*: 256..65535 | map (2 bytes follow) | 0xB9 + object | *size*: 65536..4294967295 | map (4 bytes follow) | 0xBA + object | *size*: 4294967296..18446744073709551615 | map (8 bytes follow) | 0xBB + binary | *size*: 0..23 | byte string | 0x40..0x57 + binary | *size*: 23..255 | byte string (1 byte follow) | 0x58 + binary | *size*: 256..65535 | byte string (2 bytes follow) | 0x59 + binary | *size*: 65536..4294967295 | byte string (4 bytes follow) | 0x5A + binary | *size*: 4294967296..18446744073709551615 | byte string (8 bytes follow) | 0x5B + + @note The mapping is **complete** in the sense that any JSON value type + can be converted to a CBOR value. + + @note If NaN or Infinity are stored inside a JSON number, they are + serialized properly. This behavior differs from the @ref dump() + function which serializes NaN or Infinity to `null`. + + @note The following CBOR types are not used in the conversion: + - UTF-8 strings terminated by "break" (0x7F) + - arrays terminated by "break" (0x9F) + - maps terminated by "break" (0xBF) + - byte strings terminated by "break" (0x5F) + - date/time (0xC0..0xC1) + - bignum (0xC2..0xC3) + - decimal fraction (0xC4) + - bigfloat (0xC5) + - expected conversions (0xD5..0xD7) + - simple values (0xE0..0xF3, 0xF8) + - undefined (0xF7) + - half-precision floats (0xF9) + - break (0xFF) + + @param[in] j JSON value to serialize + @return CBOR serialization as byte vector + + @complexity Linear in the size of the JSON value @a j. + + @liveexample{The example shows the serialization of a JSON value to a byte + vector in CBOR format.,to_cbor} + + @sa http://cbor.io + @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the + analogous deserialization + @sa @ref to_msgpack(const basic_json&) for the related MessagePack format + @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the + related UBJSON format + + @since version 2.0.9; compact representation of floating-point numbers + since version 3.8.0 + */ + static std::vector to_cbor(const basic_json& j) + { + std::vector result; + to_cbor(j, result); + return result; + } + + static void to_cbor(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_cbor(j); + } + + static void to_cbor(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_cbor(j); + } + + /*! + @brief create a MessagePack serialization of a given JSON value + + Serializes a given JSON value @a j to a byte vector using the MessagePack + serialization format. MessagePack is a binary serialization format which + aims to be more compact than JSON itself, yet more efficient to parse. + + The library uses the following mapping from JSON values types to + MessagePack types according to the MessagePack specification: + + JSON value type | value/range | MessagePack type | first byte + --------------- | --------------------------------- | ---------------- | ---------- + null | `null` | nil | 0xC0 + boolean | `true` | true | 0xC3 + boolean | `false` | false | 0xC2 + number_integer | -9223372036854775808..-2147483649 | int64 | 0xD3 + number_integer | -2147483648..-32769 | int32 | 0xD2 + number_integer | -32768..-129 | int16 | 0xD1 + number_integer | -128..-33 | int8 | 0xD0 + number_integer | -32..-1 | negative fixint | 0xE0..0xFF + number_integer | 0..127 | positive fixint | 0x00..0x7F + number_integer | 128..255 | uint 8 | 0xCC + number_integer | 256..65535 | uint 16 | 0xCD + number_integer | 65536..4294967295 | uint 32 | 0xCE + number_integer | 4294967296..18446744073709551615 | uint 64 | 0xCF + number_unsigned | 0..127 | positive fixint | 0x00..0x7F + number_unsigned | 128..255 | uint 8 | 0xCC + number_unsigned | 256..65535 | uint 16 | 0xCD + number_unsigned | 65536..4294967295 | uint 32 | 0xCE + number_unsigned | 4294967296..18446744073709551615 | uint 64 | 0xCF + number_float | *any value representable by a float* | float 32 | 0xCA + number_float | *any value NOT representable by a float* | float 64 | 0xCB + string | *length*: 0..31 | fixstr | 0xA0..0xBF + string | *length*: 32..255 | str 8 | 0xD9 + string | *length*: 256..65535 | str 16 | 0xDA + string | *length*: 65536..4294967295 | str 32 | 0xDB + array | *size*: 0..15 | fixarray | 0x90..0x9F + array | *size*: 16..65535 | array 16 | 0xDC + array | *size*: 65536..4294967295 | array 32 | 0xDD + object | *size*: 0..15 | fix map | 0x80..0x8F + object | *size*: 16..65535 | map 16 | 0xDE + object | *size*: 65536..4294967295 | map 32 | 0xDF + binary | *size*: 0..255 | bin 8 | 0xC4 + binary | *size*: 256..65535 | bin 16 | 0xC5 + binary | *size*: 65536..4294967295 | bin 32 | 0xC6 + + @note The mapping is **complete** in the sense that any JSON value type + can be converted to a MessagePack value. + + @note The following values can **not** be converted to a MessagePack value: + - strings with more than 4294967295 bytes + - byte strings with more than 4294967295 bytes + - arrays with more than 4294967295 elements + - objects with more than 4294967295 elements + + @note Any MessagePack output created @ref to_msgpack can be successfully + parsed by @ref from_msgpack. + + @note If NaN or Infinity are stored inside a JSON number, they are + serialized properly. This behavior differs from the @ref dump() + function which serializes NaN or Infinity to `null`. + + @param[in] j JSON value to serialize + @return MessagePack serialization as byte vector + + @complexity Linear in the size of the JSON value @a j. + + @liveexample{The example shows the serialization of a JSON value to a byte + vector in MessagePack format.,to_msgpack} + + @sa http://msgpack.org + @sa @ref from_msgpack for the analogous deserialization + @sa @ref to_cbor(const basic_json& for the related CBOR format + @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the + related UBJSON format + + @since version 2.0.9 + */ + static std::vector to_msgpack(const basic_json& j) + { + std::vector result; + to_msgpack(j, result); + return result; + } + + static void to_msgpack(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_msgpack(j); + } + + static void to_msgpack(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_msgpack(j); + } + + /*! + @brief create a UBJSON serialization of a given JSON value + + Serializes a given JSON value @a j to a byte vector using the UBJSON + (Universal Binary JSON) serialization format. UBJSON aims to be more compact + than JSON itself, yet more efficient to parse. + + The library uses the following mapping from JSON values types to + UBJSON types according to the UBJSON specification: + + JSON value type | value/range | UBJSON type | marker + --------------- | --------------------------------- | ----------- | ------ + null | `null` | null | `Z` + boolean | `true` | true | `T` + boolean | `false` | false | `F` + number_integer | -9223372036854775808..-2147483649 | int64 | `L` + number_integer | -2147483648..-32769 | int32 | `l` + number_integer | -32768..-129 | int16 | `I` + number_integer | -128..127 | int8 | `i` + number_integer | 128..255 | uint8 | `U` + number_integer | 256..32767 | int16 | `I` + number_integer | 32768..2147483647 | int32 | `l` + number_integer | 2147483648..9223372036854775807 | int64 | `L` + number_unsigned | 0..127 | int8 | `i` + number_unsigned | 128..255 | uint8 | `U` + number_unsigned | 256..32767 | int16 | `I` + number_unsigned | 32768..2147483647 | int32 | `l` + number_unsigned | 2147483648..9223372036854775807 | int64 | `L` + number_unsigned | 2147483649..18446744073709551615 | high-precision | `H` + number_float | *any value* | float64 | `D` + string | *with shortest length indicator* | string | `S` + array | *see notes on optimized format* | array | `[` + object | *see notes on optimized format* | map | `{` + + @note The mapping is **complete** in the sense that any JSON value type + can be converted to a UBJSON value. + + @note The following values can **not** be converted to a UBJSON value: + - strings with more than 9223372036854775807 bytes (theoretical) + + @note The following markers are not used in the conversion: + - `Z`: no-op values are not created. + - `C`: single-byte strings are serialized with `S` markers. + + @note Any UBJSON output created @ref to_ubjson can be successfully parsed + by @ref from_ubjson. + + @note If NaN or Infinity are stored inside a JSON number, they are + serialized properly. This behavior differs from the @ref dump() + function which serializes NaN or Infinity to `null`. + + @note The optimized formats for containers are supported: Parameter + @a use_size adds size information to the beginning of a container and + removes the closing marker. Parameter @a use_type further checks + whether all elements of a container have the same type and adds the + type marker to the beginning of the container. The @a use_type + parameter must only be used together with @a use_size = true. Note + that @a use_size = true alone may result in larger representations - + the benefit of this parameter is that the receiving side is + immediately informed on the number of elements of the container. + + @note If the JSON data contains the binary type, the value stored is a list + of integers, as suggested by the UBJSON documentation. In particular, + this means that serialization and the deserialization of a JSON + containing binary values into UBJSON and back will result in a + different JSON object. + + @param[in] j JSON value to serialize + @param[in] use_size whether to add size annotations to container types + @param[in] use_type whether to add type annotations to container types + (must be combined with @a use_size = true) + @return UBJSON serialization as byte vector + + @complexity Linear in the size of the JSON value @a j. + + @liveexample{The example shows the serialization of a JSON value to a byte + vector in UBJSON format.,to_ubjson} + + @sa http://ubjson.org + @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the + analogous deserialization + @sa @ref to_cbor(const basic_json& for the related CBOR format + @sa @ref to_msgpack(const basic_json&) for the related MessagePack format + + @since version 3.1.0 + */ + static std::vector to_ubjson(const basic_json& j, + const bool use_size = false, + const bool use_type = false) + { + std::vector result; + to_ubjson(j, result, use_size, use_type); + return result; + } + + static void to_ubjson(const basic_json& j, detail::output_adapter o, + const bool use_size = false, const bool use_type = false) + { + binary_writer(o).write_ubjson(j, use_size, use_type); + } + + static void to_ubjson(const basic_json& j, detail::output_adapter o, + const bool use_size = false, const bool use_type = false) + { + binary_writer(o).write_ubjson(j, use_size, use_type); + } + + + /*! + @brief Serializes the given JSON object `j` to BSON and returns a vector + containing the corresponding BSON-representation. + + BSON (Binary JSON) is a binary format in which zero or more ordered key/value pairs are + stored as a single entity (a so-called document). + + The library uses the following mapping from JSON values types to BSON types: + + JSON value type | value/range | BSON type | marker + --------------- | --------------------------------- | ----------- | ------ + null | `null` | null | 0x0A + boolean | `true`, `false` | boolean | 0x08 + number_integer | -9223372036854775808..-2147483649 | int64 | 0x12 + number_integer | -2147483648..2147483647 | int32 | 0x10 + number_integer | 2147483648..9223372036854775807 | int64 | 0x12 + number_unsigned | 0..2147483647 | int32 | 0x10 + number_unsigned | 2147483648..9223372036854775807 | int64 | 0x12 + number_unsigned | 9223372036854775808..18446744073709551615| -- | -- + number_float | *any value* | double | 0x01 + string | *any value* | string | 0x02 + array | *any value* | document | 0x04 + object | *any value* | document | 0x03 + binary | *any value* | binary | 0x05 + + @warning The mapping is **incomplete**, since only JSON-objects (and things + contained therein) can be serialized to BSON. + Also, integers larger than 9223372036854775807 cannot be serialized to BSON, + and the keys may not contain U+0000, since they are serialized a + zero-terminated c-strings. + + @throw out_of_range.407 if `j.is_number_unsigned() && j.get() > 9223372036854775807` + @throw out_of_range.409 if a key in `j` contains a NULL (U+0000) + @throw type_error.317 if `!j.is_object()` + + @pre The input `j` is required to be an object: `j.is_object() == true`. + + @note Any BSON output created via @ref to_bson can be successfully parsed + by @ref from_bson. + + @param[in] j JSON value to serialize + @return BSON serialization as byte vector + + @complexity Linear in the size of the JSON value @a j. + + @liveexample{The example shows the serialization of a JSON value to a byte + vector in BSON format.,to_bson} + + @sa http://bsonspec.org/spec.html + @sa @ref from_bson(detail::input_adapter&&, const bool strict) for the + analogous deserialization + @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the + related UBJSON format + @sa @ref to_cbor(const basic_json&) for the related CBOR format + @sa @ref to_msgpack(const basic_json&) for the related MessagePack format + */ + static std::vector to_bson(const basic_json& j) + { + std::vector result; + to_bson(j, result); + return result; + } + + /*! + @brief Serializes the given JSON object `j` to BSON and forwards the + corresponding BSON-representation to the given output_adapter `o`. + @param j The JSON object to convert to BSON. + @param o The output adapter that receives the binary BSON representation. + @pre The input `j` shall be an object: `j.is_object() == true` + @sa @ref to_bson(const basic_json&) + */ + static void to_bson(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_bson(j); + } + + /*! + @copydoc to_bson(const basic_json&, detail::output_adapter) + */ + static void to_bson(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_bson(j); + } + + + /*! + @brief create a JSON value from an input in CBOR format + + Deserializes a given input @a i to a JSON value using the CBOR (Concise + Binary Object Representation) serialization format. + + The library maps CBOR types to JSON value types as follows: + + CBOR type | JSON value type | first byte + ---------------------- | --------------- | ---------- + Integer | number_unsigned | 0x00..0x17 + Unsigned integer | number_unsigned | 0x18 + Unsigned integer | number_unsigned | 0x19 + Unsigned integer | number_unsigned | 0x1A + Unsigned integer | number_unsigned | 0x1B + Negative integer | number_integer | 0x20..0x37 + Negative integer | number_integer | 0x38 + Negative integer | number_integer | 0x39 + Negative integer | number_integer | 0x3A + Negative integer | number_integer | 0x3B + Byte string | binary | 0x40..0x57 + Byte string | binary | 0x58 + Byte string | binary | 0x59 + Byte string | binary | 0x5A + Byte string | binary | 0x5B + UTF-8 string | string | 0x60..0x77 + UTF-8 string | string | 0x78 + UTF-8 string | string | 0x79 + UTF-8 string | string | 0x7A + UTF-8 string | string | 0x7B + UTF-8 string | string | 0x7F + array | array | 0x80..0x97 + array | array | 0x98 + array | array | 0x99 + array | array | 0x9A + array | array | 0x9B + array | array | 0x9F + map | object | 0xA0..0xB7 + map | object | 0xB8 + map | object | 0xB9 + map | object | 0xBA + map | object | 0xBB + map | object | 0xBF + False | `false` | 0xF4 + True | `true` | 0xF5 + Null | `null` | 0xF6 + Half-Precision Float | number_float | 0xF9 + Single-Precision Float | number_float | 0xFA + Double-Precision Float | number_float | 0xFB + + @warning The mapping is **incomplete** in the sense that not all CBOR + types can be converted to a JSON value. The following CBOR types + are not supported and will yield parse errors (parse_error.112): + - date/time (0xC0..0xC1) + - bignum (0xC2..0xC3) + - decimal fraction (0xC4) + - bigfloat (0xC5) + - expected conversions (0xD5..0xD7) + - simple values (0xE0..0xF3, 0xF8) + - undefined (0xF7) + + @warning CBOR allows map keys of any type, whereas JSON only allows + strings as keys in object values. Therefore, CBOR maps with keys + other than UTF-8 strings are rejected (parse_error.113). + + @note Any CBOR output created @ref to_cbor can be successfully parsed by + @ref from_cbor. + + @param[in] i an input in CBOR format convertible to an input adapter + @param[in] strict whether to expect the input to be consumed until EOF + (true by default) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) + @param[in] tag_handler how to treat CBOR tags (optional, error by default) + + @return deserialized JSON value; in case of a parse error and + @a allow_exceptions set to `false`, the return value will be + value_t::discarded. + + @throw parse_error.110 if the given input ends prematurely or the end of + file was not reached when @a strict was set to true + @throw parse_error.112 if unsupported features from CBOR were + used in the given input @a v or if the input is not valid CBOR + @throw parse_error.113 if a string was expected as map key, but not found + + @complexity Linear in the size of the input @a i. + + @liveexample{The example shows the deserialization of a byte vector in CBOR + format to a JSON value.,from_cbor} + + @sa http://cbor.io + @sa @ref to_cbor(const basic_json&) for the analogous serialization + @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the + related MessagePack format + @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the + related UBJSON format + + @since version 2.0.9; parameter @a start_index since 2.1.1; changed to + consume input adapters, removed start_index parameter, and added + @a strict parameter since 3.0.0; added @a allow_exceptions parameter + since 3.2.0; added @a tag_handler parameter since 3.9.0. + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_cbor(InputType&& i, + const bool strict = true, + const bool allow_exceptions = true, + const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::forward(i)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler); + return res ? result : basic_json(value_t::discarded); + } + + /*! + @copydoc from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_cbor(IteratorType first, IteratorType last, + const bool strict = true, + const bool allow_exceptions = true, + const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::move(first), std::move(last)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler); + return res ? result : basic_json(value_t::discarded); + } + + template + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len)) + static basic_json from_cbor(const T* ptr, std::size_t len, + const bool strict = true, + const bool allow_exceptions = true, + const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error) + { + return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler); + } + + + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len)) + static basic_json from_cbor(detail::span_input_adapter&& i, + const bool strict = true, + const bool allow_exceptions = true, + const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = i.get(); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler); + return res ? result : basic_json(value_t::discarded); + } + + /*! + @brief create a JSON value from an input in MessagePack format + + Deserializes a given input @a i to a JSON value using the MessagePack + serialization format. + + The library maps MessagePack types to JSON value types as follows: + + MessagePack type | JSON value type | first byte + ---------------- | --------------- | ---------- + positive fixint | number_unsigned | 0x00..0x7F + fixmap | object | 0x80..0x8F + fixarray | array | 0x90..0x9F + fixstr | string | 0xA0..0xBF + nil | `null` | 0xC0 + false | `false` | 0xC2 + true | `true` | 0xC3 + float 32 | number_float | 0xCA + float 64 | number_float | 0xCB + uint 8 | number_unsigned | 0xCC + uint 16 | number_unsigned | 0xCD + uint 32 | number_unsigned | 0xCE + uint 64 | number_unsigned | 0xCF + int 8 | number_integer | 0xD0 + int 16 | number_integer | 0xD1 + int 32 | number_integer | 0xD2 + int 64 | number_integer | 0xD3 + str 8 | string | 0xD9 + str 16 | string | 0xDA + str 32 | string | 0xDB + array 16 | array | 0xDC + array 32 | array | 0xDD + map 16 | object | 0xDE + map 32 | object | 0xDF + bin 8 | binary | 0xC4 + bin 16 | binary | 0xC5 + bin 32 | binary | 0xC6 + ext 8 | binary | 0xC7 + ext 16 | binary | 0xC8 + ext 32 | binary | 0xC9 + fixext 1 | binary | 0xD4 + fixext 2 | binary | 0xD5 + fixext 4 | binary | 0xD6 + fixext 8 | binary | 0xD7 + fixext 16 | binary | 0xD8 + negative fixint | number_integer | 0xE0-0xFF + + @note Any MessagePack output created @ref to_msgpack can be successfully + parsed by @ref from_msgpack. + + @param[in] i an input in MessagePack format convertible to an input + adapter + @param[in] strict whether to expect the input to be consumed until EOF + (true by default) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) + + @return deserialized JSON value; in case of a parse error and + @a allow_exceptions set to `false`, the return value will be + value_t::discarded. + + @throw parse_error.110 if the given input ends prematurely or the end of + file was not reached when @a strict was set to true + @throw parse_error.112 if unsupported features from MessagePack were + used in the given input @a i or if the input is not valid MessagePack + @throw parse_error.113 if a string was expected as map key, but not found + + @complexity Linear in the size of the input @a i. + + @liveexample{The example shows the deserialization of a byte vector in + MessagePack format to a JSON value.,from_msgpack} + + @sa http://msgpack.org + @sa @ref to_msgpack(const basic_json&) for the analogous serialization + @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the + related CBOR format + @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for + the related UBJSON format + @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for + the related BSON format + + @since version 2.0.9; parameter @a start_index since 2.1.1; changed to + consume input adapters, removed start_index parameter, and added + @a strict parameter since 3.0.0; added @a allow_exceptions parameter + since 3.2.0 + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_msgpack(InputType&& i, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::forward(i)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + /*! + @copydoc from_msgpack(detail::input_adapter&&, const bool, const bool) + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_msgpack(IteratorType first, IteratorType last, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::move(first), std::move(last)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + + template + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len)) + static basic_json from_msgpack(const T* ptr, std::size_t len, + const bool strict = true, + const bool allow_exceptions = true) + { + return from_msgpack(ptr, ptr + len, strict, allow_exceptions); + } + + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len)) + static basic_json from_msgpack(detail::span_input_adapter&& i, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = i.get(); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + + /*! + @brief create a JSON value from an input in UBJSON format + + Deserializes a given input @a i to a JSON value using the UBJSON (Universal + Binary JSON) serialization format. + + The library maps UBJSON types to JSON value types as follows: + + UBJSON type | JSON value type | marker + ----------- | --------------------------------------- | ------ + no-op | *no value, next value is read* | `N` + null | `null` | `Z` + false | `false` | `F` + true | `true` | `T` + float32 | number_float | `d` + float64 | number_float | `D` + uint8 | number_unsigned | `U` + int8 | number_integer | `i` + int16 | number_integer | `I` + int32 | number_integer | `l` + int64 | number_integer | `L` + high-precision number | number_integer, number_unsigned, or number_float - depends on number string | 'H' + string | string | `S` + char | string | `C` + array | array (optimized values are supported) | `[` + object | object (optimized values are supported) | `{` + + @note The mapping is **complete** in the sense that any UBJSON value can + be converted to a JSON value. + + @param[in] i an input in UBJSON format convertible to an input adapter + @param[in] strict whether to expect the input to be consumed until EOF + (true by default) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) + + @return deserialized JSON value; in case of a parse error and + @a allow_exceptions set to `false`, the return value will be + value_t::discarded. + + @throw parse_error.110 if the given input ends prematurely or the end of + file was not reached when @a strict was set to true + @throw parse_error.112 if a parse error occurs + @throw parse_error.113 if a string could not be parsed successfully + + @complexity Linear in the size of the input @a i. + + @liveexample{The example shows the deserialization of a byte vector in + UBJSON format to a JSON value.,from_ubjson} + + @sa http://ubjson.org + @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the + analogous serialization + @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the + related CBOR format + @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for + the related MessagePack format + @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for + the related BSON format + + @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0 + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_ubjson(InputType&& i, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::forward(i)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + /*! + @copydoc from_ubjson(detail::input_adapter&&, const bool, const bool) + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_ubjson(IteratorType first, IteratorType last, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::move(first), std::move(last)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + template + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len)) + static basic_json from_ubjson(const T* ptr, std::size_t len, + const bool strict = true, + const bool allow_exceptions = true) + { + return from_ubjson(ptr, ptr + len, strict, allow_exceptions); + } + + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len)) + static basic_json from_ubjson(detail::span_input_adapter&& i, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = i.get(); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + + /*! + @brief Create a JSON value from an input in BSON format + + Deserializes a given input @a i to a JSON value using the BSON (Binary JSON) + serialization format. + + The library maps BSON record types to JSON value types as follows: + + BSON type | BSON marker byte | JSON value type + --------------- | ---------------- | --------------------------- + double | 0x01 | number_float + string | 0x02 | string + document | 0x03 | object + array | 0x04 | array + binary | 0x05 | still unsupported + undefined | 0x06 | still unsupported + ObjectId | 0x07 | still unsupported + boolean | 0x08 | boolean + UTC Date-Time | 0x09 | still unsupported + null | 0x0A | null + Regular Expr. | 0x0B | still unsupported + DB Pointer | 0x0C | still unsupported + JavaScript Code | 0x0D | still unsupported + Symbol | 0x0E | still unsupported + JavaScript Code | 0x0F | still unsupported + int32 | 0x10 | number_integer + Timestamp | 0x11 | still unsupported + 128-bit decimal float | 0x13 | still unsupported + Max Key | 0x7F | still unsupported + Min Key | 0xFF | still unsupported + + @warning The mapping is **incomplete**. The unsupported mappings + are indicated in the table above. + + @param[in] i an input in BSON format convertible to an input adapter + @param[in] strict whether to expect the input to be consumed until EOF + (true by default) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) + + @return deserialized JSON value; in case of a parse error and + @a allow_exceptions set to `false`, the return value will be + value_t::discarded. + + @throw parse_error.114 if an unsupported BSON record type is encountered + + @complexity Linear in the size of the input @a i. + + @liveexample{The example shows the deserialization of a byte vector in + BSON format to a JSON value.,from_bson} + + @sa http://bsonspec.org/spec.html + @sa @ref to_bson(const basic_json&) for the analogous serialization + @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the + related CBOR format + @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for + the related MessagePack format + @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the + related UBJSON format + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_bson(InputType&& i, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::forward(i)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + /*! + @copydoc from_bson(detail::input_adapter&&, const bool, const bool) + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_bson(IteratorType first, IteratorType last, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::move(first), std::move(last)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + template + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len)) + static basic_json from_bson(const T* ptr, std::size_t len, + const bool strict = true, + const bool allow_exceptions = true) + { + return from_bson(ptr, ptr + len, strict, allow_exceptions); + } + + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len)) + static basic_json from_bson(detail::span_input_adapter&& i, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = i.get(); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + /// @} + + ////////////////////////// + // JSON Pointer support // + ////////////////////////// + + /// @name JSON Pointer functions + /// @{ + + /*! + @brief access specified element via JSON Pointer + + Uses a JSON pointer to retrieve a reference to the respective JSON value. + No bound checking is performed. Similar to @ref operator[](const typename + object_t::key_type&), `null` values are created in arrays and objects if + necessary. + + In particular: + - If the JSON pointer points to an object key that does not exist, it + is created an filled with a `null` value before a reference to it + is returned. + - If the JSON pointer points to an array index that does not exist, it + is created an filled with a `null` value before a reference to it + is returned. All indices between the current maximum and the given + index are also filled with `null`. + - The special value `-` is treated as a synonym for the index past the + end. + + @param[in] ptr a JSON pointer + + @return reference to the element pointed to by @a ptr + + @complexity Constant. + + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + @throw out_of_range.404 if the JSON pointer can not be resolved + + @liveexample{The behavior is shown in the example.,operatorjson_pointer} + + @since version 2.0.0 + */ + reference operator[](const json_pointer& ptr) + { + return ptr.get_unchecked(this); + } + + /*! + @brief access specified element via JSON Pointer + + Uses a JSON pointer to retrieve a reference to the respective JSON value. + No bound checking is performed. The function does not change the JSON + value; no `null` values are created. In particular, the special value + `-` yields an exception. + + @param[in] ptr JSON pointer to the desired element + + @return const reference to the element pointed to by @a ptr + + @complexity Constant. + + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + @throw out_of_range.402 if the array index '-' is used + @throw out_of_range.404 if the JSON pointer can not be resolved + + @liveexample{The behavior is shown in the example.,operatorjson_pointer_const} + + @since version 2.0.0 + */ + const_reference operator[](const json_pointer& ptr) const + { + return ptr.get_unchecked(this); + } + + /*! + @brief access specified element via JSON Pointer + + Returns a reference to the element at with specified JSON pointer @a ptr, + with bounds checking. + + @param[in] ptr JSON pointer to the desired element + + @return reference to the element pointed to by @a ptr + + @throw parse_error.106 if an array index in the passed JSON pointer @a ptr + begins with '0'. See example below. + + @throw parse_error.109 if an array index in the passed JSON pointer @a ptr + is not a number. See example below. + + @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr + is out of range. See example below. + + @throw out_of_range.402 if the array index '-' is used in the passed JSON + pointer @a ptr. As `at` provides checked access (and no elements are + implicitly inserted), the index '-' is always invalid. See example below. + + @throw out_of_range.403 if the JSON pointer describes a key of an object + which cannot be found. See example below. + + @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved. + See example below. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Constant. + + @since version 2.0.0 + + @liveexample{The behavior is shown in the example.,at_json_pointer} + */ + reference at(const json_pointer& ptr) + { + return ptr.get_checked(this); + } + + /*! + @brief access specified element via JSON Pointer + + Returns a const reference to the element at with specified JSON pointer @a + ptr, with bounds checking. + + @param[in] ptr JSON pointer to the desired element + + @return reference to the element pointed to by @a ptr + + @throw parse_error.106 if an array index in the passed JSON pointer @a ptr + begins with '0'. See example below. + + @throw parse_error.109 if an array index in the passed JSON pointer @a ptr + is not a number. See example below. + + @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr + is out of range. See example below. + + @throw out_of_range.402 if the array index '-' is used in the passed JSON + pointer @a ptr. As `at` provides checked access (and no elements are + implicitly inserted), the index '-' is always invalid. See example below. + + @throw out_of_range.403 if the JSON pointer describes a key of an object + which cannot be found. See example below. + + @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved. + See example below. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Constant. + + @since version 2.0.0 + + @liveexample{The behavior is shown in the example.,at_json_pointer_const} + */ + const_reference at(const json_pointer& ptr) const + { + return ptr.get_checked(this); + } + + /*! + @brief return flattened JSON value + + The function creates a JSON object whose keys are JSON pointers (see [RFC + 6901](https://tools.ietf.org/html/rfc6901)) and whose values are all + primitive. The original JSON value can be restored using the @ref + unflatten() function. + + @return an object that maps JSON pointers to primitive values + + @note Empty objects and arrays are flattened to `null` and will not be + reconstructed correctly by the @ref unflatten() function. + + @complexity Linear in the size the JSON value. + + @liveexample{The following code shows how a JSON object is flattened to an + object whose keys consist of JSON pointers.,flatten} + + @sa @ref unflatten() for the reverse function + + @since version 2.0.0 + */ + basic_json flatten() const + { + basic_json result(value_t::object); + json_pointer::flatten("", *this, result); + return result; + } + + /*! + @brief unflatten a previously flattened JSON value + + The function restores the arbitrary nesting of a JSON value that has been + flattened before using the @ref flatten() function. The JSON value must + meet certain constraints: + 1. The value must be an object. + 2. The keys must be JSON pointers (see + [RFC 6901](https://tools.ietf.org/html/rfc6901)) + 3. The mapped values must be primitive JSON types. + + @return the original JSON from a flattened version + + @note Empty objects and arrays are flattened by @ref flatten() to `null` + values and can not unflattened to their original type. Apart from + this example, for a JSON value `j`, the following is always true: + `j == j.flatten().unflatten()`. + + @complexity Linear in the size the JSON value. + + @throw type_error.314 if value is not an object + @throw type_error.315 if object values are not primitive + + @liveexample{The following code shows how a flattened JSON object is + unflattened into the original nested JSON object.,unflatten} + + @sa @ref flatten() for the reverse function + + @since version 2.0.0 + */ + basic_json unflatten() const + { + return json_pointer::unflatten(*this); + } + + /// @} + + ////////////////////////// + // JSON Patch functions // + ////////////////////////// + + /// @name JSON Patch functions + /// @{ + + /*! + @brief applies a JSON patch + + [JSON Patch](http://jsonpatch.com) defines a JSON document structure for + expressing a sequence of operations to apply to a JSON) document. With + this function, a JSON Patch is applied to the current JSON value by + executing all operations from the patch. + + @param[in] json_patch JSON patch document + @return patched document + + @note The application of a patch is atomic: Either all operations succeed + and the patched document is returned or an exception is thrown. In + any case, the original value is not changed: the patch is applied + to a copy of the value. + + @throw parse_error.104 if the JSON patch does not consist of an array of + objects + + @throw parse_error.105 if the JSON patch is malformed (e.g., mandatory + attributes are missing); example: `"operation add must have member path"` + + @throw out_of_range.401 if an array index is out of range. + + @throw out_of_range.403 if a JSON pointer inside the patch could not be + resolved successfully in the current JSON value; example: `"key baz not + found"` + + @throw out_of_range.405 if JSON pointer has no parent ("add", "remove", + "move") + + @throw other_error.501 if "test" operation was unsuccessful + + @complexity Linear in the size of the JSON value and the length of the + JSON patch. As usually only a fraction of the JSON value is affected by + the patch, the complexity can usually be neglected. + + @liveexample{The following code shows how a JSON patch is applied to a + value.,patch} + + @sa @ref diff -- create a JSON patch by comparing two JSON values + + @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902) + @sa [RFC 6901 (JSON Pointer)](https://tools.ietf.org/html/rfc6901) + + @since version 2.0.0 + */ + basic_json patch(const basic_json& json_patch) const + { + // make a working copy to apply the patch to + basic_json result = *this; + + // the valid JSON Patch operations + enum class patch_operations {add, remove, replace, move, copy, test, invalid}; + + const auto get_op = [](const std::string & op) + { + if (op == "add") + { + return patch_operations::add; + } + if (op == "remove") + { + return patch_operations::remove; + } + if (op == "replace") + { + return patch_operations::replace; + } + if (op == "move") + { + return patch_operations::move; + } + if (op == "copy") + { + return patch_operations::copy; + } + if (op == "test") + { + return patch_operations::test; + } + + return patch_operations::invalid; + }; + + // wrapper for "add" operation; add value at ptr + const auto operation_add = [&result](json_pointer & ptr, basic_json val) + { + // adding to the root of the target document means replacing it + if (ptr.empty()) + { + result = val; + return; + } + + // make sure the top element of the pointer exists + json_pointer top_pointer = ptr.top(); + if (top_pointer != ptr) + { + result.at(top_pointer); + } + + // get reference to parent of JSON pointer ptr + const auto last_path = ptr.back(); + ptr.pop_back(); + basic_json& parent = result[ptr]; + + switch (parent.m_type) + { + case value_t::null: + case value_t::object: + { + // use operator[] to add value + parent[last_path] = val; + break; + } + + case value_t::array: + { + if (last_path == "-") + { + // special case: append to back + parent.push_back(val); + } + else + { + const auto idx = json_pointer::array_index(last_path); + if (JSON_HEDLEY_UNLIKELY(idx > parent.size())) + { + // avoid undefined behavior + JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range")); + } + + // default case: insert add offset + parent.insert(parent.begin() + static_cast(idx), val); + } + break; + } + + // if there exists a parent it cannot be primitive + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // LCOV_EXCL_LINE + } + }; + + // wrapper for "remove" operation; remove value at ptr + const auto operation_remove = [&result](json_pointer & ptr) + { + // get reference to parent of JSON pointer ptr + const auto last_path = ptr.back(); + ptr.pop_back(); + basic_json& parent = result.at(ptr); + + // remove child + if (parent.is_object()) + { + // perform range check + auto it = parent.find(last_path); + if (JSON_HEDLEY_LIKELY(it != parent.end())) + { + parent.erase(it); + } + else + { + JSON_THROW(out_of_range::create(403, "key '" + last_path + "' not found")); + } + } + else if (parent.is_array()) + { + // note erase performs range check + parent.erase(json_pointer::array_index(last_path)); + } + }; + + // type check: top level value must be an array + if (JSON_HEDLEY_UNLIKELY(!json_patch.is_array())) + { + JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects")); + } + + // iterate and apply the operations + for (const auto& val : json_patch) + { + // wrapper to get a value for an operation + const auto get_value = [&val](const std::string & op, + const std::string & member, + bool string_type) -> basic_json & + { + // find value + auto it = val.m_value.object->find(member); + + // context-sensitive error message + const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'"; + + // check if desired value is present + if (JSON_HEDLEY_UNLIKELY(it == val.m_value.object->end())) + { + JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'")); + } + + // check if result is of type string + if (JSON_HEDLEY_UNLIKELY(string_type && !it->second.is_string())) + { + JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'")); + } + + // no error: return value + return it->second; + }; + + // type check: every element of the array must be an object + if (JSON_HEDLEY_UNLIKELY(!val.is_object())) + { + JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects")); + } + + // collect mandatory members + const auto op = get_value("op", "op", true).template get(); + const auto path = get_value(op, "path", true).template get(); + json_pointer ptr(path); + + switch (get_op(op)) + { + case patch_operations::add: + { + operation_add(ptr, get_value("add", "value", false)); + break; + } + + case patch_operations::remove: + { + operation_remove(ptr); + break; + } + + case patch_operations::replace: + { + // the "path" location must exist - use at() + result.at(ptr) = get_value("replace", "value", false); + break; + } + + case patch_operations::move: + { + const auto from_path = get_value("move", "from", true).template get(); + json_pointer from_ptr(from_path); + + // the "from" location must exist - use at() + basic_json v = result.at(from_ptr); + + // The move operation is functionally identical to a + // "remove" operation on the "from" location, followed + // immediately by an "add" operation at the target + // location with the value that was just removed. + operation_remove(from_ptr); + operation_add(ptr, v); + break; + } + + case patch_operations::copy: + { + const auto from_path = get_value("copy", "from", true).template get(); + const json_pointer from_ptr(from_path); + + // the "from" location must exist - use at() + basic_json v = result.at(from_ptr); + + // The copy is functionally identical to an "add" + // operation at the target location using the value + // specified in the "from" member. + operation_add(ptr, v); + break; + } + + case patch_operations::test: + { + bool success = false; + JSON_TRY + { + // check if "value" matches the one at "path" + // the "path" location must exist - use at() + success = (result.at(ptr) == get_value("test", "value", false)); + } + JSON_INTERNAL_CATCH (out_of_range&) + { + // ignore out of range errors: success remains false + } + + // throw an exception if test fails + if (JSON_HEDLEY_UNLIKELY(!success)) + { + JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump())); + } + + break; + } + + default: + { + // op must be "add", "remove", "replace", "move", "copy", or + // "test" + JSON_THROW(parse_error::create(105, 0, "operation value '" + op + "' is invalid")); + } + } + } + + return result; + } + + /*! + @brief creates a diff as a JSON patch + + Creates a [JSON Patch](http://jsonpatch.com) so that value @a source can + be changed into the value @a target by calling @ref patch function. + + @invariant For two JSON values @a source and @a target, the following code + yields always `true`: + @code {.cpp} + source.patch(diff(source, target)) == target; + @endcode + + @note Currently, only `remove`, `add`, and `replace` operations are + generated. + + @param[in] source JSON value to compare from + @param[in] target JSON value to compare against + @param[in] path helper value to create JSON pointers + + @return a JSON patch to convert the @a source to @a target + + @complexity Linear in the lengths of @a source and @a target. + + @liveexample{The following code shows how a JSON patch is created as a + diff for two JSON values.,diff} + + @sa @ref patch -- apply a JSON patch + @sa @ref merge_patch -- apply a JSON Merge Patch + + @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902) + + @since version 2.0.0 + */ + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json diff(const basic_json& source, const basic_json& target, + const std::string& path = "") + { + // the patch + basic_json result(value_t::array); + + // if the values are the same, return empty patch + if (source == target) + { + return result; + } + + if (source.type() != target.type()) + { + // different types: replace value + result.push_back( + { + {"op", "replace"}, {"path", path}, {"value", target} + }); + return result; + } + + switch (source.type()) + { + case value_t::array: + { + // first pass: traverse common elements + std::size_t i = 0; + while (i < source.size() && i < target.size()) + { + // recursive call to compare array values at index i + auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i)); + result.insert(result.end(), temp_diff.begin(), temp_diff.end()); + ++i; + } + + // i now reached the end of at least one array + // in a second pass, traverse the remaining elements + + // remove my remaining elements + const auto end_index = static_cast(result.size()); + while (i < source.size()) + { + // add operations in reverse order to avoid invalid + // indices + result.insert(result.begin() + end_index, object( + { + {"op", "remove"}, + {"path", path + "/" + std::to_string(i)} + })); + ++i; + } + + // add other remaining elements + while (i < target.size()) + { + result.push_back( + { + {"op", "add"}, + {"path", path + "/-"}, + {"value", target[i]} + }); + ++i; + } + + break; + } + + case value_t::object: + { + // first pass: traverse this object's elements + for (auto it = source.cbegin(); it != source.cend(); ++it) + { + // escape the key name to be used in a JSON patch + const auto key = json_pointer::escape(it.key()); + + if (target.find(it.key()) != target.end()) + { + // recursive call to compare object values at key it + auto temp_diff = diff(it.value(), target[it.key()], path + "/" + key); + result.insert(result.end(), temp_diff.begin(), temp_diff.end()); + } + else + { + // found a key that is not in o -> remove it + result.push_back(object( + { + {"op", "remove"}, {"path", path + "/" + key} + })); + } + } + + // second pass: traverse other object's elements + for (auto it = target.cbegin(); it != target.cend(); ++it) + { + if (source.find(it.key()) == source.end()) + { + // found a key that is not in this -> add it + const auto key = json_pointer::escape(it.key()); + result.push_back( + { + {"op", "add"}, {"path", path + "/" + key}, + {"value", it.value()} + }); + } + } + + break; + } + + default: + { + // both primitive type: replace value + result.push_back( + { + {"op", "replace"}, {"path", path}, {"value", target} + }); + break; + } + } + + return result; + } + + /// @} + + //////////////////////////////// + // JSON Merge Patch functions // + //////////////////////////////// + + /// @name JSON Merge Patch functions + /// @{ + + /*! + @brief applies a JSON Merge Patch + + The merge patch format is primarily intended for use with the HTTP PATCH + method as a means of describing a set of modifications to a target + resource's content. This function applies a merge patch to the current + JSON value. + + The function implements the following algorithm from Section 2 of + [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396): + + ``` + define MergePatch(Target, Patch): + if Patch is an Object: + if Target is not an Object: + Target = {} // Ignore the contents and set it to an empty Object + for each Name/Value pair in Patch: + if Value is null: + if Name exists in Target: + remove the Name/Value pair from Target + else: + Target[Name] = MergePatch(Target[Name], Value) + return Target + else: + return Patch + ``` + + Thereby, `Target` is the current object; that is, the patch is applied to + the current value. + + @param[in] apply_patch the patch to apply + + @complexity Linear in the lengths of @a patch. + + @liveexample{The following code shows how a JSON Merge Patch is applied to + a JSON document.,merge_patch} + + @sa @ref patch -- apply a JSON patch + @sa [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396) + + @since version 3.0.0 + */ + void merge_patch(const basic_json& apply_patch) + { + if (apply_patch.is_object()) + { + if (!is_object()) + { + *this = object(); + } + for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it) + { + if (it.value().is_null()) + { + erase(it.key()); + } + else + { + operator[](it.key()).merge_patch(it.value()); + } + } + } + else + { + *this = apply_patch; + } + } + + /// @} +}; + +/*! +@brief user-defined to_string function for JSON values + +This function implements a user-defined to_string for JSON objects. + +@param[in] j a JSON object +@return a std::string object +*/ + +NLOHMANN_BASIC_JSON_TPL_DECLARATION +std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j) +{ + return j.dump(); +} +} // namespace nlohmann + +/////////////////////// +// nonmember support // +/////////////////////// + +// specialization of std::swap, and std::hash +namespace std +{ + +/// hash value for JSON objects +template<> +struct hash +{ + /*! + @brief return a hash value for a JSON object + + @since version 1.0.0 + */ + std::size_t operator()(const nlohmann::json& j) const + { + return nlohmann::detail::hash(j); + } +}; + +/// specialization for std::less +/// @note: do not remove the space after '<', +/// see https://github.com/nlohmann/json/pull/679 +template<> +struct less<::nlohmann::detail::value_t> +{ + /*! + @brief compare two value_t enum values + @since version 3.0.0 + */ + bool operator()(nlohmann::detail::value_t lhs, + nlohmann::detail::value_t rhs) const noexcept + { + return nlohmann::detail::operator<(lhs, rhs); + } +}; + +// C++20 prohibit function specialization in the std namespace. +#ifndef JSON_HAS_CPP_20 + +/*! +@brief exchanges the values of two JSON objects + +@since version 1.0.0 +*/ +template<> +inline void swap(nlohmann::json& j1, nlohmann::json& j2) noexcept( + is_nothrow_move_constructible::value&& + is_nothrow_move_assignable::value + ) +{ + j1.swap(j2); +} + +#endif + +} // namespace std + +/*! +@brief user-defined string literal for JSON values + +This operator implements a user-defined string literal for JSON objects. It +can be used by adding `"_json"` to a string literal and returns a JSON object +if no parse error occurred. + +@param[in] s a string representation of a JSON object +@param[in] n the length of string @a s +@return a JSON object + +@since version 1.0.0 +*/ +JSON_HEDLEY_NON_NULL(1) +inline nlohmann::json operator "" _json(const char* s, std::size_t n) +{ + return nlohmann::json::parse(s, s + n); +} + +/*! +@brief user-defined string literal for JSON pointer + +This operator implements a user-defined string literal for JSON Pointers. It +can be used by adding `"_json_pointer"` to a string literal and returns a JSON pointer +object if no parse error occurred. + +@param[in] s a string representation of a JSON Pointer +@param[in] n the length of string @a s +@return a JSON pointer object + +@since version 2.0.0 +*/ +JSON_HEDLEY_NON_NULL(1) +inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n) +{ + return nlohmann::json::json_pointer(std::string(s, n)); +} + +// #include + + +// restore GCC/clang diagnostic settings +#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) + #pragma GCC diagnostic pop +#endif +#if defined(__clang__) + #pragma GCC diagnostic pop +#endif + +// clean up +#undef JSON_ASSERT +#undef JSON_INTERNAL_CATCH +#undef JSON_CATCH +#undef JSON_THROW +#undef JSON_TRY +#undef JSON_HAS_CPP_14 +#undef JSON_HAS_CPP_17 +#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION +#undef NLOHMANN_BASIC_JSON_TPL +#undef JSON_EXPLICIT + +// #include +#undef JSON_HEDLEY_ALWAYS_INLINE +#undef JSON_HEDLEY_ARM_VERSION +#undef JSON_HEDLEY_ARM_VERSION_CHECK +#undef JSON_HEDLEY_ARRAY_PARAM +#undef JSON_HEDLEY_ASSUME +#undef JSON_HEDLEY_BEGIN_C_DECLS +#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE +#undef JSON_HEDLEY_CLANG_HAS_BUILTIN +#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE +#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE +#undef JSON_HEDLEY_CLANG_HAS_EXTENSION +#undef JSON_HEDLEY_CLANG_HAS_FEATURE +#undef JSON_HEDLEY_CLANG_HAS_WARNING +#undef JSON_HEDLEY_COMPCERT_VERSION +#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK +#undef JSON_HEDLEY_CONCAT +#undef JSON_HEDLEY_CONCAT3 +#undef JSON_HEDLEY_CONCAT3_EX +#undef JSON_HEDLEY_CONCAT_EX +#undef JSON_HEDLEY_CONST +#undef JSON_HEDLEY_CONSTEXPR +#undef JSON_HEDLEY_CONST_CAST +#undef JSON_HEDLEY_CPP_CAST +#undef JSON_HEDLEY_CRAY_VERSION +#undef JSON_HEDLEY_CRAY_VERSION_CHECK +#undef JSON_HEDLEY_C_DECL +#undef JSON_HEDLEY_DEPRECATED +#undef JSON_HEDLEY_DEPRECATED_FOR +#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL +#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ +#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED +#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES +#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS +#undef JSON_HEDLEY_DIAGNOSTIC_POP +#undef JSON_HEDLEY_DIAGNOSTIC_PUSH +#undef JSON_HEDLEY_DMC_VERSION +#undef JSON_HEDLEY_DMC_VERSION_CHECK +#undef JSON_HEDLEY_EMPTY_BASES +#undef JSON_HEDLEY_EMSCRIPTEN_VERSION +#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK +#undef JSON_HEDLEY_END_C_DECLS +#undef JSON_HEDLEY_FLAGS +#undef JSON_HEDLEY_FLAGS_CAST +#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE +#undef JSON_HEDLEY_GCC_HAS_BUILTIN +#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE +#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE +#undef JSON_HEDLEY_GCC_HAS_EXTENSION +#undef JSON_HEDLEY_GCC_HAS_FEATURE +#undef JSON_HEDLEY_GCC_HAS_WARNING +#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK +#undef JSON_HEDLEY_GCC_VERSION +#undef JSON_HEDLEY_GCC_VERSION_CHECK +#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE +#undef JSON_HEDLEY_GNUC_HAS_BUILTIN +#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE +#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE +#undef JSON_HEDLEY_GNUC_HAS_EXTENSION +#undef JSON_HEDLEY_GNUC_HAS_FEATURE +#undef JSON_HEDLEY_GNUC_HAS_WARNING +#undef JSON_HEDLEY_GNUC_VERSION +#undef JSON_HEDLEY_GNUC_VERSION_CHECK +#undef JSON_HEDLEY_HAS_ATTRIBUTE +#undef JSON_HEDLEY_HAS_BUILTIN +#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE +#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS +#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE +#undef JSON_HEDLEY_HAS_EXTENSION +#undef JSON_HEDLEY_HAS_FEATURE +#undef JSON_HEDLEY_HAS_WARNING +#undef JSON_HEDLEY_IAR_VERSION +#undef JSON_HEDLEY_IAR_VERSION_CHECK +#undef JSON_HEDLEY_IBM_VERSION +#undef JSON_HEDLEY_IBM_VERSION_CHECK +#undef JSON_HEDLEY_IMPORT +#undef JSON_HEDLEY_INLINE +#undef JSON_HEDLEY_INTEL_VERSION +#undef JSON_HEDLEY_INTEL_VERSION_CHECK +#undef JSON_HEDLEY_IS_CONSTANT +#undef JSON_HEDLEY_IS_CONSTEXPR_ +#undef JSON_HEDLEY_LIKELY +#undef JSON_HEDLEY_MALLOC +#undef JSON_HEDLEY_MESSAGE +#undef JSON_HEDLEY_MSVC_VERSION +#undef JSON_HEDLEY_MSVC_VERSION_CHECK +#undef JSON_HEDLEY_NEVER_INLINE +#undef JSON_HEDLEY_NON_NULL +#undef JSON_HEDLEY_NO_ESCAPE +#undef JSON_HEDLEY_NO_RETURN +#undef JSON_HEDLEY_NO_THROW +#undef JSON_HEDLEY_NULL +#undef JSON_HEDLEY_PELLES_VERSION +#undef JSON_HEDLEY_PELLES_VERSION_CHECK +#undef JSON_HEDLEY_PGI_VERSION +#undef JSON_HEDLEY_PGI_VERSION_CHECK +#undef JSON_HEDLEY_PREDICT +#undef JSON_HEDLEY_PRINTF_FORMAT +#undef JSON_HEDLEY_PRIVATE +#undef JSON_HEDLEY_PUBLIC +#undef JSON_HEDLEY_PURE +#undef JSON_HEDLEY_REINTERPRET_CAST +#undef JSON_HEDLEY_REQUIRE +#undef JSON_HEDLEY_REQUIRE_CONSTEXPR +#undef JSON_HEDLEY_REQUIRE_MSG +#undef JSON_HEDLEY_RESTRICT +#undef JSON_HEDLEY_RETURNS_NON_NULL +#undef JSON_HEDLEY_SENTINEL +#undef JSON_HEDLEY_STATIC_ASSERT +#undef JSON_HEDLEY_STATIC_CAST +#undef JSON_HEDLEY_STRINGIFY +#undef JSON_HEDLEY_STRINGIFY_EX +#undef JSON_HEDLEY_SUNPRO_VERSION +#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK +#undef JSON_HEDLEY_TINYC_VERSION +#undef JSON_HEDLEY_TINYC_VERSION_CHECK +#undef JSON_HEDLEY_TI_ARMCL_VERSION +#undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK +#undef JSON_HEDLEY_TI_CL2000_VERSION +#undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK +#undef JSON_HEDLEY_TI_CL430_VERSION +#undef JSON_HEDLEY_TI_CL430_VERSION_CHECK +#undef JSON_HEDLEY_TI_CL6X_VERSION +#undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK +#undef JSON_HEDLEY_TI_CL7X_VERSION +#undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK +#undef JSON_HEDLEY_TI_CLPRU_VERSION +#undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK +#undef JSON_HEDLEY_TI_VERSION +#undef JSON_HEDLEY_TI_VERSION_CHECK +#undef JSON_HEDLEY_UNAVAILABLE +#undef JSON_HEDLEY_UNLIKELY +#undef JSON_HEDLEY_UNPREDICTABLE +#undef JSON_HEDLEY_UNREACHABLE +#undef JSON_HEDLEY_UNREACHABLE_RETURN +#undef JSON_HEDLEY_VERSION +#undef JSON_HEDLEY_VERSION_DECODE_MAJOR +#undef JSON_HEDLEY_VERSION_DECODE_MINOR +#undef JSON_HEDLEY_VERSION_DECODE_REVISION +#undef JSON_HEDLEY_VERSION_ENCODE +#undef JSON_HEDLEY_WARNING +#undef JSON_HEDLEY_WARN_UNUSED_RESULT +#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG +#undef JSON_HEDLEY_FALL_THROUGH + + + +#endif // INCLUDE_NLOHMANN_JSON_HPP_ From 4883d139505fdbc40b1603693bd96320fea35fec Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Thu, 3 Sep 2020 20:39:16 +0200 Subject: [PATCH 045/234] Update: Support for automatic updates Use Github REST API to get info about latest release (version, changelog, installer url). --- Src/Lib/DownloadHelper.cpp | 255 ++++++++----------- Src/Lib/DownloadHelper.h | 15 +- Src/Localization/English/en-US.csv | Bin 126106 -> 126046 bytes Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 5 +- Src/Update/Update.cpp | 8 +- Src/Update/Update.rc | 14 +- 6 files changed, 132 insertions(+), 165 deletions(-) diff --git a/Src/Lib/DownloadHelper.cpp b/Src/Lib/DownloadHelper.cpp index b38c6b0c3..62bf6aa48 100644 --- a/Src/Lib/DownloadHelper.cpp +++ b/Src/Lib/DownloadHelper.cpp @@ -14,6 +14,7 @@ #include "FNVHash.h" #include "StringUtils.h" #include "Translations.h" +#include "json.hpp" #include #include @@ -141,30 +142,9 @@ LRESULT CProgressDlg::OnCancel( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& static bool g_bCheckingVersion; -static DWORD GetTimeStamp( const wchar_t *fname ) -{ - HANDLE h=CreateFile(fname,GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); - if (h==INVALID_HANDLE_VALUE) - return 0; - DWORD res=0; - DWORD q; - IMAGE_DOS_HEADER header; - if (ReadFile(h,&header,sizeof(header),&q,NULL) && q==sizeof(header)) - { - if (SetFilePointer(h,header.e_lfanew+8,NULL,FILE_BEGIN)!=INVALID_SET_FILE_POINTER) - { - if (!ReadFile(h,&res,4,&q,NULL) || q!=4) - res=0; - } - } - CloseHandle(h); - return res; -} - enum TDownloadResult { DOWNLOAD_OK, - DOWNLOAD_SAMETIME, DOWNLOAD_CANCEL, // errors @@ -176,8 +156,7 @@ enum TDownloadResult // Downloads a file // filename - returns the name of the downloaded file -// timestamp - if not zero, it is compared to the timestamp of the file and returns DOWNLOAD_SAMETIME if the same (and buf will be empty) -static TDownloadResult DownloadFile( const wchar_t *url, std::vector &buf, CString *pFilename, DWORD timestamp, bool bAcceptCached, CProgressDlg *pProgress, TSettingsComponent component ) +static TDownloadResult DownloadFile( const wchar_t *url, std::vector &buf, CString *pFilename, bool bAcceptCached, CProgressDlg *pProgress, TSettingsComponent component ) { const wchar_t *compName=L"Open-Shell"; switch (component) @@ -264,7 +243,7 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector &buf, if (fileSize==0) pProgress->SetProgress(-1); } - int CHUNK_SIZE=timestamp?1024:32768; // start with small chunk to verify the timestamp + int CHUNK_SIZE=32768; DWORD size=0; buf.reserve(fileSize+CHUNK_SIZE); while (1) @@ -286,25 +265,6 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector &buf, size+=dwSize; if (pProgress && fileSize) pProgress->SetProgress(size*100/fileSize); - if (timestamp && (size=sizeof(IMAGE_DOS_HEADER)) - { - DWORD pos=((IMAGE_DOS_HEADER*)&buf[0])->e_lfanew+8; - if (size>=pos+4) - { - if (timestamp==*(DWORD*)&buf[pos]) - { - res=DOWNLOAD_SAMETIME; - break; - } - timestamp=0; - CHUNK_SIZE=32768; - } - } } buf.resize(size); } @@ -377,80 +337,17 @@ static DWORD WINAPI ThreadVersionCheck( void *param ) return 0; } DWORD curVersion=GetVersionEx(g_Instance); - regKey.SetDWORDValue(L"LastUpdateVersion",curVersion); - // download file - wchar_t fname[_MAX_PATH]=L"%ALLUSERSPROFILE%\\OpenShell"; - DoEnvironmentSubst(fname,_countof(fname)); - SHCreateDirectory(NULL,fname); - PathAppend(fname,L"update.ver"); - - bool res=false; - CString urlBase=LoadStringEx(IDS_VERSION_URL); + bool res = false; VersionData data; - data.Clear(); - if (data.Load(fname,false)==VersionData::LOAD_OK) - { - if (!data.altUrl.IsEmpty()) - urlBase=data.altUrl; - WIN32_FILE_ATTRIBUTE_DATA attr; - if (GetFileAttributesEx(fname,GetFileExInfoStandard,&attr)) - { - DWORD writeTime=(DWORD)(((((ULONGLONG)attr.ftLastWriteTime.dwHighDateTime)<<32)|attr.ftLastWriteTime.dwLowDateTime)/TIME_DIVISOR); - if (curTime>writeTime && (curTime-writeTime)>24,(curVersion>>16)&0xFF,curVersion&0xFFFF); - - #ifdef UPDATE_LOG - LogToFile(UPDATE_LOG,L"URL: %s",url); - #endif - - std::vector buf; - TDownloadResult download=DownloadFile(url,buf,NULL,GetTimeStamp(fname),false,params.progress,params.component); - #ifdef UPDATE_LOG - LogToFile(UPDATE_LOG,L"Download result: %d",download); - #endif - if (download==DOWNLOAD_CANCEL) - { - g_bCheckingVersion=false; - return 2; - } + auto load = data.Load(); - if (downloadSetText(LoadStringEx(IDS_PROGRESS_VERIFY)); - params.progress->SetProgress(-1); - } - VersionData::TLoadResult load=data.Load(fname,false); - #ifdef UPDATE_LOG - LogToFile(UPDATE_LOG,L"Load result: %d",load); - #endif - if (load==VersionData::LOAD_BAD_FILE) - DeleteFile(fname); - res=(load==VersionData::LOAD_OK); - } - } +#ifdef UPDATE_LOG + LogToFile(UPDATE_LOG, L"Load result: %d", load); +#endif + res = (load == VersionData::LOAD_OK); } curTime+=(rand()*TIME_PRECISION)/(RAND_MAX+1)-(TIME_PRECISION/2); // add between -30 and 30 minutes to randomize access @@ -583,42 +480,19 @@ DWORD CheckForNewVersion( HWND owner, TSettingsComponent component, TVersionChec } else { - DWORD buildTime=0; - { - // skip the update if the update component is not found - wchar_t path[_MAX_PATH]; - GetModuleFileName(_AtlBaseModule.GetModuleInstance(),path,_countof(path)); - PathRemoveFileSpec(path); - PathAppend(path,L"Update.exe"); - - WIN32_FILE_ATTRIBUTE_DATA attr; - if (!GetFileAttributesEx(path,GetFileExInfoStandard,&attr)) - return 0; - - buildTime=(DWORD)(((((ULONGLONG)attr.ftCreationTime.dwHighDateTime)<<32)|attr.ftCreationTime.dwLowDateTime)/TIME_DIVISOR); // in 0.01 hours - } - ULONGLONG curTimeL; GetSystemTimeAsFileTime((FILETIME*)&curTimeL); DWORD curTime=(DWORD)(curTimeL/TIME_DIVISOR); // in 0.01 hours - if (curTime-buildTime>24*365*TIME_PRECISION) - return 0; // the build is more than a year old, don't do automatic updates CRegKey regKey; if (regKey.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\OpenShell")!=ERROR_SUCCESS) regKey.Create(HKEY_CURRENT_USER,L"Software\\OpenShell\\OpenShell"); - DWORD lastVersion; - if (regKey.QueryDWORDValue(L"LastUpdateVersion",lastVersion)!=ERROR_SUCCESS) - lastVersion=0; - if (lastVersion==GetVersionEx(g_Instance)) - { - DWORD lastTime; - if (regKey.QueryDWORDValue(L"LastUpdateTime",lastTime)!=ERROR_SUCCESS) - lastTime=0; - if ((int)(curTime-lastTime)<168*TIME_PRECISION) - return 0; // check weekly - } + DWORD lastTime; + if (regKey.QueryDWORDValue(L"LastUpdateTime",lastTime)!=ERROR_SUCCESS) + lastTime=0; + if ((int)(curTime-lastTime)<168*TIME_PRECISION) + return 0; // check weekly // check the Update setting (uses the current value in the registry, not the one from memory { @@ -848,6 +722,94 @@ void VersionData::Swap( VersionData &data ) std::swap(languages,data.languages); } +std::vector DownloadUrl(const wchar_t* url) +{ +#ifdef UPDATE_LOG + LogToFile(UPDATE_LOG, L"URL: %s", url); +#endif + + std::vector buffer; + TDownloadResult download = DownloadFile(url, buffer, nullptr, false, nullptr, COMPONENT_UPDATE); + +#ifdef UPDATE_LOG + LogToFile(UPDATE_LOG, L"Download result: %d", download); +#endif + + if (download != DOWNLOAD_OK) + buffer.clear(); + + return buffer; +} + +using namespace nlohmann; + +VersionData::TLoadResult VersionData::Load() +{ + Clear(); + + auto buf = DownloadUrl(L"https://api.github.com/repos/Open-Shell/Open-Shell-Menu/releases/latest"); + if (buf.empty()) + return LOAD_ERROR; + + try + { + auto data = json::parse(buf.begin(), buf.end()); + + // skip prerelease versions + if (data["prerelease"].get()) + return LOAD_BAD_VERSION; + + // get version from tag name + auto tag = data["tag_name"].get(); + if (tag.empty()) + return LOAD_BAD_FILE; + + int v1, v2, v3; + if (sscanf_s(tag.c_str(), "v%d.%d.%d", &v1, &v2, &v3) != 3) + return LOAD_BAD_FILE; + + newVersion = (v1 << 24) | (v2 << 16) | v3; + + // installer url + std::string url; + for (const auto& asset : data["assets"]) + { + if (asset["name"].get().find("OpenShellSetup") == 0) + { + url = asset["browser_download_url"].get(); + break; + } + } + + if (url.empty()) + return LOAD_BAD_FILE; + + downloadUrl.Append(CA2T(url.c_str())); + + // changelog + auto body = data["body"].get(); + if (!body.empty()) + { + auto name = data["name"].get(); + if (!name.empty()) + { + news.Append(CA2T(name.c_str())); + news.Append(L"\r\n\r\n"); + } + + news.Append(CA2T(body.c_str())); + news.Replace(L"\\n", L"\n"); + news.Replace(L"\\r", L"\r"); + } + + return LOAD_OK; + } + catch (...) + { + return LOAD_BAD_FILE; + } +} + VersionData::TLoadResult VersionData::Load( const wchar_t *fname, bool bLoadFlags ) { Clear(); @@ -937,7 +899,7 @@ static DWORD WINAPI ThreadDownloadFile( void *param ) params.saveRes=0; std::vector buf; - params.downloadRes=DownloadFile(params.url,buf,params.fname.IsEmpty()?¶ms.fname:NULL,0,params.bAcceptCached,params.progress,params.component); + params.downloadRes=DownloadFile(params.url,buf,params.fname.IsEmpty()?¶ms.fname:NULL,params.bAcceptCached,params.progress,params.component); if (params.downloadRes==DOWNLOAD_CANCEL || params.downloadRes>=DOWNLOAD_FIRST_ERROR) return 0; @@ -971,6 +933,7 @@ static DWORD WINAPI ThreadDownloadFile( void *param ) return 0; // validate signer +/* if (params.signer) { if (params.progress) @@ -982,7 +945,7 @@ static DWORD WINAPI ThreadDownloadFile( void *param ) return 0; } } - +*/ return 0; } @@ -1089,6 +1052,12 @@ DWORD DownloadNewVersion( HWND owner, TSettingsComponent component, const wchar_ params.bAcceptCached=true; params.component=component; + { + const wchar_t* name = wcsrchr(url, '/'); + if (name && name[1]) + params.fname.Append(name+1); + } + HANDLE hThread=CreateThread(NULL,0,ThreadDownloadFile,¶ms,0,NULL); while (1) diff --git a/Src/Lib/DownloadHelper.h b/Src/Lib/DownloadHelper.h index 915f76fec..5941f5cf8 100644 --- a/Src/Lib/DownloadHelper.h +++ b/Src/Lib/DownloadHelper.h @@ -31,19 +31,19 @@ struct LanguageVersionData struct VersionData { - bool bValid; - DWORD newVersion; - DWORD encodedLangVersion; + bool bValid = false; + DWORD newVersion = 0; + DWORD encodedLangVersion = 0; CString downloadUrl; CString downloadSigner; CString news; CString updateLink; CString languageLink; CString altUrl; - bool bNewVersion; - bool bIgnoreVersion; - bool bNewLanguage; - bool bIgnoreLanguage; + bool bNewVersion = false; + bool bIgnoreVersion = false; + bool bNewLanguage = false; + bool bIgnoreLanguage = false; CString newLanguage; std::vector languages; @@ -59,6 +59,7 @@ struct VersionData LOAD_BAD_FILE, // the file is corrupted }; + TLoadResult Load(); TLoadResult Load( const wchar_t *fname, bool bLoadFlags ); private: void operator=( const VersionData& ); diff --git a/Src/Localization/English/en-US.csv b/Src/Localization/English/en-US.csv index 237892172399e5843ef0b1824875310f4020312a..e3ad0c68393b41650f2d4253394ae717a6b2bcad 100644 GIT binary patch delta 22 ecmbPrll|Te_J%EtA6`v=@PtuhyTfb7C`JH_Q3~|{ delta 64 zcmcb2gMHRb_J%EtA6}_uFq8mc0Yfo^6@xwyrZZ#$`56qQ3`q=n49N`n47m*YlM9nY Qr#nnzRM^hhttps://github.com/Open-Shell/Open-Shell-Menu",IDC_LINKWEB,"SysLink",WS_TABSTOP,7,164,66,10,WS_EX_TRANSPARENT - DEFPUSHBUTTON "OK",IDOK,202,160,50,14 - PUSHBUTTON "Cancel",IDCANCEL,259,160,50,14 + "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,61,146,141,14 + CONTROL "Open-Shell-Menu",IDC_LINKWEB,"SysLink",WS_TABSTOP,7,166,66,10,WS_EX_TRANSPARENT + DEFPUSHBUTTON "OK",IDOK,202,162,50,14 + PUSHBUTTON "Cancel",IDCANCEL,259,162,50,14 END From afaf16620af1d3345db07678df678edaaf55cc33 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sun, 6 Sep 2020 14:05:38 +0200 Subject: [PATCH 046/234] Setup: Bring back Update component This reverts commit ed3675ca7f50539bc87a425fb2f902645c826d02. This reverts commit ee59bb76deb9437d107102c5e24a3e736bcbb97d. --- Src/Setup/BuildBinaries.bat | 3 +++ Src/Setup/Setup.wxs | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/Src/Setup/BuildBinaries.bat b/Src/Setup/BuildBinaries.bat index 2672ed41a..55b03ac19 100644 --- a/Src/Setup/BuildBinaries.bat +++ b/Src/Setup/BuildBinaries.bat @@ -37,6 +37,7 @@ copy /B ..\ClassicIE\Setup\ClassicIEDLL_32.dll Output > nul copy /B ..\ClassicIE\Setup\ClassicIE_32.exe Output > nul copy /B ..\StartMenu\Setup\StartMenu.exe Output > nul copy /B ..\StartMenu\Setup\StartMenuDLL.dll Output > nul +copy /B ..\Update\Release\Update.exe Output > nul copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.dll Output > nul copy /B ..\Setup\SetupHelper\Release\SetupHelper.exe Output > nul @@ -96,6 +97,8 @@ copy /B ..\StartMenu\Setup\StartMenuDLL.pdb Output\PDB32 > nul copy /B Output\StartMenuDLL.dll Output\PDB32 > nul copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.pdb Output\PDB32 > nul copy /B Output\StartMenuHelper32.dll Output\PDB32 > nul +copy /B ..\Update\Release\Update.pdb Output\PDB32 > nul +copy /B Output\Update.exe Output\PDB32 > nul REM Menu 64 copy /B ..\StartMenu\Setup64\StartMenu.pdb Output\PDB64 > nul diff --git a/Src/Setup/Setup.wxs b/Src/Setup/Setup.wxs index bfbabfdf5..9706cacea 100644 --- a/Src/Setup/Setup.wxs +++ b/Src/Setup/Setup.wxs @@ -103,6 +103,10 @@ IE_BUILD>=90000 + + + + @@ -469,6 +473,9 @@ + + + @@ -556,6 +563,11 @@ START_MENU_FOLDER=1 + + + + START_MENU_FOLDER=1 + From 225d0ba8f9e3096871f91b4cbab0e8ed43ff9e93 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Wed, 9 Sep 2020 19:31:33 +0200 Subject: [PATCH 047/234] Update: Add library for Desktop Toast notifications Based on sample code in: https://github.com/WindowsNotifications/desktop-toasts More info: https://docs.microsoft.com/en-us/windows/uwp/design/shell/tiles-and-notifications/send-local-toast-desktop-cpp-wrl --- Src/OpenShell.sln | 14 + .../DesktopNotificationManagerCompat.cpp | 291 ++++++++++++++++++ .../DesktopNotificationManagerCompat.h | 108 +++++++ Src/Update/DesktopToasts/DesktopToasts.def | 5 + Src/Update/DesktopToasts/DesktopToasts.h | 59 ++++ Src/Update/DesktopToasts/DesktopToasts.rc | 61 ++++ .../DesktopToasts/DesktopToasts.vcxproj | 110 +++++++ .../DesktopToasts.vcxproj.filters | 43 +++ Src/Update/DesktopToasts/dllmain.cpp | 131 ++++++++ 9 files changed, 822 insertions(+) create mode 100644 Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp create mode 100644 Src/Update/DesktopToasts/DesktopNotificationManagerCompat.h create mode 100644 Src/Update/DesktopToasts/DesktopToasts.def create mode 100644 Src/Update/DesktopToasts/DesktopToasts.h create mode 100644 Src/Update/DesktopToasts/DesktopToasts.rc create mode 100644 Src/Update/DesktopToasts/DesktopToasts.vcxproj create mode 100644 Src/Update/DesktopToasts/DesktopToasts.vcxproj.filters create mode 100644 Src/Update/DesktopToasts/dllmain.cpp diff --git a/Src/OpenShell.sln b/Src/OpenShell.sln index 600c9f79f..320903968 100644 --- a/Src/OpenShell.sln +++ b/Src/OpenShell.sln @@ -40,6 +40,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicIEDLL", "ClassicIE\ClassicIEDLL\ClassicIEDLL.vcxproj", "{BC0E6E7C-08C1-4F12-A754-4608E5A22FA8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Update", "Update\Update.vcxproj", "{171B46B0-6083-4D9E-BD33-946EA3BD76FA}" + ProjectSection(ProjectDependencies) = postProject + {D94BD2A6-1872-4F01-B911-F406603AA2E1} = {D94BD2A6-1872-4F01-B911-F406603AA2E1} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win7Aero7", "Skins\Win7Aero7\Win7Aero7.vcxproj", "{A2CCDE9F-17CE-461E-8BD9-00261B8855A6}" EndProject @@ -63,6 +66,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Metro", "Skins\Metro\Metro. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Metallic7", "Skins\Metallic7\Metallic7.vcxproj", "{CA5BFC96-428D-42F5-9F7D-CDDE048A357C}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DesktopToasts", "Update\DesktopToasts\DesktopToasts.vcxproj", "{D94BD2A6-1872-4F01-B911-F406603AA2E1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -374,6 +379,15 @@ Global {CA5BFC96-428D-42F5-9F7D-CDDE048A357C}.Setup|Win32.ActiveCfg = Resource|Win32 {CA5BFC96-428D-42F5-9F7D-CDDE048A357C}.Setup|Win32.Build.0 = Resource|Win32 {CA5BFC96-428D-42F5-9F7D-CDDE048A357C}.Setup|x64.ActiveCfg = Resource|Win32 + {D94BD2A6-1872-4F01-B911-F406603AA2E1}.Debug|Win32.ActiveCfg = Debug|Win32 + {D94BD2A6-1872-4F01-B911-F406603AA2E1}.Debug|Win32.Build.0 = Debug|Win32 + {D94BD2A6-1872-4F01-B911-F406603AA2E1}.Debug|x64.ActiveCfg = Debug|Win32 + {D94BD2A6-1872-4F01-B911-F406603AA2E1}.Release|Win32.ActiveCfg = Release|Win32 + {D94BD2A6-1872-4F01-B911-F406603AA2E1}.Release|Win32.Build.0 = Release|Win32 + {D94BD2A6-1872-4F01-B911-F406603AA2E1}.Release|x64.ActiveCfg = Release|Win32 + {D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|Win32.ActiveCfg = Release|Win32 + {D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|Win32.Build.0 = Release|Win32 + {D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp b/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp new file mode 100644 index 000000000..24d3088f1 --- /dev/null +++ b/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp @@ -0,0 +1,291 @@ +// ****************************************************************** +// Copyright (c) Microsoft. All rights reserved. +// This code is licensed under the MIT License (MIT). +// THE CODE 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 CODE OR THE USE OR OTHER DEALINGS IN THE CODE. +// ****************************************************************** + +#include "DesktopNotificationManagerCompat.h" +#include +#include + +#define RETURN_IF_FAILED(hr) do { HRESULT _hrTemp = hr; if (FAILED(_hrTemp)) { return _hrTemp; } } while (false) + +using namespace ABI::Windows::Data::Xml::Dom; +using namespace Microsoft::WRL; +using namespace Microsoft::WRL::Wrappers; + +namespace DesktopNotificationManagerCompat +{ + HRESULT RegisterComServer(GUID clsid, const wchar_t exePath[]); + HRESULT EnsureRegistered(); + bool IsRunningAsUwp(); + + bool s_registeredAumidAndComServer = false; + std::wstring s_aumid; + bool s_registeredActivator = false; + bool s_hasCheckedIsRunningAsUwp = false; + bool s_isRunningAsUwp = false; + + HRESULT RegisterAumidAndComServer(const wchar_t *aumid, GUID clsid) + { +/* + // If running as Desktop Bridge + if (IsRunningAsUwp()) + { + // Clear the AUMID since Desktop Bridge doesn't use it, and then we're done. + // Desktop Bridge apps are registered with platform through their manifest. + // Their LocalServer32 key is also registered through their manifest. + s_aumid = L""; + s_registeredAumidAndComServer = true; + return S_OK; + } +*/ + // Copy the aumid + s_aumid = std::wstring(aumid); +/* + // Get the EXE path + wchar_t exePath[MAX_PATH]; + DWORD charWritten = ::GetModuleFileName(nullptr, exePath, ARRAYSIZE(exePath)); + RETURN_IF_FAILED(charWritten > 0 ? S_OK : HRESULT_FROM_WIN32(::GetLastError())); + + // Register the COM server + RETURN_IF_FAILED(RegisterComServer(clsid, exePath)); +*/ + s_registeredAumidAndComServer = true; + return S_OK; + } + + HRESULT RegisterActivator() + { + // Module needs a callback registered before it can be used. + // Since we don't care about when it shuts down, we'll pass an empty lambda here. + Module::Create([] {}); + + // If a local server process only hosts the COM object then COM expects + // the COM server host to shutdown when the references drop to zero. + // Since the user might still be using the program after activating the notification, + // we don't want to shutdown immediately. Incrementing the object count tells COM that + // we aren't done yet. + Module::GetModule().IncrementObjectCount(); + + RETURN_IF_FAILED(Module::GetModule().RegisterObjects()); + + s_registeredActivator = true; + return S_OK; + } + + HRESULT RegisterComServer(GUID clsid, const wchar_t exePath[]) + { + // Turn the GUID into a string + OLECHAR* clsidOlechar; + StringFromCLSID(clsid, &clsidOlechar); + std::wstring clsidStr(clsidOlechar); + ::CoTaskMemFree(clsidOlechar); + + // Create the subkey + // Something like SOFTWARE\Classes\CLSID\{23A5B06E-20BB-4E7E-A0AC-6982ED6A6041}\LocalServer32 + std::wstring subKey = LR"(SOFTWARE\Classes\CLSID\)" + clsidStr + LR"(\LocalServer32)"; + + // Include -ToastActivated launch args on the exe + std::wstring exePathStr(exePath); + exePathStr = L"\"" + exePathStr + L"\" " + TOAST_ACTIVATED_LAUNCH_ARG; + + // We don't need to worry about overflow here as ::GetModuleFileName won't + // return anything bigger than the max file system path (much fewer than max of DWORD). + DWORD dataSize = static_cast((exePathStr.length() + 1) * sizeof(WCHAR)); + + // Register the EXE for the COM server + return HRESULT_FROM_WIN32(::RegSetKeyValue( + HKEY_CURRENT_USER, + subKey.c_str(), + nullptr, + REG_SZ, + reinterpret_cast(exePathStr.c_str()), + dataSize)); + } + + HRESULT CreateToastNotifier(IToastNotifier **notifier) + { + RETURN_IF_FAILED(EnsureRegistered()); + + ComPtr toastStatics; + RETURN_IF_FAILED(Windows::Foundation::GetActivationFactory( + HStringReference(RuntimeClass_Windows_UI_Notifications_ToastNotificationManager).Get(), + &toastStatics)); + + if (s_aumid.empty()) + { + return toastStatics->CreateToastNotifier(notifier); + } + else + { + return toastStatics->CreateToastNotifierWithId(HStringReference(s_aumid.c_str()).Get(), notifier); + } + } + + HRESULT CreateXmlDocumentFromString(const wchar_t *xmlString, IXmlDocument **doc) + { + ComPtr answer; + RETURN_IF_FAILED(Windows::Foundation::ActivateInstance(HStringReference(RuntimeClass_Windows_Data_Xml_Dom_XmlDocument).Get(), &answer)); + + ComPtr docIO; + RETURN_IF_FAILED(answer.As(&docIO)); + + // Load the XML string + RETURN_IF_FAILED(docIO->LoadXml(HStringReference(xmlString).Get())); + + return answer.CopyTo(doc); + } + + HRESULT CreateToastNotification(IXmlDocument *content, IToastNotification **notification) + { + ComPtr factory; + RETURN_IF_FAILED(Windows::Foundation::GetActivationFactory( + HStringReference(RuntimeClass_Windows_UI_Notifications_ToastNotification).Get(), + &factory)); + + return factory->CreateToastNotification(content, notification); + } + + HRESULT get_History(std::unique_ptr* history) + { + RETURN_IF_FAILED(EnsureRegistered()); + + ComPtr toastStatics; + RETURN_IF_FAILED(Windows::Foundation::GetActivationFactory( + HStringReference(RuntimeClass_Windows_UI_Notifications_ToastNotificationManager).Get(), + &toastStatics)); + + ComPtr toastStatics2; + RETURN_IF_FAILED(toastStatics.As(&toastStatics2)); + + ComPtr nativeHistory; + RETURN_IF_FAILED(toastStatics2->get_History(&nativeHistory)); + + *history = std::unique_ptr(new DesktopNotificationHistoryCompat(s_aumid.c_str(), nativeHistory)); + return S_OK; + } + + bool CanUseHttpImages() + { + return IsRunningAsUwp(); + } + + HRESULT EnsureRegistered() + { + // If not registered AUMID yet + if (!s_registeredAumidAndComServer) + { + // Check if Desktop Bridge + if (IsRunningAsUwp()) + { + // Implicitly registered, all good! + s_registeredAumidAndComServer = true; + } + else + { + // Otherwise, incorrect usage, must call RegisterAumidAndComServer first + return E_ILLEGAL_METHOD_CALL; + } + } + + // If not registered activator yet + if (!s_registeredActivator) + { + // Incorrect usage, must call RegisterActivator first + return E_ILLEGAL_METHOD_CALL; + } + + return S_OK; + } + + bool IsRunningAsUwp() + { + if (!s_hasCheckedIsRunningAsUwp) + { + // https://stackoverflow.com/questions/39609643/determine-if-c-application-is-running-as-a-uwp-app-in-desktop-bridge-project + UINT32 length; + wchar_t packageFamilyName[PACKAGE_FAMILY_NAME_MAX_LENGTH + 1]; + LONG result = GetPackageFamilyName(GetCurrentProcess(), &length, packageFamilyName); + s_isRunningAsUwp = result == ERROR_SUCCESS; + s_hasCheckedIsRunningAsUwp = true; + } + + return s_isRunningAsUwp; + } +} + +DesktopNotificationHistoryCompat::DesktopNotificationHistoryCompat(const wchar_t *aumid, ComPtr history) +{ + m_aumid = std::wstring(aumid); + m_history = history; +} + +HRESULT DesktopNotificationHistoryCompat::Clear() +{ + if (m_aumid.empty()) + { + return m_history->Clear(); + } + else + { + return m_history->ClearWithId(HStringReference(m_aumid.c_str()).Get()); + } +} + +HRESULT DesktopNotificationHistoryCompat::GetHistory(ABI::Windows::Foundation::Collections::IVectorView **toasts) +{ + ComPtr history2; + RETURN_IF_FAILED(m_history.As(&history2)); + + if (m_aumid.empty()) + { + return history2->GetHistory(toasts); + } + else + { + return history2->GetHistoryWithId(HStringReference(m_aumid.c_str()).Get(), toasts); + } +} + +HRESULT DesktopNotificationHistoryCompat::Remove(const wchar_t *tag) +{ + if (m_aumid.empty()) + { + return m_history->Remove(HStringReference(tag).Get()); + } + else + { + return m_history->RemoveGroupedTagWithId(HStringReference(tag).Get(), HStringReference(L"").Get(), HStringReference(m_aumid.c_str()).Get()); + } +} + +HRESULT DesktopNotificationHistoryCompat::RemoveGroupedTag(const wchar_t *tag, const wchar_t *group) +{ + if (m_aumid.empty()) + { + return m_history->RemoveGroupedTag(HStringReference(tag).Get(), HStringReference(group).Get()); + } + else + { + return m_history->RemoveGroupedTagWithId(HStringReference(tag).Get(), HStringReference(group).Get(), HStringReference(m_aumid.c_str()).Get()); + } +} + +HRESULT DesktopNotificationHistoryCompat::RemoveGroup(const wchar_t *group) +{ + if (m_aumid.empty()) + { + return m_history->RemoveGroup(HStringReference(group).Get()); + } + else + { + return m_history->RemoveGroupWithId(HStringReference(group).Get(), HStringReference(m_aumid.c_str()).Get()); + } +} diff --git a/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.h b/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.h new file mode 100644 index 000000000..2d63fe86d --- /dev/null +++ b/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.h @@ -0,0 +1,108 @@ +// ****************************************************************** +// Copyright (c) Microsoft. All rights reserved. +// This code is licensed under the MIT License (MIT). +// THE CODE 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 CODE OR THE USE OR OTHER DEALINGS IN THE CODE. +// ****************************************************************** + +#pragma once +#include +#include +#include +#include +#include +#define TOAST_ACTIVATED_LAUNCH_ARG L"-ToastActivated" + +using namespace ABI::Windows::UI::Notifications; + +class DesktopNotificationHistoryCompat; + +namespace DesktopNotificationManagerCompat +{ + ///