add PIOpenCL::Kernel::waitForFinish()

PIBinaryStream::wasReadError() method, remove incomplete read asserts

.clang-format

@@ -0,0 +1,224 @@
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: Left
+AlignConsecutiveAssignments:
+  Enabled:         true
+  AcrossEmptyLines: true
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveBitFields:
+  Enabled:         true
+  AcrossEmptyLines: false
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveDeclarations:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveMacros:
+  Enabled:         true
+  AcrossEmptyLines: true
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignEscapedNewlines: Left
+AlignOperands:   Align
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+AttributeMacros:
+  - __capability
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
+BreakBeforeBraces: Attach
+BreakInheritanceList: BeforeComma
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     140
+CommentPragmas:  '^ IWYU pragma:'
+QualifierAlignment: Leave
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: false
+DerivePointerAlignment: false
+DisableFormat:   false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: Always
+ExperimentalAutoDetectBinPacking: false
+PackConstructorInitializers: CurrentLine
+BasedOnStyle:    ''
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+AllowAllConstructorInitializersOnNextLine: true
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+  - piForeach
+  - piForeachC
+  - piForeachR
+  - piForeachRC
+  - piForeachCR
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks:   Regroup
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
+IndentCaseLabels: false
+IndentCaseBlocks: false
+IndentGotoLabels: false
+IndentPPDirectives: AfterHash
+IndentExternBlock: NoIndent
+IndentRequiresClause: true
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+InsertBraces:    false
+InsertTrailingCommas: Wrapped
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
+MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN"
+MacroBlockEnd: "PRIVATE_DEFINITION_END|STATIC_INITIALIZER_END"
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyIndentedWhitespace: 0
+PointerAlignment: Middle
+PPIndentWidth:   2
+ReferenceAlignment: Middle
+ReflowComments:  true
+RemoveBracesLLVM: false
+RequiresClausePosition: OwnLine
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes:    CaseSensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: false
+SpaceBeforeInheritanceColon: false
+SpaceBeforeParens: ControlStatementsExceptControlMacros
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: false
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   false
+  AfterOverloadedOperator: false
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
+SpaceAroundPointerQualifiers: Both
+SpaceBeforeRangeBasedForLoopColon: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  Never
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+BitFieldColonSpacing: After
+Standard:        c++11
+StatementAttributeLikeMacros:
+  - Q_EMIT
+  - PIMETA
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+  - PRIVATE_DECLARATION
+  - NO_COPY_CLASS
+  - FOREVER_WAIT
+  - WAIT_FOREVER
+TabWidth:        4
+UseCRLF:         false
+UseTab:          AlignWithSpaces
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+  - NS_SWIFT_NAME
+  - CF_SWIFT_NAME
+  - PIMETA
+...
+

.editorconfig

@@ -0,0 +1,6 @@
+root = true
+
+[*.{h,c,cpp}]
+charset = utf-8
+indent_style = tab
+tab_width = 4

.gitignore

@@ -3,3 +3,4 @@
 /doc/rtf
 _unsused
 CMakeLists.txt.user*
+/include

3rd/lua/lapi.c

@@ -5,7 +5,7 @@
 */
 
 #define lapi_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/lcode.c

@@ -5,7 +5,7 @@
 */
 
 #define lcode_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/lctype.c

@@ -5,7 +5,7 @@
 */
 
 #define lctype_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/ldebug.c

@@ -5,7 +5,7 @@
 */
 
 #define ldebug_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/ldo.c

@@ -5,7 +5,7 @@
 */
 
 #define ldo_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/ldump.c

@@ -5,7 +5,7 @@
 */
 
 #define ldump_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/lfunc.c

@@ -5,7 +5,7 @@
 */
 
 #define lfunc_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/lgc.c

@@ -5,7 +5,7 @@
 */
 
 #define lgc_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/llex.c

@@ -5,7 +5,7 @@
 */
 
 #define llex_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/lmem.c

@@ -5,7 +5,7 @@
 */
 
 #define lmem_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/lobject.c

@@ -5,7 +5,7 @@
 */
 
 #define lobject_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/lopcodes.c

@@ -5,7 +5,7 @@
 */
 
 #define lopcodes_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/lparser.c

@@ -5,7 +5,7 @@
 */
 
 #define lparser_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/lstate.c

@@ -5,7 +5,7 @@
 */
 
 #define lstate_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/lstring.c

@@ -5,7 +5,7 @@
 */
 
 #define lstring_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/ltable.c

@@ -5,7 +5,7 @@
 */
 
 #define ltable_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/ltm.c

@@ -5,7 +5,7 @@
 */
 
 #define ltm_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/lundump.c

@@ -5,7 +5,7 @@
 */
 
 #define lundump_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/lvm.c

@@ -5,7 +5,7 @@
 */
 
 #define lvm_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

3rd/lua/lzio.c

@@ -5,7 +5,7 @@
 */
 
 #define lzio_c
-#define LUA_CORE
+
 
 #include "lprefix.h"
 

CMakeLists.txt

@@ -1,22 +1,59 @@
 cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0017 NEW) # need include() with .cmake
-project(pip)
-set(pip_MAJOR    2)
-set(pip_MINOR    28)
-set(pip_REVISION 1)
-set(pip_SUFFIX   )
-set(pip_COMPANY  SHS)
-set(pip_DOMAIN   org.SHS)
+project(PIP)
+set(PIP_MAJOR    3)
+set(PIP_MINOR    14)
+set(PIP_REVISION 1)
+set(PIP_SUFFIX   )
+set(PIP_COMPANY  SHS)
+set(PIP_DOMAIN   org.SHS)
+
+set(GIT_CMAKE_DIR)
+if (NOT DEFINED SHSTKPROJECT)
+	set(ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+	file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cmake-download/CMakeLists.txt"
+"# This file was generated by PIP CMake, don`t edit it!
+cmake_minimum_required(VERSION 2.8.2)
+project(cmake-download NONE)
+include(ExternalProject)
+ExternalProject_Add(cmake
+	GIT_REPOSITORY    https://git.shs.tools/SHS/cmake.git
+	GIT_TAG           \"origin/master\"
+	GIT_CONFIG        \"advice.detachedHead=false\"
+	SOURCE_DIR        \"${CMAKE_CURRENT_BINARY_DIR}/cmake-src\"
+	BINARY_DIR        \"${CMAKE_CURRENT_BINARY_DIR}/cmake-build\"
+	INSTALL_COMMAND   \"\"
+	TEST_COMMAND      \"\"
+)
+")
+	execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+		RESULT_VARIABLE result
+		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cmake-download)
+	if(result)
+		message(FATAL_ERROR "CMake step for cmake failed: ${result}")
+	endif()
+	execute_process(COMMAND "${CMAKE_COMMAND}" --build .
+		RESULT_VARIABLE result
+		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cmake-download)
+	if(result)
+		message(FATAL_ERROR "Build step for cmake failed: ${result}")
+	endif()
+	install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" --build \"${CMAKE_CURRENT_BINARY_DIR}/cmake-build\" --target install)")
+	set(GIT_CMAKE_DIR "${CMAKE_CURRENT_BINARY_DIR}/cmake-src")
+endif()
 
 if ("x${CMAKE_MODULE_PATH}" STREQUAL "x")
 	set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 endif()
+if (NOT "x${GIT_CMAKE_DIR}" STREQUAL "x")
+	list(APPEND CMAKE_MODULE_PATH "${GIT_CMAKE_DIR}")
+endif()
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 include(CheckFunctionExists)
 include(PIPMacros)
 include(SHSTKMacros)
 
-shstk_begin_project(pip PIP)
+shstk_begin_project(PIP)
 
 set(_ICU_DEFAULT OFF)
 if((NOT DEFINED WIN32) AND (NOT DEFINED ANDROID_PLATFORM) AND (NOT DEFINED APPLE))
@@ -24,14 +61,21 @@ if((NOT DEFINED WIN32) AND (NOT DEFINED ANDROID_PLATFORM) AND (NOT DEFINED APPLE
 endif()
 set(PIP_DLL_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE STRING "")
 
+if (CMAKE_BUILD_TYPE MATCHES Debug)
+    set(PIP_BUILD_DEBUG ON)
+else()
+    set(PIP_BUILD_DEBUG OFF)
+endif()
 
 # Options
 option(ICU "ICU support for convert codepages" ${_ICU_DEFAULT})
 option(STD_IOSTREAM "Building with std iostream operators support" OFF)
 option(INTROSPECTION "Build with introspection" OFF)
-option(TESTS "Build tests and perform their before install step" OFF)
+option(TESTS "Build tests and perform their before install step" ${PIP_BUILD_DEBUG})
 option(COVERAGE "Build project with coverage info" OFF)
 set(PIP_UTILS 1)
+set(BUILDING_pip 1 PARENT_SCOPE)
+set(pip_ROOT_SRC "${CMAKE_CURRENT_SOURCE_DIR}" PARENT_SCOPE)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_STANDARD 11)
 
@@ -59,7 +103,7 @@ macro(pip_module NAME LIBS LABEL INCLUDES SOURCES MSG)
 	set(CRES)
 	file(GLOB_RECURSE CPPS "libs/${NAME}/*.cpp" "libs/${NAME}/*.c")
 	file(GLOB_RECURSE HS   "libs/${NAME}/*.h")
-	file(GLOB_RECURSE PHS  "libs/${NAME}/*_p.h")
+	file(GLOB_RECURSE PHS  "libs/${NAME}/*_p.h" "libs/${NAME}/3rd/*.h")
 	file(GLOB_RECURSE RES  "libs/${NAME}/*.conf")
 	if (NOT "x${PHS}" STREQUAL "x")
 		list(REMOVE_ITEM HS ${PHS})
@@ -68,9 +112,14 @@ macro(pip_module NAME LIBS LABEL INCLUDES SOURCES MSG)
 		file(GLOB_RECURSE ASRC "${SOURCES}/*.cpp" "${SOURCES}/*.c")
 		list(APPEND CPPS ${ASRC})
 	endif()
+	#message("${NAME} HS = ${HS}")
 	list(APPEND HDRS ${HS})
 	list(APPEND PHDRS ${PHS})
 
+	if(${CMAKE_VERSION} VERSION_LESS "3.8.0")
+	else()
+		source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${CPPS} ${HS} ${PHS})
+	endif()
 	set(_target "pip_${NAME}")
 	set(_libs "${LIBS}")
 	if ("${NAME}" STREQUAL "main")
@@ -81,11 +130,11 @@ macro(pip_module NAME LIBS LABEL INCLUDES SOURCES MSG)
 	string(TOUPPER "${_target}" DEF_NAME)
 
 	set(PIP_MSG_${NAME} "yes${MSG}")
-	import_version(${_target} pip)
-	set_deploy_property(${_target} ${pip_LIB_TYPE}
+	import_version(${_target} PIP)
+	set_deploy_property(${_target} ${PIP_LIB_TYPE}
 		LABEL "${LABEL}"
-		FULLNAME "${pip_DOMAIN}.${_target}"
-		COMPANY  "${pip_COMPANY}"
+		FULLNAME "${PIP_DOMAIN}.${_target}"
+		COMPANY  "${PIP_COMPANY}"
 		INFO "Platform-Independent Primitives")
 	make_rc(${_target} _RC)
 
@@ -102,7 +151,7 @@ macro(pip_module NAME LIBS LABEL INCLUDES SOURCES MSG)
 		pip_resources(CRES "${RES}")
 	endif()
 	add_definitions(-D${DEF_NAME})
-	add_library(${_target} ${pip_LIB_TYPE} ${CPPS} ${CRES} ${_RC})
+	add_library(${_target} ${PIP_LIB_TYPE} ${CPPS} ${CRES} ${_RC} ${HS} ${PHS})
 	target_include_directories(${_target} PUBLIC ${PIP_INCLUDES})
 	if (NOT "x${RES}" STREQUAL "x")
 		add_dependencies(${_target} pip_rc)
@@ -211,12 +260,10 @@ CHECK_FUNCTION_EXISTS(timer_delete  PIP_TIMER_RT_2)
 
 
 # Check if build debug version
-if (CMAKE_BUILD_TYPE MATCHES Debug)
-	set(PIP_BUILD_TYPE "Debug")
+if (PIP_BUILD_DEBUG)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3 -Wall")
 	add_definitions(-DPIP_DEBUG)
 else()
-	set(PIP_BUILD_TYPE "Release")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
 endif()
 
@@ -284,7 +331,7 @@ endif()
 if(APPLE)
 	add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
 endif()
-if ((NOT DEFINED LIBPROJECT) AND (DEFINED ANDROID_PLATFORM))
+if ((NOT DEFINED SHSTKPROJECT) AND (DEFINED ANDROID_PLATFORM))
 	include_directories(${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include)
 	#message("${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include")
 	#message("${ANDROID_NDK}/sysroot/usr/include")
@@ -320,7 +367,7 @@ if(WIN32)
 		set(CMAKE_CXX_FLAGS "/O2 /Ob2 /Ot /W0")
 	endif()
 else()
-	set(${CMAKE_CXX_FLAGS} "${CMAKE_CXX_FLAGS} -fPIC")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 	if(DEFINED ENV{QNX_HOST} OR PIP_FREERTOS)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-32")
 	endif()
@@ -444,14 +491,16 @@ if (NOT CROSSTOOLS)
 		list(APPEND HDR_DIRS "${_lua_bri_dir}/LuaBridge")
 		list(APPEND HDRS ${_lua_src_hdr})
 
-
 		# Test program
 		if(PIP_UTILS)
 			#add_library(pip_plugin SHARED "test_plugin.h" "test_plugin.cpp")
 			#target_link_libraries(pip_plugin pip)
-
 			add_executable(pip_test "main.cpp")
-			target_link_libraries(pip_test pip pip_cloud pip_lua)
+			target_link_libraries(pip_test pip)
+			if(sodium_FOUND)
+				add_executable(pip_cloud_test "main_picloud_test.cpp")
+				target_link_libraries(pip_cloud_test pip_cloud)
+			endif()
 		endif()
 
 	else()
@@ -525,6 +574,7 @@ if(NOT PIP_FREERTOS)
 	add_subdirectory("utils/code_model_generator")
 	add_subdirectory("utils/resources_compiler")
 	add_subdirectory("utils/deploy_tool")
+	add_subdirectory("utils/value_tree_translator")
 	if(PIP_UTILS AND (NOT CROSSTOOLS))
 		add_subdirectory("utils/system_test")
 		add_subdirectory("utils/udp_file_transfer")
@@ -550,25 +600,38 @@ if ((NOT PIP_FREERTOS) AND (NOT CROSSTOOLS))
 	include(PIPDocumentation)
 	find_package(Doxygen)
 	if(DOXYGEN_FOUND)
-		set(DOXY_PROJECT_NUMBER "${pip_VERSION}")
-		set(DOXY_QHP_CUST_FILTER_ATTRS "\"PIP ${pip_VERSION}\"")
-		set(DOXY_QHP_SECT_FILTER_ATTRS "\"PIP ${pip_VERSION}\"")
+		set(DOXY_DEFINES "${PIP_EXPORTS}")
+		foreach (_m "console" "usb" "compress" "crypt" "cloud" "fftw" "opencl" "io_utils" "lua")
+			string(TOUPPER "${_m}" _mdef)
+			list(APPEND DOXY_DEFINES "PIP_${_mdef}_EXPORT")
+		endforeach()
+		set(DOXY_PROJECT_NUMBER "${PIP_VERSION}")
+		set(DOXY_QHP_CUST_FILTER_ATTRS "\"PIP ${PIP_VERSION}\"")
+		set(DOXY_QHP_SECT_FILTER_ATTRS "\"PIP ${PIP_VERSION}\"")
 		set(DOXY_EXAMPLE_PATH    "\"${CMAKE_CURRENT_SOURCE_DIR}/doc/examples\"")
 		set(DOXY_IMAGE_PATH      "\"${CMAKE_CURRENT_SOURCE_DIR}/doc/images\"")
+		set(DOXY_LOGO_PATH       "\"${CMAKE_CURRENT_SOURCE_DIR}/doc/pip.png\"")
 		set(DOXY_EXCLUDE         "\"${CMAKE_CURRENT_SOURCE_DIR}/libs/lua/3rd\"")
+		set(DOXY_DOMAIN "${PIP_DOMAIN}.${PROJECT_NAME}.doc")
+		if ("x${DOC_LANG}" STREQUAL "x")
+			set(DOXY_OUTPUT_LANGUAGE English)
+			set(DOXY_OUTPUT_DIR      en)
+		else()
+			set(DOXY_OUTPUT_LANGUAGE ${DOC_LANG})
+			set(DOXY_OUTPUT_DIR      ${DOC_DIR})
+		endif()
 		if(DOXYGEN_DOT_EXECUTABLE)
-			string(REPLACE "\\" "" _DOT_PATH "${DOXYGEN_DOT_PATH}")
+			string(REPLACE "\\" "/" _DOT_PATH "${DOXYGEN_DOT_PATH}")
 			set(DOXY_DOT_PATH    "\"${_DOT_PATH}\"")
-			set(DOXY_MSCGEN_PATH "\"${_DOT_PATH}\"")
 			set(DOXY_DIA_PATH    "\"${_DOT_PATH}\"")
 		endif()
 		set(DOXY_INPUT)
 		foreach(F ${PIP_MAIN_FOLDERS})
 			list(APPEND DOXY_INPUT "\"${F}\"")
 		endforeach(F)
-		string(REPLACE ";" " " DOXY_INPUT "\"${CMAKE_CURRENT_SOURCE_DIR}/libs\"")
-		string(REPLACE ";" " " DOXY_INCLUDE_PATH "${DOXY_INPUT}")
-		string(REPLACE ";" " " DOXY_DEFINES "${PIP_EXPORTS};DOXYGEN;PIOBJECT;PIOBJECT_SUBCLASS")
+		string(REPLACE ";" " " DOXY_INPUT "\"${CMAKE_CURRENT_SOURCE_DIR}/libs\";\"${CMAKE_CURRENT_SOURCE_DIR}/doc/pages\"")
+		string(REPLACE ";" " " DOXY_INCLUDE_PATH "${PIP_INCLUDES}")
+		string(REPLACE ";" " " DOXY_DEFINES "${DOXY_DEFINES}")
 		add_documentation(doc doc/Doxyfile.in)
 		install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ../share/doc/pip COMPONENT doc EXCLUDE_FROM_ALL OPTIONAL)
 	endif()
@@ -595,9 +658,9 @@ endmacro()
 
 list(REMOVE_ITEM LIBS_STATUS ${PIP_MODULES})
 message("----------PIP----------")
-message(" Version: ${pip_VERSION} ")
-message(" Linkage: ${pip_LIB_TYPE_MSG}")
-message(" Type   : ${pip_BUILD_TYPE}")
+message(" Version: ${PIP_VERSION} ")
+message(" Linkage: ${PIP_LIB_TYPE_MSG}")
+message(" Type   : ${CMAKE_BUILD_TYPE}")
 if (NOT LOCAL)
 	message(" Install: \"${CMAKE_INSTALL_PREFIX}\"")
 else()

README.md

@@ -33,4 +33,10 @@ You should add ${<out_var>} to your target.
 
 ## Documentation
 
-[Online documentation](https://shs.tools/pip/html/index.html)
+[🇺🇸 Online documentation](https://shs.tools/pip/html/en/index.html)
+
+[🇺🇸 Qt-help](https://shs.tools/pip/pip_en.qch)
+
+[🇷🇺 Онлайн документация](https://shs.tools/pip/html/ru/index.html)
+
+[🇷🇺 Qt-help](https://shs.tools/pip/pip_ru.qch)

cmake/FindPIP.cmake

@@ -20,16 +20,11 @@ main library
 cmake_policy(SET CMP0011 NEW) # don`t affect includer policies
 include(SHSTKMacros)
 
-shstk_set_find_dirs(pip)
-if(PIP_DIR)
-	list(APPEND pip_LIBDIR "${PIP_DIR}/lib")
-	list(APPEND pip_INCDIR "${PIP_DIR}/include/pip")
-	list(APPEND pip_BINDIR "${PIP_DIR}/bin")
-endif()
+shstk_set_find_dirs(PIP)
 
 set(__libs "usb;crypt;console;fftw;compress;io_utils;opencl;cloud;lua")
 
-if (BUILDING_pip)
+if (BUILDING_PIP)
 	#set(_libs "pip;pip_usb;pip_console;pip_crypt;pip_fftw;pip_compress;pip_opencl;pip_io_utils;pip_cloud;pip_lua")
 	#set(_bins "pip_cmg;pip_rc;deploy_tool")
 	#get_target_property(_path pip BINARY_DIR)
@@ -40,20 +35,20 @@ if (BUILDING_pip)
 	
 	set(PIP_FOUND ON CACHE BOOL "")
 else()
-	find_library(PIP_LIBRARY pip HINTS ${pip_LIBDIR})
+	find_library(PIP_LIBRARY pip HINTS ${PIP_LIBDIR})
 	foreach (_l ${__libs})
-		find_library(PIP_LIBRARY_${_l} pip_${_l} HINTS ${pip_LIBDIR})
+		find_library(PIP_LIBRARY_${_l} pip_${_l} HINTS ${PIP_LIBDIR})
 	endforeach()
 endif()
 	
-if (BUILDING_pip AND (NOT CMAKE_CROSSCOMPILING))
+if (BUILDING_PIP AND (NOT CMAKE_CROSSCOMPILING))
 	set(PIP_CMG          "$<TARGET_FILE_DIR:pip_cmg>/$<TARGET_FILE_NAME:pip_cmg>"          CACHE STRING "")
 	set(PIP_RC           "$<TARGET_FILE_DIR:pip_rc>/$<TARGET_FILE_NAME:pip_rc>"            CACHE STRING "")
 	set(PIP_DEPLOY_TOOL  "$<TARGET_FILE_DIR:deploy_tool>/$<TARGET_FILE_NAME:deploy_tool>"  CACHE STRING "")
 else()
-	find_program(PIP_CMG pip_cmg${pip_BINEXT} HINTS ${pip_BINDIR} ${pip_FIND_PROGRAM_ARG})
-	find_program(PIP_RC pip_rc${pip_BINEXT} HINTS ${pip_BINDIR} ${pip_FIND_PROGRAM_ARG})
-	find_program(PIP_DEPLOY_TOOL deploy_tool${pip_BINEXT} HINTS ${pip_BINDIR} ${pip_FIND_PROGRAM_ARG})
+	find_program(PIP_CMG pip_cmg${PIP_BINEXT} HINTS ${PIP_BINDIR} ${PIP_FIND_PROGRAM_ARG})
+	find_program(PIP_RC pip_rc${PIP_BINEXT} HINTS ${PIP_BINDIR} ${PIP_FIND_PROGRAM_ARG})
+	find_program(PIP_DEPLOY_TOOL deploy_tool${PIP_BINEXT} HINTS ${PIP_BINDIR} ${PIP_FIND_PROGRAM_ARG})
 endif()
 if (NOT PIP_LIBRARY)
 	if(PIP_FIND_REQUIRED)
@@ -63,7 +58,7 @@ if (NOT PIP_LIBRARY)
 endif()
 set(_PIP_LIBRARY_PATH_ "${PIP_LIBRARY}")
 set(_PIP_ADD_LIBS_ "")
-if (NOT BUILDING_pip)
+if (NOT BUILDING_PIP)
 	if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 		find_library(DL_LIBRARY dl)
 		list(APPEND PIP_LIBRARY ${DL_LIBRARY})
@@ -71,14 +66,18 @@ if (NOT BUILDING_pip)
 			find_library(PTHREAD_LIBRARY pthread)
 			find_library(UTIL_LIBRARY util)
 			set(_PIP_ADD_LIBS_ ${PTHREAD_LIBRARY} ${UTIL_LIBRARY})
+			if((NOT DEFINED ENV{QNX_HOST}) AND (NOT APPLE) AND (NOT PIP_FREERTOS))
+				find_library(RT_LIBRARY rt)
+				list(APPEND _PIP_ADD_LIBS_ ${RT_LIBRARY})
+			endif()
 			list(APPEND PIP_LIBRARY ${_PIP_ADD_LIBS_})
 		endif()
 	endif()
 endif()
 
-if (NOT BUILDING_pip)
-	shstk_find_header(pip PIP "pip_version.h" "${_PIP_LIBRARY_PATH_}")
-	set(PIP_INCLUDES "${pip_INCLUDES}" CACHE STRING "")
+if (NOT BUILDING_PIP)
+	shstk_find_header(PIP "pip_version.h" "${_PIP_LIBRARY_PATH_}")
+	set(PIP_INCLUDES "${PIP_INCLUDES}" CACHE STRING "")
 endif()
 if(PIP_FIND_VERSION VERSION_GREATER PIP_VERSION)
 	message(FATAL_ERROR "PIP version ${PIP_VERSION} is available, but ${PIP_FIND_VERSION} requested!")
@@ -104,10 +103,10 @@ set(__deps_io_utils  "PIP::Crypt")
 set(__deps_cloud     "PIP::IOUtils")
 
 
-if (BUILDING_pip)
+if (BUILDING_PIP)
 
-	if (NOT SET_TARGETS_pip)
-		set(SET_TARGETS_pip ON CACHE BOOL "")
+	if (NOT SET_TARGETS_PIP)
+		set(SET_TARGETS_PIP ON CACHE BOOL "")
 		#message("create aliases")
 		if((NOT TARGET PIP) AND PIP_LIBRARY)
 			#message("alias PIP = pip")
@@ -129,7 +128,7 @@ else()
 		add_library(PIP UNKNOWN IMPORTED)
 		set_target_properties(PIP PROPERTIES
 			IMPORTED_LOCATION "${_PIP_LIBRARY_PATH_}"
-			INTERFACE_INCLUDE_DIRECTORIES "${pip_INCLUDES}"
+			INTERFACE_INCLUDE_DIRECTORIES "${PIP_INCLUDES}"
 			INTERFACE_LINK_LIBRARIES "${_PIP_ADD_LIBS_}")
 		#message("imported PIP = ${PIP_LIBRARY}")
 	endif()

cmake/PIPDocumentation.cmake

@@ -1,7 +1,7 @@
 macro(ADD_DOCUMENTATION TARGET DOXYGEN_CONFIG_FILE)
 	if(DOXYGEN_FOUND)
 		configure_file("${PROJECT_SOURCE_DIR}/${DOXYGEN_CONFIG_FILE}" "${CMAKE_CURRENT_BINARY_DIR}/doxyfile-${TARGET}")
-		add_custom_target("genereate.${TARGET}" COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxyfile-${TARGET})
+		add_custom_target("genereate.${TARGET}" COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/doc/html" COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxyfile-${TARGET})
 		add_custom_target("${TARGET}" COMMAND ${CMAKE_COMMAND} -D COMPONENT=doc -P cmake_install.cmake)
 		add_dependencies("${TARGET}" "genereate.${TARGET}")
 	else(DOXYGEN_FOUND)

doc/Doxyfile.in

@@ -1,4 +1,4 @@
-# Doxyfile 1.8.15
+# Doxyfile 1.9.1
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "Platform-Independent Primitives"
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           =
+PROJECT_LOGO           = ${DOXY_LOGO_PATH}
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
@@ -91,7 +91,7 @@ ALLOW_UNICODE_NAMES    = NO
 # Ukrainian and Vietnamese.
 # The default value is: English.
 
-OUTPUT_LANGUAGE        = English
+OUTPUT_LANGUAGE        = ${DOXY_OUTPUT_LANGUAGE}
 
 # The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
 # documentation generated by doxygen is written. Doxygen will use this
@@ -158,7 +158,7 @@ INLINE_INHERITED_MEMB  = NO
 # shortest path that makes the file name unique will be used
 # The default value is: YES.
 
-FULL_PATH_NAMES        = YES
+FULL_PATH_NAMES        = NO
 
 # The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
 # Stripping is only done if one of the specified strings matches the left-hand
@@ -197,10 +197,20 @@ SHORT_NAMES            = NO
 
 JAVADOC_AUTOBRIEF      = NO
 
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER         = NO
+
 # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
 # line (until the first dot) of a Qt-style comment as the brief description. If
 # set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit @brief command for a brief description.)
+# requiring an explicit \brief command for a brief description.)
 # The default value is: NO.
 
 QT_AUTOBRIEF           = NO
@@ -215,7 +225,15 @@ QT_AUTOBRIEF           = NO
 # not recognized any more.
 # The default value is: NO.
 
-MULTILINE_CPP_IS_BRIEF = NO
+MULTILINE_CPP_IS_BRIEF = YES
+
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
 
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
@@ -256,12 +274,6 @@ ALIASES                = "handlers=\name Handlers" \
                          "events=\name Events" \
                          "ioparams=\name Configurable parameters"
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -302,19 +314,22 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
 # Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
+# the files are not read by doxygen. When specifying no_extension you should add
+# * to the FILE_PATTERNS.
+#
+# Note see also the list of default file extension mappings.
 
 EXTENSION_MAPPING      =
 
@@ -332,7 +347,7 @@ MARKDOWN_SUPPORT       = YES
 # to that level are automatically included in the table of contents, even if
 # they do not have an id attribute.
 # Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 0.
+# Minimum value: 0, maximum value: 99, default value: 5.
 # This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
 
 TOC_INCLUDE_HEADINGS   = 0
@@ -353,7 +368,7 @@ AUTOLINK_SUPPORT       = YES
 # diagrams that involve STL classes more complete and accurate.
 # The default value is: NO.
 
-BUILTIN_STL_SUPPORT    = NO
+BUILTIN_STL_SUPPORT    = YES
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
@@ -448,6 +463,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# than 0 to get more control over the balance between CPU load and processing
+# speed. At this moment only the input processing can be done using multiple
+# threads. Since this is still an experimental feature the default is set to 1,
+# which efficively disables parallel processing. Please report any issues you
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -468,6 +496,12 @@ EXTRACT_ALL            = NO
 
 EXTRACT_PRIVATE        = NO
 
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL   = YES
+
 # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
 # The default value is: NO.
@@ -505,6 +539,13 @@ EXTRACT_LOCAL_METHODS  = YES
 
 EXTRACT_ANON_NSPACES   = NO
 
+# If this flag is set to YES, the name of an unnamed parameter in a declaration
+# will be determined by the corresponding definition. By default unnamed
+# parameters remain unnamed in the output.
+# The default value is: YES.
+
+RESOLVE_UNNAMED_PARAMS = YES
+
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
 # undocumented members inside documented classes or files. If set to NO these
 # members will be included in the various overviews, but no documentation
@@ -522,8 +563,8 @@ HIDE_UNDOC_MEMBERS     = YES
 HIDE_UNDOC_CLASSES     = YES
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = YES
@@ -542,11 +583,18 @@ HIDE_IN_BODY_DOCS      = NO
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
+# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
+# able to match the capabilities of the underlying filesystem. In case the
+# filesystem is case sensitive (i.e. it supports files in the same directory
+# whose names only differ in casing), the option must be set to YES to properly
+# deal with such files in case they appear in the input. For filesystems that
+# are not case sensitive the option should be be set to NO to properly deal with
+# output files written for symbols that only differ in casing, such as for two
+# classes, one named CLASS and the other named Class, and to also support
+# references to files without having to specify the exact matching casing. On
+# Windows (including Cygwin) and MacOS, users should typically set this option
+# to NO, whereas on Linux or other Unix flavors it should typically be set to
+# YES.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = NO
@@ -569,14 +617,14 @@ HIDE_COMPOUND_REFERENCE= NO
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
 
-SHOW_INCLUDE_FILES     = NO
+SHOW_INCLUDE_FILES     = YES
 
 # If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
 # grouped member an include statement to the documentation, telling the reader
 # which file to include in order to use the member.
 # The default value is: NO.
 
-SHOW_GROUPED_MEMB_INC  = NO
+SHOW_GROUPED_MEMB_INC  = YES
 
 # If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
 # files with double quotes in the documentation rather than with sharp brackets.
@@ -785,7 +833,10 @@ WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
 
 # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered.
+# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
+# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
+# at the end of the doxygen process doxygen will return with a non-zero status.
+# Possible values are: NO, YES and FAIL_ON_WARNINGS.
 # The default value is: NO.
 
 WARN_AS_ERROR          = NO
@@ -821,8 +872,8 @@ INPUT                  = ${DOXY_INPUT}
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
-# possible encodings.
+# documentation (see:
+# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
 # The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
@@ -835,46 +886,20 @@ INPUT_ENCODING         = UTF-8
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # read by doxygen.
 #
+# Note the list of default checked file patterns might differ from the list of
+# default file extension mappings.
+#
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
 # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
+# *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.c \ 
-                         *.cc \
-                         *.cxx \
                          *.cpp \
-                         *.c++ \
-                         *.d \
-                         *.java \
-                         *.ii \
-                         *.ixx \
-                         *.ipp \
-                         *.i++ \
-                         *.inl \
                          *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.h++ \
-                         *.idl \
-                         *.odl \
-                         *.cs \
-                         *.php \
-                         *.php3 \
-                         *.inc \
-                         *.m \
-                         *.markdown \
-                         *.md \
-                         *.mm \
-                         *.dox \
-                         *.py \
-                         *.f90 \
-                         *.f \
-                         *.for \
-                         *.vhd \
-                         *.vhdl
+                         *.md
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@@ -1087,16 +1112,22 @@ USE_HTAGS              = NO
 VERBATIM_HEADERS       = NO
 
 # If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
+# clang parser (see:
+# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
+# performance. This can be particularly helpful with template rich C++ code for
+# which doxygen's built-in parser lacks the necessary type information.
 # Note: The availability of this option depends on whether or not doxygen was
 # generated with the -Duse_libclang=ON option for CMake.
 # The default value is: NO.
 
 CLANG_ASSISTED_PARSING = NO
 
+# If clang assisted parsing is enabled and the CLANG_ADD_INC_PATHS tag is set to
+# YES then doxygen will add the directory of each input to the include path.
+# The default value is: YES.
+
+CLANG_ADD_INC_PATHS    = YES
+
 # If clang assisted parsing is enabled you can provide the compiler with command
 # line options that you would normally use when invoking the compiler. Note that
 # the include paths will already be set by doxygen for the files and directories
@@ -1106,10 +1137,13 @@ CLANG_ASSISTED_PARSING = NO
 CLANG_OPTIONS          =
 
 # If clang assisted parsing is enabled you can provide the clang parser with the
-# path to the compilation database (see:
-# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) used when the files
-# were built. This is equivalent to specifying the "-p" option to a clang tool,
-# such as clang-check. These options will then be passed to the parser.
+# path to the directory containing a file called compile_commands.json. This
+# file is the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
+# options used when the source files were built. This is equivalent to
+# specifying the -p option to a clang tool, such as clang-check. These options
+# will then be passed to the parser. Any options specified with CLANG_OPTIONS
+# will be added as well.
 # Note: The availability of this option depends on whether or not doxygen was
 # generated with the -Duse_libclang=ON option for CMake.
 
@@ -1126,13 +1160,6 @@ CLANG_DATABASE_PATH    =
 
 ALPHABETICAL_INDEX     = YES
 
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
 # In case all classes in a project start with a common prefix, all classes will
 # be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
 # can be used to specify a prefix (or a list of prefixes) that should be ignored
@@ -1156,7 +1183,7 @@ GENERATE_HTML          = YES
 # The default directory is: html.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_OUTPUT            = html
+HTML_OUTPUT            = html/${DOXY_OUTPUT_DIR}
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
 # generated HTML page (for example: .htm, .php, .asp).
@@ -1239,7 +1266,7 @@ HTML_EXTRA_FILES       =
 # Minimum value: 0, maximum value: 359, default value: 220.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_HUE    = 246
+HTML_COLORSTYLE_HUE    = 221
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
 # in the HTML output. For a value of 0 the output will use grayscales only. A
@@ -1247,7 +1274,7 @@ HTML_COLORSTYLE_HUE    = 246
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_SAT    = 79
+HTML_COLORSTYLE_SAT    = 100
 
 # The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
 # luminance component of the colors in the HTML output. Values below 100
@@ -1271,9 +1298,9 @@ HTML_TIMESTAMP         = YES
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1299,14 +1326,15 @@ HTML_DYNAMIC_SECTIONS  = NO
 # Minimum value: 0, maximum value: 9999, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_INDEX_NUM_ENTRIES = 100
+HTML_INDEX_NUM_ENTRIES = 1
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: https://developer.apple.com/xcode/), introduced with OSX
-# 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
+# environment (see:
+# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
+# create a documentation set, doxygen will generate a Makefile in the HTML
+# output directory. Running make will produce the docset in that directory and
+# running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
 # startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
 # genXcode/_index.html for more information.
@@ -1329,7 +1357,7 @@ DOCSET_FEEDNAME        = "Doxygen generated docs"
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_DOCSET is set to YES.
 
-DOCSET_BUNDLE_ID       = org.doxygen.Project
+DOCSET_BUNDLE_ID       = ${DOXY_DOMAIN}
 
 # The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
 # the documentation publisher. This should be a reverse domain-name style
@@ -1337,19 +1365,19 @@ DOCSET_BUNDLE_ID       = org.doxygen.Project
 # The default value is: org.doxygen.Publisher.
 # This tag requires that the tag GENERATE_DOCSET is set to YES.
 
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+DOCSET_PUBLISHER_ID    = ${DOXY_DOMAIN}
 
 # The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
 # The default value is: Publisher.
 # This tag requires that the tag GENERATE_DOCSET is set to YES.
 
-DOCSET_PUBLISHER_NAME  = Publisher
+DOCSET_PUBLISHER_NAME  = PIP
 
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
+# (see:
+# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1379,7 +1407,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1420,11 +1448,12 @@ GENERATE_QHP           = YES
 # the HTML output folder.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QCH_FILE               = pip.qch
+QCH_FILE               = pip_${DOXY_OUTPUT_DIR}.qch
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1432,8 +1461,8 @@ QHP_NAMESPACE          = PIP
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
-# folders).
+# Folders (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1441,30 +1470,30 @@ QHP_VIRTUAL_FOLDER     = PIP
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   = PIP
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  = ${DOXY_QHP_CUST_FILTER_ATTRS}
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  = ${DOXY_QHP_SECT_FILTER_ATTRS}
 
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
+# The QHG_LOCATION tag can be used to specify the location (absolute path
+# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
+# run qhelpgenerator on the generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           = qhelpgenerator
@@ -1487,7 +1516,7 @@ GENERATE_ECLIPSEHELP   = NO
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
 
-ECLIPSE_DOC_ID         = org.doxygen.Project
+ECLIPSE_DOC_ID         = PIP
 
 # If you want full control over the layout of the generated HTML pages it might
 # be necessary to disable the index and replace it with your own. The
@@ -1515,7 +1544,7 @@ DISABLE_INDEX          = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_TREEVIEW      = YES
+GENERATE_TREEVIEW      = NO
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
@@ -1541,6 +1570,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1561,8 +1601,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1574,7 +1620,7 @@ USE_MATHJAX            = NO
 
 # When MathJax is enabled you can set the default output format to be used for
 # the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
 # Possible values are: HTML-CSS (which is slower, but has the best
 # compatibility), NativeMML (i.e. MathML) and SVG.
 # The default value is: HTML-CSS.
@@ -1590,7 +1636,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
 # MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1604,7 +1650,8 @@ MATHJAX_EXTENSIONS     =
 
 # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
 # of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
 # example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1629,10 +1676,10 @@ MATHJAX_CODEFILE       =
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-SEARCHENGINE           = NO
+SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1651,7 +1698,8 @@ SERVER_BASED_SEARCH    = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: https://xapian.org/).
+# Xapian (see:
+# https://xapian.org/).
 #
 # See the section "External Indexing and Searching" for details.
 # The default value is: NO.
@@ -1664,8 +1712,9 @@ EXTERNAL_SEARCH        = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: https://xapian.org/). See the section "External Indexing and
-# Searching" for details.
+# Xapian (see:
+# https://xapian.org/). See the section "External Indexing and Searching" for
+# details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHENGINE_URL       =
@@ -1736,13 +1785,14 @@ LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
 
 # The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
-# generate index for LaTeX.
+# generate index for LaTeX. In case there is no backslash (\) as first character
+# it will be automatically added in the LaTeX code.
 # Note: This tag is used in the generated output file (.tex).
 # See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
-# The default value is: \makeindex.
+# The default value is: makeindex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_MAKEINDEX_CMD    = \makeindex
+LATEX_MAKEINDEX_CMD    = makeindex
 
 # If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
@@ -1828,9 +1878,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -2164,7 +2216,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = ${DOXY_DEFINES}
+PREDEFINED             =  DOXYGEN PIOBJECT PIOBJECT_SUBCLASS PIIODEVICE NO_COPY_CLASS ${DOXY_DEFINES}
 
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
@@ -2209,7 +2261,7 @@ TAGFILES               =
 # tag file that is based on the input files it reads. See section "Linking to
 # external documentation" for more information about the usage of tag files.
 
-GENERATE_TAGFILE       = doc/pip.cfg
+GENERATE_TAGFILE       = doc/html/${DOXY_OUTPUT_DIR}/pip.cfg
 
 # If the ALLEXTERNALS tag is set to YES, all external class will be listed in
 # the class index. If set to NO, only the inherited external classes will be
@@ -2230,13 +2282,7 @@ EXTERNAL_GROUPS        = YES
 # be listed.
 # The default value is: YES.
 
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
+EXTERNAL_PAGES         = NO
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
@@ -2251,15 +2297,6 @@ PERL_PATH              = /usr/bin/perl
 
 CLASS_DIAGRAMS         = YES
 
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            = ${DOXY_MSCGEN_PATH}
-
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
@@ -2357,10 +2394,32 @@ UML_LOOK               = NO
 # but if the number exceeds 15, the total amount of fields shown is limited to
 # 10.
 # Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
+# This tag requires that the tag UML_LOOK is set to YES.
 
 UML_LIMIT_NUM_FIELDS   = 12
 
+# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
+# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
+# tag is set to YES, doxygen will add type and arguments for attributes and
+# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
+# will not generate fields with class member information in the UML graphs. The
+# class diagrams will look similar to the default class diagrams but using UML
+# notation for the relationships.
+# Possible values are: NO, YES and NONE.
+# The default value is: NO.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+DOT_UML_DETAILS        = NO
+
+# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
+# to display on a single line. If the actual line length exceeds this threshold
+# significantly it will wrapped across multiple lines. Some heuristics are apply
+# to avoid ugly line breaks.
+# Minimum value: 0, maximum value: 1000, default value: 17.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_WRAP_THRESHOLD     = 17
+
 # If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
 # collaboration graphs will show the relations between templates and their
 # instances.
@@ -2550,9 +2609,11 @@ DOT_MULTI_TARGETS      = YES
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
+#
+# Note: This setting is not only used for dot files but also for msc and
+# plantuml temporary files.
 # The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES

doc/examples/picli.cpp

@@ -1,25 +1,6 @@
 #include "pip.h"
 
 //! [main]
-int main(int argc, char ** argv) {
-	PICLI cli(argc, argv);
-	cli.addArgument("console");
-	cli.addArgument("debug");
-	cli.addArgument("Value", "v", "value", true);
-	if (cli.hasArgument("console"))
-		piCout << "console active";
-	if (cli.hasArgument("debug"))
-		piCout << "debug active";
-	piCout << "Value =" << cli.argumentValue("Value");
-	return 0;
-}
-
-These executions are similar:
-a.out -cd -v 10
-a.out --value 10 -dc
-a.out -c -v 10 -d
-a.out --console -d -v 10
-a.out --debug -c --value 10
 //! [main]
 
 void _() {

doc/examples/picontainers.cpp

@@ -4,14 +4,17 @@ void _() {
 //! [foreach]
 PIVector<int> vec;
 vec << 1 << 2 << 3;
-piForeach (int & i, vec)
-	cout << i << ", ";
-// 1, 2, 3, 
-piForeach (int & i, vec)
-	i++;
-piForeach (int & i, vec)
-	cout << i << ", ";
-// 2, 3, 4, 
+
+piForeach (int & i, vec) piCout << i;
+// 1
+// 2
+// 3
+
+piForeach (int & i, vec) i++;
+piForeach (int & i, vec) piCout << i;
+// 2
+// 3
+// 4
 //! [foreach]
 //! [foreachC]
 PIVector<int> vec;

doc/examples/picout.cpp

@@ -4,7 +4,7 @@
 inline PICout operator <<(PICout s, const PIByteArray & ba) {
 	s.space(); // insert space after previous output
 	s.quote(); // ONLY if you want to quoted your type
-	s.setControl(0, true); // clear all features and
+	s.saveAndSetControls(0); // clear all features and
 	// save them to stack,
 	// now it`s behavior similar to std::cout
 	
@@ -12,7 +12,7 @@ inline PICout operator <<(PICout s, const PIByteArray & ba) {
 	for (uint i = 0; i < ba.size(); ++i)
 		s << ba[i];
 	
-	s.restoreControl(); // restore features from stack
+	s.restoreControls(); // restore features from stack
 	s.quote(); // ONLY if you want to quoted your type
 	return s;
 }

doc/examples/piiodevice.cpp

@@ -3,25 +3,24 @@ void _() {
 	
 //! [0]
 class SomeIO: public PIIODevice {
-	PIIODEVICE(SomeIO)
+	PIIODEVICE(SomeIO, "myio")
 public:
 	SomeIO(): PIIODevice() {}
 protected:
-	bool openDevice() {
+	bool openDevice() override {
 		// open your device here
 		return if_success;
 	}
-	int read(void * read_to, int max_size) {
+	ssize_t readDevice(void * read_to, ssize_t max_size) override {
 		// read from your device here
 		return readed_bytes;
 	}
-	int write(const void * data, int max_size) {
+	ssize_t writeDevice(const void * data, ssize_t max_size) override {
 		// write to your device here
 		return written_bytes;
 	}
-	PIString fullPathPrefix() const {return "myio";}
-	void configureFromFullPath(const PIString & full_path) {
-		// parse full_path and configure device there
+	void configureFromFullPathDevice(const PIString & full_path) override {
+		// parse full_path and configure device here
 	}
 };
 REGISTER_DEVICE(SomeIO)
@@ -39,7 +38,7 @@ ser.configure("example.conf", "dev");
 //! [configureDevice]
 class SomeIO: public PIIODevice {
 	...
-	bool configureDevice(const void * e_main, const void * e_parent) {
+	bool configureDevice(const void * e_main, const void * e_parent) override {
 		PIConfig::Entry * em = (PIConfig::Entry * )e_main;
 		PIConfig::Entry * ep = (PIConfig::Entry * )e_parent;
 		setStringParam(readDeviceSetting<PIString>("stringParam", stringParam(), em, ep));

doc/examples/pimutex.cpp

@@ -2,8 +2,5 @@
 
 void _() {
 //! [main]
-mutex.lock();
-// ... your code here
-mutex.unlock();
 //! [main]
 }

doc/examples/piobject.cpp

@@ -5,8 +5,8 @@ class ObjectA: public PIObject {
 	PIOBJECT(ObjectA)
 public:
 	EVENT_HANDLER1(void, handlerA, const PIString & , str) {piCoutObj << "handler A:" << str;}
-	EVENT2(eventA2, int, i, float, f);
 	EVENT1(eventA1, const PIString & , str);
+	EVENT2(eventA2, int, i, float, f);
 };
 
 class ObjectB: public PIObject {
@@ -26,7 +26,11 @@ int main(int argc, char * argv[]) {
 	CONNECT1(void, PIString, &obj_b, eventB, &obj_a, handlerA);
 	obj_b.eventB("event to handler");
 	
-	CONNECT1(void, PIString, &obj_a, eventA1, &obj_b, eventB);
+	CONNECTU(&obj_a, eventA1, &obj_b, eventB);
 	obj_a.eventA1("event to event");
+
+	obj_a.piDisconnect("eventA1");
+	CONNECTL(&obj_a, eventA1, ([](const PIString & str){piCout << str;}));
+	obj_a.eventA1("event to lambda");
 };
 //! [main]

doc/examples/pistring.cpp

@@ -1,348 +0,0 @@
-#include "pip.h"
-
-void _() {
-
-//! [PIString(char * )]
-PIString s("string");
-//! [PIString(char * )]
-//! [PIString(wchar_t * )]
-PIString s(L"string");
-//! [PIString(wchar_t * )]
-//! [PIString(char * , int)]
-PIString s("string", 3); // s = "str"
-//! [PIString(char * , int)]
-//! [PIString(int, char)]
-PIString s(5, 'p'); // s = "ppppp"
-//! [PIString(int, char)]
-//! [PIString(int, PIChar)]
-PIString s(5, "№"); // s = "№№№№№"
-//! [PIString(int, PIChar)]
-//! [PIString::char*]
-PIString s("pip");
-cout << (char*)s << endl; // pip
-//! [PIString::char*]
-//! [PIString::<<(PIString)]
-PIString s("this"), s1(" is"), s2(" string");
-s << s1 << s2; // s = "this is string"
-//! [PIString::<<(PIString)]
-//! [PIString::<<(PIChar)]
-PIString s("stri");
-s << PIChar('n') << PIChar('g'); // s = "string"
-//! [PIString::<<(PIChar)]
-//! [PIString::<<(char * )]
-PIString s("this");
-s << " is" << " string"; // s = "this is string"
-//! [PIString::<<(char * )]
-//! [PIString::<<(wchar_t * )]
-PIString s;
-s << L"№ -" << " number"; // s = "№ - number"
-//! [PIString::<<(wchar_t * )]
-//! [PIString::<<(int)]
-PIString s("ten - ");
-s << 10; // s = "ten - 10"
-//! [PIString::<<(int)]
-//! [PIString::mid]
-PIString s("0123456789");
-piCout << s.mid(-2, -1); // s = "0123456789"
-piCout << s.mid(-2, 4);  // s = "01"
-piCout << s.mid(3, -1);  // s = "3456789"
-piCout << s.mid(3, 4);   // s = "3456"
-//! [PIString::mid]
-//! [PIString::left]
-PIString s("0123456789");
-piCout << s.left(-1); // s = ""
-piCout << s.left(1);  // s = "0"
-piCout << s.left(5);  // s = "01234"
-piCout << s.left(15); // s = "0123456789"
-//! [PIString::left]
-//! [PIString::right]
-PIString s("0123456789");
-piCout << s.right(-1); // s = ""
-piCout << s.right(1);  // s = "9"
-piCout << s.right(5);  // s = "56789"
-piCout << s.right(15); // s = "0123456789"
-//! [PIString::right]
-//! [PIString::cutMid]
-PIString s("0123456789");
-s.cutMid(1, 3);
-piCout << s; // s = "0456789"
-s.cutMid(-1, 3);
-piCout << s; // s = "56789"
-s.cutMid(3, -1);
-piCout << s; // s = "567"
-//! [PIString::cutMid]
-//! [PIString::cutLeft]
-PIString s("0123456789");
-s.cutLeft(1);
-piCout << s; // s = "123456789"
-s.cutLeft(3);
-piCout << s; // s = "456789"
-s.cutLeft(30);
-piCout << s; // s = ""
-//! [PIString::cutLeft]
-//! [PIString::cutRight]
-PIString s("0123456789");
-s.cutRight(1);
-piCout << s; // s = "012345678"
-s.cutRight(3);
-piCout << s; // s = "012345"
-s.cutRight(30);
-piCout << s; // s = ""
-//! [PIString::cutRight]
-//! [PIString::trim]
-PIString s("  string  ");
-s.trim();
-piCout << s; // s = "string"
-//! [PIString::trim]
-//! [PIString::trimmed]
-PIString s("  string  ");
-piCout << s.trimmed(); // s = "string"
-piCout << s; // s = "  string  "
-//! [PIString::trimmed]
-//! [PIString::replace_0]
-PIString s("0123456789");
-s.replace(2, 3, "_cut_");
-piCout << s; // s = "01_cut_56789"
-s.replace(0, 1, "one_");
-piCout << s; // s = "one_1_cut_56789"
-//! [PIString::replace_0]
-//! [PIString::replaced_0]
-PIString s("0123456789");
-piCout << s.replaced(2, 3, "_cut_"); // s = "01_cut_56789"
-piCout << s.replaced(0, 1, "one_"); // s = "one_123456789"
-//! [PIString::replaced_0]
-//! [PIString::replace_1]
-PIString s("pip string");
-bool ok;
-s.replace("string", "conf", &ok);
-piCout << s << ok; // s = "pip conf", true
-s.replace("PIP", "PlInPr", &ok);
-piCout << s << ok; // s = "pip conf", false
-//! [PIString::replace_1]
-//! [PIString::replaced_1]
-PIString s("pip string");
-bool ok;
-piCout << s.replace("string", "conf", &ok); // s = "pip conf", true
-piCout << s.replace("PIP", "PlInPr", &ok); // s = "pip string", false
-//! [PIString::replaced_1]
-//! [PIString::replaceAll]
-PIString s("substrings");
-s.replaceAll("s", "_");
-piCout << s; // s = "_ub_tring_"
-//! [PIString::replaceAll]
-//! [PIString::repeat]
-PIString s(" :-) ");
-s.repeat(3);
-piCout << s; // :-)  :-)  :-) 
-//! [PIString::repeat]
-//! [PIString::repeated]
-PIString s(" :-) ");
-piCout << s.repeated(3); // :-)  :-)  :-) 
-piCout << s; // :-) 
-//! [PIString::repeated]
-//! [PIString::insert_0]
-PIString s("pp");
-s.insert(1, "i");
-piCout << s; // s = "pip"
-//! [PIString::insert_0]
-//! [PIString::insert_1]
-PIString s("pp");
-s.insert(1, 'i');
-piCout << s; // s = "pip"
-//! [PIString::insert_1]
-//! [PIString::insert_2]
-PIString s("stg");
-s.insert(2, "rin");
-piCout << s; // s = "string"
-//! [PIString::insert_2]
-//! [PIString::expandRightTo]
-PIString s("str");
-s.expandRightTo(2, "_");
-piCout << s; // s = "str"
-s.expandRightTo(6, "_");
-piCout << s; // s = "str___"
-//! [PIString::expandRightTo]
-//! [PIString::expandLeftTo]
-PIString s("str");
-s.expandLeftTo(2, "_");
-piCout << s; // s = "str"
-s.expandLeftTo(6, "_");
-piCout << s; // s = "___str"
-//! [PIString::expandLeftTo]
-//! [PIString::reverse]
-PIString s("0123456789");
-s.reverse();
-piCout << s; // s = "9876543210"
-//! [PIString::reverse]
-//! [PIString::reversed]
-PIString s("0123456789");
-piCout << s.reversed(); // s = "9876543210"
-piCout << s; // s = "0123456789"
-//! [PIString::reversed]
-//! [PIString::elided]
-piCout << PIString("123456789ABCDEF").elided(8, PIString::ElideLeft);   // ..ABCDEF
-piCout << PIString("123456789ABCDEF").elided(8, PIString::ElideCenter); // 123..DEF
-piCout << PIString("123456789ABCDEF").elided(8, PIString::ElideRight);  // 123456..
-piCout << PIString("123456789ABCDEF").elided(8, 0.25);                  // 12..CDEF
-//! [PIString::elided]
-//! [PIString::lengthAscii]
-piCout << PIString("0123456789").lengthAscii(); // 10
-piCout << PIString("№1").lengthAscii(); // 3
-//! [PIString::lengthAscii]
-//! [PIString::data]
-piCout << PIString("0123456789").data(); // 0123456789
-piCout << PIString("№1").data(); // №1
-//! [PIString::data]
-//! [PIString::split]
-PIString s("1 2 3");
-piCout << s.split(" "); // {"1", "2", "3"}
-//! [PIString::split]
-//! [PIString::find]
-PIString s("012345012345");
-piCout << s.find("-"); // -1
-piCout << s.find("3"); // 3
-piCout << s.find("3", 4); // 9
-piCout << s.find("3", 10); // -1
-//! [PIString::find]
-//! [PIString::findLast]
-PIString s("012345012345");
-piCout << s.find("-"); // -1
-piCout << s.find("3"); // 9
-piCout << s.find("3", 4); // 9
-piCout << s.find("3", 10); // -1
-//! [PIString::findLast]
-//! [PIString::findAny]
-piCout << PIString("1.str").findAny(".,:"); // 1
-piCout << PIString("1,str").findAny(".,:"); // 1
-piCout << PIString("1:str").findAny(".,:"); // 1
-//! [PIString::findAny]
-//! [PIString::findAnyLast]
-piCout << PIString("str.0").findAny(".,:"); // 3
-piCout << PIString("str,0").findAny(".,:"); // 3
-piCout << PIString("str:0").findAny(".,:"); // 3
-//! [PIString::findAnyLast]
-//! [PIString::findWord]
-PIString s("this is <PIP>");
-piCout << s.find("this"); // 0
-piCout << s.find("is"); // 5
-piCout << s.find("PIP", 4); // -1
-piCout << s.find("<PIP>", 10); // 8
-//! [PIString::findWord]
-//! [PIString::findCWord]
-PIString s("this::is <PIP>");
-piCout << s.find("this"); // 0
-piCout << s.find("is"); // 6
-piCout << s.find("PIP", 4); // 10
-piCout << s.find("<PIP>", 10); // 9
-//! [PIString::findCWord]
-//! [PIString::toNumber]
-piCout << PIString("123").toInt(); // 123
-piCout << PIString("123").toInt(16); // 291
-piCout << PIString("0x123").toInt(); // 291
-piCout << PIString("1001").toInt(2); // 9
-//! [PIString::toNumber]
-//! [PIString::toFloat]
-piCout << PIString("123").toFloat(); // 123
-piCout << PIString("1.2E+2").toFloat(); // 120
-piCout << PIString("0.01").toFloat(); // 0.01
-//! [PIString::toFloat]
-//! [PIString::setNumber]
-PIString s;
-s.setNumber(123);
-piCout << s; // 123
-s.setNumber(123, 16);
-piCout << s; // 7B
-//! [PIString::setNumber]
-//! [PIString::setFloat]
-PIString s;
-s.setNumber(12.3);
-piCout << s; // 12.3
-//! [PIString::setFloat]
-//! [PIString::setReadableSize]
-PIString s;
-s.setReadableSize(512);
-piCout << s; // 512 B
-s.setReadableSize(5120);
-piCout << s; // 5.0 kB
-s.setReadableSize(512000);
-piCout << s; // 500.0 kB
-s.setReadableSize(5120000);
-piCout << s; // 4.8 MB
-s.setReadableSize(512000000);
-piCout << s; // 488.2 MB
-s.setReadableSize(51200000000);
-piCout << s; // 47.6 GB
-//! [PIString::setReadableSize]
-//! [PIString::fromNumber]
-piCout << PIString::fromNumber(123); // 123
-piCout << PIString::fromNumber(123, 16); // 7B
-//! [PIString::fromNumber]
-//! [PIString::fromFloat]
-piCout << PIString::fromNumber(12.3); // 12.3
-//! [PIString::fromFloat]
-//! [PIString::readableSize]
-piCout << PIString::readableSize(512); // 512 B
-piCout << PIString::readableSize(5120); // 5.0 kB
-piCout << PIString::readableSize(512000); // 500.0 kB
-piCout << PIString::readableSize(5120000); // 4.8 MB
-piCout << PIString::readableSize(512000000); // 488.2 MB
-piCout << PIString::readableSize(51200000000); // 47.6 GB
-//! [PIString::readableSize]
-//! [PIString::takeSymbol]
-PIString s("\t ! word");
-piCout << s.takeSymbol(); // "!"
-piCout << s.takeSymbol(); // "w"
-piCout << s.takeSymbol(); // "o"
-piCout << s; // "rd"
-//! [PIString::takeSymbol]
-//! [PIString::takeWord]
-PIString s("some words\nnew line ");
-piCout << s.takeWord(); // "some"
-piCout << s.takeWord(); // "words"
-piCout << s.takeWord(); // "new"
-piCout << s; // " line "
-//! [PIString::takeWord]
-//! [PIString::takeLine]
-PIString s("some words\nnew line \n\nend");
-piCout << s.takeLine(); // "some words"
-piCout << s.takeLine(); // "new line "
-piCout << s.takeLine(); // ""
-piCout << s; // "end"
-//! [PIString::takeLine]
-//! [PIString::takeNumber]
-PIString s(" 0xFF -99 1.2E+5f 1000L");
-piCout << s.takeNumber(); // "0xFF"
-piCout << s.takeNumber(); // "-99"
-piCout << s.takeNumber(); // "1.2E+5f"
-piCout << s.takeNumber(); // "1000L"
-piCout << s; // ""
-//! [PIString::takeNumber]
-//! [PIString::takeRange]
-PIString s(" {figures{inside}}");
-piCout << s.takeRange('{', '}'); // "figures{inside}"
-piCout << s; // ""
-s = "\"text\\\"shielded\" next";
-piCout << s.takeRange('"', '"'); // "text\"shielded"
-piCout << s; // " next"
-//! [PIString::takeRange]
-
-//! [PIStringList::join]
-PIStringList sl("1", "2");
-sl << "3";
-piCout << sl.join(" < "); // 1 < 2 < 3
-//! [PIStringList::join]
-//! [PIStringList::removeStrings]
-PIStringList sl("1", "2");
-sl << "1" << "2" << "3";
-piCout << sl; // {"1", "2", "1", "2", "3"}
-piCout << sl.removeStrings("1"); // {"2", "2", "3"}
-//! [PIStringList::removeStrings]
-//! [PIStringList::removeDuplicates]
-PIStringList sl("1", "2");
-sl << "1" << "2" << "3";
-piCout << sl; // {"1", "2", "1", "2", "3"}
-piCout << sl.removeDuplicates(); // {"1", "2", "3"}
-//! [PIStringList::removeDuplicates]
-
-
-};

doc/pages/code_model.md

@@ -0,0 +1,297 @@
+\~english \page code_model Code generation
+\~russian \page code_model Генерация кода
+
+\~english
+
+\~russian
+
+# Введение
+
+Кодогенерация помогает в случаях, когда нужен доступ к строковому представлению
+сущностей (классов, перечислений, ...), либо автоматизированная де/сериализация
+структур и классов.
+
+Например, необходимо для создания интерфейса получить в готовом виде список
+пар "имя" = "значение" от какого-либо перечисления, либо обойти список
+вложенных в класс структур с дополнительными метками. Или просто описать
+структуру любой сложности, пометить поля номерами и получить готовые операторы
+де/сериализации для PIBinaryStream с возможностью будущих изменений и сохранением
+обратной совместимости.
+
+# pip_cmg
+
+PIP предоставляет утилиту, которая берет на вход файлы исходного кода, пути
+включения, параметры и макросы, и на выходе создает h/cpp пару файлов с
+необходимым функционалом. В зависимости от параметров, в этих файлах будут
+присутствовать секции:
+ * метаинформации о сущностях;
+ * операторы де/сериализации;
+ * возможность получить PIVariant любого члена структуры по имени.
+ 
+Параметры обработки:
+ * -s - не следовать "#include" внутри файлов;
+ * -I<include_dir> - добавить папку включения (например, -I.. -I../some_dir -I/usr/include);
+ * -D<define>  - добавить макрос, PICODE всегда объявлен (например, -DMY_DEFINE добавит макрос MY_DEFINE).
+ 
+Параметры создания:
+ * -A - создать всё;
+ * -M - создать метаинформацию (имена и типы всех членов, иерархия включения);
+ * -E - создать перечисления (списки перечислений);
+ * -S - создать операторы де/сериализации;
+ * -G - создать методы получения значений переменных по именам;
+ * -o <output_file> - имя файлов модели без расширения (например, "ccm" - создадутся файлы "ccm.h" и "ccm.cpp")
+
+# CMake
+
+Для автоматизации кодогенерации существует CMake макрос pip_code_model, который сам вызывает pip_cmg и
+следит за актуальностью модели.
+
+Формат вызова макроса:
+\code{.cmake}
+pip_code_model(<out_var> file0 [file1 ...] [OPTIONS opt0 [opt1 ...] ] [NAME name])
+\endcode
+
+Параметры:
+ * out_var - имя переменной, куда будут записаны абсолютные пути сгенерённых файлов;
+ * file... - файлы для генерации, допускаются относительные или абсолютные пути;
+ * OPTIONS - передаваемые в pip_cmg параметры, например, "-Es";
+ * NAME - базовое имя файлов модели, если не указано, то используется "ccm_${PROJECT_NAME}".
+ 
+Этот макрос сам включает все пути для PIP.
+
+Для получения актуальных параметров pip_cmg можно вызывать "pip_cmg -v".
+
+# Подробности
+
+## Метаинформация
+
+Метаинформация - это текстовое представление всех членов и методов структуры или класса C++.
+Для доступа к ним используется PICodeInfo::classesInfo->value("name"), который возвращает
+указатель на структуру PICodeInfo::ClassInfo, содержащую всю информацию о сущности.
+
+В любой структуре PICodeInfo есть поле "MetaMap meta", содержащее произвольные
+данные, видимые для кодогенератора, но невидимые для компилятора.
+Для этого используется макрос PIMETA(), который необходимо вписать после объявления
+переменной, метода либо сущности, например:
+\code{.cpp}
+struct MyStruct: Header PIMETA(type=in,port=5005) {
+	ushort calcChecksum() const PIMETA(show=true);
+	bool checkChecksum() const;
+	void setChecksum();
+	uchar block_id PIMETA(type=int) = 0;
+};
+enum FOV { // Поле зрения
+	fovWide   PIMETA(label="Широкое",angle=90),
+	fovNormal PIMETA(label="Нормальное",angle=60),
+	fovNarrow PIMETA(label="Узкое",angle=30)
+};
+\endcode
+В этом примере в каждом месте, где указана PIMETA, её можно будет получить через "MetaMap meta".
+
+## Перечисления
+
+Перечисления записываются отдельно, для доступа к ним используется PICodeInfo::enumsInfo->value("name"),
+который возвращает указатель на структуру PICodeInfo::EnumInfo, содержащую всю информацию о перечеслении.
+
+## Операторы де/сериализации
+
+Эти операторы создаются в h файле для всех сутрктур и классов, в которых есть хотя бы один член,
+доступный для работы. Операторы работают с PIBinaryStream в двух вариантах - простом или через PIChunkStream.
+
+Для каждой структуры можно указать режим де/сериализации с помощью фиксированного поля в PIMETA:
+ * нет указаний - работа через PIChunkStream;
+ * simple-stream - работа просто через PIBinaryStream;
+ * no-stream - не создавать операторы.
+ 
+Например, для структуры
+\code{.cpp}
+struct DateTime {
+	uchar seconds;
+	uchar minutes;
+	uchar hours;
+	uchar days;
+	uchar months;
+	uchar years;
+};
+\endcode
+создадутся операторы
+\code{.cpp}
+BINARY_STREAM_WRITE(DateTime) {
+	PIChunkStream cs;
+	cs << cs.chunk(1, v.seconds);
+	cs << cs.chunk(2, v.minutes);
+	cs << cs.chunk(3, v.hours);
+	cs << cs.chunk(4, v.days);
+	cs << cs.chunk(5, v.months);
+	cs << cs.chunk(6, v.years);
+	s << cs.data();
+	return s;
+}
+BINARY_STREAM_READ (DateTime) {
+	PIByteArray csba; s >> csba;
+	PIChunkStream cs(csba);
+	while (!cs.atEnd()) {
+		switch (cs.read()) {
+		case 1: cs.get(v.seconds); break;
+		case 2: cs.get(v.minutes); break;
+		case 3: cs.get(v.hours); break;
+		case 4: cs.get(v.days); break;
+		case 5: cs.get(v.months); break;
+		case 6: cs.get(v.years); break;
+		}
+	}
+	return s;
+}
+\endcode
+, где порядок id последовательнен.
+
+Для структуры
+\code{.cpp}
+struct DateTime PIMETA(simple-stream) {
+	uchar seconds;
+	uchar minutes;
+	uchar hours;
+	uchar days;
+	uchar months;
+	uchar years;
+};
+\endcode
+создадутся операторы
+\code{.cpp}
+BINARY_STREAM_WRITE(DateTime) {
+	s << v.seconds;
+	s << v.minutes;
+	s << v.hours;
+	s << v.days;
+	s << v.months;
+	s << v.years;
+	return s;
+}
+BINARY_STREAM_READ (DateTime) {
+	s >> v.seconds;
+	s >> v.minutes;
+	s >> v.hours;
+	s >> v.days;
+	s >> v.months;
+	s >> v.years;
+	return s;
+}
+\endcode
+
+Для структуры
+\code{.cpp}
+struct DateTime PIMETA(no-stream) {
+	uchar seconds;
+	uchar minutes;
+	uchar hours;
+	uchar days;
+	uchar months;
+	uchar years;
+};
+\endcode
+не создадутся операторы
+
+В режиме работы через PIChunkStream также можно указать индивидуальные id,
+что очень полезно для сохранения обратной совместимости структур разных версий:
+Для структуры
+\code{.cpp}
+struct DateTime {
+	PIMETA(id=10) uchar seconds;
+	PIMETA(id=11) uchar minutes;
+	PIMETA(id=12) uchar hours;
+	PIMETA(id=20) uchar days;
+	PIMETA(id=21) uchar months;
+	PIMETA(id=22) uchar years;
+};
+\endcode
+\code{.cpp}
+BINARY_STREAM_WRITE(DateTime) {
+	PIChunkStream cs;
+	cs << cs.chunk(10, v.seconds);
+	cs << cs.chunk(11, v.minutes);
+	cs << cs.chunk(12, v.hours);
+	cs << cs.chunk(20, v.days);
+	cs << cs.chunk(21, v.months);
+	cs << cs.chunk(22, v.years);
+	s << cs.data();
+	return s;
+}
+BINARY_STREAM_READ (DateTime) {
+	PIByteArray csba; s >> csba;
+	PIChunkStream cs(csba);
+	while (!cs.atEnd()) {
+		switch (cs.read()) {
+		case 10: cs.get(v.seconds); break;
+		case 11: cs.get(v.minutes); break;
+		case 12: cs.get(v.hours); break;
+		case 20: cs.get(v.days); break;
+		case 21: cs.get(v.months); break;
+		case 22: cs.get(v.years); break;
+		}
+	}
+	return s;
+}
+\endcode
+
+Если в этом режиме какую-либо переменную надо проигнорировать, то вместо
+числа id можно указать "-":
+\code{.cpp}
+struct DateTime {
+	PIMETA(id=10) uchar seconds;
+	PIMETA(id=11) uchar minutes;
+	PIMETA(id=-) uchar hours;
+	PIMETA(id=20) uchar days;
+	PIMETA(id=21) uchar months;
+	PIMETA(id=-) uchar years;
+};
+\endcode
+\code{.cpp}
+BINARY_STREAM_WRITE(DateTime) {
+	PIChunkStream cs;
+	cs << cs.chunk(10, v.seconds);
+	cs << cs.chunk(11, v.minutes);
+	cs << cs.chunk(20, v.days);
+	cs << cs.chunk(21, v.months);
+	s << cs.data();
+	return s;
+}
+BINARY_STREAM_READ (DateTime) {
+	PIByteArray csba; s >> csba;
+	PIChunkStream cs(csba);
+	while (!cs.atEnd()) {
+		switch (cs.read()) {
+		case 10: cs.get(v.seconds); break;
+		case 11: cs.get(v.minutes); break;
+		case 20: cs.get(v.days); break;
+		case 21: cs.get(v.months); break;
+		}
+	}
+	return s;
+}
+\endcode
+
+# Интеграция в проект
+
+При использовании CMake достаточно включить содержимое переменной out_var в приложение
+или библиотеку, и включить через "#include" сгенерированный заголовочный файл в нужном месте.
+После этого перечисления и метаинформация будут загружены в момент запуска, до int main(),
+а операторы станут доступны через заголовочный файл.
+
+CMakeLists.txt:
+\code{.cmake}
+project(myapp)
+pip_code_model(CCM "structures.h" OPTIONS "-EMs")
+add_executable(${PROJECT_NAME} ${CPPS} ${CCM})
+\endcode
+
+C++:
+\code{.cpp}
+#include "ccm_myapp.h"
+
+...
+
+PICodeInfo::EnumInfo * ei = PICodeInfo::enumsInfo->value("MyEnum", 0);
+if (ei) {
+	ei->members.forEach([](const PICodeInfo::EnumeratorInfo & e){piCout << e.name << "=" << e.value;});
+}
+\endcode

doc/pages/iostream.md

@@ -0,0 +1,125 @@
+\~english \page iostream Input/Output stream
+\~russian \page iostream Поток ввода/вывода
+
+\~english
+
+\~russian
+%PIBinaryStream представляет собой интерфейс бинарной сериализации.
+Не может быть использован в чистом виде, только в виде миксина или
+готовых классов: PIByteArray и PIIOBinaryStream.
+
+
+Используется для сохранения или чтения любых данных. Простые типы читаются/пишутся
+как блоки памяти, если не созданы конкретные операторы. Сложные типы
+([нетривиальные](https://ru.cppreference.com/w/cpp/types/is_trivially_copyable))
+обязаны иметь операторы ввода/вывода, иначе возникнет ошибка компиляции.
+
+Также поддерживаются контейнеры с типами по таким же правилам.
+
+Перечисления интерпретируются как int, логические типы как один байт.
+
+Операторы сохранения добавляют данные в конец потока, а операторы извлечения
+берут данные из его начала.
+
+Для облегчения написания операторов есть макросы:
+ * BINARY_STREAM_FRIEND(T) - объявить операторы с доступом к приватному
+ содержимому типа T, необязателен;
+ * BINARY_STREAM_WRITE(T) - запись в поток, "s" - объект потока, "v" - объект типа T;
+ * BINARY_STREAM_READ(T) - чтение из потока, "s" - объект потока, "v" - объект типа T.
+ 
+Пример:
+\~\code{.cpp}
+#include <pibytearray.h>
+
+class MyType {
+	BINARY_STREAM_FRIEND(MyType);
+public:
+
+	void setInt(int v) {m_i = v;}
+	int getInt() const {return m_i;}
+
+	void setString(PIString v) {m_s = v;}
+	PIString getString() const {return m_s;}
+
+private:
+	int m_i = 0;
+	PIString m_s;
+
+};
+
+BINARY_STREAM_WRITE(MyType) {s << v.m_i << v.m_s; return s;}
+BINARY_STREAM_READ (MyType) {s >> v.m_i >> v.m_s; return s;}
+
+int main(int argc, char * argv[]) {
+	MyType t_read, t_write;
+	t_write.setInt(10);
+	t_write.setString("text");
+
+	PIByteArray data;
+	data << t_write;
+
+	piCout << data.toHex();
+
+	data >> t_read;
+	piCout << t_read.getInt() << t_read.getString();
+
+	piCout << data.toHex();
+}
+\endcode
+
+\~english Result:
+\~russian Результат:
+\~\code{.cpp}
+0a000000040000007400650078007400
+10 text
+
+\endcode
+
+
+\~english
+For store/restore custom data blocks this is PIMemoryBlock class. Stream
+operators of this class simply store/restore data block to/from stream:
+
+\~russian
+Для сохранения/извлечения блоков произвольных данных используется класс PIMemoryBlock.
+Потоковые операторы для него просто сохраняют/извлекают блоки байтов в/из потока:
+
+\~\code{.cpp}
+float a_read[10], a_write[10];
+for (int i = 0; i < 10; ++i) {
+	a_read [i] = 0.f;
+	a_write[i] = i / 10.f;
+}
+
+PIByteArray data;
+data << PIMemoryBlock(a_write, 10 * sizeof(float));
+
+piCout << data.toHex();
+
+data >> PIMemoryBlock(a_read, 10 * sizeof(float));
+for (int i = 0; i < 10; ++i)
+	piCout << a_read[i];
+\endcode
+
+\~english Result:
+\~russian Результат:
+\~\code{.cpp}
+00000000cdcccc3dcdcc4c3e9a99993ecdcccc3e0000003f9a99193f3333333fcdcc4c3f6666663f
+0
+0.1
+0.2
+0.3
+0.4
+0.5
+0.6
+0.7
+0.8
+0.9
+\endcode
+
+\~english
+
+\~russian
+Если при чтении из потока не хватило данных (например, закончился массив или файл), то проверка
+объекта потока на wasReadError() вернёт true. Рекомендуется делать эту проверку после чтения
+данных для корректной обработки ошибки.

doc/pages/main.md

@@ -0,0 +1,44 @@
+\~english \mainpage What is PIP
+\~russian \mainpage Что такое PIP
+
+
+\~english
+
+PIP - Platform-Independent Primitives - is crossplatform library for C++ developers.
+This library can help developers write non-GUI projects much more quickly, efficiently
+and customizable than on pure C++.
+
+Application written on PIP works the same on any system. One can read and write
+any data types, serialize any types to device channels between any systems.
+
+Many common data types, system primitives and devices implemented in this library.
+
+PIP also tightly integrates with [CMake](https://cmake.org/) build system, providing handly search
+main library, additional modules of PIP and several utilites. With
+CMake with PIP one can easily generate and use code metainformation or
+serialize custom types with it versions back-compatability.
+
+Summary one can find at \ref summary page.
+
+Basic using of PIP described at \ref using_basic page.
+
+
+\~russian
+
+PIP - Platform-Independent Primitives - кроссплатформенная библиотека для разработчиков на C++.
+Эта библиотека поможет разработчику написать неграфическое приложение быстрее, эффективнее
+и более гибко, чем на чистом C++.
+
+Приложения, написанные на PIP, работают одинаково на многих системах. Можно читать и писать
+любые типы данных, сериализовать любые типы в каналы устройств между любыми системами.
+
+Многие типы данных, системные сущности и устройства реализованы в библиотеке.
+
+PIP также тесно интегрируется с системой сборки [CMake](https://cmake.org/), предоставляя удобный поиск
+главной библиотеки, модулей PIP и некоторых утилит. Используя CMake вместе с PIP
+можно генерировать и использовать метаинформация о коде или сериализовать
+свои типы данных с обратной совместимостью их версий.
+
+Сводку можно найти на странице \ref summary.
+
+Базовое использование PIP описано на странице \ref using_basic.

doc/pages/summary.md

@@ -0,0 +1,104 @@
+\~english \page summary Functionality summary
+\~russian \page summary Сводка функциональности
+
+\~english
+
+* direct output to console (\a PICout)
+* containers (\a PIVector, \a PIDeque, \a PIVector2D, \a PIStack, \a PIQueue, \a PIMap, \a PISet)
+* byte array (\a PIByteArray)
+* serialization (\a PIBinaryStream, \a PITextStream, \a PIIOBinaryStream, \a PIIOTextStream, \a PIChunkStream, \a PIJSON)
+* string (\a PIConstChars, \a PIString, \a PIStringList)
+* base object (events and handlers) (\a PIObject)
+* multithreading
+ * thread (\a PIThread)
+ * blocking (\a PIMutex, \a PISpinlock)
+ * executor (\a PIThreadPoolExecutor)
+ * blocking dequeue (\a PIBlockingDequeue)
+* timer (\a PITimer)
+* tiling console (with widgets) (\a PIScreen)
+ * simple text rows
+ * scroll bar
+ * list
+ * button
+ * buttons group
+ * check box
+ * progress bar
+ * PICout output
+ * text input
+* I/O devices
+ * base class (\a PIIODevice)
+ * file (\a PIFile)
+ * serial port (\a PISerial)
+ * ethernet (\a PIEthernet)
+ * USB (\a PIUSB)
+ * packets extractor (\a PIPacketExtractor)
+ * binary log (\a PIBinaryLog)
+ * complex I/O point (\a PIConnection)
+ * peering net node (\a PIPeer)
+ * connection quality diagnotic (\a PIDiagnostics)
+* Run-time libraries
+ * abstract (\a PILibrary)
+ * plugin (\a PIPluginLoader)
+* Mathematics
+ * complex numbers
+ * vectors (\a PIMathVector, \a PIMathVectorT)
+ * matrices (\a PIMathMatrix, \a PIMathMatrixT)
+ * quaternion (\a PIQuaternion)
+ * 2D geometry (\a PIPoint, \a PILine, \a PIRect)
+ * statistic (\a PIStatistic)
+ * CRC checksum (\a PICRC)
+ * Fourier transform (\a PIFFTW, \a PIFFT)
+ * expression evaluator (\a PIEvaluator)
+* command-line arguments parser (\a PICLI)
+* process (\a PIProcess)
+
+\~russian
+
+* общение с консолью (\a PICout)
+* контейнеры (\a PIVector, \a PIDeque, \a PIVector2D, \a PIStack, \a PIQueue, \a PIMap, \a PISet)
+* байтовый массив (\a PIByteArray)
+* сериализация (\a PIBinaryStream, \a PITextStream, \a PIIOBinaryStream, \a PIIOTextStream, \a PIChunkStream)
+* строка (\a PIConstChars, \a PIString, \a PIStringList)
+* базовый объект (события и обработчики) (\a PIObject)
+* многопоточность
+ * поток (\a PIThread)
+ * блокировки (\a PIMutex, \a PISpinlock)
+ * исполнитель (\a PIThreadPoolExecutor)
+ * блокирующая очередь (\a PIBlockingDequeue)
+* таймер (\a PITimer)
+* тайлинговая консоль (с виджетами) (\a PIScreen)
+ * простой вывод строк
+ * скроллбар
+ * лист
+ * кнопка
+ * группа кнопок
+ * галочка
+ * прогрессбар
+ * вывод PICout
+ * текстовый ввод
+* устройства ввода/вывода
+ * базовый класс (\a PIIODevice)
+ * файл (\a PIFile)
+ * последовательный порт (\a PISerial)
+ * ethernet (\a PIEthernet)
+ * USB (\a PIUSB)
+ * packets extractor (\a PIPacketExtractor)
+ * бинарный логфайл (\a PIBinaryLog)
+ * сложное составное устройство (\a PIConnection)
+ * пиринговая сеть (\a PIPeer)
+ * диагностика качества связи (\a PIDiagnostics)
+* поддержка библиотек времени выполнения
+ * базовая функциональность (\a PILibrary)
+ * плагин (\a PIPluginLoader)
+* Математика
+ * комплексные числа
+ * вектора (\a PIMathVector, \a PIMathVectorT)
+ * матрицы (\a PIMathMatrix, \a PIMathMatrixT)
+ * кватернион (\a PIQuaternion)
+ * 2D геометрия (\a PIPoint, \a PILine, \a PIRect)
+ * статистика (\a PIStatistic)
+ * CRC контрольная сумма (\a PICRC)
+ * преобразования Фурье (\a PIFFTW, \a PIFFT)
+ * вычислитель выражений (\a PIEvaluator)
+* парсер аргументов командной строки (\a PICLI)
+* процесс (\a PIProcess)

doc/pages/using_basic.md

@@ -0,0 +1,128 @@
+\~english \page using_basic Getting started
+\~russian \page using_basic Простые начала
+
+\~english
+
+Many novice programmers are solved many common task with system integrity: output to console,
+keyboard buttons press detecting, working with serial ports, ethernet or files, and many other.
+These tasks can solve this library, and code, based only on PIP will be compile and work
+similar on many systems: Windows, any Linux, Red Hat, FreeBSD, MacOS X and QNX.
+Typical application on PIP looks like this: \n
+
+\~russian
+
+Многие начинающие программисты решают общие задачи взаимодействия с операционной системой:
+вывод в консоль, определение нажатия клавиш, работа с последовательными портами, сетью или файлами,
+и многое другое. Эти задачи решены в библиотеке, и код, основанный на PIP будет компилироваться
+и работать одинаково на многих системах: Windows, любой Linux, Red Hat, FreeBSD, MacOS X и QNX.
+Типовое приложение на PIP выглядит примерно так: \n
+
+\code{.cpp}
+#include <pip.h>
+
+
+// declare key press handler
+void key_event(char key, void * );
+
+
+PIConsole console(false, key_event); // don`t start now, key handler is "key_event"
+
+
+// some vars
+int i = 2, j = 3;
+
+
+// implicit key press handler
+void key_event(char key, void * ) {
+	switch (key) {
+	case '-':
+		i--;
+		break;
+	case '+':
+		i++;
+		break;
+	case '(':
+		j--;
+		break;
+	case ')':
+		j++;
+		break;
+	};
+};
+
+
+class MainClass: public PITimer {
+	PIOBJECT(MainClass)
+public:
+	MainClass() {}
+protected:
+	void tick(void * data, int delimiter) {
+		piCout << "timer tick";
+		// timer tick
+	}
+};
+
+
+MainClass main_class;
+
+
+int main(int argc, char * argv[]) {
+	// enabling auto-detection of exit button press, by default 'Q' (shift+q)
+	console.enableExitCapture();
+	
+	// if we want to parse command-line arguments
+	PICLI cli(argc, argv);
+	cli.addArgument("console"); // "-c" or "--console"
+	cli.addArgument("debug"); // "-d" or "--debug"
+	
+	// enabling or disabling global debug flag
+	piDebug = cli.hasArgument("debug");
+	
+	// configure console
+	console.addTab("first tab", '1');
+	console.addString("PIP console", 1, PIConsole::Bold);
+	console.addVariable("int var (i)", &i, 1);
+	console.addVariable("int green var (j)", &j, 1, PIConsole::Green);
+	console.addString("'-' - i--", 2);
+	console.addString("'+' - i++", 2);
+	console.addString("'(' - j--", 2);
+	console.addString("')' - j++", 2);
+	console.addTab("second tab", '2');
+	console.addString("col 1", 1);
+	console.addString("col 2", 2);
+	console.addString("col 3", 3);
+	console.setTab("first tab");
+	
+	// start output to console if "console" argument exists
+	if (cli.hasArgument("console"))
+		console.start();
+	
+	// start main class, e.g. 40 Hz
+	main_class.start(25.);
+	
+	// wait for 'Q' press, independently if console is started or not
+	console.waitForFinish();
+	
+	return 0;
+};
+\endcode
+
+\~english
+
+This code demonstrates simple interactive configurable program, which can be started with console
+display or not, and with debug or not. \b MainClass is central class that also can be inherited from
+\a PIThread and reimplement \a run() function.
+\n Many PIP classes has events and event handlers, which can be connected one to another.
+Details you can see at \a PIObject reference page (\ref PIObject_sec0).
+\n To configure your program from file use \a PIConfig.
+\n If you want more information see \ref using_advanced
+
+\~russian
+
+Этот код демонстрирует простую конфигурируемую программу, которая может быть запущена с
+This code demonstrates simple interactive configurable program, which can be started with console
+display or not, and with debug or not. \b MainClass is central class that also can be inherited from
+\a PIThread and reimplement \a run() function.
+\n Many PIP classes has events and event handlers, which can be connected one to another.
+Details you can see at \a PIObject reference page (\ref PIObject_sec0).
+\n To configure your program from file use \a PIConfig.

esp-pip/main.cpp

@@ -1,2 +1 @@
 #include "pip.h"
-

library.json

@@ -0,0 +1,29 @@
+{
+    "name": "PIP",
+    "keywords": "pip",
+    "description": "Platform-Independent Primitives",
+    "repository":
+    {
+        "type": "git",
+        "url": "https://git.shs.tools/SHS/pip.git"
+    },
+    "frameworks": "*",
+    "platforms": "*",
+    "dependencies": {
+        "mike-matera/ArduinoSTL": "^1.3.2",
+        "linlin-study/FreeRTOS-Kernel": ">=10.0.0"
+    },
+    "build":
+    {
+        "srcFilter": [
+            "+<libs/main/core/*.cpp>",
+            "+<libs/main/containers/*.cpp>",
+            "+<libs/main/math/*.cpp>",
+            "+<libs/main/thread/*.cpp>",
+            "+<libs/main/io_uutils/*.cpp>",
+            "+<libs/main/geo/*.cpp>"
+        ],
+        "extraScript": "platformio_pre.py",
+        "flags": "-DPIP_FREERTOS"
+    }
+}

libs/cloud/picloudbase.cpp

@@ -2,7 +2,7 @@
 
 
 PICloudBase::PICloudBase(): eth(PIEthernet::TCP_Client), streampacker(&eth), tcp(&streampacker) {
-
+	eth.setDebug(false);
 }
 
 

libs/cloud/picloudclient.cpp

@@ -18,36 +18,42 @@
 */
 
 #include "picloudclient.h"
+
 #include "picloudtcp.h"
 
 
 PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode): PIIODevice(path, mode), PICloudBase() {
 	tcp.setRole(PICloud::TCP::Client);
+	setThreadedReadBufferSize(eth.threadedReadBufferSize());
 	setName("cloud_client");
 	is_connected = false;
-	CONNECTL(&eth, connected, [this](){tcp.sendStart();});
-	CONNECTU(&streampacker, packetReceiveEvent, this, _readed);
+	is_deleted   = false;
+	//	setReopenEnabled(false);
+	CONNECTL(&eth, connected, [this]() {
+		opened_ = true;
+		tcp.sendStart();
+	});
+	CONNECT1(void, PIByteArray, &streampacker, packetReceiveEvent, this, _readed);
 	CONNECTL(&eth, disconnected, [this](bool) {
-		piCoutObj << "disconnected";
+		if (is_deleted) return;
+		bool need_disconn = is_connected;
+		// piCoutObj << "eth disconnected";
+		eth.stop();
 		opened_ = false;
-		is_connected = false;
-		cond_connect.notifyOne();
-		cond_buff.notifyOne();
-		piMSleep(100);
+		internalDisconnect();
+		if (need_disconn) disconnected();
+		// piCoutObj << "eth disconnected done";
 	});
 }
 
 
 PICloudClient::~PICloudClient() {
-	eth.close();
-	if (is_connected) {
-		is_connected = false;
-		disconnected();
-		cond_buff.notifyOne();
-		cond_connect.notifyOne();
-	}
+	// piCoutObj << "~PICloudClient() ..." << this;
+	is_deleted = true;
+	stopAndWait();
 	close();
-	stop();
+	internalDisconnect();
+	// piCoutObj << "~PICloudClient() done" << this;
 }
 
 
@@ -62,90 +68,124 @@ void PICloudClient::setKeepConnection(bool on) {
 }
 
 
-bool PICloudClient::openDevice() {
-//	piCout << "PICloudClient open device" << path();
-	bool op = eth.connect(PIEthernet::Address::resolve(path()), false);
-	if (op) {
-		mutex_buff.lock();
-		eth.startThreadedRead();
-		bool conn_ok = cond_connect.waitFor(mutex_buff, (int)eth.readTimeout(), [this](){return isConnected();});
-		piCoutObj << "conn_ok" << conn_ok;
-		mutex_buff.unlock();
-		if (!conn_ok) {
-			eth.stop();
-			eth.close();
-			piMSleep(100);
+void PICloudClient::interrupt() {
+	cond_buff.notifyOne();
+	cond_connect.notifyOne();
+	eth.interrupt();
 }
-		return isConnected();
-	} else {
+
+
+bool PICloudClient::openDevice() {
+	// piCoutObj << "open";// << path();
+	bool op = eth.connect(PINetworkAddress::resolve(path()), false);
+	if (op) {
+		mutex_connect.lock();
+		eth.startThreadedRead();
+		// piCoutObj << "connecting...";
+		bool conn_ok = cond_connect.waitFor(mutex_connect, (int)eth.readTimeout());
+		// piCoutObj << "conn_ok" << conn_ok << is_connected;
+		mutex_connect.unlock();
+		if (!conn_ok) {
+			mutex_connect.lock();
+			eth.stopAndWait();
 			eth.close();
+			mutex_connect.unlock();
+		}
+		return is_connected;
+	} else {
+		// eth.close();
 		return false;
 	}
 }
 
 
 bool PICloudClient::closeDevice() {
+	// PIThread::stop();
 	if (is_connected) {
-		is_connected = false;
-		disconnected();
-		cond_buff.notifyOne();
-		cond_connect.notifyOne();
+		internalDisconnect();
 	}
-	eth.stop();
-	if (eth.isOpened()) eth.close();
+	eth.stopAndWait();
+	eth.close();
 	return true;
 }
 
 
-int PICloudClient::readDevice(void * read_to, int max_size) {
-//	piCoutObj << "readDevice";
-	if (!is_connected) return -1;
+ssize_t PICloudClient::readDevice(void * read_to, ssize_t max_size) {
+	if (is_deleted || max_size <= 0) return -1;
+	// piCoutObj << "readDevice ...";
+	if (!is_connected && eth.isClosed()) openDevice();
+	ssize_t sz = -1;
 	mutex_buff.lock();
-	cond_buff.wait(mutex_buff, [this](){return !buff.isEmpty();});
-	int sz = piMini(max_size, buff.size());
+	if (is_connected) {
+		if (buff.isEmpty()) {
+			sz = 0;
+		} else {
+			sz = piMin<ssize_t>(max_size, buff.size_s());
 			memcpy(read_to, buff.data(), sz);
 			buff.remove(0, sz);
+		}
+		if (sz == 0) cond_buff.wait(mutex_buff);
+	}
 	mutex_buff.unlock();
+	if (!is_connected) opened_ = false;
+	// piCoutObj << "readDevice done" << sz;
 	return sz;
 }
 
 
-int PICloudClient::writeDevice(const void * data, int size) {
-//	piCoutObj << "writeDevice";
+ssize_t PICloudClient::writeDevice(const void * data, ssize_t size) {
+	if (is_deleted || !is_connected) return -1;
+	// piCoutObj << "writeDevice" << size;
 	return tcp.sendData(PIByteArray(data, size));
 }
 
 
+void PICloudClient::internalDisconnect() {
+	// piCoutObj << "internalDisconnect";
+	is_connected = false;
+	cond_buff.notifyOne();
+	cond_connect.notifyOne();
+	streampacker.clear();
+	buff.clear();
+}
+
+
 void PICloudClient::_readed(PIByteArray & ba) {
-	mutex_buff.lock();
+	if (is_deleted) return;
 	PIPair<PICloud::TCP::Type, PICloud::TCP::Role> hdr = tcp.parseHeader(ba);
+	// piCoutObj << "_readed" << ba.size() << hdr.first << hdr.second;
 	if (hdr.second == tcp.role()) {
 		switch (hdr.first) {
 		case PICloud::TCP::Connect:
 			if (tcp.parseConnect(ba) == 1) {
+				mutex_connect.lock();
 				is_connected = true;
-				connected();
+				mutex_connect.unlock();
 				cond_connect.notifyOne();
+				connected();
 			}
 			break;
 		case PICloud::TCP::Disconnect:
-			is_connected = false;
 			eth.stop();
+			opened_ = false;
 			eth.close();
-			disconnected();
 			break;
 		case PICloud::TCP::Data:
 			if (is_connected) {
+				mutex_buff.lock();
+				if (buff.size_s() > threadedReadBufferSize()) {
+					piCoutObj << "Error: buffer overflow, drop" << ba.size() << "bytes";
+					mutex_buff.unlock();
+					return;
+				}
 				buff.append(ba);
+				mutex_buff.unlock();
 				cond_buff.notifyOne();
 			}
 			break;
-		default:
-		break;
+		default: break;
 		}
 		// piCoutObj << "readed" << ba.toHex();
 	}
-	mutex_buff.unlock();
-	while (buff.size_s() > threadedReadBufferSize()) piMSleep(100);
+	// piCoutObj << "_readed done";
 }
-

libs/cloud/picloudserver.cpp

@@ -25,19 +25,54 @@ PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode)
 	tcp.setRole(PICloud::TCP::Server);
 	tcp.setServerName(server_name);
 	setName("cloud_server__" + server_name);
-	CONNECTU(&streampacker, packetReceiveEvent, this, _readed);
-	CONNECTL(&eth, connected, [this](){tcp.sendStart();});
+	is_deleted = false;
+	eth.setReopenEnabled(false);
+	setThreadedReadBufferSize(eth.threadedReadBufferSize());
+	CONNECT1(void, PIByteArray, &streampacker, packetReceiveEvent, this, _readed);
+	CONNECTL(&eth, connected, [this]() {
+		open_mutex.lock();
+		opened_ = true;
+		cvar.notifyOne();
+		open_mutex.unlock();
+		// piCoutObj << "connected";
+		tcp.sendStart();
+	});
 	CONNECTL(&eth, disconnected, [this](bool) {
-		piCoutObj << "disconnected";
+		if (is_deleted) return;
+		// piCoutObj << "disconnected";
+		clients_mutex.lock();
+		for (auto c: clients_) {
+			c->is_connected = false;
+			c->close();
+		}
+		removed_clients_.append(clients_);
+		clients_.clear();
+		index_clients.clear();
+		clients_mutex.unlock();
+		open_mutex.lock();
 		opened_ = false;
-		piMSleep(100);
+		cvar.notifyOne();
+		open_mutex.unlock();
+		ping_timer.stop();
+	});
+	CONNECTL(&ping_timer, tickEvent, [this](void *, int) {
+		if (eth.isConnected()) tcp.sendPing();
 	});
 }
 
 
 PICloudServer::~PICloudServer() {
+	// piCoutObj << "~PICloudServer ..." << this;
+	is_deleted = true;
 	stop();
 	close();
+	waitThreadedReadFinished();
+	// piCout << "wait";
+	while (removed_clients_.isNotEmpty()) {
+		Client * c = removed_clients_.take_back();
+		delete c;
+	}
+	// piCoutObj << "~PICloudServer done" << this;
 }
 
 
@@ -54,51 +89,71 @@ PIVector<PICloudServer::Client *> PICloudServer::clients() const {
 
 
 bool PICloudServer::openDevice() {
-	piCout << "PICloudServer open device" << path();
-	bool op = eth.connect(PIEthernet::Address::resolve(path()), false);
+	// piCout << "PICloudServer open device" << path();
+	if (is_deleted) return false;
+	bool op = eth.connect(PINetworkAddress::resolve(path()), false);
 	if (op) {
 		eth.startThreadedRead();
+		ping_timer.start(5000);
 		return true;
-	}
+	} else {
+		ping_timer.stop();
 		eth.close();
 		return false;
 	}
+}
 
 
 bool PICloudServer::closeDevice() {
-	eth.stop();
+	// piCoutObj << "closeDevice" << this;
+	eth.stopAndWait();
+	ping_timer.stop();
+	eth.close();
+	cvar.notifyOne();
 	clients_mutex.lock();
 	for (auto c: clients_) {
+		c->is_connected = false;
 		c->close();
-		c->stop();
 	}
+	removed_clients_.append(clients_);
+	clients_.clear();
+	index_clients.clear();
 	clients_mutex.unlock();
-	eth.close();
-	for (auto c : clients_)
-		delete c;
 	return true;
 }
 
 
-int PICloudServer::readDevice(void * read_to, int max_size) {
+ssize_t PICloudServer::readDevice(void * read_to, ssize_t max_size) {
+	if (is_deleted) return -1;
 	// piCoutObj << "readDevice";
-	piMSleep(eth.readTimeout());
+	open_mutex.lock();
+	if (isOpened()) cvar.wait(open_mutex);
+	open_mutex.unlock();
+	// piCoutObj << "opened_ = " << opened_;
+	// else piMSleep(eth.readTimeout());
 	return -1;
 }
 
 
-int PICloudServer::writeDevice(const void * data, int max_size) {
+ssize_t PICloudServer::writeDevice(const void * data, ssize_t max_size) {
 	// piCoutObj << "writeDevice";
 	return -1;
 }
 
 
+void PICloudServer::interrupt() {
+	eth.interrupt();
+	cvar.notifyOne();
+}
+
+
 void PICloudServer::clientDisconnect(uint client_id) {
 	tcp.sendDisconnected(client_id);
 }
 
 
 int PICloudServer::sendData(const PIByteArray & data, uint client_id) {
+	if (!opened_) return -1;
 	return tcp.sendData(data, client_id);
 }
 
@@ -106,17 +161,16 @@ int PICloudServer::sendData(const PIByteArray & data, uint client_id) {
 PICloudServer::Client::Client(PICloudServer * srv, uint id): server(srv), client_id(id) {
 	setMode(PIIODevice::ReadWrite);
 	setReopenEnabled(false);
+	setThreadedReadBufferSize(server->threadedReadBufferSize());
 	is_connected = true;
 }
 
 
 PICloudServer::Client::~Client() {
-	if (is_connected) {
-		is_connected = false;
-		cond_buff.notifyOne();
-	}
+	// piCoutObj << "~PICloudServer::Client..." << this;
 	close();
-	stop();
+	stopAndWait();
+	// piCoutObj << "~PICloudServer::Client done" << this;
 }
 
 
@@ -126,43 +180,62 @@ bool PICloudServer::Client::openDevice() {
 
 
 bool PICloudServer::Client::closeDevice() {
+	// piCoutObj << "closeDevice" << this;
 	if (is_connected) {
 		server->clientDisconnect(client_id);
 		is_connected = false;
-		cond_buff.notifyOne();
 	}
+	cond_buff.notifyOne();
 	return true;
 }
 
 
-int PICloudServer::Client::readDevice(void * read_to, int max_size) {
+ssize_t PICloudServer::Client::readDevice(void * read_to, ssize_t max_size) {
 	if (!is_connected) return -1;
+	ssize_t sz = -1;
 	mutex_buff.lock();
-	cond_buff.wait(mutex_buff, [this](){return !buff.isEmpty();});
-	int sz = piMini(max_size, buff.size());
+	if (is_connected) {
+		if (buff.isEmpty()) {
+			sz = 0;
+		} else {
+			sz = piMini(max_size, buff.size());
 			memcpy(read_to, buff.data(), sz);
 			buff.remove(0, sz);
+		}
+		if (sz == 0) cond_buff.wait(mutex_buff);
+	}
 	mutex_buff.unlock();
 	return sz;
 }
 
 
-int PICloudServer::Client::writeDevice(const void * data, int size) {
+ssize_t PICloudServer::Client::writeDevice(const void * data, ssize_t size) {
+	if (!is_connected) return -1;
 	return server->sendData(PIByteArray(data, size), client_id);
 }
 
 
+void PICloudServer::Client::interrupt() {
+	cond_buff.notifyOne();
+}
+
+
 void PICloudServer::Client::pushBuffer(const PIByteArray & ba) {
 	if (!is_connected) return;
 	mutex_buff.lock();
+	if (buff.size_s() > threadedReadBufferSize()) {
+		piCoutObj << "Error: buffer overflow, drop" << ba.size() << "bytes";
+		mutex_buff.unlock();
+		return;
+	}
 	buff.append(ba);
 	cond_buff.notifyOne();
 	mutex_buff.unlock();
-	while (buff.size_s() > threadedReadBufferSize()) piMSleep(100);
 }
 
 
 void PICloudServer::_readed(PIByteArray & ba) {
+	if (is_deleted) return;
 	PIPair<PICloud::TCP::Type, PICloud::TCP::Role> hdr = tcp.parseHeader(ba);
 	if (hdr.second == tcp.role()) {
 		switch (hdr.first) {
@@ -172,11 +245,12 @@ void PICloudServer::_readed(PIByteArray & ba) {
 			Client * oc = index_clients.value(id, nullptr);
 			clients_mutex.unlock();
 			if (oc) {
+				piCoutObj << "Warning: reject client with duplicated ID";
 				tcp.sendDisconnected(id);
 			} else {
-				piCoutObj << "new Client" << id;
 				Client * c = new Client(this, id);
-				CONNECTU(c, deleted, this, clientDeleted);
+				// piCoutObj << "new Client" << id << c;
+				CONNECT1(void, PIObject *, c, deleted, this, clientDeleted);
 				clients_mutex.lock();
 				clients_ << c;
 				index_clients.insert(id, c);
@@ -186,13 +260,17 @@ void PICloudServer::_readed(PIByteArray & ba) {
 		} break;
 		case PICloud::TCP::Disconnect: {
 			uint id = tcp.parseDisconnect(ba);
-			piCoutObj << "remove Client" << id;
+			// piCoutObj << "Close on logic";
 			clients_mutex.lock();
-			Client * oc = index_clients.value(id, nullptr);
+			Client * oc = index_clients.take(id, nullptr);
+			clients_.removeOne(oc);
 			clients_mutex.unlock();
 			if (oc) {
+				oc->stopAndWait();
 				oc->is_connected = false;
 				oc->close();
+				removed_clients_ << oc;
+				// delete oc;
 			}
 		} break;
 		case PICloud::TCP::Data: {
@@ -200,7 +278,7 @@ void PICloudServer::_readed(PIByteArray & ba) {
 			clients_mutex.lock();
 			Client * oc = index_clients.value(d.first, nullptr);
 			clients_mutex.unlock();
-			//piCoutObj << "data for" << d.first << d.second.toHex();
+			// piCoutObj << "data for" << d.first << d.second.size();
 			if (oc && !d.second.isEmpty()) oc->pushBuffer(d.second);
 		} break;
 		default: break;
@@ -211,11 +289,12 @@ void PICloudServer::_readed(PIByteArray & ba) {
 
 void PICloudServer::clientDeleted(PIObject * o) {
 	PICloudServer::Client * c = (PICloudServer::Client *)o;
+	// piCoutObj << "clientDeleted" << c;
 	clients_mutex.lock();
 	clients_.removeOne(c);
+	removed_clients_.removeAll(c);
 	auto it = index_clients.makeIterator();
-	while (it.hasNext()) {
-		it.next();
+	while (it.next()) {
 		if (it.value() == c) {
 			index_clients.remove(it.key());
 			break;

libs/cloud/picloudtcp.cpp

@@ -18,13 +18,14 @@
 */
 
 #include "picloudtcp.h"
-#include "picrypt.h"
+
 #include "pichunkstream.h"
+#include "picrypt.h"
 #include "piethernet.h"
 #include "pistreampacker.h"
 
 
-const char hash_def_key[] = "_picrypt_";
+const char hash_cloud_key[] = "_picloud_";
 
 
 PICloud::TCP::Header::Header() {
@@ -33,7 +34,7 @@ PICloud::TCP::Header::Header() {
 
 
 PICloud::TCP::TCP(PIStreamPacker * s): streampacker(s) {
-
+	streampacker->setMaxPacketSize(63 * 1024);
 }
 
 void PICloud::TCP::setRole(PICloud::TCP::Role r) {
@@ -43,7 +44,8 @@ void PICloud::TCP::setRole(PICloud::TCP::Role r) {
 
 void PICloud::TCP::setServerName(const PIString & server_name_) {
 	server_name = server_name_;
-	suuid = PICrypt::hash(server_name_);
+	suuid =
+		PICrypt::hash(PIByteArray(server_name_.data(), server_name_.size()), (const unsigned char *)hash_cloud_key, sizeof(hash_cloud_key));
 }
 
 
@@ -62,7 +64,9 @@ void PICloud::TCP::sendStart() {
 	PIByteArray ba;
 	ba << header;
 	ba.append(suuid);
+	// mutex_send.lock();
 	streampacker->send(ba);
+	// mutex_send.unlock();
 }
 
 
@@ -70,7 +74,9 @@ void PICloud::TCP::sendConnected(uint client_id) {
 	header.type = PICloud::TCP::Connect;
 	PIByteArray ba;
 	ba << header << client_id;
+	//	mutex_send.lock();
 	streampacker->send(ba);
+	//	mutex_send.unlock();
 }
 
 
@@ -78,7 +84,9 @@ void PICloud::TCP::sendDisconnected(uint client_id) {
 	header.type = PICloud::TCP::Disconnect;
 	PIByteArray ba;
 	ba << header << client_id;
+	//	mutex_send.lock();
 	streampacker->send(ba);
+	//	mutex_send.unlock();
 }
 
 
@@ -87,8 +95,10 @@ int PICloud::TCP::sendData(const PIByteArray & data) {
 	PIByteArray ba;
 	ba << header;
 	ba.append(data);
-//	piCout << "sendData" << ba.toHex();
+	//	piCout << "[PICloud::TCP] sendData" << ba.toHex();
+	mutex_send.lock();
 	streampacker->send(ba);
+	mutex_send.unlock();
 	return data.size_s();
 }
 
@@ -98,11 +108,24 @@ int PICloud::TCP::sendData(const PIByteArray & data, uint client_id) {
 	PIByteArray ba;
 	ba << header << client_id;
 	ba.append(data);
+	mutex_send.lock();
 	streampacker->send(ba);
+	mutex_send.unlock();
 	return data.size_s();
 }
 
 
+void PICloud::TCP::sendPing() {
+	header.type = PICloud::TCP::Ping;
+	PIByteArray ba;
+	ba << header;
+	ba.append(suuid);
+	mutex_send.lock();
+	streampacker->send(ba);
+	mutex_send.unlock();
+}
+
+
 PIPair<PICloud::TCP::Type, PICloud::TCP::Role> PICloud::TCP::parseHeader(PIByteArray & ba) {
 	PIPair<PICloud::TCP::Type, PICloud::TCP::Role> ret;
 	ret.first  = InvalidType;
@@ -111,7 +134,8 @@ PIPair<PICloud::TCP::Type, PICloud::TCP::Role> PICloud::TCP::parseHeader(PIByteA
 	PICloud::TCP::Header hdr;
 	ba >> hdr;
 	if (hdr.version != header.version) {
-		piCout << "[PICloud]" << "invalid PICloud::TCP version!";
+		piCout << "[PICloud]"
+			   << "invalid PICloud::TCP version!";
 		return ret;
 	}
 	ret.first  = (Type)hdr.type;
@@ -120,11 +144,8 @@ PIPair<PICloud::TCP::Type, PICloud::TCP::Role> PICloud::TCP::parseHeader(PIByteA
 }
 
 
-PIByteArray PICloud::TCP::parseData(PIByteArray & ba) {
-	if (header.role == Client) {
-		return ba;
-	}
-	return PIByteArray();
+bool PICloud::TCP::canParseData(PIByteArray & ba) {
+	return header.role == Client;
 }
 
 
@@ -133,7 +154,7 @@ PIPair<uint, PIByteArray> PICloud::TCP::parseDataServer(PIByteArray & ba) {
 	ret.first = 0;
 	if (header.role == Server) {
 		ba >> ret.first;
-		ret.second = ba;
+		ret.second.swap(ba);
 	}
 	return ret;
 }
@@ -150,14 +171,14 @@ PIByteArray PICloud::TCP::parseConnect_d(PIByteArray & ba) {
 
 
 uint PICloud::TCP::parseConnect(PIByteArray & ba) {
-	uint ret;
+	uint ret = 0;
 	ba >> ret;
 	return ret;
 }
 
 
 uint PICloud::TCP::parseDisconnect(PIByteArray & ba) {
-	uint ret;
+	uint ret = 0;
 	ba >> ret;
 	return ret;
 }

libs/compress/picompress.cpp

@@ -19,7 +19,7 @@
 
 #include "picompress.h"
 #ifdef PIP_COMPRESS
-#  ifdef FREERTOS
+#  ifdef ESP_PLATFORM
 #	include "esp32/rom/miniz.h"
 #	define compress2  mz_compress2
 #	define Z_OK       MZ_OK
@@ -38,14 +38,16 @@ PIByteArray piCompress(const PIByteArray & ba, int level) {
 	ulong sz = zba.size();
 	ret      = compress2(zba.data(), &sz, ba.data(), ba.size(), level);
 	if (ret != Z_OK) {
-		piCout << "[PICompress]" << "Error: invalid input or not enought memory";
+		piCout << "[PICompress]"
+			   << "Error: invalid input or not enought memory";
 		return ba;
 	}
 	zba.resize(sz);
 	zba << ullong(ba.size());
 	return zba;
 #else
-	piCout << "[PICompress]" << "Warning: PICompress is disabled, to enable install zlib library and build pip_compress library";
+	piCout << "[PICompress]"
+		   << "Warning: PICompress is disabled, to enable install zlib library and build pip_compress library";
 #endif
 	return ba;
 }
@@ -53,9 +55,10 @@ PIByteArray piCompress(const PIByteArray & ba, int level) {
 
 PIByteArray piDecompress(const PIByteArray & zba) {
 #ifdef PIP_COMPRESS
-	ullong sz;
+	ullong sz = 0;
 	if (zba.size() < sizeof(ullong)) {
-		piCout << "[PICompress]" << "Error: invalid input";
+		piCout << "[PICompress]"
+			   << "Error: invalid input";
 		return zba;
 	}
 	PIByteArray ba(zba.data(zba.size() - sizeof(ullong)), sizeof(ullong));
@@ -65,12 +68,14 @@ PIByteArray piDecompress(const PIByteArray & zba) {
 	ulong s = sz;
 	ret     = uncompress(ba.data(), &s, zba.data(), zba.size());
 	if (ret != Z_OK) {
-		piCout << "[PICompress]" << "Error: invalid input or not enought memory";
+		piCout << "[PICompress]"
+			   << "Error: invalid input or not enought memory";
 		return zba;
 	}
 	return ba;
 #else
-	piCout << "[PICompress]" << "Warning: PICompress is disabled, to enable install zlib library and build pip_compress library";
+	piCout << "[PICompress]"
+		   << "Warning: PICompress is disabled, to enable install zlib library and build pip_compress library";
 #endif
 	return zba;
 }

libs/console/piscreen.cpp

@@ -17,13 +17,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "piscreen.h"
+
 #include "piincludes_p.h"
 #ifndef WINDOWS
-#  include <sys/ioctl.h>
 #  include <fcntl.h>
+#  include <sys/ioctl.h>
 #  include <termios.h>
 #else
 #  include <wincon.h>
+#  include <wingdi.h>
 #  ifndef COMMON_LVB_UNDERSCORE
 #	define COMMON_LVB_UNDERSCORE 0x8000
 #  endif
@@ -50,29 +52,6 @@ PRIVATE_DEFINITION_END(PIScreen::SystemConsole)
 PIScreen::SystemConsole::SystemConsole() {
 	width = height = pwidth = pheight = 0;
 	mouse_x = mouse_y = -1;
-	int w, h;
-#ifdef WINDOWS
-	PRIVATE->ulcoord.X = 0;
-	PRIVATE->hOut = GetStdHandle(STD_OUTPUT_HANDLE);
-	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
-	PRIVATE->dattr = PRIVATE->sbi.wAttributes;
-	w = PRIVATE->sbi.srWindow.Right - PRIVATE->sbi.srWindow.Left;
-	h = PRIVATE->sbi.srWindow.Bottom - PRIVATE->sbi.srWindow.Top;
-	PRIVATE->ulcoord.Y = PRIVATE->sbi.srWindow.Top;
-	GetConsoleMode(PRIVATE->hOut, &PRIVATE->smode);
-	GetConsoleCursorInfo(PRIVATE->hOut, &PRIVATE->curinfo);
-#else
-#  ifdef FREERTOS
-	w = 80;
-	h = 24;
-#  else
-	winsize ws;
-	ioctl(0, TIOCGWINSZ, &ws);
-	w = ws.ws_col;
-	h = ws.ws_row;
-#  endif
-#endif
-	resize(w, h);
 }
 
 
@@ -85,6 +64,29 @@ PIScreen::SystemConsole::~SystemConsole() {
 
 
 void PIScreen::SystemConsole::begin() {
+	int w, h;
+#ifdef WINDOWS
+	PRIVATE->ulcoord.X = 0;
+	PRIVATE->hOut      = GetStdHandle(STD_OUTPUT_HANDLE);
+	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
+	PRIVATE->dattr     = PRIVATE->sbi.wAttributes;
+	w                  = PRIVATE->sbi.srWindow.Right - PRIVATE->sbi.srWindow.Left;
+	h                  = PRIVATE->sbi.srWindow.Bottom - PRIVATE->sbi.srWindow.Top;
+	PRIVATE->ulcoord.Y = PRIVATE->sbi.srWindow.Top;
+	GetConsoleMode(PRIVATE->hOut, &PRIVATE->smode);
+	GetConsoleCursorInfo(PRIVATE->hOut, &PRIVATE->curinfo);
+#else
+#  ifdef MICRO_PIP
+	w = 80;
+	h = 24;
+#  else
+	winsize ws;
+	ioctl(0, TIOCGWINSZ, &ws);
+	w = ws.ws_col;
+	h = ws.ws_row;
+#  endif
+#endif
+	resize(w, h);
 #ifdef WINDOWS
 	SetConsoleMode(PRIVATE->hOut, ENABLE_WRAP_AT_EOL_OUTPUT);
 	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
@@ -92,6 +94,7 @@ void PIScreen::SystemConsole::begin() {
 	PRIVATE->bc.Y = 0;
 #endif
 	clear();
+	clearScreen();
 	hideCursor();
 }
 
@@ -108,16 +111,13 @@ void PIScreen::SystemConsole::end() {
 
 
 void PIScreen::SystemConsole::prepare() {
-	int w, h;
+	int w = 80, h = 24;
 #ifdef WINDOWS
 	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->csbi);
 	w = PRIVATE->csbi.srWindow.Right - PRIVATE->csbi.srWindow.Left + 1;
 	h = PRIVATE->csbi.srWindow.Bottom - PRIVATE->csbi.srWindow.Top + 1;
 #else
-#  ifdef FREERTOS
-	w = 80;
-	h = 24;
-#  else
+#  ifndef MICRO_PIP
 	winsize ws;
 	ioctl(0, TIOCGWINSZ, &ws);
 	w = ws.ws_col;
@@ -144,7 +144,7 @@ void PIScreen::SystemConsole::resize(int w, int h) {
 	pcells.resize(height);
 	for (int i = 0; i < height; ++i) {
 		cells[i].resize(width);
-		pcells[i].resize(width, Cell(0));
+		pcells[i].resize(width, Cell(PIChar()));
 	}
 #ifdef WINDOWS
 	PRIVATE->sbi.srWindow = PRIVATE->csbi.srWindow;
@@ -221,14 +221,15 @@ void PIScreen::SystemConsole::print() {
 			} else {
 				if (!s.isEmpty()) {
 					moveTo(si, sj);
-					printf("%s", s.data());
+					PICout::stdoutPIString(s);
 					s.clear();
 				}
 			}
 		}
 		if (!s.isEmpty()) {
 			moveTo(si, sj);
-			printf("%s", s.data());
+			PICout::stdoutPIString(s);
+			// printf("%s", s.data());
 			s.clear();
 		}
 	}
@@ -244,10 +245,14 @@ void PIScreen::SystemConsole::print() {
 #  define BACKGROUND_MASK (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE)
 ushort PIScreen::SystemConsole::attributes(const PIScreenTypes::Cell & c) {
 	WORD attr = PRIVATE->dattr;
-	if (c.format.flags & Bold) attr |= FOREGROUND_INTENSITY;
-	else attr &= ~FOREGROUND_INTENSITY;
-	if (c.format.flags & Underline) attr |= COMMON_LVB_UNDERSCORE;
-	else attr &= ~COMMON_LVB_UNDERSCORE;
+	if (c.format.flags & Bold)
+		attr |= FOREGROUND_INTENSITY;
+	else
+		attr &= ~FOREGROUND_INTENSITY;
+	if (c.format.flags & Underline)
+		attr |= COMMON_LVB_UNDERSCORE;
+	else
+		attr &= ~COMMON_LVB_UNDERSCORE;
 	switch (c.format.color_char) {
 	case Black: attr = (attr & ~FOREGROUND_MASK); break;
 	case Red: attr = (attr & ~FOREGROUND_MASK) | FOREGROUND_RED; break;
@@ -292,37 +297,38 @@ void PIScreen::SystemConsole::clearLine() {
 
 void PIScreen::SystemConsole::newLine() {
 	getWinCurCoord();
-	PRIVATE->ccoord.X = 0; PRIVATE->ccoord.Y++;
+	PRIVATE->ccoord.X = 0;
+	PRIVATE->ccoord.Y++;
 	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->ccoord);
 }
 #else  // WINDOWS
 PIString PIScreen::SystemConsole::formatString(const PIScreenTypes::Cell & c) {
-	PIString ts("\e[0");
+	PIString ts = PIStringAscii("\e[0");
 	switch (c.format.color_char) {
-	case Black:   ts += ";30"; break;
-	case Red:     ts += ";31"; break;
-	case Green:   ts += ";32"; break;
-	case Blue:    ts += ";34"; break;
-	case Cyan:    ts += ";36"; break;
-	case Magenta: ts += ";35"; break;
-	case Yellow:  ts += ";33"; break;
-	case White:   ts += ";37"; break;
+	case Black: ts += PIStringAscii(";30"); break;
+	case Red: ts += PIStringAscii(";31"); break;
+	case Green: ts += PIStringAscii(";32"); break;
+	case Blue: ts += PIStringAscii(";34"); break;
+	case Cyan: ts += PIStringAscii(";36"); break;
+	case Magenta: ts += PIStringAscii(";35"); break;
+	case Yellow: ts += PIStringAscii(";33"); break;
+	case White: ts += PIStringAscii(";37"); break;
 	}
 	switch (c.format.color_back) {
-	case Black:   ts += ";40"; break;
-	case Red:     ts += ";41"; break;
-	case Green:   ts += ";42"; break;
-	case Blue:    ts += ";44"; break;
-	case Cyan:    ts += ";46"; break;
-	case Magenta: ts += ";45"; break;
-	case Yellow:  ts += ";43"; break;
-	case White:   ts += ";47"; break;
+	case Black: ts += PIStringAscii(";40"); break;
+	case Red: ts += PIStringAscii(";41"); break;
+	case Green: ts += PIStringAscii(";42"); break;
+	case Blue: ts += PIStringAscii(";44"); break;
+	case Cyan: ts += PIStringAscii(";46"); break;
+	case Magenta: ts += PIStringAscii(";45"); break;
+	case Yellow: ts += PIStringAscii(";43"); break;
+	case White: ts += PIStringAscii(";47"); break;
 	}
-	if ((c.format.flags & Bold) == Bold) ts += ";1";
-	if ((c.format.flags & Underline) == Underline) ts += ";4";
-	if ((c.format.flags & Blink) == Blink) ts += ";5";
-	if ((c.format.flags & Inverse) == Inverse) ts += ";7";
-	return ts + "m";
+	if ((c.format.flags & Bold) == Bold) ts += PIStringAscii(";1");
+	if ((c.format.flags & Underline) == Underline) ts += PIStringAscii(";4");
+	if ((c.format.flags & Blink) == Blink) ts += PIStringAscii(";5");
+	if ((c.format.flags & Inverse) == Inverse) ts += PIStringAscii(";7");
+	return ts + 'm';
 }
 #endif // WINDOWS
 
@@ -358,8 +364,16 @@ void PIScreen::SystemConsole::clearScreen() {
 void PIScreen::SystemConsole::clearScreenLower() {
 #ifdef WINDOWS
 	getWinCurCoord();
-	FillConsoleOutputAttribute(PRIVATE->hOut, PRIVATE->dattr, width * height - width * PRIVATE->ccoord.Y + PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
-	FillConsoleOutputCharacter(PRIVATE->hOut, ' ', width * height - width * PRIVATE->ccoord.Y + PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
+	FillConsoleOutputAttribute(PRIVATE->hOut,
+	                           PRIVATE->dattr,
+	                           width * height - width * PRIVATE->ccoord.Y + PRIVATE->ccoord.X,
+	                           PRIVATE->ccoord,
+	                           &PRIVATE->written);
+	FillConsoleOutputCharacter(PRIVATE->hOut,
+	                           ' ',
+	                           width * height - width * PRIVATE->ccoord.Y + PRIVATE->ccoord.X,
+	                           PRIVATE->ccoord,
+	                           &PRIVATE->written);
 #else
 	printf("\e[0m\e[J");
 #endif
@@ -384,7 +398,7 @@ void PIScreen::SystemConsole::showCursor() {
 }
 
 
-
+// PIScreen
 
 PIScreen::PIScreen(bool startNow, PIKbdListener::KBFunc slot): PIThread(), drawer_(console.cells), root("rootTile") {
 	setName("screen");
@@ -392,18 +406,17 @@ PIScreen::PIScreen(bool startNow, PIKbdListener::KBFunc slot): PIThread(), drawe
 	needLockRun(true);
 	mouse_     = false;
 	ret_func   = slot;
-	tile_focus = tile_dialog = 0;
+	tile_focus = tile_dialog = nullptr;
 	root.screen              = this;
 	listener                 = new PIKbdListener(key_eventS, this, startNow);
-	CONNECTU(listener, mouseEvent, this, mouse_event);
-	CONNECTU(listener, wheelEvent, this, wheel_event);
+	CONNECT1(void, PIKbdListener::MouseEvent, listener, mouseEvent, this, mouse_event);
+	CONNECT1(void, PIKbdListener::WheelEvent, listener, wheelEvent, this, wheel_event);
 	if (startNow) start();
 }
 
 
 PIScreen::~PIScreen() {
-	if (isRunning())
-		stop();
+	if (isRunning()) stop();
 	PIThread::waitForFinish(10);
 	listener->waitForFinish(10);
 	delete listener;
@@ -423,14 +436,12 @@ void PIScreen::key_event(PIKbdListener::KeyEvent key) {
 	return;
 	*/
 	PIScreenTile * rtile = rootTile();
-	if (tile_dialog)
-		rtile = tile_dialog;
+	if (tile_dialog) rtile = tile_dialog;
 	bool used = nextFocus(rtile, key);
 	if (used) return;
 	if (!used && tile_focus) {
 		if (tile_focus->visible) {
-			if (tile_focus->keyEvent(key))
-				return;
+			if (tile_focus->keyEvent(key)) return;
 		}
 	}
 	if (ret_func != 0) ret_func(key, data_);
@@ -456,7 +467,6 @@ PIVector<PIScreenTile * > PIScreen::prepareMouse(PIKbdListener::MouseEvent * e)
 				ff = true;
 			}
 		}
-
 	}
 	return tl;
 }
@@ -489,15 +499,13 @@ void PIScreen::wheel_event(PIKbdListener::WheelEvent we) {
 	if (tl.isEmpty()) return;
 	piForeachR(PIScreenTile * t, tl)
 		if (t->wheelEvent(we)) break;
-
 }
 
 
 bool PIScreen::nextFocus(PIScreenTile * rt, PIKbdListener::KeyEvent key) {
 	PIVector<PIScreenTile *> vtl = rt->children(true), ftl;
 	piForeach(PIScreenTile * t, vtl) {
-		if (t->focus_flags[CanHasFocus])
-			ftl << t;
+		if (t->focus_flags[CanHasFocus]) ftl << t;
 	}
 	int ind = -1;
 	for (int i = 0; i < ftl.size_s(); ++i)
@@ -505,18 +513,15 @@ bool PIScreen::nextFocus(PIScreenTile * rt, PIKbdListener::KeyEvent key) {
 			ind = i;
 			break;
 		}
-	if (ind < 0)
-		tile_focus = 0;
+	if (ind < 0) tile_focus = 0;
 	if (ftl.isEmpty())
 		tile_focus = 0;
 	else {
 		if (tile_focus)
-			if (!tile_focus->visible)
-				tile_focus = 0;
+			if (!tile_focus->visible) tile_focus = 0;
 		int next = tile_focus ? 0 : 1;
 		if (tile_focus) {
-			if (tile_focus->focus_flags[NextByTab] && key.key == PIKbdListener::Tab)
-				next = 1;
+			if (tile_focus->focus_flags[NextByTab] && key.key == PIKbdListener::Tab) next = 1;
 			if (tile_focus->focus_flags[NextByArrowsHorizontal]) {
 				if (key.key == PIKbdListener::LeftArrow) next = -1;
 				if (key.key == PIKbdListener::RightArrow) next = 1;
@@ -551,22 +556,19 @@ void PIScreen::tileEventInternal(PIScreenTile * t, TileEvent e) {
 
 
 void PIScreen::tileRemovedInternal(PIScreenTile * t) {
-	if (tile_dialog == t)
-		tile_dialog = 0;
+	if (tile_dialog == t) tile_dialog = 0;
 }
 
 
 void PIScreen::tileSetFocusInternal(PIScreenTile * t) {
 	PIScreenTile * rt = rootTile();
-	if (tile_dialog)
-		rt = tile_dialog;
+	if (tile_dialog) rt = tile_dialog;
 	PIVector<PIScreenTile *> tl = rt->children(), ftl;
 	piForeach(PIScreenTile * i, tl)
 		i->has_focus = false;
 	tile_focus = t;
 	if (!tile_focus) return;
-	if (tile_focus->focus_flags[CanHasFocus])
-		tile_focus->has_focus = true;
+	if (tile_focus->focus_flags[CanHasFocus]) tile_focus->has_focus = true;
 }
 
 
@@ -589,7 +591,7 @@ void PIScreen::waitForFinish() {
 
 
 void PIScreen::stop(bool clear) {
-	PIThread::stop(true);
+	PIThread::stopAndWait();
 	if (clear) console.clearScreen();
 #ifndef WINDOWS
 	fflush(0);
@@ -621,8 +623,13 @@ void PIScreen::run() {
 		tile_dialog->height_ = sh;
 		tile_dialog->layout();
 		int dx = tile_dialog->x_ - 1, dy = tile_dialog->y_ - 1, dw = tile_dialog->width_, dh = tile_dialog->height_;
-		drawer_.drawFrame(dx, dy, dx + dw + 1, dy + dh + 1, (Color)tile_dialog->back_format.color_char,
-						  (Color)tile_dialog->back_format.color_back, (CharFlags)tile_dialog->back_format.flags);
+		drawer_.drawFrame(dx,
+		                  dy,
+		                  dx + dw + 1,
+		                  dy + dh + 1,
+		                  (Color)tile_dialog->back_format.color_char,
+		                  (Color)tile_dialog->back_format.color_back,
+		                  (CharFlags)tile_dialog->back_format.flags);
 		tile_dialog->drawEventInternal(&drawer_);
 	}
 	console.print();
@@ -638,8 +645,6 @@ void PIScreen::end() {
 PIScreenTile * PIScreen::tileByName(const PIString & name) {
 	PIVector<PIScreenTile *> tl(tiles());
 	piForeach(PIScreenTile * t, tl)
-		if (t->name() == name)
-			return t;
+		if (t->name() == name) return t;
 	return 0;
 }
-

libs/console/piscreenconsole.cpp

@@ -27,16 +27,9 @@ TileVars::TileVars(const PIString &n) : PIScreenTile(n) {
 }
 
 
-void TileVars::sizeHint(int &w, int &h) const {
+void TileVars::sizeHint(int & w, int & h) const {}
 
-}
-
-void TileVars::drawEvent(PIScreenDrawer *d) {
-
-}
+void TileVars::drawEvent(PIScreenDrawer * d) {}
 
 
-PIScreenConsoleTile::PIScreenConsoleTile() {
-
-}
-
+PIScreenConsoleTile::PIScreenConsoleTile() {}

libs/console/piscreendrawer.cpp

@@ -117,26 +117,24 @@ void PIScreenDrawer::drawLine(int x0, int y0, int x1, int y1, const PIChar & c,
 		float dy = (y1 - y0) / float(piAbsi(x1 - x0)), cy = y0;
 		int dx = x0 < x1 ? 1 : -1;
 		for (int i = x0; i != x1; i += dx) {
-			x = i; y = piRound(cy);
-			if (x >= 0 && x < width && y >= 0 && y < height)
-				cells[y][x] = cc;
+			x = i;
+			y = piRound(cy);
+			if (x >= 0 && x < width && y >= 0 && y < height) cells[y][x] = cc;
 			cy += dy;
 		}
 		y = piRound(cy);
-		if (x1 >= 0 && x1 < width && y >= 0 && y < height)
-			cells[y][x1] = cc;
+		if (x1 >= 0 && x1 < width && y >= 0 && y < height) cells[y][x1] = cc;
 	} else {
 		float dx = (x1 - x0) / float(piAbsi(y1 - y0)), cx = x0;
 		int dy = y0 < y1 ? 1 : -1;
 		for (int i = y0; i != y1; i += dy) {
-			x = piRound(cx); y = i;
-			if (x >= 0 && x < width && y >= 0 && y < height)
-				cells[y][x] = cc;
+			x = piRound(cx);
+			y = i;
+			if (x >= 0 && x < width && y >= 0 && y < height) cells[y][x] = cc;
 			cx += dx;
 		}
 		x = piRound(cx);
-		if (x >= 0 && x < width && y1 >= 0 && y1 < height)
-			cells[y1][x] = cc;
+		if (x >= 0 && x < width && y1 >= 0 && y1 < height) cells[y1][x] = cc;
 	}
 }
 
@@ -157,19 +155,16 @@ void PIScreenDrawer::drawRect(int x0, int y0, int x1, int y1, const PIChar & c,
 		if (j >= 0 && j < height) {
 			PIVector<Cell> & cv(cells[j]);
 			for (int i = x0; i != x1; i += dx)
-				if (i >= 0 && i < width)
-					cv[i] = cc;
+				if (i >= 0 && i < width) cv[i] = cc;
 		}
 		j = xs[k];
 		if (j >= 0 && j < width) {
 			for (int i = y0; i != y1; i += dy)
-				if (i >= 0 && i < height)
-					cells[i][j] = cc;
+				if (i >= 0 && i < height) cells[i][j] = cc;
 		}
 	}
 	int i = x1, j = y1;
-	if (i >= 0 && i < width && j >= 0 && j < height)
-		cells[j][i] = cc;
+	if (i >= 0 && i < width && j >= 0 && j < height) cells[j][i] = cc;
 }
 
 
@@ -189,24 +184,26 @@ void PIScreenDrawer::drawFrame(int x0, int y0, int x1, int y1, Color col_char, C
 			PIVector<Cell> & cv(cells[j]);
 			cc.symbol = artChar(LineHorizontal);
 			for (int i = x0 + 1; i != x1; i += dx)
-				if (i >= 0 && i < width)
-					cv[i] = cc;
+				if (i >= 0 && i < width) cv[i] = cc;
 		}
 		j = xs[k];
 		if (j >= 0 && j < width) {
 			cc.symbol = artChar(LineVertical);
 			for (int i = y0 + 1; i != y1; i += dy)
-				if (i >= 0 && i < height)
-					cells[i][j] = cc;
+				if (i >= 0 && i < height) cells[i][j] = cc;
 		}
 	}
-	int i = x0, j = y0; cc.symbol = artChar(CornerTopLeft);
+	int i = x0, j = y0;
+	cc.symbol = artChar(CornerTopLeft);
 	if (i >= 0 && i < width && j >= 0 && j < height) cells[j][i] = cc;
-	i = x1, j = y0; cc.symbol = artChar(CornerTopRight);
+	i = x1, j = y0;
+	cc.symbol = artChar(CornerTopRight);
 	if (i >= 0 && i < width && j >= 0 && j < height) cells[j][i] = cc;
-	i = x0, j = y1; cc.symbol = artChar(CornerBottomLeft);
+	i = x0, j = y1;
+	cc.symbol = artChar(CornerBottomLeft);
 	if (i >= 0 && i < width && j >= 0 && j < height) cells[j][i] = cc;
-	i = x1, j = y1; cc.symbol = artChar(CornerBottomRight);
+	i = x1, j = y1;
+	cc.symbol = artChar(CornerBottomRight);
 	if (i >= 0 && i < width && j >= 0 && j < height) cells[j][i] = cc;
 }
 
@@ -224,8 +221,7 @@ void PIScreenDrawer::fillRect(int x0, int y0, int x1, int y1, const PIChar & c,
 		if (j >= 0 && j < height) {
 			PIVector<Cell> & cv(cells[j]);
 			for (int i = x0; i != x1; i += dx)
-				if (i >= 0 && i < width)
-					cv[i] = cc;
+				if (i >= 0 && i < width) cv[i] = cc;
 		}
 }
 
@@ -241,8 +237,7 @@ void PIScreenDrawer::fillRect(int x0, int y0, int x1, int y1, PIVector<PIVector<
 				PIVector<Cell> & cv(cells[y0 + j]);
 				PIVector<Cell> & contv(content[j]);
 				for (int i = 0; i < piMini(w, contv.size_s()); ++i)
-					if ((i + x0) >= 0 && (i + x0) < width)
-						cv[x0 + i] = contv[i];
+					if ((i + x0) >= 0 && (i + x0) < width) cv[x0 + i] = contv[i];
 			}
 		}
 }

libs/console/piscreentile.cpp

@@ -18,6 +18,7 @@
 */
 
 #include "piscreentile.h"
+
 #include "piscreendrawer.h"
 
 
@@ -41,8 +42,7 @@ PIScreenTile::PIScreenTile(const PIString & n, Direction d, SizePolicy p): PIObj
 
 PIScreenTile::~PIScreenTile() {
 	// piCout << this << "~";
-	if (screen)
-		screen->tileRemovedInternal(this);
+	if (screen) screen->tileRemovedInternal(this);
 	setScreen(0);
 	deleteChildren();
 	if (!parent) return;
@@ -79,8 +79,7 @@ void PIScreenTile::removeTile(PIScreenTile * t) {
 PIVector<PIScreenTile *> PIScreenTile::children(bool only_visible) {
 	PIVector<PIScreenTile *> ret;
 	piForeach(PIScreenTile * t, tiles)
-		if (t->visible || !only_visible)
-			ret << t << t->children(only_visible);
+		if (t->visible || !only_visible) ret << t << t->children(only_visible);
 	return ret;
 }
 
@@ -88,8 +87,7 @@ PIVector<PIScreenTile * > PIScreenTile::children(bool only_visible) {
 PIScreenTile * PIScreenTile::childUnderMouse(int x, int y) {
 	piForeach(PIScreenTile * t, tiles) {
 		if (!t->visible) continue;
-		if (x >= t->x_ && (x - t->x_) < t->width_ &&
-			y >= t->y_ && (y - t->y_) < t->height_) {
+		if (x >= t->x_ && (x - t->x_) < t->width_ && y >= t->y_ && (y - t->y_) < t->height_) {
 			return t;
 		}
 	}
@@ -129,7 +127,14 @@ void PIScreenTile::drawEventInternal(PIScreenDrawer * d) {
 	if (!visible) {
 		return;
 	}
-	d->fillRect(x_, y_, x_ + width_, y_ + height_, back_symbol, (Color)back_format.color_char, (Color)back_format.color_back, back_format.flags);
+	d->fillRect(x_,
+	            y_,
+	            x_ + width_,
+	            y_ + height_,
+	            back_symbol,
+	            (Color)back_format.color_char,
+	            (Color)back_format.color_back,
+	            back_format.flags);
 	drawEvent(d);
 	piForeach(PIScreenTile * t, tiles)
 		t->drawEventInternal(d);
@@ -141,8 +146,10 @@ void PIScreenTile::sizeHint(int & w, int & h) const {
 	h = 0;
 	if (tiles.isEmpty()) return;
 	int sl = spacing * (tiles.size_s() - 1);
-	if (direction == Horizontal) w += sl;
-	else h += sl;
+	if (direction == Horizontal)
+		w += sl;
+	else
+		h += sl;
 	piForeachC(PIScreenTile * t, tiles) {
 		if (!t->visible) continue;
 		int cw(0), ch(0);
@@ -150,9 +157,11 @@ void PIScreenTile::sizeHint(int & w, int & h) const {
 		cw = piClampi(cw, t->minimumWidth, t->maximumWidth);
 		ch = piClampi(ch, t->minimumHeight, t->maximumHeight);
 		if (direction == Horizontal) {
-			w += cw; h = piMaxi(h, ch);
+			w += cw;
+			h = piMaxi(h, ch);
 		} else {
-			h += ch; w = piMaxi(w, cw);
+			h += ch;
+			w = piMaxi(w, cw);
 		}
 	}
 	w += marginLeft + marginRight;
@@ -210,8 +219,7 @@ void PIScreenTile::layout() {
 							for (int j = 0; j < tiles.size_s(); ++j) {
 								if (i == j) continue;
 								if (max_tl[j]) continue;
-								if (tiles[j]->size_policy == pol && tiles[j]->visible && tiles[j]->needLayout())
-									asizes[j] += pas;
+								if (tiles[j]->size_policy == pol && tiles[j]->visible && tiles[j]->needLayout()) asizes[j] += pas;
 							}
 						}
 					}
@@ -241,8 +249,7 @@ void PIScreenTile::layout() {
 			t->height_ = hints[i];
 			cy += hints[i] + spacing;
 		}
-		if (t->pw != t->width_ || t->ph != t->height_)
-			t->resizeEvent(t->width_, t->height_);
+		if (t->pw != t->width_ || t->ph != t->height_) t->resizeEvent(t->width_, t->height_);
 		t->pw = t->width_;
 		t->ph = t->height_;
 		t->layout();

libs/console/piscreentiles.cpp

@@ -18,6 +18,7 @@
 */
 
 #include "piscreentiles.h"
+
 #include "piscreendrawer.h"
 
 
@@ -57,7 +58,7 @@ void TileSimple::drawEvent(PIScreenDrawer * d) {
 }
 
 
-
+// TileScrollBar
 
 TileScrollBar::TileScrollBar(const PIString & n) {
 	direction = Vertical;
@@ -122,7 +123,7 @@ bool TileScrollBar::mouseEvent(PIKbdListener::MouseEvent me) {
 }
 
 
-
+// TileList
 
 TileList::TileList(const PIString & n, SelectionMode sm): PIScreenTile(n) {
 	alignment   = Left;
@@ -188,9 +189,7 @@ bool TileList::keyEvent(PIKbdListener::KeyEvent key) {
 	lhei = height_ - 2;
 	int oo(0), osp = piMini(3, lhei / 4);
 	switch (key.key) {
-	case PIKbdListener::PageUp:
-		cur -= lhei / 2;
-		oo -= lhei / 2;
+	case PIKbdListener::PageUp: cur -= lhei / 2; oo -= lhei / 2;
 	case PIKbdListener::UpArrow:
 		cur--;
 		oo--;
@@ -207,7 +206,8 @@ bool TileList::keyEvent(PIKbdListener::KeyEvent key) {
 		switch (selection_mode) {
 		case NoSelection: return false;
 		case SingleSelection:
-			if (selected.isEmpty()) selected << cur;
+			if (selected.isEmpty())
+				selected << cur;
 			else {
 				bool add = !selected[cur];
 				selected.clear();
@@ -216,8 +216,10 @@ bool TileList::keyEvent(PIKbdListener::KeyEvent key) {
 			raiseEvent(TileEvent(SelectionChanged));
 			return true;
 		case MultiSelection:
-			if (selected[cur]) selected.remove(cur);
-			else selected << cur;
+			if (selected[cur])
+				selected.remove(cur);
+			else
+				selected << cur;
 			raiseEvent(TileEvent(SelectionChanged));
 			break;
 		}
@@ -238,17 +240,14 @@ bool TileList::keyEvent(PIKbdListener::KeyEvent key) {
 		if (offset >= content.size_s() - lhei) offset = content.size_s() - lhei;
 		if (offset < 0) offset = 0;
 		return true;
-	case PIKbdListener::Home:
-		cur = offset = 0;
-		return true;
+	case PIKbdListener::Home: cur = offset = 0; return true;
 	case PIKbdListener::End:
 		cur    = content.size_s() - 1;
 		offset = content.size_s() - lhei;
 		if (offset < 0) offset = 0;
 		return true;
 	case PIKbdListener::Return:
-		if (cur >= 0 && cur < content.size_s())
-			raiseEvent(TileEvent(RowPressed, cur));
+		if (cur >= 0 && cur < content.size_s()) raiseEvent(TileEvent(RowPressed, cur));
 		return true;
 	case '*':
 		if (selection_mode == TileList::MultiSelection) {
@@ -278,12 +277,8 @@ bool TileList::mouseEvent(PIKbdListener::MouseEvent me) {
 	if (mp < 0 || mp >= content.size_s()) return true;
 	cur = mp;
 	switch (me.action) {
-	case PIKbdListener::MouseButtonPress:
-		mouse_sel = !selected.contains(cur);
-		break;
-	case PIKbdListener::MouseButtonDblClick:
-		keyEvent(PIKbdListener::KeyEvent(PIKbdListener::Return));
-		return true;
+	case PIKbdListener::MouseButtonPress: mouse_sel = !selected.contains(cur); break;
+	case PIKbdListener::MouseButtonDblClick: keyEvent(PIKbdListener::KeyEvent(PIKbdListener::Return)); return true;
 	default: break;
 	}
 	if (me.buttons[PIKbdListener::MouseRight]) {
@@ -294,8 +289,10 @@ bool TileList::mouseEvent(PIKbdListener::MouseEvent me) {
 			raiseEvent(TileEvent(SelectionChanged));
 			break;
 		case MultiSelection:
-			if (mouse_sel) selected << cur;
-			else selected.remove(cur);
+			if (mouse_sel)
+				selected << cur;
+			else
+				selected.remove(cur);
 			raiseEvent(TileEvent(SelectionChanged));
 			break;
 		default: break;
@@ -311,7 +308,7 @@ bool TileList::wheelEvent(PIKbdListener::WheelEvent we) {
 }
 
 
-
+// TileButton
 
 TileButton::TileButton(const PIString & n): PIScreenTile(n) {
 	focus_flags = CanHasFocus | NextByTab | NextByArrowsAll | FocusOnMouse;
@@ -351,7 +348,7 @@ bool TileButton::mouseEvent(PIKbdListener::MouseEvent me) {
 }
 
 
-
+// TileButtons
 
 TileButtons::TileButtons(const PIString & n): PIScreenTile(n) {
 	focus_flags = CanHasFocus | NextByTab | FocusOnMouse;
@@ -387,8 +384,7 @@ void TileButtons::drawEvent(PIScreenDrawer * d) {
 	case PIScreenTypes::Right: dx = width_ - shw; break;
 	default: break;
 	}
-	if (direction == PIScreenTypes::Horizontal)
-		cx += dx;
+	if (direction == PIScreenTypes::Horizontal) cx += dx;
 	for (int i = 0; i < content.size_s(); ++i) {
 		Color cb = Cyan;
 		Color ct = Black;
@@ -430,9 +426,7 @@ bool TileButtons::keyEvent(PIKbdListener::KeyEvent key) {
 		if (cur >= content.size_s()) cur = content.size_s() - 1;
 		return true;
 	case PIKbdListener::Space:
-	case PIKbdListener::Return:
-		raiseEvent(TileEvent(ButtonSelected, cur));
-		return true;
+	case PIKbdListener::Return: raiseEvent(TileEvent(ButtonSelected, cur)); return true;
 	};
 	return PIScreenTile::keyEvent(key);
 }
@@ -441,8 +435,7 @@ bool TileButtons::keyEvent(PIKbdListener::KeyEvent key) {
 bool TileButtons::mouseEvent(PIKbdListener::MouseEvent me) {
 	if (me.action == PIKbdListener::MouseMove || me.action == PIKbdListener::MouseButtonPress) {
 		for (int i = 0; i < btn_rects.size_s(); ++i)
-			if (me.x >= btn_rects[i].x0 && me.x < btn_rects[i].x1 &&
-				me.y >= btn_rects[i].y0 && me.y < btn_rects[i].y1) {
+			if (me.x >= btn_rects[i].x0 && me.x < btn_rects[i].x1 && me.y >= btn_rects[i].y0 && me.y < btn_rects[i].y1) {
 				cur = i;
 				break;
 			}
@@ -454,7 +447,7 @@ bool TileButtons::mouseEvent(PIKbdListener::MouseEvent me) {
 }
 
 
-
+// TileCheck
 
 TileCheck::TileCheck(const PIString & n): PIScreenTile(n) {
 	focus_flags = CanHasFocus | NextByTab | NextByArrowsAll | FocusOnMouse;
@@ -499,7 +492,7 @@ bool TileCheck::mouseEvent(PIKbdListener::MouseEvent me) {
 }
 
 
-
+// TileProgress
 
 TileProgress::TileProgress(const PIString & n): PIScreenTile(n) {
 	maximum = 100.;
@@ -532,25 +525,23 @@ void TileProgress::drawEvent(PIScreenDrawer * d) {
 }
 
 
-
+// TilePICout
 
 TilePICout::TilePICout(const PIString & n): TileList(n) {
 	max_lines      = 1024;
 	selection_mode = TileList::SingleSelection;
 	PICout::setOutputDevices(PICout::Buffer);
-	PICout::setBufferActive(true);
 }
 
 
 void TilePICout::drawEvent(PIScreenDrawer * d) {
-	PIString out = PICout::buffer(true);
+	PIString out = PICout::getBufferAndClear();
 	if (!out.isEmpty()) {
 		PIStringList l = out.split("\n");
 		bool scroll    = (cur == content.size_s() - 1) || !has_focus;
 		piForeachC(PIString & s, l)
 			content << TileList::Row(s.trimmed(), format);
-		if (content.size_s() > max_lines)
-			content.remove(0, content.size_s() - max_lines);
+		if (content.size_s() > max_lines) content.remove(0, content.size_s() - max_lines);
 		if (scroll) {
 			offset = piMaxi(0, content.size_s() - lhei);
 			cur    = content.size_s() - 1;
@@ -570,7 +561,7 @@ bool TilePICout::keyEvent(PIKbdListener::KeyEvent key) {
 }
 
 
-
+// TileInput
 
 TileInput::TileInput(const PIString & n): PIScreenTile(n) {
 	focus_flags            = CanHasFocus | NextByTab | FocusOnMouse;
@@ -592,10 +583,8 @@ void TileInput::sizeHint(int & w, int & h) const {
 void TileInput::drawEvent(PIScreenDrawer * d) {
 	PIString ps = text.mid(offset, width_ - 2);
 	d->drawText(x_ + 1, y_, ps, (Color)format.color_char, Transparent, (CharFlags)format.flags);
-	if (offset > 0)
-		d->drawText(x_, y_, "<", Green, Black, Bold);
-	if (text.size_s() - offset >= width_ - 2)
-		d->drawText(x_ + width_ - 1, y_, ">", Green, Black, Bold);
+	if (offset > 0) d->drawText(x_, y_, "<", Green, Black, Bold);
+	if (text.size_s() - offset >= width_ - 2) d->drawText(x_ + width_ - 1, y_, ">", Green, Black, Bold);
 	if (!has_focus) return;
 	Color cb = (Color)format.color_char, cc = (Color)format.color_back;
 	if (tm_blink.elapsed_m() >= 650) {
@@ -648,8 +637,7 @@ bool TileInput::keyEvent(PIKbdListener::KeyEvent key) {
 		reserCursor();
 		return true;
 	case PIKbdListener::Backspace:
-		if (cur > text.size_s() || text.isEmpty())
-			return true;
+		if (cur > text.size_s() || text.isEmpty()) return true;
 		text.remove(cur - 1, 1);
 		cur--;
 		if (cur > text.size_s()) cur = text.size_s();
@@ -659,8 +647,7 @@ bool TileInput::keyEvent(PIKbdListener::KeyEvent key) {
 		reserCursor();
 		return true;
 	case PIKbdListener::Delete:
-		if (cur >= text.size_s() || text.isEmpty())
-			return true;
+		if (cur >= text.size_s() || text.isEmpty()) return true;
 		text.remove(cur, 1);
 		if (cur < 0) cur = 0;
 		if (cur > text.size_s()) cur = text.size_s();
@@ -686,16 +673,9 @@ bool TileInput::keyEvent(PIKbdListener::KeyEvent key) {
 	case PIKbdListener::F9:
 	case PIKbdListener::F10:
 	case PIKbdListener::F11:
-	case PIKbdListener::F12:
-		break;
+	case PIKbdListener::F12: break;
 	default:
-		PIChar tc
-#ifdef WINDOWS
-				= PIChar(key.key);
-#else
-				= PIChar::fromUTF8((char *)&(key.key));
-#endif
-		text.insert(cur, tc);
+		text.insert(cur, PIChar((ushort)key.key));
 		cur++;
 		oo++;
 		if (cur - offset >= lwid - osp) offset += oo;

libs/console/piterminal.cpp

@@ -16,16 +16,19 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "piincludes_p.h"
 #include "piterminal.h"
+
+#include "piincludes_p.h"
 #include "pisharedmemory.h"
-#ifndef FREERTOS
+#ifndef MICRO_PIP
 #  ifdef WINDOWS
-#  include <windows.h>
 #	include <wincon.h>
+#	include <windows.h>
+#	include <wingdi.h>
 #	include <winuser.h>
 #  else
 #	include "piprocess.h"
+
 #	include <csignal>
 #	include <fcntl.h>
 #	include <sys/ioctl.h>
@@ -122,8 +125,7 @@ PITerminal::PITerminal(): PIThread() {
 
 
 PITerminal::~PITerminal() {
-	if (isRunning())
-		stop();
+	if (isRunning()) stop();
 	PIThread::waitForFinish(10);
 	destroy();
 #  ifdef WINDOWS
@@ -164,7 +166,8 @@ void PITerminal::write(PIKbdListener::SpecialKey k, PIKbdListener::KeyModifiers
 	default: break;
 	}
 	// piCout << "write" << ba.size();
-	if (!ba.isEmpty()) write(ba);
+	if (!ba.isEmpty())
+		write(ba);
 	else {
 		PIByteArray msg;
 		PIVector<PIKbdListener::KeyEvent> ke;
@@ -184,7 +187,8 @@ void PITerminal::write(PIKbdListener::SpecialKey k, PIKbdListener::KeyModifiers
 	case PIKbdListener::UpArrow:
 	case PIKbdListener::DownArrow:
 	case PIKbdListener::RightArrow:
-	case PIKbdListener::LeftArrow:  if (PRIVATE->DEC.value(CKM, false)) flags = 1;
+	case PIKbdListener::LeftArrow:
+		if (PRIVATE->DEC.value(CKM, false)) flags = 1;
 	/*case PIKbdListener::Home:       //break;
 	case PIKbdListener::End:        //break;
 	case PIKbdListener::PageUp:     //ba << uchar('\e') << uchar('[') << uchar('5') << uchar('~'); break;
@@ -234,13 +238,14 @@ void PITerminal::write(PIKbdListener::SpecialKey k, PIKbdListener::KeyModifiers
 
 
 void PITerminal::write(PIKbdListener::KeyEvent ke) {
-	if (isSpecialKey(ke.key)) write((PIKbdListener::SpecialKey)ke.key, ke.modifiers);
+	if (isSpecialKey(ke.key))
+		write((PIKbdListener::SpecialKey)ke.key, ke.modifiers);
 	else {
 		PIByteArray ba;
 #  ifdef WINDOWS
-		ba << uchar(PIChar(ke.key).toConsole1Byte());
+		ba << uchar(PIChar((ushort)ke.key).toConsole1Byte());
 #  else
-		ba = PIString(PIChar(ke.key)).toUTF8();
+		ba = PIString(PIChar((ushort)ke.key)).toUTF8();
 #  endif
 		write(ba);
 	}
@@ -252,8 +257,7 @@ PIVector<PIVector<PIScreenTypes::Cell> > PITerminal::content() {
 	PIVector<PIVector<PIScreenTypes::Cell>> ret = cells;
 	if (cursor_blink && cursor_visible)
 		if (cursor_x >= 0 && cursor_x < size_x)
-			if (cursor_y >= 0 && cursor_y < size_y)
-				ret[cursor_y][cursor_x].format.flags ^= PIScreenTypes::Inverse;
+			if (cursor_y >= 0 && cursor_y < size_y) ret[cursor_y][cursor_x].format.flags ^= PIScreenTypes::Inverse;
 	return ret;
 }
 
@@ -394,16 +398,15 @@ void PITerminal::run() {
 		}
 		bool parse = PRIVATE->read_buf.size_s() >= BUFFER_SIZE;
 		if (PRIVATE->read_buf.size_s() == 1)
-			if (PRIVATE->read_buf[0] < 0x80)
-				parse = true;
+			if (PRIVATE->read_buf[0] < 0x80) parse = true;
 		if (parse) {
-			parseInput(PIString(PRIVATE->read_buf));
+			parseInput(PIString::fromUTF8(PRIVATE->read_buf));
 			PRIVATE->read_buf.clear();
 		}
 		// printf("%s", PRIVATE->read_buf.data());
 	}
 	if (!used && !PRIVATE->last_read && !PRIVATE->read_buf.isEmpty()) {
-		parseInput(PIString(PRIVATE->read_buf));
+		parseInput(PIString::fromUTF8(PRIVATE->read_buf));
 		PRIVATE->read_buf.clear();
 	}
 	PRIVATE->last_read = false;
@@ -444,7 +447,8 @@ void PITerminal::parseInput(const PIString & s) {
 				if (s[i] == '\r') continue;
 				if (s[i] == '\n') {
 					// piCoutObj << "new line";
-					for (int i = PRIVATE->cur_x; i < size_x; ++i) cells[PRIVATE->cur_y][i].format = PRIVATE->cur_format;
+					for (int i = PRIVATE->cur_x; i < size_x; ++i)
+						cells[PRIVATE->cur_y][i].format = PRIVATE->cur_format;
 					PRIVATE->line_format = PRIVATE->cur_format;
 					PRIVATE->cur_x       = 0;
 					moveCursor(0, 1);
@@ -497,7 +501,8 @@ void PITerminal::applyEscSeq(PIString es) {
 		case 1047:
 			if (val) {
 				PRIVATE->cells_save = cells;
-				for (int i = 0; i < size_y; ++i) cells[i].fill(def_cell);
+				for (int i = 0; i < size_y; ++i)
+					cells[i].fill(def_cell);
 			} else {
 				cells = PRIVATE->cells_save;
 			}
@@ -523,8 +528,14 @@ void PITerminal::applyEscSeq(PIString es) {
 				default: {
 					bool col = false, target = false;
 					int cid = av % 10;
-					if (av >= 30 && av <= 37) {col = true; target = false;}
-					if (av >= 40 && av <= 47) {col = true; target = true;}
+					if (av >= 30 && av <= 37) {
+						col    = true;
+						target = false;
+					}
+					if (av >= 40 && av <= 47) {
+						col    = true;
+						target = true;
+					}
 					if (col) {
 						int cfl = 0;
 						switch (cid) {
@@ -585,25 +596,29 @@ void PITerminal::applyEscSeq(PIString es) {
 		}
 		if (es.back() == 'A') { // cursor up
 			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
+			int v = es.toInt();
+			if (v == 0) v = 1;
 			PRIVATE->cur_y       = piClamp(PRIVATE->cur_y - v, 0, size_y - 1);
 			PRIVATE->line_format = PRIVATE->cur_format;
 		}
 		if (es.back() == 'B') { // cursor down
 			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
+			int v = es.toInt();
+			if (v == 0) v = 1;
 			PRIVATE->cur_y       = piClamp(PRIVATE->cur_y + v, 0, size_y - 1);
 			PRIVATE->line_format = PRIVATE->cur_format;
 		}
 		if (es.back() == 'C' || es.back() == 'a') { // cursor forward, next column
 			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
+			int v = es.toInt();
+			if (v == 0) v = 1;
 			PRIVATE->cur_x       = piClamp(PRIVATE->cur_x + v, 0, size_x - 1);
 			PRIVATE->line_format = PRIVATE->cur_format;
 		}
 		if (es.back() == 'D') { // cursor back
 			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
+			int v = es.toInt();
+			if (v == 0) v = 1;
 			PRIVATE->cur_x       = piClamp(PRIVATE->cur_x - v, 0, size_x - 1);
 			PRIVATE->line_format = PRIVATE->cur_format;
 		}
@@ -615,65 +630,91 @@ void PITerminal::applyEscSeq(PIString es) {
 		}
 		if (es.back() == 'd') { // goto line
 			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
+			int v = es.toInt();
+			if (v == 0) v = 1;
 			PRIVATE->cur_x       = 0;
 			PRIVATE->cur_y       = piClamp(v - 1, 0, size_y - 1);
 			PRIVATE->line_format = PRIVATE->cur_format;
 		}
 		if (es.back() == 'E' || es.back() == 'e') { // next line
 			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
+			int v = es.toInt();
+			if (v == 0) v = 1;
 			PRIVATE->cur_x       = 0;
 			PRIVATE->cur_y       = piClamp(PRIVATE->cur_y + v, 0, size_y - 1);
 			PRIVATE->line_format = PRIVATE->cur_format;
 		}
 		if (es.back() == 'F') { // previous line
 			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
+			int v = es.toInt();
+			if (v == 0) v = 1;
 			PRIVATE->cur_x       = 0;
 			PRIVATE->cur_y       = piClamp(PRIVATE->cur_y - v, 0, size_y - 1);
 			PRIVATE->line_format = PRIVATE->cur_format;
 		}
 		if (es.back() == 'L') { // insert lines
 			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			for (int i = piClamp(size_y - 1, PRIVATE->win_y0, PRIVATE->win_y1); i >= piClamp(PRIVATE->cur_y + v, PRIVATE->win_y0, PRIVATE->win_y1); --i) cells[i] = cells[i - v];
-			for (int j = piClamp(PRIVATE->cur_y, PRIVATE->win_y0, PRIVATE->win_y1); j < piClamp(PRIVATE->cur_y + v, PRIVATE->win_y0, PRIVATE->win_y1); ++j)
-				for (int i = 0; i < PRIVATE->cur_x; ++i) cells[j][i] = def_cell;
+			int v = es.toInt();
+			if (v == 0) v = 1;
+			for (int i = piClamp(size_y - 1, PRIVATE->win_y0, PRIVATE->win_y1);
+			     i >= piClamp(PRIVATE->cur_y + v, PRIVATE->win_y0, PRIVATE->win_y1);
+			     --i)
+				cells[i] = cells[i - v];
+			for (int j = piClamp(PRIVATE->cur_y, PRIVATE->win_y0, PRIVATE->win_y1);
+			     j < piClamp(PRIVATE->cur_y + v, PRIVATE->win_y0, PRIVATE->win_y1);
+			     ++j)
+				for (int i = 0; i < PRIVATE->cur_x; ++i)
+					cells[j][i] = def_cell;
 		}
 		if (es.back() == 'M') { // delete lines
 			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			for (int i = piClamp(PRIVATE->cur_y, PRIVATE->win_y0, PRIVATE->win_y1); i < piClamp(size_y - v, PRIVATE->win_y0, PRIVATE->win_y1); ++i) cells[i] = cells[i + v];
+			int v = es.toInt();
+			if (v == 0) v = 1;
+			for (int i = piClamp(PRIVATE->cur_y, PRIVATE->win_y0, PRIVATE->win_y1);
+			     i < piClamp(size_y - v, PRIVATE->win_y0, PRIVATE->win_y1);
+			     ++i)
+				cells[i] = cells[i + v];
 			for (int j = piClamp(size_y - v, PRIVATE->win_y0, PRIVATE->win_y1); j < piClamp(size_y, PRIVATE->win_y0, PRIVATE->win_y1); ++j)
-				for (int i = 0; i < PRIVATE->cur_x; ++i) cells[j][i] = def_cell;
+				for (int i = 0; i < PRIVATE->cur_x; ++i)
+					cells[j][i] = def_cell;
 		}
 		if (es.back() == 'P') { // delete characters
 			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			for (int i = PRIVATE->cur_x; i < size_x - v; ++i) cells[PRIVATE->cur_y][i] = cells[PRIVATE->cur_y][i + v];
-			for (int i = size_x - v; i < size_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
+			int v = es.toInt();
+			if (v == 0) v = 1;
+			for (int i = PRIVATE->cur_x; i < size_x - v; ++i)
+				cells[PRIVATE->cur_y][i] = cells[PRIVATE->cur_y][i + v];
+			for (int i = size_x - v; i < size_x; ++i)
+				cells[PRIVATE->cur_y][i] = def_cell;
 		}
 		if (es.back() == '@') { // delete characters
 			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			for (int i = size_x - 1; i >= PRIVATE->cur_x + v; --i) cells[PRIVATE->cur_y][i] = cells[PRIVATE->cur_y][i - v];
-			for (int i = PRIVATE->cur_x; i < PRIVATE->cur_x + v; ++i) cells[PRIVATE->cur_y][i] = def_cell;
+			int v = es.toInt();
+			if (v == 0) v = 1;
+			for (int i = size_x - 1; i >= PRIVATE->cur_x + v; --i)
+				cells[PRIVATE->cur_y][i] = cells[PRIVATE->cur_y][i - v];
+			for (int i = PRIVATE->cur_x; i < PRIVATE->cur_x + v; ++i)
+				cells[PRIVATE->cur_y][i] = def_cell;
 		}
 		if (es.back() == 'J') { // erase data
 			es.cutLeft(1).cutRight(1);
 			int v = es.toInt();
 			switch (v) {
 			case 0:
-				for (int i = PRIVATE->cur_x; i < size_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
-				for (int i = PRIVATE->cur_y + 1; i < size_y; ++i) cells[i].fill(def_cell);
+				for (int i = PRIVATE->cur_x; i < size_x; ++i)
+					cells[PRIVATE->cur_y][i] = def_cell;
+				for (int i = PRIVATE->cur_y + 1; i < size_y; ++i)
+					cells[i].fill(def_cell);
 				break;
 			case 1:
-				for (int i = 0; i <= PRIVATE->cur_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
-				for (int i = 0; i < PRIVATE->cur_y; ++i) cells[i].fill(def_cell);
+				for (int i = 0; i <= PRIVATE->cur_x; ++i)
+					cells[PRIVATE->cur_y][i] = def_cell;
+				for (int i = 0; i < PRIVATE->cur_y; ++i)
+					cells[i].fill(def_cell);
 				break;
 			case 2:
-				for (int i = 0; i < size_y; ++i) cells[i].fill(def_cell);
+				for (int i = 0; i < size_y; ++i)
+					cells[i].fill(def_cell);
 				// PRIVATE->cur_x = PRIVATE->cur_y = 0;
 				break;
 			}
@@ -683,14 +724,14 @@ void PITerminal::applyEscSeq(PIString es) {
 			int v = es.toInt();
 			switch (v) {
 			case 0:
-				for (int i = PRIVATE->cur_x; i < size_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
+				for (int i = PRIVATE->cur_x; i < size_x; ++i)
+					cells[PRIVATE->cur_y][i] = def_cell;
 				break;
 			case 1:
-				for (int i = 0; i <= PRIVATE->cur_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
-				break;
-			case 2:
-				cells[PRIVATE->cur_y].fill(def_cell);
+				for (int i = 0; i <= PRIVATE->cur_x; ++i)
+					cells[PRIVATE->cur_y][i] = def_cell;
 				break;
+			case 2: cells[PRIVATE->cur_y].fill(def_cell); break;
 			}
 		}
 	}
@@ -720,8 +761,10 @@ void PITerminal::moveCursor(int dx, int dy) {
 
 
 int PITerminal::termType(const PIString & t) {
-	if (t == "xterm") return PIKbdListener::vt_xterm;
-	else if (t == "linux") return PIKbdListener::vt_linux;
+	if (t == "xterm")
+		return PIKbdListener::vt_xterm;
+	else if (t == "linux")
+		return PIKbdListener::vt_linux;
 	return PIKbdListener::vt_none;
 }
 #  endif
@@ -766,12 +809,28 @@ bool PITerminal::initialize() {
 	PIString shmh  = PIString::fromNumber(randomi() % 10000);
 	PIString pname = "\\\\.\\pipe\\piterm" + shmh;
 	PIString cmd   = "piterminal \"" + shmh + "\" \"" + pname + "\"";
-	if(!CreateProcessA(0, (LPSTR)cmd.dataAscii(), 0, 0, false, CREATE_NEW_CONSOLE | CREATE_NEW_PROCESS_GROUP, 0, 0, &PRIVATE->si, &PRIVATE->pi)) {
+	if (!CreateProcessA(0,
+	                    (LPSTR)cmd.dataAscii(),
+	                    0,
+	                    0,
+	                    false,
+	                    CREATE_NEW_CONSOLE | CREATE_NEW_PROCESS_GROUP,
+	                    0,
+	                    0,
+	                    &PRIVATE->si,
+	                    &PRIVATE->pi)) {
 		piCoutObj << "CreateProcess error," << errorString();
 		destroy();
 		return false;
 	}
-	PRIVATE->pipe = CreateNamedPipe((LPSTR)pname.dataAscii(), PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, 2, PIPE_BUFFER_SIZE, PIPE_BUFFER_SIZE, 1000, NULL);
+	PRIVATE->pipe = CreateNamedPipeA((LPSTR)pname.dataAscii(),
+	                                 PIPE_ACCESS_DUPLEX,
+	                                 PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT,
+	                                 2,
+	                                 PIPE_BUFFER_SIZE,
+	                                 PIPE_BUFFER_SIZE,
+	                                 1000,
+	                                 NULL);
 	if (PRIVATE->pipe == INVALID_HANDLE_VALUE) {
 		piCoutObj << "CreateNamedPipe error," << errorString();
 		destroy();
@@ -796,7 +855,8 @@ bool PITerminal::initialize() {
 	resize(dsize_x, dsize_y);
 #  else
 #	ifdef HAS_FORKPTY
-	char pty[256]; memset(pty, 0, 256);
+	char pty[256];
+	memset(pty, 0, 256);
 	winsize ws;
 	ws.ws_col        = dsize_x;
 	ws.ws_row        = dsize_y;
@@ -811,11 +871,12 @@ bool PITerminal::initialize() {
 	// piCoutObj << fr << PRIVATE->fd << pty;
 	if (fr == 0) {
 		char ** argv      = new char *[2];
-		argv[0] = new char[PRIVATE->shell.lengthAscii() + 1];
-		memcpy(argv[0], PRIVATE->shell.dataAscii(), PRIVATE->shell.lengthAscii());
-		argv[0][PRIVATE->shell.lengthAscii()] = 0;
+		PIByteArray shell = PRIVATE->shell.toByteArray();
+		argv[0]           = new char[shell.size() + 1];
+		memcpy(argv[0], shell.data(), shell.size());
+		argv[0][shell.size()] = 0;
 		argv[1]               = 0;
-		execvp(PRIVATE->shell.dataAscii(), argv);
+		execvp(argv[0], argv);
 		delete[] argv[0];
 		delete[] argv;
 		exit(0);
@@ -875,10 +936,8 @@ void PITerminal::destroy() {
 		// piCout << "destroy" << size_y;
 #  else
 #	ifdef HAS_FORKPTY
-	if (PRIVATE->pid != 0)
-		kill(PRIVATE->pid, SIGKILL);
-	if (PRIVATE->fd != 0)
-		::close(PRIVATE->fd);
+	if (PRIVATE->pid != 0) kill(PRIVATE->pid, SIGKILL);
+	if (PRIVATE->fd != 0) ::close(PRIVATE->fd);
 #	endif
 #  endif
 	initPrivate();
@@ -917,4 +976,4 @@ bool PITerminal::resize(int cols, int rows) {
 	return ret;
 }
 
-#endif // FREERTOS
+#endif // MICRO_PIP

libs/crypt/piauth.cpp

@@ -128,7 +128,7 @@ PIAuth::State PIAuth::receive(PIByteArray & ba) {
 			passwordRequest(&ps);
 			if (ps.isEmpty()) return disconnect(ba, "Canceled by user");
 			ph = crypt.passwordHash(ps, PIString("PIAuth").toByteArray());
-			ps.fill(PIChar(0));
+			ps.fill(PIChar());
 			tba.clear();
 			tba << ph << auth_sign << sign_pk;
 			tba = crypt.crypt(tba, box_pk, box_sk);
@@ -238,7 +238,7 @@ PIAuth::State PIAuth::receive(PIByteArray & ba) {
 			rinfo   = crypt.decrypt(rinfo, secret_key, &ok);
 			if (!ok) return disconnect(ba, "Error while exchange keys");
 			state = Connected;
-			connected(rinfo);
+			connected(PIString::fromUTF8(rinfo));
 			ba << (int)state << crypt.generateRandomBuff(randomi() % PIAUTH_NOISE_MAX_SIZE);
 			return state;
 		}

libs/crypt/picrypt.cpp

@@ -22,7 +22,9 @@
 #  include <sodium.h>
 #endif
 
-#define PICRYPT_DISABLED_WARNING piCout << "[PICrypt]" << "Warning: PICrypt is disabled, to enable install sodium library and rebuild pip";
+#define PICRYPT_DISABLED_WARNING \
+	piCout << "[PICrypt]"        \
+		   << "Warning: PICrypt is disabled, to enable install sodium library and rebuild pip";
 
 const char hash_def_key[]   = "_picrypt_\0\0\0\0\0\0\0";
 const int hash_def_key_size = 9;
@@ -30,7 +32,9 @@ const int hash_def_key_size = 9;
 
 PICrypt::PICrypt() {
 #ifdef PIP_CRYPT
-	if (!init()) piCout << "[PICrypt]" << "Error while initialize sodium!";
+	if (!init())
+		piCout << "[PICrypt]"
+			   << "Error while initialize sodium!";
 	nonce_.resize(crypto_secretbox_NONCEBYTES);
 	key_.resize(crypto_secretbox_KEYBYTES);
 	randombytes_buf(key_.data(), key_.size());
@@ -76,8 +80,7 @@ PIByteArray PICrypt::crypt(const PIByteArray & data) {
 PIByteArray PICrypt::crypt(const PIByteArray & data, PIByteArray key) {
 	PIByteArray ret;
 #ifdef PIP_CRYPT
-	if (key.size() != crypto_secretbox_KEYBYTES)
-		key.resize(crypto_secretbox_KEYBYTES, ' ');
+	if (key.size() != crypto_secretbox_KEYBYTES) key.resize(crypto_secretbox_KEYBYTES, ' ');
 	// return PIByteArray();
 	if (!init()) return ret;
 	PIByteArray n;
@@ -116,8 +119,7 @@ PIByteArray PICrypt::decrypt(const PIByteArray & crypt_data, bool *ok) {
 PIByteArray PICrypt::decrypt(const PIByteArray & crypt_data, PIByteArray key, bool * ok) {
 	PIByteArray ret;
 #ifdef PIP_CRYPT
-	if (key.size() != crypto_secretbox_KEYBYTES)
-		key.resize(crypto_secretbox_KEYBYTES, ' ');
+	if (key.size() != crypto_secretbox_KEYBYTES) key.resize(crypto_secretbox_KEYBYTES, ' ');
 	/*if (ok) *ok = false;
 	return PIByteArray();
 }*/
@@ -134,7 +136,8 @@ PIByteArray PICrypt::decrypt(const PIByteArray & crypt_data, PIByteArray key, bo
 		if (ok) *ok = false;
 		//			piCout << "[PICrypt]" << "bad key_";
 		return PIByteArray();
-	} else if (ok) *ok = true;
+	} else if (ok)
+		*ok = true;
 #else
 	PICRYPT_DISABLED_WARNING
 #endif
@@ -169,6 +172,19 @@ PIByteArray PICrypt::hash(const PIByteArray & data) {
 }
 
 
+PIByteArray PICrypt::hash(const PIByteArray & data, const unsigned char * key, size_t keylen) {
+	PIByteArray hash;
+#ifdef PIP_CRYPT
+	if (!init()) return hash;
+	hash.resize(crypto_generichash_BYTES);
+	crypto_generichash(hash.data(), hash.size(), data.data(), data.size(), key, keylen);
+#else
+	PICRYPT_DISABLED_WARNING
+#endif
+	return hash;
+}
+
+
 size_t PICrypt::sizeHash() {
 #ifdef PIP_CRYPT
 	return crypto_generichash_BYTES;
@@ -182,10 +198,13 @@ size_t PICrypt::sizeHash() {
 ullong PICrypt::shorthash(const PIString & s, PIByteArray key) {
 	ullong hash = 0;
 #ifdef PIP_CRYPT
-	if (crypto_shorthash_BYTES != sizeof(hash)) piCout << "[PICrypt]" << "internal error: bad hash size";
+	if (crypto_shorthash_BYTES != sizeof(hash))
+		piCout << "[PICrypt]"
+			   << "internal error: bad hash size";
 	if (!init()) return hash;
 	if (key.size() != crypto_shorthash_KEYBYTES) {
-		piCout << "[PICrypt]" << "invalid key size" << key.size() << ", shoud be" << crypto_shorthash_KEYBYTES << ", filled zeros";
+		piCout << "[PICrypt]"
+			   << "invalid key size" << key.size() << ", shoud be" << crypto_shorthash_KEYBYTES << ", filled zeros";
 		key.resize(crypto_shorthash_KEYBYTES, 0);
 	}
 	PIByteArray in(s.data(), s.size());
@@ -332,16 +351,13 @@ PIByteArray PICrypt::crypt(const PIByteArray & data, const PIByteArray & public_
 	PIByteArray ret;
 #ifdef PIP_CRYPT
 	if (!init()) return ret;
-	if (public_key.size() != crypto_box_PUBLICKEYBYTES)
-		return ret;
-	if (secret_key.size() != crypto_box_SECRETKEYBYTES)
-		return ret;
+	if (public_key.size() != crypto_box_PUBLICKEYBYTES) return ret;
+	if (secret_key.size() != crypto_box_SECRETKEYBYTES) return ret;
 	PIByteArray n;
 	ret.resize(data.size() + crypto_box_MACBYTES);
 	n.resize(crypto_box_NONCEBYTES);
 	randombytes_buf(n.data(), n.size());
-	if (crypto_box_easy(ret.data(), data.data(), data.size(), n.data(), public_key.data(), secret_key.data()) != 0)
-		return PIByteArray();
+	if (crypto_box_easy(ret.data(), data.data(), data.size(), n.data(), public_key.data(), secret_key.data()) != 0) return PIByteArray();
 	ret.append(n);
 #else
 	PICRYPT_DISABLED_WARNING
@@ -370,11 +386,13 @@ PIByteArray PICrypt::decrypt(const PIByteArray & crypt_data, const PIByteArray &
 	n.resize(crypto_secretbox_NONCEBYTES);
 	ret.resize(crypt_data.size() - n.size() - crypto_secretbox_MACBYTES);
 	memcpy(n.data(), crypt_data.data(crypt_data.size() - n.size()), n.size());
-	if (crypto_box_open_easy(ret.data(), crypt_data.data(), crypt_data.size() - n.size(), n.data(), public_key.data(), secret_key.data()) != 0) {
+	if (crypto_box_open_easy(ret.data(), crypt_data.data(), crypt_data.size() - n.size(), n.data(), public_key.data(), secret_key.data()) !=
+	    0) {
 		if (ok) *ok = false;
 		//			piCout << "[PICrypt]" << "bad key_";
 		return PIByteArray();
-	} else if (ok) *ok = true;
+	} else if (ok)
+		*ok = true;
 #else
 	PICRYPT_DISABLED_WARNING
 #endif
@@ -392,8 +410,16 @@ PIByteArray PICrypt::passwordHash(const PIString & password, const PIByteArray &
 	n.resize(crypto_pwhash_SALTBYTES);
 	//	randombytes_buf(n.data(), n.size());
 	//	crypto_shorthash(n.data(), seed.data(), seed.size(), PIByteArray(crypto_shorthash_KEYBYTES).data());
-	int r = crypto_pwhash(ph.data(), ph.size(), (const char*)pass.data(), pass.size(), n.data(), crypto_pwhash_argon2i_opslimit_moderate(), crypto_pwhash_argon2i_memlimit_moderate(), crypto_pwhash_ALG_ARGON2I13);
-	//crypto_pwhash_str(out, (const char*)pass.data(), pass.size(), crypto_pwhash_argon2i_opslimit_moderate(), crypto_pwhash_argon2i_memlimit_moderate());
+	int r = crypto_pwhash(ph.data(),
+	                      ph.size(),
+	                      (const char *)pass.data(),
+	                      pass.size(),
+	                      n.data(),
+	                      crypto_pwhash_argon2i_opslimit_moderate(),
+	                      crypto_pwhash_argon2i_memlimit_moderate(),
+	                      crypto_pwhash_ALG_ARGON2I13);
+	// crypto_pwhash_str(out, (const char*)pass.data(), pass.size(), crypto_pwhash_argon2i_opslimit_moderate(),
+	// crypto_pwhash_argon2i_memlimit_moderate());
 	pass.fill(0);
 	if (r != 0) return PIByteArray();
 	return ph;
@@ -421,8 +447,7 @@ bool PICrypt::init() {
 	if (inited) return true;
 	// piCout << "[PICrypt]" << "init ...";
 	inited = sodium_init();
-	if (!inited)
-		inited = sodium_init();
+	if (!inited) inited = sodium_init();
 	// piCout << "[PICrypt]" << "init" << inited;
 	return inited;
 #else
@@ -430,6 +455,3 @@ bool PICrypt::init() {
 #endif
 	return false;
 }
-
-
-

libs/fftw/pifft.cpp

@@ -18,16 +18,30 @@
 */
 
 #include "pifft.h"
+
 #include "pifft_p.h"
 
 
 #define _PIFFTW_CPP(type)                                                                               \
-	_PIFFTW_P_##type##_::_PIFFTW_P_##type##_() {impl = new PIFFTW_Private<type>();;} \
-	_PIFFTW_P_##type##_::~_PIFFTW_P_##type##_() {delete (PIFFTW_Private<type>*)impl;} \
-	const PIVector<complex<type> > & _PIFFTW_P_##type##_::calcFFT(const PIVector<complex<type> > & in) {return ((PIFFTW_Private<type>*)impl)->calcFFT(in);} \
-	const PIVector<complex<type> > & _PIFFTW_P_##type##_::calcFFTR(const PIVector<type> & in) {return ((PIFFTW_Private<type>*)impl)->calcFFT(in);} \
-	const PIVector<complex<type> > & _PIFFTW_P_##type##_::calcFFTI(const PIVector<complex<type> > & in) {return ((PIFFTW_Private<type>*)impl)->calcFFTinverse(in);} \
-	void _PIFFTW_P_##type##_::preparePlan(int size, int op) {return ((PIFFTW_Private<type>*)impl)->preparePlan(size, op);}
+	_PIFFTW_P_##type##_::_PIFFTW_P_##type##_() {                                                        \
+		impl = new PIFFTW_Private<type>();                                                              \
+		;                                                                                               \
+	}                                                                                                   \
+	_PIFFTW_P_##type##_::~_PIFFTW_P_##type##_() {                                                       \
+		delete (PIFFTW_Private<type> *)impl;                                                            \
+	}                                                                                                   \
+	const PIVector<complex<type>> & _PIFFTW_P_##type##_::calcFFT(const PIVector<complex<type>> & in) {  \
+		return ((PIFFTW_Private<type> *)impl)->calcFFT(in);                                             \
+	}                                                                                                   \
+	const PIVector<complex<type>> & _PIFFTW_P_##type##_::calcFFTR(const PIVector<type> & in) {          \
+		return ((PIFFTW_Private<type> *)impl)->calcFFT(in);                                             \
+	}                                                                                                   \
+	const PIVector<complex<type>> & _PIFFTW_P_##type##_::calcFFTI(const PIVector<complex<type>> & in) { \
+		return ((PIFFTW_Private<type> *)impl)->calcFFTinverse(in);                                      \
+	}                                                                                                   \
+	void _PIFFTW_P_##type##_::preparePlan(int size, int op) {                                           \
+		return ((PIFFTW_Private<type> *)impl)->preparePlan(size, op);                                   \
+	}
 
 _PIFFTW_CPP(float)
 _PIFFTW_CPP(double)

libs/fftw/pifft_p.h

@@ -1,5 +1,5 @@
-/*! @file pifft_p.h
- * @brief Class for FFT, IFFT and Hilbert transformations
+/*! \file pifft_p.h
+ * \brief Class for FFT, IFFT and Hilbert transformations
  */
 /*
     PIP - Platform Independent Primitives
@@ -23,8 +23,8 @@
 #ifndef PIFFT_P_H
 #define PIFFT_P_H
 
-#include "pivector.h"
 #include "picout.h"
+#include "pivector.h"
 #if defined(PIP_FFTW) || defined(PIP_FFTWf) || defined(PIP_FFTWl) || defined(PIP_FFTWq)
 #  include "fftw3.h"
 #else
@@ -36,8 +36,7 @@
 
 
 template<typename T>
-class PIFFTW_Private
-{
+class PIFFTW_Private {
 public:
 	explicit PIFFTW_Private() {
 		plan = 0;
@@ -51,7 +50,7 @@ public:
 	const PIVector<complex<T>> & calcFFT(const PIVector<complex<T>> & in) {
 		if (prepare != PlanParams(in.size(), fo_complex)) {
 			p_out.resize(in.size());
-			piCout << "[PIFFTW]" << "creating plan";
+			// piCout << "[PIFFTW]" << "creating plan";
 			p_createPlan_c2c_1d(plan, in.size(), in.data(), p_out.data(), FFTW_FORWARD, FFTW_ESTIMATE | FFTW_UNALIGNED);
 			prepare = PlanParams(in.size(), fo_complex);
 		}
@@ -61,7 +60,7 @@ public:
 	const PIVector<complex<T>> & calcFFT(const PIVector<T> & in) {
 		if (prepare != PlanParams(in.size(), fo_real)) {
 			p_out.resize(in.size());
-			piCout << "[PIFFTW]" << "creating plan";
+			// piCout << "[PIFFTW]" << "creating plan";
 			p_createPlan_r2c_1d(plan, in.size(), in.data(), p_out.data(), FFTW_ESTIMATE | FFTW_UNALIGNED);
 			prepare = PlanParams(in.size(), fo_real);
 		}
@@ -71,7 +70,7 @@ public:
 	const PIVector<complex<T>> & calcFFTinverse(const PIVector<complex<T>> & in) {
 		if (prepare != PlanParams(in.size(), fo_inverse)) {
 			p_out.resize(in.size());
-			piCout << "[PIFFTW]" << "creating plan";
+			// piCout << "[PIFFTW]" << "creating plan";
 			p_createPlan_c2c_1d(plan, in.size(), in.data(), p_out.data(), FFTW_BACKWARD, FFTW_ESTIMATE | FFTW_UNALIGNED);
 			prepare = PlanParams(in.size(), fo_inverse);
 		}
@@ -79,7 +78,11 @@ public:
 		return p_out;
 	}
 
-	enum FFT_Operation {fo_real, fo_complex, fo_inverse};
+	enum FFT_Operation {
+		fo_real,
+		fo_complex,
+		fo_inverse
+	};
 
 	void preparePlan(int size, int op) {
 		p_inr.clear();
@@ -101,9 +104,7 @@ public:
 			p_out.resize(size);
 			p_createPlan_c2c_1d(plan, size, p_in.data(), p_out.data(), FFTW_BACKWARD, FFTW_MEASURE | FFTW_UNALIGNED);
 			break;
-			default:
-				size = 0;
-			break;
+		default: size = 0; break;
 		}
 		prepare = PlanParams(size, (FFT_Operation)op);
 	}
@@ -117,8 +118,14 @@ public:
 	inline void p_makeThreadSafe() {}
 
 	struct PlanParams {
-		PlanParams() {size = 0; op = fo_complex;}
-		PlanParams(int size_, FFT_Operation op_) {size = size_; op = op_;}
+		PlanParams() {
+			size = 0;
+			op   = fo_complex;
+		}
+		PlanParams(int size_, FFT_Operation op_) {
+			size = size_;
+			op   = op_;
+		}
 		bool isValid() { return size > 0; }
 		bool operator==(const PlanParams & v) const { return (v.size == size) && (v.op == op); }
 		bool operator!=(const PlanParams & v) const { return !(*this == v); }
@@ -135,44 +142,104 @@ public:
 
 
 #ifdef PIP_FFTWf
-template<> inline void PIFFTW_Private<float>::p_createPlan_c2c_1d(void *& plan, int size, const void * in, void * out, int dir, int flags) {
-	plan = fftwf_plan_dft_1d(size, (fftwf_complex *)in, (fftwf_complex *)out, dir, flags);}
-template<> inline void PIFFTW_Private<float>::p_createPlan_r2c_1d(void *& plan, int size, const void * in, void * out, int flags) {
-	plan = fftwf_plan_dft_r2c_1d(size, (float *)in, (fftwf_complex *)out, flags);}
-template<> inline void PIFFTW_Private<float>::p_executePlan(void * plan) {fftwf_execute((fftwf_plan)plan);}
-template<> inline void PIFFTW_Private<float>::p_executePlan_c2c(void * plan, const void * in, void * out) {fftwf_execute_dft((fftwf_plan)plan, (fftwf_complex *)in, (fftwf_complex *)out);}
-template<> inline void PIFFTW_Private<float>::p_executePlan_r2c(void * plan, const void * in, void * out) {fftwf_execute_dft_r2c((fftwf_plan)plan, (float *)in, (fftwf_complex *)out);}
-template<> inline void PIFFTW_Private<float>::p_destroyPlan(void *& plan) {if (plan) fftwf_destroy_plan((fftwf_plan)plan); plan = 0;}
+template<>
+inline void PIFFTW_Private<float>::p_createPlan_c2c_1d(void *& plan, int size, const void * in, void * out, int dir, int flags) {
+	plan = fftwf_plan_dft_1d(size, (fftwf_complex *)in, (fftwf_complex *)out, dir, flags);
+}
+template<>
+inline void PIFFTW_Private<float>::p_createPlan_r2c_1d(void *& plan, int size, const void * in, void * out, int flags) {
+	plan = fftwf_plan_dft_r2c_1d(size, (float *)in, (fftwf_complex *)out, flags);
+}
+template<>
+inline void PIFFTW_Private<float>::p_executePlan(void * plan) {
+	fftwf_execute((fftwf_plan)plan);
+}
+template<>
+inline void PIFFTW_Private<float>::p_executePlan_c2c(void * plan, const void * in, void * out) {
+	fftwf_execute_dft((fftwf_plan)plan, (fftwf_complex *)in, (fftwf_complex *)out);
+}
+template<>
+inline void PIFFTW_Private<float>::p_executePlan_r2c(void * plan, const void * in, void * out) {
+	fftwf_execute_dft_r2c((fftwf_plan)plan, (float *)in, (fftwf_complex *)out);
+}
+template<>
+inline void PIFFTW_Private<float>::p_destroyPlan(void *& plan) {
+	if (plan) fftwf_destroy_plan((fftwf_plan)plan);
+	plan = 0;
+}
 #  ifdef PIP_FFTWf_THREADSAFE
-template<> inline void PIFFTW_Private<float>::p_makeThreadSafe() {fftwf_make_planner_thread_safe();}
+template<>
+inline void PIFFTW_Private<float>::p_makeThreadSafe() {
+	fftwf_make_planner_thread_safe();
+}
 #  endif
 #endif // PIP_FFTWf
 
 #ifdef PIP_FFTW
-template<> inline void PIFFTW_Private<double>::p_createPlan_c2c_1d(void *& plan, int size, const void * in, void * out, int dir, int flags) {
-	plan = fftw_plan_dft_1d(size, (fftw_complex *)in, (fftw_complex *)out, dir, flags);}
-template<> inline void PIFFTW_Private<double>::p_createPlan_r2c_1d(void *& plan, int size, const void * in, void * out, int flags) {
-	plan = fftw_plan_dft_r2c_1d(size, (double *)in, (fftw_complex *)out, flags);}
-template<> inline void PIFFTW_Private<double>::p_executePlan(void * plan) {fftw_execute((fftw_plan)plan);}
-template<> inline void PIFFTW_Private<double>::p_executePlan_c2c(void * plan, const void * in, void * out) {fftw_execute_dft((fftw_plan)plan, (fftw_complex *)in, (fftw_complex *)out);}
-template<> inline void PIFFTW_Private<double>::p_executePlan_r2c(void * plan, const void * in, void * out) {fftw_execute_dft_r2c((fftw_plan)plan, (double *)in, (fftw_complex *)out);}
-template<> inline void PIFFTW_Private<double>::p_destroyPlan(void *& plan) {if (plan) fftw_destroy_plan((fftw_plan)plan); plan = 0;}
+template<>
+inline void PIFFTW_Private<double>::p_createPlan_c2c_1d(void *& plan, int size, const void * in, void * out, int dir, int flags) {
+	plan = fftw_plan_dft_1d(size, (fftw_complex *)in, (fftw_complex *)out, dir, flags);
+}
+template<>
+inline void PIFFTW_Private<double>::p_createPlan_r2c_1d(void *& plan, int size, const void * in, void * out, int flags) {
+	plan = fftw_plan_dft_r2c_1d(size, (double *)in, (fftw_complex *)out, flags);
+}
+template<>
+inline void PIFFTW_Private<double>::p_executePlan(void * plan) {
+	fftw_execute((fftw_plan)plan);
+}
+template<>
+inline void PIFFTW_Private<double>::p_executePlan_c2c(void * plan, const void * in, void * out) {
+	fftw_execute_dft((fftw_plan)plan, (fftw_complex *)in, (fftw_complex *)out);
+}
+template<>
+inline void PIFFTW_Private<double>::p_executePlan_r2c(void * plan, const void * in, void * out) {
+	fftw_execute_dft_r2c((fftw_plan)plan, (double *)in, (fftw_complex *)out);
+}
+template<>
+inline void PIFFTW_Private<double>::p_destroyPlan(void *& plan) {
+	if (plan) fftw_destroy_plan((fftw_plan)plan);
+	plan = 0;
+}
 #  ifdef PIP_FFTW_THREADSAFE
-template<> inline void PIFFTW_Private<double>::p_makeThreadSafe() {fftw_make_planner_thread_safe();}
+template<>
+inline void PIFFTW_Private<double>::p_makeThreadSafe() {
+	fftw_make_planner_thread_safe();
+}
 #  endif
 #endif // PIP_FFTW
 
 #ifdef PIP_FFTWl
-template<> inline void PIFFTW_Private<ldouble>::p_createPlan_c2c_1d(void *& plan, int size, const void * in, void * out, int dir, int flags) {
-	plan = fftwl_plan_dft_1d(size, (fftwl_complex *)in, (fftwl_complex *)out, dir, flags);}
-template<> inline void PIFFTW_Private<ldouble>::p_createPlan_r2c_1d(void *& plan, int size, const void * in, void * out, int flags) {
-	plan = fftwl_plan_dft_r2c_1d(size, (ldouble *)in, (fftwl_complex *)out, flags);}
-template<> inline void PIFFTW_Private<ldouble>::p_executePlan(void * plan) {fftwl_execute((fftwl_plan)plan);}
-template<> inline void PIFFTW_Private<ldouble>::p_executePlan_c2c(void * plan, const void * in, void * out) {fftwl_execute_dft((fftwl_plan)plan, (fftwl_complex *)in, (fftwl_complex *)out);}
-template<> inline void PIFFTW_Private<ldouble>::p_executePlan_r2c(void * plan, const void * in, void * out) {fftwl_execute_dft_r2c((fftwl_plan)plan, (ldouble *)in, (fftwl_complex *)out);}
-template<> inline void PIFFTW_Private<ldouble>::p_destroyPlan(void *& plan) {if (plan) fftwl_destroy_plan((fftwl_plan)plan); plan = 0;}
+template<>
+inline void PIFFTW_Private<ldouble>::p_createPlan_c2c_1d(void *& plan, int size, const void * in, void * out, int dir, int flags) {
+	plan = fftwl_plan_dft_1d(size, (fftwl_complex *)in, (fftwl_complex *)out, dir, flags);
+}
+template<>
+inline void PIFFTW_Private<ldouble>::p_createPlan_r2c_1d(void *& plan, int size, const void * in, void * out, int flags) {
+	plan = fftwl_plan_dft_r2c_1d(size, (ldouble *)in, (fftwl_complex *)out, flags);
+}
+template<>
+inline void PIFFTW_Private<ldouble>::p_executePlan(void * plan) {
+	fftwl_execute((fftwl_plan)plan);
+}
+template<>
+inline void PIFFTW_Private<ldouble>::p_executePlan_c2c(void * plan, const void * in, void * out) {
+	fftwl_execute_dft((fftwl_plan)plan, (fftwl_complex *)in, (fftwl_complex *)out);
+}
+template<>
+inline void PIFFTW_Private<ldouble>::p_executePlan_r2c(void * plan, const void * in, void * out) {
+	fftwl_execute_dft_r2c((fftwl_plan)plan, (ldouble *)in, (fftwl_complex *)out);
+}
+template<>
+inline void PIFFTW_Private<ldouble>::p_destroyPlan(void *& plan) {
+	if (plan) fftwl_destroy_plan((fftwl_plan)plan);
+	plan = 0;
+}
 #  ifdef PIP_FFTWl_THREADSAFE
-template<> inline void PIFFTW_Private<ldouble>::p_makeThreadSafe() {fftwl_make_planner_thread_safe();}
+template<>
+inline void PIFFTW_Private<ldouble>::p_makeThreadSafe() {
+	fftwl_make_planner_thread_safe();
+}
 #  endif
 #endif // PIP_FFTWl
 

libs/io_utils/pibroadcast.cpp

@@ -20,7 +20,7 @@
 #include "pibroadcast.h"
 
 /** \class PIBroadcast
- * @brief Broadcast for all interfaces, including loopback
+ * \brief Broadcast for all interfaces, including loopback
  *
  * \section PIBroadcast_synopsis Synopsis
  * %PIBroadcast used as multichannel IO device. It can use
@@ -53,8 +53,6 @@ PIBroadcast::PIBroadcast(bool send_only): PIThread(), PIEthUtilBase() {
 	_started   = false;
 	_send_only = send_only;
 	_reinit    = true;
-	//initMcast(PIEthernet::allAddresses());
-	PIThread::start(3000);
 }
 
 
@@ -86,7 +84,7 @@ void PIBroadcast::setMulticastPort(ushort port) {
 }
 
 
-void PIBroadcast::setMulticastAddress(const PIEthernet::Address & addr) {
+void PIBroadcast::setMulticastAddress(const PINetworkAddress & addr) {
 	PIMutexLocker ml(mcast_mutex);
 	mcast_address = addr;
 	_reinit       = true;
@@ -128,19 +126,18 @@ void PIBroadcast::destroyAll() {
 }
 
 
-void PIBroadcast::initAll(PIVector<PIEthernet::Address> al) {
+void PIBroadcast::initAll(PIVector<PINetworkAddress> al) {
 	PIMutexLocker ml(mcast_mutex);
 	destroyAll();
 	_reinit = false;
 	prev_al = al;
-	al.removeAll(PIEthernet::Address("127.0.0.1"));
+	al.removeAll(PINetworkAddress("127.0.0.1"));
 	al << mcast_address;
 	eth_mcast.clear();
 	PIEthernet::InterfaceList ifaces = PIEthernet::interfaces();
-	piForeachC (PIEthernet::Address & a, al) {
+	piForeachC(PINetworkAddress & a, al) {
 		PIEthernet * ce = 0;
 		// piCout << "mcast try" << a;
-
 		if (_channels[Multicast]) {
 			ce = new PIEthernet();
 			ce->setDebug(false);
@@ -154,7 +151,7 @@ void PIBroadcast::initAll(PIVector<PIEthernet::Address> al) {
 				// piCout << "mcast " << ce->readAddress() << ce->sendAddress();
 				if (ce->open()) {
 					eth_mcast << ce;
-					CONNECTU(ce, threadedReadEvent, this, mcastRead);
+					CONNECT2(void, const uchar *, ssize_t, ce, threadedReadEvent, this, mcastRead);
 				} else {
 					delete ce;
 				}
@@ -169,14 +166,14 @@ void PIBroadcast::initAll(PIVector<PIEthernet::Address> al) {
 			ce->setName("PIMulticast_" + a.toString());
 			ce->setParameters(PIEthernet::Broadcast);
 			const PIEthernet::Interface * cint = ifaces.getByAddress(a.ipString());
-			PIEthernet::Address nm((cint == 0) ? "255.255.255.0" : cint->netmask);
+			PINetworkAddress nm((cint == 0) ? "255.255.255.0" : cint->netmask);
 			ce->setSendAddress(PIEthernet::getBroadcast(a, nm).ipString(), bcast_port);
 			if (!_send_only) {
-				ce->setReadAddress(PIEthernet::Address(a.ip(), bcast_port));
+				ce->setReadAddress(PINetworkAddress(a.ip(), bcast_port));
 				// piCout << "bcast " << ce->readAddress() << ce->sendAddress();
 				if (ce->open()) {
 					eth_mcast << ce;
-					CONNECTU(ce, threadedReadEvent, this, mcastRead);
+					CONNECT2(void, const uchar *, ssize_t, ce, threadedReadEvent, this, mcastRead);
 				} else {
 					delete ce;
 				}
@@ -184,7 +181,6 @@ void PIBroadcast::initAll(PIVector<PIEthernet::Address> al) {
 				eth_mcast << ce;
 			}
 		}
-
 	}
 
 	if (_channels[Loopback]) {
@@ -193,7 +189,7 @@ void PIBroadcast::initAll(PIVector<PIEthernet::Address> al) {
 		eth_lo->setName("PIMulticast_loopback");
 		if (!_send_only) {
 			eth_lo->setParameter(PIEthernet::ReuseAddress, false);
-			CONNECTU(eth_lo, threadedReadEvent, this, mcastRead);
+			CONNECT2(void, const uchar *, ssize_t, eth_lo, threadedReadEvent, this, mcastRead);
 			for (int i = 0; i < lo_pcnt; ++i) {
 				eth_lo->setReadAddress("127.0.0.1", lo_port + i);
 				if (eth_lo->open()) {
@@ -207,6 +203,10 @@ void PIBroadcast::initAll(PIVector<PIEthernet::Address> al) {
 
 
 void PIBroadcast::send(const PIByteArray & data) {
+	if (!isRunning()) {
+		reinit();
+		PIThread::start(3000);
+	}
 	PIByteArray cd = cryptData(data);
 	if (cd.isEmpty()) return;
 	PIMutexLocker ml(mcast_mutex);
@@ -221,34 +221,37 @@ void PIBroadcast::send(const PIByteArray & data) {
 
 
 void PIBroadcast::startRead() {
+	if (!isRunning()) {
+		_started = false;
+		reinit();
+		PIThread::start(3000);
+	}
 	if (_send_only) return;
 	PIMutexLocker ml(mcast_mutex);
 	piForeach(PIEthernet * e, eth_mcast)
 		e->startThreadedRead();
-	if (eth_lo)
-		eth_lo->startThreadedRead();
+	if (eth_lo) eth_lo->startThreadedRead();
 	_started = true;
 }
 
 
 void PIBroadcast::stopRead() {
+	if (isRunning()) stop();
 	PIMutexLocker ml(mcast_mutex);
 	piForeach(PIEthernet * e, eth_mcast)
 		e->stopThreadedRead();
-	if (eth_lo)
-		eth_lo->stopThreadedRead();
+	if (eth_lo) eth_lo->stopThreadedRead();
 	_started = false;
 }
 
 
 void PIBroadcast::reinit() {
 	initAll(PIEthernet::allAddresses());
-	if (_started)
-		startRead();
+	if (_started) startRead();
 }
 
 
-void PIBroadcast::mcastRead(uchar * data, int size) {
+void PIBroadcast::mcastRead(const uchar * data, ssize_t size) {
 	PIByteArray cd = decryptData(PIByteArray(data, size));
 	if (cd.isEmpty()) return;
 	received(cd);
@@ -257,12 +260,10 @@ void PIBroadcast::mcastRead(uchar * data, int size) {
 
 
 void PIBroadcast::run() {
-	PIVector<PIEthernet::Address> al = PIEthernet::allAddresses();
+	PIVector<PINetworkAddress> al = PIEthernet::allAddresses();
 	mcast_mutex.lock();
 	bool r = _reinit, ac = (al != prev_al);
 	mcast_mutex.unlock();
-	if (ac || r)
-		reinit();
-	if (ac)
-		addressesChanged();
+	if (ac || r) reinit();
+	if (ac) addressesChanged();
 }

libs/io_utils/piethutilbase.cpp

@@ -23,7 +23,7 @@
 #endif
 
 /** \class PIEthUtilBase
- * @brief Base class for ethernet utils
+ * \brief Base class for ethernet utils
  *
  * \section PIEthUtilBase_synopsis Synopsis
  * %PIEthUtilBase provides crypt layer for derived classes:
@@ -51,8 +51,7 @@ PIEthUtilBase::PIEthUtilBase() {
 }
 
 
-PIEthUtilBase::~PIEthUtilBase() {
-}
+PIEthUtilBase::~PIEthUtilBase() {}
 
 
 void PIEthUtilBase::setCryptEnabled(bool on) {

libs/io_utils/pistreampacker.cpp

@@ -22,13 +22,14 @@
 #  pragma GCC diagnostic ignored "-Wnonnull"
 #endif
 #include "pistreampacker.h"
+
 #include "piiodevice.h"
 #ifdef __GNUC__
 #  pragma GCC diagnostic pop
 #endif
 
 /** \class PIStreamPacker
- * @brief Simple packet wrap aroud any PIIODevice
+ * \brief Simple packet wrap aroud any PIIODevice
  *
  * \section PIStreamPacker_synopsis Synopsis
  * %PIStreamPacker provides simple pack/unpack logic for any data packets.
@@ -61,13 +62,21 @@ PIStreamPacker::PIStreamPacker(PIIODevice * dev): PIObject() {
 void PIStreamPacker::setCryptSizeEnabled(bool on) {
 	crypt_size = on;
 	if (crypt_size) {
-		PIByteArray ba; ba << int(0);
+		PIByteArray ba;
+		ba << int(0);
 		size_crypted_size = cryptData(ba).size_s();
 	} else
 		size_crypted_size = sizeof(int);
 }
 
 
+void PIStreamPacker::clear() {
+	packet.clear();
+	packet_size = -1;
+	stream.clear();
+}
+
+
 void PIStreamPacker::send(const PIByteArray & data) {
 	if (data.isEmpty()) return;
 	PIByteArray cd;
@@ -76,8 +85,10 @@ void PIStreamPacker::send(const PIByteArray & data) {
 		// piCout << "crypt_frag send" << fcnt << "frags";
 		PIByteArray frag;
 		for (int i = 0; i < fcnt; ++i) {
-			if (i == fcnt - 1) frag = PIByteArray(data.data(fst), data.size_s() - fst);
-			else frag = PIByteArray(data.data(fst), crypt_frag_size);
+			if (i == fcnt - 1)
+				frag = PIByteArray(data.data(fst), data.size_s() - fst);
+			else
+				frag = PIByteArray(data.data(fst), crypt_frag_size);
 			fst += crypt_frag_size;
 			cd << cryptData(frag);
 		}
@@ -88,42 +99,26 @@ void PIStreamPacker::send(const PIByteArray & data) {
 	PIByteArray hdr, part;
 	hdr << packet_sign;
 	if (crypt_size) {
-		PIByteArray crsz; crsz << int(cd.size_s());
+		PIByteArray crsz;
+		crsz << int(cd.size_s());
 		hdr.append(cryptData(crsz));
 	} else
 		hdr << int(cd.size_s());
 	cd.insert(0, hdr);
 	int pcnt = (cd.size_s() - 1) / max_packet_size + 1, pst = 0;
-	if (pcnt > 1) {
-		prog_s_mutex.lock();
-		prog_s.active = true;
-		prog_s.bytes_all = data.size_s();
-		prog_s.bytes_current = 0;
-		prog_s.progress = 0.;
-		prog_s_mutex.unlock();
-	}
 	for (int i = 0; i < pcnt; ++i) {
-		if (i == pcnt - 1) part = PIByteArray(cd.data(pst), cd.size_s() - pst);
-		else part = PIByteArray(cd.data(pst), max_packet_size);
+		if (i == pcnt - 1)
+			part = PIByteArray(cd.data(pst), cd.size_s() - pst);
+		else
+			part = PIByteArray(cd.data(pst), max_packet_size);
 		// piCout << "send" << part.size();
 		sendRequest(part);
 		pst += max_packet_size;
-		if (pcnt > 1) {
-			prog_s_mutex.lock();
-			prog_s.bytes_current += part.size_s();
-			prog_s.progress = (double)prog_s.bytes_current / prog_s.bytes_all;
-			prog_s_mutex.unlock();
-		}
-	}
-	if (pcnt > 1) {
-		prog_s_mutex.lock();
-		prog_s.active = false;
-		prog_s_mutex.unlock();
 	}
 }
 
 
-void PIStreamPacker::received(uchar * readed, int size) {
+void PIStreamPacker::received(const uchar * readed, ssize_t size) {
 	received(PIByteArray(readed, size));
 }
 
@@ -138,8 +133,10 @@ void PIStreamPacker::received(const PIByteArray & data) {
 			ushort sign(0);
 			memcpy(&sign, stream.data(), 2);
 			if (sign != packet_sign) {
-				if (aggressive_optimization) stream.clear();
-				else stream.pop_front();
+				if (aggressive_optimization)
+					stream.clear();
+				else
+					stream.pop_front();
 				continue;
 			}
 			int sz = -1;
@@ -148,8 +145,10 @@ void PIStreamPacker::received(const PIByteArray & data) {
 				memcpy(crsz.data(), stream.data(2), size_crypted_size);
 				crsz = decryptData(crsz);
 				if (crsz.size() < sizeof(sz)) {
-					if (aggressive_optimization) stream.clear();
-					else stream.pop_front();
+					if (aggressive_optimization)
+						stream.clear();
+					else
+						stream.pop_front();
 					continue;
 				}
 				crsz >> sz;
@@ -157,31 +156,20 @@ void PIStreamPacker::received(const PIByteArray & data) {
 				memcpy(&sz, stream.data(2), size_crypted_size);
 			}
 			if (sz < 0) {
-				if (aggressive_optimization) stream.clear();
-				else stream.pop_front();
+				if (aggressive_optimization)
+					stream.clear();
+				else
+					stream.pop_front();
 				continue;
 			}
 			stream.remove(0, hdr_size);
 			packet.clear();
 			packet_size = sz;
-			if (packet_size == 0)
-				packet_size = -1;
-			else {
-				prog_r_mutex.lock();
-				prog_r.active = true;
-				prog_r.bytes_all = packet_size;
-				prog_r.bytes_current = 0;
-				prog_r.progress = 0.;
-				prog_r_mutex.unlock();
-			}
+			if (packet_size == 0) packet_size = -1;
 			continue;
 		} else {
 			int ps = piMini(stream.size_s(), packet_size - packet.size_s());
 			packet.append(stream.data(), ps);
-			prog_r_mutex.lock();
-			prog_r.bytes_current = packet.size_s();
-			prog_r.progress = (double)prog_r.bytes_current / piMaxi(1, prog_r.bytes_all);
-			prog_r_mutex.unlock();
 			stream.remove(0, ps);
 			if (packet.size_s() == packet_size) {
 				PIByteArray cd;
@@ -211,9 +199,6 @@ void PIStreamPacker::received(const PIByteArray & data) {
 				}
 				packet.clear();
 				packet_size = -1;
-				prog_r_mutex.lock();
-				prog_r.active = false;
-				prog_r_mutex.unlock();
 			}
 		}
 	}
@@ -222,35 +207,9 @@ void PIStreamPacker::received(const PIByteArray & data) {
 
 void PIStreamPacker::assignDevice(PIIODevice * dev) {
 	if (!dev) return;
-	if (!dev->infoFlags()[PIIODevice::Reliable])
+	if (!dev->infoFlags()[PIIODevice::Reliable]) {
 		piCoutObj << "Warning! Not recommended to use with non-reliable" << dev;
-	CONNECTU(dev, threadedReadEvent, this, received);
-	CONNECTU(this, sendRequest, dev, write);
 	}
-
-
-PIStreamPacker::Progress PIStreamPacker::progressSend() const {
-	PIStreamPacker::Progress ret;
-	prog_s_mutex.lock();
-	ret = prog_s;
-	prog_s_mutex.unlock();
-	return ret;
-}
-
-
-PIStreamPacker::Progress PIStreamPacker::progressReceive() const {
-	PIStreamPacker::Progress ret;
-	prog_r_mutex.lock();
-	ret = prog_r;
-	prog_r_mutex.unlock();
-	return ret;
-}
-
-
-
-
-PIStreamPacker::Progress::Progress() {
-	active = false;
-	bytes_all = bytes_current = 0;
-	progress = 0.;
+	CONNECT2(void, const uchar *, ssize_t, dev, threadedReadEvent, this, received);
+	CONNECT1(void, PIByteArray, this, sendRequest, dev, write);
 }

libs/lua/piluaprogram.cpp

@@ -50,4 +50,3 @@ luabridge::LuaRef PILuaProgram::getGlobal(const PIString & name) {
 luabridge::Namespace PILuaProgram::getGlobalNamespace() {
 	return luabridge::getGlobalNamespace(PRIVATE->lua_state);
 }
-

libs/main/cloud/picloudbase.h

@@ -1,5 +1,8 @@
-/*! @file picloudbase.h
- * @brief PICloud Base - Base class for PICloudClient and PICloud Server
+/*! \file picloudbase.h
+ * \ingroup Cloud
+ * \~\brief
+ * \~english Base class for PICloudClient and PICloudServer
+ * \~russian Базовый класс для PICloudClient и PICloudServer
  */
 /*
     PIP - Platform Independent Primitives
@@ -28,8 +31,7 @@
 #include "pistreampacker.h"
 
 
-class PIP_CLOUD_EXPORT PICloudBase
-{
+class PIP_CLOUD_EXPORT PICloudBase {
 public:
 	PICloudBase();
 

libs/main/cloud/picloudclient.h

@@ -1,5 +1,8 @@
-/*! @file picloudclient.h
- * @brief PICloud Client
+/*! \file picloudclient.h
+ * \ingroup Cloud
+ * \~\brief
+ * \~english PICloud Client
+ * \~russian Клиент PICloud
  */
 /*
     PIP - Platform Independent Primitives
@@ -27,11 +30,13 @@
 #include "piconditionvar.h"
 
 
-//! @brief PICloudClient
+//! \brief PICloudClient
+
+class PIP_CLOUD_EXPORT PICloudClient
+	: public PIIODevice
+	, public PICloudBase {
+	PIIODEVICE(PICloudClient, "");
 
-class PIP_CLOUD_EXPORT PICloudClient: public PIIODevice, public PICloudBase
-{
-	PIIODEVICE(PICloudClient)
 public:
 	explicit PICloudClient(const PIString & path = PIString(), PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
 	virtual ~PICloudClient();
@@ -39,25 +44,30 @@ public:
 	void setServerName(const PIString & server_name);
 	void setKeepConnection(bool on);
 	bool isConnected() const { return is_connected; }
+	ssize_t bytesAvailable() const override { return buff.size(); }
+	void interrupt() override;
 
-	EVENT(connected)
-	EVENT(disconnected)
+	EVENT(connected);
+	EVENT(disconnected);
 
 protected:
-	bool openDevice();
-	bool closeDevice();
-	int readDevice(void * read_to, int max_size);
-	int writeDevice(const void * data, int size);
-	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Reliable;}
+	bool openDevice() override;
+	bool closeDevice() override;
+	ssize_t readDevice(void * read_to, ssize_t max_size) override;
+	ssize_t writeDevice(const void * data, ssize_t size) override;
+	DeviceInfoFlags deviceInfoFlags() const override { return PIIODevice::Reliable; }
 
 private:
 	EVENT_HANDLER1(void, _readed, PIByteArray &, data);
+	void internalDisconnect();
+
 	PIByteArray buff;
 	PIMutex mutex_buff;
 	PIMutex mutex_connect;
 	PIConditionVariable cond_buff;
 	PIConditionVariable cond_connect;
 	std::atomic_bool is_connected;
+	std::atomic_bool is_deleted;
 };
 
 #endif // PICLOUDCLIENT_H

libs/main/cloud/picloudmodule.h

@@ -16,12 +16,43 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+//! \defgroup Cloud Cloud
+//! \~\brief
+//! \~english Cloud transport over ethernet
+//! \~russian Облачный транспорт через ethernet
+//!
+//! \~\details
+//! \~english \section cmake_module_Cloud Building with CMake
+//! \~russian \section cmake_module_Cloud Сборка с использованием CMake
+//!
+//! \~\code
+//! find_package(PIP REQUIRED)
+//! target_link_libraries([target] PIP::Cloud)
+//! \endcode
+//!
+//! \~english \par Common
+//! \~russian \par Общее
+//!
+//! \~english
+//! These files provides server-side and client-side of PICloud transport.
+//!
+//! \~russian
+//! Эти файлы обеспечивают серверную и клиентскую сторону транспорта PICloud.
+//!
+//! \~\authors
+//! \~english
+//! Ivan Pelipenko peri4ko@yandex.ru;
+//! Andrey Bychkov work.a.b@yandex.ru;
+//! \~russian
+//! Иван Пелипенко peri4ko@yandex.ru;
+//! Андрей Бычков work.a.b@yandex.ru;
+//!
 
 #ifndef PICLOUDMODULE_H
 #define PICLOUDMODULE_H
 
-#include "picloudtcp.h"
 #include "picloudclient.h"
 #include "picloudserver.h"
+#include "picloudtcp.h"
 
 #endif // PICLOUDMODULE_H

libs/main/cloud/picloudserver.h

@@ -1,5 +1,8 @@
-/*! @file picloudserver.h
- * @brief PICloud Server
+/*! \file picloudserver.h
+ * \ingroup Cloud
+ * \~\brief
+ * \~english PICloud Server
+ * \~russian Сервер PICloud
  */
 /*
     PIP - Platform Independent Primitives
@@ -27,26 +30,32 @@
 #include "piconditionvar.h"
 
 
-class PIP_CLOUD_EXPORT PICloudServer: public PIIODevice, public PICloudBase
-{
-	PIIODEVICE(PICloudServer)
+class PIP_CLOUD_EXPORT PICloudServer
+	: public PIIODevice
+	, public PICloudBase {
+	PIIODEVICE(PICloudServer, "");
+
 public:
 	//! PICloudServer
 	explicit PICloudServer(const PIString & path = PIString(), PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
 	virtual ~PICloudServer();
 
 	class Client: public PIIODevice {
-		PIIODEVICE(PICloudServer::Client)
+		PIIODEVICE(PICloudServer::Client, "");
 		friend class PICloudServer;
+
 	public:
 		Client(PICloudServer * srv = nullptr, uint id = 0);
 		virtual ~Client();
+
 	protected:
-		bool openDevice();
-		bool closeDevice();
-		int readDevice(void * read_to, int max_size);
-		int writeDevice(const void * data, int size);
-		DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Reliable;}
+		bool openDevice() override;
+		bool closeDevice() override;
+		ssize_t readDevice(void * read_to, ssize_t max_size) override;
+		ssize_t writeDevice(const void * data, ssize_t size) override;
+		DeviceInfoFlags deviceInfoFlags() const override { return PIIODevice::Reliable; }
+		ssize_t bytesAvailable() const override { return buff.size(); }
+		void interrupt() override;
 
 	private:
 		void pushBuffer(const PIByteArray & ba);
@@ -62,13 +71,14 @@ public:
 
 	PIVector<PICloudServer::Client *> clients() const;
 
-	EVENT1(newConnection, PICloudServer::Client * , client)
+	EVENT1(newConnection, PICloudServer::Client *, client);
 
 protected:
-	bool openDevice();
-	bool closeDevice();
-	int readDevice(void * read_to, int max_size);
-	int writeDevice(const void * data, int max_size);
+	bool openDevice() override;
+	bool closeDevice() override;
+	ssize_t readDevice(void * read_to, ssize_t max_size) override;
+	ssize_t writeDevice(const void * data, ssize_t max_size) override;
+	void interrupt() override;
 
 private:
 	EVENT_HANDLER1(void, _readed, PIByteArray &, ba);
@@ -77,8 +87,13 @@ private:
 	int sendData(const PIByteArray & data, uint client_id);
 
 	PIVector<Client *> clients_;
+	PIVector<Client *> removed_clients_;
 	PIMap<uint, Client *> index_clients;
+	PITimer ping_timer;
+	PIConditionVariable cvar;
+	PIMutex open_mutex;
 	mutable PIMutex clients_mutex;
+	std::atomic_bool is_deleted;
 };
 
 #endif // PICLOUDSERVER_H

libs/main/cloud/picloudtcp.h

@@ -1,5 +1,8 @@
-/*! @file picloudtcp.h
- * @brief PICloud TCP transport
+/*! \file picloudtcp.h
+ * \ingroup Cloud
+ * \~\brief
+ * \~english PICloud TCP transport
+ * \~russian TCP слой PICloud
  */
 /*
     PIP - Platform Independent Primitives
@@ -23,6 +26,7 @@
 #ifndef PICLOUDTCP_H
 #define PICLOUDTCP_H
 
+#include "pimutex.h"
 #include "pip_cloud_export.h"
 #include "pistring.h"
 
@@ -33,7 +37,6 @@ class PIStreamPacker;
 namespace PICloud {
 
 
-
 class PIP_CLOUD_EXPORT TCP {
 public:
 	enum Version {
@@ -52,6 +55,7 @@ public:
 		Connect     = 1,
 		Disconnect  = 2,
 		Data        = 3,
+		Ping        = 4,
 	};
 
 	TCP(PIStreamPacker * s);
@@ -65,8 +69,9 @@ public:
 	void sendDisconnected(uint client_id);
 	int sendData(const PIByteArray & data);
 	int sendData(const PIByteArray & data, uint client_id);
+	void sendPing();
 	PIPair<PICloud::TCP::Type, PICloud::TCP::Role> parseHeader(PIByteArray & ba);
-	PIByteArray parseData(PIByteArray & ba);
+	bool canParseData(PIByteArray & ba);
 	PIPair<uint, PIByteArray> parseDataServer(PIByteArray & ba);
 	PIByteArray parseConnect_d(PIByteArray & ba);
 	uint parseConnect(PIByteArray & ba);
@@ -84,8 +89,9 @@ private:
 	PIByteArray suuid;
 	PIString server_name;
 	PIStreamPacker * streampacker;
+	PIMutex mutex_send;
 };
 
-}
+} // namespace PICloud
 
 #endif // PICLOUDTCP_H

libs/main/code/picodeinfo.cpp

@@ -18,37 +18,45 @@
 */
 
 #include "picodeinfo.h"
+
 #include "pivariant.h"
 
 
 PIString PICodeInfo::EnumInfo::memberName(int value_) const {
 	piForeachC(PICodeInfo::EnumeratorInfo & e, members)
-		if (e.value == value_)
-			return e.name;
+		if (e.value == value_) return e.name.toString();
 	return PIString();
 }
 
 
 int PICodeInfo::EnumInfo::memberValue(const PIString & name_) const {
 	piForeachC(PICodeInfo::EnumeratorInfo & e, members)
-		if (e.name == name_)
-			return e.value;
+		if (e.name.toString() == name_) return e.value;
 	return -1;
 }
 
 
-PIMap<PIString, PICodeInfo::ClassInfo * > * PICodeInfo::classesInfo;
-PIMap<PIString, PICodeInfo::EnumInfo * > * PICodeInfo::enumsInfo;
-PIMap<PIString, PICodeInfo::AccessValueFunction> * PICodeInfo::accessValueFunctions;
-PIMap<PIString, PICodeInfo::AccessTypeFunction> * PICodeInfo::accessTypeFunctions;
+PIVariantTypes::Enum PICodeInfo::EnumInfo::toPIVariantEnum() {
+	PIVariantTypes::Enum en(name.toString());
+	for (auto m: members)
+		en << m.toPIVariantEnumerator();
+	if (!en.isEmpty()) en.selectValue(members.front().value);
+	return en;
+}
+
+
+PIMap<PIConstChars, PICodeInfo::ClassInfo *> * PICodeInfo::classesInfo;
+PIMap<PIConstChars, PICodeInfo::EnumInfo *> * PICodeInfo::enumsInfo;
+PIMap<PIConstChars, PICodeInfo::AccessValueFunction> * PICodeInfo::accessValueFunctions;
+PIMap<PIConstChars, PICodeInfo::AccessTypeFunction> * PICodeInfo::accessTypeFunctions;
 
 bool __PICodeInfoInitializer__::_inited_ = false;
 
 
 PIVariant PICodeInfo::getMemberAsVariant(const void * p, const char * class_name, const char * member_name) {
 	if (!p || !class_name || !member_name || !accessTypeFunctions || !accessValueFunctions) return PIVariant();
-	AccessTypeFunction atf = accessTypeFunctions->value(PIStringAscii(class_name), (AccessTypeFunction)0);
-	AccessValueFunction avf = accessValueFunctions->value(PIStringAscii(class_name), (AccessValueFunction)0);
+	AccessTypeFunction atf  = accessTypeFunctions->value(class_name, (AccessTypeFunction)0);
+	AccessValueFunction avf = accessValueFunctions->value(class_name, (AccessValueFunction)0);
 	if (!atf || !avf) return PIVariant();
 	return PIVariant::fromValue(avf(p, member_name), PIStringAscii(atf(member_name)));
 }

libs/main/code/picodeinfo.h

@@ -1,5 +1,8 @@
-/*! @file picodeinfo.h
- * @brief C++ code info structs
+/*! \file picodeinfo.h
+ * \ingroup Code
+ * \~\brief
+ * \~english C++ code info structs. See \ref code_model.
+ * \~russian Структуры для C++ кода. Подробнее \ref code_model.
  */
 /*
     PIP - Platform Independent Primitives
@@ -24,21 +27,31 @@
 #ifndef PICODEINFO_H
 #define PICODEINFO_H
 
+#include "piconstchars.h"
 #include "pistringlist.h"
+#include "pivarianttypes.h"
+
 
 class PIVariant;
 
+//! \~english Namespace contains structures for code generation. See \ref code_model.
+//! \~russian Пространство имен содержит структуры для кодогенерации. Подробнее \ref code_model.
 namespace PICodeInfo {
 
+
+//! \~english
+//! Type modifiers
+//! \~russian
+//! Модификаторы типа
 enum TypeFlag {
 	NoFlag,
-	Const = 0x01,
-	Static = 0x02,
-	Mutable = 0x04,
-	Volatile = 0x08,
-	Inline = 0x10,
-	Virtual = 0x20,
-	Extern = 0x40
+	Const /** const    */    = 0x01,
+	Static /** static   */   = 0x02,
+	Mutable /** mutable  */  = 0x04,
+	Volatile /** volatile */ = 0x08,
+	Inline /** inline   */   = 0x10,
+	Virtual /** virtual  */  = 0x20,
+	Extern /** extern   */   = 0x40
 };
 
 typedef PIFlags<PICodeInfo::TypeFlag> TypeFlags;
@@ -46,47 +59,151 @@ typedef PIMap<PIString, PIString> MetaMap;
 typedef PIByteArray (*AccessValueFunction)(const void *, const char *);
 typedef const char * (*AccessTypeFunction)(const char *);
 
+
+//! \~english Type information
+//! \~russian Информация о типе
 struct PIP_EXPORT TypeInfo {
-	TypeInfo(const PIString & n = PIString(), const PIString & t = PIString(), PICodeInfo::TypeFlags f = 0, int b = -1) {name = n; type = t; flags = f; bits = b;}
+	TypeInfo(const PIConstChars & n = PIConstChars(), const PIConstChars & t = PIConstChars(), PICodeInfo::TypeFlags f = 0, int b = -1) {
+		name  = n;
+		type  = t;
+		flags = f;
+		bits  = b;
+	}
+
+	//! \~english Returns if variable if bitfield
+	//! \~russian Возвращает битовым ли полем является переменная
 	bool isBitfield() const { return bits > 0; }
+
+	//! \~english Custom PIMETA content
+	//! \~russian Произвольное содержимое PIMETA
 	MetaMap meta;
-	PIString name;
-	PIString type;
+
+	//! \~english Name
+	//! \~russian Имя
+	PIConstChars name;
+
+	//! \~english Type
+	//! \~russian Тип
+	PIConstChars type;
+
+	//! \~english Modifiers
+	//! \~russian Модификаторы
 	PICodeInfo::TypeFlags flags;
+
+	//! \~english Bitfield variable bit count
+	//! \~russian Количество бит битового поля
 	int bits;
 };
 
+
+//! \~english Method information
+//! \~russian Информация о методе
 struct PIP_EXPORT FunctionInfo {
+	//! \~english Custom PIMETA content
+	//! \~russian Произвольное содержимое PIMETA
 	MetaMap meta;
-	PIString name;
+
+	//! \~english Name
+	//! \~russian Имя
+	PIConstChars name;
+
+	//! \~english Return type
+	//! \~russian Возвращаемые тип
 	TypeInfo return_type;
+
+	//! \~english Arguments types
+	//! \~russian Типы аргументов
 	PIVector<PICodeInfo::TypeInfo> arguments;
 };
 
+
+//! \~english Class or struct information
+//! \~russian Информация о классе или структуре
 struct PIP_EXPORT ClassInfo {
 	ClassInfo() { has_name = true; }
+
+	//! \~english Custom PIMETA content
+	//! \~russian Произвольное содержимое PIMETA
 	MetaMap meta;
+
+	//! \~english Has name or not
+	//! \~russian Имеет или нет имя
 	bool has_name;
-	PIString type;
-	PIString name;
-	PIStringList parents;
+
+	//! \~english Type
+	//! \~russian Тип
+	PIConstChars type;
+
+	//! \~english Name
+	//! \~russian Имя
+	PIConstChars name;
+
+	//! \~english Parent names
+	//! \~russian Имена родителей
+	PIVector<PIConstChars> parents;
+
+	//! \~english Variables
+	//! \~russian Переменные
 	PIVector<PICodeInfo::TypeInfo> variables;
+
+	//! \~english Methods
+	//! \~russian Методы
 	PIVector<PICodeInfo::FunctionInfo> functions;
+
+	//! \~english Subclass list
+	//! \~russian Список наследников
 	PIVector<PICodeInfo::ClassInfo *> children_info;
 };
 
+
+//! \~english Enumerator information
+//! \~russian Информация об элементе перечисления
 struct PIP_EXPORT EnumeratorInfo {
-	EnumeratorInfo(const PIString & n = PIString(), int v = 0) {name = n; value = v;}
+	EnumeratorInfo(const PIConstChars & n = PIConstChars(), int v = 0) {
+		name  = n;
+		value = v;
+	}
+	PIVariantTypes::Enumerator toPIVariantEnumerator() { return PIVariantTypes::Enumerator(value, name.toString()); }
+
+	//! \~english Custom PIMETA content
+	//! \~russian Произвольное содержимое PIMETA
 	MetaMap meta;
-	PIString name;
+
+	//! \~english Name
+	//! \~russian Имя
+	PIConstChars name;
+
+	//! \~english Value
+	//! \~russian Значение
 	int value;
 };
 
+
+//! \~english Enum information
+//! \~russian Информация о перечислении
 struct PIP_EXPORT EnumInfo {
+	//! \~english Returns member name with value "value"
+	//! \~russian Возвращает имя элемента со значением "value"
 	PIString memberName(int value) const;
+
+	//! \~english Returns member value with name "name"
+	//! \~russian Возвращает значение элемента с именем "name"
 	int memberValue(const PIString & name) const;
+
+	//! \~english Returns as PIVariantTypes::Enum
+	//! \~russian Возвращает как PIVariantTypes::Enum
+	PIVariantTypes::Enum toPIVariantEnum();
+
+	//! \~english Custom PIMETA content
+	//! \~russian Произвольное содержимое PIMETA
 	MetaMap meta;
-	PIString name;
+
+	//! \~english Name
+	//! \~russian Имя
+	PIConstChars name;
+
+	//! \~english Members
+	//! \~russian Элементы
 	PIVector<PICodeInfo::EnumeratorInfo> members;
 };
 
@@ -99,75 +216,90 @@ inline PICout operator <<(PICout s, const PICodeInfo::TypeInfo & v) {
 	if (v.flags[Static]) s << "static ";
 	if (v.flags[Const]) s << "const ";
 	s << v.type;
-	if (!v.name.isEmpty())
-		s << " " << v.name;
+	if (!v.name.isEmpty()) s << " " << v.name;
 	return s;
 }
 
-inline PICout operator <<(PICout s, const PICodeInfo::EnumeratorInfo & v) {s << v.name << " = " << v.value << " Meta" << v.meta; return s;}
+inline PICout operator<<(PICout s, const PICodeInfo::EnumeratorInfo & v) {
+	s << v.name << " = " << v.value << " Meta" << v.meta;
+	return s;
+}
 
 inline PICout operator<<(PICout s, const PICodeInfo::ClassInfo & v) {
-	s.setControl(0, true);
+	s.saveAndSetControls(0);
 	s << "class " << v.name;
 	if (!v.parents.isEmpty()) {
 		s << ": ";
 		bool first = true;
-		piForeachC (PIString & i, v.parents) {
-			if (first) first = false;
-			else s << ", ";
+		for (const auto & i: v.parents) {
+			if (first)
+				first = false;
+			else
+				s << ", ";
 			s << i;
 		}
 	}
 	s << " Meta" << v.meta << " {\n";
-	piForeachC (FunctionInfo & i, v.functions) {
+	for (const auto & i: v.functions) {
 		s << PICoutManipulators::Tab << i.return_type << " " << i.name << "(";
 		bool fa = true;
-		piForeachC (TypeInfo & a, i.arguments) {
-			if (fa) fa = false;
-			else s << ", ";
+		for (const auto & a: i.arguments) {
+			if (fa)
+				fa = false;
+			else
+				s << ", ";
 			s << a;
 		}
 		s << ") Meta" << i.meta << ";\n";
 	}
-	if (!v.functions.isEmpty() && !v.variables.isEmpty())
-		s << "\n";
-	piForeachC (TypeInfo & i, v.variables) {
+	if (!v.functions.isEmpty() && !v.variables.isEmpty()) s << "\n";
+	for (const auto & i: v.variables) {
 		s << PICoutManipulators::Tab << i << " Meta" << i.meta << ";\n";
 	}
 	s << "}\n";
-	s.restoreControl();
+	s.restoreControls();
 	return s;
 }
 
 inline PICout operator<<(PICout s, const PICodeInfo::EnumInfo & v) {
-	s.setControl(0, true);
+	s.saveAndSetControls(0);
 	s << "enum " << v.name << " Meta" << v.meta << " {\n";
-	piForeachC (EnumeratorInfo & i, v.members) {
+	for (const auto & i: v.members) {
 		bool f = true;
-		if (f) f = false;
-		else s << ", ";
+		if (f)
+			f = false;
+		else
+			s << ", ";
 		s << PICoutManipulators::Tab << i << "\n";
 	}
 	s << "}\n";
-	s.restoreControl();
+	s.restoreControls();
 	return s;
 }
 
-extern PIP_EXPORT PIMap<PIString, PICodeInfo::ClassInfo * > * classesInfo;
-extern PIP_EXPORT PIMap<PIString, PICodeInfo::EnumInfo * > * enumsInfo;
-extern PIP_EXPORT PIMap<PIString, PICodeInfo::AccessValueFunction> * accessValueFunctions;
-extern PIP_EXPORT PIMap<PIString, PICodeInfo::AccessTypeFunction> * accessTypeFunctions;
+
+//! \~english Pointer to single storage of PICodeInfo::ClassInfo, access by name
+//! \~russian Указатель на единое хренилище PICodeInfo::ClassInfo, доступ по имени
+extern PIP_EXPORT PIMap<PIConstChars, PICodeInfo::ClassInfo *> * classesInfo;
+
+//! \~english Pointer to single storage of PICodeInfo::EnumInfo, access by name
+//! \~russian Указатель на единое хренилище PICodeInfo::EnumInfo, доступ по имени
+extern PIP_EXPORT PIMap<PIConstChars, PICodeInfo::EnumInfo *> * enumsInfo;
+
+extern PIP_EXPORT PIMap<PIConstChars, PICodeInfo::AccessValueFunction> * accessValueFunctions;
+
+extern PIP_EXPORT PIMap<PIConstChars, PICodeInfo::AccessTypeFunction> * accessTypeFunctions;
 
 inline PIByteArray getMemberValue(const void * p, const char * class_name, const char * member_name) {
 	if (!p || !class_name || !member_name || !accessValueFunctions) return PIByteArray();
-	AccessValueFunction af = accessValueFunctions->value(PIStringAscii(class_name), (AccessValueFunction)0);
+	AccessValueFunction af = accessValueFunctions->value(class_name, (AccessValueFunction)0);
 	if (!af) return PIByteArray();
 	return af(p, member_name);
 }
 
 inline const char * getMemberType(const char * class_name, const char * member_name) {
 	if (!class_name || !member_name || !accessTypeFunctions) return "";
-	AccessTypeFunction af = accessTypeFunctions->value(PIStringAscii(class_name), (AccessTypeFunction)0);
+	AccessTypeFunction af = accessTypeFunctions->value(class_name, (AccessTypeFunction)0);
 	if (!af) return "";
 	return af(member_name);
 }
@@ -176,22 +308,24 @@ PIP_EXPORT PIVariant getMemberAsVariant(const void * p, const char * class_name,
 
 
 template<typename T, typename std::enable_if<std::is_assignable<T &, const T &>::value, int>::type = 0>
-void serialize(PIByteArray & ret, const T & v) {ret << v;}
+void serialize(PIByteArray & ret, const T & v) {
+	ret << v;
+}
 
 template<typename T, typename std::enable_if<!std::is_assignable<T &, const T &>::value, int>::type = 0>
 void serialize(PIByteArray & ret, const T & v) {}
 
-}
+} // namespace PICodeInfo
 
 class PIP_EXPORT __PICodeInfoInitializer__ {
 public:
 	__PICodeInfoInitializer__() {
 		if (_inited_) return;
 		_inited_                         = true;
-		PICodeInfo::classesInfo = new PIMap<PIString, PICodeInfo::ClassInfo * >;
-		PICodeInfo::enumsInfo = new PIMap<PIString, PICodeInfo::EnumInfo * >;
-		PICodeInfo::accessValueFunctions = new PIMap<PIString, PICodeInfo::AccessValueFunction>;
-		PICodeInfo::accessTypeFunctions = new PIMap<PIString, PICodeInfo::AccessTypeFunction>;
+		PICodeInfo::classesInfo          = new PIMap<PIConstChars, PICodeInfo::ClassInfo *>;
+		PICodeInfo::enumsInfo            = new PIMap<PIConstChars, PICodeInfo::EnumInfo *>;
+		PICodeInfo::accessValueFunctions = new PIMap<PIConstChars, PICodeInfo::AccessValueFunction>;
+		PICodeInfo::accessTypeFunctions  = new PIMap<PIConstChars, PICodeInfo::AccessTypeFunction>;
 	}
 	static bool _inited_;
 };

libs/main/code/picodemodule.h

@@ -16,6 +16,39 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+//! \defgroup Code Code
+//! \~\brief
+//! \~english C++ code parsing
+//! \~russian Разбор C++ кода
+//!
+//! \~\details
+//! \~english \section cmake_module_Code Building with CMake
+//! \~russian \section cmake_module_Code Сборка с использованием CMake
+//!
+//! \~\code
+//! find_package(PIP REQUIRED)
+//! target_link_libraries([target] PIP)
+//! \endcode
+//!
+//! \~english \par Common
+//! \~russian \par Общее
+//!
+//! \~english
+//! These files provides parsing C++ code and storage to use results of \a pip_cmg utility.
+//! See \ref code_model.
+//!
+//! \~russian
+//! Эти файлы обеспечивают разбор C++ кода и хранение результатов работы утилиты \a pip_cmg.
+//! Подробнее \ref code_model.
+//!
+//! \~\authors
+//! \~english
+//! Ivan Pelipenko peri4ko@yandex.ru;
+//! Andrey Bychkov work.a.b@yandex.ru;
+//! \~russian
+//! Иван Пелипенко peri4ko@yandex.ru;
+//! Андрей Бычков work.a.b@yandex.ru;
+//!
 
 #ifndef PICODEMODULE_H
 #define PICODEMODULE_H

libs/main/code/picodeparser.cpp

@@ -20,7 +20,6 @@
 #include "picodeparser.h"
 
 
-
 PIString PICodeParser::Macro::expand(PIString args_, bool * ok) const {
 	PIStringList arg_vals;
 	while (!args_.isEmpty()) {
@@ -32,17 +31,20 @@ PIString PICodeParser::Macro::expand(PIString args_, bool * ok) const {
 		PIString ca;
 		if (bi >= 0 && bi < ci) {
 			ca = args_.left(args_.takeLeft(bi).toInt());
-			ci -= ca.size_s(); bi -= ca.size_s();
+			ci -= ca.size_s();
+			bi -= ca.size_s();
 			ca += '(' + args_.takeRange('(', ')') + ')';
 		} else {
 			ca = args_.takeLeft(ci);
 		}
 		arg_vals << ca;
-		args_.trim(); args_.takeLeft(1); args_.trim();
+		args_.trim();
+		args_.takeLeft(1);
+		args_.trim();
 	}
 	if (args.size() != arg_vals.size()) {
-		piCout << ("Error: in expansion of macro \"" + name + '(' + args.join(", ") + ")\": expect")
-			   << args.size() << "arguments but takes" << arg_vals.size() << "!";
+		piCout << ("Error: in expansion of macro \"" + name + '(' + args.join(", ") + ")\": expect") << args.size() << "arguments but takes"
+			   << arg_vals.size() << "!";
 		if (ok != 0) *ok = false;
 		return PIString();
 	}
@@ -51,7 +53,7 @@ PIString PICodeParser::Macro::expand(PIString args_, bool * ok) const {
 		const PIString &an(args[i]), av(arg_vals[i]);
 		int ind(-1);
 		while ((ind = ret.find(an, ind + 1)) >= 0) {
-			PIChar ppc(0), pc(0), nc(0);
+			PIChar ppc, pc, nc;
 			if (ind > 1) ppc = ret[ind - 2];
 			if (ind > 0) pc = ret[ind - 1];
 			if (ind + an.size_s() < ret.size_s()) nc = ret.mid(ind + an.size_s(), 1)[0];
@@ -72,7 +74,6 @@ PIString PICodeParser::Macro::expand(PIString args_, bool * ok) const {
 }
 
 
-
 PICodeParser::PICodeParser() {
 	macros_iter   = 32;
 	with_includes = true;
@@ -140,8 +141,7 @@ void PICodeParser::parseFiles(const PIStringList & files, bool follow_includes)
 
 bool PICodeParser::isEnum(const PIString & name) {
 	piForeachC(Enum & e, enums)
-		if (e.name == name)
-			return true;
+		if (e.name == name) return true;
 	return false;
 }
 
@@ -174,7 +174,8 @@ bool PICodeParser::parseFileInternal(const PIString & file, bool follow_includes
 
 
 void PICodeParser::clear() {
-	piForeach (Entity * i, entities) delete i;
+	piForeach(Entity * i, entities)
+		delete i;
 	defines.clear();
 	macros.clear();
 	enums.clear();
@@ -190,10 +191,144 @@ void PICodeParser::clear() {
 	piForeachC(PIString & d, defs)
 		defines << Define(d, "");
 	defines << Define(PIStringAscii("PICODE"), "") << custom_defines;
+	macros << Macro(PIStringAscii("PIOBJECT"), "", PIStringList() << "name")
+		   << Macro(PIStringAscii("PIOBJECT_PARENT"), "", PIStringList() << "parent")
+		   << Macro(PIStringAscii("PIOBJECT_SUBCLASS"),
+	                "",
+	                PIStringList() << "name"
+	                               << "parent")
+		   << Macro(PIStringAscii("PIIODEVICE"), "", PIStringList() << "name")
+		   << Macro(PIStringAscii("NO_COPY_CLASS"), "", PIStringList() << "name") << Macro(PIStringAscii("PRIVATE_DECLARATION"))
+
+		   << Macro(PIStringAscii("EVENT"), "void name();", PIStringList() << "name")
+		   << Macro(PIStringAscii("EVENT0"), "void name();", PIStringList() << "name")
+		   << Macro(PIStringAscii("EVENT1"),
+	                "void name(a0 n0);",
+	                PIStringList() << "name"
+	                               << "a0"
+	                               << "n0")
+		   << Macro(PIStringAscii("EVENT2"),
+	                "void name(a0 n0, a1 n1);",
+	                PIStringList() << "name"
+	                               << "a0"
+	                               << "n0"
+	                               << "a1"
+	                               << "n1")
+		   << Macro(PIStringAscii("EVENT3"),
+	                "void name(a0 n0, a1 n1, a2 n2);",
+	                PIStringList() << "name"
+	                               << "a0"
+	                               << "n0"
+	                               << "a1"
+	                               << "n1"
+	                               << "a2"
+	                               << "n2")
+		   << Macro(PIStringAscii("EVENT4"),
+	                "void name(a0 n0, a1 n1, a2 n2, a3 n3);",
+	                PIStringList() << "name"
+	                               << "a0"
+	                               << "n0"
+	                               << "a1"
+	                               << "n1"
+	                               << "a2"
+	                               << "n2"
+	                               << "a3"
+	                               << "n3")
+
+		   << Macro(PIStringAscii("EVENT_HANDLER"),
+	                "ret name()",
+	                PIStringList() << "ret"
+	                               << "name")
+		   << Macro(PIStringAscii("EVENT_HANDLER0"),
+	                "ret name()",
+	                PIStringList() << "ret"
+	                               << "name")
+		   << Macro(PIStringAscii("EVENT_HANDLER1"),
+	                "ret name(a0 n0)",
+	                PIStringList() << "ret"
+	                               << "name"
+	                               << "a0"
+	                               << "n0")
+		   << Macro(PIStringAscii("EVENT_HANDLER2"),
+	                "ret name(a0 n0, a1 n1)",
+	                PIStringList() << "ret"
+	                               << "name"
+	                               << "a0"
+	                               << "n0"
+	                               << "a1"
+	                               << "n1")
+		   << Macro(PIStringAscii("EVENT_HANDLER3"),
+	                "ret name(a0 n0, a1 n1, a2 n2)",
+	                PIStringList() << "ret"
+	                               << "name"
+	                               << "a0"
+	                               << "n0"
+	                               << "a1"
+	                               << "n1"
+	                               << "a2"
+	                               << "n2")
+		   << Macro(PIStringAscii("EVENT_HANDLER4"),
+	                "ret name(a0 n0, a1 n1, a2 n2, a3 n3)",
+	                PIStringList() << "ret"
+	                               << "name"
+	                               << "a0"
+	                               << "n0"
+	                               << "a1"
+	                               << "n1"
+	                               << "a2"
+	                               << "n2"
+	                               << "a3"
+	                               << "n3")
+
+		   << Macro(PIStringAscii("EVENT_VHANDLER"),
+	                "virtual ret name()",
+	                PIStringList() << "ret"
+	                               << "name")
+		   << Macro(PIStringAscii("EVENT_VHANDLER0"),
+	                "virtual ret name()",
+	                PIStringList() << "ret"
+	                               << "name")
+		   << Macro(PIStringAscii("EVENT_VHANDLER1"),
+	                "virtual ret name(a0 n0)",
+	                PIStringList() << "ret"
+	                               << "name"
+	                               << "a0"
+	                               << "n0")
+		   << Macro(PIStringAscii("EVENT_VHANDLER2"),
+	                "virtual ret name(a0 n0, a1 n1)",
+	                PIStringList() << "ret"
+	                               << "name"
+	                               << "a0"
+	                               << "n0"
+	                               << "a1"
+	                               << "n1")
+		   << Macro(PIStringAscii("EVENT_VHANDLER3"),
+	                "virtual ret name(a0 n0, a1 n1, a2 n2)",
+	                PIStringList() << "ret"
+	                               << "name"
+	                               << "a0"
+	                               << "n0"
+	                               << "a1"
+	                               << "n1"
+	                               << "a2"
+	                               << "n2")
+		   << Macro(PIStringAscii("EVENT_VHANDLER4"),
+	                "virtual ret name(a0 n0, a1 n1, a2 n2, a3 n3)",
+	                PIStringList() << "ret"
+	                               << "name"
+	                               << "a0"
+	                               << "n0"
+	                               << "a1"
+	                               << "n1"
+	                               << "a2"
+	                               << "n2"
+	                               << "a3"
+								   << "n3");
 }
 
 
 bool PICodeParser::parseFileContent(PIString & fc, bool main) {
+	static const PIString s_ns        = PIStringAscii("::");
 	static const PIString s_bo        = PIStringAscii("{\n");
 	static const PIString s_bc        = PIStringAscii("\n}\n");
 	static const PIString s_class     = PIStringAscii("class");
@@ -218,7 +353,8 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 		if (i > 0) pc = c;
 		c = fc[i].toAscii();
 		if (c == '"' && !mlc && pc != '\'') {
-			if (i > 0) if (fc[i - 1] == '\\') continue;
+			if (i > 0)
+				if (fc[i - 1] == '\\') continue;
 			cc = !cc;
 			continue;
 		}
@@ -229,9 +365,24 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 				continue;
 			}
 		if (cc) continue;
-		if (fc.mid(i, 2) == "/*") {mlc = true; mls = i; ++i; continue;}
-		if (fc.mid(i, 2) == "*/" && mlc) {mlc = false; fc.cutMid(mls, i - mls + 2); i = mls - 1; continue;}
-		if (fc.mid(i, 2) == "//" && !mlc) {ole = fc.find('\n', i); fc.cutMid(i, ole < 0 ? -1 : ole - i); --i; continue;}
+		if (fc.mid(i, 2) == "/*") {
+			mlc = true;
+			mls = i;
+			++i;
+			continue;
+		}
+		if (fc.mid(i, 2) == "*/" && mlc) {
+			mlc = false;
+			fc.cutMid(mls, i - mls + 2);
+			i = mls - 1;
+			continue;
+		}
+		if (fc.mid(i, 2) == "//" && !mlc) {
+			ole = fc.find('\n', i);
+			fc.cutMid(i, ole < 0 ? -1 : ole - i);
+			--i;
+			continue;
+		}
 	}
 	pfc = procMacros(fc);
 
@@ -250,7 +401,7 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 		piForeachC(Define & d, defines) {
 			int ind(-1);
 			while ((ind = pfc.find(d.first, ind + 1)) >= 0) {
-				PIChar pc(0), nc(0);
+				PIChar pc, nc;
 				if (ind > 0) pc = pfc[ind - 1];
 				if (ind + d.first.size_s() < pfc.size_s()) nc = pfc.mid(ind + d.first.size_s(), 1)[0];
 				if (_isCChar(pc) || _isCChar(nc) || nc.isDigit()) continue;
@@ -262,11 +413,12 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 		piForeachC(Macro & m, macros) {
 			int ind(-1);
 			while ((ind = pfc.find(m.name, ind + 1)) >= 0) {
-				PIChar pc(0), nc(0);
+				PIChar pc, nc;
 				if (ind > 0) pc = pfc[ind - 1];
 				if (ind + m.name.size_s() < pfc.size_s()) nc = pfc.mid(ind + m.name.size_s(), 1)[0];
 				if (_isCChar(pc) || _isCChar(nc) || nc.isDigit()) continue;
-				PIString ret, range; bool ok(false);
+				PIString ret, range;
+				bool ok(false);
 				range = pfc.mid(ind + m.name.size_s()).takeRange('(', ')');
 				ret   = m.expand(range, &ok);
 				if (!ok) return false;
@@ -280,15 +432,22 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 
 	replaceMeta(pfc);
 
-	//piCout << NewLine << "file" << cur_file << pfc;
+	// piCout << PICoutManipulators::NewLine << "file" << cur_file << pfc;
 	int pl      = -1;
+	cur_def_vis = Global;
 	while (!pfc.isEmpty()) {
 		pfc.trim();
 		int nl = pfc.size_s();
 		if (pl == nl) break;
 		pl = nl;
 		if (pfc.left(9) == s_namespace) {
-			pfc.cutLeft(pfc.find('{') + 1);
+			pfc.cutLeft(9);
+			PIString prev_namespace = cur_namespace, ccmn;
+			cur_namespace += pfc.takeCWord() + s_ns;
+			ccmn = pfc.takeRange('{', '}');
+			// piCout << "namespace" << cur_namespace;
+			parseClass(0, ccmn, true);
+			cur_namespace = prev_namespace;
 			continue;
 		}
 		if (pfc.left(8) == s_template) {
@@ -296,17 +455,28 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 			pfc.takeRange('<', '>');
 			bool def = !isDeclaration(pfc, 0, &end);
 			pfc.cutLeft(end);
-			if (def) pfc.takeRange('{', '}');
-			else pfc.takeSymbol();
+			if (def)
+				pfc.takeRange('{', '}');
+			else
+				pfc.takeSymbol();
 			continue;
 		}
 		if (pfc.left(5) == s_class || pfc.left(6) == s_struct || pfc.left(5) == s_union) {
 			int dind = pfc.find('{', 0), find = pfc.find(';', 0);
-			if (dind < 0 && find < 0) {pfc.cutLeft(6); continue;}
-			if (dind < 0 || find < dind) {pfc.cutLeft(6); continue;}
+			// piCout << pfc.left(6) << dind << find;
+			if (dind < 0 && find < 0) {
+				pfc.cutLeft(6);
+				continue;
+			}
+			if (dind < 0 || find < dind) {
+				// piCout << "skip FC" << (find + 1) << pfc.left(find + 1);
+				pfc.cutLeft(find + 1);
+				// pfc.cutLeft(6);
+				continue;
+			}
 			ccmn = pfc.left(dind) + s_bo + pfc.mid(dind).takeRange('{', '}') + s_bc;
 			pfc.remove(0, ccmn.size());
-			parseClass(0, ccmn);
+			parseClass(0, ccmn, false);
 			continue;
 		}
 		if (pfc.left(4) == s_enum) {
@@ -314,6 +484,12 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 			tmp = pfc.takeCWord();
 			pfc.trim();
 			MetaMap meta = maybeMeta(pfc);
+			if (tmp == s_class || tmp == s_struct) {
+				tmp = pfc.takeCWord();
+				pfc.trim();
+				MetaMap smeta = maybeMeta(pfc);
+				meta << smeta;
+			}
 			parseEnum(0, cur_namespace + tmp, pfc.takeRange('{', '}'), meta);
 			pfc.takeSymbol();
 			continue;
@@ -321,8 +497,10 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 		if (pfc.left(7) == s_typedef) {
 			pfc.cutLeft(7);
 			typedefs << parseTypedef(pfc.takeLeft(pfc.find(';')));
-			if (typedefs.back().first.isEmpty()) typedefs.pop_back();
-			else root_.typedefs << typedefs.back();
+			if (typedefs.back().first.isEmpty())
+				typedefs.pop_back();
+			else
+				root_.typedefs << typedefs.back();
 			pfc.takeSymbol();
 			continue;
 		}
@@ -364,34 +542,40 @@ PICodeParser::Entity * PICodeParser::parseClassDeclaration(const PIString & fc)
 		cd.cutRight(1);
 		Entity * pe = 0;
 		piForeachC(PIString & p, pl) {
-			if (p.contains(' ')) pn = p.mid(p.find(' ') + 1);
-			else pn = p;
+			if (p.contains(' '))
+				pn = p.mid(p.find(' ') + 1);
+			else
+				pn = p;
 			pe = findEntityByName(pn);
-			if (pe == 0) ;//{piCout << "Error: can`t find" << pn;}
-			else parents << pe;
+			if (pe == 0)
+				; //{piCout << "Error: can`t find" << pn;}
+			else
+				parents << pe;
 		}
 	}
 	PIString typename_ = cd.left(6).trim();
 	bool is_class      = typename_ == s_class;
+	Visibility vis     = cur_def_vis;
 	cur_def_vis        = (is_class ? Private : Public);
 	PIString cn        = cd.mid(6).trim();
 	bool has_name      = !cn.isEmpty();
 	if (cn.isEmpty()) cn = PIStringAscii("<unnamed_") + PIString::fromNumber(anon_num++) + '>';
 	// piCout << "found " << typename_ << cn;
-	if (cn.isEmpty()) return 0;
+	if (cn.isEmpty()) return nullptr;
 	Entity * e    = new Entity();
 	e->meta       = meta;
 	e->name       = cur_namespace + cn;
 	e->type       = typename_;
 	e->has_name   = has_name;
 	e->parents    = parents;
+	e->visibility = vis;
 	e->file       = cur_file;
 	entities << e;
 	return e;
 }
 
 
-PIString PICodeParser::parseClass(Entity * parent, PIString & fc) {
+void PICodeParser::parseClass(Entity * parent, PIString & fc, bool is_namespace) {
 	static const PIString s_ns        = PIStringAscii("::");
 	static const PIString s_public    = PIStringAscii("public");
 	static const PIString s_protected = PIStringAscii("protected");
@@ -402,31 +586,56 @@ PIString PICodeParser::parseClass(Entity * parent, PIString & fc) {
 	static const PIString s_enum      = PIStringAscii("enum");
 	static const PIString s_friend    = PIStringAscii("friend");
 	static const PIString s_typedef   = PIStringAscii("typedef");
+	static const PIString s_namespace = PIStringAscii("namespace");
 	static const PIString s_template  = PIStringAscii("template");
 	Visibility prev_vis               = cur_def_vis;
 	int dind = fc.find('{'), find = fc.find(';'), end = 0;
-	if (dind < 0 && find < 0) return PIString();
-	if (dind < 0 || find < dind) return fc.left(find);
-	//piCout << "parse class <****\n" << fc.left(20) << "\n****>";
-	Entity * ce = parseClassDeclaration(fc.takeLeft(dind));
+	if (dind < 0 && find < 0) return;
+	// piCout << "parse class <****\n" << fc << "\n****>";
+	Entity * ce = parent;
+	if (!is_namespace) {
+		ce = parseClassDeclaration(fc.takeLeft(dind));
 		fc.trim().cutLeft(1).cutRight(1).trim();
+	}
 	// piCout << "found class <****\n" << fc << "\n****>";
-	if (!ce) return PIString();
+	if (ce) {
 		if (parent) parent->children << ce;
 		ce->parent_scope = parent;
+	}
 	int ps                  = -1;
 	bool def                = false;
 	PIString prev_namespace = cur_namespace, stmp;
-	cur_namespace = ce->name + s_ns;
+	if (ce) cur_namespace += ce->name + s_ns;
 	// piCout << "parse class" << ce->name << "namespace" << cur_namespace;
 	// piCout << "\nparse class" << ce->name << "namespace" << cur_namespace;
 	while (!fc.isEmpty()) {
 		PIString cw = fc.takeCWord(), tmp;
 		// piCout << "\ntaked word" << cw;
-		if (cw == s_public   ) {cur_def_vis = Public;    fc.cutLeft(1); continue;}
-		if (cw == s_protected) {cur_def_vis = Protected; fc.cutLeft(1); continue;}
-		if (cw == s_private  ) {cur_def_vis = Private;   fc.cutLeft(1); continue;}
+		if (cw == s_public) {
+			cur_def_vis = Public;
+			fc.cutLeft(1);
+			continue;
+		}
+		if (cw == s_protected) {
+			cur_def_vis = Protected;
+			fc.cutLeft(1);
+			continue;
+		}
+		if (cw == s_private) {
+			cur_def_vis = Private;
+			fc.cutLeft(1);
+			continue;
+		}
+		if (cw == s_namespace) {
+			PIString prev_namespace = cur_namespace, ccmn;
+			cur_namespace += fc.takeCWord() + s_ns;
+			ccmn = fc.takeRange('{', '}');
+			parseClass(ce, ccmn, true);
+			cur_namespace = prev_namespace;
+			continue;
+		}
 		if (cw == s_class || cw == s_struct || cw == s_union) {
+			// piCout << cw << isDeclaration(fc, 0, &end);
 			if (isDeclaration(fc, 0, &end)) {
 				fc.cutLeft(end);
 				fc.takeSymbol();
@@ -436,24 +645,34 @@ PIString PICodeParser::parseClass(Entity * parent, PIString & fc) {
 			stmp = fc.takeRange('{', '}');
 			fc.takeSymbol();
 			stmp = cw + ' ' + tmp + '{' + stmp + '}';
-			parseClass(ce, stmp);
+			parseClass(ce, stmp, false);
 			continue;
 		}
 		if (cw == s_enum) {
 			tmp = fc.takeCWord();
 			fc.trim();
 			MetaMap meta = maybeMeta(fc);
+			if (tmp == s_class || tmp == s_struct) {
+				tmp = fc.takeCWord();
+				fc.trim();
+				MetaMap smeta = maybeMeta(fc);
+				meta << smeta;
+			}
 			parseEnum(ce, cur_namespace + tmp, fc.takeRange('{', '}'), meta);
 			fc.takeSymbol();
 			continue;
 		}
-		if (cw == s_friend) {fc.cutLeft(fc.find(';') + 1); continue;}
+		if (cw == s_friend) {
+			fc.cutLeft(fc.find(';') + 1);
+			continue;
+		}
 		if (cw == s_typedef) {
+			if (ce) {
 				ce->typedefs << parseTypedef(fc.takeLeft(fc.find(';')));
 				typedefs << ce->typedefs.back();
 				typedefs.back().first.insert(0, cur_namespace);
-			if (ce->typedefs.back().first.isEmpty())
-				ce->typedefs.pop_back();
+				if (ce->typedefs.back().first.isEmpty()) ce->typedefs.pop_back();
+			}
 			fc.takeSymbol();
 			continue;
 		}
@@ -461,22 +680,26 @@ PIString PICodeParser::parseClass(Entity * parent, PIString & fc) {
 			fc.takeRange('<', '>');
 			def = !isDeclaration(fc, 0, &end);
 			fc.cutLeft(end);
-			if (def) fc.takeRange('{', '}');
-			else fc.takeSymbol();
+			if (def)
+				fc.takeRange('{', '}');
+			else
+				fc.takeSymbol();
 			continue;
 		}
 		def = !isDeclaration(fc, 0, &end);
 		tmp = (cw + fc.takeLeft(end)).trim();
-		if (!tmp.isEmpty())
-			parseMember(ce, tmp);
-		if (def) fc.takeRange('{', '}');
-		else fc.takeSymbol();
-		if (ps == fc.size_s()) {fc.cutLeft(1);}
+		if (!tmp.isEmpty() && ce) parseMember(ce, tmp);
+		if (def)
+			fc.takeRange('{', '}');
+		else
+			fc.takeSymbol();
+		if (ps == fc.size_s()) {
+			fc.cutLeft(1);
+		}
 		ps = fc.size_s();
 	}
 	cur_def_vis   = prev_vis;
 	cur_namespace = prev_namespace;
-	return ce->name;
 }
 
 
@@ -516,14 +739,17 @@ bool PICodeParser::parseEnum(Entity * parent, const PIString & name, PIString fc
 			meta = tmp_meta.value(v.takeMid(mi, 5));
 			v.replaceAll(s_ss, ' ');
 		}
-		vn = v; ind = v.find('=');
-		if (ind > 0) {cv = v.right(v.size_s() - ind - 1).toInt(); vn = v.left(ind);}
+		vn  = v;
+		ind = v.find('=');
+		if (ind > 0) {
+			cv = v.right(v.size_s() - ind - 1).toInt();
+			vn = v.left(ind);
+		}
 		if (ind < 0) ++cv;
 		e.members << EnumeratorInfo(vn.trim(), cv, meta);
 	}
 	if (!e.members.isEmpty())
-		if (e.members.back().name.isEmpty())
-			e.members.pop_back();
+		if (e.members.back().name.isEmpty()) e.members.pop_back();
 	enums << e;
 	return true;
 }
@@ -537,7 +763,10 @@ PICodeParser::Typedef PICodeParser::parseTypedef(PIString fc) {
 	if (fc.contains('(')) {
 		int start = fc.find('('), end = fc.find(')');
 		td.first = fc.takeMid(start + 1, end - start - 1).trim();
-		if (td.first.left(1) == PIChar('*')) {td.first.cutLeft(1).trim(); fc.insert(start + 1, '*');}
+		if (td.first.left(1) == PIChar('*')) {
+			td.first.cutLeft(1).trim();
+			fc.insert(start + 1, '*');
+		}
 		td.second = fc.trim();
 	} else {
 		td.first  = fc.takeMid(fc.findLast(' ')).trim();
@@ -584,7 +813,11 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
 	PIString ctemp, crepl;
 	while (ts >= 0) {
 		ctemp = fc.mid(ts).takeRange('<', '>');
-		if (ctemp.isEmpty()) {te = ts + 1; ts = fc.find('<', te); continue;}
+		if (ctemp.isEmpty()) {
+			te = ts + 1;
+			ts = fc.find('<', te);
+			continue;
+		}
 		crepl = s_T + PIString::fromNumber(tmp_temp.size_s()).expandLeftTo(3, '0');
 		fc.replace(ts, ctemp.size_s() + 2, crepl);
 		tmp_temp[crepl] = '<' + ctemp + '>';
@@ -630,8 +863,7 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
 		int i = 0;
 		// piCout << me.arguments_full;
 		piForeach(PIString & a, me.arguments_full)
-				if ((i = a.find('=')) > 0)
-				a.cutRight(a.size_s() - i).trim();
+			if ((i = a.find('=')) > 0) a.cutRight(a.size_s() - i).trim();
 		for (int j = 0; j < me.arguments_full.size_s(); ++j)
 			if (me.arguments_full[j] == s_void) {
 				me.arguments_full.remove(j);
@@ -640,8 +872,7 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
 		me.arguments_type = me.arguments_full;
 		piForeach(PIString & a, me.arguments_type) {
 			crepl.clear();
-			if (a.contains('['))
-				crepl = a.takeMid(a.find('['), a.findLast(']') - a.find('[') + 1);
+			if (a.contains('[')) crepl = a.takeMid(a.find('['), a.findLast(']') - a.find('[') + 1);
 			for (ts = a.size_s() - 1; ts >= 0; --ts)
 				if (!_isCChar(a[ts]) && !(a[ts].isDigit())) break;
 			a.cutRight(a.size_s() - ts - 1);
@@ -671,8 +902,11 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
 			ctemp.trim();
 		}
 		for (ts = ctemp.size_s() - 1; ts > 0; --ts) {
-			if (vn) {if (!_isCChar(ctemp[ts]) && !ctemp[ts].isDigit() && ctemp[ts] != '[' && ctemp[ts] != ']') vn = false;}
-			else {if (_isCChar(ctemp[ts]) || ctemp[ts].isDigit()) break;}
+			if (vn) {
+				if (!_isCChar(ctemp[ts]) && !ctemp[ts].isDigit() && ctemp[ts] != '[' && ctemp[ts] != ']') vn = false;
+			} else {
+				if (_isCChar(ctemp[ts]) || ctemp[ts].isDigit()) break;
+			}
 		}
 		me.type       = ctemp.takeLeft(ts + 1);
 		me.visibility = cur_def_vis;
@@ -710,13 +944,13 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
 			me.type = type;
 			restoreTmpMeta(&me);
 			if (me.name.isEmpty()) continue;
-			if (me.name.contains('['))
-				crepl = me.name.takeMid(me.name.find('['), me.name.findLast(']') - me.name.find('[') + 1);
+			if (me.name.contains('[')) crepl = me.name.takeMid(me.name.find('['), me.name.findLast(']') - me.name.find('[') + 1);
 			while (!me.name.isEmpty()) {
 				if (me.name.front() == PIChar('*') || me.name.front() == PIChar('&')) {
 					me.type += me.name.takeLeft(1);
 					me.name.trim();
-				} else break;
+				} else
+					break;
 			}
 			me.is_type_ptr = (me.type.right(1) == PIChar(']') || me.type.right(1) == PIChar('*'));
 			me.type += crepl;
@@ -763,10 +997,22 @@ void PICodeParser::normalizeEntityNamespace(PIString & n) {
 			break;
 		}
 	n.push_front(' ');
-	if (n.find(s_s_const_s) >= 0) {n.replaceAll(s_s_const_s, ""); pref += s_const_s;}
-	if (n.find(s_s_static_s) >= 0) {n.replaceAll(s_s_static_s, ""); pref += s_static_s;}
-	if (n.find(s_s_mutable_s) >= 0) {n.replaceAll(s_s_mutable_s, ""); pref += s_mutable_s;}
-	if (n.find(s_s_volatile_s) >= 0) {n.replaceAll(s_s_volatile_s, ""); pref += s_volatile_s;}
+	if (n.find(s_s_const_s) >= 0) {
+		n.replaceAll(s_s_const_s, "");
+		pref += s_const_s;
+	}
+	if (n.find(s_s_static_s) >= 0) {
+		n.replaceAll(s_s_static_s, "");
+		pref += s_static_s;
+	}
+	if (n.find(s_s_mutable_s) >= 0) {
+		n.replaceAll(s_s_mutable_s, "");
+		pref += s_mutable_s;
+	}
+	if (n.find(s_s_volatile_s) >= 0) {
+		n.replaceAll(s_s_volatile_s, "");
+		pref += s_volatile_s;
+	}
 	n.trim();
 	int f = 0;
 	piForeachC(Entity * e, entities) {
@@ -866,10 +1112,25 @@ double PICodeParser::procMacrosCond(PIString fc) {
 	while (!fc.isEmpty()) {
 		cc = fc[0].toAscii();
 		nc = (fc.size() > 1 ? fc[1].toAscii() : 0);
-		if (cc == '!') {neg = true; fc.pop_front(); continue;}
-		if (cc == '(') {br = true; brv = procMacrosCond(fc.takeRange('(', ')'));}
-		if (cc == '&' && nc == '&') {fc.remove(0, 2); oper = 1; continue;}
-		if (cc == '|' && nc == '|') {fc.remove(0, 2); oper = 2; continue;}
+		if (cc == '!') {
+			neg = true;
+			fc.pop_front();
+			continue;
+		}
+		if (cc == '(') {
+			br  = true;
+			brv = procMacrosCond(fc.takeRange('(', ')'));
+		}
+		if (cc == '&' && nc == '&') {
+			fc.remove(0, 2);
+			oper = 1;
+			continue;
+		}
+		if (cc == '|' && nc == '|') {
+			fc.remove(0, 2);
+			oper = 2;
+			continue;
+		}
 		if (!br) {
 			ce = fc.takeCWord();
 			if (ce.isEmpty()) ce = fc.takeNumber();
@@ -897,8 +1158,7 @@ double PICodeParser::procMacrosCond(PIString fc) {
 
 bool PICodeParser::isDefineExists(const PIString & dn) {
 	piForeachC(Define & d, defines) {
-		if (d.first == dn)
-			return true;
+		if (d.first == dn) return true;
 	}
 	return false;
 }
@@ -906,8 +1166,7 @@ bool PICodeParser::isDefineExists(const PIString & dn) {
 
 double PICodeParser::defineValue(const PIString & dn) {
 	piForeachC(Define & d, defines) {
-		if (d.first == dn)
-			return d.second.isEmpty() ? 1. : d.second.toDouble();
+		if (d.first == dn) return d.second.isEmpty() ? 1. : d.second.toDouble();
 	}
 	return dn.toDouble();
 }
@@ -935,8 +1194,7 @@ void PICodeParser::replaceMeta(PIString & dn) {
 
 PICodeParser::Entity * PICodeParser::findEntityByName(const PIString & en) {
 	piForeach(Entity * e, entities)
-			if (e->name == en)
-			return e;
+		if (e->name == en) return e;
 	return 0;
 }
 
@@ -944,8 +1202,14 @@ PICodeParser::Entity * PICodeParser::findEntityByName(const PIString & en) {
 bool PICodeParser::isDeclaration(const PIString & fc, int start, int * end) {
 	int dind = fc.find('{', start), find = fc.find(';', start);
 	// piCout << "isDeclaration" << dind << find << fc.left(10);
-	if (dind < 0 && find < 0) {if (end) *end = -1; return true;}
-	if (dind < 0 || find < dind) {if (end) *end = find; return true;}
+	if (dind < 0 && find < 0) {
+		if (end) *end = -1;
+		return true;
+	}
+	if (dind < 0 || find < dind) {
+		if (end) *end = find;
+		return true;
+	}
 	if (end) *end = dind;
 	return false;
 }
@@ -995,10 +1259,11 @@ PIString PICodeParser::procMacros(PIString fc) {
 			if (skip || grab) {
 				if (mif.left(2) == s_if) ifcnt++;
 				if (mif.left(5) == s_endif) {
-					if (ifcnt > 0) ifcnt--;
+					if (ifcnt > 0)
+						ifcnt--;
 					else {
 						// piCout << "main endif" << skip << grab;
-						if (grab) pfc << procMacros(nfc);
+						if (grab) pfc += procMacros(nfc);
 						skip = grab = false;
 						continue;
 					}
@@ -1007,8 +1272,9 @@ PIString PICodeParser::procMacros(PIString fc) {
 					// piCout << "main elif" << skip << grab << cond_ok;
 					if (cond_ok) {
 						if (grab) {
-							pfc << procMacros(nfc);
-							skip = true; grab = false;
+							pfc += procMacros(nfc);
+							skip = true;
+							grab = false;
 						}
 						continue;
 					}
@@ -1016,26 +1282,34 @@ PIString PICodeParser::procMacros(PIString fc) {
 						// piCout << "check elif" << skip << grab << cond_ok;
 						if (!macroCondition(mif, mifcond.trimmed())) continue;
 						// piCout << "check elif ok";
-						skip = false; grab = cond_ok = true;
+						skip = false;
+						grab = cond_ok = true;
 						continue;
 					}
 					continue;
 				}
 				if (mif.left(4) == s_else && ifcnt == 0) {
 					// piCout << "main else" << skip << grab;
-					if (grab) pfc << procMacros(nfc);
-					if (skip && !cond_ok) {skip = false; grab = true;}
-					else {skip = true; grab = false;}
+					if (grab) pfc += procMacros(nfc);
+					if (skip && !cond_ok) {
+						skip = false;
+						grab = true;
+					} else {
+						skip = true;
+						grab = false;
+					}
 					continue;
 				}
-				if (grab) nfc << line << '\n';
+				if (grab) nfc += line + '\n';
 				continue;
 			}
 			if (mif.left(2) == s_if) {
 				// piCout << "main if";
 				skip = grab = cond_ok = false;
-				if (macroCondition(mif, mifcond.trimmed())) grab = cond_ok = true;
-				else skip = true;
+				if (macroCondition(mif, mifcond.trimmed()))
+					grab = cond_ok = true;
+				else
+					skip = true;
 				ifcnt = 0;
 				nfc.clear();
 			} else {
@@ -1043,8 +1317,10 @@ PIString PICodeParser::procMacros(PIString fc) {
 				// return false; /// WARNING: now skip errors
 			}
 		} else {
-			if (grab) nfc << line << '\n';
-			else if (!skip) pfc << line << '\n';
+			if (grab)
+				nfc += line + '\n';
+			else if (!skip)
+				pfc += line + '\n';
 		}
 	}
 	return pfc;
@@ -1074,9 +1350,19 @@ bool PICodeParser::parseDirective(PIString d) {
 		if (mname == s_PIMETA) return true;
 		if (d.left(1) == PIChar('(')) { // macro
 			PIStringList args = d.takeRange('(', ')').split(',').trim();
+			for (int i = 0; i < macros.size_s(); ++i)
+				if (macros[i].name == mname) {
+					macros.remove(i);
+					break;
+				}
 			macros << Macro(mname, d.trim(), args);
 		} else { // define
 			d.trim();
+			for (int i = 0; i < defines.size_s(); ++i)
+				if (defines[i].first == mname) {
+					defines.remove(i);
+					break;
+				}
 			defines << Define(mname, d);
 			evaluator.setVariable(mname, complexd_1);
 		}
@@ -1085,7 +1371,10 @@ bool PICodeParser::parseDirective(PIString d) {
 	if (dname == s_undef) {
 		PIString mname = d.takeCWord();
 		for (int i = 0; i < defines.size_s(); ++i)
-			if (defines[i].first == mname) {defines.remove(i); --i;}
+			if (defines[i].first == mname) {
+				defines.remove(i);
+				--i;
+			}
 		return true;
 	}
 	return true;

libs/main/code/picodeparser.h

@@ -1,5 +1,8 @@
-/*! @file picodeparser.h
- * @brief C++ code parser
+/*! \file picodeparser.h
+ * \ingroup Code
+ * \~\brief
+ * \~english C++ code parser
+ * \~russian Разбор C++ кода
  */
 /*
     PIP - Platform Independent Primitives
@@ -23,17 +26,27 @@
 #ifndef PICODEPARSER_H
 #define PICODEPARSER_H
 
-#include "pifile.h"
 #include "pievaluator.h"
+#include "pifile.h"
 
-inline bool _isCChar(const PIChar & c) {return (c.isAlpha() || (c.toAscii() == '_'));}
-inline bool _isCChar(const PIString & c) {if (c.isEmpty()) return false; return _isCChar(c[0]);}
+inline bool _isCChar(const PIChar & c) {
+	return (c.isAlpha() || (c.toAscii() == '_'));
+}
+inline bool _isCChar(const PIString & c) {
+	if (c.isEmpty()) return false;
+	return _isCChar(c[0]);
+}
 
 class PIP_EXPORT PICodeParser {
 public:
 	PICodeParser();
 
-	enum Visibility {Global, Public, Protected, Private};
+	enum Visibility {
+		Global,
+		Public,
+		Protected,
+		Private
+	};
 	enum Attribute {
 		NoAttributes = 0x0,
 		Const        = 0x01,
@@ -107,16 +120,18 @@ public:
 	};
 
 	struct PIP_EXPORT EnumeratorInfo {
-		EnumeratorInfo(const PIString & n = PIString(), int v = 0, const MetaMap & m = MetaMap()) {name = n; value = v; meta = m;}
+		EnumeratorInfo(const PIString & n = PIString(), int v = 0, const MetaMap & m = MetaMap()) {
+			name  = n;
+			value = v;
+			meta  = m;
+		}
 		MetaMap meta;
 		PIString name;
 		int value;
 	};
 
 	struct PIP_EXPORT Enum {
-		Enum(const PIString & n = PIString()) {
-			name = n;
-		}
+		Enum(const PIString & n = PIString()) { name = n; }
 		MetaMap meta;
 		PIString name;
 		PIVector<EnumeratorInfo> members;
@@ -148,7 +163,7 @@ private:
 	bool parseFileContent(PIString & fc, bool main);
 	bool parseDirective(PIString d);
 	Entity * parseClassDeclaration(const PIString & fc);
-	PIString parseClass(Entity * parent, PIString & fc);
+	void parseClass(Entity * parent, PIString & fc, bool is_namespace);
 	MetaMap parseMeta(PIString & fc);
 	bool parseEnum(Entity * parent, const PIString & name, PIString fc, const MetaMap & meta);
 	Typedef parseTypedef(PIString fc);
@@ -178,7 +193,6 @@ private:
 	PIString cur_namespace;
 	PIMap<PIString, PIString> tmp_temp;
 	PIMap<PIString, MetaMap> tmp_meta;
-	
 };
 
 #endif // PICODEPARSER_H

libs/main/compress/picompress.h

@@ -1,5 +1,9 @@
-/*! @file picompress.h
- * @brief Compress class using zlib
+/*! \file picompress.h
+ * \brief
+ * \ingroup Compress
+ * \~\brief
+ * \~english Compress class zlib
+ * \~russian Сжатие с помощью zlib
  */
 /*
     PIP - Platform Independent Primitives
@@ -19,15 +23,54 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+//! \defgroup Compress Compress
+//! \~\brief
+//! \~english Compression support
+//! \~russian Поддержка сжатия
+//!
+//! \~\details
+//! \~english \section cmake_module_Compress Building with CMake
+//! \~russian \section cmake_module_Compress Сборка с использованием CMake
+//!
+//! \~\code
+//! find_package(PIP REQUIRED)
+//! target_link_libraries([target] PIP::Compress)
+//! \endcode
+//!
+//! \~english \par Common
+//! \~russian \par Общее
+//!
+//! \~english
+//! These files provides simple compression and decompression support.
+//!
+//! \~russian
+//! Эти файлы обеспечивают простое сжатие и распакову.
+//!
+//! \~\authors
+//! \~english
+//! Ivan Pelipenko peri4ko@yandex.ru;
+//! Andrey Bychkov work.a.b@yandex.ru;
+//! \~russian
+//! Иван Пелипенко peri4ko@yandex.ru;
+//! Андрей Бычков work.a.b@yandex.ru;
+//!
 
 #ifndef PICOMPRESS_H
 #define PICOMPRESS_H
 
-#include "pip_compress_export.h"
 #include "pibytearray.h"
+#include "pip_compress_export.h"
 
+//! \~english Compress "ba" with compression level "level", return empty %PIByteArray if no compression supports
+//! \~russian Сжимает "ba" с уровнем сжатия "level", возвращает пустой %PIByteArray если нет поддержки
+//! \~\ingroup Compress
+//! \~\details
 PIP_COMPRESS_EXPORT PIByteArray piCompress(const PIByteArray & ba, int level = 6);
 
+//! \~english Decompress "zba", return empty %PIByteArray if no compression supports
+//! \~russian Распаковывает "zba", возвращает пустой %PIByteArray если нет поддержки
+//! \~\ingroup Compress
+//! \~\details
 PIP_COMPRESS_EXPORT PIByteArray piDecompress(const PIByteArray & zba);
 
 #endif // PICOMPRESS_H

libs/main/console/piconsolemodule.h

@@ -16,6 +16,37 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+//! \defgroup Console Console
+//! \~\brief
+//! \~english Console graphic
+//! \~russian Графика в консоли
+//!
+//! \~\details
+//! \~english \section cmake_module_Console Building with CMake
+//! \~russian \section cmake_module_Console Сборка с использованием CMake
+//!
+//! \~\code
+//! find_package(PIP REQUIRED)
+//! target_link_libraries([target] PIP::Console)
+//! \endcode
+//!
+//! \~english \par Common
+//! \~russian \par Общее
+//!
+//! \~english
+//! These files provides grab keyboard from console, simple tiling manager and virtual terminal.
+//!
+//! \~russian
+//! Эти файлы обеспечивают захват клавиатуры в консоли, простой тайловый менеджер и виртуальный терминал.
+//!
+//! \~\authors
+//! \~english
+//! Ivan Pelipenko peri4ko@yandex.ru;
+//! Andrey Bychkov work.a.b@yandex.ru;
+//! \~russian
+//! Иван Пелипенко peri4ko@yandex.ru;
+//! Андрей Бычков work.a.b@yandex.ru;
+//!
 
 #ifndef PICONSOLEMODULE_H
 #define PICONSOLEMODULE_H

libs/main/console/pikbdlistener.cpp

@@ -16,16 +16,19 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "piincludes_p.h"
 #include "pikbdlistener.h"
+
+#include "piincludes_p.h"
+#include "piliterals.h"
 #ifndef WINDOWS
 #  include <termios.h>
 #else
 #  include <wincon.h>
+#  include <wingdi.h>
 #endif
 
 /** \class PIKbdListener
- * @brief Keyboard console input listener
+ * \brief Keyboard console input listener
  * \details This class provide listening of console keyboard input.
  * There is two ways to receive pressed key:
  * * external static function with format "void func(char key, void * data_)"
@@ -118,8 +121,10 @@ const PIKbdListener::EscSeq PIKbdListener::esc_seq[] = {
 	{0,      0,						 0, 0,        0},
 };
 void setupTerminal(bool on) {
-	printf("\e[?1000"); printf(on ? "h" : "l");
-	printf("\e[?1002"); printf(on ? "h" : "l");
+	printf("\e[?1000");
+	printf(on ? "h" : "l");
+	printf("\e[?1002");
+	printf(on ? "h" : "l");
 	fflush(0);
 }
 #endif
@@ -143,7 +148,7 @@ PRIVATE_DEFINITION_END(PIKbdListener)
 
 
 PIKbdListener::PIKbdListener(KBFunc slot, void * _d, bool startNow): PIThread() {
-	setName("keyboard_listener");
+	setName("keyboard_listener"_a);
 	_object = this;
 #ifdef WINDOWS
 	PRIVATE->hIn  = GetStdHandle(STD_INPUT_HANDLE);
@@ -223,33 +228,111 @@ void PIKbdListener::readKeyboard() {
 			ke.modifiers = getModifiers(ker.dwControlKeyState, &shift);
 			// piCout << "key" << int(ker.wVirtualKeyCode) << int(ker.uChar.AsciiChar);
 			switch (ker.wVirtualKeyCode) {
-			case 8:  PRIVATE->ret = 1; ke.key = Backspace; break;
-			case 33: PRIVATE->ret = 1; ke.key = PageUp; break;
-			case 34: PRIVATE->ret = 1; ke.key = PageDown; break;
-			case 35: PRIVATE->ret = 1; ke.key = End; break;
-			case 36: PRIVATE->ret = 1; ke.key = Home; break;
-			case 37: PRIVATE->ret = 1; ke.key = LeftArrow; break;
-			case 38: PRIVATE->ret = 1; ke.key = UpArrow; break;
-			case 39: PRIVATE->ret = 1; ke.key = RightArrow; break;
-			case 40: PRIVATE->ret = 1; ke.key = DownArrow; break;
-			case 45: PRIVATE->ret = 1; ke.key = Insert; break;
-			case 46: PRIVATE->ret = 1; ke.key = Delete; break;
+			case 8:
+				PRIVATE->ret = 1;
+				ke.key       = Backspace;
+				break;
+			case 33:
+				PRIVATE->ret = 1;
+				ke.key       = PageUp;
+				break;
+			case 34:
+				PRIVATE->ret = 1;
+				ke.key       = PageDown;
+				break;
+			case 35:
+				PRIVATE->ret = 1;
+				ke.key       = End;
+				break;
+			case 36:
+				PRIVATE->ret = 1;
+				ke.key       = Home;
+				break;
+			case 37:
+				PRIVATE->ret = 1;
+				ke.key       = LeftArrow;
+				break;
+			case 38:
+				PRIVATE->ret = 1;
+				ke.key       = UpArrow;
+				break;
+			case 39:
+				PRIVATE->ret = 1;
+				ke.key       = RightArrow;
+				break;
+			case 40:
+				PRIVATE->ret = 1;
+				ke.key       = DownArrow;
+				break;
+			case 45:
+				PRIVATE->ret = 1;
+				ke.key       = Insert;
+				break;
+			case 46:
+				PRIVATE->ret = 1;
+				ke.key       = Delete;
+				break;
 			case '\r':
-			case '\n': PRIVATE->ret = 1; ke.key = Return; break;
-			case ' ':  PRIVATE->ret = 1; ke.key = Space; break;
-			case '\t': PRIVATE->ret = 1; ke.key = Tab; break;
-			case 112:  PRIVATE->ret = 1; ke.key = F1; break;
-			case 113:  PRIVATE->ret = 1; ke.key = F2; break;
-			case 114:  PRIVATE->ret = 1; ke.key = F3; break;
-			case 115:  PRIVATE->ret = 1; ke.key = F4; break;
-			case 116:  PRIVATE->ret = 1; ke.key = F5; break;
-			case 117:  PRIVATE->ret = 1; ke.key = F6; break;
-			case 118:  PRIVATE->ret = 1; ke.key = F7; break;
-			case 119:  PRIVATE->ret = 1; ke.key = F8; break;
-			case 120:  PRIVATE->ret = 1; ke.key = F9; break;
-			case 121:  PRIVATE->ret = 1; ke.key = F10; break;
-			case 122:  PRIVATE->ret = 1; ke.key = F11; break;
-			case 123:  PRIVATE->ret = 1; ke.key = F12; break;
+			case '\n':
+				PRIVATE->ret = 1;
+				ke.key       = Return;
+				break;
+			case ' ':
+				PRIVATE->ret = 1;
+				ke.key       = Space;
+				break;
+			case '\t':
+				PRIVATE->ret = 1;
+				ke.key       = Tab;
+				break;
+			case 112:
+				PRIVATE->ret = 1;
+				ke.key       = F1;
+				break;
+			case 113:
+				PRIVATE->ret = 1;
+				ke.key       = F2;
+				break;
+			case 114:
+				PRIVATE->ret = 1;
+				ke.key       = F3;
+				break;
+			case 115:
+				PRIVATE->ret = 1;
+				ke.key       = F4;
+				break;
+			case 116:
+				PRIVATE->ret = 1;
+				ke.key       = F5;
+				break;
+			case 117:
+				PRIVATE->ret = 1;
+				ke.key       = F6;
+				break;
+			case 118:
+				PRIVATE->ret = 1;
+				ke.key       = F7;
+				break;
+			case 119:
+				PRIVATE->ret = 1;
+				ke.key       = F8;
+				break;
+			case 120:
+				PRIVATE->ret = 1;
+				ke.key       = F9;
+				break;
+			case 121:
+				PRIVATE->ret = 1;
+				ke.key       = F10;
+				break;
+			case 122:
+				PRIVATE->ret = 1;
+				ke.key       = F11;
+				break;
+			case 123:
+				PRIVATE->ret = 1;
+				ke.key       = F12;
+				break;
 			default:
 				PRIVATE->ret = 1;
 				rc[0]        = 1;
@@ -260,10 +343,15 @@ void PIKbdListener::readKeyboard() {
 				}
 				break;
 			}
-			if (ke.key == 0) {piMSleep(10); return;}
-		} else {piMSleep(10); return;}
+			if (ke.key == 0) {
+				piMSleep(10);
+				return;
 			}
-		break;
+		} else {
+			piMSleep(10);
+			return;
+		}
+	} break;
 	case MOUSE_EVENT: {
 		MOUSE_EVENT_RECORD mer = ir.Event.MouseEvent;
 		GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
@@ -296,24 +384,23 @@ void PIKbdListener::readKeyboard() {
 						prev_p_me = me;
 					}
 					tm_dbl.reset();
+				} else if (mb < me.buttons)
+					me.action = MouseButtonRelease;
+				else {
+					if (mb != 0) piCoutObj << "WTF";
+					break;
 				}
-				else if (mb < me.buttons) me.action = MouseButtonRelease;
-				else {if (mb != 0) piCoutObj << "WTF"; break;}
 			}
 			me.buttons = mb;
-			if (piCompareBinary(&prev_me, &me, sizeof(me)))
-				break;
+			if (piCompareBinary(&prev_me, &me, sizeof(me))) break;
 			memcpy((void *)(&prev_me), (const void *)(&me), sizeof(me));
 			// PIString _s[] = {"press", "release", "dbl click", "move"};
 			// piCoutObj << _s[me.action] << me.buttons << ":" << me.x << me.y;
 			mouseEvent(me, kbddata_);
 			break;
 		}
-		}
-		break;
-	default:
-		piMSleep(10);
-		return;
+	} break;
+	default: piMSleep(10); return;
 	}
 #else
 	tcsetattr(0, TCSANOW, &PRIVATE->tterm);
@@ -322,12 +409,24 @@ void PIKbdListener::readKeyboard() {
 	for (int i = 0; i < PRIVATE->ret; ++i)
 	    PICout(0) << PICoutManipulators::Hex << int(((uchar * )&rc)[i]) << ' ';
 	PICout(0) << "\n";
+	std::cout << PRIVATE->ret << " chars ";
 	for (int i = 0; i < PRIVATE->ret; ++i)
-		cout << "'" << (char)(rc[i]) << "' ";
-	cout << endl;*/
-	if (rc[0] == 0) {piMSleep(10); return;}
-	if (PRIVATE->ret < 0 || PRIVATE->ret > 7) {piMSleep(10); return;}
-	if (PRIVATE->ret == 1) ke.key = PIChar::fromConsole(rc[0]).unicode16Code();
+	    std::cout << "'" << (char)(rc[i]) << "' " << (int)(uchar)(rc[i]);
+	std::cout << std::endl;*/
+	if (rc[0] == 0) {
+		piMSleep(10);
+		return;
+	}
+	if (PRIVATE->ret < 0 || PRIVATE->ret > 7) {
+		piMSleep(10);
+		return;
+	}
+	if (PRIVATE->ret == 1) {
+		if (rc[0] == 8)
+			ke.key = Backspace;
+		else
+			ke.key = PIChar::fromConsole(rc[0]).unicode16Code();
+	}
 	int mod(0);
 	// 2 - shift			1
 	// 3 - alt				2
@@ -340,7 +439,8 @@ void PIKbdListener::readKeyboard() {
 			ke.key = PIChar::fromConsole(rc[1]).unicode16Code();
 		} else {                 // escape-seq
 			if (rc[1] == '\e') { // search for Alt
-				for (int i = 1; i < 7; ++i) rc[i] = rc[i + 1];
+				for (int i = 1; i < 7; ++i)
+					rc[i] = rc[i + 1];
 				mod = 2;
 				PRIVATE->ret--;
 			}
@@ -389,7 +489,8 @@ void PIKbdListener::readKeyboard() {
 					for (int i = 2; i < 7; ++i) // search for modifier
 						if (rc[i] == ';') {
 							mod |= rc[i + 1] - '0' - 1;
-							for (int j = i; j < 6; ++j) rc[j] = rc[j + 2];
+							for (int j = i; j < 6; ++j)
+								rc[j] = rc[j + 2];
 							rc[6] = rc[7] = 0;
 							PRIVATE->ret -= 2;
 							break;
@@ -399,7 +500,8 @@ void PIKbdListener::readKeyboard() {
 			if (PRIVATE->ret >= 3 && rc[1] == 'O') { // search for modifier (F1-F4)
 				if (rc[2] >= '1' && rc[2] <= '8') {
 					mod |= rc[2] - '0' - 1;
-					for (int j = 2; j < 6; ++j) rc[j] = rc[j + 1];
+					for (int j = 2; j < 6; ++j)
+						rc[j] = rc[j + 1];
 					rc[7] = 0;
 					PRIVATE->ret--;
 				}
@@ -425,11 +527,9 @@ void PIKbdListener::readKeyboard() {
 		    cout << "'" << (char)(rc[i]) << "' ";
 		cout << endl;*/
 	}
-	if (ke.key == 0 && PRIVATE->ret > 1)
-		ke.key = PIChar(rc).unicode16Code();
+	if (ke.key == 0 && PRIVATE->ret > 1) ke.key = PIChar::fromSystem(rc).unicode16Code();
 #endif
-	if ((rc[0] == '\n' || rc[0] == '\r') && PRIVATE->ret == 1)
-		ke.key = Return;
+	if ((rc[0] == '\n' || rc[0] == '\r') && PRIVATE->ret == 1) ke.key = Return;
 	if (exit_enabled && ke.key == exit_key) {
 		PIKbdListener::exiting = true;
 		return;

libs/main/console/pikbdlistener.h

@@ -1,5 +1,8 @@
-/*! @file pikbdlistener.h
- * @brief Keyboard console input listener
+/*! \file pikbdlistener.h
+ * \ingroup Console
+ * \~\brief
+ * \~english Keyboard console input listener
+ * \~russian Консольный захват клавиатуры
  */
 /*
     PIP - Platform Independent Primitives
@@ -24,17 +27,19 @@
 #define PIKBDLISTENER_H
 
 #include "pithread.h"
+#include "pitime.h"
 
-#define WAIT_FOR_EXIT while (!PIKbdListener::exiting) piMSleep(PIP_MIN_MSLEEP*5);
+#define WAIT_FOR_EXIT               \
+	while (!PIKbdListener::exiting) \
+		piMSleep(PIP_MIN_MSLEEP * 5); // TODO: rewrite with condvar
 
 
-class PIP_EXPORT PIKbdListener: public PIThread
-{
-	PIOBJECT_SUBCLASS(PIKbdListener, PIThread)
+class PIP_EXPORT PIKbdListener: public PIThread {
+	PIOBJECT_SUBCLASS(PIKbdListener, PIThread);
 	friend class PIConsole;
 	friend class PITerminal;
-public:
 
+public:
 	//! Special keyboard keys
 	enum SpecialKey {
 		Tab /** Tab key */                = 0x09,
@@ -78,7 +83,10 @@ public:
 
 	//! This struct contains information about pressed keyboard key
 	struct PIP_EXPORT KeyEvent {
-		KeyEvent(int k = 0, KeyModifiers m = 0) {key = k; modifiers = m;}
+		KeyEvent(int k = 0, KeyModifiers m = 0) {
+			key       = k;
+			modifiers = m;
+		}
 
 		//! Pressed key. It can be simple \b char or special key (see PIKbdListener::SpecialKey)
 		int key;
@@ -107,7 +115,12 @@ public:
 
 	//! This struct contains information about mouse action
 	struct PIP_EXPORT MouseEvent {
-		MouseEvent(MouseAction a = MouseButtonPress, MouseButtons b = 0, KeyModifiers m = 0) {x = y = 0; action = a; buttons = b; modifiers = m;}
+		MouseEvent(MouseAction a = MouseButtonPress, MouseButtons b = 0, KeyModifiers m = 0) {
+			x = y     = 0;
+			action    = a;
+			buttons   = b;
+			modifiers = m;
+		}
 
 		//! Event X coordinate in view-space, from 0
 		int x;
@@ -151,7 +164,9 @@ public:
 	void setSlot(KBFunc slot) { ret_func = slot; }
 
 	//! Set external function to "slot"
-	void setSlot(std::function<void(KeyEvent)> slot) {ret_func = [slot](KeyEvent e, void *){slot(e);};}
+	void setSlot(std::function<void(KeyEvent)> slot) {
+		ret_func = [slot](KeyEvent e, void *) { slot(e); };
+	}
 
 	//! Returns if exit key if awaiting
 	bool exitCaptured() const { return exit_enabled; }
@@ -168,33 +183,36 @@ public:
 	bool isActive() { return is_active; }
 
 	EVENT_HANDLER(void, enableExitCapture) { enableExitCapture('Q'); }
-	EVENT_HANDLER1(void, enableExitCapture, int, key) {exit_enabled = true; exit_key = key;}
+	EVENT_HANDLER1(void, enableExitCapture, int, key) {
+		exit_enabled = true;
+		exit_key     = key;
+	}
 	EVENT_HANDLER(void, disableExitCapture) { exit_enabled = false; }
 	EVENT_HANDLER(void, setActive) { setActive(true); }
 	EVENT_HANDLER1(void, setActive, bool, yes);
 
-	EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void * , data)
-	EVENT2(mouseEvent, PIKbdListener::MouseEvent, mouse, void * , data)
-	EVENT2(wheelEvent, PIKbdListener::WheelEvent, wheel, void * , data)
+	EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void *, data);
+	EVENT2(mouseEvent, PIKbdListener::MouseEvent, mouse, void *, data);
+	EVENT2(wheelEvent, PIKbdListener::WheelEvent, wheel, void *, data);
 
 	//! \handlers
 	//! \{
 
 	//! \fn void enableExitCapture(int key = 'Q')
-	//! @brief Enable exit key "key" awaiting
+	//! \brief Enable exit key "key" awaiting
 
 	//! \fn void disableExitCapture()
-	//! @brief Disable exit key awaiting
+	//! \brief Disable exit key awaiting
 
 	//! \fn void setActive(bool yes = true)
-	//! @brief Set keyboard listening is active or not
+	//! \brief Set keyboard listening is active or not
 
 	//! \}
 	//! \events
 	//! \{
 
 	//! \fn void keyPressed(PIKbdListener::KeyEvent key, void * data)
-	//! @brief Raise on key "key" pressed, "data" is custom data
+	//! \brief Raise on key "key" pressed, "data" is custom data
 
 	//! \}
 
@@ -202,9 +220,9 @@ public:
 	static PIKbdListener * instance() { return _object; }
 
 private:
-	void begin();
-	void run() {readKeyboard();}
-	void end();
+	void begin() override;
+	void run() override { readKeyboard(); }
+	void end() override;
 
 #ifndef WINDOWS
 	struct PIP_EXPORT EscSeq {
@@ -240,17 +258,42 @@ private:
 	MouseEvent me, prev_me, prev_p_me;
 	WheelEvent we;
 	static PIKbdListener * _object;
-
 };
 
 
-inline PIByteArray & operator <<(PIByteArray & s, const PIKbdListener::KeyEvent & v) {s << v.key << v.modifiers; return s;}
-inline PIByteArray & operator <<(PIByteArray & s, const PIKbdListener::MouseEvent & v) {s << v.x << v.y << (int)v.action << v.buttons << v.modifiers; return s;}
-inline PIByteArray & operator <<(PIByteArray & s, const PIKbdListener::WheelEvent & v) {s << (*(PIKbdListener::MouseEvent*)&v) << (uchar)v.direction; return s;}
+//! \relatesalso PIBinaryStream
+//! \~english Store operator
+//! \~russian Оператор сохранения
+BINARY_STREAM_WRITE(PIKbdListener::MouseEvent) {
+	s << v.x << v.y << v.action << v.buttons << v.modifiers;
+	return s;
+}
+
+//! \relatesalso PIBinaryStream
+//! \~english Restore operator
+//! \~russian Оператор извлечения
+BINARY_STREAM_READ(PIKbdListener::MouseEvent) {
+	s >> v.x >> v.y >> v.action >> v.buttons >> v.modifiers;
+	return s;
+}
+
+
+//! \relatesalso PIBinaryStream
+//! \~english Store operator
+//! \~russian Оператор сохранения
+BINARY_STREAM_WRITE(PIKbdListener::WheelEvent) {
+	s << (*(PIKbdListener::MouseEvent *)&v) << v.direction;
+	return s;
+}
+
+//! \relatesalso PIBinaryStream
+//! \~english Restore operator
+//! \~russian Оператор извлечения
+BINARY_STREAM_READ(PIKbdListener::WheelEvent) {
+	s >> (*(PIKbdListener::MouseEvent *)&v) >> v.direction;
+	return s;
+}
 
-inline PIByteArray & operator >>(PIByteArray & s, PIKbdListener::KeyEvent & v) {s >> v.key >> v.modifiers; return s;}
-inline PIByteArray & operator >>(PIByteArray & s, PIKbdListener::MouseEvent & v) {int a(0); s >> v.x >> v.y >> a >> v.buttons >> v.modifiers; v.action = (PIKbdListener::MouseAction)a; return s;}
-inline PIByteArray & operator >>(PIByteArray & s, PIKbdListener::WheelEvent & v) {uchar d(0); s >> (*(PIKbdListener::MouseEvent*)&v) >> d; v.direction = d; return s;}
 
 REGISTER_PIVARIANTSIMPLE(PIKbdListener::KeyEvent)
 REGISTER_PIVARIANTSIMPLE(PIKbdListener::MouseEvent)

libs/main/console/piscreen.h

@@ -1,5 +1,8 @@
-/*! @file piscreen.h
- * @brief Console GUI class
+/*! \file piscreen.h
+ * \ingroup Console
+ * \~\brief
+ * \~english Console tiling manager
+ * \~russian Консольный тайловый менеджер
  */
 /*
     PIP - Platform Independent Primitives
@@ -24,16 +27,17 @@
 #define PISCREEN_H
 
 #include "pip_console_export.h"
-#include "piscreentile.h"
 #include "piscreendrawer.h"
+#include "piscreentile.h"
 
 
-class PIP_CONSOLE_EXPORT PIScreen: public PIThread, public PIScreenTypes::PIScreenBase
-{
-	PIOBJECT_SUBCLASS(PIScreen, PIThread)
+class PIP_CONSOLE_EXPORT PIScreen
+	: public PIThread
+	, public PIScreenTypes::PIScreenBase {
+	PIOBJECT_SUBCLASS(PIScreen, PIThread);
 	class SystemConsole;
-public:
 
+public:
 	//! Constructs %PIScreen with key handler "slot" and if "startNow" start it
 	PIScreen(bool startNow = true, PIKbdListener::KBFunc slot = 0);
 
@@ -69,34 +73,37 @@ public:
 
 	EVENT_HANDLER0(void, waitForFinish);
 	EVENT_HANDLER0(void, start) { start(false); }
-	EVENT_HANDLER1(void, start, bool, wait) {PIThread::start(40); if (wait) waitForFinish();}
+	EVENT_HANDLER1(void, start, bool, wait) {
+		PIThread::start(40);
+		if (wait) waitForFinish();
+	}
 	EVENT_HANDLER0(void, stop) { stop(false); }
 	EVENT_HANDLER1(void, stop, bool, clear);
 
-	EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void * , data)
-	EVENT2(tileEvent, PIScreenTile * , tile, PIScreenTypes::TileEvent, e)
+	EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void *, data);
+	EVENT2(tileEvent, PIScreenTile *, tile, PIScreenTypes::TileEvent, e);
 
 	//! \handlers
 	//! \{
 
 	//! \fn void waitForFinish()
-	//! @brief block until finished (exit key will be pressed)
+	//! \brief block until finished (exit key will be pressed)
 
 	//! \fn void start(bool wait = false)
-	//! @brief Start console output and if "wait" block until finished (exit key will be pressed)
+	//! \brief Start console output and if "wait" block until finished (exit key will be pressed)
 
 	//! \fn void stop(bool clear = false)
-	//! @brief Stop console output and if "clear" clear the screen
+	//! \brief Stop console output and if "clear" clear the screen
 
 	//! \}
 	//! \events
 	//! \{
 
 	//! \fn void keyPressed(PIKbdListener::KeyEvent key, void * data)
-	//! @brief Raise on key "key" pressed, "data" is pointer to %PIConsole object
+	//! \brief Raise on key "key" pressed, "data" is pointer to %PIConsole object
 
 	//! \fn void tileEvent(PIScreenTile * tile, PIScreenTypes::TileEvent e)
-	//! @brief Raise on some event "e" from tile "tile"
+	//! \brief Raise on some event "e" from tile "tile"
 
 	//! \}
 
@@ -131,9 +138,9 @@ private:
 		PIVector<PIVector<PIScreenTypes::Cell>> cells, pcells;
 	};
 
-	void begin();
-	void run();
-	void end();
+	void begin() override;
+	void run() override;
+	void end() override;
 	void key_event(PIKbdListener::KeyEvent key);
 	EVENT_HANDLER1(void, mouse_event, PIKbdListener::MouseEvent, me);
 	EVENT_HANDLER1(void, wheel_event, PIKbdListener::WheelEvent, we);
@@ -142,9 +149,9 @@ private:
 	PIVector<PIScreenTile *> prepareMouse(PIKbdListener::MouseEvent * e);
 	PIVector<PIScreenTile *> tilesUnderMouse(int x, int y);
 	bool nextFocus(PIScreenTile * rt, PIKbdListener::KeyEvent key = PIKbdListener::KeyEvent());
-	void tileEventInternal(PIScreenTile * t, PIScreenTypes::TileEvent e);
-	void tileRemovedInternal(PIScreenTile * t);
-	void tileSetFocusInternal(PIScreenTile * t);
+	void tileEventInternal(PIScreenTile * t, PIScreenTypes::TileEvent e) override;
+	void tileRemovedInternal(PIScreenTile * t) override;
+	void tileSetFocusInternal(PIScreenTile * t) override;
 
 	bool mouse_;
 	SystemConsole console;
@@ -153,7 +160,6 @@ private:
 	PIKbdListener::KBFunc ret_func;
 	PIScreenTile root;
 	PIScreenTile *tile_focus, *tile_dialog;
-
 };
 
 

libs/main/console/piscreenconsole.h

@@ -1,7 +1,8 @@
-/*! @file piscreenconsole.h
- * @brief Tile for PIScreen with PIConsole API
- *
- * This file declares TileVars
+/*! \file piscreenconsole.h
+ * \ingroup Console
+ * \~\brief
+ * \~english Tile for PIScreen with PIConsole API
+ * \~russian Тайл для PIScreen с API PIConsole
  */
 /*
     PIP - Platform Independent Primitives
@@ -34,9 +35,14 @@
 class PIP_CONSOLE_EXPORT TileVars: public PIScreenTile {
 public:
 	TileVars(const PIString & n = PIString());
+
 protected:
 	struct PIP_CONSOLE_EXPORT Variable {
-		Variable() {nx = ny = type = offset = bitFrom = bitCount = size = 0; format = PIScreenTypes::CellFormat(); ptr = 0;}
+		Variable() {
+			nx = ny = type = offset = bitFrom = bitCount = size = 0;
+			format                                              = PIScreenTypes::CellFormat();
+			ptr                                                 = 0;
+		}
 		bool isEmpty() const { return (ptr == 0); }
 		PIString name;
 		PIScreenTypes::CellFormat format;
@@ -63,14 +69,12 @@ protected:
 	};
 	PIVector<Variable> variables;
 	PIScreenTypes::Alignment alignment;
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
+	void sizeHint(int & w, int & h) const override;
+	void drawEvent(PIScreenDrawer * d) override;
 };
 
 
-
-class PIP_CONSOLE_EXPORT PIScreenConsoleTile : public PIScreenTile
-{
+class PIP_CONSOLE_EXPORT PIScreenConsoleTile: public PIScreenTile {
 public:
 	PIScreenConsoleTile();
 };

libs/main/console/piscreendrawer.h

@@ -1,5 +1,8 @@
-/*! @file piscreendrawer.h
- * @brief Drawer for PIScreen
+/*! \file piscreendrawer.h
+ * \ingroup Console
+ * \~\brief
+ * \~english Drawer for PIScreen
+ * \~russian Отрисовщик для PIScreen
  */
 /*
     PIP - Platform Independent Primitives
@@ -27,10 +30,10 @@
 #include "piscreentypes.h"
 #include "pistring.h"
 
-class PIP_CONSOLE_EXPORT PIScreenDrawer
-{
+class PIP_CONSOLE_EXPORT PIScreenDrawer {
 	friend class PIScreen;
 	PIScreenDrawer(PIVector<PIVector<PIScreenTypes::Cell>> & c);
+
 public:
 	enum ArtChar {
 		LineVertical = 1,
@@ -46,12 +49,49 @@ public:
 
 	void clear();
 	void clearRect(int x0, int y0, int x1, int y1) { fillRect(x0, y0, x1, y1, ' '); }
-	void drawPixel(int x, int y, const PIChar & c, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
-	void drawLine(int x0, int y0, int x1, int y1, const PIChar & c, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
-	void drawRect(int x0, int y0, int x1, int y1, const PIChar & c, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
-	void drawFrame(int x0, int y0, int x1, int y1, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
-	void drawText(int x, int y, const PIString & s, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Transparent, PIScreenTypes::CharFlags flags_char = 0);
-	void fillRect(int x0, int y0, int x1, int y1, const PIChar & c, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
+	void drawPixel(int x,
+	               int y,
+	               const PIChar & c,
+	               PIScreenTypes::Color col_char       = PIScreenTypes::Default,
+	               PIScreenTypes::Color col_back       = PIScreenTypes::Default,
+	               PIScreenTypes::CharFlags flags_char = 0);
+	void drawLine(int x0,
+	              int y0,
+	              int x1,
+	              int y1,
+	              const PIChar & c,
+	              PIScreenTypes::Color col_char       = PIScreenTypes::Default,
+	              PIScreenTypes::Color col_back       = PIScreenTypes::Default,
+	              PIScreenTypes::CharFlags flags_char = 0);
+	void drawRect(int x0,
+	              int y0,
+	              int x1,
+	              int y1,
+	              const PIChar & c,
+	              PIScreenTypes::Color col_char       = PIScreenTypes::Default,
+	              PIScreenTypes::Color col_back       = PIScreenTypes::Default,
+	              PIScreenTypes::CharFlags flags_char = 0);
+	void drawFrame(int x0,
+	               int y0,
+	               int x1,
+	               int y1,
+	               PIScreenTypes::Color col_char       = PIScreenTypes::Default,
+	               PIScreenTypes::Color col_back       = PIScreenTypes::Default,
+	               PIScreenTypes::CharFlags flags_char = 0);
+	void drawText(int x,
+	              int y,
+	              const PIString & s,
+	              PIScreenTypes::Color col_char       = PIScreenTypes::Default,
+	              PIScreenTypes::Color col_back       = PIScreenTypes::Transparent,
+	              PIScreenTypes::CharFlags flags_char = 0);
+	void fillRect(int x0,
+	              int y0,
+	              int x1,
+	              int y1,
+	              const PIChar & c,
+	              PIScreenTypes::Color col_char       = PIScreenTypes::Default,
+	              PIScreenTypes::Color col_back       = PIScreenTypes::Default,
+	              PIScreenTypes::CharFlags flags_char = 0);
 	void fillRect(int x0, int y0, int x1, int y1, PIVector<PIVector<PIScreenTypes::Cell>> & content);
 
 	PIChar artChar(const ArtChar type) const { return arts_.value(type, PIChar(' ')); }
@@ -62,7 +102,6 @@ private:
 	PIVector<PIVector<PIScreenTypes::Cell>> & cells;
 	int width, height;
 	PIMap<ArtChar, PIChar> arts_;
-	
 };
 
 

libs/main/console/piscreentile.h

@@ -1,5 +1,8 @@
-/*! @file piscreentile.h
- * @brief Basic PIScreen tile
+/*! \file piscreentile.h
+ * \ingroup Console
+ * \~\brief
+ * \~english Basic PIScreen tile
+ * \~russian Базовый тайл для PIScreen
  */
 /*
     PIP - Platform Independent Primitives
@@ -23,17 +26,20 @@
 #ifndef PISCREENTILE_H
 #define PISCREENTILE_H
 
+#include "pikbdlistener.h"
 #include "pip_console_export.h"
 #include "piscreentypes.h"
-#include "pikbdlistener.h"
 
 class PIScreenDrawer;
 
 class PIP_CONSOLE_EXPORT PIScreenTile: public PIObject {
 	friend class PIScreen;
-	PIOBJECT_SUBCLASS(PIScreenTile, PIObject)
+	PIOBJECT_SUBCLASS(PIScreenTile, PIObject);
+
 public:
-	PIScreenTile(const PIString & n = PIString(), PIScreenTypes::Direction d = PIScreenTypes::Vertical, PIScreenTypes::SizePolicy p = PIScreenTypes::Preferred);
+	PIScreenTile(const PIString & n          = PIString(),
+	             PIScreenTypes::Direction d  = PIScreenTypes::Vertical,
+	             PIScreenTypes::SizePolicy p = PIScreenTypes::Preferred);
 	virtual ~PIScreenTile();
 
 	void addTile(PIScreenTile * t);
@@ -47,7 +53,12 @@ public:
 	void setFocus();
 	bool hasFocus() const { return has_focus; }
 	void setMargins(int m) { marginLeft = marginRight = marginTop = marginBottom = m; }
-	void setMargins(int l, int r, int t, int b) {marginLeft = l; marginRight = r; marginTop = t; marginBottom = b;}
+	void setMargins(int l, int r, int t, int b) {
+		marginLeft   = l;
+		marginRight  = r;
+		marginTop    = t;
+		marginBottom = b;
+	}
 
 	int x() const { return x_; }
 	int y() const { return y_; }
@@ -66,7 +77,6 @@ public:
 	bool visible;
 
 protected:
-	
 	//! Returns desired tile size in "w" and "h"
 	virtual void sizeHint(int & w, int & h) const;
 
@@ -100,7 +110,6 @@ protected:
 
 private:
 	int pw, ph;
-	
 };
 
 

libs/main/console/piscreentiles.h

@@ -1,5 +1,8 @@
-/*! @file piscreentiles.h
- * @brief Various tiles for PIScreen
+/*! \file piscreentiles.h
+ * \ingroup Console
+ * \~\brief
+ * \~english Various tiles for PIScreen
+ * \~russian Различные тайлы для PIScreen
  */
 /*
     PIP - Platform Independent Primitives
@@ -28,7 +31,8 @@
 
 
 class PIP_CONSOLE_EXPORT TileSimple: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileSimple, PIScreenTile)
+	PIOBJECT_SUBCLASS(TileSimple, PIScreenTile);
+
 public:
 	typedef PIPair<PIString, PIScreenTypes::CellFormat> Row;
 	TileSimple(const PIString & n = PIString());
@@ -36,17 +40,19 @@ public:
 	virtual ~TileSimple() {}
 	PIVector<Row> content;
 	PIScreenTypes::Alignment alignment;
+
 protected:
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
+	void sizeHint(int & w, int & h) const override;
+	void drawEvent(PIScreenDrawer * d) override;
 };
 
 
 class TileList;
 
 class PIP_CONSOLE_EXPORT TileScrollBar: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileScrollBar, PIScreenTile)
+	PIOBJECT_SUBCLASS(TileScrollBar, PIScreenTile);
 	friend class TileList;
+
 public:
 	TileScrollBar(const PIString & n = PIString());
 	virtual ~TileScrollBar() {}
@@ -57,18 +63,20 @@ public:
 	int maximum() const { return maximum_; }
 	int value() const { return value_; }
 	int thickness;
+
 protected:
 	void _check();
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
-	bool mouseEvent(PIKbdListener::MouseEvent me);
+	void sizeHint(int & w, int & h) const override;
+	void drawEvent(PIScreenDrawer * d) override;
+	bool mouseEvent(PIKbdListener::MouseEvent me) override;
 	int minimum_, maximum_, value_;
 	PIChar line_char;
 };
 
 
 class PIP_CONSOLE_EXPORT TileList: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileList, PIScreenTile)
+	PIOBJECT_SUBCLASS(TileList, PIScreenTile);
+
 public:
 	enum SelectionMode {
 		NoSelection,
@@ -89,20 +97,22 @@ public:
 	SelectionMode selection_mode;
 	PISet<int> selected;
 	int lhei, cur, offset;
+
 protected:
-	void sizeHint(int & w, int & h) const;
-	void resizeEvent(int w, int h);
-	void drawEvent(PIScreenDrawer * d);
-	bool keyEvent(PIKbdListener::KeyEvent key);
-	bool mouseEvent(PIKbdListener::MouseEvent me);
-	bool wheelEvent(PIKbdListener::WheelEvent we);
+	void sizeHint(int & w, int & h) const override;
+	void resizeEvent(int w, int h) override;
+	void drawEvent(PIScreenDrawer * d) override;
+	bool keyEvent(PIKbdListener::KeyEvent key) override;
+	bool mouseEvent(PIKbdListener::MouseEvent me) override;
+	bool wheelEvent(PIKbdListener::WheelEvent we) override;
 	TileScrollBar * scroll;
 	bool mouse_sel;
 };
 
 
 class PIP_CONSOLE_EXPORT TileButton: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileButton, PIScreenTile)
+	PIOBJECT_SUBCLASS(TileButton, PIScreenTile);
+
 public:
 	TileButton(const PIString & n = PIString());
 	virtual ~TileButton() {}
@@ -111,18 +121,18 @@ public:
 	};
 	PIScreenTypes::CellFormat format;
 	PIString text;
+
 protected:
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
-	bool keyEvent(PIKbdListener::KeyEvent key);
-	bool mouseEvent(PIKbdListener::MouseEvent me);
+	void sizeHint(int & w, int & h) const override;
+	void drawEvent(PIScreenDrawer * d) override;
+	bool keyEvent(PIKbdListener::KeyEvent key) override;
+	bool mouseEvent(PIKbdListener::MouseEvent me) override;
 };
 
 
-
-
 class PIP_CONSOLE_EXPORT TileButtons: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileButtons, PIScreenTile)
+	PIOBJECT_SUBCLASS(TileButtons, PIScreenTile);
+
 public:
 	TileButtons(const PIString & n = PIString());
 	virtual ~TileButtons() {}
@@ -133,11 +143,12 @@ public:
 	PIScreenTypes::Alignment alignment;
 	PIVector<Button> content;
 	int cur;
+
 protected:
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
-	bool keyEvent(PIKbdListener::KeyEvent key);
-	bool mouseEvent(PIKbdListener::MouseEvent me);
+	void sizeHint(int & w, int & h) const override;
+	void drawEvent(PIScreenDrawer * d) override;
+	bool keyEvent(PIKbdListener::KeyEvent key) override;
+	bool mouseEvent(PIKbdListener::MouseEvent me) override;
 	struct Rect {
 		Rect(int _x0 = 0, int _y0 = 0, int _x1 = 0, int _y1 = 0): x0(_x0), y0(_y0), x1(_x1), y1(_y1) {}
 		int x0, y0, x1, y1;
@@ -147,7 +158,8 @@ protected:
 
 
 class PIP_CONSOLE_EXPORT TileCheck: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileCheck, PIScreenTile)
+	PIOBJECT_SUBCLASS(TileCheck, PIScreenTile);
+
 public:
 	TileCheck(const PIString & n = PIString());
 	virtual ~TileCheck() {}
@@ -157,16 +169,18 @@ public:
 	PIScreenTypes::CellFormat format;
 	PIString text;
 	bool toggled;
+
 protected:
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
-	bool keyEvent(PIKbdListener::KeyEvent key);
-	bool mouseEvent(PIKbdListener::MouseEvent me);
+	void sizeHint(int & w, int & h) const override;
+	void drawEvent(PIScreenDrawer * d) override;
+	bool keyEvent(PIKbdListener::KeyEvent key) override;
+	bool mouseEvent(PIKbdListener::MouseEvent me) override;
 };
 
 
 class PIP_CONSOLE_EXPORT TileProgress: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileProgress, PIScreenTile)
+	PIOBJECT_SUBCLASS(TileProgress, PIScreenTile);
+
 public:
 	TileProgress(const PIString & n = PIString());
 	virtual ~TileProgress() {}
@@ -175,37 +189,42 @@ public:
 	PIString suffix;
 	double maximum;
 	double value;
+
 protected:
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
+	void sizeHint(int & w, int & h) const override;
+	void drawEvent(PIScreenDrawer * d) override;
 };
 
 
 class PIP_CONSOLE_EXPORT TilePICout: public TileList {
-	PIOBJECT_SUBCLASS(TilePICout, PIScreenTile)
+	PIOBJECT_SUBCLASS(TilePICout, PIScreenTile);
+
 public:
 	TilePICout(const PIString & n = PIString());
 	virtual ~TilePICout() {}
 	PIScreenTypes::CellFormat format;
 	int max_lines;
+
 protected:
-	void drawEvent(PIScreenDrawer * d);
-	bool keyEvent(PIKbdListener::KeyEvent key);
+	void drawEvent(PIScreenDrawer * d) override;
+	bool keyEvent(PIKbdListener::KeyEvent key) override;
 };
 
 
 class PIP_CONSOLE_EXPORT TileInput: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileInput, PIScreenTile)
+	PIOBJECT_SUBCLASS(TileInput, PIScreenTile);
+
 public:
 	TileInput(const PIString & n = PIString());
 	virtual ~TileInput() {}
 	PIScreenTypes::CellFormat format;
 	PIString text;
 	int max_length;
+
 protected:
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
-	bool keyEvent(PIKbdListener::KeyEvent key);
+	void sizeHint(int & w, int & h) const override;
+	void drawEvent(PIScreenDrawer * d) override;
+	bool keyEvent(PIKbdListener::KeyEvent key) override;
 	void reserCursor();
 	int cur, offset;
 	bool inv;

libs/main/console/piscreentypes.h

@@ -1,5 +1,8 @@
-/*! @file piscreentypes.h
- * @brief Types for PIScreen
+/*! \file piscreentypes.h
+ * \ingroup Console
+ * \~\brief
+ * \~english Types for PIScreen
+ * \~russian Типы для PIScreen
  */
 /*
     PIP - Platform Independent Primitives
@@ -107,7 +110,10 @@ namespace PIScreenTypes {
 };
 
 struct PIP_CONSOLE_EXPORT Cell {
-		Cell(PIChar c = PIChar(' '), CellFormat f = CellFormat()) {symbol = c; format = f;}
+	Cell(PIChar c = PIChar(' '), CellFormat f = CellFormat()) {
+		symbol = c;
+		format = f;
+	}
 	CellFormat format;
 	PIChar symbol;
 	bool operator==(const Cell & c) const { return format == c.format && symbol == c.symbol; }
@@ -117,7 +123,8 @@ namespace PIScreenTypes {
 		if (c.format.color_back == Transparent) {
 			format.color_char = c.format.color_char;
 			format.flags      = c.format.flags;
-			} else format = c.format;
+		} else
+			format = c.format;
 		return *this;
 	}
 };
@@ -137,14 +144,45 @@ namespace PIScreenTypes {
 	virtual void tileSetFocusInternal(PIScreenTile *) {}
 };
 
+} // namespace PIScreenTypes
+
+
+// inline PIByteArray & operator <<(PIByteArray & s, const PIScreenTypes::Cell & v) {s << v.format.raw_format << v.symbol; return s;}
+// inline PIByteArray & operator >>(PIByteArray & s, PIScreenTypes::Cell & v) {s >> v.format.raw_format >> v.symbol; return s;}
+
+//! \relatesalso PIBinaryStream
+//! \~english Store operator
+//! \~russian Оператор сохранения
+BINARY_STREAM_WRITE(PIScreenTypes::Cell) {
+	s << v.format.raw_format << v.symbol;
+	return s;
+}
+
+//! \relatesalso PIBinaryStream
+//! \~english Restore operator
+//! \~russian Оператор извлечения
+BINARY_STREAM_READ(PIScreenTypes::Cell) {
+	s >> v.format.raw_format >> v.symbol;
+	return s;
 }
 
 
-inline PIByteArray & operator <<(PIByteArray & s, const PIScreenTypes::Cell & v) {s << v.format.raw_format << v.symbol; return s;}
-inline PIByteArray & operator >>(PIByteArray & s, PIScreenTypes::Cell & v) {s >> v.format.raw_format >> v.symbol; return s;}
+//! \relatesalso PIBinaryStream
+//! \~english Store operator
+//! \~russian Оператор сохранения
+BINARY_STREAM_WRITE(PIScreenTypes::TileEvent) {
+	s << v.type << v.data;
+	return s;
+}
+
+//! \relatesalso PIBinaryStream
+//! \~english Restore operator
+//! \~russian Оператор извлечения
+BINARY_STREAM_READ(PIScreenTypes::TileEvent) {
+	s >> v.type >> v.data;
+	return s;
+}
 
-inline PIByteArray & operator <<(PIByteArray & s, const PIScreenTypes::TileEvent & v) {s << v.type << v.data; return s;}
-inline PIByteArray & operator >>(PIByteArray & s, PIScreenTypes::TileEvent & v) {s >> v.type >> v.data; return s;}
 
 REGISTER_PIVARIANTSIMPLE(PIScreenTypes::TileEvent)
 

libs/main/console/piterminal.h

@@ -1,5 +1,8 @@
-/*! @file piterminal.h
- * @brief Virtual terminal
+/*! \file piterminal.h
+ * \ingroup Console
+ * \~\brief
+ * \~english Virtual terminal
+ * \~russian Виртуальный терминал
  */
 /*
     PIP - Platform Independent Primitives
@@ -23,16 +26,15 @@
 #ifndef PITERMINAL_H
 #define PITERMINAL_H
 
-#include "pip_console_export.h"
 #include "pikbdlistener.h"
+#include "pip_console_export.h"
 #include "piscreentypes.h"
 
 
-class PIP_CONSOLE_EXPORT PITerminal: public PIThread
-{
-	PIOBJECT_SUBCLASS(PITerminal, PIThread)
-public:
+class PIP_CONSOLE_EXPORT PITerminal: public PIThread {
+	PIOBJECT_SUBCLASS(PITerminal, PIThread);
 
+public:
 	//! Constructs %PITerminal
 	PITerminal();
 
@@ -50,12 +52,13 @@ public:
 
 	bool initialize();
 	void destroy();
+
 private:
 	void initPrivate();
 	void readConsole();
 	void getCursor(int & x, int & y);
 	uchar invertColor(uchar c);
-	void run();
+	void run() override;
 #ifndef WINDOWS
 	void parseInput(const PIString & s);
 	bool isCompleteEscSeq(const PIString & es);
@@ -70,7 +73,6 @@ private:
 	bool cursor_blink, cursor_visible;
 	PITimeMeasurer cursor_tm;
 	PIVector<PIVector<PIScreenTypes::Cell>> cells;
-
 };
 
 

libs/main/containers/picontainers.cpp

@@ -0,0 +1,35 @@
+/*
+    PIP - Platform Independent Primitives
+    Base macros for generic containers
+    Ivan Pelipenko peri4ko@yandex.ru
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "picontainers.h"
+
+
+const size_t minAlloc = 64;
+
+
+size_t _PIContainerConstantsBase::calcMinCountPoT(size_t szof) {
+	size_t ret = 0;
+	size_t elc = 1;
+	while (elc * szof < minAlloc) {
+		elc *= 2;
+		++ret;
+	}
+	// printf("calcMinCount sizeof = %d, min_count = %d, pot = %d\n", szof, elc, ret);
+	return ret;
+}

libs/main/containers/picontainers.h

@@ -1,12 +1,20 @@
-/*! @file picontainers.h
- * @brief Base for generic containers
- * 
- * This file declare all containers and useful macros
- * to use them
-*/
+//! \addtogroup Containers
+//! \{
+//! \file picontainers.h
+//! \brief
+//! \~english Base macros for generic containers
+//! \~russian Базовые макросы для контейнеров
+//! \~\authors
+//! \~english
+//! Ivan Pelipenko peri4ko@yandex.ru;
+//! Andrey Bychkov work.a.b@yandex.ru;
+//! \~russian
+//! Иван Пелипенко peri4ko@yandex.ru;
+//! Андрей Бычков work.a.b@yandex.ru;
+//! \~\}
 /*
     PIP - Platform Independent Primitives
-	Base for generic containers
+    Base macros for generic containers
     Ivan Pelipenko peri4ko@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
@@ -33,91 +41,156 @@
 #else
 #  include <malloc.h>
 #endif
+#include <algorithm>
+#include <functional>
 #include <initializer_list>
-#include <type_traits>
-#include <string.h>
 #include <new>
-#ifndef PIP_MEMALIGN_BYTES
-#  define PIP_MEMALIGN_BYTES (sizeof(void*)*4)
-#endif
-#ifdef WINDOWS
-#  ifdef CC_GCC
-#    define amalloc(s) __mingw_aligned_malloc(s, PIP_MEMALIGN_BYTES)
-#    define afree(p) __mingw_aligned_free(p)
-#  else
-#    ifdef CC_VC
-#      define amalloc(s) _aligned_malloc(s, PIP_MEMALIGN_BYTES)
-#      define afree(p) _aligned_free(p)
-#    endif
-#  endif
-#else
-#  define amalloc(s) aligned_alloc(PIP_MEMALIGN_BYTES, s)
-#  define afree(p) free(p)
-#endif
-
-
-#ifdef DOXYGEN
-
-/*!@brief Macro for iterate any container
- * \details Use this macros instead of standard "for"
- * to get read/write access to each element of container.
- * Pass direction is direct \n
- * Example: \snippet picontainers.cpp foreach
- */
-#  define piForeach(i,c)
-
-/*!@brief Macro for iterate any container only for read
- * \details Use this macros instead of standard "for"
- * to get read access to each element of container.
- * Pass direction is direct \n
- * Example: \snippet picontainers.cpp foreachC
- */
-#  define piForeachC(i,c)
-
-/*!@brief Macro for iterate any container with reverse direction
- * \details Use this macros instead of standard "for"
- * to get read/write access to each element of container.
- * Pass direction is reverse \n
- * Example: \snippet picontainers.cpp foreachR
- */
-#  define piForeachR(i,c)
-
-/*!@brief Macro for iterate any container only for read with reverse direction
- * \details Use this macros instead of standard "for"
- * to get read access to each element of container.
- * Pass direction is reverse \n
- * Example: \snippet picontainers.cpp foreachCR
- */
-#  define piForeachCR(i,c)
-
-#else
+#include <string.h>
+#include <type_traits>
 
 
 template<typename C>
-struct _reverse_wrapper {
-	C & c_;
-	_reverse_wrapper(C & c): c_(c) {}
-	_reverse_wrapper(const C & c): c_(const_cast<C&>(c)) {}
+class _PIReverseWrapper {
+public:
+	_PIReverseWrapper(C & c): c_(c) {}
+	_PIReverseWrapper(const C & c): c_(const_cast<C &>(c)) {}
 	typename C::reverse_iterator begin() { return c_.rbegin(); }
 	typename C::reverse_iterator end() { return c_.rend(); }
 	typename C::const_reverse_iterator begin() const { return c_.rbegin(); }
 	typename C::const_reverse_iterator end() const { return c_.rend(); }
+
+private:
+	C & c_;
 };
 
-template <typename C> _reverse_wrapper<C> _reverse_wrap(C & c) {return _reverse_wrapper<C>(c);}
-template <typename C> _reverse_wrapper<C> _reverse_wrap(const C & c) {return _reverse_wrapper<C>(c);}
+
+class PIP_EXPORT _PIContainerConstantsBase {
+public:
+	static size_t calcMinCountPoT(size_t szof);
+};
+
+template<typename T>
+class _PIContainerConstants {
+public:
+	static size_t minCountPoT() {
+		static const size_t ret = _PIContainerConstantsBase::calcMinCountPoT(sizeof(T));
+		return ret;
+	}
+};
 
 
+//! \brief
+//! \~english Template reverse wrapper over any container
+//! \~russian Шаблонная функция обертки любого контейнера для обратного доступа через итераторы
+template<typename C>
+_PIReverseWrapper<C> PIReverseWrap(C & c) {
+	return _PIReverseWrapper<C>(c);
+}
+template<typename C>
+_PIReverseWrapper<C> PIReverseWrap(const C & c) {
+	return _PIReverseWrapper<C>(c);
+}
+
+
+//! \brief
+//! \~english Macro for short replacement of standart "for"
+//! \~russian Макрос для короткой записи стандартного цикла "for"
+//! \~\param c
+//! \~english Iteration times in loop
+//! \~russian Количество итераций цикла
 #define piForTimes(c)     for (int _i##c = 0; _i##c < c; ++_i##c)
 
-#  define piForeach(i,c) for(i : c)
-#  define piForeachC(i,c) for(const i : c)
-#  define piForeachR(i,c) for(i : _reverse_wrap(c))
-#  define piForeachRC(i,c) for(const i : _reverse_wrap(c))
 
+//! \brief
+//! \~english Macro for iterate any container
+//! \~russian Макрос для перебора любых контейнеров
+//! \~\deprecated
+//! \~english Deprecated, using only for backward compatibility. Use
+//! [C++ Range-based for loop](https://en.cppreference.com/w/cpp/language/range-for).
+//! \~russian Устарело, используется только для обратной совместимости. Используйте
+//! [C++ Range-based for loop](https://ru.cppreference.com/w/cpp/language/range-for).
+//! \~\details
+//! \~english Get read/write access to each element of container.
+//! Iterating in forward direction.
+//! Example of using:
+//! \~russian Перебор всех элементов контейнера с доступом на чтение и запись.
+//! Перебор осуществляется в прямом порядке.
+//! Пример использования:
+//! \~\code
+//! PIVector<int> vec;
+//! vec << 1 << 2 << 3;
+//! piForeach(int & i, vec) piCout << i;
+//! // 1
+//! // 2
+//! // 3
+//! piForeach(int & i, vec) i++;
+//! piForeach(int & i, vec) piCout << i;
+//! // 2
+//! // 3
+//! // 4
+//! \endcode
+//! \sa \a piForeachC, \a piForeachR, \a piForeachRC
+#define piForeach(i, c)   for (i: c)
+
+//! \brief
+//! \~english Macro for iterate any container
+//! \~russian Макрос для перебора любых контейнеров
+//! \~\deprecated
+//! \~english Deprecated, using only for backward compatibility. Use
+//! [C++ Range-based for loop](https://en.cppreference.com/w/cpp/language/range-for).
+//! \~russian Устарело, используется только для обратной совместимости. Используйте
+//! [C++ Range-based for loop](https://ru.cppreference.com/w/cpp/language/range-for).
+//! \~\details
+//! \~english Get read only access to each element of container.
+//! Iterating in forward direction.
+//! \~russian Перебор всех элементов контейнера с доступом только на чтение.
+//! Перебор осуществляется в прямом порядке.
+//! \~ \sa \a piForeach, \a piForeachR, \a piForeachRC
+#define piForeachC(i, c)  for (const i: c)
+
+//! \brief
+//! \~english Macro for iterate any container
+//! \~russian Макрос для перебора любых контейнеров
+//! \~\deprecated
+//! \~english Deprecated, using only for backward compatibility. Use
+//! [C++ Range-based for loop](https://en.cppreference.com/w/cpp/language/range-for).
+//! \~russian Устарело, используется только для обратной совместимости. Используйте
+//! [C++ Range-based for loop](https://ru.cppreference.com/w/cpp/language/range-for).
+//! \~\details
+//! \~english Get read/write access to each element of container.
+//! Iterating in backward direction.
+//! \~russian Перебор всех элементов контейнера с доступом на чтение и запись.
+//! Перебор осуществляется в обратном порядке.
+//! \~ \sa \a piForeach, \a piForeachC, \a piForeachRC
+#define piForeachR(i, c)  for (i: PIReverseWrap(c))
+
+//! \brief
+//! \~english Macro for iterate any container
+//! \~russian Макрос для перебора любых контейнеров
+//! \~\deprecated
+//! \~english Deprecated, using only for backward compatibility. Use
+//! [C++ Range-based for loop](https://en.cppreference.com/w/cpp/language/range-for).
+//! \~russian Устарело, используется только для обратной совместимости. Используйте
+//! [C++ Range-based for loop](https://ru.cppreference.com/w/cpp/language/range-for).
+//! \~\details
+//! \~english Get read only access to each element of container.
+//! Iterating in backward direction. Also has alias **piForeachCR**
+//! \~russian Перебор всех элементов контейнера с доступом только на чтение.
+//! Перебор осуществляется в обратном порядке. Также можно писать **piForeachCR**
+//! \~ \sa \a piForeach, \a piForeachC, \a piForeachR
+#define piForeachRC(i, c) for (const i: PIReverseWrap(c))
 #define piForeachCR       piForeachRC
 
-#endif // DOXYGEN
 
+//! \~\brief
+//! \~english Reshape order enum for reshape() function.
+//! \~russian Порядок обхода для функции изменения размерности reshape().
+//! \~ \sa \a PIVector::reshape(), \a PIDeque::reshape()
+enum ReshapeOrder {
+	ReshapeByRow /*! \~english Traversing elements by line, just as they stay in memory  \~russian Обход элементов построчно, так же как они
+	                находятся в памяти */
+		,
+	ReshapeByColumn /*! \~english Traversing elements by column \~russian Обход элементов по столбцам */,
+};
 
 #endif // PICONTAINERS_H

libs/main/containers/picontainersmodule.h

@@ -1,6 +1,6 @@
 /*
     PIP - Platform Independent Primitives
-	Module includes
+    Containers
     Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
@@ -16,16 +16,177 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+//! \defgroup Containers Containers
+//! \~\brief
+//! \~english Various standart containers realization
+//! \~russian Различные классы контейнеров
+//!
+//! \~\details
+//! \~english \section cmake_module_Containers Building with CMake
+//! \~russian \section cmake_module_Containers Сборка с использованием CMake
+//!
+//! \~\code
+//! find_package(PIP REQUIRED)
+//! target_link_libraries([target] PIP)
+//! \endcode
+//!
+//! \~english \section containers_module_list Content
+//! \~russian \section containers_module_list Состав
+//!
+//! \~english
+//!     Class     | Description
+//! ------------- | -----------
+//! \a PIVector   | Linear array, fast back insert
+//! \a PIDeque    | Linear array, fast back and front insert
+//! \a PIMap      | Dictionary container, key/value array
+//! \a PISet      | Set container
+//! \a PIStack    | Stack
+//! \a PIQueue    | Queue
+//! \a PIPair     | Pair
+//! \a PIVector2D | Linear 2D rectangle array
+//!
+//! \~russian
+//!     Класс     | Описание
+//! ------------- | -----------
+//! \a PIVector   | Линейный массив, быстрое добавление в конец
+//! \a PIDeque    | Линейный массив, быстрое добавление вначало и конец
+//! \a PIMap      | Массив ключ/значение, словарь
+//! \a PISet      | Множество
+//! \a PIStack    | Стек
+//! \a PIQueue    | Очередь
+//! \a PIPair     | Пара
+//! \a PIVector2D | Линейный двумерный прямоугольный массив
+//!
+//!
+//! \~english \section stl_iterators STL-Style Iterators
+//! \~russian \section stl_iterators Итераторы в стиле STL
+//! \~english
+//! \brief They are compatible with Qt's and STL's generic algorithms and are optimized for speed.
+//! \details
+//! For each container class, there are two STL-style iterator types:
+//! one that provides read-only access and one that provides read-write access.
+//! Read-only iterators should be used wherever possible
+//! because they are faster than read-write iterators.
+//! Read-only iterator - `const_iterator.`
+//! Read-write iterator - `iterator.`
+//!
+//! The API of the STL iterators is modelled on pointers in an array.
+//! For example, the `++` operator advances the iterator to the next item,
+//! and the `*` operator returns the item that the iterator points to.
+//! The `iterator` type is just a `typedef` for `T *`,
+//! and the `const_iterator` type is just a `typedef` for `const T *`.
+//! STL-style iterators point directly at items.
+//! The `begin()` function of a container
+//! returns an iterator that points to the first item in the container.
+//! The `end()` function of a container returns an iterator to the imaginary item
+//! one position past the last item in the container.
+//! `end()` marks an invalid position; it must never be dereferenced.
+//! It is typically used in a loop's break condition.
+//!
+//! Example:
+//! \code
+//! for (PIVector<int>::const_iterator i = v.begin(); i != v.end(); ++i) piCout << *i;
+//! std::for_each(v.begin(), v.end(), [](int n){std::cout << n << ' ';});
+//! \endcode
+//!
+//! If the list is empty, `begin()` equals `end()`, so we never execute the loop.
+//!
+//! ![iterators](doc/images/pivector_rbegin.png)
+//!
+//! The following table summarizes the STL-style iterators' API:
+//! Expression | Behavior
+//! ---------- | --------------------
+//! `*i`       | Returns the current item
+//! `++i`      | Advances the iterator to the next item
+//! `i += n`   | Advances the iterator by `n` items
+//! `--i`      | Moves the iterator back by one item
+//! `i -= n`   | Moves the iterator back by `n` items
+//! `i - j`    | Returns the number of items between iterators `i` and `j`
+//!
+//! The `++` and `--` operators are available both as prefix `(++i, --i)`
+//! and postfix `(i++, i--)` operators.
+//! The prefix versions modify the iterators
+//! and return a reference to the modified iterator;
+//! the postfix versions take a copy of the iterator before they modify it, and return that copy.
+//! In expressions where the return value is ignored,
+//! we recommend that you use the prefix operators `(++i, --i)`, as these are slightly faster.
+//! For non-const iterator types, the return value of the unary `*` operator
+//! can be used on the left side of the assignment operator.
+//!
+//! \~russian
+//! \brief Они совместимы с базовыми алгоритмами Qt и STL и оптимизированы по скорости.
+//! \details
+//! Для каждого контейнерного класса есть два типа итераторов в стиле STL:
+//! один из них предоставляет доступ только для чтения, а другой - доступ для чтения-записи.
+//! Итераторы только для чтения должны использоваться везде, где это только возможно,
+//! так как они быстрее, чем итераторы для чтения-записи.
+//! Итератор только для чтения - `const_iterator.`
+//! Итератор для чтения-записи - `iterator.`
+//!
+//! API итераторов в стиле STL сделан по образцу указателей в массиве.
+//! Например, оператор `++` перемещает итератор к следующему элементу,
+//! а оператор `*` возвращает элемент, на который позиционирован итератор.
+//! Тип `iterator` - это как `typedef` для `T *`,
+//! а тип `const_iterator` - как `typedef` для `const T *`.
+//! Итераторы в стиле STL указывают непосредственно на элемент.
+//! Функция контейнера `begin()` возвращает итератор, указывающий на первый элемент контейнера.
+//! Функция контейнера `end()` возвращает итератор, указывающий на воображаемый элемент,
+//! находящийся в позиции, следующей за последним элементом контейнера.
+//! `end()` обозначает несуществующую позицию;
+//! он никогда не должен разыменовываться.
+//! Обычно, он используется, как условие выхода из цикла.
+//!
+//! Например:
+//! \code
+//! for (PIVector<int>::const_iterator i = v.begin(); i != v.end(); ++i) piCout << *i;
+//! std::for_each(v.begin(), v.end(), [](int n){std::cout << n << ' ';});
+//! \endcode
+//!
+//! Если список пуст, то begin() равен end(), поэтому цикл никогда не выполнится.
+//!
+//! ![итераторы](doc/images/pivector_rbegin.png)
+//!
+//! В следующей таблице подводится итог API итераторов в стиле STL:
+//! Выражение | Поведение
+//! --------- | --------------------
+//! `*i`      | Возвращает текущий элемент
+//! `++i`     | Перемещает итератор к следующему элементу
+//! `i += n`  | Перемещает итератор вперед на `n` элементов
+//! `--i`     | Перемещает итератор на один элемент назад
+//! `i -= n`  | Перемещает итератор назад на `n` элементов
+//! `i - j`   | Возвращает количество элементов, находящихся между итераторами `i` и `j`
+//!
+//! Оба оператора `++` и `--` могут использоваться и как префиксные `(++i, --i)`
+//! и как постфиксные `(i++, i--)` операторы.
+//! Префиксная версия изменяет итератор, и возвращает ссылку на измененный итератор;
+//! постфиксная версия, берет копию итератора перед его изменением, и возвращает эту копию.
+//! В выражениях, в которых возвращаемое значение игнорируется,
+//! мы рекомендуем использовать префиксную версию `(++i, --i)`,
+//! так как она несколько быстрее.
+//!
+//! Для неконстантных итераторов, возвращаемое значение унарного оператора `*`
+//! может быть использовано с левой стороны от оператора присваивания.
+//!
+//!
+//! \authors
+//! \~english
+//! Ivan Pelipenko peri4ko@yandex.ru;
+//! Andrey Bychkov work.a.b@yandex.ru;
+//! \~russian
+//! Иван Пелипенко peri4ko@yandex.ru;
+//! Андрей Бычков work.a.b@yandex.ru;
+
 
 #ifndef PICONTAINERSMODULE_H
 #define PICONTAINERSMODULE_H
 
-#include "pivector.h"
 #include "pideque.h"
 #include "pimap.h"
 #include "piqueue.h"
 #include "piset.h"
 #include "pistack.h"
+#include "pivector.h"
 #include "pivector2d.h"
 
+
 #endif // PICONTAINERSMODULE_H

libs/main/containers/pideque.h

@@ -1,8 +1,17 @@
-/*! @file pideque.h
- * @brief Dynamic array of any type
- *
- * This file declares PIDeque
-*/
+//! \addtogroup Containers
+//! \{
+//! \file pideque.h
+//! \brief
+//! \~english Declares \a PIDeque
+//! \~russian Объявление \a PIDeque
+//! \~\authors
+//! \~english
+//! Ivan Pelipenko peri4ko@yandex.ru;
+//! Andrey Bychkov work.a.b@yandex.ru;
+//! \~russian
+//! Иван Пелипенко peri4ko@yandex.ru;
+//! Андрей Бычков work.a.b@yandex.ru;
+//! \~\}
 /*
     PIP - Platform Independent Primitives
     Dynamic array of any type
@@ -28,212 +37,1133 @@
 #include "picontainers.h"
 
 
+//! \addtogroup Containers
+//! \{
+//! \class PIDeque
+//! \brief
+//! \~english Sequence two-way linear container - dynamic size array of any type.
+//! \~russian Последовательный двухсторонний контейнер с линейной памятью - динамический массив любого типа.
+//! \~\}
+//! \details
+//! \~english
+//! The elements are stored contiguously,
+//! which means that elements can be accessed not only through iterators,
+//! but also using offsets to regular pointers to elements.
+//! This means that a pointer to an element of a PIDeque may be passed to any function
+//! that expects a pointer to an element of an array.
+//! To add elements you can use functions \a append() and \a insert(),
+//! to remove elements you can use functions \a remove() and \a removeOne(), \a removeWhere().
+//! Change size by function \a resize() and \a assign().
+//! Items in an array are numbered, starting from zero.
+//! This number is called the item's index.
+//! So the first item has index 0, the last has index `size() - 1`.
+//! A set of various convenient functions is also available for the array,
+//! for example: \a indexOf(), \a contains(), \a entries(), \a isEmpty(), \a isNotEmpty(),
+//! \a every(), \a any(), \a forEach(), \a indexWhere(), \a getRange(), \a sort(),
+//! \a map(), \a reduce(), \a filter(), \a flatten(), \a reshape() and others.
+//!
+//! The storage of the PIDeque is handled automatically,
+//! being expanded as needed.
+//! PIDeque usually occupy more space than \a PIVector,
+//! because more memory is allocated to handle future growth
+//! from both the beginning and the end.
+//! This way a PIDeque does not need to reallocate each time an element is inserted,
+//! but only when the additional memory is exhausted.
+//! The total amount of allocated memory can be queried using \a capacity() function.
+//! Reallocations are usually costly operations in terms of performance.
+//! The \a reserve() function can be used to eliminate reallocations
+//! if the number of elements is known beforehand.
+//!
+//! The complexity (efficiency) of common operations on PIDeque is as follows:
+//! - Random access - constant O(1)
+//! - Insertion or removal of elements at the end or begin - amortized constant O(1)
+//! - Insertion or removal of elements - linear in the distance to the end of the array O(n)
+//!
+//! \~russian
+//! Элементы хранятся непрерывно, а значит доступны не только через итераторы,
+//! но и с помощью смещений для обычных указателей на элементы.
+//! Это означает, что указатель на элемент PIDeque может передаваться в любую функцию,
+//! ожидающую указатель на элемент массива.
+//! Добавить элементы можно с помощью функции \a append() или \a insert(),
+//! а удалить с помощью \a remove() или \a removeOne(), \a removeWhere().
+//! Изменить размер можно функцией \a resize() или \a assign().
+//! Массив индексируется с нуля:
+//! первый элемент массива имеет индекс, равный `0`,
+//! а индекс последнего элемента равен `size() - 1`.
+//! Также для массива доступен набор различных удобных функций,
+//! например: \a indexOf(), \a contains(), \a entries(), \a isEmpty(), \a isNotEmpty(),
+//! \a every(), \a any(), \a forEach(), \a indexWhere(), \a getRange(), \a sort(),
+//! \a map(), \a reduce(), \a filter(), \a flatten(), \a reshape() и другие.
+//!
+//! Память PIDeque обрабатывается автоматически,
+//! расширяясь по мере необходимости.
+//! PIDeque занимает больше места, чем \a PIVector, поскольку
+//! больше памяти выделяется для обработки будущего роста и с начала и с конца.
+//! Таким образом, память для PIDeque требуется выделять
+//! не при каждой вставке элемента, а только после исчерпания дополнительной памяти.
+//! Общий объём выделенной памяти можно получить с помощью функции \a capacity().
+//!
+//! Выделение памяти обычно является дорогостоящей операцией
+//! с точки зрения производительности.
+//! Функцию \a reserve() можно использовать для исключения выделения памяти,
+//! если количество элементов известно заранее.
+//!
+//! Сложность (эффективность) обычных операций над PIDeque следующая:
+//! - Произвольный доступ — постоянная O(1)
+//! - Вставка и удаление элементов в конце или начале — амортизированная постоянная O(1)
+//! - Вставка и удаление элементов — линейная по расстоянию до конца массива O(n)
+//!
+//! \~\sa \a PIVector, \a PIMap
 template<typename T>
 class PIDeque {
 public:
-	inline PIDeque(): pid_data(0), pid_size(0), pid_rsize(0), pid_start(0) {
+	typedef bool (*CompareFunc)(const T &, const T &);
+	typedef T value_type;
+	typedef T * pointer;
+	typedef const T * const_pointer;
+	typedef T & reference;
+	typedef const T & const_reference;
+	typedef size_t size_type;
+
+	//! \~english Constructs an empty array.
+	//! \~russian Создает пустой массив.
+	inline PIDeque() { PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T)) }
+
+	//! \~english Copy constructor.
+	//! \~russian Копирующий конструктор.
+	inline PIDeque(const PIDeque<T> & other) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-	}
-	inline PIDeque(const PIDeque<T> & other): pid_data(0), pid_size(0), pid_rsize(0), pid_start(0) {
-		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-		alloc(other.pid_size, true);
+		alloc_forward(other.pid_size);
 		newT(pid_data + pid_start, other.pid_data + other.pid_start, pid_size);
 	}
-	inline PIDeque(std::initializer_list<T> init_list): pid_data(0), pid_size(0), pid_rsize(0), pid_start(0) {
+
+	//! \~english Contructs array from
+	//! [C++11 initializer list](https://en.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~russian Создает массив из
+	//! [списка инициализации C++11](https://ru.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~\details
+	//! \~\code
+	//! PIDeque <int> v{1,2,3};
+	//! piCout << v; // {1, 2, 3}
+	//! \endcode
+	inline PIDeque(std::initializer_list<T> init_list) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-		alloc(init_list.size(), true);
+		alloc_forward(init_list.size());
 		newT(pid_data, init_list.begin(), init_list.size());
 	}
-	inline PIDeque(const T * data, size_t size): pid_data(0), pid_size(0), pid_rsize(0), pid_start(0) {
+
+	//! \~english Contructs array from raw `data`.
+	//! This constructor reserve `size` and copy from `data` pointer.
+	//! \~russian Создает массив из указателя на данные `data` и размер `size`.
+	//! То есть выделяет память для `size` элементов и копирует данные из указателя `data`.
+	inline PIDeque(const T * data, size_t size) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-		alloc(size, true);
+		alloc_forward(size);
 		newT(pid_data + pid_start, data, pid_size);
 	}
-	inline PIDeque(size_t pid_size, const T & f = T()): pid_data(0), pid_size(0), pid_rsize(0), pid_start(0) {
+
+	//! \~english Contructs array with size `size` filled elements `e`.
+	//! \~russian Создает массив из `size` элементов заполненных `e`.
+	inline explicit PIDeque(size_t pid_size, const T & e = T()) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-		resize(pid_size, f);
+		expand(pid_size, e);
 	}
-	inline PIDeque(size_t piv_size, std::function<T(size_t)> f): pid_data(0), pid_size(0), pid_rsize(0), pid_start(0) {
+
+	//! \~english Contructs array with size `size` and elements created by function `f(size_t i)`.
+	//! \~russian Создает массив из `size` элементов созданных функцией `f(size_t i)`.
+	//! \~\details
+	//! \~english Can use
+	//! [Lambda expressions](https://en.cppreference.com/w/cpp/language/lambda)
+	//! as constructor argument.
+	//! \~russian Позволяет передавать
+	//! [Лямбда-выражения](https://ru.cppreference.com/w/cpp/language/lambda)
+	//! для создания элементов в конструкторе.
+	//! \~\code
+	//! PIDeque <int> v(5, [](size_t i){return i*2;});
+	//! piCout << v; // {0, 2, 4, 6, 8}
+	//! \endcode
+	inline PIDeque(size_t piv_size, std::function<T(size_t i)> f) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-		resize(piv_size, f);
+		expand(piv_size, f);
 	}
-	inline PIDeque(PIDeque<T> && other): pid_data(other.pid_data), pid_size(other.pid_size), pid_rsize(other.pid_rsize), pid_start(other.pid_start) {
+
+	//! \~english Move constructor.
+	//! \~russian Перемещающий конструктор.
+	inline PIDeque(PIDeque<T> && other) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
+		pid_data  = other.pid_data;
+		pid_size  = other.pid_size;
+		pid_rsize = other.pid_rsize;
+		pid_start = other.pid_start;
 		other._reset();
 	}
-	inline virtual ~PIDeque() {
+
+	inline ~PIDeque() {
 		PIINTROSPECTION_CONTAINER_DELETE(T)
 		PIINTROSPECTION_CONTAINER_FREE(T, (pid_rsize))
 		deleteT(pid_data + pid_start, pid_size);
 		dealloc();
-		_reset();
 	}
 
+	//! \~english Assign operator.
+	//! \~russian Оператор присваивания.
 	inline PIDeque<T> & operator=(const PIDeque<T> & other) {
 		if (this == &other) return *this;
-		deleteT(pid_data + pid_start, pid_size);
-		alloc(other.pid_size, true);
+		clear();
+		alloc_forward(other.pid_size);
 		newT(pid_data + pid_start, other.pid_data + other.pid_start, pid_size);
 		return *this;
 	}
 
+	//! \~english Assign move operator.
+	//! \~russian Оператор перемещающего присваивания.
 	inline PIDeque<T> & operator=(PIDeque<T> && other) {
 		swap(other);
 		return *this;
 	}
 
-	typedef T value_type;
-
-	enum ReshapeOrder {
-		byRow,
-		byColumn
-	};
-
 	class iterator {
 		friend class PIDeque<T>;
+
 	private:
-		inline iterator(PIDeque<T> * v, size_t p): parent(v), pos(p) {}
+		inline iterator(PIDeque<T> * v, ssize_t p): parent(v), pos(p) {}
 		PIDeque<T> * parent;
-		size_t pos;
+		ssize_t pos;
+
 	public:
+		typedef T value_type;
+		typedef T * pointer;
+		typedef T & reference;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::random_access_iterator_tag iterator_category;
+
 		inline iterator(): parent(0), pos(0) {}
+
 		inline T & operator*() { return (*parent)[pos]; }
 		inline const T & operator*() const { return (*parent)[pos]; }
-		inline void operator ++() {++pos;}
-		inline void operator ++(int) {++pos;}
-		inline void operator --() {--pos;}
-		inline void operator --(int) {--pos;}
+		inline T & operator->() { return (*parent)[pos]; }
+		inline const T & operator->() const { return (*parent)[pos]; }
+
+		inline iterator & operator++() {
+			++pos;
+			return *this;
+		}
+		inline iterator operator++(int) {
+			const auto tmp = *this;
+			++*this;
+			return tmp;
+		}
+		inline iterator & operator--() {
+			--pos;
+			return *this;
+		}
+		inline iterator operator--(int) {
+			const auto tmp = *this;
+			--*this;
+			return tmp;
+		}
+
+		inline iterator & operator+=(const iterator & it) {
+			pos += it.pos;
+			return *this;
+		}
+		inline iterator & operator+=(size_t p) {
+			pos += p;
+			return *this;
+		}
+		inline iterator & operator-=(const iterator & it) {
+			pos -= it.pos;
+			return *this;
+		}
+		inline iterator & operator-=(size_t p) {
+			pos -= p;
+			return *this;
+		}
+
+		friend inline iterator operator-(size_t p, const iterator & it) { return it - p; }
+		friend inline iterator operator-(const iterator & it, size_t p) {
+			auto tmp = it;
+			tmp -= p;
+			return tmp;
+		}
+		friend inline std::ptrdiff_t operator-(const iterator & it1, const iterator & it2) { return it1.pos - it2.pos; }
+
+		friend inline iterator operator+(size_t p, const iterator & it) { return it + p; }
+		friend inline iterator operator+(const iterator & it, size_t p) {
+			auto tmp = it;
+			tmp += p;
+			return tmp;
+		}
+
 		inline bool operator==(const iterator & it) const { return (pos == it.pos); }
 		inline bool operator!=(const iterator & it) const { return (pos != it.pos); }
+		friend inline bool operator<(const iterator & it1, const iterator & it2) { return it1.pos < it2.pos; }
+		friend inline bool operator<=(const iterator & it1, const iterator & it2) { return it1.pos <= it2.pos; }
+		friend inline bool operator>(const iterator & it1, const iterator & it2) { return it1.pos > it2.pos; }
+		friend inline bool operator>=(const iterator & it1, const iterator & it2) { return it1.pos >= it2.pos; }
 	};
 
 	class const_iterator {
 		friend class PIDeque<T>;
+
 	private:
-		inline const_iterator(const PIDeque<T> * v, size_t p): parent(v), pos(p) {}
+		inline const_iterator(const PIDeque<T> * v, ssize_t p): parent(v), pos(p) {}
 		const PIDeque<T> * parent;
-		size_t pos;
+		ssize_t pos;
+
 	public:
+		typedef T value_type;
+		typedef T * pointer;
+		typedef T & reference;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::random_access_iterator_tag iterator_category;
+
 		inline const_iterator(): parent(0), pos(0) {}
+
 		inline const T & operator*() const { return (*parent)[pos]; }
-		inline void operator ++() {++pos;}
-		inline void operator ++(int) {++pos;}
-		inline void operator --() {--pos;}
-		inline void operator --(int) {--pos;}
+		inline const T & operator->() const { return (*parent)[pos]; }
+
+		inline const_iterator & operator++() {
+			++pos;
+			return *this;
+		}
+		inline const_iterator operator++(int) {
+			const auto tmp = *this;
+			++*this;
+			return tmp;
+		}
+		inline const_iterator & operator--() {
+			--pos;
+			return *this;
+		}
+		inline const_iterator operator--(int) {
+			const auto tmp = *this;
+			--*this;
+			return tmp;
+		}
+
+		inline const_iterator & operator+=(const const_iterator & it) {
+			pos += it.pos;
+			return *this;
+		}
+		inline const_iterator & operator+=(size_t p) {
+			pos += p;
+			return *this;
+		}
+		inline const_iterator & operator-=(const const_iterator & it) {
+			pos -= it.pos;
+			return *this;
+		}
+		inline const_iterator & operator-=(size_t p) {
+			pos -= p;
+			return *this;
+		}
+
+		friend inline const_iterator operator-(size_t p, const const_iterator & it) { return it - p; }
+		friend inline const_iterator operator-(const const_iterator & it, size_t p) {
+			auto tmp = it;
+			tmp -= p;
+			return tmp;
+		}
+		friend inline std::ptrdiff_t operator-(const const_iterator & it1, const const_iterator & it2) { return it1.pos - it2.pos; }
+
+		friend inline const_iterator operator+(size_t p, const const_iterator & it) { return it + p; }
+		friend inline const_iterator operator+(const const_iterator & it, size_t p) {
+			auto tmp = it;
+			tmp += p;
+			return tmp;
+		}
+
 		inline bool operator==(const const_iterator & it) const { return (pos == it.pos); }
 		inline bool operator!=(const const_iterator & it) const { return (pos != it.pos); }
+		friend inline bool operator<(const const_iterator & it1, const const_iterator & it2) { return it1.pos < it2.pos; }
+		friend inline bool operator<=(const const_iterator & it1, const const_iterator & it2) { return it1.pos <= it2.pos; }
+		friend inline bool operator>(const const_iterator & it1, const const_iterator & it2) { return it1.pos > it2.pos; }
+		friend inline bool operator>=(const const_iterator & it1, const const_iterator & it2) { return it1.pos >= it2.pos; }
 	};
 
 	class reverse_iterator {
 		friend class PIDeque<T>;
+
 	private:
-		inline reverse_iterator(PIDeque<T> * v, size_t p): parent(v), pos(p) {}
+		inline reverse_iterator(PIDeque<T> * v, ssize_t p): parent(v), pos(p) {}
 		PIDeque<T> * parent;
-		size_t pos;
+		ssize_t pos;
+
 	public:
+		typedef T value_type;
+		typedef T * pointer;
+		typedef T & reference;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::random_access_iterator_tag iterator_category;
+
 		inline reverse_iterator(): parent(0), pos(0) {}
+
 		inline T & operator*() { return (*parent)[pos]; }
 		inline const T & operator*() const { return (*parent)[pos]; }
-		inline void operator ++() {--pos;}
-		inline void operator ++(int) {--pos;}
-		inline void operator --() {++pos;}
-		inline void operator --(int) {++pos;}
+		inline T & operator->() { return (*parent)[pos]; }
+		inline const T & operator->() const { return (*parent)[pos]; }
+
+		inline reverse_iterator & operator++() {
+			--pos;
+			return *this;
+		}
+		inline reverse_iterator operator++(int) {
+			const auto tmp = *this;
+			--*this;
+			return tmp;
+		}
+		inline reverse_iterator & operator--() {
+			++pos;
+			return *this;
+		}
+		inline reverse_iterator operator--(int) {
+			const auto tmp = *this;
+			++*this;
+			return tmp;
+		}
+
+		inline reverse_iterator & operator+=(const reverse_iterator & it) {
+			pos -= it.pos;
+			return *this;
+		}
+		inline reverse_iterator & operator+=(size_t p) {
+			pos -= p;
+			return *this;
+		}
+		inline reverse_iterator & operator-=(const reverse_iterator & it) {
+			pos += it.pos;
+			return *this;
+		}
+		inline reverse_iterator & operator-=(size_t p) {
+			pos += p;
+			return *this;
+		}
+
+		friend inline reverse_iterator operator-(size_t p, const reverse_iterator & it) { return it - p; }
+		friend inline reverse_iterator operator-(const reverse_iterator & it, size_t p) {
+			auto tmp = it;
+			tmp -= p;
+			return tmp;
+		}
+		friend inline std::ptrdiff_t operator-(const reverse_iterator & it1, const reverse_iterator & it2) { return it2.pos - it1.pos; }
+
+		friend inline reverse_iterator operator+(size_t p, const reverse_iterator & it) { return it + p; }
+		friend inline reverse_iterator operator+(const reverse_iterator & it, size_t p) {
+			auto tmp = it;
+			tmp += p;
+			return tmp;
+		}
+
 		inline bool operator==(const reverse_iterator & it) const { return (pos == it.pos); }
 		inline bool operator!=(const reverse_iterator & it) const { return (pos != it.pos); }
+		friend inline bool operator<(const reverse_iterator & it1, const reverse_iterator & it2) { return it1.pos < it2.pos; }
+		friend inline bool operator<=(const reverse_iterator & it1, const reverse_iterator & it2) { return it1.pos <= it2.pos; }
+		friend inline bool operator>(const reverse_iterator & it1, const reverse_iterator & it2) { return it1.pos > it2.pos; }
+		friend inline bool operator>=(const reverse_iterator & it1, const reverse_iterator & it2) { return it1.pos >= it2.pos; }
 	};
 
 	class const_reverse_iterator {
 		friend class PIDeque<T>;
+
 	private:
-		inline const_reverse_iterator(const PIDeque<T> * v, size_t p): parent(v), pos(p) {}
+		inline const_reverse_iterator(const PIDeque<T> * v, ssize_t p): parent(v), pos(p) {}
 		const PIDeque<T> * parent;
-		size_t pos;
+		ssize_t pos;
+
 	public:
+		typedef T value_type;
+		typedef T * pointer;
+		typedef T & reference;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::random_access_iterator_tag iterator_category;
+
 		inline const_reverse_iterator(): parent(0), pos(0) {}
 		inline const T & operator*() const { return (*parent)[pos]; }
-		inline void operator ++() {--pos;}
-		inline void operator ++(int) {--pos;}
-		inline void operator --() {++pos;}
-		inline void operator --(int) {++pos;}
+		inline const T & operator->() const { return (*parent)[pos]; }
+
+		inline const_reverse_iterator & operator++() {
+			--pos;
+			return *this;
+		}
+		inline const_reverse_iterator operator++(int) {
+			const auto tmp = *this;
+			--*this;
+			return tmp;
+		}
+		inline const_reverse_iterator & operator--() {
+			++pos;
+			return *this;
+		}
+		inline const_reverse_iterator operator--(int) {
+			const auto tmp = *this;
+			++*this;
+			return tmp;
+		}
+
+		inline const_reverse_iterator & operator+=(const const_reverse_iterator & it) {
+			pos -= it.pos;
+			return *this;
+		}
+		inline const_reverse_iterator & operator+=(size_t p) {
+			pos -= p;
+			return *this;
+		}
+		inline const_reverse_iterator & operator-=(const const_reverse_iterator & it) {
+			pos += it.pos;
+			return *this;
+		}
+		inline const_reverse_iterator & operator-=(size_t p) {
+			pos += p;
+			return *this;
+		}
+
+		friend inline const_reverse_iterator operator-(size_t p, const const_reverse_iterator & it) { return it - p; }
+		friend inline const_reverse_iterator operator-(const const_reverse_iterator & it, size_t p) {
+			auto tmp = it;
+			tmp -= p;
+			return tmp;
+		}
+		friend inline std::ptrdiff_t operator-(const const_reverse_iterator & it1, const const_reverse_iterator & it2) {
+			return it2.pos - it1.pos;
+		}
+
+		friend inline const_reverse_iterator operator+(size_t p, const const_reverse_iterator & it) { return it + p; }
+		friend inline const_reverse_iterator operator+(const const_reverse_iterator & it, size_t p) {
+			auto tmp = it;
+			tmp += p;
+			return tmp;
+		}
+
 		inline bool operator==(const const_reverse_iterator & it) const { return (pos == it.pos); }
 		inline bool operator!=(const const_reverse_iterator & it) const { return (pos != it.pos); }
+		friend inline bool operator<(const const_reverse_iterator & it1, const const_reverse_iterator & it2) { return it1.pos < it2.pos; }
+		friend inline bool operator<=(const const_reverse_iterator & it1, const const_reverse_iterator & it2) { return it1.pos <= it2.pos; }
+		friend inline bool operator>(const const_reverse_iterator & it1, const const_reverse_iterator & it2) { return it1.pos > it2.pos; }
+		friend inline bool operator>=(const const_reverse_iterator & it1, const const_reverse_iterator & it2) { return it1.pos >= it2.pos; }
 	};
 
+
+	//! \~english Iterator to the first element.
+	//! \~russian Итератор на первый элемент.
+	//! \~\details ![begin, end](doc/images/pivector_begin.png)
+	//!
+	//! \~english If the array is empty, the returned iterator is equal to \a end().
+	//! \~russian Если массив - пуст, возвращаемый итератор будет равен \a end().
+	//! \~\return \ref stl_iterators
+	//! \~\sa \a end(), \a rbegin(), \a rend()
 	inline iterator begin() { return iterator(this, 0); }
+
+	//! \~english Iterator to the element following the last element.
+	//! \~russian Итератор на элемент, следующий за последним элементом.
+	//! \~\details ![begin, end](doc/images/pivector_begin.png)
+	//!
+	//! \~english This element acts as a placeholder;
+	//! attempting to access it results in undefined behavior.
+	//! \~russian Этот элемент существует лишь условно,
+	//! попытка доступа к нему приведёт к выходу за разрешенную память.
+	//! \~\return \ref stl_iterators
+	//! \~\sa \a begin(), \a rbegin(), \a rend()
 	inline iterator end() { return iterator(this, pid_size); }
+
 	inline const_iterator begin() const { return const_iterator(this, 0); }
 	inline const_iterator end() const { return const_iterator(this, pid_size); }
+
+	//! \~english Returns a reverse iterator to the first element of the reversed array.
+	//! \~russian Обратный итератор на первый элемент.
+	//! \~\details ![rbegin, rend](doc/images/pivector_rbegin.png)
+	//!
+	//! \~english It corresponds to the last element of the non-reversed array.
+	//! If the array is empty, the returned iterator is equal to \a rend().
+	//! \~russian Итератор для прохода массива в обратном порядке.
+	//! Указывает на последний элемент.
+	//! Если массив пустой, то совпадает с итератором \a rend().
+	//! \~\return \ref stl_iterators
+	//! \~\sa \a rend(), \a begin(), \a end()
 	inline reverse_iterator rbegin() { return reverse_iterator(this, pid_size - 1); }
+
+	//! \~english Returns a reverse iterator to the element.
+	//! following the last element of the reversed array.
+	//! \~russian Обратный итератор на элемент,
+	//! следующий за последним элементом.
+	//! \~\details ![rbegin, rend](doc/images/pivector_rbegin.png)
+	//!
+	//! \~english It corresponds to the element preceding the first element of the non-reversed array.
+	//! This element acts as a placeholder, attempting to access it results in undefined behavior.
+	//! \~russian Итератор для прохода массива в обратном порядке.
+	//! Указывает на элемент, предшествующий первому элементу.
+	//! Этот элемент существует лишь условно,
+	//! попытка доступа к нему приведёт к выходу за разрешенную память.
+	//! \~\return \ref stl_iterators
+	//! \~\sa \a rbegin(), \a begin(), \a end()
 	inline reverse_iterator rend() { return reverse_iterator(this, -1); }
+
 	inline const_reverse_iterator rbegin() const { return const_reverse_iterator(this, pid_size - 1); }
 	inline const_reverse_iterator rend() const { return const_reverse_iterator(this, -1); }
 
+	//! \~english Number of elements in the container.
+	//! \~russian Количество элементов массива.
+	//! \~\sa \a size_s(), \a capacity(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
 	inline size_t size() const { return pid_size; }
+
+	//! \~english Number of elements in the container as signed value.
+	//! \~russian Количество элементов массива в виде знакового числа.
+	//! \~\sa \a size(), \a capacity(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
 	inline ssize_t size_s() const { return pid_size; }
+
+	//! \~english Same as \a size().
+	//! \~russian Синоним \a size().
+	//! \~\sa \a size(), \a size_s(), \a capacity(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
 	inline size_t length() const { return pid_size; }
+
+	//! \~english Number of elements that the container has currently allocated space for.
+	//! \~russian Количество элементов, для которого сейчас выделена память массивом.
+	//! \~\details
+	//! \~english To find out the actual number of items, use the function \a size().
+	//! \~russian Чтобы узнать фактическое количество элементов используйте функцию \a size().
+	//! \~\sa \a reserve(), \a size(), \a size_s()
 	inline size_t capacity() const { return pid_rsize; }
+
 	inline size_t _start() const { return pid_start; }
+
+	//! \~english Checks if the container has no elements.
+	//! \~russian Проверяет пуст ли массив.
+	//! \~\return
+	//! \~english **true** if the container is empty, **false** otherwise
+	//! \~russian **true** если массив пуст, **false** иначе.
+	//! \~\sa \a size(), \a size_s(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
 	inline bool isEmpty() const { return (pid_size == 0); }
 
+	//! \~english Checks if the container has elements.
+	//! \~russian Проверяет не пуст ли массив.
+	//! \~\return
+	//! \~english **true** if the container is not empty, **false** otherwise
+	//! \~russian **true** если массив не пуст, **false** иначе.
+	//! \~\sa \a size(), \a size_s(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
+	inline bool isNotEmpty() const { return (pid_size > 0); }
+
+	//! \~english Tests whether at least one element in the array
+	//! passes the test implemented by the provided function `test`.
+	//! \~russian Проверяет, удовлетворяет ли какой-либо элемент массива условию,
+	//! заданному в передаваемой функции `test`.
+	//! \~\return
+	//! \~english **true** if, in the array,
+	//! it finds an element for which the provided function returns **true**;
+	//! otherwise it returns **false**. Always returns **false** if is empty.
+	//! \~russian **true** если хотя бы для одного элемента
+	//! передаваемая функция возвращает **true**, в остальных случаях **false**.
+	//! Метод возвращает **false** при любом условии для пустого массива.
+	//! \~\details
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 8, 9};
+	//! piCout << v.any([](int e){return e % 2 == 0;}); // true
+	//! piCout << v.any([](int e){return e == 3;});     // false
+	//! \endcode
+	//! \~\sa \a every(), \a contains(), \a entries(), \a forEach()
+	inline bool any(std::function<bool(const T & e)> test) const {
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
+			if (test(pid_data[i])) return true;
+		}
+		return false;
+	}
+
+	//! \~english Tests whether all elements in the array passes the test
+	//! implemented by the provided function `test`.
+	//! \~russian Проверяет, удовлетворяют ли все элементы массива условию,
+	//! заданному в передаваемой функции `test`.
+	//! \~\return
+	//! \~english **true** if, in the array,
+	//! it finds an element for which the provided function returns **true**;
+	//!  otherwise it returns **false**. Always returns **true** if is empty.
+	//! \~russian **true** если для всех элементов передаваемая функция возвращает **true**,
+	//! в остальных случаях **false**.
+	//! Метод возвращает **true** при любом условии для пустого массива.
+	//! \~\details
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 8, 9};
+	//! piCout << v.every([](int e){return e % 2 == 0;}); // false
+	//! piCout << v.every([](int e){return e > 0;});      // true
+	//! \endcode
+	//! \~\sa \a any(), \a contains(), \a entries(), \a forEach()
+	inline bool every(std::function<bool(const T & e)> test) const {
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
+			if (!test(pid_data[i])) return false;
+		}
+		return true;
+	}
+
+	//! \~english Full access to element by `index`.
+	//! \~russian Полный доступ к элементу по индексу `index`.
+	//! \~\details
+	//! \~english Element index starts from `0`.
+	//! Element index must be in range from `0` to `size()-1`.
+	//! Otherwise will be undefined behavior.
+	//! \~russian Индекс элемента считается от `0`.
+	//! Индекс элемента должен лежать в пределах от `0` до `size()-1`.
+	//! Иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 8, 9};
+	//! piCout << v[2]; // 8
+	//! v[2] = 5;
+	//! piCout << v; // {1, 2, 5, 9}
+	//! \endcode
+	//! \~\sa \a at()
 	inline T & operator[](size_t index) { return pid_data[pid_start + index]; }
 	inline const T & operator[](size_t index) const { return pid_data[pid_start + index]; }
+
+	//! \~english Read only access to element by `index`.
+	//! \~russian Доступ исключительно на чтение к элементу по индексу `index`.
+	//! \~\details
+	//! \~english Element index starts from `0`.
+	//! Element index must be in range from `0` to `size()-1`.
+	//! Otherwise will be undefined behavior.
+	//! \~russian Индекс элемента считается от `0`.
+	//! Индекс элемента должен лежать в пределах от `0` до `size()-1`.
+	//! Иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
 	inline const T & at(size_t index) const { return pid_data[pid_start + index]; }
+
+	//! \~english Returns the first element of the array that
+	//! passes the test implemented by the provided function `test`
+	//! or `def` if there is no such element.
+	//! \~russian Возвращает первый элемент массива, проходящего по условию,
+	//! заданному в передаваемой функции `test`, или `def` если такого элемента нет.
+	//! \~\sa \a indexWhere()
+	inline const T & atWhere(std::function<bool(const T & e)> test, ssize_t start = 0, const T & def = T()) const {
+		const ssize_t i = indexWhere(test, start);
+		if (i < 0)
+			return def;
+		else
+			return at(i);
+	}
+
+	//! \~english Returns the last element of the array that
+	//! passes the test implemented by the provided function `test`
+	//! or `def` if there is no such element.
+	//! \~russian Возвращает последний элемент массива, проходящего по условию,
+	//! заданному в передаваемой функции `test`, или `def` если такого элемента нет.
+	//! \~\sa \a lastIndexWhere()
+	inline const T & lastAtWhere(std::function<bool(const T & e)> test, ssize_t start = -1, const T & def = T()) const {
+		const ssize_t i = lastIndexWhere(test, start);
+		if (i < 0)
+			return def;
+		else
+			return at(i);
+	}
+
+	//! \~english Last element.
+	//! \~russian Последний элемент массива.
+	//! \~\details
+	//! \~english Returns a reference to the last item in the array.
+	//! This function assumes that the array isn't empty.
+	//! Otherwise will be undefined behavior.
+	//! \~russian Возвращает ссылку на последний элемент в массиве.
+	//! Эта функция предполагает, что массив не пустой.
+	//! Иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
 	inline T & back() { return pid_data[pid_start + pid_size - 1]; }
 	inline const T & back() const { return pid_data[pid_start + pid_size - 1]; }
+
+	//! \~english Last element.
+	//! \~russian Первый элемент массива.
+	//! \~\details
+	//! \~english Returns a reference to the last item in the array.
+	//! This function assumes that the array isn't empty.
+	//! Otherwise will be undefined behavior.
+	//! \~russian Возвращает ссылку на пенрвый элемент в массиве.
+	//! Эта функция предполагает, что массив не пустой.
+	//! Иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
 	inline T & front() { return pid_data[pid_start]; }
 	inline const T & front() const { return pid_data[pid_start]; }
-	inline bool operator ==(const PIDeque<T> & t) const {
-		if (pid_size != t.pid_size) return false;
-		for (size_t i = 0; i < pid_size; ++i)
-			if (t[i] != (*this)[i])
-				return false;
+
+	//! \~english Compare operator with array `v`.
+	//! \~russian Оператор сравнения с массивом `v`.
+	inline bool operator==(const PIDeque<T> & v) const {
+		if (pid_size != v.pid_size) return false;
+		for (size_t i = 0; i < pid_size; ++i) {
+			if (v[i] != (*this)[i]) return false;
+		}
 		return true;
 	}
-	inline bool operator !=(const PIDeque<T> & t) const {return !(*this == t);}
-	inline bool operator >(const PIDeque<T> & t) const {
-		if (pid_size != t.pid_size) return pid_size > t.pid_size;
-		for (size_t i = 0; i < pid_size; ++i)
-			if (t[i] != (*this)[i]) return t[i] > (*this)[i];
+
+	//! \~english Compare operator with array `v`.
+	//! \~russian Оператор сравнения с массивом `v`.
+	inline bool operator!=(const PIDeque<T> & v) const { return !(*this == v); }
+
+	//! \~english Tests if element `e` exists in the array.
+	//! \~russian Проверяет наличие элемента `e` в массиве.
+	//! \~\details
+	//! \~english Optional argument `start` - the position in this array at which to begin searching.
+	//! If the index is greater than or equal to the array's size,
+	//! **false** is returned, which means the array will not be searched.
+	//! If the provided index value is a negative number,
+	//! it is taken as the offset from the end of the array.
+	//! Note: if the provided index is negative,
+	//! the array is still searched from front to back.
+	//! Default: 0 (entire array is searched).
+	//! \~russian Опциональный аргумент `start` указывает на индекс в массиве, откуда будет начинаться поиск.
+	//! Если индекс больше или равен длине массива,
+	//! возвращается **false**, что означает, что массив даже не просматривается.
+	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
+	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
+	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3, 4};
+	//! piCout << v.contains(3);      // true
+	//! piCout << v.contains(5);      // false
+	//! piCout << v.contains(3, 3);   // false
+	//! piCout << v.contains(3, -2);  // true
+	//! piCout << v.contains(3, -99); // true
+	//! \endcode
+	//! \~\return
+	//! \~english **true** if the array contains an occurrence of element `e`,
+	//! otherwise it returns **false**.
+	//! \~russian **true** если элемент `e` присутствует в массиве,
+	//! в остальных случаях **false**.
+	//! \~\sa \a every(), \a any(), \a entries(), \a forEach()
+	inline bool contains(const T & e, ssize_t start = 0) const {
+		if (start < 0) {
+			start = pid_size + start;
+			if (start < 0) start = 0;
+		}
+		for (size_t i = pid_start + size_t(start); i < pid_start + pid_size; ++i) {
+			if (e == pid_data[i]) return true;
+		}
 		return false;
 	}
-	inline bool contains(const T & v) const {
-		for (size_t i = pid_start; i < pid_start + pid_size; ++i)
-			if (v == pid_data[i])
+
+	//! \~english Tests if all elements of `v` exists in the array.
+	//! \~russian Проверяет наличие  всех элементов `v` в массиве.
+	//! \~\details
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3, 4};
+	//! piCout << v.contains({1,4}); // true
+	//! piCout << v.contains({1,5}); // false
+	//! \endcode
+	//! \~\sa \a every(), \a any(), \a entries(), \a forEach()
+	inline bool contains(const PIDeque<T> & v, ssize_t start = 0) const {
+		if (start < 0) {
+			start = pid_size + start;
+			if (start < 0) start = 0;
+		}
+		for (const T & e: v) {
+			bool c = false;
+			for (size_t i = pid_start + size_t(start); i < pid_start + pid_size; ++i) {
+				if (e == pid_data[i]) {
+					c = true;
+					break;
+				}
+			}
+			if (!c) return false;
+		}
 		return true;
-		return false;
 	}
-	inline int etries(const T & v) const {
+
+	//! \~english Count elements equal `e` in the array.
+	//! \~russian Подсчитывает количество элементов, совпадающих с элементом `e` в массиве.
+	//! \~\details
+	//! \~english Optional argument `start` - the position in this array at which to begin searching.
+	//! If the index is greater than or equal to the array's size,
+	//! 0 is returned, which means the array will not be searched.
+	//! If the provided index value is a negative number,
+	//! it is taken as the offset from the end of the array.
+	//! Note: if the provided index is negative,
+	//! the array is still searched from front to back.
+	//! Default: 0 (entire array is searched).
+	//! \~russian Опциональный аргумент `start` указывает на индекс в массиве, откуда будет начинаться поиск.
+	//! Если индекс больше или равен длине массива,
+	//! возвращается 0, что означает, что массив даже не просматривается.
+	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
+	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
+	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
+	//! \~\code
+	//! PIDeque<int> v{2, 2, 4, 2, 6};
+	//! piCout << v.entries(2);     // 3
+	//! piCout << v.entries(2, 2);  // 1
+	//! piCout << v.entries(2, -4); // 2
+	//! \endcode
+	//! \~\sa \a every(), \a any(), \a contains(), \a forEach(), \a indexOf()
+	inline int entries(const T & e, ssize_t start = 0) const {
 		int ec = 0;
-		for (size_t i = pid_start; i < pid_start + pid_size; ++i)
-			if (v == pid_data[i]) ++ec;
+		if (start < 0) {
+			start = pid_size + start;
+			if (start < 0) start = 0;
+		}
+		for (size_t i = pid_start + size_t(start); i < pid_start + pid_size; ++i) {
+			if (e == pid_data[i]) ++ec;
+		}
 		return ec;
 	}
-	inline ssize_t indexOf(const T & v) const {
-		for (ssize_t i = pid_start; i < pid_start + (ssize_t)pid_size; ++i)
-			if (v == pid_data[i])
-				return i - pid_start;
-		return -1;
+
+	//! \~english Count elements in the array passes the test implemented by the provided function `test`.
+	//! \~russian Подсчитывает количество элементов в массиве,
+	//! проходящих по условию, заданному в передаваемой функции `test`.
+	//! \~\details
+	//! \~english Overloaded function.
+	//!  Optional argument `start` - the position in this array at which to begin searching.
+	//! If the index is greater than or equal to the array's size,
+	//! 0 is returned, which means the array will not be searched.
+	//! If the provided index value is a negative number,
+	//! it is taken as the offset from the end of the array.
+	//! Note: if the provided index is negative,
+	//! the array is still searched from front to back.
+	//! Default: 0 (entire array is searched).
+	//! \~russian Перегруженная функция.
+	//!  Опциональный аргумент `start` указывает на индекс в массиве, откуда будет начинаться поиск.
+	//! Если индекс больше или равен длине массива,
+	//! возвращается 0, что означает, что массив даже не просматривается.
+	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
+	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
+	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
+	//! \~\sa \a every(), \a any(), \a contains(), \a forEach(), \a indexWhere()
+	inline int entries(std::function<bool(const T & e)> test, ssize_t start = 0) const {
+		int ec = 0;
+		if (start < 0) {
+			start = pid_size + start;
+			if (start < 0) start = 0;
+		}
+		for (size_t i = pid_start + size_t(start); i < pid_start + pid_size; ++i) {
+			if (test(pid_data[i])) ++ec;
+		}
+		return ec;
+	}
+
+	//! \~english Returns the first index at which a given element `e`
+	//! can be found in the array, or `-1` if it is not present.
+	//! \~russian Возвращает первый индекс, по которому данный элемент `e`
+	//! может быть найден в массиве или `-1`, если такого индекса нет.
+	//! \~\details
+	//! \~english Optional argument `start` - the position in this array at which to begin searching.
+	//! If the index is greater than or equal to the array's size,
+	//! `-1` is returned, which means the array will not be searched.
+	//! If the provided index value is a negative number,
+	//! it is taken as the offset from the end of the array.
+	//! Note: if the provided index is negative,
+	//! the array is still searched from front to back.
+	//! Default: 0 (entire array is searched).
+	//! \~russian Опциональный аргумент `start` указывает на индекс в массиве, откуда будет начинаться поиск.
+	//! Если индекс больше или равен длине массива,
+	//! возвращается `-1`, что означает, что массив даже не просматривается.
+	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
+	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
+	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
+	//! \~\code
+	//! PIDeque<int> v{2, 5, 9};
+	//! piCout << v.indexOf(2);     // 0
+	//! piCout << v.indexOf(7);     // -1
+	//! piCout << v.indexOf(9, 2);  // 2
+	//! piCout << v.indexOf(2, -1); // -1
+	//! piCout << v.indexOf(2, -3); // 0
+	//! \endcode
+	//! \~\sa \a indexWhere(), \a lastIndexOf(), \a lastIndexWhere(), \a contains()
+	inline ssize_t indexOf(const T & e, ssize_t start = 0) const {
+		if (start < 0) {
+			start = pid_size + start;
+			if (start < 0) start = 0;
+		}
+		for (size_t i = pid_start + size_t(start); i < pid_start + pid_size; ++i) {
+			if (e == pid_data[i]) {
+				return ssize_t(i) - pid_start;
+			}
 		}
-	inline ssize_t lastIndexOf(const T & v) const {
-		for (ssize_t i = pid_start + (ssize_t)pid_size - 1; i >= pid_start; --i)
-			if (v == pid_data[i])
-				return i - pid_start;
 		return -1;
 	}
 
+	//! \~english Returns the first index passes the test implemented by the provided function `test`,
+	//! or `-1` if it is not present.
+	//! can be found in the array, or `-1` if it is not present.
+	//! \~russian Возвращает первый индекс элемента проходящего по условию,
+	//! заданному в передаваемой функции `test`, или `-1`, если таких элементов нет.
+	//! \~\details
+	//! \~english Optional argument `start` - the position in this array at which to begin searching.
+	//! If the index is greater than or equal to the array's size,
+	//! `-1` is returned, which means the array will not be searched.
+	//! If the provided index value is a negative number,
+	//! it is taken as the offset from the end of the array.
+	//! Note: if the provided index is negative,
+	//! the array is still searched from front to back.
+	//! Default: 0 (entire array is searched).
+	//! \~russian Опциональный аргумент `start` указывает на индекс в массиве, откуда будет начинаться поиск.
+	//! Если индекс больше или равен длине массива,
+	//! возвращается `-1`, что означает, что массив даже не просматривается.
+	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
+	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
+	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
+	//! \~\code
+	//! PIDeque<PIString> v{"do", "re", "mi", "re"};
+	//! piCout << v.indexWhere([](const PIString & s){return s.startsWith('r');});    // 1
+	//! piCout << v.indexWhere([](const PIString & s){return s.startsWith('r');}, 2); // 3
+	//! piCout << v.indexWhere([](const PIString & s){return s.startsWith('k');});    // -1
+	//! \endcode
+	//! \~\sa \a indexOf(), \a lastIndexOf(), \a lastIndexWhere(), \a contains()
+	inline ssize_t indexWhere(std::function<bool(const T & e)> test, ssize_t start = 0) const {
+		if (start < 0) {
+			start = pid_size + start;
+			if (start < 0) start = 0;
+		}
+		for (size_t i = pid_start + size_t(start); i < pid_start + pid_size; ++i) {
+			if (test(pid_data[i])) {
+				return ssize_t(i) - pid_start;
+			}
+		}
+		return -1;
+	}
+
+	//! \~english Returns the last index at which a given element `e`
+	//! can be found in the array, or `-1` if it is not present.
+	//! \~russian Возвращает последний индекс, по которому данный элемент `e`
+	//! может быть найден в массиве или `-1`, если такого индекса нет.
+	//! \~\details
+	//! \~english Optional argument `start` - the position in this array
+	//! at which to start searching backwards.
+	//! If the index is greater than or equal to the array's size,
+	//! causes the whole array to be searched.
+	//! If the provided index value is a negative number,
+	//! it is taken as the offset from the end of the array.
+	//! Therefore, if calculated index less than 0,
+	//! the array is not searched, and the method returns `-1`.
+	//! Note: if the provided index is negative,
+	//! the array is still searched from back to front.
+	//! Default: -1 (entire array is searched).
+	//! \~russian Опциональный аргумент `start` указывает на индекс
+	//! c которого начинать поиск в обратном направлении.
+	//! Если индекс больше или равен длине массива, просматривается весь массив.
+	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от конца к началу (справа на лево).
+	//! Если рассчитанный индекс оказывается меньше 0, массив даже не просматривается.
+	//! Значение по умолчанию равно `-1`, что равно индексу последнего элемента
+	//! и означает, что просматривается весь массив.
+	//! \~\code
+	//! PIDeque<int> v{2, 5, 9, 2};
+	//! piCout << v.lastIndexOf(2);       // 3
+	//! piCout << v.lastIndexOf(7);       // -1
+	//! piCout << v.lastIndexOf(2, 2);    // 0
+	//! piCout << v.lastIndexOf(2, -3);   // 0
+	//! piCout << v.lastIndexOf(2, -300); // -1
+	//! piCout << v.lastIndexOf(2, 300);  // 3
+	//! \endcode
+	//! \~\sa \a indexOf(), \a indexWhere(), \a lastIndexWhere(), \a contains()
+	inline ssize_t lastIndexOf(const T & e, ssize_t start = -1) const {
+		if (start >= size_s()) start = pid_size - 1;
+		if (start < 0) start = pid_size + start;
+		for (ssize_t i = ssize_t(pid_start) + start; i >= ssize_t(pid_start); --i) {
+			if (e == pid_data[i]) {
+				return i - ssize_t(pid_start);
+			}
+		}
+		return -1;
+	}
+
+	//! \~english Returns the last index passes the test implemented by the provided function `test`,
+	//! or `-1` if it is not present.
+	//! \~russian Возвращает последний индекс элемента проходящего по условию,
+	//! заданному в передаваемой функции `test`, или `-1`, если таких элементов нет.
+	//! \~\details
+	//! \~english Optional argument `start` - the position in this array
+	//! at which to start searching backwards.
+	//! If the index is greater than or equal to the array's size,
+	//! causes the whole array to be searched.
+	//! If the provided index value is a negative number,
+	//! it is taken as the offset from the end of the array.
+	//! Therefore, if calculated index less than 0,
+	//! the array is not searched, and the method returns `-1`.
+	//! Note: if the provided index is negative,
+	//! the array is still searched from back to front.
+	//! Default: -1 (entire array is searched).
+	//! \~russian Опциональный аргумент `start` указывает на индекс
+	//! c которого начинать поиск в обратном направлении.
+	//! Если индекс больше или равен длине массива, просматривается весь массив.
+	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от конца к началу (справа на лево).
+	//! Если рассчитанный индекс оказывается меньше 0, массив даже не просматривается.
+	//! Значение по умолчанию равно `-1`, что равно индексу последнего элемента
+	//! и означает, что просматривается весь массив.
+	//! \~\sa \a indexOf(), \a lastIndexOf(), \a indexWhere(), \a contains()
+	inline ssize_t lastIndexWhere(std::function<bool(const T & e)> test, ssize_t start = -1) const {
+		if (start >= size_s()) start = pid_size - 1;
+		if (start < 0) start = pid_size + start;
+		for (ssize_t i = ssize_t(pid_start) + start; i >= ssize_t(pid_start); --i) {
+			if (test(pid_data[i])) {
+				return i - ssize_t(pid_start);
+			}
+		}
+		return -1;
+	}
+
+	//! \~english Pointer to array
+	//! \~russian Указатель на память массива
+	//! \~\details
+	//! \~english Optional argument `index` the position in this array,
+	//! where is pointer. Default: start of array.
+	//! \~russian Опциональный аргумент `index` указывает на индекс c которого брать указатель.
+	//! По умолчанию указывает на начало массива.
+	//! \~\code
+	//! PIDeque<int> v{2, 5, 9, 2};
+	//! int a[2] = {12, 13};
+	//! memcpy(vec.data(1), a, 2 * sizeof(int));
+	//! piCout << v; // {2, 12, 13, 2}
+	//! \endcode
 	inline T * data(size_t index = 0) { return &(pid_data[pid_start + index]); }
+
+	//! \~english Read only pointer to array
+	//! \~russian Указатель на память массива только для чтения.
+	//! \~\details
+	//! \~english The pointer can be used to access and modify the items in the array.
+	//! The pointer remains valid as long as the array isn't reallocated.
+	//! Optional argument `index` the position in this array,
+	//! where is pointer. Default: start of array.
+	//! \~russian Указатель можно использовать для доступа и изменения элементов в массиве.
+	//! Указатель остается действительным только до тех пор, пока массив не будет перераспределен.
+	//! Опциональный аргумент `index` указывает на индекс c которого брать указатель.
+	//! По умолчанию указывает на начало массива.
+	//! \~\code
+	//! PIDeque<int> v{1, 3, 5};
+	//! int a[3];
+	//! memcpy(a, v.data(), a.size() * sizeof(int));
+	//! piCout << a[0] << a[1] << a[2]; // 1 3 5
+	//! \endcode
 	inline const T * data(size_t index = 0) const { return &(pid_data[pid_start + index]); }
 
-	template<typename T1 = T, typename std::enable_if<
-				 !std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
+	//! \~english Creates sub-array of this array.
+	//! \~russian Создает подмассив, то есть кусок из текущего массива.
+	//! \~english
+	//! \param index - index of this array where sub-array starts
+	//! \param count - sub-array size
+	//! \~russian
+	//! \param index - индекс в текущем массиве, откуда начинётся подмассив
+	//! \param count - размер подмассива
+	//! \~\details
+	//! \~english
+	//! Index must be in range from `0` to `size()-1`.
+	//! If sub-array size more than this array size, than ends early.
+	//! \~russian
+	//! Индекс начала должен лежать в диапазоне от `0` до `size()-1`.
+	//! Если заданный размер подмассива превышает размер текущего массива,
+	//! то вернется подмассив меньшего размера (`size()-index-1`).
+	PIDeque<T> getRange(size_t index, size_t count) const {
+		if (index >= pid_size || count == 0) return PIDeque<T>();
+		if (index + count > pid_size) count = pid_size - index;
+		return PIDeque(pid_data + pid_start + index, count);
+	}
+
+	//! \~english Clear array, remove all elements.
+	//! \~russian Очищает массив, удаляет все элементы.
+	//! \~\details
+	//! \~\note
+	//! \~english Reserved memory will not be released.
+	//! \~russian Зарезервированная память не освободится.
+	//! \~\sa \a resize()
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline PIDeque<T> & clear() {
-		resize(0);
+		deleteT(pid_data + pid_start, pid_size);
+		pid_size  = 0;
+		pid_start = (pid_rsize - pid_size) / 2;
 		return *this;
 	}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline PIDeque<T> & clear() {
 		PIINTROSPECTION_CONTAINER_UNUSED(T, pid_size)
 		pid_size  = 0;
@@ -241,427 +1171,1535 @@ public:
 		return *this;
 	}
 
-	inline PIDeque<T> & fill(const T & f = T()) {
+	//! \~english Assigns element 'e' to all items in the array.
+	//! \~russian Заполняет весь массив копиями элемента 'e'.
+	//! \~\details
+	//! \code
+	//! PIDeque<int> v{1, 3, 5};
+	//! v.fill(7);
+	//! piCout << v; // {7, 7, 7}
+	//! \endcode
+	//! \~\sa \a resize()
+	inline PIDeque<T> & fill(const T & e = T()) {
 		deleteT(pid_data + pid_start, pid_size);
 		PIINTROSPECTION_CONTAINER_USED(T, pid_size)
-		for (size_t i = pid_start; i < pid_start + pid_size; ++i)
-			elementNew(pid_data + i, f);
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
+			elementNew(pid_data + i, e);
+		}
 		return *this;
 	}
-	inline PIDeque<T> & fill(std::function<T(size_t)> f) {
+
+	//! \~english Assigns result of function 'f(size_t i)' to all items in the array.
+	//! \~russian Заполняет весь массив результатом вызова функции 'f(size_t i)'.
+	//! \~\details
+	//! \code
+	//! PIDeque<int> v{1, 3, 5};
+	//! v.fill([](size_t i){return i*2;});
+	//! piCout << v; // {0, 2, 4}
+	//! \endcode
+	//! \~\sa \a resize()
+	inline PIDeque<T> & fill(std::function<T(size_t i)> f) {
 		deleteT(pid_data + pid_start, pid_size);
 		PIINTROSPECTION_CONTAINER_USED(T, pid_size)
-		for (size_t i = pid_start; i < pid_start + pid_size; ++i)
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
 			elementNew(pid_data + i, f(i));
+		}
 		return *this;
 	}
-	inline PIDeque<T> & assign(const T & f = T()) {return fill(f);}
-	template<typename T1 = T, typename std::enable_if<
-				 !std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
-	inline PIDeque<T> & assign(size_t new_size, const T & f) {
+
+	//! \~english Same as \a fill().
+	//! \~russian Тоже самое что и \a fill().
+	//! \~\sa \a fill(), \a resize()
+	inline PIDeque<T> & assign(const T & e = T()) { return fill(e); }
+
+	//! \~english First does `resize(new_size)` then `fill(e)`.
+	//! \~russian Сначала делает `resize(new_size)`, затем `fill(e)`.
+	//! \~\sa \a fill(), \a resize()
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
+	inline PIDeque<T> & assign(size_t new_size, const T & e) {
 		resize(new_size);
-		return fill(f);
+		return fill(e);
 	}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
-	inline PIDeque<T> & assign(size_t new_size, const T & f) {
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
+	inline PIDeque<T> & assign(size_t new_size, const T & e) {
 		_resizeRaw(new_size);
-		return fill(f);
+		return fill(e);
 	}
 
-	inline PIDeque<T> & resize(size_t new_size, const T & f = T()) {
+	//! \~english Sets size of the array, new elements are copied from `e`.
+	//! \~russian Устанавливает размер массива, новые элементы копируются из `e`.
+	//! \~\details
+	//! \~english If `new_size` is greater than the current \a size(),
+	//!  elements are added to the end; the new elements are initialized from `e`.
+	//! If `new_size` is less than the current \a size(), elements are removed from the end.
+	//! \~russian Если `new_size` больше чем текущий размер массива \a size(),
+	//! новые элементы добавляются в конец массива и создаются из `e`.
+	//! Если `new_size` меньше чем текущий размер массива \a size(),
+	//! лишние элементы удаляются с конца массива.
+	//! \~\sa \a size(), \a clear()
+	inline PIDeque<T> & resize(size_t new_size, const T & e = T()) {
+		if (new_size == 0) return clear();
 		if (new_size < pid_size) {
-			deleteT(&(pid_data[new_size + pid_start]), pid_size - new_size);
+			deleteT(pid_data + pid_start + new_size, pid_size - new_size);
 			pid_size = new_size;
-			if (new_size == 0)
-				pid_start = (pid_rsize - pid_size) / 2;
-		}
-		if (new_size > pid_size) {
-			size_t os = pid_size;
-			alloc(new_size, true);
-			PIINTROSPECTION_CONTAINER_USED(T, (new_size-os))
-			for (size_t i = os + pid_start; i < new_size + pid_start; ++i)
-				elementNew(pid_data + i, f);
-		}
-		return *this;
-	}
-	inline PIDeque<T> & resize(size_t new_size, std::function<T(size_t)> f) {
-		if (new_size < pid_size) {
-			deleteT(&(pid_data[new_size + pid_start]), pid_size - new_size);
-			pid_size = new_size;
-			if (new_size == 0)
-				pid_start = (pid_rsize - pid_size) / 2;
-		}
-		if (new_size > pid_size) {
-			size_t os = pid_size;
-			alloc(new_size, true);
-			PIINTROSPECTION_CONTAINER_USED(T, (new_size-os))
-			for (size_t i = os + pid_start; i < new_size + pid_start; ++i)
-				elementNew(pid_data + i, f(i));
+		} else if (new_size > pid_size) {
+			expand(new_size, e);
 		}
 		return *this;
 	}
 
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
+	//! \~english Sets size of the array, new elements created by function `f(size_t i)`.
+	//! \~russian Устанавливает размер массива, новые элементы создаются функцией `f(size_t i)`.
+	//! \~\details
+	//! \~english If `new_size` is greater than the current \a size(),
+	//!  elements are added to the end; the new elements created by function `f(size_t i)`.
+	//! If `new_size` is less than the current \a size(), elements are removed from the end.
+	//! \~russian Если `new_size` больше чем текущий размер массива \a size(),
+	//! новые элементы добавляются в конец массива и функцией `f(size_t i)`.
+	//! Если `new_size` меньше чем текущий размер массива \a size(),
+	//! лишние элементы удаляются с конца массива.
+	//! \~\sa \a size(), \a clear()
+	inline PIDeque<T> & resize(size_t new_size, std::function<T(size_t i)> f) {
+		if (new_size == 0) return clear();
+		if (new_size < pid_size) {
+			deleteT(pid_data + pid_start + new_size, pid_size - new_size);
+			pid_size = new_size;
+		} else if (new_size > pid_size) {
+			expand(new_size, f);
+		}
+		return *this;
+	}
+
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline PIDeque<T> & _resizeRaw(size_t new_size) {
+#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
 		if (new_size > pid_size) {
 			PIINTROSPECTION_CONTAINER_USED(T, (new_size - pid_size));
 		}
 		if (new_size < pid_size) {
 			PIINTROSPECTION_CONTAINER_UNUSED(T, (pid_size - new_size));
 		}
-		alloc(new_size, true);
+#endif
+		alloc_forward(new_size);
 		return *this;
 	}
 
+	inline void _copyRaw(T * dst, const T * src, size_t size) { newT(dst, src, size); }
+
+	//! \~english Attempts to allocate memory for at least `new_size` elements.
+	//! \~russian Резервируется память под как минимум `new_size` элементов.
+	//! \~\details
+	//! \~english If you know in advance how large the array will be,
+	//! you should call this function to prevent reallocations and memory fragmentation.
+	//! If `new_size` is greater than the current \a capacity(),
+	//! new storage is allocated, otherwise the function does nothing.
+	//! This function does not change the \a size() of the array.
+	//! \~russian Если вы заранее знаете, насколько велик будет массив,
+	//! вы можете вызвать эту функцию, чтобы предотвратить перераспределение и фрагментацию памяти.
+	//! Если размер `new_size` больше чем выделенная память \a capacity(),
+	//! то произойдёт выделение новой памяти и перераспределение массива.
+	//! Эта функция не изменяет количество элементов в массиве \a size().
+	//! \~\sa \a size(), \a capacity(), \a resize()
 	inline PIDeque<T> & reserve(size_t new_size) {
 		if (new_size <= pid_rsize) return *this;
-		size_t os = pid_size;
-		alloc(new_size, true);
+		const size_t os = pid_size;
+		alloc_forward(new_size);
 		pid_size = os;
 		return *this;
 	}
 
-	inline PIDeque<T> & insert(size_t index, const T & v = T()) {
-		if (index == pid_size) return push_back(v);
+	//! \~english Inserts value `e` at `index` position in the array.
+	//! \~russian Вставляет значение `e` в позицию `index` в массиве.
+	//! \~\details
+	//! \~english The index must be greater than 0 and less than or equal to \a size().
+	//! \~russian Индекс должен быть больше 0 и меньше или равен \a size().
+	//! \code
+	//! PIDeque<int> v{1, 3, 5};
+	//! v.insert(2, 7);
+	//! piCout << v; // {1, 3, 7, 5}
+	//! \endcode
+	//! \~\sa \a append(), \a prepend(), \a remove()
+	inline PIDeque<T> & insert(size_t index, const T & e = T()) {
+		if (index == pid_size) return push_back(e);
 		PIINTROSPECTION_CONTAINER_USED(T, 1)
-		bool dir = pid_rsize <= 2 ? true : (index >= pid_rsize / 2 ? true : false);
+		const bool dir = pid_rsize <= 2 ? true : (index >= pid_rsize / 2 ? true : false);
 		if (dir) {
-			alloc(pid_size + 1, true);
+			alloc_forward(pid_size + 1);
 			if (index < pid_size - 1) {
-				size_t os = pid_size - index - 1;
-				memmove((void*)(&(pid_data[index + pid_start + 1])), (const void*)(&(pid_data[index + pid_start])), os * sizeof(T));
+				const size_t os = pid_size - index - 1;
+				memmove(reinterpret_cast<void *>(pid_data + pid_start + index + 1),
+						reinterpret_cast<const void *>(pid_data + pid_start + index),
+						os * sizeof(T));
 			}
 		} else {
-			alloc(pid_size + 1, false, -1);
-			if (index > 0)
-				memmove((void*)(&(pid_data[pid_start])), (const void*)(&(pid_data[pid_start + 1])), index * sizeof(T));
+			alloc_backward(pid_size + 1, -1);
+			if (index > 0) {
+				memmove(reinterpret_cast<void *>(pid_data + pid_start),
+						reinterpret_cast<const void *>(pid_data + pid_start + 1),
+						index * sizeof(T));
 			}
-		elementNew(pid_data + pid_start + index, v);
-		return *this;
 		}
-	inline PIDeque<T> & insert(size_t index, T && v) {
-		if (index == pid_size) return push_back(v);
-		PIINTROSPECTION_CONTAINER_USED(T, 1)
-		bool dir = pid_rsize <= 2 ? true : (index >= pid_rsize / 2 ? true : false);
-		if (dir) {
-			alloc(pid_size + 1, true);
-			if (index < pid_size - 1) {
-				size_t os = pid_size - index - 1;
-				memmove((void*)(&(pid_data[index + pid_start + 1])), (const void*)(&(pid_data[index + pid_start])), os * sizeof(T));
-			}
-		} else {
-			alloc(pid_size + 1, false, -1);
-			if (index > 0)
-				memmove((void*)(&(pid_data[pid_start])), (const void*)(&(pid_data[pid_start + 1])), index * sizeof(T));
-		}
-		elementNew(pid_data + pid_start + index, std::move(v));
-		return *this;
-	}
-	inline PIDeque<T> & insert(size_t index, const PIDeque<T> & other) {
-		if (other.isEmpty()) return *this;
-		assert(&other != this);
-		bool dir = pid_rsize <= 2 ? true : (index >= pid_rsize / 2 ? true : false);
-		if (dir) {
-			ssize_t os = pid_size - index;
-			alloc(pid_size + other.pid_size, true);
-			if (os > 0)
-				memmove((void*)(&(pid_data[index + pid_start + other.pid_size])), (const void*)(&(pid_data[index + pid_start])), os * sizeof(T));
-		} else {
-			alloc(pid_size + other.pid_size, false, -other.pid_size);
-			if (index > 0)
-				memmove((void*)(&(pid_data[pid_start])), (const void*)(&(pid_data[pid_start + other.pid_size])), index * sizeof(T));
-		}
-		newT(pid_data + pid_start + index, other.pid_data + other.pid_start, other.pid_size);
+		elementNew(pid_data + pid_start + index, e);
 		return *this;
 	}
 
+	//! \~english Inserts value `e` at `index` position in the array.
+	//! \~russian Вставляет значение `e` в позицию `index` в массиве.
+	//! \~\details
+	//! \~english The index must be greater than 0 and less than or equal to \a size().
+	//! \~russian Индекс должен быть больше 0 и меньше или равен \a size().
+	//! \~\sa \a append(), \a prepend(), \a remove()
+	inline PIDeque<T> & insert(size_t index, T && e) {
+		if (index == pid_size) return push_back(e);
+		PIINTROSPECTION_CONTAINER_USED(T, 1)
+		const bool dir = pid_rsize <= 2 ? true : (index >= pid_rsize / 2 ? true : false);
+		if (dir) {
+			alloc_forward(pid_size + 1);
+			if (index < pid_size - 1) {
+				const size_t os = pid_size - index - 1;
+				memmove(reinterpret_cast<void *>(pid_data + pid_start + index + 1),
+						reinterpret_cast<const void *>(pid_data + pid_start + index),
+						os * sizeof(T));
+			}
+		} else {
+			alloc_backward(pid_size + 1, -1);
+			if (index > 0) {
+				memmove(reinterpret_cast<void *>(pid_data + pid_start),
+						reinterpret_cast<const void *>(pid_data + pid_start + 1),
+						index * sizeof(T));
+			}
+		}
+		elementNew(pid_data + pid_start + index, std::move(e));
+		return *this;
+	}
+
+	//! \~english Inserts array `v` at `index` position in the array.
+	//! \~russian Вставляет массив `v` в позицию `index` в массиве.
+	//! \~\details
+	//! \~english The index must be greater than or equal to 0 and less than or equal to \a size().
+	//! \~russian Индекс должен быть больше или равен 0 и меньше или равен \a size().
+	//! \~\sa \a append(), \a prepend(), \a remove()
+	inline PIDeque<T> & insert(size_t index, const PIDeque<T> & v) {
+		if (v.isEmpty()) return *this;
+#ifndef NDEBUG
+		if (&v == this) {
+			printf("error with PIDeque<%s>::insert\n", __PIP_TYPENAME__(T));
+		}
+#endif
+		assert(&v != this);
+		const bool dir = v.size() > pid_size ? true : (index >= pid_rsize / 2 ? true : false);
+		if (dir) {
+			const ssize_t os = pid_size - index;
+			alloc_forward(pid_size + v.pid_size);
+			if (os > 0) {
+				memmove(reinterpret_cast<void *>(pid_data + pid_start + index + v.pid_size),
+						reinterpret_cast<const void *>(pid_data + pid_start + index),
+						os * sizeof(T));
+			}
+		} else {
+			alloc_backward(pid_size + v.pid_size, -v.pid_size);
+			if (index > 0) {
+				memmove(reinterpret_cast<void *>(pid_data + pid_start),
+						reinterpret_cast<const void *>(pid_data + pid_start + v.pid_size),
+						index * sizeof(T));
+			}
+		}
+		newT(pid_data + pid_start + index, v.pid_data + v.pid_start, v.pid_size);
+		return *this;
+	}
+
+	//! \~english Inserts the given elements at `index` position in the array.
+	//! \~russian Вставляет элементы в позицию `index` в массиве.
+	//! \~\details
+	//! \~english The index must be greater than or equal to 0 and less than or equal to \a size().
+	//! Inserts the given elements from
+	//! [C++11 initializer list](https://en.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~russian Индекс должен быть больше или равен 0 и меньше или равен \a size().
+	//! Вставляет элементы из
+	//! [списка инициализации C++11](https://ru.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~\sa \a append(), \a prepend(), \a remove()
+	inline PIDeque<T> & insert(size_t index, std::initializer_list<T> init_list) {
+		if (init_list.size() == 0) return *this;
+		const bool dir = init_list.size() > pid_size ? true : (index >= pid_rsize / 2 ? true : false);
+		if (dir) {
+			const ssize_t os = ssize_t(pid_size) - index;
+			alloc_forward(pid_size + init_list.size());
+			if (os > 0) {
+				memmove(reinterpret_cast<void *>(pid_data + pid_start + index + init_list.size()),
+						reinterpret_cast<const void *>(pid_data + pid_start + index),
+				        os * sizeof(T));
+			}
+		} else {
+			alloc_backward(pid_size + init_list.size(), -init_list.size());
+			if (index > 0) {
+				memmove(reinterpret_cast<void *>(pid_data + pid_start),
+						reinterpret_cast<const void *>(pid_data + pid_start + init_list.size()),
+						index * sizeof(T));
+			}
+		}
+		newT(pid_data + pid_start + index, init_list.begin(), init_list.size());
+		return *this;
+	}
+
+	//! \~english Removes `count` elements from the middle of the array, starting at `index` position.
+	//! \~russian Удаляет элементы из массива, начиная с позиции `index` в количестве `count`.
+	//! \~\details
+	//! \code
+	//! PIDeque<int> v{1, 3, 7, 5};
+	//! v.remove(1, 2);
+	//! piCout << v; // {1, 5}
+	//! \endcode
+	//! \~\sa \a resize(), \a insert(), \a removeOne(), \a removeAll(), \a removeWhere()
 	inline PIDeque<T> & remove(size_t index, size_t count = 1) {
 		if (count == 0) return *this;
 		if (index + count >= pid_size) {
-			resize(index);
-			return *this;
+			if (index < pid_size) {
+				deleteT(pid_data + pid_start + index, pid_size - index);
+				pid_size = index;
 			}
-		size_t os = pid_size - index - count;
-		deleteT(&(pid_data[index + pid_start]), count);
-		if (os <= index) {
-			if (os > 0) memmove((void*)(&(pid_data[index + pid_start])), (const void*)(&(pid_data[index + pid_start + count])), os * sizeof(T));
 		} else {
-			if (index > 0) memmove((void*)(&(pid_data[pid_start + count])), (const void*)(&(pid_data[pid_start])), index * sizeof(T));
+			const size_t os = pid_size - index - count;
+			deleteT(pid_data + pid_start + index, count);
+			if (os <= index) {
+				memmove(reinterpret_cast<void *>(pid_data + pid_start + index),
+						reinterpret_cast<const void *>(pid_data + pid_start + index + count),
+						os * sizeof(T));
+			} else {
+				if (index > 0) {
+					memmove(reinterpret_cast<void *>(pid_data + pid_start + count),
+							reinterpret_cast<const void *>(pid_data + pid_start),
+							index * sizeof(T));
+				}
 				pid_start += count;
 			}
 			pid_size -= count;
+		}
 		return *this;
 	}
 
+	//! \~english Swaps array `v` other with this array.
+	//! \~russian Меняет местами массив `v` с этим массивом.
+	//! \~\details
+	//! \~english This operation is very fast and never fails.
+	//! \~russian Эта операция выполняется мгновенно без копирования памяти и никогда не дает сбоев.
 	inline void swap(PIDeque<T> & other) {
 		piSwap<T *>(pid_data, other.pid_data);
 		piSwap<size_t>(pid_size, other.pid_size);
 		piSwap<size_t>(pid_rsize, other.pid_rsize);
-		piSwap<ssize_t>(pid_start, other.pid_start);
+		piSwap<size_t>(pid_start, other.pid_start);
 	}
 
-	typedef int (*CompareFunc)(const T * , const T * );
-	static int compare_func(const T * t0, const T * t1) {return (*t0) < (*t1) ? -1 : ((*t0) == (*t1) ? 0 : 1);}
-	inline PIDeque<T> & sort(CompareFunc compare = compare_func) {
-		piqsort(pid_data + pid_start, pid_size, sizeof(T), (int(*)(const void * , const void * ))compare);
+	//! \~english Sorts the elements in non-descending order.
+	//! \~russian Сортировка элементов в порядке возрастания.
+	//! \~\details
+	//! \~english The order of equal elements is not guaranteed to be preserved.
+	//! Elements are compared using operator<.
+	//! Sorting provided by [std::sort](https://en.cppreference.com/w/cpp/algorithm/sort).
+	//! Complexity `O(N·log(N))`.
+	//! \~russian Сохранность порядка элементов, имеющих одинаковое значение, не гарантируется.
+	//! Для сравнения элементов используется оператор `operator<`.
+	//! Для сортировки используется функция [std::sort](https://ru.cppreference.com/w/cpp/algorithm/sort).
+	//! Сложность сортировки `O(N·log(N))`.
+	//! \~\code
+	//! PIDeque<int> v{5, 7, 4, 2, 8, 6, 1, 9, 0, 3};
+	//! v.sort();
+	//! piCout << v; // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+	//! \endcode
+	//! \~\sa \a sort(std::function<bool(const T &a, const T &b)> comp)
+	inline PIDeque<T> & sort() {
+		std::sort(begin(), end());
 		return *this;
 	}
 
-	inline PIDeque<T> & enlarge(llong pid_size) {
-		llong ns = size_s() + pid_size;
-		if (ns <= 0) clear();
-		else resize(size_t(ns));
+	//! \~english Sorts the elements in non-descending order.
+	//! \~russian Сортировка элементов в порядке возрастания.
+	//! \~\details
+	//! \~english The order of equal elements is not guaranteed to be preserved.
+	//! Elements are compared using the given binary comparison function `comp`.
+	//! which returns `​true` if the first argument is less than (i.e. is ordered before) the second.
+	//! The signature of the comparison function should be equivalent to the following:
+	//! \code
+	//! bool comp(const T &a, const T &b);
+	//! \endcode
+	//! While the signature does not need to have const &, the function must not modify the objects passed to it.
+	//! The function must return `false` for identical elements,
+	//! otherwise, it will lead to undefined program behavior and memory errors.
+	//! Sorting provided by [std::sort](https://en.cppreference.com/w/cpp/algorithm/sort).
+	//! Complexity `O(N·log(N))`.
+	//! \~russian Сохранность порядка элементов, имеющих одинаковое значение, не гарантируется.
+	//! Для сравнения элементов используется функция сравнения `comp`.
+	//! Функция сравнения, возвращает ​`true` если первый аргумент меньше
+	//! второго. Сигнатура функции сравнения должна быть эквивалентна следующей: \code bool comp(const T &a, const T &b); \endcode Сигнатура
+	//! не обязана содержать const &, однако, функция не может изменять переданные объекты. Функция обязана возвращать `false` для
+	//! одинаковых элементов, иначе это приведёт к неопределённому поведению программы и ошибкам памяти. Для сортировки используется функция
+	//! [std::sort](https://ru.cppreference.com/w/cpp/algorithm/sort). Сложность сортировки `O(N·log(N))`.
+	//! \~\code
+	//! PIDeque<int> v{5, 7, 4, 2, 8, 6, 1, 9, 0, 3};
+	//! v.sort([](const int & a, const int & b){return a > b;});
+	//! piCout << v; // 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
+	//! \endcode
+	//! \~\sa \a sort()
+	inline PIDeque<T> & sort(std::function<bool(const T & a, const T & b)> comp) {
+		std::sort(begin(), end(), comp);
 		return *this;
 	}
 
-	inline PIDeque<T> & removeOne(const T & v) {
-		for (size_t i = 0; i < pid_size; ++i)
-			if (pid_data[i + pid_start] == v) {
+
+	//! \~english Reverses this array.
+	//! \~russian Обращает порядок следования элементов этого массива.
+	//! \~\details
+	//! \~english This method reverses an array [in place](https://en.wikipedia.org/wiki/In-place_algorithm).
+	//! The first array element becomes the last, and the last array element becomes the first.
+	//! The reverse method transposes the elements of the calling array object in place,
+	//! mutating the array, and returning a reference to the array.
+	//! \~russian Метод reverse() на месте переставляет элементы массива,
+	//! на котором он был вызван, изменяет массив и возвращает ссылку на него.
+	//! Первый элемент массива становится последним, а последний — первым.
+	//! \~\code
+	//! PIDeque<int> v{1, 3, 7, 5};
+	//! v.reverse();
+	//! piCout << v; // {5, 7, 3, 1}
+	//! \endcode
+	//! \~\sa \a reversed()
+	inline PIDeque<T> & reverse() {
+		const size_t s2 = pid_size / 2;
+		for (size_t i = 0; i < s2; ++i) {
+			piSwap<T>(pid_data[pid_start + i], pid_data[pid_start + pid_size - i - 1]);
+		}
+		return *this;
+	}
+
+	//! \~english Returns reversed array.
+	//! \~russian Возвращает перевернутый массив.
+	//! \~\details
+	//! \~english Returns a copy of the array with elements in reverse order.
+	//! The first array element becomes the last, and the last array element becomes the first.
+	//! \~russian Возвращает копию массива с элементами в обратном порядке.
+	//! Первый элемент массива становится последним, а последний — первым.
+	//! \~\sa \a reverse()
+	inline PIDeque<T> reversed() const {
+		PIDeque<T> ret(*this);
+		return ret.reverse();
+	}
+
+	//! \~english Increases or decreases the size of the array by `add_size` elements.
+	//! \~russian Увеличивает или уменьшает размер массива на `add_size` элементов.
+	//! \~\details
+	//! \~english If `add_size > 0` then elements are added to the end of the array.
+	//! If `add_size < 0` then elements are removed from the end of the array.
+	//! If `add_size < 0` and there are fewer elements in the array than specified, then the array becomes empty.
+	//! \~russian Если `add_size > 0`, то в конец массива добавляются элементы.
+	//! Если `add_size < 0`, то с конца массива удаляются элементы.
+	//! Если `add_size < 0` и в массиве меньше элементов чем указано, то массив становится пустым.
+	//! \~\sa \a resize()
+	inline PIDeque<T> & enlarge(ssize_t add_size, const T & e = T()) {
+		const ssize_t ns = size_s() + add_size;
+		if (ns <= 0)
+			clear();
+		else
+			resize(size_t(ns), e);
+		return *this;
+	}
+
+	//! \~english Remove no more than one element equal `e`.
+	//! \~russian Удаляет первый элемент, который равен элементу `e`.
+	//! \~\details
+	//! \~\code
+	//! PIDeque<int> v{3, 2, 5, 2, 7};
+	//! v.removeOne(2);
+	//! piCout << v; // {3, 5, 2, 7}
+	//! \endcode
+	//! \~\sa \a remove(), \a removeAll(), \a removeWhere()
+	inline PIDeque<T> & removeOne(const T & e) {
+		for (size_t i = 0; i < pid_size; ++i) {
+			if (pid_data[i + pid_start] == e) {
 				remove(i);
 				return *this;
 			}
+		}
 		return *this;
 	}
-	inline PIDeque<T> & removeAll(const T & v) {
-		for (ssize_t i = 0; i < ssize_t(pid_size); ++i)
-			if (pid_data[i + pid_start] == v) {
+
+	//! \~english Remove all elements equal `e`.
+	//! \~russian Удаляет все элементы, равные элементу `e`.
+	//! \~\details
+	//! \~\code
+	//! PIDeque<int> v{3, 2, 5, 2, 7};
+	//! v.removeAll(2);
+	//! piCout << v; // {3, 5, 7}
+	//! \endcode
+	//! \~\sa \a remove(), \a removeOne(), \a removeWhere()
+	inline PIDeque<T> & removeAll(const T & e) {
+		for (size_t i = 0; i < pid_size; ++i) {
+			if (pid_data[i + pid_start] == e) {
 				remove(i);
 				--i;
 			}
+		}
 		return *this;
 	}
 
-	inline PIDeque<T> & push_back(const T & v) {
-		alloc(pid_size + 1, true);
+	//! \~english Remove all elements in the array
+	//! passes the test implemented by the provided function `test`.
+	//! \~russian Удаляет все элементы, удовлетворяющие условию,
+	//! заданному в передаваемой функции `test`.
+	//! \~\details
+	//! \~\code
+	//! PIDeque<int> v{3, 2, 5, 2, 7};
+	//! v.removeWhere([](const int & i){return i > 2;});
+	//! piCout << v; // {2, 2}
+	//! \endcode
+	//! \~\sa \a remove(), \a removeOne(), \a removeWhere()
+	inline PIDeque<T> & removeWhere(std::function<bool(const T & e)> test) {
+		for (size_t i = 0; i < pid_size; ++i) {
+			if (test(pid_data[i + pid_start])) {
+				remove(i);
+				--i;
+			}
+		}
+		return *this;
+	}
+
+	//! \~english Appends the given element `e` to the end of the array.
+	//! \~russian Добавляет элемент `e` в конец массива.
+	//! \~\details
+	//! \~english If size() is less than capacity(), which is most often
+	//! then the addition will be very fast.
+	//! In any case, the addition is fast and does not depend on the size of the array.
+	//! If the new size() is greater than capacity()
+	//! then all iterators and references
+	//! (including the past-the-end iterator) are invalidated.
+	//! Otherwise only the past-the-end iterator is invalidated.
+	//! \~russian Если size() меньше capacity(), что часто бывает,
+	//! то добавление будет очень быстрым.
+	//! В любом случае добавление быстрое и не зависит от размера массива.
+	//! Если новый size() больше, чем capacity(),
+	//! то все итераторы и указатели становятся нерабочими.
+	//! В противном случае все, кроме итераторов, указывающих на конец массива,
+	//! остаются в рабочем состоянии.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! v.push_back(4);
+	//! v.push_back(5);
+	//! piCout << v; // {1, 2, 3, 4, 5}
+	//! \endcode
+	//! \~\sa \a push_front(), \a append(), \a prepend(), \a insert()
+	inline PIDeque<T> & push_back(const T & e) {
+		alloc_forward(pid_size + 1);
 		PIINTROSPECTION_CONTAINER_USED(T, 1);
-		elementNew(pid_data + pid_start + pid_size - 1, v);
+		elementNew(pid_data + pid_start + pid_size - 1, e);
 		return *this;
 	}
-	inline PIDeque<T> & push_back(T && v) {
-		alloc(pid_size + 1, true);
+
+	//! \~english Appends the given element `e` to the end of the array.
+	//! \~russian Добавляет элемент `e` в конец массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\sa \a push_back()
+	inline PIDeque<T> & push_back(T && e) {
+		alloc_forward(pid_size + 1);
 		PIINTROSPECTION_CONTAINER_USED(T, 1);
-		elementNew(pid_data + pid_start + pid_size - 1, std::move(v));
+		elementNew(pid_data + pid_start + pid_size - 1, std::move(e));
 		return *this;
 	}
-	inline PIDeque<T> & append(const T & v) {return push_back(v);}
-	inline PIDeque<T> & append(T && v) {return push_back(std::move(v));}
-	inline PIDeque<T> & append(const PIDeque<T> & t) {
-		assert(&t != this);
-		size_t ps = pid_size;
-		alloc(pid_size + t.pid_size, true);
-		newT(pid_data + ps + pid_start, t.pid_data + t.pid_start, t.pid_size);
+
+	//! \~english Appends the given elements to the end of the array.
+	//! \~russian Добавляет элементы в конец массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! Appends the given elements from
+	//! [C++11 initializer list](https://en.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~russian Перегруженая функция.
+	//! Добавляет элементы из
+	//! [списка инициализации C++11](https://ru.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~\sa \a push_back()
+	inline PIDeque<T> & push_back(std::initializer_list<T> init_list) {
+		if (init_list.size() == 0) return *this;
+		const size_t ps = pid_size;
+		alloc_forward(pid_size + init_list.size());
+		newT(pid_data + pid_start + ps, init_list.begin(), init_list.size());
 		return *this;
 	}
-	inline PIDeque<T> & operator <<(const T & v) {return push_back(v);}
-	inline PIDeque<T> & operator <<(T && v) {return push_back(std::move(v));}
-	inline PIDeque<T> & operator <<(const PIDeque<T> & t) {return append(t);}
 
-	inline PIDeque<T> & push_front(const T & v) {insert(0, v); return *this;}
-	inline PIDeque<T> & push_front(T && v) {insert(0, std::move(v)); return *this;}
-	inline PIDeque<T> & prepend(const T & v) {return push_front(v);}
-	inline PIDeque<T> & prepend(T && v) {return push_front(std::move(v));}
+	//! \~english Appends the given array `v` to the end of the array.
+	//! \~russian Добавляет массив `v` в конец массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\sa \a push_back()
+	inline PIDeque<T> & push_back(const PIDeque<T> & v) {
+		if (v.isEmpty()) return *this;
+#ifndef NDEBUG
+		if (&v == this) {
+			printf("error with PIDeque<%s>::append\n", __PIP_TYPENAME__(T));
+		}
+#endif
+		assert(&v != this);
+		const size_t ps = pid_size;
+		alloc_forward(pid_size + v.pid_size);
+		newT(pid_data + ps + pid_start, v.pid_data + v.pid_start, v.pid_size);
+		return *this;
+	}
 
-	inline PIDeque<T> & pop_back() {if (pid_size == 0) return *this; resize(pid_size - 1); return *this;}
-	inline PIDeque<T> & pop_front() {if (pid_size == 0) return *this; remove(0); return *this;}
+	//! \~english Appends the given element `e` to the end of the array.
+	//! \~russian Добавляет элемент `e` в конец массива.
+	//! \~\details
+	//! \~english If size() is less than capacity(), which is most often
+	//! then the addition will be very fast.
+	//! In any case, the addition is fast and does not depend on the size of the array.
+	//! If the new size() is greater than capacity()
+	//! then all iterators and references
+	//! (including the past-the-end iterator) are invalidated.
+	//! Otherwise only the past-the-end iterator is invalidated.
+	//! \~russian Если size() меньше capacity(), что часто бывает,
+	//! то добавление будет очень быстрым.
+	//! В любом случае добавление быстрое и не зависит от размера массива.
+	//! Если новый size() больше, чем capacity(),
+	//! то все итераторы и указатели становятся нерабочими.
+	//! В противном случае все, кроме итераторов, указывающих на конец массива,
+	//! остаются в рабочем состоянии.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! v.append(4);
+	//! v.append(5);
+	//! piCout << v; // {1, 2, 3, 4, 5}
+	//! \endcode
+	//! \~\sa \a prepend(), \a push_front(), \a push_back(), \a insert()
+	inline PIDeque<T> & append(const T & e) { return push_back(e); }
 
-	inline T take_back() {T t(back()); pop_back(); return t;}
-	inline T take_front() {T t(front()); pop_front(); return t;}
+	//! \~english Appends the given element `e` to the end of the array.
+	//! \~russian Добавляет элемент `e` в конец массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\sa \a append()
+	inline PIDeque<T> & append(T && e) { return push_back(std::move(e)); }
 
+	//! \~english Appends the given elements to the end of the array.
+	//! \~russian Добавляет элементы в конец массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! Appends the given elements from
+	//! [C++11 initializer list](https://en.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~russian Перегруженая функция.
+	//! Добавляет элементы из
+	//! [списка инициализации C++11](https://ru.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~\sa \a append()
+	inline PIDeque<T> & append(std::initializer_list<T> init_list) { return push_back(init_list); }
+
+	//! \~english Appends the given array `v` to the end of the array.
+	//! \~russian Добавляет массив `v` в конец массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! v.append(PIDeque<int>{4, 5});
+	//! piCout << v; // {1, 2, 3, 4, 5}
+	//! \endcode
+	//! \~\sa \a append()
+	inline PIDeque<T> & append(const PIDeque<T> & v) { return push_back(v); }
+
+	//! \~english Appends the given element `e` to the end of the array.
+	//! \~russian Добавляет элемент `e` в конец массива.
+	//! \~\details
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! v << 4 << 5;
+	//! piCout << v; // {1, 2, 3, 4, 5}
+	//! \endcode
+	//! \~\sa \a append()
+	inline PIDeque<T> & operator<<(const T & e) { return push_back(e); }
+
+	//! \~english Appends the given element `e` to the end of the array.
+	//! \~russian Добавляет элемент `e` в конец массива.
+	//! \~\details
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! v << 4 << 5;
+	//! piCout << v; // {1, 2, 3, 4, 5}
+	//! \endcode
+	//! \~\sa \a append()
+	inline PIDeque<T> & operator<<(T && e) { return push_back(std::move(e)); }
+
+	//! \~english Appends the given array `v` to the end of the array.
+	//! \~russian Добавляет массив `v` в конец массива.
+	//! \~\details
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! v << PIDeque<int>{4, 5};
+	//! piCout << v; // {1, 2, 3, 4, 5}
+	//! \endcode
+	//! \~\sa \a append(), \a push_back()
+	inline PIDeque<T> & operator<<(const PIDeque<T> & v) { return append(v); }
+
+	//! \~english Appends the given element `e` to the begin of the array.
+	//! \~russian Добавляет элемент `e` в начало массива.
+	//! \~\details
+	//! \~english If there is free space at the beginning of the array,
+	//! which is most often, then the addition will be very fast.
+	//! In any case, the addition is fast and does not depend on the size of the array.
+	//! If there is no free space at the beginning of the array
+	//! then all iterators and references
+	//! (including the past-the-begin iterator) are invalidated.
+	//! Otherwise only the past-the-begin iterator is invalidated.
+	//! \~russian Если в начале массива имеется свободное место,
+	//! что часто бывает, то добавление будет очень быстрым.
+	//! В любом случае добавление быстрое и не зависит от размера массива.
+	//! Если в начале массива нет свободного места,
+	//! то все итераторы и указатели становятся нерабочими.
+	//! В противном случае все, кроме итераторов указывающих, на начало массива,
+	//! остаются в рабочем состоянии.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! v.push_front(4);
+	//! v.push_front(5);
+	//! piCout << v; // {5, 4, 1, 2, 3}
+	//! \endcode
+	//! \~\sa \a push_back(), \a append(), \a prepend(), \a insert()
+	inline PIDeque<T> & push_front(const T & e) {
+		if (isEmpty()) return push_back(e);
+		alloc_backward(pid_size + 1, -1);
+		elementNew(pid_data + pid_start, e);
+		return *this;
+	}
+
+	//! \~english Appends the given element `e` to the begin of the array.
+	//! \~russian Добавляет элемент `e` в начало массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\sa \a push_front()
+	inline PIDeque<T> & push_front(T && e) {
+		if (isEmpty()) return push_back(std::move(e));
+		alloc_backward(pid_size + 1, -1);
+		elementNew(pid_data + pid_start, std::move(e));
+		return *this;
+	}
+
+	//! \~english Appends the given array `v` to the begin of the array.
+	//! \~russian Добавляет массив `v` в начало массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! v.push_front(PIDeque<int>{4, 5});
+	//! piCout << v; // {4, 5, 1, 2, 3}
+	//! \endcode
+	//! \~\sa \a push_front()
+	inline PIDeque<T> & push_front(const PIDeque<T> & v) { return insert(0, v); }
+
+	//! \~english Appends the given elements to the begin of the array.
+	//! \~russian Добавляет элементы в начало массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! Appends the given elements from
+	//! [C++11 initializer list](https://en.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~russian Перегруженая функция.
+	//! Добавляет элементы из
+	//! [списка инициализации C++11](https://ru.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~\sa \a append()
+	inline PIDeque<T> & push_front(std::initializer_list<T> init_list) { return insert(0, init_list); }
+
+	//! \~english Appends the given element `e` to the begin of the array.
+	//! \~russian Добавляет элемент `e` в начало массива.
+	//! \~\details
+	//! \~english If there is free space at the beginning of the array,
+	//! which is most often, then the addition will be very fast.
+	//! In any case, the addition is fast and does not depend on the size of the array.
+	//! If there is no free space at the beginning of the array
+	//! then all iterators and references
+	//! (including the past-the-begin iterator) are invalidated.
+	//! Otherwise only the past-the-begin iterator is invalidated.
+	//! \~russian Если в начале массива имеется свободное место,
+	//! что часто бывает, то добавление будет очень быстрым.
+	//! В любом случае добавление быстрое и не зависит от размера массива.
+	//! Если в начале массива нет свободного места,
+	//! то все итераторы и указатели становятся нерабочими.
+	//! В противном случае все, кроме итераторов указывающих, на начало массива,
+	//! остаются в рабочем состоянии.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! v.prepend(4);
+	//! v.prepend(5);
+	//! piCout << v; // {5, 4, 1, 2, 3}
+	//! \endcode
+	//! \~\sa \a push_back(), \a append(), \a prepend(), \a insert()
+	inline PIDeque<T> & prepend(const T & e) { return push_front(e); }
+
+	//! \~english Appends the given element `e` to the begin of the array.
+	//! \~russian Добавляет элемент `e` в начало массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\sa \a prepend()
+	inline PIDeque<T> & prepend(T && e) { return push_front(std::move(e)); }
+
+	//! \~english Appends the given array `v` to the begin of the array.
+	//! \~russian Добавляет массив `v` в начало массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! v.prepend(PIDeque<int>{4, 5});
+	//! piCout << v; // {4, 5, 1, 2, 3}
+	//! \endcode
+	//! \~\sa \a prepend()
+	inline PIDeque<T> & prepend(const PIDeque<T> & v) { return push_front(v); }
+
+	//! \~english Appends the given elements to the begin of the array.
+	//! \~russian Добавляет элементы в начало массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! Appends the given elements from
+	//! [C++11 initializer list](https://en.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~russian Перегруженая функция.
+	//! Добавляет элементы из
+	//! [списка инициализации C++11](https://ru.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~\sa \a append()
+	inline PIDeque<T> & prepend(std::initializer_list<T> init_list) { return push_front(init_list); }
+
+	//! \~english Remove one element from the end of the array.
+	//! \~russian Удаляет один элемент с конца массива.
+	//! \~\details
+	//! \~english Deleting an element from the end is very fast
+	//! and does not depend on the size of the array.
+	//! \~russian Удаление элемента с конца выполняется очень быстро
+	//! и не зависит от размера массива.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! v.pop_back();
+	//! piCout << v; // {1, 2}
+	//! \endcode
+	//! \~\sa \a pop_front(), \a take_back(), \a take_front()
+	inline PIDeque<T> & pop_back() {
+		if (pid_size == 0) return *this;
+		elementDelete(pid_data[pid_size + pid_start - 1]);
+		pid_size = pid_size - 1;
+		return *this;
+	}
+
+	//! \~english Remove one element from the begining of the array.
+	//! \~russian Удаляет один элемент с начала массива.
+	//! \~\details
+	//! \~english Removing an element from the beginning takes longer than from the end.
+	//! This time is directly proportional to the size of the array.
+	//! All iterators and references are invalidated.
+	//! \~russian Удаление элемента с начала выполняется дольше, чем с конца.
+	//! Это время прямопропорционально размеру массива.
+	//! При удалении элемента все итераторы и указатели становятся нерабочими.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! v.pop_front();
+	//! piCout << v; // {2, 3}
+	//! \endcode
+	//! \~\sa \a pop_back(), \a take_back(), \a take_front()
+	inline PIDeque<T> & pop_front() {
+		if (pid_size == 0) return *this;
+		elementDelete(pid_data[pid_start]);
+		pid_start += 1;
+		pid_size -= 1;
+		return *this;
+	}
+
+	//! \~english Remove one element from the end of the array and return it.
+	//! \~russian Удаляет один элемент с начала массива и возвращает его.
+	//! \~\details
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! piCout << v.take_back(); // 3
+	//! piCout << v; // {1, 2}
+	//! \endcode
+	//! \~\sa \a take_front(), \a pop_back(), \a pop_front()
+	inline T take_back() {
+		const T e(back());
+		pop_back();
+		return e;
+	}
+
+	//! \~english Remove one element from the begining of the array and return it.
+	//! \~russian Удаляет один элемент с конца массива и возвращает его.
+	//! \~\details
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! piCout << v.take_front(); // 1
+	//! piCout << v; // {2, 3}
+	//! \endcode
+	//! \~\sa \a take_front(), \a pop_back(), \a pop_front()
+	inline T take_front() {
+		const T e(front());
+		pop_front();
+		return e;
+	}
+
+	//! \~english Returns an array converted to another type.
+	//! \~russian Возвращает конвертированный в другой тип массив.
+	//! \~\details
+	//! \~\code
+	//! PIDeque<double> v{1.1, 2.5, 3.8};
+	//! PIDeque<int> v2 = v.toType<int>();
+	//! piCout << v2; // {1, 2, 3}
+	//! \endcode
+	//! \~\sa \a map()
 	template<typename ST>
-	PIDeque<ST> toType() const {
+	inline PIDeque<ST> toType() const {
 		PIDeque<ST> ret(pid_size);
-		for (uint i = 0; i < pid_size; ++i)
+		ret.reserve(pid_size);
+		for (size_t i = 0; i < pid_size; ++i) {
 			ret[i] = ST(pid_data[i + pid_start]);
+		}
 		return ret;
 	}
 
-	const PIDeque<T> & forEach(std::function<void(const T &)> f) const {
-		for (uint i = 0; i < pid_size; ++i)
-			f(pid_data[i + pid_start]);
-		return *this;
+	//! \~english Returns a new array with all elements
+	//! that pass the test implemented by the provided function `bool test(const T & e)`.
+	//! \~russian Возвращает новый массив со всеми элементами,
+	//! прошедшими проверку, задаваемую в передаваемой функции `bool test(const T & e)`.
+	//! \~\details
+	//! \~\code
+	//! PIDeque<int> v{3, 2, 5, 2, 7};
+	//! PIDeque<int> v2 = v.filter([](const int & i){return i > 2;});
+	//! piCout << v2; // {3, 5, 7}
+	//! \endcode
+	//! \~\sa \a map(), \a any(), \a every()
+	inline PIDeque<T> filter(std::function<bool(const T & e)> test) const {
+		PIDeque<T> ret;
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
+			if (test(pid_data[i])) ret << pid_data[i];
 		}
-	PIDeque<T> copyForEach(std::function<T(const T &)> f) const {
-		PIDeque<T> ret; ret.reserve(pid_size);
-		for (uint i = 0; i < pid_size; ++i)
-			ret << f(pid_data[i + pid_start]);
 		return ret;
 	}
-	PIDeque<T> & forEachInplace(std::function<T(const T &)> f) {
-		for (uint i = 0; i < pid_size; ++i)
-			pid_data[i + pid_start] = f(pid_data[i + pid_start]);
+
+	//! \~english Same as \a filter() but with `index` parameter in `test`.
+	//! \~russian Аналогично \a filter() но с параметром индекса `index` в функции `test`.
+	//! \~\sa \a filter()
+	inline PIDeque<T> filterIndexed(std::function<bool(size_t index, const T & e)> test) const {
+		PIDeque<T> ret;
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
+			if (test(i - pid_start, pid_data[i])) ret << pid_data[i];
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a filter() but from end to begin (from right to left).
+	//! \~russian Аналогично \a filter() но от конца до начала (справа на лево).
+	//! \~\sa \a filter()
+	inline PIDeque<T> filterReverse(std::function<bool(const T & e)> test) const {
+		PIDeque<T> ret;
+		for (ssize_t i = ssize_t(pid_start + pid_size) - 1; i >= ssize_t(pid_start); --i) {
+			if (test(pid_data[i])) ret << pid_data[i];
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a filterReverse() but with `index` parameter in `test`.
+	//! \~russian Аналогично \a filterReverse() но с параметром индекса `index` в функции `test`.
+	//! \~\sa \a filterReverse()
+	inline PIDeque<T> filterReverseIndexed(std::function<bool(size_t index, const T & e)> test) const {
+		PIDeque<T> ret;
+		for (ssize_t i = ssize_t(pid_start + pid_size) - 1; i >= ssize_t(pid_start); --i) {
+			if (test(i - pid_start, pid_data[i])) ret << pid_data[i];
+		}
+		return ret;
+	}
+
+	//! \~english Execute function `void f(const T & e)` for every element in array.
+	//! \~russian Выполняет функцию `void f(const T & e)` для каждого элемента массива.
+	//! \~\details
+	//! \~russian Не позволяет изменять элементы массива.
+	//! Для редактирования элементов используйте функцию вида `void f(T & e)`.
+	//! \~english Does not allow changing array elements.
+	//! To edit elements, use the function like `void f(T & e)`
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3, 4, 5};
+	//! int s = 0;
+	//! v.forEach([&s](const int & e){s += e;});
+	//! piCout << s; // 15
+	//! \endcode
+	//! \~\sa \a filter(), \a map(), \a reduce(), \a any(), \a every()
+	inline void forEach(std::function<void(const T & e)> f) const {
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
+			f(pid_data[i]);
+		}
+	}
+
+	//! \~english Execute function `void f(T & e)` for every element in array.
+	//! \~russian Выполняет функцию `void f(T & e)` для каждого элемента массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! Allows you to change the elements of the array.
+	//! \~russian Перегруженая функция.
+	//! Позволяет изменять элементы массива.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3, 4, 5};
+	//! v.forEach([](int & e){e++;});
+	//! piCout << v; // {2, 3, 4, 5, 6}
+	//! \endcode
+	//! \~\sa \a filter(), \a map(), \a reduce(), \a any(), \a every()
+	inline PIDeque<T> & forEach(std::function<void(T & e)> f) {
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
+			f(pid_data[i]);
+		}
 		return *this;
 	}
+
+	//! \~english Same as \a forEach() but with `index` parameter in `f`.
+	//! \~russian Аналогично \a forEach() но с параметром индекса `index` в функции `f`.
+	//! \~\sa \a forEach()
+	inline void forEachIndexed(std::function<void(size_t index, const T & e)> f) const {
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
+			f(i - pid_start, pid_data[i]);
+		}
+	}
+
+	//! \~english Same as \a forEachIndexed(), but allows you to change the elements of the array.
+	//! \~russian Аналогично \a forEachIndexed(), но позволяет изменять элементы массива.
+	//! \~\sa \a forEach(), \a forEachIndexed()
+	inline PIDeque<T> & forEachIndexed(std::function<void(size_t index, T & e)> f) {
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
+			f(i - pid_start, pid_data[i]);
+		}
+		return *this;
+	}
+
+	//! \~english Same as \a forEach() but from end to begin (from right to left).
+	//! \~russian Аналогично \a forEach() но от конца до начала (справа на лево).
+	//! \~\sa \a forEach()
+	inline void forEachReverse(std::function<void(const T & e)> f) const {
+		for (ssize_t i = ssize_t(pid_start + pid_size) - 1; i >= ssize_t(pid_start); --i) {
+			f(pid_data[i]);
+		}
+	}
+
+	//! \~english Same as \a forEachReverse(), but allows you to change the elements of the array.
+	//! \~russian Аналогично \a forEachReverse(), но позволяет изменять элементы массива.
+	//! \~\sa \a forEach(), \a forEachReverse()
+	inline PIDeque<T> & forEachReverse(std::function<void(T & e)> f) {
+		for (ssize_t i = ssize_t(pid_start + pid_size) - 1; i >= ssize_t(pid_start); --i) {
+			f(pid_data[i]);
+		}
+		return *this;
+	}
+
+	//! \~english Same as \a forEachIndexed() but from end to begin (from right to left).
+	//! \~russian Аналогично \a forEachIndexed() но от конца до начала (справа на лево).
+	//! \~\sa \a forEachIndexed(), \a forEachReverse(), \a forEach()
+	inline void forEachReverseIndexed(std::function<void(size_t index, const T & e)> f) const {
+		for (ssize_t i = ssize_t(pid_start + pid_size) - 1; i >= ssize_t(pid_start); --i) {
+			f(i - pid_start, pid_data[i]);
+		}
+	}
+
+	//! \~english Same as \a forEachReverseIndexed(), but allows you to change the elements of the array.
+	//! \~russian Аналогично \a forEachReverseIndexed(), но позволяет изменять элементы массива.
+	//! \~\sa \a forEachReverseIndexed(), \a forEachIndexed(), \a forEachReverse(), \a forEach()
+	inline PIDeque<T> & forEachReverseIndexed(std::function<void(size_t index, T & e)> f) {
+		for (ssize_t i = ssize_t(pid_start + pid_size) - 1; i >= ssize_t(pid_start); --i) {
+			f(i - pid_start, pid_data[i]);
+		}
+		return *this;
+	}
+
+	//! \~english Сreates a new array populated with the results
+	//! of calling a provided function `ST f(const T & e)` on every element in the calling array.
+	//! \~russian Создаёт новый массив с результатом вызова указанной функции
+	//! `ST f(const T & e)` для каждого элемента массива.
+	//! \~\details
+	//! \~english Calls a provided function`ST f(const T & e)`
+	//! once for each element in an array, in order,
+	//! and constructs a new array from the results.
+	//! \~russian Метод `map` вызывает переданную функцию `ST f(const T & e)`
+	//! один раз для каждого элемента в порядке их появления от начала к концу (слева на право)
+	//! и конструирует новый массив из результатов её вызова.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! PIStringList sl = v.map<PIString>([](const int & i){return PIString::fromNumber(i);});
+	//! piCout << sl; // {"1", "2", "3"}
+	//! \endcode
+	//! \~\sa \a forEach(), \a reduce()
 	template<typename ST>
-	PIDeque<ST> toType(std::function<ST(const T &)> f) const {
-		PIDeque<ST> ret; ret.reserve(pid_size);
-		for (uint i = 0; i < pid_size; ++i)
-			ret << f(pid_data[i + pid_start]);
+	inline PIDeque<ST> map(std::function<ST(const T & e)> f) const {
+		PIDeque<ST> ret;
+		ret.reserve(pid_size);
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
+			ret << f(pid_data[i]);
+		}
 		return ret;
 	}
 
-	inline PIDeque<PIDeque<T>> reshape(size_t rows, size_t cols, int order = byRow) const {
+	//! \~english Same as \a map() but with `index` parameter in `f`.
+	//! \~russian Аналогично \a map() но с параметром индекса `index` в функции `f`.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! PIStringList sl = v.mapIndexed<PIString>([](size_t index, const int & i){return PIString::fromNumber(index);});
+	//! piCout << sl; // {"0", "1", "2"}
+	//! \endcode
+	//! \~\sa \a map()
+	template<typename ST>
+	inline PIDeque<ST> mapIndexed(std::function<ST(size_t index, const T & e)> f) const {
+		PIDeque<ST> ret;
+		ret.reserve(pid_size);
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
+			ret << f(i - pid_start, pid_data[i]);
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a map() but from end to begin (from right to left).
+	//! \~russian Аналогично \a map() но от конца до начала (справа на лево).
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! PIStringList sl = v.mapReverse<PIString>([](const int & i){return PIString::fromNumber(i);});
+	//! piCout << sl; // {"3", "2", "1"}
+	//! \endcode
+	//! \~\sa \a map()
+	template<typename ST>
+	inline PIDeque<ST> mapReverse(std::function<ST(const T & e)> f) const {
+		PIDeque<ST> ret;
+		ret.reserve(pid_size);
+		for (ssize_t i = ssize_t(pid_start + pid_size) - 1; i >= ssize_t(pid_start); --i) {
+			ret << f(pid_data[i]);
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a mapReverse() but with `index` parameter in `f`.
+	//! \~russian Аналогично \a mapReverse() но с параметром индекса `index` в функции `f`.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3};
+	//! PIStringList sl = v.mapReverseIndexed<PIString>([](size_t index, const int & i){return PIString::fromNumber(index);});
+	//! piCout << sl; // {"2", "1", "0"}
+	//! \endcode
+	//! \~\sa \a mapReverse()
+	template<typename ST>
+	inline PIDeque<ST> mapReverseIndexed(std::function<ST(size_t index, const T & e)> f) const {
+		PIDeque<ST> ret;
+		ret.reserve(pid_size);
+		for (ssize_t i = ssize_t(pid_start + pid_size) - 1; i >= ssize_t(pid_start); --i) {
+			ret << f(size_t(i) - pid_start, pid_data[i]);
+		}
+		return ret;
+	}
+
+	//! \~english Applies the function `ST f(const T & e, const ST & acc)`
+	//! to each element of the array (from left to right), returns one value.
+	//! \~russian Применяет функцию `ST f(const T & e, const ST & acc)`
+	//! к каждому элементу массива (слева-направо), возвращает одно значение.
+	//! \~\details
+	//! \~english The reduce() method performs the `f` function
+	//! once for each element in the array.
+	//! If the `initial` argument is passed when calling reduce(),
+	//! then when the function `f` is called for the first time,
+	//! the value of `acc` will be assigned to `initial`.
+	//! If the array is empty, the value `initial` will be returned.
+	//! \param f is a function like `ST f(const T & e, const ST & acc)`,
+	//! executed for each element of the array. It takes two arguments:
+	//! * **e** - current element of the array
+	//! * **acc** - accumulator accumulating the value
+	//! which this function returns after visiting the next element
+	//!
+	//! \param initial _optional_ Object used as the second argument
+	//! when the `f` function is first called.
+	//! \~russian Метод reduce() выполняет функцию `f`
+	//! один раз для каждого элемента, присутствующего в массиве от начала к концу (слева на право).
+	//! Если при вызове reduce() передан аргумент `initial`,
+	//! то при первом вызове функции `f` значение `acc`
+	//! будет равным значению `initial`.
+	//! Если массив пустой то будет возвращено значение `initial`.
+	//! \param f Функция, вида `ST f(const T & e, const ST & acc)`,
+	//! выполняющаяся для каждого элемента массива.
+	//! Она принимает два аргумента:
+	//! * **e** - текущий элемент массива
+	//! * **acc** - аккумулятор, аккумулирующий значение
+	//! которое возвращает эта функция после посещения очередного элемента
+	//!
+	//! \param initial _опциональный_ Объект,
+	//! используемый в качестве второго аргумента при первом вызове функции `f`.
+	//!
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3, 4, 5};
+	//! int s = v.reduce<int>([](const int & e, const int & acc){return e + acc;});
+	//! piCout << s; // 15
+	//! \endcode
+	//! \~\sa \a reduceIndexed(), \a reduceReverse(), \a reduceReverseIndexed(), \a forEach(), \a map()
+	template<typename ST>
+	inline ST reduce(std::function<ST(const T & e, const ST & acc)> f, const ST & initial = ST()) const {
+		ST ret(initial);
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
+			ret = f(pid_data[i], ret);
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a reduce() but with `index` parameter in `f`.
+	//! \~russian Аналогично \a reduce() но с параметром индекса `index` в функции `f`.
+	//! \~\sa \a reduce()
+	template<typename ST>
+	inline ST reduceIndexed(std::function<ST(size_t index, const T & e, const ST & acc)> f, const ST & initial = ST()) const {
+		ST ret(initial);
+		for (size_t i = pid_start; i < pid_start + pid_size; ++i) {
+			ret = f(i - pid_start, pid_data[i], ret);
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a reduce() but from end to begin (from right to left).
+	//! \~russian Аналогично \a reduce() но от конца до начала (справа на лево).
+	//! \~\sa \a reduce()
+	template<typename ST>
+	inline ST reduceReverse(std::function<ST(const T & e, const ST & acc)> f, const ST & initial = ST()) const {
+		ST ret(initial);
+		for (ssize_t i = ssize_t(pid_start + pid_size) - 1; i >= ssize_t(pid_start); --i) {
+			ret = f(pid_data[i], ret);
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a reduceReverse() but with `index` parameter in `f`.
+	//! \~russian Аналогично \a reduceReverse() но с параметром индекса `index` в функции `f`.
+	//! \~\sa \a reduceReverse()
+	template<typename ST>
+	inline ST reduceReverseIndexed(std::function<ST(size_t index, const T & e, const ST & acc)> f, const ST & initial = ST()) const {
+		ST ret(initial);
+		for (ssize_t i = ssize_t(pid_start + pid_size) - 1; i >= ssize_t(pid_start); --i) {
+			ret = f(size_t(i) - pid_start, pid_data[i], ret);
+		}
+		return ret;
+	}
+
+	//! \~english Changes the dimension of the array, creates a two-dimensional array from a one-dimensional array.
+	//! \~russian Изменяет размерность массива, из одномерного массива создает двухмерный.
+	//! \~\details
+	//! \~russian
+	//! \param rows размер внешнего массива
+	//! \param cols размер внутренних массивов
+	//! \param order порядок обхода исходного массива, задаётся с помощью \a ReshapeOrder
+	//! \~english
+	//! \param rows size external array
+	//! \param cols size internal arrays
+	//! \param order the order of traversing the source array is set using \a ReshapeOrder
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3, 4};
+	//! PIDeque<PIDeque<int>> m1 = v.reshape(2,2);
+	//! piCout << m1; // {{1, 2}, {3, 4}}
+	//! PIDeque<PIDeque<int>> m2 = v.reshape(2,2, ReshapeByColumn);
+	//! piCout << m2; // {{1, 3}, {2, 4}}
+	//! \endcode
+	//! \~\sa \a map(), \a reduce(), \a flatten()
+	inline PIDeque<PIDeque<T>> reshape(size_t rows, size_t cols, ReshapeOrder order = ReshapeByRow) const {
 		PIDeque<PIDeque<T>> ret;
 		if (isEmpty()) return ret;
+#ifndef NDEBUG
+		if (rows * cols != pid_size) {
+			printf("error with PIDeque<%s>::reshape\n", __PIP_TYPENAME__(T));
+		}
+#endif
 		assert(rows * cols == pid_size);
-		ret.resize(rows);
-		if (order == byRow) {
-			for (size_t r = 0; r < rows; r++)
+		ret.expand(rows);
+		if (order == ReshapeByRow) {
+			for (size_t r = 0; r < rows; r++) {
 				ret[r] = PIDeque<T>(&(pid_data[r * cols]), cols);
 			}
-		if (order == byColumn) {
+		}
+		if (order == ReshapeByColumn) {
 			for (size_t r = 0; r < rows; r++) {
-				ret[r].resize(cols);
-				for (size_t c = 0; c < cols; c++)
+				ret[r].expand(cols);
+				for (size_t c = 0; c < cols; c++) {
 					ret[r][c] = pid_data[c * rows + r];
 				}
 			}
+		}
 		return ret;
 	}
 
-	template<typename C, typename std::enable_if<
-				 std::is_same<T, PIDeque<C>>::value
-				 , int>::type = 0>
-	inline PIDeque<C> reshape(int order = byRow) const {
+	//! \~english Changes the dimension of the array, creates a one-dimensional array from a two-dimensional array.
+	//! \~russian Изменяет размерность массива, из двухмерный массива создает одномерный.
+	//! \~\details
+	//! \~russian Делает массив плоским.
+	//! Порядок обхода исходного массива задаётся с помощью \a ReshapeOrder.
+	//! \~english Makes the array flat.
+	//! Еhe order of traversing the source array is set using \a ReshapeOrder.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3, 4, 5, 6};
+	//! PIDeque<PIDeque<int>> xv = v.reshape(3,2);
+	//! piCout << xv; // {{1, 2}, {3, 4}, {5, 6}}
+	//! piCout << xv.flatten<int>(); // {1, 2, 3, 4, 5, 6}
+	//! \endcode
+	//! \~\sa \a map(), \a reduce(), \a reshape()
+	template<typename C, typename std::enable_if<std::is_same<T, PIDeque<C>>::value, int>::type = 0>
+	inline PIDeque<C> flatten(ReshapeOrder order = ReshapeByRow) const {
 		PIDeque<C> ret;
 		if (isEmpty()) return ret;
-		size_t rows = size();
-		size_t cols = at(0).size();
+		const size_t rows = size();
+		const size_t cols = at(0).size();
 		ret.reserve(rows * cols);
-		if (order == byRow) {
-			for (size_t r = 0; r < rows; r++)
+		if (order == ReshapeByRow) {
+			for (size_t r = 0; r < rows; r++) {
 				ret.append(at(r));
 			}
-		if (order == byColumn) {
-			for (size_t c = 0; c < cols; c++)
-				for (size_t r = 0; r < rows; r++)
+		}
+		if (order == ReshapeByColumn) {
+			for (size_t c = 0; c < cols; c++) {
+				for (size_t r = 0; r < rows; r++) {
 					ret << at(r)[c];
 				}
+			}
+		}
 		ret.resize(rows * cols);
 		return ret;
 	}
 
+	//! \~english Changes the dimension of the two-dimensional array.
+	//! \~russian Изменяет размерность двухмерного массива.
+	//! \~\details
+	//! \~russian
+	//! \param rows размер внешнего массива
+	//! \param cols размер внутренних массивов
+	//! \param order порядок обхода исходного массива, задаётся с помощью \a ReshapeOrder
+	//! \~english
+	//! \param rows size external array
+	//! \param cols size internal arrays
+	//! \param order the order of traversing the source array is set using \a ReshapeOrder
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3, 4, 5, 6};
+	//! PIDeque<PIDeque<int>> xv = v.reshape(3,2);
+	//! piCout << xv; // {{1, 2}, {3, 4}, {5, 6}}
+	//! piCout << xv.reshape<int>(2,3); // {{1, 2, 3}, {4, 5, 6}}
+	//! \endcode
+	//! \~\sa \a map(), \a reduce(), \a reshape()
+	template<typename C, typename std::enable_if<std::is_same<T, PIDeque<C>>::value, int>::type = 0>
+	inline PIDeque<PIDeque<C>> reshape(size_t rows, size_t cols, ReshapeOrder order = ReshapeByRow) const {
+		PIDeque<C> fl = flatten<C>();
+		return fl.reshape(rows, cols, order);
+	}
+
+	//! \~english Divides an array into a two-dimensional array using the separator `separator`.
+	//! \~russian Разделяет массив на двумерный массив с помощью разделителя`separator`.
+	//! \~\code
+	//! PIDeque<int> v{1, 2, 3, 99, 4, 5, 99, 6};
+	//! piCout << v.split(99); // {{1, 2, 3}, {4, 5}, {6}}
+	//! \endcode
+	//! \~\sa \a splitBySize()
+	inline PIDeque<PIDeque<T>> split(const T & separator) const {
+		PIDeque<PIDeque<T>> ret;
+		if (isEmpty()) return ret;
+		size_t start = 0;
+		ssize_t ci   = indexOf(separator, start);
+		while (ci >= 0) {
+			ret << PIDeque<T>(pid_data + pid_start + start, ci - start);
+			start = ci + 1;
+			ci    = indexOf(separator, start);
+		}
+		if (start < pid_size) {
+			ret << PIDeque<T>(pid_data + pid_start + start, pid_size - start);
+		}
+		return ret;
+	}
+
+	//! \~english Divides an array into a two-dimensional array in chunks of no more than `sz`.
+	//! \~russian Разделяет массив на двумерный массив по кускам не более чем `sz`.
+	//! \~\sa \a split()
+	inline PIDeque<PIDeque<T>> splitBySize(size_t sz) const {
+		PIDeque<PIDeque<T>> ret;
+		if (isEmpty() || sz == 0) return ret;
+		const size_t ch = pid_size / sz;
+		for (size_t i = 0; i < ch; ++i) {
+			ret << PIDeque<T>(pid_data + pid_start + sz * i, sz);
+		}
+		const size_t t = ch * sz;
+		if (t < pid_size) {
+			ret << PIDeque<T>(pid_data + pid_start + t, pid_size - t);
+		}
+		return ret;
+	}
+
+
+	//! \~english Cut sub-array of this array.
+	//! \~russian Вырезает подмассив, то есть кусок из текущего массива.
+	//! \~english
+	//! \param index - index of this array where sub-array starts
+	//! \param count - sub-array size
+	//! \~russian
+	//! \param index - индекс в текущем массиве, откуда начинётся подмассив
+	//! \param count - размер подмассива
+	//! \~\details
+	//! \~english
+	//! Index must be in range from `0` to `size()-1`.
+	//! If sub-array size more than this array size, than ends early.
+	//! \~russian
+	//! Индекс начала должен лежать в диапазоне от `0` до `size()-1`.
+	//! Если заданный размер подмассива превышает размер текущего массива,
+	//! то вернется подмассив меньшего размера (`size()-index-1`).
+	inline PIDeque<T> takeRange(size_t index, size_t count) {
+		PIDeque<T> ret;
+		if (index >= pid_size || count == 0) return ret;
+		if (index + count > pid_size) count = pid_size - index;
+		ret.alloc_forward(count);
+		memcpy(reinterpret_cast<void *>(ret.pid_data + ret.pid_start),
+			   reinterpret_cast<const void *>(pid_data + pid_start + index),
+			   count * sizeof(T));
+
+		const size_t os = pid_size - index - count;
+		if (os <= index) {
+			if (os > 0) {
+				memmove(reinterpret_cast<void *>(pid_data + pid_start + index),
+						reinterpret_cast<const void *>(pid_data + pid_start + index + count),
+						os * sizeof(T));
+			}
+		} else {
+			if (index > 0) {
+				memmove(reinterpret_cast<void *>(pid_data + pid_start + count),
+						reinterpret_cast<const void *>(pid_data + pid_start),
+						index * sizeof(T));
+			}
+			pid_start += count;
+		}
+		pid_size -= count;
+		return ret;
+	}
+
 private:
-	inline void _reset() {pid_size = pid_rsize = pid_start = 0; pid_data = 0;}
+	inline void _reset() {
+		pid_size  = 0;
+		pid_rsize = 0;
+		pid_start = 0;
+		pid_data  = nullptr;
+	}
+
 	inline size_t asize(ssize_t s) {
 		if (s <= 0) return 0;
-		if (pid_rsize + pid_rsize >= size_t(s) && pid_rsize < size_t(s))
-			return pid_rsize + pid_rsize;
-		ssize_t t = 0, s_ = s - 1;
-		while (s_ >> t)
+		if (pid_rsize * 2 >= size_t(s) && pid_rsize < size_t(s)) {
+			return pid_rsize * 2;
+		}
+		size_t t = _PIContainerConstants<T>::minCountPoT();
+		s -= 1;
+		while (s >> t) {
 			++t;
+		}
 		return (1 << t);
 	}
-	template<typename T1 = T, typename std::enable_if<
-			!std::is_trivially_copyable<T1>::value
-			, int>::type = 0>
+
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline void newT(T * dst, const T * src, size_t s) {
 		PIINTROSPECTION_CONTAINER_USED(T, s)
-		for (size_t i = 0; i < s; ++i)
+		for (size_t i = 0; i < s; ++i) {
 			elementNew(dst + i, src[i]);
 		}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
+	}
+
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline void newT(T * dst, const T * src, size_t s) {
 		PIINTROSPECTION_CONTAINER_USED(T, s)
-		memcpy((void*)(dst), (const void*)(src), s * sizeof(T));
+		memcpy(reinterpret_cast<void *>(dst), reinterpret_cast<const void *>(src), s * sizeof(T));
 	}
-	template<typename T1 = T, typename std::enable_if<
-			!std::is_trivially_copyable<T1>::value
-			, int>::type = 0>
+
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline void deleteT(T * d, size_t sz) {
 		PIINTROSPECTION_CONTAINER_UNUSED(T, sz)
-		if ((uchar*)d != 0) {
-			for (size_t i = 0; i < sz; ++i)
+		if (d != nullptr) {
+			for (size_t i = 0; i < sz; ++i) {
 				elementDelete(d[i]);
 			}
 		}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
+	}
+
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline void deleteT(T * d, size_t sz) {
 		PIINTROSPECTION_CONTAINER_UNUSED(T, sz)
 	}
-	template<typename T1 = T, typename std::enable_if<
-				 !std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
-	inline void elementNew(T * to, const T & from) {new(to)T(from);}
-	template<typename T1 = T, typename std::enable_if<
-				 !std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
-	inline void elementNew(T * to, T && from) {new(to)T(std::move(from));}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
-	inline void elementNew(T1 * to, const T & from) {(*to) = from;}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
-	inline void elementNew(T * to, T && from) {(*to) = std::move(from);}
-	template<typename T1 = T, typename std::enable_if<
-				 !std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
-	inline void elementDelete(T & from) {from.~T();}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
-	inline void elementDelete(T & from) {}
-	inline void dealloc() {
-		if ((uchar*)pid_data != 0) free((uchar*)pid_data);
-		pid_data = 0;
+
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
+	inline void elementNew(T * to, const T & from) {
+		new (to) T(from);
 	}
-	inline void checkMove(bool direction) {
+
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
+	inline void elementNew(T * to, T && from) {
+		new (to) T(std::move(from));
+	}
+
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
+	inline void elementNew(T1 * to, const T & from) {
+		(*to) = from;
+	}
+
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
+	inline void elementNew(T * to, T && from) {
+		(*to) = std::move(from);
+	}
+
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
+	inline void elementDelete(T & from) {
+		from.~T();
+	}
+
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
+	inline void elementDelete(T & from) {}
+
+	inline void dealloc() {
+		if (pid_data != nullptr) {
+			free(reinterpret_cast<void *>(pid_data));
+			pid_data = nullptr;
+		}
+	}
+
+	inline void checkMove() {
 		if (pid_size >= 4) {
 			if (pid_size < pid_rsize / 6) {
-				if (pid_start < ssize_t(pid_size + pid_size) || pid_start > (ssize_t(pid_rsize) - ssize_t(pid_size) - ssize_t(pid_size))) {
-					ssize_t ns = (pid_rsize - pid_size) / 2;
+				if (pid_start < (pid_size * 2) || ssize_t(pid_start) > (ssize_t(pid_rsize) - (ssize_t(pid_size) * 2))) {
+					size_t ns = (pid_rsize - pid_size) / 2;
 					if (pid_start != ns) {
-						memmove((void*)(pid_data + ns), (const void*)(pid_data + pid_start), pid_size * sizeof(T));
+						memmove(reinterpret_cast<void *>(pid_data + ns),
+								reinterpret_cast<const void *>(pid_data + pid_start),
+								pid_size * sizeof(T));
 						pid_start = ns;
 					}
 				}
 			}
 		} else {
-			ssize_t ns = (pid_rsize - pid_size) / 2;
+			const size_t ns = (pid_rsize - pid_size) / 2;
 			if (pid_start != ns) {
-				memmove((void*)(pid_data + ns), (const void*)(pid_data + pid_start), pid_size * sizeof(T));
+				memmove(reinterpret_cast<void *>(pid_data + ns),
+						reinterpret_cast<const void *>(pid_data + pid_start),
+						pid_size * sizeof(T));
 				pid_start = ns;
 			}
 		}
 	}
-	inline void alloc(size_t new_size, bool direction, ssize_t start_offset = 0) { // direction == true -> alloc forward
-		if (direction) {
+
+	inline void alloc_forward(size_t new_size) {
 		if (pid_start + new_size <= pid_rsize) {
 			pid_size = new_size;
-				checkMove(direction);
+			if (pid_start > 0) checkMove();
 			return;
 		}
 		pid_size        = new_size;
-			size_t as = asize(pid_start + new_size);
+		const size_t as = asize(pid_start + new_size);
 		if (as != pid_rsize) {
 			PIINTROSPECTION_CONTAINER_ALLOC(T, (as - pid_rsize))
-				T * p_d = (T*)(realloc((void*)(pid_data), as*sizeof(T)));
+			T * p_d = reinterpret_cast<T *>(realloc(reinterpret_cast<void *>(pid_data), as * sizeof(T)));
+#ifndef NDEBUG
+			if (!p_d) {
+				printf("error with PIDeque<%s>::alloc\n", __PIP_TYPENAME__(T));
+			}
+#endif
 			assert(p_d);
 			pid_data  = p_d;
 			pid_rsize = as;
 		}
-		} else {
-			size_t as;
-			if (pid_start + start_offset < 0)
-				as = asize(pid_rsize - start_offset);
-			else as = pid_rsize;
+	}
 
+	inline void alloc_backward(size_t new_size, ssize_t start_offset = 0) {
+		const size_t as = ssize_t(pid_start) + start_offset < 0 ? asize(pid_rsize - start_offset) : pid_rsize;
 		if (as > pid_rsize) {
-				T * td = (T*)(malloc(as * sizeof(T)));
-				ssize_t ns = pid_start + as - pid_rsize;
+			T * td          = reinterpret_cast<T *>(malloc(as * sizeof(T)));
+			const size_t ns = pid_start + as - pid_rsize;
 			PIINTROSPECTION_CONTAINER_ALLOC(T, (as - pid_rsize))
 			if (pid_rsize > 0 && pid_data != 0) {
-					memcpy((void*)(td + ns), (const void*)(pid_data + pid_start), pid_size * sizeof(T));
+				memcpy(reinterpret_cast<void *>(td + ns), reinterpret_cast<const void *>(pid_data + pid_start), pid_size * sizeof(T));
 				dealloc();
 			}
 			pid_data  = td;
@@ -670,37 +2708,71 @@ private:
 		}
 		pid_start += start_offset;
 		pid_size = new_size;
-			checkMove(direction);
+		checkMove();
+	}
+
+	inline void expand(size_t new_size, const T & e = T()) {
+		const size_t os = pid_size;
+		alloc_forward(new_size);
+		PIINTROSPECTION_CONTAINER_USED(T, (new_size - os))
+		for (size_t i = os + pid_start; i < new_size + pid_start; ++i) {
+			elementNew(pid_data + i, e);
 		}
 	}
 
-	T * pid_data;
-	size_t pid_size, pid_rsize;
-	ssize_t pid_start;
+	inline void expand(size_t new_size, std::function<T(size_t i)> f) {
+		const size_t os = pid_size;
+		alloc_forward(new_size);
+		PIINTROSPECTION_CONTAINER_USED(T, (new_size - os))
+		for (size_t i = os + pid_start; i < new_size + pid_start; ++i) {
+			elementNew(pid_data + i, f(i));
+		}
+	}
+
+	T * pid_data     = nullptr;
+	size_t pid_size  = 0;
+	size_t pid_rsize = 0;
+	size_t pid_start = 0;
 };
 
 
 #ifdef PIP_STD_IOSTREAM
+//! \~english Output operator to [std::ostream](https://en.cppreference.com/w/cpp/io/basic_ostream).
+//! \~russian Оператор вывода в [std::ostream](https://ru.cppreference.com/w/cpp/io/basic_ostream).
 template<typename T>
-inline std::ostream & operator <<(std::ostream & s, const PIDeque<T> & v) {s << "{"; for (size_t i = 0; i < v.size(); ++i) {s << v[i]; if (i < v.size() - 1) s << ", ";} s << "}"; return s;}
-#endif
-
-template<typename T>
-inline PICout operator <<(PICout s, const PIDeque<T> & v) {
-	s.space();
-	s.setControl(0, true);
+inline std::ostream & operator<<(std::ostream & s, const PIDeque<T> & v) {
 	s << "{";
 	for (size_t i = 0; i < v.size(); ++i) {
 		s << v[i];
-		if (i < v.size() - 1)
-			s << ", ";
+		if (i < v.size() - 1) s << ", ";
 	}
 	s << "}";
-	s.restoreControl();
+	return s;
+}
+#endif
+
+
+//! \relatesalso PICout
+//! \~english Output operator to \a PICout
+//! \~russian Оператор вывода в \a PICout
+template<typename T>
+inline PICout operator<<(PICout s, const PIDeque<T> & v) {
+	s.space();
+	s.saveAndSetControls(0);
+	s << "{";
+	for (size_t i = 0; i < v.size(); ++i) {
+		s << v[i];
+		if (i < v.size() - 1) s << ", ";
+	}
+	s << "}";
+	s.restoreControls();
 	return s;
 }
 
-template<typename T> inline void piSwap(PIDeque<T> & f, PIDeque<T> & s) {f.swap(s);}
+template<typename T>
+inline void piSwap(PIDeque<T> & f, PIDeque<T> & s) {
+	f.swap(s);
+}
 
 
 #endif // PIDEQUE_H

libs/main/containers/pimap.cpp

@@ -1,187 +0,0 @@
-/** \class PIMap
- * @brief Associative array
- * \details This class used to store Key = Value array of any
- * type of data. \a value() returns value for key and leave map
- * unchaged in any case. \a operator [] create entry in map if
- * there is no entry for given key. You can retrieve all
- * keys by method \a keys() and all values by methos \a values().
- * To iterate all entries use class PIMapIterator, or methods
- * \a makeIterator() and \a makeReverseIterator().
-
- * \fn PIMap::PIMap();
- * @brief Contructs an empty map
-
- * \fn PIMap::PIMap(const PIMap & other);
- * @brief Contructs a copy of "other"
-
- * \fn PIMap & PIMap::operator =(const PIMap & other);
- * @brief Copy operator
-
- * \fn PIMap::PIMap(const PIMap & other);
- * @brief Contructs a copy of "other"
-
-* \fn PIMapIterator PIMap::makeIterator() const
-* @brief Returns PIMapIterator for this map
-
-* \fn PIMapIterator PIMap::makeReverseIterator() const
-* @brief Returns reverse PIMapIterator for this map
-
-
-* \fn size_t PIMap::size() const
-* @brief Returns entries count
-
-* \fn int PIMap::size_s() const
-* @brief Returns entries count
-
-* \fn size_t PIMap::length() const
-* @brief Returns entries count
-
-* \fn bool PIMap::isEmpty() const
-* @brief Returns if map is empty
-
-
-* \fn T & PIMap::operator [](const Key & key)
-* @brief Returns value for key "key". If there is no key in map, create one.
-
-* \fn const T PIMap::operator [](const Key & key) const
-* @brief Returns value for key "key". If there is no key in map, returns default T().
-
-* \fn T & PIMap::at(const Key & key)
-* @brief Equivalent to operator []
-
-* \fn const T PIMap::at(const Key & key) const
-* @brief Equivalent to operator []
-
-
-* \fn PIMap & PIMap::operator <<(const PIMap & other)
-* @brief Insert all etries of "other" to this map. Override existing values.
-
-* \fn bool PIMap::operator ==(const PIMap & t) const
-* @brief Compare operator
-
-* \fn bool PIMap::operator !=(const PIMap & t) const
-* @brief Compare operator
-
-* \fn bool PIMap::contains(const Key & key) const
-* @brief Returns "true" if map contains entry with key "key"
-
-
-* \fn PIMap & PIMap::reserve(size_t new_size)
-* @brief Reserve space for "new_size" entries
-
-* \fn PIMap & PIMap::removeOne(const Key & key)
-* @brief Remove entry with key "key"
-
-* \fn PIMap & PIMap::remove(const Key & key)
-* @brief Equivalent \a removeOne(key)
-
-* \fn PIMap & PIMap::erase(const Key & key)
-* @brief Equivalent \a removeOne(key)
-
-* \fn PIMap & PIMap::clear()
-* @brief Clear map
-
-
-* \fn void PIMap::swap(PIMap & other)
-* @brief Swap map with "other"
-
-
-* \fn PIMap & PIMap::insert(const Key & key, const T & value)
-* @brief Insert or rewrite entry with key "key" and value "value"
-
-* \fn const T PIMap::value(const Key & key, const T & default = T())
-* @brief Returns value for key "key". If there is no key in map, returns "default".
-
-* \fn PIVector<T> PIMap::values() const
-* @brief Returns all values as PIVector
-
-* \fn Key PIMap::key(const T & value, const Key & default = Key()) const
-* @brief Returns key for first founded value "value". If there is no such value in map, returns "default".
-
-* \fn PIVector<Key> PIMap::keys() const
-* @brief Returns all keys as PIVector
-
- * */
-
-
-
-
-/** \class PIMapIterator
- * @brief Helper class to iterate over PIMap
- * \details This class used to access keys and values in PIMap.
- * You can use constructor to create iterator, or use \a PIMap::makeIterator()
- * and \a PIMap::makeReverseIterator() methods.
- *
- * First usage variant:
- * \code
- * PIMap<int, PIString> m;
- * m[1] = "one";
- * m[2] = "two";
- * m[4] = "four";
- *
- * auto it = m.makeIterator();
- * while (it.next()) {
- *     piCout << it.key() << it.value();
- * }
- * // 1 one
- * // 2 two
- * // 4 four
- * \endcode
- *
- * Using hasNext():
- * \code
- * while (it.hasNext()) {
- *     it.next();
- * \endcode
- *
- * Using constructor:
- * \code
- * PIMapIterator<int, PIString> it(m);
- * \endcode
- *
- * Write access:
- * \code
- * while (it.next()) {
- *     it.valueRef().append("_!");
- *     piCout << it.key() << it.value();
- * }
- *
- * // 1 one_!
- * // 2 two_!
- * // 4 four_!
- * \endcode
- *
- * Reverse iterator:
- * \code
- * auto it = m.makeReverseIterator();
- * while (it.next()) {
- *     piCout << it.key() << it.value();
- * }
- *
- * // 4 four
- * // 2 two
- * // 1 one
- * \endcode
-
-* \fn PIMapIterator(const PIMap & map, bool reverse = false)
-* @brief Contructs iterator for "map". Current position is invalid.
-
-* \fn const Key & PIMapIterator::key() const
-* @brief Returns current entry key
-
-* \fn const T & PIMapIterator::value() const
-* @brief Returns current entry value
-
-* \fn T & PIMapIterator::valueRef() const
-* @brief Returns reference to current entry value
-
-* \fn bool PIMapIterator::hasNext()
-* @brief Returns if iterator can jump to next entry
-
-* \fn bool PIMapIterator::next()
-* @brief Jump to next entry and return if new position is valid.
-
-* \fn void PIMapIterator::reset()
-* @brief Reset iterator to initial position.
-
- * */

libs/main/containers/pimap.h

@@ -1,8 +1,17 @@
-/*! @file pimap.h
- * @brief Associative array with custom types of key and value
- * 
- * This file declares PIMap
-*/
+//! \addtogroup Containers
+//! \{
+//! \file pimap.h
+//! \brief
+//! \~english Declares \a PIMap
+//! \~russian Объявление \a PIMap
+//! \~\authors
+//! \~english
+//! Ivan Pelipenko peri4ko@yandex.ru;
+//! Andrey Bychkov work.a.b@yandex.ru;
+//! \~russian
+//! Иван Пелипенко peri4ko@yandex.ru;
+//! Андрей Бычков work.a.b@yandex.ru;
+//! \~\}
 /*
     PIP - Platform Independent Primitives
     Associative array with custom types of key and value
@@ -25,62 +34,100 @@
 #ifndef PIMAP_H
 #define PIMAP_H
 
-#include "pivector.h"
 #include "pideque.h"
 #include "pipair.h"
+#include "pivector.h"
 
 
-template<class T>
-void piQuickSort(T * a, ssize_t N) {
-	if (N < 1) return;
-	if (N < 46) {
-		T tmp;
-		ssize_t i,j;
-		for(i=1; i<=N; i++) {
-			tmp = a[i];
-			j = i-1;
-			while(tmp<a[j] && j>=0) {
-				a[j+1] = a[j];
-				j = j-1;
-			}
-			a[j+1] = tmp;
-		}
-	} else {
-		ssize_t i = 0, j = N;
-		T & p(a[N >> 1]);
-		do {
-			while (a[i] < p) i++;
-			while (a[j] > p) j--;
-			if (i <= j) {
-				if (i != j) {
-					//piCout << "swap" << i << j << a[i] << a[j];
-					piSwap<T>(a[i], a[j]);
-				}
-				i++; j--;
-			}
-		} while (i <= j);
-		if (j > 0) piQuickSort(a, j);
-		if (N > i) piQuickSort(a + i, N - i);
-	}
-}
-
-
+template<typename Key, typename T>
+class PIMapIteratorConst;
+template<typename Key, typename T>
+class PIMapIteratorConstReverse;
 template<typename Key, typename T>
 class PIMapIterator;
+template<typename Key, typename T>
+class PIMapIteratorReverse;
 
 
+//! \addtogroup Containers
+//! \{
+//! \class PIMap
+//! \brief
+//! \~english Associative array.
+//! \~russian Словарь.
+//! \~\}
+//! \details
+//! \~english
+//! A collection of key/value pairs, from which you retrieve a value using its associated key.
+//! There is a finite number of keys in the map, and each key has exactly one value associated with it.
+//! \a value() returns value for key and leave map
+//! unchaged in any case. \a operator [] create entry in map if
+//! there is no entry for given key. You can retrieve all
+//! keys by method \a keys() and all values by methos \a values().
+//! To iterate all entries use class PIMapIterator, or methods
+//! \a makeIterator() and \a makeReverseIterator().
+//! A key in the Map may only occur once.
+//! \~russian
+//! Словари, в принципе, похожи на обычные, используемые в повседневной жизни.
+//! Они хранят элементы одного и того же типа, индексируемые ключевыми значениями.
+//! Достоинство словаря в том, что он позволяет быстро получать значение,
+//! ассоциированное с заданным ключом.
+//! Ключи должны быть уникальными.
+//! Элемент
+//! В контейнеры этого типа заносятся элементы вместе с ключами,
+//! по которым их можно найти, которыми могут выступать значения любого типа.
+//! \a operator [] позволяет получить доступ к элементу по ключу,
+//! и если такого эелемента не было, то он будет создан.
 template<typename Key, typename T>
 class PIMap {
-	template <typename Key1, typename T1> friend PIByteArray & operator >>(PIByteArray & s, PIMap<Key1, T1> & v);
-	template <typename Key1, typename T1> friend PIByteArray & operator <<(PIByteArray & s, const PIMap<Key1, T1> & v);
-	template <typename Key1, typename T1> friend class PIMapIterator;
-public:
-	PIMap() {;}
-	PIMap(const PIMap<Key, T> & other) {*this = other;}
-	PIMap(PIMap<Key, T> && other) : pim_content(std::move(other.pim_content)), pim_index(std::move(other.pim_index)) {}
-	virtual ~PIMap() {;}
+	template<typename Key1, typename T1>
+	friend class PIMapIteratorConst;
+	template<typename Key1, typename T1>
+	friend class PIMapIteratorConstReverse;
+	template<typename Key1, typename T1>
+	friend class PIMapIterator;
+	template<typename Key1, typename T1>
+	friend class PIMapIteratorReverse;
+	template<typename P, typename Key1, typename T1>
+	friend PIBinaryStream<P> & operator<<(PIBinaryStream<P> & s, const PIMap<Key1, T1> & v);
+	template<typename P, typename Key1, typename T1>
+	friend PIBinaryStream<P> & operator>>(PIBinaryStream<P> & s, PIMap<Key1, T1> & v);
 
-	PIMap<Key, T> & operator =(const PIMap<Key, T> & other) {
+public:
+	typedef T mapped_type;
+	typedef Key key_type;
+	typedef PIPair<Key, T> value_type;
+
+	//! \~english Constructs an empty map.
+	//! \~russian Создает пустой словарь.
+	inline PIMap() {}
+
+	//! \~english Copy constructor.
+	//! \~russian Копирующий конструктор.
+	inline PIMap(const PIMap<Key, T> & other): pim_content(other.pim_content), pim_index(other.pim_index) {}
+
+	//! \~english Move constructor.
+	//! \~russian Перемещающий конструктор.
+	inline PIMap(PIMap<Key, T> && other): pim_content(std::move(other.pim_content)), pim_index(std::move(other.pim_index)) {}
+
+	//! \~english Contructs map from
+	//! [C++11 initializer list](https://en.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~russian Создает словарь из
+	//! [списка инициализации C++11](https://ru.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~\details
+	//! \~\code
+	//! PIMap <int, PIString> m{{1, "a"}, {2, "b"}};
+	//! piCout << m; // {1: a, 2: b}
+	//! \endcode
+	inline PIMap(std::initializer_list<std::pair<Key, T>> init_list) {
+		for (auto i: init_list) {
+			insert(std::get<0>(i), std::get<1>(i));
+		}
+	}
+
+	//! \~english Assign operator.
+	//! \~russian Оператор присваивания.
+	inline PIMap<Key, T> & operator=(const PIMap<Key, T> & other) {
 		if (this == &other) return *this;
 		clear();
 		pim_content = other.pim_content;
@@ -88,25 +135,28 @@ public:
 		return *this;
 	}
 
-	PIMap<Key, T> & operator =(PIMap<Key, T> && other) {
+	//! \~english Assign move operator.
+	//! \~russian Оператор перемещающего присваивания.
+	inline PIMap<Key, T> & operator=(PIMap<Key, T> && other) {
 		swap(other);
 		return *this;
 	}
 
-	typedef T mapped_type;
-	typedef Key key_type;
-	typedef PIPair<Key, T> value_type;
-	
 	class iterator {
 		friend class PIMap<Key, T>;
+
 	private:
 		iterator(const PIMap<Key, T> * v, ssize_t p): parent(v), pos(p) {}
 		const PIMap<Key, T> * parent;
 		ssize_t pos;
+
 	public:
-		iterator(): parent(0), pos(0) {}
+		iterator(): parent(nullptr), pos(0) {}
 		const Key & key() const { return const_cast<PIMap<Key, T> *>(parent)->_key(pos); }
 		T & value() { return const_cast<PIMap<Key, T> *>(parent)->_value(pos); }
+		inline PIPair<Key, T> operator*() const {
+			return PIPair<Key, T>(const_cast<PIMap<Key, T> *>(parent)->_key(pos), const_cast<PIMap<Key, T> *>(parent)->_value(pos));
+		}
 		void operator++() { ++pos; }
 		void operator++(int) { ++pos; }
 		void operator--() { --pos; }
@@ -117,14 +167,19 @@ public:
 
 	class reverse_iterator {
 		friend class PIMap<Key, T>;
+
 	private:
 		reverse_iterator(const PIMap<Key, T> * v, ssize_t p): parent(v), pos(p) {}
 		const PIMap<Key, T> * parent;
 		ssize_t pos;
+
 	public:
-		reverse_iterator(): parent(0), pos(0) {}
+		reverse_iterator(): parent(nullptr), pos(0) {}
 		const Key & key() const { return const_cast<PIMap<Key, T> *>(parent)->_key(pos); }
 		T & value() const { return const_cast<PIMap<Key, T> *>(parent)->_value(pos); }
+		inline PIPair<Key, T> operator*() const {
+			return PIPair<Key, T>(const_cast<PIMap<Key, T> *>(parent)->_key(pos), const_cast<PIMap<Key, T> *>(parent)->_value(pos));
+		}
 		void operator++() { --pos; }
 		void operator++(int) { --pos; }
 		void operator--() { ++pos; }
@@ -135,14 +190,15 @@ public:
 
 	class const_iterator {
 		friend class PIMap<Key, T>;
+
 	private:
 		const_iterator(const PIMap<Key, T> * v, ssize_t p): parent(v), pos(p) {}
 		const PIMap<Key, T> * parent;
 		ssize_t pos;
+
 	public:
-		const_iterator(): parent(0), pos(0) {}
+		const_iterator(): parent(nullptr), pos(0) {}
 		const value_type operator*() const { return parent->_pair(pos); }
-		const value_type* operator ->() const {cval = parent->_pair(pos); return &cval;}
 		const Key & key() const { return const_cast<PIMap<Key, T> *>(parent)->_key(pos); }
 		const T & value() const { return const_cast<PIMap<Key, T> *>(parent)->_value(pos); }
 		void operator++() { ++pos; }
@@ -151,132 +207,412 @@ public:
 		void operator--(int) { --pos; }
 		bool operator==(const const_iterator & it) const { return (pos == it.pos); }
 		bool operator!=(const const_iterator & it) const { return (pos != it.pos); }
-		mutable value_type cval;
 	};
 
 	class const_reverse_iterator {
 		friend class PIMap<Key, T>;
+
 	private:
 		const_reverse_iterator(const PIMap<Key, T> * v, ssize_t p): parent(v), pos(p) {}
 		const PIMap<Key, T> * parent;
 		ssize_t pos;
+
 	public:
-		const_reverse_iterator(): parent(0), pos(0) {}
+		const_reverse_iterator(): parent(nullptr), pos(0) {}
 		const value_type operator*() const { return parent->_pair(pos); }
-		const value_type* operator ->() const {cval = parent->_pair(pos); return &cval;}
 		void operator++() { --pos; }
 		void operator++(int) { --pos; }
 		void operator--() { ++pos; }
 		void operator--(int) { ++pos; }
 		bool operator==(const const_reverse_iterator & it) const { return (pos == it.pos); }
 		bool operator!=(const const_reverse_iterator & it) const { return (pos != it.pos); }
-		mutable value_type cval;
 	};
 
- 	iterator begin() {return iterator(this, 0);}
- 	iterator end() {return iterator(this, size());}
-	const_iterator begin() const {return const_iterator(this, 0);}
-	const_iterator end() const {return const_iterator(this, size());}
-	const_iterator constBegin() const {return const_iterator(this, 0);}
-	const_iterator constEnd() const {return const_iterator(this, size());}
- 	reverse_iterator rbegin() {return reverse_iterator(this, size() - 1);}
- 	reverse_iterator rend() {return reverse_iterator(this, -1);}
-	const_reverse_iterator rbegin() const {return const_reverse_iterator(this, size() - 1);}
-	const_reverse_iterator rend() const {return const_reverse_iterator(this, -1);}
-	const_reverse_iterator constRbegin() const {return const_reverse_iterator(this, size() - 1);}
-	const_reverse_iterator constRend() const {return const_reverse_iterator(this, -1);}
 
-	PIMapIterator<Key, T> makeIterator()  const {return PIMapIterator<Key, T>(*this);}
-	PIMapIterator<Key, T> makeReverseIterator() const {return PIMapIterator<Key, T>(*this, true);}
+	//! \~english Iterator to the first element.
+	//! \~russian Итератор на первый элемент.
+	inline iterator begin() { return iterator(this, 0); }
 
-	size_t size() const {return pim_content.size();}
-	int size_s() const {return pim_content.size_s();}
-	size_t length() const {return pim_content.size();}
-	bool isEmpty() const {return (pim_content.size() == 0);}
+	//! \~english Iterator to the element following the last element.
+	//! \~russian Итератор на элемент, следующий за последним элементом.
+	inline iterator end() { return iterator(this, size()); }
 
-	T & operator [](const Key & key) {
+	inline const_iterator begin() const { return const_iterator(this, 0); }
+	inline const_iterator end() const { return const_iterator(this, size()); }
+
+	//! \~english Returns a reverse iterator to the first element of the reversed array.
+	//! \~russian Обратный итератор на первый элемент.
+	inline reverse_iterator rbegin() { return reverse_iterator(this, size() - 1); }
+
+	//! \~english Returns a reverse iterator to the element.
+	//! following the last element of the reversed array.
+	//! \~russian Обратный итератор на элемент,
+	//! следующий за последним элементом.
+	inline reverse_iterator rend() { return reverse_iterator(this, -1); }
+
+	inline const_reverse_iterator rbegin() const { return const_reverse_iterator(this, size() - 1); }
+	inline const_reverse_iterator rend() const { return const_reverse_iterator(this, -1); }
+
+	//! \relatesalso PIMapIteratorConst
+	inline PIMapIteratorConst<Key, T> makeIterator() const { return PIMapIteratorConst<Key, T>(*this); }
+
+	//! \relatesalso PIMapIterator
+	inline PIMapIterator<Key, T> makeIterator() { return PIMapIterator<Key, T>(*this); }
+
+	//! \relatesalso PIMapIteratorConstReverse
+	inline PIMapIteratorConstReverse<Key, T> makeReverseIterator() const { return PIMapIteratorConstReverse<Key, T>(*this); }
+
+	//! \relatesalso PIMapIteratorReverse
+	inline PIMapIteratorReverse<Key, T> makeReverseIterator() { return PIMapIteratorReverse<Key, T>(*this); }
+
+	//! \~english Number of elements in the container.
+	//! \~russian Количество элементов массива.
+	//! \~\sa \a size_s(), \a capacity(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
+	inline size_t size() const { return pim_content.size(); }
+
+	//! \~english Number of elements in the container as signed value.
+	//! \~russian Количество элементов массива в виде знакового числа.
+	//! \~\sa \a size(), \a capacity(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
+	inline int size_s() const { return pim_content.size_s(); }
+
+	//! \~english Same as \a size().
+	//! \~russian Синоним \a size().
+	//! \~\sa \a size(), \a size_s(), \a capacity(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
+	inline size_t length() const { return pim_content.size(); }
+
+	//! \~english Checks if the container has no elements.
+	//! \~russian Проверяет пуст ли массив.
+	//! \~\return
+	//! \~english **true** if the container is empty, **false** otherwise
+	//! \~russian **true** если массив пуст, **false** иначе.
+	//! \~\sa \a size(), \a size_s(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
+	inline bool isEmpty() const { return (pim_content.size() == 0); }
+
+	//! \~english Checks if the container has elements.
+	//! \~russian Проверяет не пуст ли массив.
+	//! \~\return
+	//! \~english **true** if the container is not empty, **false** otherwise
+	//! \~russian **true** если массив не пуст, **false** иначе.
+	//! \~\sa \a size(), \a size_s(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
+	inline bool isNotEmpty() const { return (pim_content.size() > 0); }
+
+
+	//! \~english Full access to element key `key`.
+	//! \~russian Полный доступ к элементу по ключу `key`.
+	//! \~\details
+	//! \~english If the map contains no item with key `key`,
+	//! the function inserts a default-constructed value into the map with key `key`,
+	//! and returns a reference to it.
+	//! \~russian Если элемента с таким ключом `key` не существует,
+	//! то он будет создан конструктором по умолчанию и добавлен в массив
+	//! по ключу `key`, а затем возвращена ссылка на этот новый элемент.
+	//! \~\code
+	//! PIMap <PIString, int> m;
+	//! m["огурец"] = 500;
+	//! piCout << m; // {огурец: 500}
+	//! m["лук"] = 25;
+	//! piCout << m; // {огурец: 500, лук: 25}
+	//! m["огурец"] = 350;
+	//! piCout << m; // {огурец: 350, лук: 25}
+	//! \endcode
+	//! \~\sa \a insert(), \a value(), \a key()
+	inline T & operator[](const Key & key) {
 		bool f(false);
-		ssize_t i = _find(key, f);
-		if (f) return pim_content[pim_index[i].index];
+		const ssize_t i = _find(key, f);
+		if (f) return _value(i);
 		pim_content.push_back(T());
 		pim_index.insert(i, MapIndex(key, pim_content.size() - 1));
 		return pim_content.back();
 	}
-	const T operator [](const Key & key) const {bool f(false); ssize_t i = _find(key, f); if (f) return pim_content[pim_index[i].index]; return T();}
-	const T at(const Key & key) const {return (*this)[key];}
 
-	PIMap<Key, T> & operator <<(const PIMap<Key, T> & other) {
+	//! \~english Read only access to element by `key`.
+	//! \~russian Доступ исключительно на чтение к элементу по ключу `key`.
+	//! \~\note
+	//! \~english Element with key `key` must exists,
+	//! otherwise it will lead to undefined program behavior and memory errors.
+	//! \~russian Элемент по ключу `key` должен существовать,
+	//! иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
+	//! \~\sa \a operator[](), \a value(), \a key()
+	inline const T & at(const Key & key) const {
+		bool f(false);
+		const ssize_t i = _find(key, f);
+		return _value(i);
+	}
+
+	//! \~english Remove element with key `key` from the array and return it.
+	//! \~russian Удаляет элемент с ключом `key` из массива и возвращает его.
+	inline T take(const Key & key, const T & default_ = T()) {
+		bool f(false);
+		const ssize_t i = _find(key, f);
+		if (!f) return default_;
+		const T ret = _value(i);
+		_remove(i);
+		return ret;
+	}
+
+	//! \~english Inserts all elements in array `other` to this array with overwrite.
+	//! \~russian Вставляет все элементы `other` этот массив с перезаписью.
+	inline PIMap<Key, T> & operator<<(const PIMap<Key, T> & other) {
+#ifndef NDEBUG
+		if (&other == this) {
+			printf("error with PIMap<%s, %s>::<<\n", __PIP_TYPENAME__(Key), __PIP_TYPENAME__(T));
+		}
+#endif
 		assert(&other != this);
 		if (other.isEmpty()) return *this;
-		if (other.size() == 1) {insert(other.pim_index[0].key, other.pim_content[0]); return *this;}
-		if (other.size() == 2) {insert(other.pim_index[0].key, other.pim_content[0]); insert(other.pim_index[1].key, other.pim_content[1]); return *this;}
-		for (int i = 0; i < other.pim_index.size_s(); ++i)
+		if (other.size() == 1) {
+			insert(other.pim_index[0].key, other.pim_content[0]);
+			return *this;
+		}
+		if (other.size() == 2) {
+			insert(other.pim_index[0].key, other.pim_content[0]);
+			insert(other.pim_index[1].key, other.pim_content[1]);
+			return *this;
+		}
+		for (int i = 0; i < other.pim_index.size_s(); ++i) {
 			insert(other.pim_index[i].key, other.pim_content[other.pim_index[i].index]);
+		}
 		return *this;
 	}
 
-	bool operator ==(const PIMap<Key, T> & t) const {return (pim_content == t.pim_content && pim_index == t.pim_index);}
-	bool operator !=(const PIMap<Key, T> & t) const {return (pim_content != t.pim_content || pim_index != t.pim_index);}
-	bool contains(const Key & key) const {bool f(false); _find(key, f); return f;}
+	//! \~english Compare operator with array `m`.
+	//! \~russian Оператор сравнения с массивом `m`.
+	inline bool operator==(const PIMap<Key, T> & m) const { return (pim_content == m.pim_content && pim_index == m.pim_index); }
 
-	PIMap<Key, T> & reserve(size_t new_size) {pim_content.reserve(new_size); pim_index.reserve(new_size); return *this;}
+	//! \~english Compare operator with array `m`.
+	//! \~russian Оператор сравнения с массивом `m`.
+	inline bool operator!=(const PIMap<Key, T> & m) const { return (pim_content != m.pim_content || pim_index != m.pim_index); }
 
-	PIMap<Key, T> & removeOne(const Key & key) {bool f(false); ssize_t i = _find(key, f); if (f) _remove(i); return *this;}
-	PIMap<Key, T> & remove(const Key & key) {return removeOne(key);}
-	PIMap<Key, T> & erase(const Key & key) {return removeOne(key);}
-	PIMap<Key, T> & clear() {pim_content.clear(); pim_index.clear(); return *this;}
+	//! \~english Tests if element with key `key` exists in the array.
+	//! \~russian Проверяет наличие элемента с ключом `key` в массиве.
+	inline bool contains(const Key & key) const {
+		bool f(false);
+		_find(key, f);
+		return f;
+	}
 
-	void swap(PIMap<Key, T> & other) {
+	//! \~english Tests if element with value `value` exists in the array.
+	//! \~russian Проверяет наличие элемента со значением `value` в массиве.
+	inline bool containsValue(const T & value) const { return pim_content.contains(value); }
+
+	//! \~english Attempts to allocate memory for at least `new_size` elements.
+	//! \~russian Резервируется память под как минимум `new_size` элементов.
+	inline PIMap<Key, T> & reserve(size_t new_size) {
+		pim_content.reserve(new_size);
+		pim_index.reserve(new_size);
+		return *this;
+	}
+
+	//! \~english Remove element with key `key` from the array.
+	//! \~russian Удаляет элемент с ключом `key` из массива.
+	inline PIMap<Key, T> & remove(const Key & key) {
+		bool f(false);
+		const ssize_t i = _find(key, f);
+		if (f) _remove(i);
+		return *this;
+	}
+
+
+	//! \~english Remove all elements in the array
+	//! passes the test implemented by the provided function `test`.
+	//! \~russian Удаляет все элементы, удовлетворяющие условию,
+	//! заданному в передаваемой функции `test`.
+	inline PIMap<Key, T> & removeWhere(std::function<bool(const Key & key, const T & value)> test) {
+		for (int i = 0; i < pim_index.size_s(); ++i) {
+			const auto & mi(pim_index[i]);
+			if (test(mi.key, pim_content[mi.index])) {
+				_remove(i);
+				--i;
+			}
+		}
+	}
+
+	//! \~english Same as \a remove().
+	//! \~russian Синоним функции \a remove().
+	inline PIMap<Key, T> & erase(const Key & key) { return remove(key); }
+
+
+	//! \~english Clear array, remove all elements.
+	//! \~russian Очищает массив, удаляет все элементы.
+	//! \~\details
+	//! \~\note
+	//! \~english Reserved memory will not be released.
+	//! \~russian Зарезервированная память не освободится.
+	//! \~\sa \a resize()
+	inline PIMap<Key, T> & clear() {
+		pim_content.clear();
+		pim_index.clear();
+		return *this;
+	}
+
+	//! \~english Swaps array `v` other with this array.
+	//! \~russian Меняет местами массив `v` с этим массивом.
+	//! \~\details
+	//! \~english This operation is very fast and never fails.
+	//! \~russian Эта операция выполняется мгновенно без копирования памяти и никогда не дает сбоев.
+	inline void swap(PIMap<Key, T> & other) {
 		pim_content.swap(other.pim_content);
 		pim_index.swap(other.pim_index);
 	}
 
-	PIMap<Key, T> & insert(const Key & key, const T & value) {
+	//! \~english Inserts value `value` with key `key` in the array.
+	//! \~russian Вставляет значение `value` с ключом `key` в массив.
+	//! \~\details
+	//! \~english If an element with the key `key` already exists, it will be overwritten with the value `value`.
+	//! \~russian Если элемент с ключом `key` уже существует, то он будет перезаписан на значение `value`.
+	inline PIMap<Key, T> & insert(const Key & key, const T & value) {
 		bool f(false);
-		ssize_t i = _find(key, f);
-		//piCout << "insert key=" << key << "found=" << f << "index=" << i << "value=" << value;
+		const ssize_t i = _find(key, f);
 		if (f) {
-			pim_content[pim_index[i].index] = value;
+			_value(i) = value;
 		} else {
 			pim_content.push_back(value);
 			pim_index.insert(i, MapIndex(key, pim_content.size() - 1));
 		}
 		return *this;
 	}
-	PIMap<Key, T> & insert(const Key & key, T && value) {
+
+	inline PIMap<Key, T> & insert(const Key & key, T && value) {
 		bool f(false);
-		ssize_t i = _find(key, f);
-		//piCout << "insert key=" << key << "found=" << f << "index=" << i << "value=" << value;
+		const ssize_t i = _find(key, f);
 		if (f) {
-			pim_content[pim_index[i].index] = std::move(value);
+			_value(i) = std::move(value);
 		} else {
 			pim_content.push_back(std::move(value));
 			pim_index.insert(i, MapIndex(key, pim_content.size() - 1));
 		}
 		return *this;
 	}
-	const T value(const Key & key, const T & default_ = T()) const {bool f(false); ssize_t i = _find(key, f); if (!f) return default_; return pim_content[pim_index[i].index];}
-	PIVector<T> values() const {return pim_content;}
-	Key key(const T & value_, const Key & default_ = Key()) const {for (int i = 0; i < pim_index.size_s(); ++i) if (pim_content[pim_index[i].index] == value_) return pim_index[i].key; return default_;}
-	PIVector<Key> keys() const {
+
+	//! \~english Inserts value `pair` in the array.
+	//! \~russian Вставляет пару `pair` в массив.
+	//! \~\details
+	//! \~english The first element of the pair is the key, and the second is the value.
+	//! \~russian Первый элемент пары является ключом, а второй значением.
+	inline PIMap<Key, T> & insert(const PIPair<Key, T> & pair) {
+		bool f(false);
+		const ssize_t i = _find(pair.first, f);
+		if (f) {
+			_value(i) = pair.second;
+		} else {
+			pim_content.push_back(pair.second);
+			pim_index.insert(i, MapIndex(pair.first, pim_content.size() - 1));
+		}
+		return *this;
+	}
+
+	inline PIMap<Key, T> & insert(PIPair<Key, T> && pair) {
+		bool f(false);
+		Key k(std::move(pair.first));
+		const ssize_t i = _find(k, f);
+		if (f) {
+			_value(i) = std::move(pair.second);
+		} else {
+			pim_content.push_back(std::move(pair.second));
+			pim_index.insert(i, MapIndex(k, pim_content.size() - 1));
+		}
+		return *this;
+	}
+
+	//! \~english Returns the value of the element by the key `key`
+	//! or `default_` if there is no such element.
+	//! \~russian Возвращает значение элемента по ключу `key`
+	//!  или `default_` если такого элемента нет.
+	inline T value(const Key & key, const T & default_ = T()) const {
+		bool f(false);
+		const ssize_t i = _find(key, f);
+		if (!f) return default_;
+		return _value(i);
+	}
+
+	//! \~english Returns an array of values of all elements
+	//! \~russian Возвращает массив значений всех эелметнов
+	inline PIVector<T> values() const { return pim_content; }
+
+	//! \~english Returns the key of the first element
+	//! whose value matches `value` or `default_` if there is no such element.
+	//! \~russian Возвращает ключ первого элемента, значение которого
+	//! совпадает с `value` или `default_` если такого элемента нет.
+	inline Key key(const T & value, const Key & default_ = Key()) const {
+		for (int i = 0; i < pim_index.size_s(); ++i) {
+			const auto & mi(pim_index[i]);
+			if (pim_content[mi.index] == value) {
+				return mi.key;
+			}
+		}
+		return default_;
+	}
+
+	//! \~english Returns an array of keys of all elements
+	//! \~russian Возвращает массив ключей всех элементов
+	inline PIVector<Key> keys() const {
 		PIVector<Key> ret;
-		for (int i = 0; i < pim_index.size_s(); ++i)
+		ret.reserve(pim_index.size());
+		for (int i = 0; i < pim_index.size_s(); ++i) {
 			ret << pim_index[i].key;
+		}
 		return ret;
 	}
 
-	void dump() {
-		piCout << "PIMap" << size() << "entries" << PICoutManipulators::NewLine << "content:";
-		for (size_t i = 0; i < pim_content.size(); ++i)
-			piCout << PICoutManipulators::Tab << i << ":" << pim_content[i];
-		piCout << "index:";
-		for (size_t i = 0; i < pim_index.size(); ++i)
-			piCout << PICoutManipulators::Tab << i << ":" << pim_index[i].key << "->" << pim_index[i].index;
+	//! \~english Execute function `void f(const Key & key, const T & value)` for every element in array.
+	//! \~russian Выполняет функцию `void f(const Key & key, const T & value)` для каждого элемента массива.
+	inline void forEach(std::function<void(const Key & key, const T & value)> f) const {
+		for (int i = 0; i < pim_index.size_s(); ++i) {
+			const auto & mi(pim_index[i]);
+			f(mi.key, pim_content[mi.index]);
+		}
 	}
 
-protected:
+	//! \~english Сreates a new map PIMap<Key2, T2> populated with the results
+	//! of calling a provided function `PIPair<Key2, T2> f(const Key & key, const T & value)` on every element in the calling array.
+	//! \~russian Создаёт новый словарь PIMap<Key2, T2> с результатом вызова указанной функции
+	//! `PIPair<Key2, T2> f(const Key & key, const T & value)` для каждого элемента массива.
+	template<typename Key2, typename T2>
+	inline PIMap<Key2, T2> map(std::function<PIPair<Key2, T2>(const Key & key, const T & value)> f) const {
+		PIMap<Key2, T2> ret;
+		ret.reserve(size());
+		for (int i = 0; i < pim_index.size_s(); ++i) {
+			const auto & mi(pim_index[i]);
+			ret.insert(f(mi.key, pim_content[mi.index]));
+		}
+		return ret;
+	}
+
+	//! \~english Сreates a new array PIVector<ST> populated with the results
+	//! of calling a provided function `ST f(const Key & key, const T & value)` on every element in the calling array.
+	//! \~russian Создаёт новый массив PIVector<ST> с результатом вызова указанной функции
+	//! `ST f(const Key & key, const T & value)` для каждого элемента массива.
+	template<typename ST>
+	inline PIVector<ST> map(std::function<ST(const Key & key, const T & value)> f) const {
+		PIVector<ST> ret;
+		ret.reserve(size());
+		for (int i = 0; i < pim_index.size_s(); ++i) {
+			const auto & mi(pim_index[i]);
+			ret << f(mi.key, pim_content[mi.index]);
+		}
+		return ret;
+	}
+
+	//! \~english Returns a new array with all elements
+	//! that pass the test implemented by the provided function `bool test(const Key & key, const T & value)`.
+	//! \~russian Возвращает новый массив со всеми элементами,
+	//! прошедшими проверку, задаваемую в передаваемой функции `bool test(const Key & key, const T & value)`.
+	inline PIMap<Key, T> filter(std::function<bool(const Key & key, const T & value)> test) const {
+		PIMap<Key, T> ret;
+		for (int i = 0; i < pim_index.size_s(); ++i) {
+			const auto & mi(pim_index[i]);
+			const auto & v(pim_content[mi.index]);
+			if (test(mi.key, v)) {
+				ret.insert(mi.key, v);
+			}
+		}
+		return ret;
+	}
+
+private:
 	struct MapIndex {
-		MapIndex(Key k = Key(), size_t i = 0): key(k), index(i) {;}
+		MapIndex(const Key & k = Key(), size_t i = 0): key(k), index(i) {}
+		MapIndex(Key && k, size_t i = 0): key(std::move(k)), index(i) {}
 		Key key;
 		size_t index;
 		bool operator==(const MapIndex & s) const { return key == s.key; }
@@ -284,130 +620,390 @@ protected:
 		bool operator<(const MapIndex & s) const { return key < s.key; }
 		bool operator>(const MapIndex & s) const { return key > s.key; }
 	};
-	template <typename Key1, typename T1> friend PIByteArray & operator >>(PIByteArray & s, PIDeque<typename PIMap<Key1, T1>::MapIndex> & v);
-	template <typename Key1, typename T1> friend PIByteArray & operator <<(PIByteArray & s, const PIDeque<typename PIMap<Key1, T1>::MapIndex> & v);
 
-	ssize_t binarySearch(ssize_t first, ssize_t last, const Key & key, bool & found) const {
-		ssize_t mid;
+	template<typename P, typename Key1, typename T1>
+	friend PIBinaryStream<P> & operator>>(PIBinaryStream<P> & s, PIDeque<typename PIMap<Key1, T1>::MapIndex> & v);
+	template<typename P, typename Key1, typename T1>
+	friend PIBinaryStream<P> & operator<<(PIBinaryStream<P> & s, const PIDeque<typename PIMap<Key1, T1>::MapIndex> & v);
+
+	inline ssize_t _binarySearch(ssize_t first, ssize_t last, const Key & key, bool & found) const {
+		ssize_t mid = 0;
 		while (first <= last) {
 			mid = (first + last) / 2;
-			if (key > pim_index[mid].key) first = mid + 1;
-			else if (key < pim_index[mid].key) last = mid - 1;
-			else {found = true; return mid;}
+			if (key > pim_index[mid].key)
+				first = mid + 1;
+			else if (key < pim_index[mid].key)
+				last = mid - 1;
+			else {
+				found = true;
+				return mid;
+			}
 		}
 		found = false;
 		return first;
 	}
-	void _sort() {piQuickSort<MapIndex>(pim_index.data(), pim_index.size_s() - 1);}
-	ssize_t _find(const Key & k, bool & found) const {
+
+	inline ssize_t _find(const Key & k, bool & found) const {
 		if (pim_index.isEmpty()) {
 			found = false;
 			return 0;
 		}
-		return binarySearch(0, pim_index.size_s() - 1, k, found);
+		return _binarySearch(0, pim_index.size_s() - 1, k, found);
 	}
-	void _remove(ssize_t index) {
-		//if (index >= pim_index.size()) return;
-		size_t ci = pim_index[index].index, bi = pim_index.size() - 1;
+
+	inline void _remove(ssize_t index) {
+		const size_t ci = pim_index[index].index, bi = pim_index.size() - 1;
 		pim_index.remove(index);
-		for (size_t i = 0; i < pim_index.size(); ++i)
+		for (size_t i = 0; i < pim_index.size(); ++i) {
 			if (pim_index[i].index == bi) {
 				pim_index[i].index = ci;
 				break;
 			}
+		}
 		piSwap<T>(pim_content[ci], pim_content.back());
 		pim_content.resize(pim_index.size());
 	}
-	const value_type _pair(ssize_t index) const {
-		if (index < 0 || index >= pim_index.size_s())
-			return value_type();
-		//piCout << "_pair" << index << pim_index[index].index;
-		return value_type(pim_index[index].key, pim_content[pim_index[index].index]);
+
+	inline const value_type _pair(ssize_t index) const {
+		if (index < 0 || index >= pim_index.size_s()) return value_type();
+		const auto & mi(pim_index[index]);
+		return value_type(mi.key, pim_content[mi.index]);
 	}
-	Key & _key(ssize_t index) {return pim_index[index].key;}
-	T & _value(ssize_t index) {return pim_content[pim_index[index].index];}
+
+	inline Key & _key(ssize_t index) { return pim_index[index].key; }
+
+	inline const Key & _key(ssize_t index) const { return pim_index[index].key; }
+
+	inline T & _value(ssize_t index) { return pim_content[pim_index[index].index]; }
+
+	inline const T & _value(ssize_t index) const { return pim_content[pim_index[index].index]; }
+
 
 	PIVector<T> pim_content;
 	PIDeque<MapIndex> pim_index;
 };
 
 
+//! \addtogroup Containers
+//! \{
+//! \class PIMapIteratorConst
+//! \brief
+//! \~english Java-style iterator for \a PIMap.
+//! \~russian Итератор Java стиля для \a PIMap.
+//! \~\}
+//! \details
+//! \~english
+//! This class used to easy serial access keys and values in PIMap with read only permitions.
+//! Use constructor to create iterator, or use \a PIMap::makeIterator()
+//! \~russian
+//! Этот класс используется для удобного перебора ключей и значений всего словаря только для чтения.
+//! Можно использовать конструктор, в который передаётся словарь, или функцию словаря \a PIMap::makeIterator().
+//! \~
+//! \code
+//! PIMap<int, PIString> m;
+//! m[1] = "one";
+//! m[2] = "two";
+//! m[4] = "four";
+//! auto it = m.makeIterator();
+//! while (it.next()) {
+//!     piCout << it.key() << it.value();
+//! }
+//! // 1 one
+//! // 2 two
+//! // 4 four
+//! \endcode
 template<typename Key, typename T>
-class PIMapIterator {
+class PIMapIteratorConst {
 	typedef PIMap<Key, T> MapType;
+
 public:
-	PIMapIterator(const PIMap<Key, T> & map, bool reverse = false): m(map), pos(-1), rev(reverse) {
-		if (rev) pos = m.size_s();
-	}
-	const Key & key() const {return const_cast<MapType & >(m)._key(pos);}
-	const T & value() const {return const_cast<MapType & >(m)._value(pos);}
-	T & valueRef() const {return const_cast<MapType & >(m)._value(pos);}
-	inline bool hasNext() const {
-		if (rev) {
-			return pos > 0;
-		} else {
-			return pos < (m.size_s() - 1);
-		}
-		return false;
-	}
+	inline PIMapIteratorConst(const PIMap<Key, T> & map): m(map), pos(-1) {}
+
+	//! \~english Returns current key.
+	//! \~russian Возвращает ключ текущего элемента.
+	//! \~\sa \a value()
+	inline const Key & key() const { return m._key(pos); }
+
+	//! \~english Returns current value.
+	//! \~russian Возвращает значение текущего элемента.
+	//! \~\sa \a key()
+	inline const T & value() const { return m._value(pos); }
+
+
+	//! \~english Returns true if iterator can jump to next entry
+	//! \~russian Возвращает true если итератор может перейти к следующему элементу.
+	//! \~\sa \a next()
+	inline bool hasNext() const { return pos < (m.size_s() - 1); }
+
+	//! \~english Jump to next entry and return true if new position is valid.
+	//! \~russian Переходит к следующему элементу и возвращает true если он существует.
+	//! \~\sa \a hasNext(), \a reset()
 	inline bool next() {
-		if (rev) {
-			--pos;
-			return pos >= 0;
-		} else {
 		++pos;
 		return pos < m.size_s();
 	}
-		return false;
-	}
-	inline void reset() {
-		if (rev) {
-			pos = m.size_s();
-		} else {
-			pos = -1;
-		}
-	}
+
+	//! \~english Reset iterator to initial position.
+	//! \~russian Переходит на начало.
+	//! \~\sa \a next()
+	inline void reset() { pos = -1; }
+
 private:
 	const MapType & m;
 	ssize_t pos;
-	bool rev;
+};
+
+
+//! \addtogroup Containers
+//! \{
+//! \class PIMapIteratorConstReverse
+//! \brief
+//! \~english Java-style reverse iterator for \a PIMap.
+//! \~russian Итератор Java стиля для \a PIMap в обратном порядке.
+//! \~\}
+//! \details
+//! \~english
+//! This class used to easy serial reverse access keys and values in PIMap with read only permitions.
+//! Use constructor to create iterator, or use \a PIMap::makeReverseIterator().
+//! \~russian
+//! Этот класс используется для удобного перебора ключей и значений всего словаря в обратном порядке только для чтения.
+//! Можно использовать конструктор, в который передаётся словарь, или функцию словаря \a PIMap::makeReverseIterator().
+//! \~
+//! \code
+//! PIMap<int, PIString> m;
+//! m[1] = "one";
+//! m[2] = "two";
+//! m[4] = "four";
+//! auto it = m.makeReverseIterator();
+//! while (it.next()) {
+//!     piCout << it.key() << it.value();
+//! }
+//! // 4 four
+//! // 2 two
+//! // 1 one
+//! \endcode
+template<typename Key, typename T>
+class PIMapIteratorConstReverse {
+	typedef PIMap<Key, T> MapType;
+
+public:
+	inline PIMapIteratorConstReverse(const PIMap<Key, T> & map): m(map), pos(m.size_s()) {}
+
+	//! \~english Returns current key.
+	//! \~russian Возвращает ключ текущего элемента.
+	//! \~\sa \a value()
+	inline const Key & key() const { return m._key(pos); }
+
+	//! \~english Returns current value.
+	//! \~russian Возвращает значение текущего элемента.
+	//! \~\sa \a key()
+	inline const T & value() const { return m._value(pos); }
+
+	//! \~english Returns true if iterator can jump to next entry
+	//! \~russian Возвращает true если итератор может перейти к следующему элементу.
+	//! \~\sa \a next()
+	inline bool hasNext() const { return pos > 0; }
+
+	//! \~english Jump to next entry and return true if new position is valid.
+	//! \~russian Переходит к следующему элементу и возвращает true если он существует.
+	//! \~\sa \a hasNext(), \a reset()
+	inline bool next() {
+		--pos;
+		return pos >= 0;
+	}
+
+	//! \~english Reset iterator to initial position.
+	//! \~russian Переходит на начало.
+	//! \~\sa \a next()
+	inline void reset() { pos = m.size_s(); }
+
+private:
+	const MapType & m;
+	ssize_t pos;
+};
+
+
+//! \addtogroup Containers
+//! \{
+//! \class PIMapIterator
+//! \brief
+//! \~english Java-style iterator for \a PIMap.
+//! \~russian Итератор Java стиля для \a PIMap.
+//! \~\}
+//! \details
+//! \~english
+//! This class used to easy serial access keys and values in PIMap with write permitions.
+//! Use constructor to create iterator, or use \a PIMap::makeIterator()
+//! \~russian
+//! Этот класс используется для удобного перебора ключей и значений всего словаря с доступом на запись.
+//! Можно использовать конструктор, в который передаётся словарь, или функцию словаря \a PIMap::makeIterator().
+//! \~
+//! \code
+//! PIMap<int, PIString> m;
+//! m[1] = "one";
+//! m[2] = "two";
+//! m[4] = "four";
+//! auto it = m.makeIterator();
+//! while (it.next()) {
+//!     it.value().append("_!");
+//!     piCout << it.key() << it.value();
+//! }
+//! // 1 one_!
+//! // 2 two_!
+//! // 4 four_!
+//! \endcode
+template<typename Key, typename T>
+class PIMapIterator {
+	typedef PIMap<Key, T> MapType;
+
+public:
+	inline PIMapIterator(PIMap<Key, T> & map): m(map), pos(-1) {}
+
+	//! \~english Returns current key.
+	//! \~russian Возвращает ключ текущего элемента.
+	//! \~\sa \a value()
+	inline const Key & key() const { return m._key(pos); }
+
+	//! \~english Returns current value.
+	//! \~russian Возвращает значение текущего элемента.
+	//! \~\sa \a key()
+	inline T & value() { return m._value(pos); }
+
+	//! \~english Returns true if iterator can jump to next entry
+	//! \~russian Возвращает true если итератор может перейти к следующему элементу.
+	//! \~\sa \a next()
+	inline bool hasNext() const { return pos < (m.size_s() - 1); }
+
+	//! \~english Jump to next entry and return true if new position is valid.
+	//! \~russian Переходит к следующему элементу и возвращает true если он существует.
+	//! \~\sa \a hasNext(), \a reset()
+	inline bool next() {
+		++pos;
+		return pos < m.size_s();
+	}
+
+	//! \~english Reset iterator to initial position.
+	//! \~russian Переходит на начало.
+	//! \~\sa \a next()
+	inline void reset() { pos = -1; }
+
+private:
+	MapType & m;
+	ssize_t pos;
+};
+
+
+//! \addtogroup Containers
+//! \{
+//! \class PIMapIteratorReverse
+//! \brief
+//! \~english Java-style reverse iterator for \a PIMap.
+//! \~russian Итератор Java стиля для \a PIMap в обратном порядке.
+//! \~\}
+//! \details
+//! \~english
+//! This class used to easy serial reverse access keys and values in PIMap with write permitions.
+//! Use constructor to create iterator, or use \a PIMap::makeReverseIterator().
+//! \~russian
+//! Этот класс используется для удобного перебора ключей и значений всего словаря в обратном порядке с доступом на запись.
+//! Можно использовать конструктор, в который передаётся словарь, или функцию словаря \a PIMap::makeReverseIterator().
+//! \~
+//! \code
+//! PIMap<int, PIString> m;
+//! m[1] = "one";
+//! m[2] = "two";
+//! m[4] = "four";
+//! auto it = m.makeReverseIterator();
+//! while (it.next()) {
+//!     it.value().append("_!");
+//!     piCout << it.key() << it.value();
+//! }
+//! // 4 four_!
+//! // 2 two_!
+//! // 1 one_!
+//! \endcode
+template<typename Key, typename T>
+class PIMapIteratorReverse {
+	typedef PIMap<Key, T> MapType;
+
+public:
+	inline PIMapIteratorReverse(PIMap<Key, T> & map): m(map), pos(m.size_s()) {}
+
+	//! \~english Returns current key.
+	//! \~russian Возвращает ключ текущего элемента.
+	//! \~\sa \a value()
+	inline const Key & key() const { return m._key(pos); }
+
+	//! \~english Returns current value.
+	//! \~russian Возвращает значение текущего элемента.
+	//! \~\sa \a key()
+	inline T & value() { return m._value(pos); }
+
+	//! \~english Returns true if iterator can jump to next entry
+	//! \~russian Возвращает true если итератор может перейти к следующему элементу.
+	//! \~\sa \a next()
+	inline bool hasNext() const { return pos > 0; }
+
+	//! \~english Jump to next entry and return true if new position is valid.
+	//! \~russian Переходит к следующему элементу и возвращает true если он существует.
+	//! \~\sa \a hasNext(), \a reset()
+	inline bool next() {
+		--pos;
+		return pos >= 0;
+	}
+
+	//! \~english Reset iterator to initial position.
+	//! \~russian Переходит на начало.
+	//! \~\sa \a next()
+	inline void reset() { pos = m.size_s(); }
+
+private:
+	MapType & m;
+	ssize_t pos;
 };
 
 
 #ifdef PIP_STD_IOSTREAM
+//! \~english Output operator to [std::ostream](https://en.cppreference.com/w/cpp/io/basic_ostream).
+//! \~russian Оператор вывода в [std::ostream](https://ru.cppreference.com/w/cpp/io/basic_ostream).
 template<typename Key, typename Type>
 inline std::ostream & operator<<(std::ostream & s, const PIMap<Key, Type> & v) {
 	s << "{";
 	bool first = true;
 	for (typename PIMap<Key, Type>::const_iterator i = v.begin(); i != v.end(); ++i) {
-		if (!first)
-			s << ", ";
+		if (!first) s << ", ";
 		first = false;
-		s << i->first << ": " << i->second;
+		s << i.key() << ": " << i.value();
 	}
 	s << "}";
 	return s;
 }
 #endif
 
+
+//! \relatesalso PICout
+//! \~english Output operator to \a PICout
+//! \~russian Оператор вывода в \a PICout
 template<typename Key, typename Type>
 inline PICout operator<<(PICout s, const PIMap<Key, Type> & v) {
 	s.space();
-	s.setControl(0, true);
+	s.saveAndSetControls(0);
 	s << "{";
 	bool first = true;
 	for (typename PIMap<Key, Type>::const_iterator i = v.begin(); i != v.end(); ++i) {
-		if (!first)
-			s << ", ";
+		if (!first) s << ", ";
 		first = false;
-		s << i->first << ": " << i->second;
+		s << i.key() << ": " << i.value();
 	}
 	s << "}";
-	s.restoreControl();
+	s.restoreControls();
 	return s;
 }
 
-template<typename Key, typename Type> inline void piSwap(PIMap<Key, Type> & f, PIMap<Key, Type> & s) {f.swap(s);}
+template<typename Key, typename Type>
+inline void piSwap(PIMap<Key, Type> & f, PIMap<Key, Type> & s) {
+	f.swap(s);
+}
 
 
 #endif // PIMAP_H

libs/main/containers/pipair.h

@@ -1,8 +1,17 @@
-/*! @file pipair.h
- * @brief pair
- *
- * This file declare PIPair
-*/
+//! \addtogroup Containers
+//! \{
+//! \file pipair.h
+//! \brief
+//! \~english Declares \a PIPair
+//! \~russian Объявление \a PIPair
+//! \~\authors
+//! \~english
+//! Ivan Pelipenko peri4ko@yandex.ru;
+//! Andrey Bychkov work.a.b@yandex.ru;
+//! \~russian
+//! Иван Пелипенко peri4ko@yandex.ru;
+//! Андрей Бычков work.a.b@yandex.ru;
+//! \~\}
 /*
     PIP - Platform Independent Primitives
     pair
@@ -25,31 +34,116 @@
 #ifndef PIPAIR_H
 #define PIPAIR_H
 
-#include "pibase.h"
+#include "picout.h"
 
-class PICout;
 
+//! \addtogroup Containers
+//! \{
+//! \class PIPair
+//! \brief
+//! \~english Class template that provides a way to store two heterogeneous objects as a single unit.
+//! \~russian Класс, который позволяет хранить два разнородных объекта как единое целое.
+//! \~\}
+//! \~\sa \a PIMap
 template<typename Type0, typename Type1>
 class PIPair {
 public:
-	PIPair() {first = Type0(); second = Type1();}
-	PIPair(const Type0 & value0, const Type1 & value1) {first = value0; second = value1;}
+	//! \~english Constructs an empty PIPair.
+	//! \~russian Создает пустой PIPair.
+	PIPair(): first(), second() {}
+
+	//! \~english Constructs PIPair from [std::tuple](https://en.cppreference.com/w/cpp/utility/tuple).
+	//! \~russian Создает PIPair из [std::tuple](https://ru.cppreference.com/w/cpp/utility/tuple).
+	explicit PIPair(std::tuple<Type0, Type1> tuple) {
+		first  = std::get<0>(tuple);
+		second = std::get<1>(tuple);
+	}
+
+	//! \~english Constructs PIPair from [std::pair](https://en.cppreference.com/w/cpp/utility/pair).
+	//! \~russian Создает PIPair из [std::pair](https://ru.cppreference.com/w/cpp/utility/pair).
+	explicit PIPair(std::pair<Type0, Type1> pair) {
+		first  = pair.first;
+		second = pair.second;
+	}
+
+	//! \~english Constructs PIPair from values `value0` and `value1`.
+	//! \~russian Создает PIPair из `value0` и `value1`.
+	PIPair(const Type0 & value0, const Type1 & value1) {
+		first  = value0;
+		second = value1;
+	}
+
+	//! \~english Move constructor.
+	//! \~russian Перемещающий конструктор.
+	PIPair(Type0 && value0, Type1 && value1) {
+		first  = std::move(value0);
+		second = std::move(value1);
+	}
+
+	//! \~english First element.
+	//! \~russian Первый элемент.
 	Type0 first;
+
+	//! \~english Second element.
+	//! \~russian Второй элемент.
 	Type1 second;
 };
+
+//! \~english Compare operator with PIPair.
+//! \~russian Оператор сравнения с PIPair.
 template<typename Type0, typename Type1>
-inline bool operator <(const PIPair<Type0, Type1> & value0, const PIPair<Type0, Type1> & value1) {return value0.first < value1.first;}
+inline bool operator==(const PIPair<Type0, Type1> & value0, const PIPair<Type0, Type1> & value1) {
+	return (value0.first == value1.first) && (value0.second == value1.second);
+}
+
+//! \~english Compare operator with PIPair.
+//! \~russian Оператор сравнения с PIPair.
 template<typename Type0, typename Type1>
-inline bool operator ==(const PIPair<Type0, Type1> & value0, const PIPair<Type0, Type1> & value1) {return (value0.first == value1.first) && (value0.second == value1.second);}
-template<typename Type0, typename Type1>
-inline bool operator !=(const PIPair<Type0, Type1> & value0, const PIPair<Type0, Type1> & value1) {return (value0.first != value1.first) || (value0.second != value1.second);}
+inline bool operator!=(const PIPair<Type0, Type1> & value0, const PIPair<Type0, Type1> & value1) {
+	return (value0.first != value1.first) || (value0.second != value1.second);
+}
 
 #ifdef PIP_STD_IOSTREAM
 template<typename Type0, typename Type1>
-inline std::ostream & operator <<(std::ostream & s, const PIPair<Type0, Type1> & v) {s << "(" << v.first << ", " << v.second << ")"; return s;}
+inline std::ostream & operator<<(std::ostream & s, const PIPair<Type0, Type1> & v) {
+	s << "(" << v.first << ", " << v.second << ")";
+	return s;
+}
 #endif
 
+//! \relatesalso PICout
+//! \~english Output operator to \a PICout
+//! \~russian Оператор вывода в \a PICout
 template<typename Type0, typename Type1>
-inline PICout operator <<(PICout s, const PIPair<Type0, Type1> & v) {s.space(); s.setControl(0, true); s << "(" << v.first << ", " << v.second << ")"; s.restoreControl(); return s;}
+inline PICout operator<<(PICout s, const PIPair<Type0, Type1> & v) {
+	s.space();
+	s.saveAndSetControls(0);
+	s << "(" << v.first << ", " << v.second << ")";
+	s.restoreControls();
+	return s;
+}
+
+
+//! \~english Creates \a PIPair object, deducing the target type from the types of arguments.
+//! \~russian Создает \a PIPair выводя типы из аргументов.
+//! \~\details
+//! \~\code
+//! auto p = createPIPair(1, 'a');
+//! piCout << p; // (1, a)
+//! \endcode
+template<class T1, class T2>
+PIPair<T1, T2> createPIPair(const T1 & f, const T2 & s) {
+	return PIPair<T1, T2>(f, s);
+}
+
+
+//! \~english Creates \a PIPair object, deducing the target type from the types of arguments.
+//! \~russian Создает \a PIPair выводя типы из аргументов.
+//! \sa \a createPIPair()
+template<class T1, class T2>
+PIPair<T1, T2> createPIPair(T1 && f, T2 && s) {
+	return PIPair<T1, T2>(std::move(f), std::move(s));
+}
+
 
 #endif // PIPAIR_H

libs/main/containers/piqueue.h

@@ -1,8 +1,17 @@
-/*! @file pideque.h
- * @brief Queue container
- * 
- * This file declare PIQueue
-*/
+//! \addtogroup Containers
+//! \{
+//! \file piqueue.h
+//! \brief
+//! \~english Declares \a PIQueue
+//! \~russian Объявление \a PIQueue
+//! \~\authors
+//! \~english
+//! Ivan Pelipenko peri4ko@yandex.ru;
+//! Andrey Bychkov work.a.b@yandex.ru;
+//! \~russian
+//! Иван Пелипенко peri4ko@yandex.ru;
+//! Андрей Бычков work.a.b@yandex.ru;
+//! \~\}
 /*
     PIP - Platform Independent Primitives
     Queue container
@@ -28,24 +37,82 @@
 #include "pideque.h"
 #include "pivector.h"
 
-
+//! \addtogroup Containers
+//! \{
+//! \class PIQueue
+//! \brief
+//! \~english A container class inherited from the \a PIDeque with queue functionality.
+//! \~russian Класс контейнера наследованый от \a PIDeque с функциональностью очереди.
+//! \~\}
+//! \details
+//! \~english The container is a array of elements organized according to the FIFO principle (first in, first out).
+//! Adds \a enqueue() and \dequeue() functions to \a PIDeque.
+//! \~russian Контейнер представляющий массив элементов, организованных по принципу FIFO (первым пришёл — первым вышел).
+//! Добавляет к \a PIDeque функции \a enqueue() и \a dequeue().
+//! \~\sa \a PIDeque
 template<typename T>
 class PIQueue: public PIDeque<T> {
 public:
+	//! \~english Constructs an empty array.
+	//! \~russian Создает пустой массив.
 	PIQueue() {}
-	virtual ~PIQueue() {}
-	PIDeque<T> & enqueue(const T & v) {PIDeque<T>::push_front(v); return *this;}
-	PIDeque<T> & enqueue(T && v) {PIDeque<T>::push_front(std::move(v)); return *this;}
+
+	//! \~english Puts an element on the queue.
+	//! \~russian Кладёт элемент в очередь.
+	PIDeque<T> & enqueue(const T & v) {
+		PIDeque<T>::push_front(v);
+		return *this;
+	}
+
+	//! \~english Move an element on the queue.
+	//! \~russian Перемещает элемент в очередь.
+	PIDeque<T> & enqueue(T && v) {
+		PIDeque<T>::push_front(std::move(v));
+		return *this;
+	}
+
+	//! \~english Retrieves and returns an element from the queue.
+	//! \~russian Забирает и возвращает элемент из очереди.
+	//! \~\details
+	//! \note
+	//! \~english This function assumes that the array isn't empty.
+	//! Otherwise will be undefined behavior.
+	//! \~russian Эта функция предполагает, что массив не пустой.
+	//! Иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
 	T dequeue() { return PIDeque<T>::take_back(); }
+
+	//! \~english Head element of the queue.
+	//! \~russian Головной (верхний) элемент очереди.
+	//! \~\details
+	//! \note
+	//! \~english Returns a reference to the head element of the queue.
+	//! This function assumes that the array isn't empty.
+	//! Otherwise will be undefined behavior.
+	//! \~russian Возвращает ссылку на головной (верхний) элемент очереди.
+	//! Эта функция предполагает, что массив не пустой.
+	//! Иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
 	T & head() { return PIDeque<T>::back(); }
 	const T & head() const { return PIDeque<T>::back(); }
-	PIVector<T> toVector() {
-		PIVector<T> v;
-		v.reserve(PIDeque<T>::size());
-		for (uint i = 0; i < PIDeque<T>::size(); ++i)
-			v.push_back(PIDeque<T>::at(i));
-		return v;
-	}
+
+	//! \~english Tail element of the queue.
+	//! \~russian Хвостовой (нижний) элемент очереди.
+	//! \~\details
+	//! \~english Returns a reference to the tail element of the queue.
+	//! This function assumes that the array isn't empty.
+	//! Otherwise will be undefined behavior.
+	//! \~russian Возвращает ссылку на хвостовой (нижний) элемент очереди.
+	//! Эта функция предполагает, что массив не пустой.
+	//! Иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
+	T & tail() { return PIDeque<T>::front(); }
+	const T & tail() const { return PIDeque<T>::front(); }
+
+	//! \~english Converts \a PIQueue to \a PIVector.
+	//! \~russian Преобразует \a PIQueue в \a PIVector.
+	PIVector<T> toVector() const { return PIVector<T>(PIDeque<T>::data(), PIDeque<T>::size()); }
+
+	//! \~english Converts \a PIQueue to \a PIDeque.
+	//! \~russian Преобразует \a PIQueue в \a PIDeque.
+	PIDeque<T> toDeque() const { return PIDeque<T>(*this); }
 };
 
 #endif // PIQUEUE_H

libs/main/containers/piset.h

@@ -1,5 +1,5 @@
-/*! @file piset.h
- * @brief Set container
+/*! \file piset.h
+ * \brief Set container
  *
  * This file declare PISet
  */
@@ -27,7 +27,7 @@
 
 #include "pimap.h"
 
-/*! @brief Set of any type
+/*! \brief Set of any type
  * \details This class used to store collection of unique elements
  * of any type. You can only add values to set with \a operator<< or
  * with function \a insert(). You can discover if value already in
@@ -37,27 +37,37 @@
 template<typename T>
 class PISet: public PIMap<T, uchar> {
 	typedef PIMap<T, uchar> _CSet;
-public:
 
+public:
 	//! Contructs an empty set
 	PISet() {}
 
-	virtual ~PISet() {;}
-
 	//! Contructs set with one element "value"
-	PISet(const T & value) {_CSet::insert(value, 0);}
+	explicit PISet(const T & value) { _CSet::insert(value, 0); }
 
 	//! Contructs set with elements "v0" and "v1"
-	PISet(const T & v0, const T & v1) {_CSet::insert(v0, 0); _CSet::insert(v1, 0);}
+	PISet(const T & v0, const T & v1) {
+		_CSet::insert(v0, 0);
+		_CSet::insert(v1, 0);
+	}
 
 	//! Contructs set with elements "v0", "v1" and "v2"
-	PISet(const T & v0, const T & v1, const T & v2) {_CSet::insert(v0, 0); _CSet::insert(v1, 0); _CSet::insert(v2, 0);}
+	PISet(const T & v0, const T & v1, const T & v2) {
+		_CSet::insert(v0, 0);
+		_CSet::insert(v1, 0);
+		_CSet::insert(v2, 0);
+	}
 
 	//! Contructs set with elements "v0", "v1", "v2" and "v3"
-	PISet(const T & v0, const T & v1, const T & v2, const T & v3) {_CSet::insert(v0, 0); _CSet::insert(v1, 0); _CSet::insert(v2, 0); _CSet::insert(v3, 0);}
+	PISet(const T & v0, const T & v1, const T & v2, const T & v3) {
+		_CSet::insert(v0, 0);
+		_CSet::insert(v1, 0);
+		_CSet::insert(v2, 0);
+		_CSet::insert(v3, 0);
+	}
 
 	//! Contructs set from vector of elements
-	PISet(const PIVector<T> & values) {
+	explicit PISet(const PIVector<T> & values) {
 		if (values.isEmpty()) return;
 		for (int i = 0; i < values.size_s(); ++i) {
 			_CSet::insert(values[i], 0);
@@ -65,7 +75,7 @@ public:
 	}
 
 	//! Contructs set from deque of elements
-	PISet(const PIDeque<T> & values) {
+	explicit PISet(const PIDeque<T> & values) {
 		if (values.isEmpty()) return;
 		for (int i = 0; i < values.size_s(); ++i) {
 			_CSet::insert(values[i], 0);
@@ -74,27 +84,39 @@ public:
 
 	typedef T key_type;
 
-	PISet<T> & operator <<(const T & t) {_CSet::insert(t, 0); return *this;}
-	PISet<T> & operator <<(T && t) {_CSet::insert(std::move(t), 0); return *this;}
-	PISet<T> & operator <<(const PISet<T> & other) {(*(_CSet*)this) << *((_CSet*)&other); return *this;}
+	PISet<T> & operator<<(const T & t) {
+		_CSet::insert(t, 0);
+		return *this;
+	}
+	PISet<T> & operator<<(T && t) {
+		_CSet::insert(std::move(t), 0);
+		return *this;
+	}
+	PISet<T> & operator<<(const PISet<T> & other) {
+		(*(_CSet *)this) << *((_CSet *)&other);
+		return *this;
+	}
 
 	//! Returns if element "t" exists in this set
 	bool operator[](const T & t) const { return _CSet::contains(t); }
 
 	//! Returns if element "t" exists in this set
-	PISet<T> & remove(const T & t) {_CSet::remove(t); return *this;}
+	PISet<T> & remove(const T & t) {
+		_CSet::remove(t);
+		return *this;
+	}
 
 	//! Unite set with "v"
 	PISet<T> & unite(const PISet<T> & v) {
 		for (typename PIMap<T, uchar>::const_iterator i = v.begin(); i != v.end(); ++i)
-			_CSet::insert(i->first, 0);
+			_CSet::insert(i.key(), 0);
 		return *this;
 	}
 
 	//! Subtract set with "v"
 	PISet<T> & subtract(const PISet<T> & v) {
 		for (typename PIMap<T, uchar>::const_iterator i = v.begin(); i != v.end(); ++i)
-			_CSet::remove(i->first);
+			_CSet::remove(i.key());
 		return *this;
 	}
 
@@ -121,41 +143,69 @@ public:
 	PISet<T> & operator&=(const PISet<T> & v) { return intersect(v); }
 
 	//! Returns content of set as PIVector
-	PIVector<T> toVector() const {PIVector<T> ret; for (typename _CSet::const_iterator i = _CSet::begin(); i != _CSet::end(); ++i) ret << (*i).first; return ret;}
+	PIVector<T> toVector() const {
+		PIVector<T> ret;
+		for (typename _CSet::const_iterator i = _CSet::begin(); i != _CSet::end(); ++i)
+			ret << i.key();
+		return ret;
+	}
 
 	//! Returns content of set as PIDeque
-	PIDeque<T> toDeque() const {PIDeque<T> ret; for (typename _CSet::const_iterator i = _CSet::begin(); i != _CSet::end(); ++i) ret << (*i).first; return ret;}
-
+	PIDeque<T> toDeque() const {
+		PIDeque<T> ret;
+		for (typename _CSet::const_iterator i = _CSet::begin(); i != _CSet::end(); ++i)
+			ret << i.key();
+		return ret;
+	}
 };
 
 
-//! \relatesalso PISet @brief Returns unite of two sets
-template <typename T> PISet<T> operator +(const PISet<T> & v0, const PISet<T> & v1) {PISet<T> ret(v0); ret.unite(v1); return ret;}
+//! \relatesalso PISet \brief Returns unite of two sets
+template<typename T>
+PISet<T> operator+(const PISet<T> & v0, const PISet<T> & v1) {
+	PISet<T> ret(v0);
+	ret.unite(v1);
+	return ret;
+}
 
-//! \relatesalso PISet @brief Returns subtraction of two sets
-template <typename T> PISet<T> operator -(const PISet<T> & v0, const PISet<T> & v1) {PISet<T> ret(v0); ret.subtract(v1); return ret;}
+//! \relatesalso PISet \brief Returns subtraction of two sets
+template<typename T>
+PISet<T> operator-(const PISet<T> & v0, const PISet<T> & v1) {
+	PISet<T> ret(v0);
+	ret.subtract(v1);
+	return ret;
+}
 
-//! \relatesalso PISet @brief Returns unite of two sets
-template <typename T> PISet<T> operator |(const PISet<T> & v0, const PISet<T> & v1) {PISet<T> ret(v0); ret.unite(v1); return ret;}
+//! \relatesalso PISet \brief Returns unite of two sets
+template<typename T>
+PISet<T> operator|(const PISet<T> & v0, const PISet<T> & v1) {
+	PISet<T> ret(v0);
+	ret.unite(v1);
+	return ret;
+}
 
-//! \relatesalso PISet @brief Returns intersetion of two sets
-template <typename T> PISet<T> operator &(const PISet<T> & v0, const PISet<T> & v1) {PISet<T> ret(v0); ret.intersect(v1); return ret;}
+//! \relatesalso PISet \brief Returns intersetion of two sets
+template<typename T>
+PISet<T> operator&(const PISet<T> & v0, const PISet<T> & v1) {
+	PISet<T> ret(v0);
+	ret.intersect(v1);
+	return ret;
+}
 
 
 template<typename Type>
 inline PICout operator<<(PICout s, const PISet<Type> & v) {
 	s.space();
-	s.setControl(0, true);
+	s.saveAndSetControls(0);
 	s << "{";
 	bool first = true;
 	for (typename PIMap<Type, uchar>::const_iterator i = v.begin(); i != v.end(); ++i) {
-		if (!first)
-			s << ", ";
+		if (!first) s << ", ";
 		first = false;
-		s << i->first;
+		s << i.key();
 	}
 	s << "}";
-	s.restoreControl();
+	s.restoreControls();
 	return s;
 }
 

libs/main/containers/pistack.h

@@ -1,8 +1,17 @@
-/*! @file pistack.h
- * @brief Stack container
- * 
- * This file declare PIStack
-*/
+//! \addtogroup Containers
+//! \{
+//! \file pistack.h
+//! \brief
+//! \~english Declares \a PIStack
+//! \~russian Объявление \a PIStack
+//! \~\authors
+//! \~english
+//! Ivan Pelipenko peri4ko@yandex.ru;
+//! Andrey Bychkov work.a.b@yandex.ru;
+//! \~russian
+//! Иван Пелипенко peri4ko@yandex.ru;
+//! Андрей Бычков work.a.b@yandex.ru;
+//! \~\}
 /*
     PIP - Platform Independent Primitives
     Stack container
@@ -25,25 +34,73 @@
 #ifndef PISTACK_H
 #define PISTACK_H
 
+#include "pideque.h"
 #include "pivector.h"
 
+//! \addtogroup Containers
+//! \{
+//! \class PIStack
+//! \brief
+//! \~english A container class inherited from the \a PIVector with stack functionality.
+//! \~russian Класс контейнера наследованый от \a PIVector с функциональностью стека.
+//! \~\}
+//! \details
+//! \~english The container is a array of elements organized according to the LIFO principle (last in, first out).
+//! Adds \a push() and \pop() functions to \a PIVector.
+//! \~russian Контейнер представляющий массив элементов, организованных по принципу LIFO (последним пришёл — первым вышел).
+//! Добавляет к \a PIVector функции \a push() и \a pop().
+//! \~\sa \a PIVector
 template<typename T>
 class PIStack: public PIVector<T> {
 public:
-	PIStack() {;}
-	virtual ~PIStack() {;}
-	PIVector<T> & push(const T & v) {PIVector<T>::push_back(v); return *this;}
-	PIVector<T> & push(T && v) {PIVector<T>::push_back(std::move(v)); return *this;}
+	//! \~english Constructs an empty array.
+	//! \~russian Создает пустой массив.
+	PIStack() {}
+
+	//! \~english Puts an element on the stack.
+	//! \~russian Кладёт элемент в стек.
+	PIVector<T> & push(const T & v) {
+		PIVector<T>::push_back(v);
+		return *this;
+	}
+
+	//! \~english Move an element on the stack.
+	//! \~russian Перемещает элемент в стек.
+	PIVector<T> & push(T && v) {
+		PIVector<T>::push_back(std::move(v));
+		return *this;
+	}
+
+	//! \~english Retrieves and returns an element from the stack.
+	//! \~russian Забирает и возвращает элемент из стека.
+	//! \~\details
+	//! \note
+	//! \~english This function assumes that the array isn't empty.
+	//! Otherwise will be undefined behavior.
+	//! \~russian Эта функция предполагает, что массив не пустой.
+	//! Иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
 	T pop() { return PIVector<T>::take_back(); }
+
+	//! \~english Top element of the stack
+	//! \~russian Верхний элемент стека.
+	//! \~\details
+	//! \note
+	//! \~english Returns a reference to the top element of the stack.
+	//! This function assumes that the array isn't empty.
+	//! Otherwise will be undefined behavior.
+	//! \~russian Возвращает ссылку на верхний элемент стека.
+	//! Эта функция предполагает, что массив не пустой.
+	//! Иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
 	T & top() { return PIVector<T>::back(); }
 	const T & top() const { return PIVector<T>::back(); }
-	PIVector<T> toVector() {
-		PIVector<T> v;
-		v.reserve(PIVector<T>::size());
-		for (uint i = 0; i < PIVector<T>::size(); ++i)
-			v.push_back(PIVector<T>::at(i));
-		return v;
-	}
+
+	//! \~english Converts \a PIStack to \a PIVector.
+	//! \~russian Преобразует \a PIStack в \a PIVector.
+	PIVector<T> toVector() const { return PIVector<T>(*this); }
+
+	//! \~english Converts \a PIStack to \a PIDeque.
+	//! \~russian Преобразует \a PIStack в \a PIDeque.
+	PIDeque<T> toDeque() const { return PIDeque<T>(PIVector<T>::data(), PIVector<T>::size()); }
 };
 
 #endif // PISTACK_H

libs/main/containers/pivector.cpp

@@ -1,170 +0,0 @@
-/** \class PIVector
- * @brief Dynamic array of any type
- * \details This class used to store dynamic array of any
- * type of data. In memory data stored linear. You can insert
- * item in any place of remove some items from any place.
- * For quick add elements this is stream operator <<.
-
- * \fn PIVector::PIVector();
- * Contructs an empty vector
-
- * \fn PIVector::PIVector(size_t size, const T & value = T());
- * @brief Contructs vector with size "size" filled elements "value"
- * \details Example: \snippet picontainers.cpp PIVector::PIVector
-
- * \fn PIVector::PIVector(std::initializer_list list);
- * @brief Contructs vector from C++11 initializer list
- * \details Example: \snippet picontainers.cpp PIVector::PIVector
-
- * \fn const T & PIVector::at(size_t index) const;
- * @brief Read-only access to element by index "index"
- * \details Example: \snippet picontainers.cpp PIVector::at_c
- * \sa \a operator[]
-
- * \fn T & PIVector::at(size_t index);
- * @brief Full access to element by index "index"
- * \details Example: \snippet picontainers.cpp PIVector::at
- * \sa \a operator[]
-
- * \fn const T * PIVector::data(size_t index = 0) const;
- * @brief Read-only pointer to element by index "index"
- * \details Example: \snippet picontainers.cpp PIVector::data_c
-
- * \fn T * PIVector::data(size_t index = 0);
- * @brief Pointer to element by index "index"
- * \details Example: \snippet picontainers.cpp PIVector::data
-
- * \fn size_t PIVector::size() const;
- * @brief Elements count
-
- * \fn ssize_t PIVector::size_s() const;
- * @brief Elements count
-
- * \fn bool PIVector::isEmpty() const;
- * @brief Return \c "true" if vector is empty, i.e. size = 0
-
- * \fn bool PIVector::has(const T & t) const;
-
- * \fn bool PIVector::contains(const T & v) const;
- * @brief Return \c "true" if vector has at least one element equal "t"
-
- * \fn int PIVector::etries(const T & t) const;
- * @brief Return how many times element "t" appears in vector
-
- * \fn ssize_t PIVector::indexOf(const T & t) const;
- * @brief Return index of first element equal "t" or -1 if there is no such element
-
- * \fn ssize_t PIVector::lastIndexOf(const T & t) const;
- * @brief Return index of last element equal "t" or -1 if there is no such element
-
- * \fn static int PIVector::compare_func(const T * t0, const T * t1);
- * @brief Standard compare function for type "T". Return  0 if t0 = t1,  -1 if t0 < t1  and  1 if t0 > t1.
-
- * \fn void PIVector::resize(size_t size, const T & new_type = T());
- * @brief Resize vector to size "size"
- * \details Elements removed from end of vector if new size < old size, or added new elements = "new_type" if new size > old size.\n
- * Example: \snippet picontainers.cpp PIVector::resize
- * \sa \a size(), \a clear()
-
- * \fn PIVector & PIVector::enlarge(size_t size);
- * @brief Increase vector size with "size" elements
-
- * \fn void PIVector::clear();
- * @brief Clear vector. Equivalent to call <tt>"resize(0)"</tt>
-
- * \fn PIVector & PIVector::sort(CompareFunc compare = compare_func);
- * @brief Sort vector using quick sort algorithm and standard compare function
- * \details Example: \snippet picontainers.cpp PIVector::sort_0
- * With custom compare function: \snippet picontainers.cpp PIVector::sort_1
-
- * \fn PIVector & PIVector::fill(const T & t);
- * @brief Fill vector with elements "t" leave size is unchanged and return reference to vector
- * \details Example: \snippet picontainers.cpp PIVector::fill
-
- * \fn PIVector & PIVector::assign(const T & t = T());
- * @brief Synonym of \a fill(t)
-
- * \fn PIVector & PIVector::assign(size_t new_size, const T & t);
- * @brief Resize to "new_size", then fill with "t"
-
- * \fn T & PIVector::back();
- * @brief Last element of the vector
-
- * \fn const T & PIVector::back() const;
- * @brief Last element of the vector
-
- * \fn T & PIVector::front();
- * @brief First element of the vector
-
- * \fn const T & PIVector::front() const;
- * @brief First element of the vector
-
- * \fn PIVector & PIVector::push_back(const T & t);
- * @brief Add new element "t" at the end of vector and return reference to vector
-
- * \fn PIVector & PIVector::push_front(const T & t);
- * @brief Add new element "t" at the beginning of vector and return reference to vector
-
- * \fn PIVector & PIVector::pop_back();
- * @brief Remove one element from the end of vector and return reference to vector
-
- * \fn PIVector & PIVector::pop_front();
- * @brief Remove one element from the beginning of vector and return reference to vector
-
- * \fn T PIVector::take_back();
- * @brief Remove one element from the end of vector and return it
-
- * \fn T PIVector::take_front();
- * @brief Remove one element from the beginning of vector and return it
-
- * \fn PIVector & PIVector::remove(size_t index);
- * @brief Remove one element by index "index" and return reference to vector
- * \details Example: \snippet picontainers.cpp PIVector::remove_0
- * \sa \a removeOne(), \a removeAll()
-
- * \fn PIVector & PIVector::remove(size_t index, size_t count);
- * @brief Remove "count" elements by first index "index" and return reference to vector
- * \details Example: \snippet picontainers.cpp PIVector::remove_1
- * \sa \a removeOne(), \a removeAll()
-
- * \fn PIVector & PIVector::removeOne(const T & v);
- * @brief Remove no more than one element equal "v" and return reference to vector
- * \details Example: \snippet picontainers.cpp PIVector::removeOne
- * \sa \a remove(), \a removeAll()
-
- * \fn PIVector & PIVector::removeAll(const T & v);
- * @brief Remove all elements equal "v" and return reference to vector
- * \details Example: \snippet picontainers.cpp PIVector::removeAll
- * \sa \a remove(), \a removeOne()
-
- * \fn PIVector & PIVector::insert(size_t pos, const T & t);
- * @brief Insert element "t" after index "pos" and return reference to vector
- * \details Example: \snippet picontainers.cpp PIVector::insert_0
-
- * \fn PIVector & PIVector::insert(size_t pos, const PIVector & t);
- * @brief Insert other vector "t" after index "pos" and return reference to vector
- * \details Example: \snippet picontainers.cpp PIVector::insert_1
-
- * \fn T & PIVector::operator [](size_t index);
- * @brief Full access to element by index "index"
- * \details Example: \snippet picontainers.cpp PIVector::()
- * \sa \a at()
-
- * \fn const T & PIVector::operator [](size_t index) const;
- * @brief Read-only access to element by index "index"
- * \details Example: \snippet picontainers.cpp PIVector::()_c
- * \sa \a at()
-
- * \fn PIVector & PIVector::operator <<(const T & t);
- * @brief Add new element "t" at the end of vector and return reference to vector
-
- * \fn PIVector & PIVector::operator <<(const PIVector & t);
- * @brief Add vector "t" at the end of vector and return reference to vector
-
- * \fn bool PIVector::operator ==(const PIVector & t);
- * @brief Compare with vector "t"
-
- * \fn bool PIVector::operator !=(const PIVector & t);
- * @brief Compare with vector "t"
-
- * */

libs/main/containers/pivector.h

@@ -1,11 +1,20 @@
-/*! @file pivector.h
- * @brief Dynamic array of any type
- *
- * This file declares PIVector
-*/
+//! \addtogroup Containers
+//! \{
+//! \file pivector.h
+//! \brief
+//! \~english Declares \a PIVector
+//! \~russian Объявление \a PIVector
+//! \~\authors
+//! \~english
+//! Ivan Pelipenko peri4ko@yandex.ru;
+//! Andrey Bychkov work.a.b@yandex.ru;
+//! \~russian
+//! Иван Пелипенко peri4ko@yandex.ru;
+//! Андрей Бычков work.a.b@yandex.ru;
+//! \~\}
 /*
     PIP - Platform Independent Primitives
-	Dynamic array of any type
+    Sequence linear container aka dynamic size array of any type
     Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
 
     This program is free software: you can redistribute it and/or modify
@@ -28,609 +37,2579 @@
 #include "picontainers.h"
 
 
+//! \addtogroup Containers
+//! \{
+//! \class PIVector
+//! \brief
+//! \~english Sequence linear container - dynamic size array of any type.
+//! \~russian Последовательный контейнер с линейной памятью - динамический массив любого типа.
+//! \~\}
+//! \details
+//! \~english
+//! The elements are stored contiguously,
+//! which means that elements can be accessed not only through iterators,
+//! but also using offsets to regular pointers to elements.
+//! This means that a pointer to an element of a PIVector may be passed to any function
+//! that expects a pointer to an element of an array.
+//! To add elements you can use functions \a append() and \a insert(),
+//! to remove elements you can use functions \a remove() and \a removeOne(), \a removeWhere().
+//! Change size by function \a resize() and \a assign().
+//! Items in an array are numbered, starting from zero.
+//! This number is called the item's index.
+//! So the first item has index 0, the last has index `size() - 1`.
+//! A set of various convenient functions is also available for the array,
+//! for example: \a indexOf(), \a contains(), \a entries(), \a isEmpty(), \a isNotEmpty(),
+//! \a every(), \a any(), \a forEach(), \a indexWhere(), \a getRange(), \a sort(),
+//! \a map(), \a reduce(), \a filter(), \a flatten(), \a reshape() and others.
+//!
+//! The storage of the PIVector is handled automatically,
+//! being expanded as needed.
+//! PIVector usually occupy more space than static arrays,
+//! because more memory is allocated to handle future growth.
+//! This way a PIVector does not need to reallocate each time an element is inserted,
+//! but only when the additional memory is exhausted.
+//! The total amount of allocated memory can be queried using \a capacity() function.
+//! Reallocations are usually costly operations in terms of performance.
+//! The \a reserve() function can be used to eliminate reallocations
+//! if the number of elements is known beforehand.
+//!
+//! The complexity (efficiency) of common operations on PIVector is as follows:
+//! - Random access - constant O(1)
+//! - Insertion or removal of elements at the end - amortized constant O(1)
+//! - Insertion or removal of elements - linear in the distance to the end of the array O(n)
+//!
+//! \~russian
+//! Элементы хранятся непрерывно, а значит доступны не только через итераторы,
+//! но и с помощью смещений для обычных указателей на элементы.
+//! Это означает, что указатель на элемент PIVector может передаваться в любую функцию,
+//! ожидающую указатель на элемент массива.
+//! Добавить элементы можно с помощью функции \a append() или \a insert(),
+//! а удалить с помощью \a remove() или \a removeOne(), \a removeWhere().
+//! Изменить размер можно функцией \a resize() или \a assign().
+//! Массив индексируется с нуля:
+//! первый элемент массива имеет индекс, равный `0`,
+//! а индекс последнего элемента равен `size() - 1`.
+//! Также для массива доступен набор различных удобных функций,
+//! например: \a indexOf(), \a contains(), \a entries(), \a isEmpty(), \a isNotEmpty(),
+//! \a every(), \a any(), \a forEach(), \a indexWhere(), \a getRange(), \a sort(),
+//! \a map(), \a reduce(), \a filter(), \a flatten(), \a reshape() и другие.
+//!
+//! Память PIVector обрабатывается автоматически,
+//! расширяясь по мере необходимости.
+//! Векторы обычно занимают больше места, чем статические массивы,
+//! поскольку больше памяти выделяется для обработки будущего роста.
+//! Таким образом, память для PIVector требуется выделять
+//! не при каждой вставке элемента,
+//! а только после исчерпания дополнительной памяти.
+//! Общий объём выделенной памяти можно получить с помощью функции \a capacity().
+//!
+//! Выделение памяти обычно является дорогостоящей операцией
+//! с точки зрения производительности.
+//! Функцию \a reserve() можно использовать для исключения выделения памяти,
+//! если количество элементов известно заранее.
+//!
+//! Сложность (эффективность) обычных операций над PIVector следующая:
+//! - Произвольный доступ — постоянная O(1)
+//! - Вставка и удаление элементов в конце — амортизированная постоянная O(1)
+//! - Вставка и удаление элементов — линейная по расстоянию до конца массива O(n)
+//!
+//! \~\sa \a PIDeque, \a PIMap
 template<typename T>
 class PIVector {
 public:
-	inline PIVector(): piv_data(0), piv_size(0), piv_rsize(0) {
-		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-	}
-	inline PIVector(const T * data, size_t size): piv_data(0), piv_size(0), piv_rsize(0) {
+	typedef bool (*CompareFunc)(const T &, const T &);
+	typedef T value_type;
+	typedef T * pointer;
+	typedef const T * const_pointer;
+	typedef T & reference;
+	typedef const T & const_reference;
+	typedef size_t size_type;
+
+	//! \~english Constructs an empty array.
+	//! \~russian Создает пустой массив.
+	inline PIVector() { PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T)) }
+
+	//! \~english Contructs array from raw `data`.
+	//! This constructor reserve `size` and copy from `data` pointer.
+	//! \~russian Создает массив из указателя на данные `data` и размер `size`.
+	//! То есть выделяет память для `size` элементов и копирует данные из указателя `data`.
+	inline PIVector(const T * data, size_t size) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
 		alloc(size);
 		newT(piv_data, data, piv_size);
 	}
-	inline PIVector(const PIVector<T> & other): piv_data(0), piv_size(0), piv_rsize(0) {
+
+	//! \~english Copy constructor.
+	//! \~russian Копирующий конструктор.
+	inline PIVector(const PIVector<T> & v) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-		alloc(other.piv_size);
-		newT(piv_data, other.piv_data, piv_size);
+		alloc(v.piv_size);
+		newT(piv_data, v.piv_data, piv_size);
 	}
-	inline PIVector(std::initializer_list<T> init_list): piv_data(0), piv_size(0), piv_rsize(0) {
+
+	//! \~english Contructs array from
+	//! [C++11 initializer list](https://en.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~russian Создает массив из
+	//! [списка инициализации C++11](https://ru.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~\details
+	//! \~\code
+	//! PIVector <int> v{1,2,3};
+	//! piCout << v; // {1, 2, 3}
+	//! \endcode
+	inline PIVector(std::initializer_list<T> init_list) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
 		alloc(init_list.size());
 		newT(piv_data, init_list.begin(), init_list.size());
 	}
-	inline PIVector(size_t piv_size, const T & f = T()): piv_data(0), piv_size(0), piv_rsize(0) {
+
+	//! \~english Contructs array with size `size` filled elements `e`.
+	//! \~russian Создает массив из `size` элементов заполненных `e`.
+	inline explicit PIVector(size_t size, const T & e = T()) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-		resize(piv_size, f);
+		expand(size, e);
 	}
-	inline PIVector(size_t piv_size, std::function<T(size_t)> f): piv_data(0), piv_size(0), piv_rsize(0) {
+
+	//! \~english Contructs array with size `size` and elements created by function `f(size_t i)`.
+	//! \~russian Создает массив из `size` элементов созданных функцией `f(size_t i)`.
+	//! \~\details
+	//! \~english Can use
+	//! [Lambda expressions](https://en.cppreference.com/w/cpp/language/lambda)
+	//! as constructor argument.
+	//! \~russian Позволяет передавать
+	//! [Лямбда-выражения](https://ru.cppreference.com/w/cpp/language/lambda)
+	//! для создания элементов в конструкторе.
+	//! \~\code
+	//! PIVector <int> v(5, [](size_t i){return i*2;});
+	//! piCout << v; // {0, 2, 4, 6, 8}
+	//! \endcode
+	inline PIVector(size_t size, std::function<T(size_t i)> f) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-		resize(piv_size, f);
+		expand(size, f);
 	}
-	inline PIVector(PIVector<T> && other): piv_data(other.piv_data), piv_size(other.piv_size), piv_rsize(other.piv_rsize) {
+
+	//! \~english Move constructor.
+	//! \~russian Перемещающий конструктор.
+	inline PIVector(PIVector<T> && v) {
 		PIINTROSPECTION_CONTAINER_NEW(T, sizeof(T))
-		other._reset();
+		piv_data  = v.piv_data;
+		piv_size  = v.piv_size;
+		piv_rsize = v.piv_rsize;
+		v._reset();
 	}
-	inline virtual ~PIVector() {
+
+	inline ~PIVector() {
 		PIINTROSPECTION_CONTAINER_DELETE(T)
 		PIINTROSPECTION_CONTAINER_FREE(T, (piv_rsize))
 		deleteT(piv_data, piv_size);
 		dealloc();
-		_reset();
 	}
 
-	inline PIVector<T> & operator =(const PIVector<T> & other) {
-		if (this == &other) return *this;
+	//! \~english Assign operator.
+	//! \~russian Оператор присваивания.
+	inline PIVector<T> & operator=(const PIVector<T> & v) {
+		if (this == &v) return *this;
 		clear();
-		deleteT(piv_data, piv_size);
-		alloc(other.piv_size);
-		newT(piv_data, other.piv_data, piv_size);
+		alloc(v.piv_size);
+		newT(piv_data, v.piv_data, piv_size);
 		return *this;
 	}
 
-	inline PIVector<T> & operator =(PIVector<T> && other) {
-		swap(other);
+	//! \~english Assign move operator.
+	//! \~russian Оператор перемещающего присваивания.
+	inline PIVector<T> & operator=(PIVector<T> && v) {
+		swap(v);
 		return *this;
 	}
 
-	typedef T value_type;
-
-	enum ReshapeOrder {
-		byRow,
-		byColumn
-	};
-
 	class iterator {
 		friend class PIVector<T>;
+
 	private:
-		inline iterator(PIVector<T> * v, size_t p): parent(v), pos(p) {}
+		inline iterator(PIVector<T> * v, ssize_t p): parent(v), pos(p) {}
 		PIVector<T> * parent;
-		size_t pos;
+		ssize_t pos;
+
 	public:
+		typedef T value_type;
+		typedef T * pointer;
+		typedef T & reference;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::random_access_iterator_tag iterator_category;
+
 		inline iterator(): parent(0), pos(0) {}
+
 		inline T & operator*() { return (*parent)[pos]; }
 		inline const T & operator*() const { return (*parent)[pos]; }
-		inline void operator ++() {++pos;}
-		inline void operator ++(int) {++pos;}
-		inline void operator --() {--pos;}
-		inline void operator --(int) {--pos;}
+		inline T & operator->() { return (*parent)[pos]; }
+		inline const T & operator->() const { return (*parent)[pos]; }
+
+		inline iterator & operator++() {
+			++pos;
+			return *this;
+		}
+		inline iterator operator++(int) {
+			const auto tmp = *this;
+			++*this;
+			return tmp;
+		}
+		inline iterator & operator--() {
+			--pos;
+			return *this;
+		}
+		inline iterator operator--(int) {
+			const auto tmp = *this;
+			--*this;
+			return tmp;
+		}
+
+		inline iterator & operator+=(const iterator & it) {
+			pos += it.pos;
+			return *this;
+		}
+		inline iterator & operator+=(size_t p) {
+			pos += p;
+			return *this;
+		}
+		inline iterator & operator-=(const iterator & it) {
+			pos -= it.pos;
+			return *this;
+		}
+		inline iterator & operator-=(size_t p) {
+			pos -= p;
+			return *this;
+		}
+
+		friend inline iterator operator-(size_t p, const iterator & it) { return it - p; }
+		friend inline iterator operator-(const iterator & it, size_t p) {
+			auto tmp = it;
+			tmp -= p;
+			return tmp;
+		}
+		friend inline std::ptrdiff_t operator-(const iterator & it1, const iterator & it2) { return it1.pos - it2.pos; }
+
+		friend inline iterator operator+(size_t p, const iterator & it) { return it + p; }
+		friend inline iterator operator+(const iterator & it, size_t p) {
+			auto tmp = it;
+			tmp += p;
+			return tmp;
+		}
+
 		inline bool operator==(const iterator & it) const { return (pos == it.pos); }
 		inline bool operator!=(const iterator & it) const { return (pos != it.pos); }
+		friend inline bool operator<(const iterator & it1, const iterator & it2) { return it1.pos < it2.pos; }
+		friend inline bool operator<=(const iterator & it1, const iterator & it2) { return it1.pos <= it2.pos; }
+		friend inline bool operator>(const iterator & it1, const iterator & it2) { return it1.pos > it2.pos; }
+		friend inline bool operator>=(const iterator & it1, const iterator & it2) { return it1.pos >= it2.pos; }
 	};
 
 	class const_iterator {
 		friend class PIVector<T>;
+
 	private:
-		inline const_iterator(const PIVector<T> * v, size_t p): parent(v), pos(p) {}
+		inline const_iterator(const PIVector<T> * v, ssize_t p): parent(v), pos(p) {}
 		const PIVector<T> * parent;
-		size_t pos;
+		ssize_t pos;
+
 	public:
+		typedef T value_type;
+		typedef T * pointer;
+		typedef T & reference;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::random_access_iterator_tag iterator_category;
+
 		inline const_iterator(): parent(0), pos(0) {}
+
 		inline const T & operator*() const { return (*parent)[pos]; }
-		inline void operator ++() {++pos;}
-		inline void operator ++(int) {++pos;}
-		inline void operator --() {--pos;}
-		inline void operator --(int) {--pos;}
+		inline const T & operator->() const { return (*parent)[pos]; }
+
+		inline const_iterator & operator++() {
+			++pos;
+			return *this;
+		}
+		inline const_iterator operator++(int) {
+			const auto tmp = *this;
+			++*this;
+			return tmp;
+		}
+		inline const_iterator & operator--() {
+			--pos;
+			return *this;
+		}
+		inline const_iterator operator--(int) {
+			const auto tmp = *this;
+			--*this;
+			return tmp;
+		}
+
+		inline const_iterator & operator+=(const const_iterator & it) {
+			pos += it.pos;
+			return *this;
+		}
+		inline const_iterator & operator+=(size_t p) {
+			pos += p;
+			return *this;
+		}
+		inline const_iterator & operator-=(const const_iterator & it) {
+			pos -= it.pos;
+			return *this;
+		}
+		inline const_iterator & operator-=(size_t p) {
+			pos -= p;
+			return *this;
+		}
+
+		friend inline const_iterator operator-(size_t p, const const_iterator & it) { return it - p; }
+		friend inline const_iterator operator-(const const_iterator & it, size_t p) {
+			auto tmp = it;
+			tmp -= p;
+			return tmp;
+		}
+		friend inline std::ptrdiff_t operator-(const const_iterator & it1, const const_iterator & it2) { return it1.pos - it2.pos; }
+
+		friend inline const_iterator operator+(size_t p, const const_iterator & it) { return it + p; }
+		friend inline const_iterator operator+(const const_iterator & it, size_t p) {
+			auto tmp = it;
+			tmp += p;
+			return tmp;
+		}
+
 		inline bool operator==(const const_iterator & it) const { return (pos == it.pos); }
 		inline bool operator!=(const const_iterator & it) const { return (pos != it.pos); }
+		friend inline bool operator<(const const_iterator & it1, const const_iterator & it2) { return it1.pos < it2.pos; }
+		friend inline bool operator<=(const const_iterator & it1, const const_iterator & it2) { return it1.pos <= it2.pos; }
+		friend inline bool operator>(const const_iterator & it1, const const_iterator & it2) { return it1.pos > it2.pos; }
+		friend inline bool operator>=(const const_iterator & it1, const const_iterator & it2) { return it1.pos >= it2.pos; }
 	};
 
 	class reverse_iterator {
 		friend class PIVector<T>;
+
 	private:
-		inline reverse_iterator(PIVector<T> * v, size_t p): parent(v), pos(p) {}
+		inline reverse_iterator(PIVector<T> * v, ssize_t p): parent(v), pos(p) {}
 		PIVector<T> * parent;
-		size_t pos;
+		ssize_t pos;
+
 	public:
+		typedef T value_type;
+		typedef T * pointer;
+		typedef T & reference;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::random_access_iterator_tag iterator_category;
+
 		inline reverse_iterator(): parent(0), pos(0) {}
+
 		inline T & operator*() { return (*parent)[pos]; }
 		inline const T & operator*() const { return (*parent)[pos]; }
-		inline void operator ++() {--pos;}
-		inline void operator ++(int) {--pos;}
-		inline void operator --() {++pos;}
-		inline void operator --(int) {++pos;}
+		inline T & operator->() { return (*parent)[pos]; }
+		inline const T & operator->() const { return (*parent)[pos]; }
+
+		inline reverse_iterator & operator++() {
+			--pos;
+			return *this;
+		}
+		inline reverse_iterator operator++(int) {
+			const auto tmp = *this;
+			--*this;
+			return tmp;
+		}
+		inline reverse_iterator & operator--() {
+			++pos;
+			return *this;
+		}
+		inline reverse_iterator operator--(int) {
+			const auto tmp = *this;
+			++*this;
+			return tmp;
+		}
+
+		inline reverse_iterator & operator+=(const reverse_iterator & it) {
+			pos -= it.pos;
+			return *this;
+		}
+		inline reverse_iterator & operator+=(size_t p) {
+			pos -= p;
+			return *this;
+		}
+		inline reverse_iterator & operator-=(const reverse_iterator & it) {
+			pos += it.pos;
+			return *this;
+		}
+		inline reverse_iterator & operator-=(size_t p) {
+			pos += p;
+			return *this;
+		}
+
+		friend inline reverse_iterator operator-(size_t p, const reverse_iterator & it) { return it - p; }
+		friend inline reverse_iterator operator-(const reverse_iterator & it, size_t p) {
+			auto tmp = it;
+			tmp -= p;
+			return tmp;
+		}
+		friend inline std::ptrdiff_t operator-(const reverse_iterator & it1, const reverse_iterator & it2) { return it2.pos - it1.pos; }
+
+		friend inline reverse_iterator operator+(size_t p, const reverse_iterator & it) { return it + p; }
+		friend inline reverse_iterator operator+(const reverse_iterator & it, size_t p) {
+			auto tmp = it;
+			tmp += p;
+			return tmp;
+		}
+
 		inline bool operator==(const reverse_iterator & it) const { return (pos == it.pos); }
 		inline bool operator!=(const reverse_iterator & it) const { return (pos != it.pos); }
+		friend inline bool operator<(const reverse_iterator & it1, const reverse_iterator & it2) { return it1.pos < it2.pos; }
+		friend inline bool operator<=(const reverse_iterator & it1, const reverse_iterator & it2) { return it1.pos <= it2.pos; }
+		friend inline bool operator>(const reverse_iterator & it1, const reverse_iterator & it2) { return it1.pos > it2.pos; }
+		friend inline bool operator>=(const reverse_iterator & it1, const reverse_iterator & it2) { return it1.pos >= it2.pos; }
 	};
 
 	class const_reverse_iterator {
 		friend class PIVector<T>;
+
 	private:
-		inline const_reverse_iterator(const PIVector<T> * v, size_t p): parent(v), pos(p) {}
+		inline const_reverse_iterator(const PIVector<T> * v, ssize_t p): parent(v), pos(p) {}
 		const PIVector<T> * parent;
-		size_t pos;
+		ssize_t pos;
+
 	public:
+		typedef T value_type;
+		typedef T * pointer;
+		typedef T & reference;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::random_access_iterator_tag iterator_category;
+
 		inline const_reverse_iterator(): parent(0), pos(0) {}
 		inline const T & operator*() const { return (*parent)[pos]; }
-		inline void operator ++() {--pos;}
-		inline void operator ++(int) {--pos;}
-		inline void operator --() {++pos;}
-		inline void operator --(int) {++pos;}
+		inline const T & operator->() const { return (*parent)[pos]; }
+
+		inline const_reverse_iterator & operator++() {
+			--pos;
+			return *this;
+		}
+		inline const_reverse_iterator operator++(int) {
+			const auto tmp = *this;
+			--*this;
+			return tmp;
+		}
+		inline const_reverse_iterator & operator--() {
+			++pos;
+			return *this;
+		}
+		inline const_reverse_iterator operator--(int) {
+			const auto tmp = *this;
+			++*this;
+			return tmp;
+		}
+
+		inline const_reverse_iterator & operator+=(const const_reverse_iterator & it) {
+			pos -= it.pos;
+			return *this;
+		}
+		inline const_reverse_iterator & operator+=(size_t p) {
+			pos -= p;
+			return *this;
+		}
+		inline const_reverse_iterator & operator-=(const const_reverse_iterator & it) {
+			pos += it.pos;
+			return *this;
+		}
+		inline const_reverse_iterator & operator-=(size_t p) {
+			pos += p;
+			return *this;
+		}
+
+		friend inline const_reverse_iterator operator-(size_t p, const const_reverse_iterator & it) { return it - p; }
+		friend inline const_reverse_iterator operator-(const const_reverse_iterator & it, size_t p) {
+			auto tmp = it;
+			tmp -= p;
+			return tmp;
+		}
+		friend inline std::ptrdiff_t operator-(const const_reverse_iterator & it1, const const_reverse_iterator & it2) {
+			return it2.pos - it1.pos;
+		}
+
+		friend inline const_reverse_iterator operator+(size_t p, const const_reverse_iterator & it) { return it + p; }
+		friend inline const_reverse_iterator operator+(const const_reverse_iterator & it, size_t p) {
+			auto tmp = it;
+			tmp += p;
+			return tmp;
+		}
+
 		inline bool operator==(const const_reverse_iterator & it) const { return (pos == it.pos); }
 		inline bool operator!=(const const_reverse_iterator & it) const { return (pos != it.pos); }
+		friend inline bool operator<(const const_reverse_iterator & it1, const const_reverse_iterator & it2) { return it1.pos < it2.pos; }
+		friend inline bool operator<=(const const_reverse_iterator & it1, const const_reverse_iterator & it2) { return it1.pos <= it2.pos; }
+		friend inline bool operator>(const const_reverse_iterator & it1, const const_reverse_iterator & it2) { return it1.pos > it2.pos; }
+		friend inline bool operator>=(const const_reverse_iterator & it1, const const_reverse_iterator & it2) { return it1.pos >= it2.pos; }
 	};
 
+	//! \~english Iterator to the first element.
+	//! \~russian Итератор на первый элемент.
+	//! \~\details ![begin, end](doc/images/pivector_begin.png)
+	//!
+	//! \~english If the array is empty, the returned iterator is equal to \a end().
+	//! \~russian Если массив пустой, возвращаемый итератор будет равен \a end().
+	//! \~\return \ref stl_iterators
+	//! \~\sa \a end(), \a rbegin(), \a rend()
 	inline iterator begin() { return iterator(this, 0); }
+
+	//! \~english Iterator to the element following the last element.
+	//! \~russian Итератор на элемент, следующий за последним элементом.
+	//! \~\details ![begin, end](doc/images/pivector_begin.png)
+	//!
+	//! \~english This element acts as a placeholder;
+	//! attempting to access it results in undefined behavior.
+	//! \~russian Этот элемент существует лишь условно,
+	//! попытка доступа к нему приведёт к выходу за разрешенную память.
+	//! \~\return \ref stl_iterators
+	//! \~\sa \a begin(), \a rbegin(), \a rend()
 	inline iterator end() { return iterator(this, piv_size); }
+
 	inline const_iterator begin() const { return const_iterator(this, 0); }
 	inline const_iterator end() const { return const_iterator(this, piv_size); }
+
+	//! \~english Returns a reverse iterator to the first element of the reversed array.
+	//! \~russian Обратный итератор на первый элемент.
+	//! \~\details ![rbegin, rend](doc/images/pivector_rbegin.png)
+	//!
+	//! \~english It corresponds to the last element of the non-reversed array.
+	//! If the array is empty, the returned iterator is equal to \a rend().
+	//! \~russian Итератор для прохода массива в обратном порядке.
+	//! Указывает на последний элемент.
+	//! Если массив пустой, то совпадает с итератором \a rend().
+	//! \~\return \ref stl_iterators
+	//! \~\sa \a rend(), \a begin(), \a end()
 	inline reverse_iterator rbegin() { return reverse_iterator(this, piv_size - 1); }
+
+	//! \~english Returns a reverse iterator to the element
+	//! following the last element of the reversed array.
+	//! \~russian Обратный итератор на элемент, следующий за последним элементом.
+	//! \~\details ![rbegin, rend](doc/images/pivector_rbegin.png)
+	//!
+	//! \~english It corresponds to the element preceding the first element of the non-reversed array.
+	//! This element acts as a placeholder, attempting to access it results in undefined behavior.
+	//! \~russian Итератор для прохода массива в обратном порядке.
+	//! Указывает на элемент, предшествующий первому элементу.
+	//! Этот элемент существует лишь условно,
+	//! попытка доступа к нему приведёт к выходу за разрешенную память.
+	//! \~\return \ref stl_iterators
+	//! \~\sa \a rbegin(), \a begin(), \a end()
 	inline reverse_iterator rend() { return reverse_iterator(this, -1); }
+
 	inline const_reverse_iterator rbegin() const { return const_reverse_iterator(this, piv_size - 1); }
 	inline const_reverse_iterator rend() const { return const_reverse_iterator(this, -1); }
 
+	//! \~english Number of elements in the container.
+	//! \~russian Количество элементов массива.
+	//! \~\sa \a size_s(), \a capacity(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
 	inline size_t size() const { return piv_size; }
+
+	//! \~english Number of elements in the container as signed value.
+	//! \~russian Количество элементов массива в виде знакового числа.
+	//! \~\sa \a size(), \a capacity(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
 	inline ssize_t size_s() const { return piv_size; }
+
+	//! \~english Same as \a size().
+	//! \~russian Синоним \a size().
+	//! \~\sa \a size(), \a size_s(), \a capacity(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
 	inline size_t length() const { return piv_size; }
+
+	//! \~english Number of elements that the container has currently allocated space for.
+	//! \~russian Количество элементов, для которого сейчас выделена память массивом.
+	//! \~\details
+	//! \~english To find out the actual number of items, use the function \a size().
+	//! \~russian Чтобы узнать фактическое количество элементов используйте функцию \a size().
+	//! \~\sa \a reserve(), \a size(), \a size_s()
 	inline size_t capacity() const { return piv_rsize; }
+
+	//! \~english Checks if the container has no elements.
+	//! \~russian Проверяет пуст ли массив.
+	//! \~\return
+	//! \~english **true** if the container is empty, **false** otherwise
+	//! \~russian **true** если массив пуст, **false** иначе.
+	//! \~\sa \a size(), \a size_s(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
 	inline bool isEmpty() const { return (piv_size == 0); }
 
+	//! \~english Checks if the container has elements.
+	//! \~russian Проверяет не пуст ли массив.
+	//! \~\return
+	//! \~english **true** if the container is not empty, **false** otherwise
+	//! \~russian **true** если массив не пуст, **false** иначе.
+	//! \~\sa \a size(), \a size_s(), \a isEmpty(), \a isNotEmpty(), \a resize(), \a reserve()
+	inline bool isNotEmpty() const { return (piv_size > 0); }
+
+	//! \~english Tests whether at least one element in the array
+	//! passes the test implemented by the provided function `test`.
+	//! \~russian Проверяет, удовлетворяет ли какой-либо элемент массива условию,
+	//! заданному в передаваемой функции `test`.
+	//! \~\return
+	//! \~english **true** if, in the array,
+	//! it finds an element for which the provided function returns **true**;
+	//! otherwise it returns **false**. Always returns **false** if is empty.
+	//! \~russian **true** если хотя бы для одного элемента
+	//! передаваемая функция возвращает **true**, в остальных случаях **false**.
+	//! Метод возвращает **false** при любом условии для пустого массива.
+	//! \~\details
+	//! \~\code
+	//! PIVector<int> v{1, 2, 8, 9};
+	//! piCout << v.any([](int e){return e % 2 == 0;}); // true
+	//! piCout << v.any([](int e){return e == 3;});     // false
+	//! \endcode
+	//! \~\sa \a every(), \a contains(), \a entries(), \a forEach()
+	inline bool any(std::function<bool(const T & e)> test) const {
+		for (size_t i = 0; i < piv_size; ++i) {
+			if (test(piv_data[i])) return true;
+		}
+		return false;
+	}
+
+	//! \~english Tests whether all elements in the array passes the test
+	//! implemented by the provided function `test`.
+	//! \~russian Проверяет, удовлетворяют ли все элементы массива условию,
+	//! заданному в передаваемой функции `test`.
+	//! \~\return
+	//! \~english **true** if, in the array,
+	//! it finds an element for which the provided function returns **true**;
+	//!  otherwise it returns **false**. Always returns **true** if is empty.
+	//! \~russian **true** если для всех элементов передаваемая функция возвращает **true**,
+	//! в остальных случаях **false**.
+	//! Метод возвращает **true** при любом условии для пустого массива.
+	//! \~\details
+	//! \~\code
+	//! PIVector<int> v{1, 2, 8, 9};
+	//! piCout << v.every([](int e){return e % 2 == 0;}); // false
+	//! piCout << v.every([](int e){return e > 0;});      // true
+	//! \endcode
+	//! \~\sa \a any(), \a contains(), \a entries(), \a forEach()
+	inline bool every(std::function<bool(const T & e)> test) const {
+		for (size_t i = 0; i < piv_size; ++i) {
+			if (!test(piv_data[i])) return false;
+		}
+		return true;
+	}
+
+	//! \~english Full access to element by `index`.
+	//! \~russian Полный доступ к элементу по индексу `index`.
+	//! \~\details
+	//! \~english Element index starts from `0`.
+	//! Element index must be in range from `0` to `size()-1`.
+	//! Otherwise will be undefined behavior.
+	//! \~russian Индекс элемента считается от `0`.
+	//! Индекс элемента должен лежать в пределах от `0` до `size()-1`.
+	//! Иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 8, 9};
+	//! piCout << v[2]; // 8
+	//! v[2] = 5;
+	//! piCout << v; // {1, 2, 5, 9}
+	//! \endcode
+	//! \~\sa \a at()
 	inline T & operator[](size_t index) { return piv_data[index]; }
 	inline const T & operator[](size_t index) const { return piv_data[index]; }
+
+	//! \~english Read only access to element by `index`.
+	//! \~russian Доступ исключительно на чтение к элементу по индексу `index`.
+	//! \~\details
+	//! \~english Element index starts from `0`.
+	//! Element index must be in range from `0` to `size()-1`.
+	//! Otherwise will be undefined behavior.
+	//! \~russian Индекс элемента считается от `0`.
+	//! Индекс элемента должен лежать в пределах от `0` до `size()-1`.
+	//! Иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
 	inline const T & at(size_t index) const { return piv_data[index]; }
+
+
+	//! \~english Returns the first element of the array that
+	//! passes the test implemented by the provided function `test`
+	//! or `def` if there is no such element.
+	//! \~russian Возвращает первый элемент массива, проходящего по условию,
+	//! заданному в передаваемой функции `test`, или `def` если такого элемента нет.
+	//! \~\sa \a indexWhere()
+	inline const T & atWhere(std::function<bool(const T & e)> test, ssize_t start = 0, const T & def = T()) const {
+		const ssize_t i = indexWhere(test, start);
+		if (i < 0)
+			return def;
+		else
+			return at(i);
+	}
+
+	//! \~english Returns the last element of the array that
+	//! passes the test implemented by the provided function `test`
+	//! or `def` if there is no such element.
+	//! \~russian Возвращает последний элемент массива, проходящего по условию,
+	//! заданному в передаваемой функции `test`, или `def` если такого элемента нет.
+	//! \~\sa \a lastIndexWhere()
+	inline const T & lastAtWhere(std::function<bool(const T & e)> test, ssize_t start = -1, const T & def = T()) const {
+		const ssize_t i = lastIndexWhere(test, start);
+		if (i < 0)
+			return def;
+		else
+			return at(i);
+	}
+
+	//! \~english Last element.
+	//! \~russian Последний элемент массива.
+	//! \~\details
+	//! \~english Returns a reference to the last item in the array.
+	//! This function assumes that the array isn't empty.
+	//! Otherwise will be undefined behavior.
+	//! \~russian Возвращает ссылку на последний элемент в массиве.
+	//! Эта функция предполагает, что массив не пустой.
+	//! Иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
 	inline T & back() { return piv_data[piv_size - 1]; }
 	inline const T & back() const { return piv_data[piv_size - 1]; }
+
+	//! \~english Last element.
+	//! \~russian Первый элемент массива.
+	//! \~\details
+	//! \~english Returns a reference to the last item in the array.
+	//! This function assumes that the array isn't empty.
+	//! Otherwise will be undefined behavior.
+	//! \~russian Возвращает ссылку на пенрвый элемент в массиве.
+	//! Эта функция предполагает, что массив не пустой.
+	//! Иначе это приведёт к неопределённому поведению программы и ошибкам памяти.
 	inline T & front() { return piv_data[0]; }
 	inline const T & front() const { return piv_data[0]; }
-	inline bool operator ==(const PIVector<T> & t) const {
-		if (piv_size != t.piv_size)
-			return false;
-		for (size_t i = 0; i < piv_size; ++i)
-			if (t[i] != piv_data[i])
-				return false;
+
+	//! \~english Compare operator with array `v`.
+	//! \~russian Оператор сравнения с массивом `v`.
+	inline bool operator==(const PIVector<T> & v) const {
+		if (piv_size != v.piv_size) return false;
+		for (size_t i = 0; i < piv_size; ++i) {
+			if (v[i] != piv_data[i]) return false;
+		}
 		return true;
 	}
-	inline bool operator !=(const PIVector<T> & t) const {return !(*this == t);}
-	inline bool contains(const T & v) const {
-		for (size_t i = 0; i < piv_size; ++i)
-			if (v == piv_data[i])
-				return true;
+
+	//! \~english Compare operator with array `v`.
+	//! \~russian Оператор сравнения с массивом `v`.
+	inline bool operator!=(const PIVector<T> & v) const { return !(*this == v); }
+
+	//! \~english Tests if element `e` exists in the array.
+	//! \~russian Проверяет наличие элемента `e` в массиве.
+	//! \~\details
+	//! \~english Optional argument `start` - the position in this array at which to begin searching.
+	//! If the index is greater than or equal to the array's size,
+	//! **false** is returned, which means the array will not be searched.
+	//! If the provided index value is a negative number,
+	//! it is taken as the offset from the end of the array.
+	//! Note: if the provided index is negative,
+	//! the array is still searched from front to back.
+	//! Default: 0 (entire array is searched).
+	//! \~russian Опциональный аргумент `start` указывает на индекс в массиве, откуда будет начинаться поиск.
+	//! Если индекс больше или равен длине массива,
+	//! возвращается **false**, что означает, что массив даже не просматривается.
+	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
+	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
+	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3, 4};
+	//! piCout << v.contains(3);      // true
+	//! piCout << v.contains(5);      // false
+	//! piCout << v.contains(3, 3);   // false
+	//! piCout << v.contains(3, -2);  // true
+	//! piCout << v.contains(3, -99); // true
+	//! \endcode
+	//! \~\return
+	//! \~english **true** if the array contains an occurrence of element `e`,
+	//! otherwise it returns **false**.
+	//! \~russian **true** если элемент `e` присутствует в массиве,
+	//! в остальных случаях **false**.
+	//! \~\sa \a every(), \a any(), \a entries(), \a forEach()
+	inline bool contains(const T & e, ssize_t start = 0) const {
+		if (start < 0) {
+			start = piv_size + start;
+			if (start < 0) start = 0;
+		}
+		for (size_t i = start; i < piv_size; ++i) {
+			if (e == piv_data[i]) return true;
+		}
 		return false;
 	}
-	inline int etries(const T & v) const {
+
+	//! \~english Tests if all elements of `v` exists in the array.
+	//! \~russian Проверяет наличие  всех элементов `v` в массиве.
+	//! \~\details
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3, 4};
+	//! piCout << v.contains({1,4}); // true
+	//! piCout << v.contains({1,5}); // false
+	//! \endcode
+	//! \~\sa \a every(), \a any(), \a entries(), \a forEach()
+	inline bool contains(const PIVector<T> & v, ssize_t start = 0) const {
+		if (start < 0) {
+			start = piv_size + start;
+			if (start < 0) start = 0;
+		}
+		for (const T & e: v) {
+			bool c = false;
+			for (size_t i = start; i < piv_size; ++i) {
+				if (e == piv_data[i]) {
+					c = true;
+					break;
+				}
+			}
+			if (!c) return false;
+		}
+		return true;
+	}
+
+	//! \~english Count elements equal `e` in the array.
+	//! \~russian Подсчитывает количество элементов, совпадающих с элементом `e` в массиве.
+	//! \~\details
+	//! \~english Optional argument `start` - the position in this array at which to begin searching.
+	//! If the index is greater than or equal to the array's size,
+	//! 0 is returned, which means the array will not be searched.
+	//! If the provided index value is a negative number,
+	//! it is taken as the offset from the end of the array.
+	//! Note: if the provided index is negative,
+	//! the array is still searched from front to back.
+	//! Default: 0 (entire array is searched).
+	//! \~russian Опциональный аргумент `start` указывает на индекс в массиве, откуда будет начинаться поиск.
+	//! Если индекс больше или равен длине массива,
+	//! возвращается 0, что означает, что массив даже не просматривается.
+	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
+	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
+	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
+	//! \~\code
+	//! PIVector<int> v{2, 2, 4, 2, 6};
+	//! piCout << v.entries(2);     // 3
+	//! piCout << v.entries(2, 2);  // 1
+	//! piCout << v.entries(2, -4); // 2
+	//! \endcode
+	//! \~\sa \a every(), \a any(), \a contains(), \a forEach(), \a indexOf()
+	inline int entries(const T & e, ssize_t start = 0) const {
 		int ec = 0;
-		for (size_t i = 0; i < piv_size; ++i)
-			if (v == piv_data[i]) ++ec;
+		if (start < 0) {
+			start = piv_size + start;
+			if (start < 0) start = 0;
+		}
+		for (size_t i = start; i < piv_size; ++i) {
+			if (e == piv_data[i]) ++ec;
+		}
 		return ec;
 	}
-	inline ssize_t indexOf(const T & v) const {
-		for (size_t i = 0; i < piv_size; ++i)
-			if (v == piv_data[i])
-				return i;
-		return -1;
+
+	//! \~english Count elements in the array passes the test implemented by the provided function `test`.
+	//! \~russian Подсчитывает количество элементов в массиве,
+	//! проходящих по условию, заданному в передаваемой функции `test`.
+	//! \~\details
+	//! \~english Overloaded function.
+	//!  Optional argument `start` - the position in this array at which to begin searching.
+	//! If the index is greater than or equal to the array's size,
+	//! 0 is returned, which means the array will not be searched.
+	//! If the provided index value is a negative number,
+	//! it is taken as the offset from the end of the array.
+	//! Note: if the provided index is negative,
+	//! the array is still searched from front to back.
+	//! Default: 0 (entire array is searched).
+	//! \~russian Перегруженная функция.
+	//!  Опциональный аргумент `start` указывает на индекс в массиве, откуда будет начинаться поиск.
+	//! Если индекс больше или равен длине массива,
+	//! возвращается 0, что означает, что массив даже не просматривается.
+	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
+	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
+	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
+	//! \~\sa \a every(), \a any(), \a contains(), \a forEach(), \a indexWhere()
+	inline int entries(std::function<bool(const T & e)> test, ssize_t start = 0) const {
+		int ec = 0;
+		if (start < 0) {
+			start = piv_size + start;
+			if (start < 0) start = 0;
+		}
+		for (size_t i = start; i < piv_size; ++i) {
+			if (test(piv_data[i])) ++ec;
+		}
+		return ec;
+	}
+
+	//! \~english Returns the first index at which a given element `e`
+	//! can be found in the array, or `-1` if it is not present.
+	//! \~russian Возвращает первый индекс, по которому данный элемент `e`
+	//! может быть найден в массиве или `-1`, если такого индекса нет.
+	//! \~\details
+	//! \~english Optional argument `start` - the position in this array at which to begin searching.
+	//! If the index is greater than or equal to the array's size,
+	//! `-1` is returned, which means the array will not be searched.
+	//! If the provided index value is a negative number,
+	//! it is taken as the offset from the end of the array.
+	//! Note: if the provided index is negative,
+	//! the array is still searched from front to back.
+	//! Default: 0 (entire array is searched).
+	//! \~russian Опциональный аргумент `start` указывает на индекс в массиве, откуда будет начинаться поиск.
+	//! Если индекс больше или равен длине массива,
+	//! возвращается `-1`, что означает, что массив даже не просматривается.
+	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
+	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
+	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
+	//! \~\code
+	//! PIVector<int> v{2, 5, 9};
+	//! piCout << v.indexOf(2);     // 0
+	//! piCout << v.indexOf(7);     // -1
+	//! piCout << v.indexOf(9, 2);  // 2
+	//! piCout << v.indexOf(2, -1); // -1
+	//! piCout << v.indexOf(2, -3); // 0
+	//! \endcode
+	//! \~\sa \a indexWhere(), \a lastIndexOf(), \a lastIndexWhere(), \a contains()
+	inline ssize_t indexOf(const T & e, ssize_t start = 0) const {
+		if (start < 0) {
+			start = piv_size + start;
+			if (start < 0) start = 0;
+		}
+		for (size_t i = start; i < piv_size; ++i) {
+			if (e == piv_data[i]) return i;
 		}
-	inline ssize_t lastIndexOf(const T & v) const {
-		for (ssize_t i = piv_size - 1; i >= 0; --i)
-			if (v == piv_data[i])
-				return i;
 		return -1;
 	}
 
+	//! \~english Returns the first index passes the test implemented by the provided function `test`,
+	//! or `-1` if it is not present.
+	//! can be found in the array, or `-1` if it is not present.
+	//! \~russian Возвращает первый индекс элемента проходящего по условию,
+	//! заданному в передаваемой функции `test`, или `-1`, если таких элементов нет.
+	//! \~\details
+	//! \~english Optional argument `start` - the position in this array at which to begin searching.
+	//! If the index is greater than or equal to the array's size,
+	//! `-1` is returned, which means the array will not be searched.
+	//! If the provided index value is a negative number,
+	//! it is taken as the offset from the end of the array.
+	//! Note: if the provided index is negative,
+	//! the array is still searched from front to back.
+	//! Default: 0 (entire array is searched).
+	//! \~russian Опциональный аргумент `start` указывает на индекс в массиве, откуда будет начинаться поиск.
+	//! Если индекс больше или равен длине массива,
+	//! возвращается `-1`, что означает, что массив даже не просматривается.
+	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
+	//! Если рассчитанный индекс все равно оказывается меньше 0, просматривается весь массив.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от начала к концу (слева на право).
+	//! Значение по умолчанию равно 0, что означает, что просматривается весь массив.
+	//! \~\code
+	//! PIVector<PIString> v{"do", "re", "mi", "re"};
+	//! piCout << v.indexWhere([](const PIString & s){return s.startsWith('r');});    // 1
+	//! piCout << v.indexWhere([](const PIString & s){return s.startsWith('r');}, 2); // 3
+	//! piCout << v.indexWhere([](const PIString & s){return s.startsWith('k');});    // -1
+	//! \endcode
+	//! \~\sa \a indexOf(), \a lastIndexOf(), \a lastIndexWhere(), \a contains()
+	inline ssize_t indexWhere(std::function<bool(const T & e)> test, ssize_t start = 0) const {
+		if (start < 0) {
+			start = piv_size + start;
+			if (start < 0) start = 0;
+		}
+		for (size_t i = start; i < piv_size; ++i) {
+			if (test(piv_data[i])) return i;
+		}
+		return -1;
+	}
+
+	//! \~english Returns the last index at which a given element `e`
+	//! can be found in the array, or `-1` if it is not present.
+	//! \~russian Возвращает последний индекс, по которому данный элемент `e`
+	//! может быть найден в массиве или `-1`, если такого индекса нет.
+	//! \~\details
+	//! \~english Optional argument `start` - the position in this array
+	//! at which to start searching backwards.
+	//! If the index is greater than or equal to the array's size,
+	//! causes the whole array to be searched.
+	//! If the provided index value is a negative number,
+	//! it is taken as the offset from the end of the array.
+	//! Therefore, if calculated index less than 0,
+	//! the array is not searched, and the method returns `-1`.
+	//! Note: if the provided index is negative,
+	//! the array is still searched from back to front.
+	//! Default: -1 (entire array is searched).
+	//! \~russian Опциональный аргумент `start` указывает на индекс
+	//! c которого начинать поиск в обратном направлении.
+	//! Если индекс больше или равен длине массива, просматривается весь массив.
+	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от конца к началу (справа на лево).
+	//! Если рассчитанный индекс оказывается меньше 0, массив даже не просматривается.
+	//! Значение по умолчанию равно `-1`, что равно индексу последнего элемента
+	//! и означает, что просматривается весь массив.
+	//! \~\code
+	//! PIVector<int> v{2, 5, 9, 2};
+	//! piCout << v.lastIndexOf(2);       // 3
+	//! piCout << v.lastIndexOf(7);       // -1
+	//! piCout << v.lastIndexOf(2, 2);    // 0
+	//! piCout << v.lastIndexOf(2, -3);   // 0
+	//! piCout << v.lastIndexOf(2, -300); // -1
+	//! piCout << v.lastIndexOf(2, 300);  // 3
+	//! \endcode
+	//! \~\sa \a indexOf(), \a indexWhere(), \a lastIndexWhere(), \a contains()
+	inline ssize_t lastIndexOf(const T & e, ssize_t start = -1) const {
+		if (start >= size_s()) start = piv_size - 1;
+		if (start < 0) start = piv_size + start;
+		for (ssize_t i = start; i >= 0; --i) {
+			if (e == piv_data[i]) return i;
+		}
+		return -1;
+	}
+
+	//! \~english Returns the last index passes the test implemented by the provided function `test`,
+	//! or `-1` if it is not present.
+	//! \~russian Возвращает последний индекс элемента проходящего по условию,
+	//! заданному в передаваемой функции `test`, или `-1`, если таких элементов нет.
+	//! \~\details
+	//! \~english Optional argument `start` - the position in this array
+	//! at which to start searching backwards.
+	//! If the index is greater than or equal to the array's size,
+	//! causes the whole array to be searched.
+	//! If the provided index value is a negative number,
+	//! it is taken as the offset from the end of the array.
+	//! Therefore, if calculated index less than 0,
+	//! the array is not searched, and the method returns `-1`.
+	//! Note: if the provided index is negative,
+	//! the array is still searched from back to front.
+	//! Default: -1 (entire array is searched).
+	//! \~russian Опциональный аргумент `start` указывает на индекс
+	//! c которого начинать поиск в обратном направлении.
+	//! Если индекс больше или равен длине массива, просматривается весь массив.
+	//! Если индекс является отрицательным числом, он трактуется как смещение с конца массива.
+	//! Обратите внимание: если индекс отрицателен, массив всё равно просматривается от конца к началу (справа на лево).
+	//! Если рассчитанный индекс оказывается меньше 0, массив даже не просматривается.
+	//! Значение по умолчанию равно `-1`, что равно индексу последнего элемента
+	//! и означает, что просматривается весь массив.
+	//! \~\sa \a indexOf(), \a lastIndexOf(), \a indexWhere(), \a contains()
+	inline ssize_t lastIndexWhere(std::function<bool(const T & e)> test, ssize_t start = -1) const {
+		if (start >= size_s()) start = piv_size - 1;
+		if (start < 0) start = piv_size + start;
+		for (ssize_t i = start; i >= 0; --i) {
+			if (test(piv_data[i])) return i;
+		}
+		return -1;
+	}
+
+	//! \~english Pointer to array
+	//! \~russian Указатель на память массива
+	//! \~\details
+	//! \~english Optional argument `index` the position in this array,
+	//! where is pointer. Default: start of array.
+	//! \~russian Опциональный аргумент `index` указывает на индекс c которого брать указатель.
+	//! По умолчанию указывает на начало массива.
+	//! \~\code
+	//! PIVector<int> v{2, 5, 9, 2};
+	//! int a[2] = {12, 13};
+	//! memcpy(vec.data(1), a, 2 * sizeof(int));
+	//! piCout << v; // {2, 12, 13, 2}
+	//! \endcode
 	inline T * data(size_t index = 0) { return &(piv_data[index]); }
+
+	//! \~english Read only pointer to array
+	//! \~russian Указатель на память массива только для чтения.
+	//! \~\details
+	//! \~english The pointer can be used to access and modify the items in the array.
+	//! The pointer remains valid as long as the array isn't reallocated.
+	//! Optional argument `index` the position in this array,
+	//! where is pointer. Default: start of array.
+	//! \~russian Указатель можно использовать для доступа и изменения элементов в массиве.
+	//! Указатель остается действительным только до тех пор, пока массив не будет перераспределен.
+	//! Опциональный аргумент `index` указывает на индекс c которого брать указатель.
+	//! По умолчанию указывает на начало массива.
+	//! \~\code
+	//! PIVector<int> v{1, 3, 5};
+	//! int a[3];
+	//! memcpy(a, v.data(), a.size() * sizeof(int));
+	//! piCout << a[0] << a[1] << a[2]; // 1 3 5
+	//! \endcode
 	inline const T * data(size_t index = 0) const { return &(piv_data[index]); }
 
-	template<typename T1 = T, typename std::enable_if<
-				 !std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
+	//! \~english Creates sub-array of this array.
+	//! \~russian Создает подмассив, то есть кусок из текущего массива.
+	//! \~english
+	//! \param index - index of this array where sub-array starts
+	//! \param count - sub-array size
+	//! \~russian
+	//! \param index - индекс в текущем массиве, откуда начинётся подмассив
+	//! \param count - размер подмассива
+	//! \~\details
+	//! \~english
+	//! Index must be in range from `0` to `size()-1`.
+	//! If sub-array size more than this array size, than ends early.
+	//! \~russian
+	//! Индекс начала должен лежать в диапазоне от `0` до `size()-1`.
+	//! Если заданный размер подмассива превышает размер текущего массива,
+	//! то вернется подмассив меньшего размера (`size()-index-1`).
+	PIVector<T> getRange(size_t index, size_t count) const {
+		if (index >= piv_size || count == 0) return PIVector<T>();
+		if (index + count > piv_size) count = piv_size - index;
+		return PIVector(piv_data + index, count);
+	}
+
+	//! \~english Clear array, remove all elements.
+	//! \~russian Очищает массив, удаляет все элементы.
+	//! \~\details
+	//! \~\note
+	//! \~english Reserved memory will not be released.
+	//! \~russian Зарезервированная память не освободится.
+	//! \~\sa \a resize()
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline PIVector<T> & clear() {
-		resize(0);
+		deleteT(piv_data, piv_size);
+		piv_size = 0;
 		return *this;
 	}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline PIVector<T> & clear() {
 		PIINTROSPECTION_CONTAINER_UNUSED(T, piv_size)
 		piv_size = 0;
 		return *this;
 	}
 
-	inline PIVector<T> & fill(const T & f = T()) {
+	//! \~english Assigns element 'e' to all items in the array.
+	//! \~russian Заполняет весь массив копиями элемента 'e'.
+	//! \~\details
+	//! \code
+	//! PIVector<int> v{1, 3, 5};
+	//! v.fill(7);
+	//! piCout << v; // {7, 7, 7}
+	//! \endcode
+	//! \~\sa \a resize()
+	inline PIVector<T> & fill(const T & e = T()) {
 		deleteT(piv_data, piv_size);
 		PIINTROSPECTION_CONTAINER_USED(T, piv_size)
-		for (size_t i = 0; i < piv_size; ++i)
-			elementNew(piv_data + i, f);
+		for (size_t i = 0; i < piv_size; ++i) {
+			elementNew(piv_data + i, e);
+		}
 		return *this;
 	}
-	inline PIVector<T> & fill(std::function<T(size_t)> f) {
+
+	//! \~english Assigns result of function 'f(size_t i)' to all items in the array.
+	//! \~russian Заполняет весь массив результатом вызова функции 'f(size_t i)'.
+	//! \~\details
+	//! \code
+	//! PIVector<int> v{1, 3, 5};
+	//! v.fill([](size_t i){return i*2;});
+	//! piCout << v; // {0, 2, 4}
+	//! \endcode
+	//! \~\sa \a resize()
+	inline PIVector<T> & fill(std::function<T(size_t i)> f) {
 		deleteT(piv_data, piv_size);
 		PIINTROSPECTION_CONTAINER_USED(T, piv_size)
-		for (size_t i = 0; i < piv_size; ++i)
+		for (size_t i = 0; i < piv_size; ++i) {
 			elementNew(piv_data + i, f(i));
+		}
 		return *this;
 	}
-	inline PIVector<T> & assign(const T & f = T()) {return fill(f);}
-	template<typename T1 = T, typename std::enable_if<
-				 !std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
+
+	//! \~english Same as \a fill().
+	//! \~russian Тоже самое что и \a fill().
+	//! \~\sa \a fill(), \a resize()
+	inline PIVector<T> & assign(const T & e = T()) { return fill(e); }
+
+	//! \~english First does `resize(new_size)` then `fill(e)`.
+	//! \~russian Сначала делает `resize(new_size)`, затем `fill(e)`.
+	//! \~\sa \a fill(), \a resize()
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline PIVector<T> & assign(size_t new_size, const T & f) {
 		resize(new_size);
 		return fill(f);
 	}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline PIVector<T> & assign(size_t new_size, const T & f) {
 		_resizeRaw(new_size);
 		return fill(f);
 	}
 
-	inline PIVector<T> & resize(size_t new_size, const T & f = T()) {
+	//! \~english Sets size of the array, new elements are copied from `e`.
+	//! \~russian Устанавливает размер массива, новые элементы копируются из `e`.
+	//! \~\details
+	//! \~english If `new_size` is greater than the current \a size(),
+	//!  elements are added to the end; the new elements are initialized from `e`.
+	//! If `new_size` is less than the current \a size(), elements are removed from the end.
+	//! \~russian Если `new_size` больше чем текущий размер массива \a size(),
+	//! новые элементы добавляются в конец массива и создаются из `e`.
+	//! Если `new_size` меньше чем текущий размер массива \a size(),
+	//! лишние элементы удаляются с конца массива.
+	//! \~\sa \a size(), \a clear()
+	inline PIVector<T> & resize(size_t new_size, const T & e = T()) {
 		if (new_size < piv_size) {
-			T * de = &(piv_data[new_size]);
-			deleteT(de, piv_size - new_size);
+			deleteT(piv_data + new_size, piv_size - new_size);
 			piv_size = new_size;
-		}
-		if (new_size > piv_size) {
-			size_t os = piv_size;
-			alloc(new_size);
-			PIINTROSPECTION_CONTAINER_USED(T, (new_size-os))
-			for (size_t i = os; i < new_size; ++i)
-				elementNew(piv_data + i, f);
+		} else if (new_size > piv_size) {
+			expand(new_size, e);
 		}
 		return *this;
 	}
-	inline PIVector<T> & resize(size_t new_size, std::function<T(size_t)> f) {
+
+	//! \~english Sets size of the array, new elements created by function `f(size_t i)`.
+	//! \~russian Устанавливает размер массива, новые элементы создаются функцией `f(size_t i)`.
+	//! \~\details
+	//! \~english If `new_size` is greater than the current \a size(),
+	//!  elements are added to the end; the new elements created by function `f(size_t i)`.
+	//! If `new_size` is less than the current \a size(), elements are removed from the end.
+	//! \~russian Если `new_size` больше чем текущий размер массива \a size(),
+	//! новые элементы добавляются в конец массива и функцией `f(size_t i)`.
+	//! Если `new_size` меньше чем текущий размер массива \a size(),
+	//! лишние элементы удаляются с конца массива.
+	//! \~\sa \a size(), \a clear()
+	inline PIVector<T> & resize(size_t new_size, std::function<T(size_t i)> f) {
 		if (new_size < piv_size) {
-			T * de = &(piv_data[new_size]);
-			deleteT(de, piv_size - new_size);
+			deleteT(piv_data + new_size, piv_size - new_size);
 			piv_size = new_size;
-		}
-		if (new_size > piv_size) {
-			size_t os = piv_size;
-			alloc(new_size);
-			PIINTROSPECTION_CONTAINER_USED(T, (new_size-os))
-			for (size_t i = os; i < new_size; ++i)
-				elementNew(piv_data + i, f(i));
+		} else if (new_size > piv_size) {
+			expand(new_size, f);
 		}
 		return *this;
 	}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
+
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline PIVector<T> & _resizeRaw(size_t new_size) {
+#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
 		if (new_size > piv_size) {
 			PIINTROSPECTION_CONTAINER_USED(T, (new_size - piv_size));
 		}
 		if (new_size < piv_size) {
 			PIINTROSPECTION_CONTAINER_UNUSED(T, (piv_size - new_size));
 		}
+#endif
 		alloc(new_size);
 		return *this;
 	}
-	inline void _copyRaw(T * dst, const T * src, size_t size) {
-		newT(dst, src, size);
-	}
 
+	inline void _copyRaw(T * dst, const T * src, size_t size) { newT(dst, src, size); }
+
+	//! \~english Attempts to allocate memory for at least `new_size` elements.
+	//! \~russian Резервируется память под как минимум `new_size` элементов.
+	//! \~\details
+	//! \~english If you know in advance how large the array will be,
+	//! you should call this function to prevent reallocations and memory fragmentation.
+	//! If `new_size` is greater than the current \a capacity(),
+	//! new storage is allocated, otherwise the function does nothing.
+	//! This function does not change the \a size() of the array.
+	//! \~russian Если вы заранее знаете, насколько велик будет массив,
+	//! вы можете вызвать эту функцию, чтобы предотвратить перераспределение и фрагментацию памяти.
+	//! Если размер `new_size` больше чем выделенная память \a capacity(),
+	//! то произойдёт выделение новой памяти и перераспределение массива.
+	//! Эта функция не изменяет количество элементов в массиве \a size().
+	//! \~\sa \a size(), \a capacity(), \a resize()
 	inline PIVector<T> & reserve(size_t new_size) {
 		if (new_size <= piv_rsize) return *this;
-		size_t os = piv_size;
+		const size_t os = piv_size;
 		alloc(new_size);
 		piv_size = os;
 		return *this;
 	}
 
-	inline PIVector<T> & insert(size_t index, const T & v = T()) {
+	//! \~english Inserts value `e` at `index` position in the array.
+	//! \~russian Вставляет значение `e` в позицию `index` в массиве.
+	//! \~\details
+	//! \~english The index must be greater than 0 and less than or equal to \a size().
+	//! \~russian Индекс должен быть больше 0 и меньше или равен \a size().
+	//! \code
+	//! PIVector<int> v{1, 3, 5};
+	//! v.insert(2, 7);
+	//! piCout << v; // {1, 3, 7, 5}
+	//! \endcode
+	//! \~\sa \a append(), \a prepend(), \a remove()
+	inline PIVector<T> & insert(size_t index, const T & e = T()) {
 		alloc(piv_size + 1);
 		if (index < piv_size - 1) {
-			size_t os = piv_size - index - 1;
-			memmove((void*)(&(piv_data[index + 1])), (const void*)(&(piv_data[index])), os * sizeof(T));
+			const size_t os = piv_size - index - 1;
+			memmove(reinterpret_cast<void *>(piv_data + index + 1), reinterpret_cast<const void *>(piv_data + index), os * sizeof(T));
 		}
 		PIINTROSPECTION_CONTAINER_USED(T, 1)
-		elementNew(piv_data + index, v);
-		return *this;
-	}
-	inline PIVector<T> & insert(size_t index, T && v) {
-		alloc(piv_size + 1);
-		if (index < piv_size - 1) {
-			size_t os = piv_size - index - 1;
-			memmove((void*)(&(piv_data[index + 1])), (const void*)(&(piv_data[index])), os * sizeof(T));
-		}
-		PIINTROSPECTION_CONTAINER_USED(T, 1)
-		elementNew(piv_data + index, std::move(v));
-		return *this;
-	}
-	inline PIVector<T> & insert(size_t index, const PIVector<T> & other) {
-		if (other.isEmpty()) return *this;
-		assert(&other != this);
-		ssize_t os = piv_size - index;
-		alloc(piv_size + other.piv_size);
-		if (os > 0)
-			memmove((void*)(&(piv_data[index + other.piv_size])), (const void*)(&(piv_data[index])), os * sizeof(T));
-		newT(piv_data + index, other.piv_data, other.piv_size);
+		elementNew(piv_data + index, e);
 		return *this;
 	}
 
+	//! \~english Inserts value `e` at `index` position in the array.
+	//! \~russian Вставляет значение `e` в позицию `index` в массиве.
+	//! \~\details
+	//! \~english The index must be greater than 0 and less than or equal to \a size().
+	//! \~russian Индекс должен быть больше 0 и меньше или равен \a size().
+	//! \~\sa \a append(), \a prepend(), \a remove()
+	inline PIVector<T> & insert(size_t index, T && e) {
+		alloc(piv_size + 1);
+		if (index < piv_size - 1) {
+			const size_t os = piv_size - index - 1;
+			memmove(reinterpret_cast<void *>(piv_data + index + 1), reinterpret_cast<const void *>(piv_data + index), os * sizeof(T));
+		}
+		PIINTROSPECTION_CONTAINER_USED(T, 1)
+		elementNew(piv_data + index, std::move(e));
+		return *this;
+	}
+
+	//! \~english Inserts array `v` at `index` position in the array.
+	//! \~russian Вставляет массив `v` в позицию `index` в массиве.
+	//! \~\details
+	//! \~english The index must be greater than or equal to 0 and less than or equal to \a size().
+	//! \~russian Индекс должен быть больше или равен 0 и меньше или равен \a size().
+	//! \~\sa \a append(), \a prepend(), \a remove()
+	inline PIVector<T> & insert(size_t index, const PIVector<T> & v) {
+		if (v.isEmpty()) return *this;
+#ifndef NDEBUG
+		if (&v == this) {
+			printf("error with PIVector<%s>::insert\n", __PIP_TYPENAME__(T));
+		}
+#endif
+		assert(&v != this);
+		const ssize_t os = piv_size - index;
+		alloc(piv_size + v.piv_size);
+		if (os > 0) {
+			memmove(reinterpret_cast<void *>(piv_data + index + v.piv_size),
+					reinterpret_cast<const void *>(piv_data + index),
+					os * sizeof(T));
+		}
+		newT(piv_data + index, v.piv_data, v.piv_size);
+		return *this;
+	}
+
+	//! \~english Inserts the given elements at `index` position in the array.
+	//! \~russian Вставляет элементы в позицию `index` в массиве.
+	//! \~\details
+	//! \~english The index must be greater than or equal to 0 and less than or equal to \a size().
+	//! Inserts the given elements from
+	//! [C++11 initializer list](https://en.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~russian Индекс должен быть больше или равен 0 и меньше или равен \a size().
+	//! Вставляет элементы из
+	//! [списка инициализации C++11](https://ru.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~\sa \a append(), \a prepend(), \a remove()
+	inline PIVector<T> & insert(size_t index, std::initializer_list<T> init_list) {
+		if (init_list.size() == 0) return *this;
+		const ssize_t os = piv_size - index;
+		alloc(piv_size + init_list.size());
+		if (os > 0) {
+			memmove(reinterpret_cast<void *>(piv_data + index + init_list.size()),
+					reinterpret_cast<const void *>(piv_data + index),
+					os * sizeof(T));
+		}
+		newT(piv_data + index, init_list.begin(), init_list.size());
+		return *this;
+	}
+
+	//! \~english Removes `count` elements from the middle of the array, starting at `index` position.
+	//! \~russian Удаляет элементы из массива, начиная с позиции `index` в количестве `count`.
+	//! \~\details
+	//! \code
+	//! PIVector<int> v{1, 3, 7, 5};
+	//! v.remove(1, 2);
+	//! piCout << v; // {1, 5}
+	//! \endcode
+	//! \~\sa \a resize(), \a insert(), \a removeOne(), \a removeAll(), \a removeWhere()
 	inline PIVector<T> & remove(size_t index, size_t count = 1) {
 		if (count == 0) return *this;
 		if (index + count >= piv_size) {
-			resize(index);
-			return *this;
+			if (index < piv_size) {
+				deleteT(piv_data + index, piv_size - index);
+				piv_size = index;
 			}
-		size_t os = piv_size - index - count;
-		deleteT(&(piv_data[index]), count);
-		memmove((void*)(&(piv_data[index])), (const void*)(&(piv_data[index + count])), os * sizeof(T));
+		} else {
+			const size_t os = piv_size - index - count;
+			deleteT(piv_data + index, count);
+			memmove(reinterpret_cast<void *>(piv_data + index), reinterpret_cast<const void *>(piv_data + index + count), os * sizeof(T));
 			piv_size -= count;
+		}
 		return *this;
 	}
 
-	inline void swap(PIVector<T> & other) {
-		piSwap<T*>(piv_data, other.piv_data);
-		piSwap<size_t>(piv_size, other.piv_size);
-		piSwap<size_t>(piv_rsize, other.piv_rsize);
+	//! \~english Swaps array `v` other with this array.
+	//! \~russian Меняет местами массив `v` с этим массивом.
+	//! \~\details
+	//! \~english This operation is very fast and never fails.
+	//! \~russian Эта операция выполняется мгновенно без копирования памяти и никогда не дает сбоев.
+	inline void swap(PIVector<T> & v) {
+		piSwap<T *>(piv_data, v.piv_data);
+		piSwap<size_t>(piv_size, v.piv_size);
+		piSwap<size_t>(piv_rsize, v.piv_rsize);
 	}
 
-	typedef int (*CompareFunc)(const T * , const T * );
-	static int compare_func(const T * t0, const T * t1) {return (*t0) < (*t1) ? -1 : ((*t0) == (*t1) ? 0 : 1);}
-	inline PIVector<T> & sort(CompareFunc compare = compare_func) {
-		piqsort(piv_data, piv_size, sizeof(T), (int(*)(const void * , const void * ))compare);
+	//! \~english Sorts the elements in non-descending order.
+	//! \~russian Сортировка элементов в порядке возрастания.
+	//! \~\details
+	//! \~english The order of equal elements is not guaranteed to be preserved.
+	//! Elements are compared using operator<.
+	//! Sorting provided by [std::sort](https://en.cppreference.com/w/cpp/algorithm/sort).
+	//! Complexity `O(N·log(N))`.
+	//! \~russian Сохранность порядка элементов, имеющих одинаковое значение, не гарантируется.
+	//! Для сравнения элементов используется оператор `operator<`.
+	//! Для сортировки используется функция [std::sort](https://ru.cppreference.com/w/cpp/algorithm/sort).
+	//! Сложность сортировки `O(N·log(N))`.
+	//! \~\code
+	//! PIVector<int> v{5, 7, 4, 2, 8, 6, 1, 9, 0, 3};
+	//! v.sort();
+	//! piCout << v; // {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}
+	//! \endcode
+	//! \~\sa \a sort(std::function<bool(const T &a, const T &b)> comp)
+	inline PIVector<T> & sort() {
+		std::sort(begin(), end());
 		return *this;
 	}
 
-	inline PIVector<T> & enlarge(llong piv_size) {
-		llong ns = size_s() + piv_size;
-		if (ns <= 0) clear();
-		else resize(size_t(ns));
+	//! \~english Sorts the elements in non-descending order.
+	//! \~russian Сортировка элементов в порядке возрастания.
+	//! \~\details
+	//! \~english The order of equal elements is not guaranteed to be preserved.
+	//! Elements are compared using the given binary comparison function `comp`.
+	//! which returns `​true` if the first argument is less than (i.e. is ordered before) the second.
+	//! The signature of the comparison function should be equivalent to the following:
+	//! \code
+	//! bool comp(const T &a, const T &b);
+	//! \endcode
+	//! While the signature does not need to have const &, the function must not modify the objects passed to it.
+	//! The function must return `false` for identical elements,
+	//! otherwise, it will lead to undefined program behavior and memory errors.
+	//! Sorting provided by [std::sort](https://en.cppreference.com/w/cpp/algorithm/sort).
+	//! Complexity `O(N·log(N))`.
+	//! \~russian Сохранность порядка элементов, имеющих одинаковое значение, не гарантируется.
+	//! Для сравнения элементов используется функция сравнения `comp`.
+	//! Функция сравнения, возвращает ​`true` если первый аргумент меньше
+	//! второго. Сигнатура функции сравнения должна быть эквивалентна следующей: \code bool comp(const T &a, const T &b); \endcode Сигнатура
+	//! не обязана содержать const &, однако, функция не может изменять переданные объекты. Функция обязана возвращать `false` для
+	//! одинаковых элементов, иначе это приведёт к неопределённому поведению программы и ошибкам памяти. Для сортировки используется функция
+	//! [std::sort](https://ru.cppreference.com/w/cpp/algorithm/sort). Сложность сортировки `O(N·log(N))`.
+	//! \~\code
+	//! PIVector<int> v{5, 7, 4, 2, 8, 6, 1, 9, 0, 3};
+	//! v.sort([](const int & a, const int & b){return a > b;});
+	//! piCout << v; // {9, 8, 7, 6, 5, 4, 3, 2, 1, 0}
+	//! \endcode
+	//! \~\sa \a sort()
+	inline PIVector<T> & sort(std::function<bool(const T & a, const T & b)> comp) {
+		std::sort(begin(), end(), comp);
 		return *this;
 	}
 
-	inline PIVector<T> & removeOne(const T & v) {
-		for (size_t i = 0; i < piv_size; ++i)
-			if (piv_data[i] == v) {
+	//! \~english Reverses this array.
+	//! \~russian Обращает порядок следования элементов этого массива.
+	//! \~\details
+	//! \~english This method reverses an array [in place](https://en.wikipedia.org/wiki/In-place_algorithm).
+	//! The first array element becomes the last, and the last array element becomes the first.
+	//! The reverse method transposes the elements of the calling array object in place,
+	//! mutating the array, and returning a reference to the array.
+	//! \~russian Метод reverse() на месте переставляет элементы массива,
+	//! на котором он был вызван, изменяет массив и возвращает ссылку на него.
+	//! Первый элемент массива становится последним, а последний — первым.
+	//! \~\code
+	//! PIVector<int> v{1, 3, 7, 5};
+	//! v.reverse();
+	//! piCout << v; // {5, 7, 3, 1}
+	//! \endcode
+	//! \~\sa \a reversed()
+	inline PIVector<T> & reverse() {
+		const size_t s2 = piv_size / 2;
+		for (size_t i = 0; i < s2; ++i) {
+			piSwap<T>(piv_data[i], piv_data[piv_size - i - 1]);
+		}
+		return *this;
+	}
+
+	//! \~english Returns reversed array.
+	//! \~russian Возвращает перевернутый массив.
+	//! \~\details
+	//! \~english Returns a copy of the array with elements in reverse order.
+	//! The first array element becomes the last, and the last array element becomes the first.
+	//! \~russian Возвращает копию массива с элементами в обратном порядке.
+	//! Первый элемент массива становится последним, а последний — первым.
+	//! \~\sa \a reverse()
+	inline PIVector<T> reversed() const {
+		PIVector<T> ret(*this);
+		return ret.reverse();
+	}
+
+	//! \~english Increases or decreases the size of the array by `add_size` elements.
+	//! \~russian Увеличивает или уменьшает размер массива на `add_size` элементов.
+	//! \~\details
+	//! \~english If `add_size > 0` then elements are added to the end of the array.
+	//! If `add_size < 0` then elements are removed from the end of the array.
+	//! If `add_size < 0` and there are fewer elements in the array than specified, then the array becomes empty.
+	//! \~russian Если `add_size > 0`, то в конец массива добавляются элементы.
+	//! Если `add_size < 0`, то с конца массива удаляются элементы.
+	//! Если `add_size < 0` и в массиве меньше элементов чем указано, то массив становится пустым.
+	//! \~\sa \a resize()
+	inline PIVector<T> & enlarge(ssize_t add_size, const T & e = T()) {
+		const ssize_t ns = size_s() + add_size;
+		if (ns <= 0)
+			clear();
+		else
+			resize(size_t(ns), e);
+		return *this;
+	}
+
+	//! \~english Remove no more than one element equal `e`.
+	//! \~russian Удаляет первый элемент, который равен элементу `e`.
+	//! \~\details
+	//! \~\code
+	//! PIVector<int> v{3, 2, 5, 2, 7};
+	//! v.removeOne(2);
+	//! piCout << v; // {3, 5, 2, 7}
+	//! \endcode
+	//! \~\sa \a remove(), \a removeAll(), \a removeWhere()
+	inline PIVector<T> & removeOne(const T & e) {
+		for (size_t i = 0; i < piv_size; ++i) {
+			if (piv_data[i] == e) {
 				remove(i);
 				return *this;
 			}
+		}
 		return *this;
 	}
-	inline PIVector<T> & removeAll(const T & v) {
-		for (ssize_t i = 0; i < ssize_t(piv_size); ++i)
-			if (piv_data[i] == v) {
+
+	//! \~english Remove all elements equal `e`.
+	//! \~russian Удаляет все элементы, равные элементу `e`.
+	//! \~\details
+	//! \~\code
+	//! PIVector<int> v{3, 2, 5, 2, 7};
+	//! v.removeAll(2);
+	//! piCout << v; // {3, 5, 7}
+	//! \endcode
+	//! \~\sa \a remove(), \a removeOne(), \a removeWhere()
+	inline PIVector<T> & removeAll(const T & e) {
+		for (ssize_t i = 0; i < size_s(); ++i) {
+			if (piv_data[i] == e) {
 				remove(i);
 				--i;
 			}
+		}
 		return *this;
 	}
 
-	inline PIVector<T> & push_back(const T & v) {
+	//! \~english Remove all elements in the array
+	//! passes the test implemented by the provided function `test`.
+	//! \~russian Удаляет все элементы, удовлетворяющие условию,
+	//! заданному в передаваемой функции `test`.
+	//! \~\details
+	//! \~\code
+	//! PIVector<int> v{3, 2, 5, 2, 7};
+	//! v.removeWhere([](const int & i){return i > 2;});
+	//! piCout << v; // {2, 2}
+	//! \endcode
+	//! \~\sa \a remove(), \a removeOne(), \a removeWhere()
+	inline PIVector<T> & removeWhere(std::function<bool(const T & e)> test) {
+		for (ssize_t i = 0; i < size_s(); ++i) {
+			if (test(piv_data[i])) {
+				remove(i);
+				--i;
+			}
+		}
+		return *this;
+	}
+
+	//! \~english Appends the given element `e` to the end of the array.
+	//! \~russian Добавляет элемент `e` в конец массива.
+	//! \~\details
+	//! \~english If size() is less than capacity(), which is most often
+	//! then the addition will be very fast.
+	//! In any case, the addition is fast and does not depend on the size of the array.
+	//! If the new size() is greater than capacity()
+	//! then all iterators and references
+	//! (including the past-the-end iterator) are invalidated.
+	//! Otherwise only the past-the-end iterator is invalidated.
+	//! \~russian Если size() меньше capacity(), что часто бывает,
+	//! то добавление будет очень быстрым.
+	//! В любом случае добавление быстрое и не зависит от размера массива.
+	//! Если новый size() больше, чем capacity(),
+	//! то все итераторы и указатели становятся нерабочими.
+	//! В противном случае все, кроме итераторов, указывающих на конец массива,
+	//! остаются в рабочем состоянии.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! v.push_back(4);
+	//! v.push_back(5);
+	//! piCout << v; // {1, 2, 3, 4, 5}
+	//! \endcode
+	//! \~\sa \a push_front(), \a append(), \a prepend(), \a insert()
+	inline PIVector<T> & push_back(const T & e) {
 		alloc(piv_size + 1);
 		PIINTROSPECTION_CONTAINER_USED(T, 1);
-		elementNew(piv_data + piv_size - 1, v);
+		elementNew(piv_data + piv_size - 1, e);
 		return *this;
 	}
-	inline PIVector<T> & push_back(T && v) {
+
+	//! \~english Appends the given element `e` to the end of the array.
+	//! \~russian Добавляет элемент `e` в конец массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\sa \a push_back()
+	inline PIVector<T> & push_back(T && e) {
 		alloc(piv_size + 1);
 		PIINTROSPECTION_CONTAINER_USED(T, 1);
-		elementNew(piv_data + piv_size - 1, std::move(v));
+		elementNew(piv_data + piv_size - 1, std::move(e));
 		return *this;
 	}
-	inline PIVector<T> & append(const T & v) {return push_back(v);}
-	inline PIVector<T> & append(T && v) {return push_back(std::move(v));}
-	inline PIVector<T> & append(const PIVector<T> & other) {
-		assert(&other != this);
-		size_t ps = piv_size;
-		alloc(piv_size + other.piv_size);
-		newT(piv_data + ps, other.piv_data, other.piv_size);
+
+	//! \~english Appends the given elements to the end of the array.
+	//! \~russian Добавляет элементы в конец массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! Appends the given elements from
+	//! [C++11 initializer list](https://en.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~russian Перегруженая функция.
+	//! Добавляет элементы из
+	//! [списка инициализации C++11](https://ru.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~\sa \a push_back()
+	inline PIVector<T> & push_back(std::initializer_list<T> init_list) {
+		if (init_list.size() == 0) return *this;
+		const size_t ps = piv_size;
+		alloc(piv_size + init_list.size());
+		newT(piv_data + ps, init_list.begin(), init_list.size());
 		return *this;
 	}
-	inline PIVector<T> & operator <<(const T & v) {return push_back(v);}
-	inline PIVector<T> & operator <<(T && v) {return push_back(std::move(v));}
-	inline PIVector<T> & operator <<(const PIVector<T> & other) {return append(other);}
 
-	inline PIVector<T> & push_front(const T & v) {insert(0, v); return *this;}
-	inline PIVector<T> & push_front(T && v) {insert(0, std::move(v)); return *this;}
-	inline PIVector<T> & prepend(const T & v) {return push_front(v);}
-	inline PIVector<T> & prepend(T && v) {return push_front(std::move(v));}
+	//! \~english Appends the given array `v` to the end of the array.
+	//! \~russian Добавляет массив `v` в конец массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\sa \a push_back()
+	inline PIVector<T> & push_back(const PIVector<T> & v) {
+		if (v.isEmpty()) return *this;
+#ifndef NDEBUG
+		if (&v == this) {
+			printf("error with PIVector<%s>::push_back\n", __PIP_TYPENAME__(T));
+		}
+#endif
+		assert(&v != this);
+		const size_t ps = piv_size;
+		alloc(piv_size + v.piv_size);
+		newT(piv_data + ps, v.piv_data, v.piv_size);
+		return *this;
+	}
 
+	//! \~english Appends the given element `e` to the end of the array.
+	//! \~russian Добавляет элемент `e` в конец массива.
+	//! \~\details
+	//! \~\details
+	//! \~english If size() is less than capacity(), which is most often
+	//! then the addition will be very fast.
+	//! In any case, the addition is fast and does not depend on the size of the array.
+	//! If the new size() is greater than capacity()
+	//! then all iterators and references
+	//! (including the past-the-end iterator) are invalidated.
+	//! Otherwise only the past-the-end iterator is invalidated.
+	//! \~russian Если size() меньше capacity(), что часто бывает,
+	//! то добавление будет очень быстрым.
+	//! В любом случае добавление быстрое и не зависит от размера массива.
+	//! Если новый size() больше, чем capacity(),
+	//! то все итераторы и указатели становятся нерабочими.
+	//! В противном случае все, кроме итераторов, указывающих на конец массива,
+	//! остаются в рабочем состоянии.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! v.append(4);
+	//! v.append(5);
+	//! piCout << v; // {1, 2, 3, 4, 5}
+	//! \endcode
+	//! \~\sa \a prepend(), \a push_front(), \a push_back(), \a insert()
+	inline PIVector<T> & append(const T & e) { return push_back(e); }
+
+	//! \~english Appends the given element `e` to the end of the array.
+	//! \~russian Добавляет элемент `e` в конец массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\sa \a append()
+	inline PIVector<T> & append(T && e) { return push_back(std::move(e)); }
+
+	//! \~english Appends the given elements to the end of the array.
+	//! \~russian Добавляет элементы в конец массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! Appends the given elements from
+	//! [C++11 initializer list](https://en.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~russian Перегруженая функция.
+	//! Добавляет элементы из
+	//! [списка инициализации C++11](https://ru.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~\sa \a append()
+	inline PIVector<T> & append(std::initializer_list<T> init_list) { return push_back(init_list); }
+
+	//! \~english Appends the given array `v` to the end of the array.
+	//! \~russian Добавляет массив `v` в конец массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! v.append(PIVector<int>{4, 5});
+	//! piCout << v; // {1, 2, 3, 4, 5}
+	//! \endcode
+	//! \~\sa \a append()
+	inline PIVector<T> & append(const PIVector<T> & v) { return push_back(v); }
+
+	//! \~english Appends the given element `e` to the end of the array.
+	//! \~russian Добавляет элемент `e` в конец массива.
+	//! \~\details
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! v << 4 << 5;
+	//! piCout << v; // {1, 2, 3, 4, 5}
+	//! \endcode
+	//! \~\sa \a append()
+	inline PIVector<T> & operator<<(const T & e) { return push_back(e); }
+
+	//! \~english Appends the given element `e` to the end of the array.
+	//! \~russian Добавляет элемент `e` в конец массива.
+	//! \~\details
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! v << 4 << 5;
+	//! piCout << v; // {1, 2, 3, 4, 5}
+	//! \endcode
+	//! \~\sa \a append()
+	inline PIVector<T> & operator<<(T && e) { return push_back(std::move(e)); }
+
+	//! \~english Appends the given array `v` to the end of the array.
+	//! \~russian Добавляет массив `v` в конец массива.
+	//! \~\details
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! v << PIVector<int>{4, 5};
+	//! piCout << v; // {1, 2, 3, 4, 5}
+	//! \endcode
+	//! \~\sa \a append()
+	inline PIVector<T> & operator<<(const PIVector<T> & v) { return push_back(v); }
+
+	//! \~english Appends the given element `e` to the begin of the array.
+	//! \~russian Добавляет элемент `e` в начало массива.
+	//! \~\details
+	//! \~english Adding an element to the beginning takes longer than to the end.
+	//! This time is directly proportional to the size of the array.
+	//! All iterators and references are invalidated.
+	//! \~russian Добавление элемента в начало выполняется дольше, чем в конец.
+	//! Это время прямопропорционально размеру массива.
+	//! При добавлении элемента все итераторы и указатели становятся нерабочими.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! v.push_front(4);
+	//! v.push_front(5);
+	//! piCout << v; // {5, 4, 1, 2, 3}
+	//! \endcode
+	//! \~\sa \a push_back(), \a append(), \a prepend(), \a insert()
+	inline PIVector<T> & push_front(const T & e) { return insert(0, e); }
+
+	//! \~english Appends the given element `e` to the begin of the array.
+	//! \~russian Добавляет элемент `e` в начало массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\sa \a push_front()
+	inline PIVector<T> & push_front(T && e) { return insert(0, std::move(e)); }
+
+	//! \~english Appends the given array `v` to the begin of the array.
+	//! \~russian Добавляет массив `v` в начало массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! v.push_front(PIVector<int>{4, 5});
+	//! piCout << v; // {4, 5, 1, 2, 3}
+	//! \endcode
+	//! \~\sa \a push_front()
+	inline PIVector<T> & push_front(const PIVector<T> & v) { return insert(0, v); }
+
+	//! \~english Appends the given elements to the begin of the array.
+	//! \~russian Добавляет элементы в начало массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! Appends the given elements from
+	//! [C++11 initializer list](https://en.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~russian Перегруженая функция.
+	//! Добавляет элементы из
+	//! [списка инициализации C++11](https://ru.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~\sa \a append()
+	inline PIVector<T> & push_front(std::initializer_list<T> init_list) { return insert(0, init_list); }
+
+	//! \~english Appends the given element `e` to the begin of the array.
+	//! \~russian Добавляет элемент `e` в начало массива.
+	//! \~\details
+	//! \~english Adding an element to the beginning takes longer than to the end.
+	//! This time is directly proportional to the size of the array.
+	//! All iterators and references are invalidated.
+	//! \~russian Добавление элемента в начало выполняется дольше, чем в конец.
+	//! Это время прямопропорционально размеру массива.
+	//! При добавлении элемента все итераторы и указатели становятся нерабочими.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! v.prepend(4);
+	//! v.prepend(5);
+	//! piCout << v; // {5, 4, 1, 2, 3}
+	//! \endcode
+	//! \~\sa \a append(), \a push_back(), \a push_front(), \a insert()
+	inline PIVector<T> & prepend(const T & e) { return push_front(e); }
+
+	//! \~english Appends the given element `e` to the begin of the array.
+	//! \~russian Добавляет элемент `e` в начало массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\sa \a prepend()
+	inline PIVector<T> & prepend(T && e) { return push_front(std::move(e)); }
+
+	//! \~english Appends the given array `v` to the begin of the array.
+	//! \~russian Добавляет массив `v` в начало массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! \~russian Перегруженая функция.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! v.prepend(PIVector<int>{4, 5});
+	//! piCout << v; // {4, 5, 1, 2, 3}
+	//! \endcode
+	//! \~\sa \a prepend()
+	inline PIVector<T> & prepend(const PIVector<T> & v) { return push_front(v); }
+
+	//! \~english Appends the given elements to the begin of the array.
+	//! \~russian Добавляет элементы в начало массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! Appends the given elements from
+	//! [C++11 initializer list](https://en.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~russian Перегруженая функция.
+	//! Добавляет элементы из
+	//! [списка инициализации C++11](https://ru.cppreference.com/w/cpp/utility/initializer_list).
+	//! \~\sa \a append()
+	inline PIVector<T> & prepend(std::initializer_list<T> init_list) { return prepend(init_list); }
+
+	//! \~english Remove one element from the end of the array.
+	//! \~russian Удаляет один элемент с конца массива.
+	//! \~\details
+	//! \~english Deleting an element from the end is very fast
+	//! and does not depend on the size of the array.
+	//! \~russian Удаление элемента с конца выполняется очень быстро
+	//! и не зависит от размера массива.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! v.pop_back();
+	//! piCout << v; // {1, 2}
+	//! \endcode
+	//! \~\sa \a pop_front(), \a take_back(), \a take_front()
 	inline PIVector<T> & pop_back() {
-		if (piv_size == 0)
-			return *this;
-		resize(piv_size - 1);
+		if (piv_size == 0) return *this;
+		deleteT(piv_data + piv_size - 1, 1);
+		piv_size = piv_size - 1;
 		return *this;
 	}
+
+	//! \~english Remove one element from the begining of the array.
+	//! \~russian Удаляет один элемент с начала массива.
+	//! \~\details
+	//! \~english Removing an element from the beginning takes longer than from the end.
+	//! This time is directly proportional to the size of the array.
+	//! All iterators and references are invalidated.
+	//! \~russian Удаление элемента с начала выполняется дольше, чем с конца.
+	//! Это время прямопропорционально размеру массива.
+	//! При удалении элемента все итераторы и указатели становятся нерабочими.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! v.pop_front();
+	//! piCout << v; // {2, 3}
+	//! \endcode
+	//! \~\sa \a pop_back(), \a take_back(), \a take_front()
 	inline PIVector<T> & pop_front() {
-		if (piv_size == 0)
-			return *this;
+		if (piv_size == 0) return *this;
 		remove(0);
 		return *this;
 	}
 
-	inline T take_back() {T t(back()); pop_back(); return t;}
-	inline T take_front() {T t(front()); pop_front(); return t;}
+	//! \~english Remove one element from the end of the array and return it.
+	//! \~russian Удаляет один элемент с начала массива и возвращает его.
+	//! \~\details
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! piCout << v.take_back(); // 3
+	//! piCout << v; // {1, 2}
+	//! \endcode
+	//! \~\sa \a take_front(), \a pop_back(), \a pop_front()
+	inline T take_back() {
+		const T e(back());
+		pop_back();
+		return e;
+	}
 
+	//! \~english Remove one element from the begining of the array and return it.
+	//! \~russian Удаляет один элемент с конца массива и возвращает его.
+	//! \~\details
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! piCout << v.take_front(); // 1
+	//! piCout << v; // {2, 3}
+	//! \endcode
+	//! \~\sa \a take_front(), \a pop_back(), \a pop_front()
+	inline T take_front() {
+		const T e(front());
+		pop_front();
+		return e;
+	}
+
+	//! \~english Returns an array converted to another type.
+	//! \~russian Возвращает конвертированный в другой тип массив.
+	//! \~\details
+	//! \~\code
+	//! PIVector<double> v{1.1, 2.5, 3.8};
+	//! PIVector<int> v2 = v.toType<int>();
+	//! piCout << v2; // {1, 2, 3}
+	//! \endcode
+	//! \~\sa \a map()
 	template<typename ST>
-	PIVector<ST> toType() const {
-		PIVector<ST> ret(piv_size);
-		for (uint i = 0; i < piv_size; ++i)
-			ret[i] = ST(piv_data[i]);
+	inline PIVector<ST> toType() const {
+		PIVector<ST> ret;
+		ret.reserve(piv_size);
+		for (size_t i = 0; i < piv_size; ++i) {
+			ret << ST(piv_data[i]);
+		}
 		return ret;
 	}
 
-	const PIVector<T> & forEach(std::function<void(const T &)> f) const {
-		for (uint i = 0; i < piv_size; ++i)
+	//! \~english Returns a new array with all elements
+	//! that pass the test implemented by the provided function `bool test(const T & e)`.
+	//! \~russian Возвращает новый массив со всеми элементами,
+	//! прошедшими проверку, задаваемую в передаваемой функции `bool test(const T & e)`.
+	//! \~\details
+	//! \~\code
+	//! PIVector<int> v{3, 2, 5, 2, 7};
+	//! PIVector<int> v2 = v.filter([](const int & i){return i > 2;});
+	//! piCout << v2; // {3, 5, 7}
+	//! \endcode
+	//! \~\sa \a map(), \a any(), \a every()
+	inline PIVector<T> filter(std::function<bool(const T & e)> test) const {
+		PIVector<T> ret;
+		for (size_t i = 0; i < piv_size; ++i) {
+			if (test(piv_data[i])) ret << piv_data[i];
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a filter() but with `index` parameter in `test`.
+	//! \~russian Аналогично \a filter() но с параметром индекса `index` в функции `test`.
+	//! \~\sa \a filter()
+	inline PIVector<T> filterIndexed(std::function<bool(size_t index, const T & e)> test) const {
+		PIVector<T> ret;
+		for (size_t i = 0; i < piv_size; ++i) {
+			if (test(i, piv_data[i])) ret << piv_data[i];
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a filter() but from end to begin (from right to left).
+	//! \~russian Аналогично \a filter() но от конца до начала (справа на лево).
+	//! \~\sa \a filter()
+	inline PIVector<T> filterReverse(std::function<bool(const T & e)> test) const {
+		PIVector<T> ret;
+		for (ssize_t i = piv_size; i >= 0; --i) {
+			if (test(piv_data[i])) ret << piv_data[i];
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a filterReverse() but with `index` parameter in `test`.
+	//! \~russian Аналогично \a filterReverse() но с параметром индекса `index` в функции `test`.
+	//! \~\sa \a filterReverse()
+	inline PIVector<T> filterReverseIndexed(std::function<bool(size_t index, const T & e)> test) const {
+		PIVector<T> ret;
+		for (ssize_t i = piv_size; i >= 0; --i) {
+			if (test(i, piv_data[i])) ret << piv_data[i];
+		}
+		return ret;
+	}
+
+	//! \~english Execute function `void f(const T & e)` for every element in array.
+	//! \~russian Выполняет функцию `void f(const T & e)` для каждого элемента массива.
+	//! \~\details
+	//! \~russian Не позволяет изменять элементы массива.
+	//! Для редактирования элементов используйте функцию вида `void f(T & e)`.
+	//! \~english Does not allow changing array elements.
+	//! To edit elements, use the function like `void f(T & e)`
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3, 4, 5};
+	//! int s = 0;
+	//! v.forEach([&s](const int & e){s += e;});
+	//! piCout << s; // 15
+	//! \endcode
+	//! \~\sa \a filter(), \a map(), \a reduce(), \a any(), \a every()
+	inline void forEach(std::function<void(const T & e)> f) const {
+		for (size_t i = 0; i < piv_size; ++i) {
 			f(piv_data[i]);
+		}
+	}
+
+	//! \~english Execute function `void f(T & e)` for every element in array.
+	//! \~russian Выполняет функцию `void f(T & e)` для каждого элемента массива.
+	//! \~\details
+	//! \~english Overloaded function.
+	//! Allows you to change the elements of the array.
+	//! \~russian Перегруженая функция.
+	//! Позволяет изменять элементы массива.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3, 4, 5};
+	//! v.forEach([](int & e){e++;});
+	//! piCout << v; // {2, 3, 4, 5, 6}
+	//! \endcode
+	//! \~\sa \a filter(), \a map(), \a reduce(), \a any(), \a every()
+	inline PIVector<T> & forEach(std::function<void(T & e)> f) {
+		for (size_t i = 0; i < piv_size; ++i) {
+			f(piv_data[i]);
+		}
 		return *this;
 	}
-	PIVector<T> copyForEach(std::function<T(const T &)> f) const {
-		PIVector<T> ret; ret.reserve(piv_size);
-		for (uint i = 0; i < piv_size; ++i)
-			ret << f(piv_data[i]);
-		return ret;
+
+	//! \~english Same as \a forEach() but with `index` parameter in `f`.
+	//! \~russian Аналогично \a forEach() но с параметром индекса `index` в функции `f`.
+	//! \~\sa \a forEach()
+	inline void forEachIndexed(std::function<void(size_t index, const T & e)> f) const {
+		for (size_t i = 0; i < piv_size; ++i) {
+			f(i, piv_data[i]);
+		}
+	}
+
+	//! \~english Same as \a forEachIndexed(), but allows you to change the elements of the array.
+	//! \~russian Аналогично \a forEachIndexed(), но позволяет изменять элементы массива.
+	//! \~\sa \a forEach(), \a forEachIndexed()
+	inline PIVector<T> & forEachIndexed(std::function<void(size_t index, T & e)> f) {
+		for (size_t i = 0; i < piv_size; ++i) {
+			f(i, piv_data[i]);
 		}
-	PIVector<T> & forEachInplace(std::function<T(const T &)> f) {
-		for (uint i = 0; i < piv_size; ++i)
-			piv_data[i] = f(piv_data[i]);
 		return *this;
 	}
+
+	//! \~english Same as \a forEach() but from end to begin (from right to left).
+	//! \~russian Аналогично \a forEach() но от конца до начала (справа на лево).
+	//! \~\sa \a forEach()
+	inline void forEachReverse(std::function<void(const T & e)> f) const {
+		for (ssize_t i = piv_size; i >= 0; --i) {
+			f(piv_data[i]);
+		}
+	}
+
+	//! \~english Same as \a forEachReverse(), but allows you to change the elements of the array.
+	//! \~russian Аналогично \a forEachReverse(), но позволяет изменять элементы массива.
+	//! \~\sa \a forEach(), \a forEachReverse()
+	inline PIVector<T> & forEachReverse(std::function<void(T & e)> f) {
+		for (ssize_t i = piv_size; i >= 0; --i) {
+			f(piv_data[i]);
+		}
+		return *this;
+	}
+
+	//! \~english Same as \a forEachIndexed() but from end to begin (from right to left).
+	//! \~russian Аналогично \a forEachIndexed() но от конца до начала (справа на лево).
+	//! \~\sa \a forEachIndexed(), \a forEachReverse(), \a forEach()
+	inline void forEachReverseIndexed(std::function<void(size_t index, const T & e)> f) const {
+		for (ssize_t i = piv_size; i >= 0; --i) {
+			f(i, piv_data[i]);
+		}
+	}
+
+	//! \~english Same as \a forEachReverseIndexed(), but allows you to change the elements of the array.
+	//! \~russian Аналогично \a forEachReverseIndexed(), но позволяет изменять элементы массива.
+	//! \~\sa \a forEachReverseIndexed(), \a forEachIndexed(), \a forEachReverse(), \a forEach()
+	inline PIVector<T> & forEachReverseIndexed(std::function<void(size_t index, T & e)> f) {
+		for (ssize_t i = piv_size; i >= 0; --i) {
+			f(i, piv_data[i]);
+		}
+		return *this;
+	}
+
+	//! \~english Сreates a new array populated with the results
+	//! of calling a provided function `ST f(const T & e)` on every element in the calling array.
+	//! \~russian Создаёт новый массив с результатом вызова указанной функции
+	//! `ST f(const T & e)` для каждого элемента массива.
+	//! \~\details
+	//! \~english Calls a provided function`ST f(const T & e)`
+	//! once for each element in an array, in order,
+	//! and constructs a new array from the results.
+	//! \~russian Метод `map` вызывает переданную функцию `ST f(const T & e)`
+	//! один раз для каждого элемента в порядке их появления
+	//! и конструирует новый массив из результатов её вызова.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! PIVector<PIString> sl = v.map<PIString>([](const int & i){return PIString::fromNumber(i);});
+	//! piCout << sl; // {"1", "2", "3"}
+	//! \endcode
+	//! \~\sa \a forEach(), \a reduce()
 	template<typename ST>
-	PIVector<ST> toType(std::function<ST(const T &)> f) const {
-		PIVector<ST> ret; ret.reserve(piv_size);
-		for (uint i = 0; i < piv_size; ++i)
+	inline PIVector<ST> map(std::function<ST(const T & e)> f) const {
+		PIVector<ST> ret;
+		ret.reserve(piv_size);
+		for (size_t i = 0; i < piv_size; ++i) {
 			ret << f(piv_data[i]);
+		}
 		return ret;
 	}
 
-	inline PIVector<PIVector<T>> reshape(size_t rows, size_t cols, int order = byRow) const {
+	//! \~english Same as \a map() but with `index` parameter in `f`.
+	//! \~russian Аналогично \a map() но с параметром индекса `index` в функции `f`.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! PIVector<PIString> sl = v.mapIndexed<PIString>([](size_t index, const int & i){return PIString::fromNumber(index);});
+	//! piCout << sl; // {"0", "1", "2"}
+	//! \endcode
+	//! \~\sa \a map()
+	template<typename ST>
+	inline PIVector<ST> mapIndexed(std::function<ST(size_t index, const T & e)> f) const {
+		PIVector<ST> ret;
+		ret.reserve(piv_size);
+		for (size_t i = 0; i < piv_size; ++i) {
+			ret << f(i, piv_data[i]);
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a map() but from end to begin (from right to left).
+	//! \~russian Аналогично \a map() но от конца до начала (справа на лево).
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! PIVector<PIString> sl = v.mapReverse<PIString>([](const int & i){return PIString::fromNumber(i);});
+	//! piCout << sl; // {"3", "2", "1"}
+	//! \endcode
+	//! \~\sa \a map()
+	template<typename ST>
+	inline PIVector<ST> mapReverse(std::function<ST(const T & e)> f) const {
+		PIVector<ST> ret;
+		ret.reserve(piv_size);
+		for (ssize_t i = piv_size; i >= 0; --i) {
+			ret << f(piv_data[i]);
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a mapReverse() but with `index` parameter in `f`.
+	//! \~russian Аналогично \a mapReverse() но с параметром индекса `index` в функции `f`.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3};
+	//! PIVector<PIString> sl = v.mapReverseIndexed<PIString>([](size_t index, const int & i){return PIString::fromNumber(index);});
+	//! piCout << sl; // {"2", "1", "0"}
+	//! \endcode
+	//! \~\sa \a mapReverse()
+	template<typename ST>
+	inline PIVector<ST> mapReverseIndexed(std::function<ST(size_t index, const T & e)> f) const {
+		PIVector<ST> ret;
+		ret.reserve(piv_size);
+		for (ssize_t i = piv_size; i >= 0; --i) {
+			ret << f(i, piv_data[i]);
+		}
+		return ret;
+	}
+
+	//! \~english Applies the function `ST f(const T & e, const ST & acc)`
+	//! to each element of the array (from left to right), returns one value.
+	//! \~russian Применяет функцию `ST f(const T & e, const ST & acc)`
+	//! к каждому элементу массива (слева-направо), возвращает одно значение.
+	//! \~\details
+	//! \~english The reduce() method performs the `f` function
+	//! once for each element in the array.
+	//! If the `initial` argument is passed when calling reduce(),
+	//! then when the function `f` is called for the first time,
+	//! the value of `acc` will be assigned to `initial`.
+	//! If the array is empty, the value `initial` will be returned.
+	//! \param f is a function like `ST f(const T & e, const ST & acc)`,
+	//! executed for each element of the array. It takes two arguments:
+	//! * **e** - current element of the array
+	//! * **acc** - accumulator accumulating the value
+	//! which this function returns after visiting the next element
+	//!
+	//! \param initial _optional_ Object used as the second argument
+	//! when the `f` function is first called.
+	//! \~russian Метод reduce() выполняет функцию `f`
+	//! один раз для каждого элемента, присутствующего в массиве.
+	//! Если при вызове reduce() передан аргумент `initial`,
+	//! то при первом вызове функции `f` значение `acc`
+	//! будет равным значению `initial`.
+	//! Если массив пустой то будет возвращено значение `initial`.
+	//! \param f Функция, вида `ST f(const T & e, const ST & acc)`,
+	//! выполняющаяся для каждого элемента массива.
+	//! Она принимает два аргумента:
+	//! * **e** - текущий элемент массива
+	//! * **acc** - аккумулятор, аккумулирующий значение
+	//! которое возвращает эта функция после посещения очередного элемента
+	//!
+	//! \param initial _опциональный_ Объект,
+	//! используемый в качестве второго аргумента при первом вызове функции `f`.
+	//!
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3, 4, 5};
+	//! int s = v.reduce<int>([](const int & e, const int & acc){return e + acc;});
+	//! piCout << s; // 15
+	//! \endcode
+	//! \~\sa \a forEach(), \a map()
+	template<typename ST>
+	inline ST reduce(std::function<ST(const T & e, const ST & acc)> f, const ST & initial = ST()) const {
+		ST ret(initial);
+		for (size_t i = 0; i < piv_size; ++i) {
+			ret = f(piv_data[i], ret);
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a reduce() but with `index` parameter in `f`.
+	//! \~russian Аналогично \a reduce() но с параметром индекса `index` в функции `f`.
+	//! \~\sa \a reduce()
+	template<typename ST>
+	inline ST reduceIndexed(std::function<ST(size_t index, const T & e, const ST & acc)> f, const ST & initial = ST()) const {
+		ST ret(initial);
+		for (size_t i = 0; i < piv_size; ++i) {
+			ret = f(i, piv_data[i], ret);
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a reduce() but from end to begin (from right to left).
+	//! \~russian Аналогично \a reduce() но от конца до начала (справа на лево).
+	//! \~\sa \a reduce()
+	template<typename ST>
+	inline ST reduceReverse(std::function<ST(const T & e, const ST & acc)> f, const ST & initial = ST()) const {
+		ST ret(initial);
+		for (ssize_t i = piv_size; i >= 0; --i) {
+			ret = f(piv_data[i], ret);
+		}
+		return ret;
+	}
+
+	//! \~english Same as \a reduceReverse() but with `index` parameter in `f`.
+	//! \~russian Аналогично \a reduceReverse() но с параметром индекса `index` в функции `f`.
+	//! \~\sa \a reduceReverse()
+	template<typename ST>
+	inline ST reduceReverseIndexed(std::function<ST(size_t index, const T & e, const ST & acc)> f, const ST & initial = ST()) const {
+		ST ret(initial);
+		for (ssize_t i = piv_size; i >= 0; --i) {
+			ret = f(i, piv_data[i], ret);
+		}
+		return ret;
+	}
+
+	//! \~english Changes the dimension of the array, creates a two-dimensional array from a one-dimensional array.
+	//! \~russian Изменяет размерность массива, из одномерного массива создает двухмерный.
+	//! \~\details
+	//! \~russian
+	//! \param rows размер внешнего массива
+	//! \param cols размер внутренних массивов
+	//! \param order порядок обхода исходного массива, задаётся с помощью \a ReshapeOrder
+	//! \~english
+	//! \param rows size external array
+	//! \param cols size internal arrays
+	//! \param order the order of traversing the source array is set using \a ReshapeOrder
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3, 4};
+	//! PIVector<PIVector<int>> m1 = v.reshape(2,2);
+	//! piCout << m1; // {{1, 2}, {3, 4}}
+	//! PIVector<PIVector<int>> m2 = v.reshape(2,2, ReshapeByColumn);
+	//! piCout << m2; // {{1, 3}, {2, 4}}
+	//! \endcode
+	//! \~\sa \a map(), \a reduce(), \a flatten()
+	inline PIVector<PIVector<T>> reshape(size_t rows, size_t cols, ReshapeOrder order = ReshapeByRow) const {
+#ifndef NDEBUG
+		if (rows * cols != piv_size) {
+			printf("error with PIVector<%s>::reshape\n", __PIP_TYPENAME__(T));
+		}
+#endif
+		assert(rows * cols == piv_size);
 		PIVector<PIVector<T>> ret;
 		if (isEmpty()) return ret;
-		assert(rows*cols == piv_size);
-		ret.resize(rows);
-		if (order == byRow) {
-			for (size_t r = 0; r < rows; r++)
+		ret.expand(rows);
+		if (order == ReshapeByRow) {
+			for (size_t r = 0; r < rows; r++) {
 				ret[r] = PIVector<T>(&(piv_data[r * cols]), cols);
 			}
-		if (order == byColumn) {
+		}
+		if (order == ReshapeByColumn) {
 			for (size_t r = 0; r < rows; r++) {
 				ret[r].resize(cols);
-				for (size_t c = 0; c < cols; c++)
+				for (size_t c = 0; c < cols; c++) {
 					ret[r][c] = piv_data[c * rows + r];
 				}
 			}
+		}
 		return ret;
 	}
 
-	template<typename C, typename std::enable_if<
-				 std::is_same<T, PIVector<C>>::value
-				 , int>::type = 0>
-	inline PIVector<C> reshape(int order = byRow) const {
+	//! \~english Changes the dimension of the array, creates a one-dimensional array from a two-dimensional array.
+	//! \~russian Изменяет размерность массива, из двухмерный массива создает одномерный.
+	//! \~\details
+	//! \~russian Делает массив плоским.
+	//! Порядок обхода исходного массива задаётся с помощью \a ReshapeOrder.
+	//! \~english Makes the array flat.
+	//! Еhe order of traversing the source array is set using \a ReshapeOrder.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3, 4, 5, 6};
+	//! PIVector<PIVector<int>> xv = v.reshape(3,2);
+	//! piCout << xv; // {{1, 2}, {3, 4}, {5, 6}}
+	//! piCout << xv.flatten<int>(); // {1, 2, 3, 4, 5, 6}
+	//! \endcode
+	//! \~\sa \a map(), \a reduce(), \a reshape()
+	template<typename C, typename std::enable_if<std::is_same<T, PIVector<C>>::value, int>::type = 0>
+	inline PIVector<C> flatten(ReshapeOrder order = ReshapeByRow) const {
 		PIVector<C> ret;
 		if (isEmpty()) return ret;
-		size_t rows = size();
-		size_t cols = at(0).size();
+		const size_t rows = size();
+		const size_t cols = at(0).size();
 		ret.reserve(rows * cols);
-		if (order == byRow) {
-			for (size_t r = 0; r < rows; r++)
+		if (order == ReshapeByRow) {
+			for (size_t r = 0; r < rows; r++) {
 				ret.append(at(r));
 			}
-		if (order == byColumn) {
-			for (size_t c = 0; c < cols; c++)
-				for (size_t r = 0; r < rows; r++)
+		}
+		if (order == ReshapeByColumn) {
+			for (size_t c = 0; c < cols; c++) {
+				for (size_t r = 0; r < rows; r++) {
 					ret << at(r)[c];
 				}
+			}
+		}
 		ret.resize(rows * cols);
 		return ret;
 	}
 
+	//! \~english Changes the dimension of the two-dimensional array.
+	//! \~russian Изменяет размерность двухмерного массива.
+	//! \~\details
+	//! \~russian
+	//! \param rows размер внешнего массива
+	//! \param cols размер внутренних массивов
+	//! \param order порядок обхода исходного массива, задаётся с помощью \a ReshapeOrder
+	//! \~english
+	//! \param rows size external array
+	//! \param cols size internal arrays
+	//! \param order the order of traversing the source array is set using \a ReshapeOrder
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3, 4, 5, 6};
+	//! PIVector<PIVector<int>> xv = v.reshape(3,2);
+	//! piCout << xv; // {{1, 2}, {3, 4}, {5, 6}}
+	//! piCout << xv.reshape<int>(2,3); // {{1, 2, 3}, {4, 5, 6}}
+	//! \endcode
+	//! \~\sa \a map(), \a reduce(), \a reshape()
+	template<typename C, typename std::enable_if<std::is_same<T, PIVector<C>>::value, int>::type = 0>
+	inline PIVector<PIVector<C>> reshape(size_t rows, size_t cols, ReshapeOrder order = ReshapeByRow) const {
+		PIVector<C> fl = flatten<C>();
+		return fl.reshape(rows, cols, order);
+	}
+
+	//! \~english Divides an array into a two-dimensional array using the separator `separator`.
+	//! \~russian Разделяет массив на двумерный массив с помощью разделителя`separator`.
+	//! \~\code
+	//! PIVector<int> v{1, 2, 3, 99, 4, 5, 99, 6};
+	//! piCout << v.split(99); // {{1, 2, 3}, {4, 5}, {6}}
+	//! \endcode
+	//! \~\sa \a splitBySize()
+	inline PIVector<PIVector<T>> split(const T & separator) const {
+		PIVector<PIVector<T>> ret;
+		if (isEmpty()) return ret;
+		size_t start = 0;
+		ssize_t ci   = indexOf(separator, start);
+		while (ci >= 0) {
+			ret << PIVector<T>(piv_data + start, ci - start);
+			start = ci + 1;
+			ci    = indexOf(separator, start);
+		}
+		if (start < piv_size) {
+			ret << PIVector<T>(piv_data + start, piv_size - start);
+		}
+		return ret;
+	}
+
+	//! \~english Divides an array into a two-dimensional array in chunks of no more than `sz`.
+	//! \~russian Разделяет массив на двумерный массив по кускам не более чем `sz`.
+	//! \~\sa \a split()
+	inline PIVector<PIVector<T>> splitBySize(size_t sz) const {
+		PIVector<PIVector<T>> ret;
+		if (isEmpty() || sz == 0) return ret;
+		const size_t ch = piv_size / sz;
+		for (size_t i = 0; i < ch; ++i) {
+			ret << PIVector<T>(piv_data + sz * i, sz);
+		}
+		const size_t t = ch * sz;
+		if (t < piv_size) {
+			ret << PIVector<T>(piv_data + t, piv_size - t);
+		}
+		return ret;
+	}
+
+	//! \~english Cut sub-array of this array.
+	//! \~russian Вырезает подмассив, то есть кусок из текущего массива.
+	//! \~english
+	//! \param index - index of this array where sub-array starts
+	//! \param count - sub-array size
+	//! \~russian
+	//! \param index - индекс в текущем массиве, откуда начинётся подмассив
+	//! \param count - размер подмассива
+	//! \~\details
+	//! \~english
+	//! Index must be in range from `0` to `size()-1`.
+	//! If sub-array size more than this array size, than ends early.
+	//! \~russian
+	//! Индекс начала должен лежать в диапазоне от `0` до `size()-1`.
+	//! Если заданный размер подмассива превышает размер текущего массива,
+	//! то вернется подмассив меньшего размера (`size()-index-1`).
+	inline PIVector<T> takeRange(size_t index, size_t count) {
+		PIVector<T> ret;
+		if (index >= piv_size || count == 0) return ret;
+		if (index + count > piv_size) count = piv_size - index;
+		ret.alloc(count);
+		memcpy(reinterpret_cast<void *>(ret.piv_data), reinterpret_cast<const void *>(piv_data + index), count * sizeof(T));
+		const size_t os = piv_size - index - count;
+		if (os > 0) {
+			memmove(reinterpret_cast<void *>(piv_data + index), reinterpret_cast<const void *>(piv_data + index + count), os * sizeof(T));
+			piv_size -= count;
+		} else {
+			piv_size = index;
+		}
+		return ret;
+	}
+
 private:
-	inline void _reset() {piv_size = piv_rsize = 0; piv_data = 0;}
+	inline void _reset() {
+		piv_size  = 0;
+		piv_rsize = 0;
+		piv_data  = nullptr;
+	}
+
 	inline size_t asize(size_t s) {
 		if (s == 0) return 0;
-		if (piv_rsize + piv_rsize >= s && piv_rsize < s)
-			return piv_rsize + piv_rsize;
-		ssize_t t = 0, s_ = s - 1;
-		while (s_ >> t) ++t;
+		if (piv_rsize * 2 >= s && piv_rsize < s) {
+			return piv_rsize * 2;
+		}
+		ssize_t t = _PIContainerConstants<T>::minCountPoT();
+		s -= 1;
+		while (s >> t)
+			++t;
 		return (1 << t);
 	}
-	template<typename T1 = T, typename std::enable_if<
-			!std::is_trivially_copyable<T1>::value
-			, int>::type = 0>
+
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline void newT(T * dst, const T * src, size_t s) {
 		PIINTROSPECTION_CONTAINER_USED(T, s)
-		for (size_t i = 0; i < s; ++i)
+		for (size_t i = 0; i < s; ++i) {
 			elementNew(dst + i, src[i]);
 		}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
+	}
+
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline void newT(T * dst, const T * src, size_t s) {
 		PIINTROSPECTION_CONTAINER_USED(T, s)
-		memcpy((void*)(dst), (const void*)(src), s * sizeof(T));
+		memcpy(reinterpret_cast<void *>(dst), reinterpret_cast<const void *>(src), s * sizeof(T));
 	}
-	template<typename T1 = T, typename std::enable_if<
-			!std::is_trivially_copyable<T1>::value
-			, int>::type = 0>
+
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline void deleteT(T * d, size_t sz) {
 		PIINTROSPECTION_CONTAINER_UNUSED(T, sz)
-		if ((uchar*)d != 0) {
-			for (size_t i = 0; i < sz; ++i)
+		if (d != nullptr) {
+			for (size_t i = 0; i < sz; ++i) {
 				elementDelete(d[i]);
 			}
 		}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
+	}
+
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline void deleteT(T * d, size_t sz) {
 		PIINTROSPECTION_CONTAINER_UNUSED(T, sz)
 	}
-	template<typename T1 = T, typename std::enable_if<
-				 !std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
-	inline void elementNew(T * to, const T & from) {new(to)T(from);}
-	template<typename T1 = T, typename std::enable_if<
-				 !std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
-	inline void elementNew(T * to, T && from) {new(to)T(std::move(from));}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
-	inline void elementNew(T1 * to, const T & from) {(*to) = from;}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
-	inline void elementNew(T * to, T && from) {(*to) = std::move(from);}
-	template<typename T1 = T, typename std::enable_if<
-				 !std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
-	inline void elementDelete(T & from) {from.~T();}
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
-	inline void elementDelete(T & from) {}
-	inline void dealloc() {
-		if ((uchar*)piv_data != 0) free((uchar*)piv_data);
-		piv_data = 0;
+
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
+	inline void elementNew(T * to, const T & from) {
+		new (to) T(from);
 	}
+
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
+	inline void elementNew(T * to, T && from) {
+		new (to) T(std::move(from));
+	}
+
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
+	inline void elementNew(T1 * to, const T & from) {
+		(*to) = from;
+	}
+
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
+	inline void elementNew(T * to, T && from) {
+		(*to) = std::move(from);
+	}
+
+	template<typename T1 = T, typename std::enable_if<!std::is_trivially_copyable<T1>::value, int>::type = 0>
+	inline void elementDelete(T & from) {
+		from.~T();
+	}
+
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
+	inline void elementDelete(T & from) {}
+
+	inline void dealloc() {
+		if (piv_data != nullptr) {
+			free(reinterpret_cast<void *>(piv_data));
+			piv_data = nullptr;
+		}
+	}
+
+	inline void expand(size_t new_size, const T & e = T()) {
+		const size_t os = piv_size;
+		alloc(new_size);
+		PIINTROSPECTION_CONTAINER_USED(T, (new_size - os))
+		for (size_t i = os; i < new_size; ++i) {
+			elementNew(piv_data + i, e);
+		}
+	}
+
+	inline void expand(size_t new_size, std::function<T(size_t i)> f) {
+		const size_t os = piv_size;
+		alloc(new_size);
+		PIINTROSPECTION_CONTAINER_USED(T, (new_size - os))
+		for (size_t i = os; i < new_size; ++i) {
+			elementNew(piv_data + i, f(i));
+		}
+	}
+
 	inline void alloc(size_t new_size) {
 		if (new_size <= piv_rsize) {
 			piv_size = new_size;
 			return;
 		}
 		piv_size        = new_size;
-		size_t as = asize(new_size);
+		const size_t as = asize(new_size);
 		if (as == piv_rsize) return;
 		PIINTROSPECTION_CONTAINER_ALLOC(T, (as - piv_rsize))
-		T * p_d = (T*)(realloc((void*)(piv_data), as*sizeof(T)));
+		T * p_d = reinterpret_cast<T *>(realloc(reinterpret_cast<void *>(piv_data), as * sizeof(T)));
+#ifndef NDEBUG
+		if (!p_d) {
+			printf("error with PIVector<%s>::alloc\n", __PIP_TYPENAME__(T));
+		}
+#endif
 		assert(p_d);
 		piv_data  = p_d;
 		piv_rsize = as;
 	}
 
-	T * piv_data;
-	size_t piv_size, piv_rsize;
+	T * piv_data     = nullptr;
+	size_t piv_size  = 0;
+	size_t piv_rsize = 0;
 };
 
 
-
 #ifdef PIP_STD_IOSTREAM
+//! \~english Output operator to [std::ostream](https://en.cppreference.com/w/cpp/io/basic_ostream).
+//! \~russian Оператор вывода в [std::ostream](https://ru.cppreference.com/w/cpp/io/basic_ostream).
 template<typename T>
-inline std::ostream & operator <<(std::ostream & s, const PIVector<T> & v) {s << "{"; for (size_t i = 0; i < v.size(); ++i) {s << v[i]; if (i < v.size() - 1) s << ", ";} s << "}"; return s;}
-#endif
-
-template<typename T>
-inline PICout operator <<(PICout s, const PIVector<T> & v) {
-	s.space();
-	s.setControl(0, true);
+inline std::ostream & operator<<(std::ostream & s, const PIVector<T> & v) {
 	s << "{";
 	for (size_t i = 0; i < v.size(); ++i) {
 		s << v[i];
-		if (i < v.size() - 1)
-			s << ", ";
+		if (i < v.size() - 1) s << ", ";
 	}
 	s << "}";
-	s.restoreControl();
+	return s;
+}
+#endif
+
+//! \relatesalso PICout
+//! \~english Output operator to \a PICout
+//! \~russian Оператор вывода в \a PICout
+template<typename T>
+inline PICout operator<<(PICout s, const PIVector<T> & v) {
+	s.space();
+	s.saveAndSetControls(0);
+	s << "{";
+	for (size_t i = 0; i < v.size(); ++i) {
+		s << v[i];
+		if (i < v.size() - 1) {
+			s << ", ";
+		}
+	}
+	s << "}";
+	s.restoreControls();
 	return s;
 }
 
-template<typename T> inline void piSwap(PIVector<T> & f, PIVector<T> & s) {f.swap(s);}
-
+template<typename T>
+inline void piSwap(PIVector<T> & f, PIVector<T> & s) {
+	f.swap(s);
+}
 
 #endif // PIVECTOR_H

libs/main/containers/pivector2d.h

@@ -1,5 +1,5 @@
-/*! @file pivector2d.h
- * @brief 2D wrapper around PIVector
+/*! \file pivector2d.h
+ * \brief 2D wrapper around PIVector
  *
  * This file declares PIVector
  */
@@ -27,7 +27,7 @@
 
 #include "pivector.h"
 
-/*! @brief 2D array,
+/*! \brief 2D array,
  * \details This class used to store 2D array of any type elements as plain vector.
  * You can read/write any element via operators [][], first dimension - row, second - column.
  * The first dimension is Row, and you can operate with Row as PIVector<T>: modify any element, assign to another Row and etc.
@@ -39,17 +39,17 @@ template <typename T>
 class PIVector2D {
 public:
 	inline PIVector2D() { rows_ = cols_ = 0; }
+
 	inline PIVector2D(size_t rows, size_t cols, const T & f = T()) {
 		rows_ = rows;
 		cols_ = cols;
 		mat.resize(rows * cols, f);
 	}
-	inline PIVector2D(size_t rows, size_t cols, const PIVector<T> & v) : rows_(rows), cols_(cols), mat(v) {
-		mat.resize(rows*cols);
-	}
-	inline PIVector2D(size_t rows, size_t cols, PIVector<T> && v) : rows_(rows), cols_(cols), mat(std::move(v)) {
-		mat.resize(rows*cols);
-	}
+
+	inline PIVector2D(size_t rows, size_t cols, const PIVector<T> & v): rows_(rows), cols_(cols), mat(v) { mat.resize(rows * cols); }
+
+	inline PIVector2D(size_t rows, size_t cols, PIVector<T> && v): rows_(rows), cols_(cols), mat(std::move(v)) { mat.resize(rows * cols); }
+
 	inline PIVector2D(const PIVector<PIVector<T>> & v) {
 		rows_ = v.size();
 		if (rows_) {
@@ -64,19 +64,32 @@ public:
 	}
 
 	inline size_t rows() const { return rows_; }
+
 	inline size_t cols() const { return cols_; }
+
 	inline size_t size() const { return mat.size(); }
+
 	inline ssize_t size_s() const { return mat.size_s(); }
+
 	inline size_t length() const { return mat.length(); }
+
 	inline size_t capacity() const { return mat.capacity(); }
+
 	inline bool isEmpty() const { return mat.isEmpty(); }
 
+	inline bool isNotEmpty() const { return mat.isNotEmpty(); }
+
 	class Row {
 		friend class PIVector2D<T>;
+
 	private:
-		inline Row(PIVector2D<T> * p, size_t row) : p_(&(p->mat)) {st_ = p->cols_ * row; sz_ = p->cols_;}
+		inline Row(PIVector2D<T> * p, size_t row): p_(&(p->mat)) {
+			st_ = p->cols_ * row;
+			sz_ = p->cols_;
+		}
 		PIVector<T> * p_;
 		size_t st_, sz_;
+
 	public:
 		inline size_t size() const { return sz_; }
 		inline T & operator[](size_t index) { return (*p_)[st_ + index]; }
@@ -85,12 +98,12 @@ public:
 		inline const T * data(size_t index = 0) const { return p_->data(st_ + index); }
 		inline Row & operator=(const Row & other) {
 			if (p_ == other.p_ && st_ == other.st_) return *this;
-			size_t sz = piMin<size_t>(sz_, other.sz_);
+			const size_t sz = piMin<size_t>(sz_, other.sz_);
 			p_->_copyRaw(p_->data(st_), other.data(), sz);
 			return *this;
 		}
 		inline Row & operator=(const PIVector<T> & other) {
-			size_t sz = piMin<size_t>(sz, other.size());
+			const size_t sz = piMin<size_t>(sz, other.size());
 			p_->_copyRaw(p_->data(st_), other.data(), sz);
 			return *this;
 		}
@@ -99,10 +112,16 @@ public:
 
 	class Col {
 		friend class PIVector2D<T>;
+
 	private:
-		inline Col(PIVector2D<T> * p, size_t row) : p_(&(p->mat)) {step_ = p->cols_; row_ = row; sz_ = p->rows_;}
+		inline Col(PIVector2D<T> * p, size_t row): p_(&(p->mat)) {
+			step_ = p->cols_;
+			row_  = row;
+			sz_   = p->rows_;
+		}
 		PIVector<T> * p_;
 		size_t step_, row_, sz_;
+
 	public:
 		inline size_t size() const { return sz_; }
 		inline T & operator[](size_t index) { return (*p_)[index * step_ + row_]; }
@@ -111,29 +130,37 @@ public:
 		inline const T * data(size_t index = 0) const { return p_->data(index * step_ + row_); }
 		inline Col & operator=(const Col & other) {
 			if (p_ == other.p_ && row_ == other.row_) return *this;
-			size_t sz = piMin<size_t>(sz_, other.sz_);
-			for (int i=0; i<sz; ++i) (*p_)[i * step_ + row_] = other[i];
+			const size_t sz = piMin<size_t>(sz_, other.sz_);
+			for (int i = 0; i < sz; ++i)
+				(*p_)[i * step_ + row_] = other[i];
 			return *this;
 		}
 		inline Row & operator=(const PIVector<T> & other) {
-			size_t sz = piMin<size_t>(sz_, other.size());
-			for (int i=0; i<sz; ++i) (*p_)[i * step_ + row_] = other[i];
+			const size_t sz = piMin<size_t>(sz_, other.size());
+			for (int i = 0; i < sz; ++i)
+				(*p_)[i * step_ + row_] = other[i];
 			return *this;
 		}
 		inline PIVector<T> toVector() const {
 			PIVector<T> ret;
 			ret.reserve(sz_);
-			for (size_t i=0; i<sz_; i++) ret << (*p_)[i * step_ + row_];
+			for (size_t i = 0; i < sz_; i++)
+				ret << (*p_)[i * step_ + row_];
 			return ret;
 		}
 	};
 
 	class RowConst {
 		friend class PIVector2D<T>;
+
 	private:
-		inline RowConst(const PIVector2D<T> * p, size_t row) : p_(&(p->mat)) {st_ = p->cols_ * row; sz_ = p->cols_;}
+		inline RowConst(const PIVector2D<T> * p, size_t row): p_(&(p->mat)) {
+			st_ = p->cols_ * row;
+			sz_ = p->cols_;
+		}
 		const PIVector<T> * p_;
 		size_t st_, sz_;
+
 	public:
 		inline size_t size() const { return sz_; }
 		inline const T & operator[](size_t index) const { return (*p_)[st_ + index]; }
@@ -143,10 +170,16 @@ public:
 
 	class ColConst {
 		friend class PIVector2D<T>;
+
 	private:
-		inline ColConst(const PIVector2D<T> * p, size_t row) : p_(&(p->mat)) {step_ = p->cols_; row_ = row; sz_ = p->rows_;}
+		inline ColConst(const PIVector2D<T> * p, size_t row): p_(&(p->mat)) {
+			step_ = p->cols_;
+			row_  = row;
+			sz_   = p->rows_;
+		}
 		const PIVector<T> * p_;
 		size_t step_, row_, sz_;
+
 	public:
 		inline size_t size() const { return p_->rows_; }
 		inline const T & operator[](size_t index) const { return (*p_)[index * step_ + row_]; }
@@ -154,7 +187,8 @@ public:
 		inline PIVector<T> toVector() const {
 			PIVector<T> ret;
 			ret.reserve(sz_);
-			for (int i=0; i<size(); i++) ret << (*p_)[i * step_ + row_];
+			for (int i = 0; i < size(); i++)
+				ret << (*p_)[i * step_ + row_];
 			return ret;
 		}
 	};
@@ -172,24 +206,24 @@ public:
 	inline Col col(size_t index) { return Col(this, index); }
 	inline ColConst col(size_t index) const { return ColConst(this, index); }
 	inline PIVector2D<T> & setRow(size_t row, const Row & other) {
-		size_t sz = piMin<size_t>(cols_, other.sz_);
+		const size_t sz = piMin<size_t>(cols_, other.sz_);
 		mat._copyRaw(mat.data(cols_ * row), other.data(), sz);
 		return *this;
 	}
 	inline PIVector2D<T> & setRow(size_t row, const RowConst & other) {
-		size_t sz = piMin<size_t>(cols_, other.sz_);
+		const size_t sz = piMin<size_t>(cols_, other.sz_);
 		mat._copyRaw(mat.data(cols_ * row), other.data(), sz);
 		return *this;
 	}
 	inline PIVector2D<T> & setRow(size_t row, const PIVector<T> & other) {
-		size_t sz = piMin<size_t>(cols_, other.size());
+		const size_t sz = piMin<size_t>(cols_, other.size());
 		mat._copyRaw(mat.data(cols_ * row), other.data(), sz);
 		return *this;
 	}
 	inline PIVector2D<T> & addRow(const Row & other) {
 		if (cols_ == 0) cols_ = other.sz_;
-		size_t sz = piMin<size_t>(cols_, other.sz_);
-		size_t ps = mat.size();
+		const size_t sz = piMin<size_t>(cols_, other.sz_);
+		const size_t ps = mat.size();
 		mat.resize(mat.size() + cols_);
 		mat._copyRaw(mat.data(ps), other.data(), sz);
 		rows_++;
@@ -197,8 +231,8 @@ public:
 	}
 	inline PIVector2D<T> & addRow(const RowConst & other) {
 		if (cols_ == 0) cols_ = other.sz_;
-		size_t sz = piMin<size_t>(cols_, other.sz_);
-		size_t ps = mat.size();
+		const size_t sz = piMin<size_t>(cols_, other.sz_);
+		const size_t ps = mat.size();
 		mat.resize(mat.size() + cols_);
 		mat._copyRaw(mat.data(ps), other.data(), sz);
 		rows_++;
@@ -206,8 +240,8 @@ public:
 	}
 	inline PIVector2D<T> & addRow(const PIVector<T> & other) {
 		if (cols_ == 0) cols_ = other.size();
-		size_t sz = piMin<size_t>(cols_, other.size());
-		size_t ps = mat.size();
+		const size_t sz = piMin<size_t>(cols_, other.size());
+		const size_t ps = mat.size();
 		mat.resize(mat.size() + cols_);
 		mat._copyRaw(mat.data(ps), other.data(), sz);
 		rows_++;
@@ -217,7 +251,7 @@ public:
 	inline PIVector2D<T> & resize(size_t rows, size_t cols, const T & f = T()) {
 		mat.resize(rows * cols_, f);
 		rows_        = rows;
-		int cs = (cols - cols_);
+		const int cs = (cols - cols_);
 		if (cs < 0) {
 			for (size_t r = 0; r < rows; ++r) {
 				mat.remove(r * cols + cols, -cs);
@@ -237,22 +271,24 @@ public:
 	}
 
 	inline bool operator==(const PIVector2D<T> & t) const {
-		if (cols_ != t.cols_ || rows_ != t.rows_)
-			return false;
+		if (cols_ != t.cols_ || rows_ != t.rows_) return false;
 		return mat == t.mat;
 	}
 	inline bool operator!=(const PIVector2D<T> & t) const { return !(*this == t); }
 
-	PIVector<PIVector<T> > toVectors() const {
+	inline PIVector<PIVector<T>> toVectors() const {
 		PIVector<PIVector<T>> ret;
 		ret.reserve(rows_);
 		for (size_t i = 0; i < rows_; ++i)
 			ret << PIVector<T>(mat.data(i * cols_), cols_);
 		return ret;
 	}
-	PIVector<T> toPlainVector() const {return mat;}
-	PIVector<T> & plainVector() {return mat;}
-	const PIVector<T> & plainVector() const {return mat;}
+
+	inline PIVector<T> toPlainVector() const { return mat; }
+
+	inline PIVector<T> & plainVector() { return mat; }
+
+	inline const PIVector<T> & plainVector() const { return mat; }
 
 	inline void swap(PIVector2D<T> & other) {
 		mat.swap(other.mat);
@@ -260,9 +296,7 @@ public:
 		piSwap<size_t>(cols_, other.cols_);
 	}
 
-	template<typename T1 = T, typename std::enable_if<
-				 std::is_trivially_copyable<T1>::value
-				 , int>::type = 0>
+	template<typename T1 = T, typename std::enable_if<std::is_trivially_copyable<T1>::value, int>::type = 0>
 	inline PIVector2D<T> & _resizeRaw(size_t r, size_t c) {
 		rows_ = r;
 		cols_ = c;
@@ -275,19 +309,17 @@ public:
 		mat.clear();
 	}
 
-	const PIVector2D<T> & forEach(std::function<void(const T &)> f) const {
+	template<typename ST>
+	inline PIVector2D<ST> map(std::function<ST(const T & e)> f) const {
+		return PIVector2D<ST>(rows_, cols_, mat.map(f));
+	}
+
+	inline void forEach(std::function<void(const T &)> f) const { mat.forEach(f); }
+
+	inline PIVector2D<T> & forEach(std::function<void(T &)> f) {
 		mat.forEach(f);
 		return *this;
 	}
-	PIVector2D<T> copyForEach(std::function<T(const T &)> f) const {
-		PIVector2D<T> ret(*this);
-		ret.mat = mat.copyForEach(f);
-		return ret;
-	}
-	PIVector2D<T> & forEachInplace(std::function<T(const T &)> f) {
-		mat.forEachInplace(f);
-		return *this;
-	}
 
 protected:
 	size_t rows_, cols_;
@@ -297,7 +329,7 @@ protected:
 
 template<typename T>
 inline PICout operator<<(PICout s, const PIVector2D<T> & v) {
-	s.setControl(0, true);
+	s.saveAndSetControls(0);
 	s << "{";
 	for (size_t i = 0; i < v.rows(); ++i) {
 		s << "{ ";
@@ -310,7 +342,7 @@ inline PICout operator <<(PICout s, const PIVector2D<T> & v) {
 	}
 	if (v.isEmpty()) s << "{ }";
 	s << "}";
-	s.restoreControl();
+	s.restoreControls();
 	return s;
 }
 

libs/main/core/pibase.h

@@ -1,8 +1,16 @@
-/*! @file pibase.h
- * @brief Base types and functions
+/*! \file pibase.h
+ * \ingroup Core
+ * \~\brief
+ * \~english Base types and functions
+ * \~russian Базовые типы и методы
  *
+ * \~\details
+ * \~english
  * This file implements first layer above the system and
  * declares some basic useful functions
+ * \~russian
+ * Этот файл реализует первый слой после системы и объявляет
+ * несколько базовых полезных методов
  */
 /*
     PIP - Platform Independent Primitives
@@ -26,276 +34,31 @@
 #ifndef PIBASE_H
 #define PIBASE_H
 
-#include "pip_version.h"
-#include "piplatform.h"
+#include "pibase_macros.h"
 #include "pip_export.h"
-#include "pip_defs.h"
-#include "string.h"
 
-//! Meta-information section for any entity.
-//! Parsing by \a pip_cmg and can be accessed by \a PICodeInfo.
-//! Contains sequence of key=value pairs, e.g.
-//! PIMETA(id=12345,tag="my string")
-#define PIMETA(...)
+#include <string.h>
 
-#ifdef DOXYGEN
-
-//! Major value of PIP version
-#  define PIP_VERSION_MAJOR
-
-//! Minor value of PIP version
-#  define PIP_VERSION_MINOR
-
-//! Revision value of PIP version
-#  define PIP_VERSION_REVISION
-
-//! Suffix of PIP version
-#  define PIP_VERSION_SUFFIX
-
-//! Version of PIP in hex - 0x##(Major)##(Minor)##(Revision)
-#  define PIP_VERSION
-
-//! Macro is defined when compile-time debug is enabled
-#  define PIP_DEBUG
-
-//! Macro is defined when host is any Windows
-#  define WINDOWS
-
-//! Macro is defined when host is QNX or Blackberry
-#  define QNX
-
-//! Macro is defined when host is Blackberry
-#  define BLACKBERRY
-
-//! Macro is defined when host is FreeBSD
-#  define FREE_BSD
-
-//! Macro is defined when host is Mac OS
-#  define MAC_OS
-
-//! Macro is defined when host is Android
-#  define ANDROID
-
-//! Macro is defined when host is any Linux
-#  define LINUX
-
-//! Macro is defined when compiler is GCC or MinGW
-#  define CC_GCC
-
-//! Macro is defined when PIP is decided that host is support language
-#  define HAS_LOCALE
-
-//! Macro is defined when compiler is Visual Studio
-#  define CC_VC
-
-//! Macro is defined when compiler is unknown
-#  define CC_OTHER
-
-//! Macro is defined when PIP can use "rt" library for "PITimer::ThreadRT" timers implementation
-#  define PIP_TIMER_RT
-
-//! Macro to declare private section, export is optional
-#  define PRIVATE_DECLARATION(export)
-
-//! Macro to start definition of private section
-#  define PRIVATE_DEFINITION_START(Class)
-
-//! Macro to end definition of private section
-#  define PRIVATE_DEFINITION_END(Class)
-
-//! Macro to access private section by pointer
-#  define PRIVATE
-
-//! Macro to access private section by pointer without brakes ()
-#  define PRIVATEWB
-
-//! Macro to start static initializer
-#  define STATIC_INITIALIZER_BEGIN
-
-//! Macro to end static initializer
-#  define STATIC_INITIALIZER_END
-
-
-#endif //DOXYGEN
-
-#include <functional>
-
-#include <cstddef>
-#ifdef WINDOWS
-#  ifdef CC_VC
-#    define SHUT_RDWR 2
-#    pragma comment(lib, "Ws2_32.lib")
-#    pragma comment(lib, "Iphlpapi.lib")
-#    pragma comment(lib, "Psapi.lib")
-#    ifdef ARCH_BITS_32
-#      define _X86_
-#    else
-#      define _IA64_
-#    endif
-#  else
-#    define SHUT_RDWR SD_BOTH
-#  endif
-	typedef int socklen_t;
-	extern long long __pi_perf_freq;
-#endif
-
-#ifdef ANDROID
-///#  define tcdrain(fd) ioctl(fd, TCSBRK, 1)
-   //inline int wctomb(char * c, wchar_t w) {*c = ((char * )&w)[0]; return 1;}
-   //inline int mbtowc(wchar_t * w, const char * c, size_t) {*w = ((wchar_t * )&c)[0]; return 1;}
-#endif
-
-#ifdef MAC_OS
-#  define environ (*_NSGetEnviron())
-   typedef long time_t;
-#endif
-
-#ifdef LINUX
-#  define environ __environ
-#endif
-
-#ifdef FREE_BSD
-   extern char ** environ;
-#endif
-
-#ifdef NDEBUG
-#  undef NDEBUG
+#ifdef CC_AVR_GCC
+#  include <ArduinoSTL.h>
 #endif
+#include <atomic>
 #include <cassert>
-#ifndef assert
-#  define assert(x)
-#  define assertm(exp, msg)
-#else
-#  define assertm(exp, msg) assert(((void)msg, exp))
-#endif
+#include <cstddef>
+#include <functional>
+#include <initializer_list>
+#include <limits>
 
-#ifdef CC_GCC
-#  undef DEPRECATED
-#  define DEPRECATED __attribute__((deprecated))
-#  if CC_GCC_VERSION > 0x025F // > 2.95
-#    ifdef LINUX
-#      define HAS_LOCALE
-#    endif
-#    ifdef MAC_OS
-#      pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#      pragma GCC diagnostic ignored "-Wundefined-bool-conversion"
-#      pragma GCC diagnostic ignored "-Wc++11-extensions"
-#    endif
-#  endif
-#  ifdef ANDROID
-#    pragma GCC diagnostic ignored "-Wunused-parameter"
-#    pragma GCC diagnostic ignored "-Wextra"
-#    pragma GCC diagnostic ignored "-Wc++11-extensions"
-#    pragma GCC diagnostic ignored "-Wundefined-bool-conversion"
-//#    pragma GCC diagnostic ignored "-Wliteral-suffix"
-#  endif
-#endif
-
-#ifdef CC_VC
-#  undef DEPRECATED
-#  define DEPRECATED
-#  pragma warning(disable: 4018)
-#  pragma warning(disable: 4061)
-#  pragma warning(disable: 4100)
-#  pragma warning(disable: 4239)
-#  pragma warning(disable: 4242)
-#  pragma warning(disable: 4244)
-#  pragma warning(disable: 4251)
-#  pragma warning(disable: 4365)
-#  pragma warning(disable: 4512)
-#  pragma warning(disable: 4668)
-#  pragma warning(disable: 4710)
-#  pragma warning(disable: 4800)
-#  pragma warning(disable: 4820)
-#  pragma warning(disable: 4986)
-#  pragma warning(disable: 4996)
-#  ifdef ARCH_BITS_32
-	 typedef long ssize_t;
-#  else
-	 typedef long long ssize_t;
-#  endif
-#endif
-
-#ifdef CC_OTHER
-#  undef DEPRECATED
-#  define DEPRECATED
-#endif
-
-
-// Private data macros
-#ifndef DOXYGEN
-
-#define PRIVATE_DECLARATION(e) \
-	struct __Private__; \
-	friend struct __Private__; \
-	struct e __PrivateInitializer__ { \
-		__PrivateInitializer__(); \
-		__PrivateInitializer__(const __PrivateInitializer__ & o); \
-		~__PrivateInitializer__(); \
-		__PrivateInitializer__ & operator =(const __PrivateInitializer__ & o); \
-		__Private__ * p; \
-	}; \
-	__PrivateInitializer__ __privateinitializer__;
-
-#define PRIVATE_DEFINITION_START(c) \
-	struct c::__Private__ {
-
-#define PRIVATE_DEFINITION_END(c) \
-	}; \
-	c::__PrivateInitializer__::__PrivateInitializer__() {p = new c::__Private__();} \
-	c::__PrivateInitializer__::__PrivateInitializer__(const c::__PrivateInitializer__ & ) {/*if (p) delete p;*/ p = new c::__Private__();} \
-	c::__PrivateInitializer__::~__PrivateInitializer__() {delete p; p = 0;} \
-	c::__PrivateInitializer__ & c::__PrivateInitializer__::operator =(const c::__PrivateInitializer__ & ) {if (p) delete p; p = new c::__Private__(); return *this;}
-
-#define PRIVATE (__privateinitializer__.p)
-#define PRIVATEWB __privateinitializer__.p
-
-#endif //DOXYGEN
-
-#define NO_COPY_CLASS(name) \
-	name(const name&) = delete; \
-	name& operator=(const name&) = delete;
-
-
-#define _PIP_ADD_COUNTER_WS(a, cnt) a##cnt
-#define _PIP_ADD_COUNTER_WF(a, cnt) _PIP_ADD_COUNTER_WS(a, cnt)
-#define _PIP_ADD_COUNTER(a) _PIP_ADD_COUNTER_WF(a, __COUNTER__)
-
-
-#define STATIC_INITIALIZER_BEGIN \
-	class { \
-		class _Initializer_ { \
-		public: \
-			_Initializer_() {
-
-#define STATIC_INITIALIZER_END \
-		} \
-	} _initializer_; \
-} _PIP_ADD_COUNTER(_pip_initializer_);
-
-
-#ifdef FREERTOS
-#  define PIP_MIN_MSLEEP 10.
-#else
-#  define PIP_MIN_MSLEEP 1.
-#endif
-
-
-//! Macro used for infinite loop
-#define FOREVER for (;;)
-
-//! Macro used for infinite wait
-#define FOREVER_WAIT FOREVER msleep(PIP_MIN_MSLEEP);
-
-//! Macro used for infinite wait
-#define WAIT_FOREVER FOREVER msleep(PIP_MIN_MSLEEP);
-
-
-//! global variable enabling output to piCout, default is true
+//! \~\brief
+//! \~english Global variable enabling output to piCout, default is true
+//! \~russian Глобальная переменная, включающая вывод в piCout, при старте true
 extern PIP_EXPORT bool piDebug;
 
-//! global variable that set minimum real update interval
+//! \~\brief
+//! \~english Global variable that set minimum real update interval
 //! for function PIInit::mountInfo(), default is 10000 ms
+//! \~russian Глобальная переменная минимального ожидания между реальным обновлением
+//! в методе PIInit::mountInfo(), по умолчанию 10000 мс
 extern PIP_EXPORT double piMountInfoRefreshIntervalMs;
 
 typedef unsigned char uchar;
@@ -306,13 +69,27 @@ typedef unsigned long long ullong;
 typedef long long llong;
 typedef long double ldouble;
 
-/*! @brief Templated function for swap two values
- * \details Example:\n \snippet piincludes.cpp swap */
-template<typename T> inline void piSwap(T & f, T & s) {T t(std::move(f)); f = std::move(s); s = std::move(t);}
+//! \~\brief
+//! \~english Templated function for swap two values
+//! \~russian Шаблонный метод для перестановки двух значений
+//! \~\details
+//! \~english Example:\n \snippet piincludes.cpp swap
+//! \~russian Пример:\n \snippet piincludes.cpp swap
+template<typename T>
+inline void piSwap(T & f, T & s) {
+	T t(std::move(f));
+	f = std::move(s);
+	s = std::move(t);
+}
 
-/*! @brief Templated function for swap two values without "="
- * \details Example:\n \snippet piincludes.cpp swapBinary */
-template<typename T> inline void piSwapBinary(T & f, T & s) {
+//! \~\brief
+//! \~english Templated function for swap two values without "="
+//! \~russian Шаблонный метод для перестановки двух значений без использования "="
+//! \~\details
+//! \~english Example:\n \snippet piincludes.cpp swapBinary
+//! \~russian Пример:\n \snippet piincludes.cpp swapBinary
+template<typename T>
+inline void piSwapBinary(T & f, T & s) {
 	if ((size_t *)&f == (size_t *)&s) return;
 	size_t j = (sizeof(T) / sizeof(size_t)), bs = j * sizeof(size_t), bf = sizeof(T);
 	size_t i = 0;
@@ -328,7 +105,8 @@ template<typename T> inline void piSwapBinary(T & f, T & s) {
 	}
 }
 
-template<> inline void piSwapBinary(const void *& f, const void *& s) {
+template<>
+inline void piSwapBinary(const void *& f, const void *& s) {
 	if ((size_t *)f == (size_t *)s) return;
 	size_t j = (sizeof(void *) / sizeof(size_t)), bs = j * sizeof(size_t), bf = sizeof(void *);
 	size_t i = 0;
@@ -346,161 +124,328 @@ template<> inline void piSwapBinary(const void *& f, const void *& s) {
 }
 
 
-/*! @brief Function for compare two values without "=" by raw content
- * \details Example:\n \snippet piincludes.cpp compareBinary */
+//! \~\brief
+//! \~english Function for compare two values without "==" by raw content
+//! \~russian Метод для сравнения двух значений без использования "==" (по сырому содержимому)
+//! \~\details
+//! \~english Example:\n \snippet piincludes.cpp compareBinary
+//! \~russian Пример:\n \snippet piincludes.cpp compareBinary
 inline bool piCompareBinary(const void * f, const void * s, size_t size) {
 	for (size_t i = 0; i < size; ++i)
-		if (((const uchar*)f)[i] != ((const uchar*)s)[i])
-			return false;
+		if (((const uchar *)f)[i] != ((const uchar *)s)[i]) return false;
 	return true;
 }
 
-/*! @brief Templated function return round of float falue
- * \details Round is the nearest integer value \n
- * There are some macros:
- * - \c piRoundf for "float"
- * - \c piRoundd for "double"
- *
- * Example:
- * \snippet piincludes.cpp round */
-template<typename T> inline constexpr int piRound(const T & v) {return int(v >= T(0.) ? v + T(0.5) : v - T(0.5));}
+//! \~\brief
+//! \~english Templated function return round of float falue
+//! \~russian Шаблонный метод, возвращающий округленное значение
+//! \~\details
+//! \~english
+//! Round is the nearest integer value \n
+//! There are some macros:
+//! - \c piRoundf for "float"
+//! - \c piRoundd for "double"
+//!
+//! Example:
+//! \snippet piincludes.cpp round
+//! \~russian
+//! Округленное значение - это ближайшее целое число\n
+//! Есть несколько макросов:
+//! - \c piRoundf для "float"
+//! - \c piRoundd для "double"
+//!
+//! Пример:
+//! \snippet piincludes.cpp round
+template<typename T>
+inline constexpr int piRound(const T & v) {
+	return int(v >= T(0.) ? v + T(0.5) : v - T(0.5));
+}
 
-/*! @brief Templated function return floor of float falue
- * \details Floor is the largest integer that is not greater than value \n
- * There are some macros:
- * - \c piFloorf for "float"
- * - \c piFloord for "double"
- *
- * Example:
- * \snippet piincludes.cpp floor */
-template<typename T> inline constexpr int piFloor(const T & v) {return v < T(0) ? int(v) - 1 : int(v);}
+//! \~\brief
+//! \~english Templated function return floor of float falue
+//! \~russian Шаблонный метод, возвращающий floor значение
+//! \~\details
+//! \~english
+//! Floor is the largest integer that is not greater than "v" \n
+//! There are some macros:
+//! - \c piFloorf for "float"
+//! - \c piFloord for "double"
+//!
+//! Example:
+//! \snippet piincludes.cpp floor
+//! \~russian
+//! Floor значение - это наибольшее целое, не большее чем "v"\n
+//! Есть несколько макросов:
+//! - \c piFloorf для "float"
+//! - \c piFloord для "double"
+//!
+//! Пример:
+//! \snippet piincludes.cpp floor
+template<typename T>
+inline constexpr int piFloor(const T & v) {
+	return v < T(0) ? int(v) - 1 : int(v);
+}
 
-/*! @brief Templated function return ceil of float falue
- * \details Ceil is the smallest integer that is not less than value \n
- * There are some macros:
- * - \c piCeilf for "float"
- * - \c piCeild for "double"
- *
- * Example:
- * \snippet piincludes.cpp ceil */
-template<typename T> inline constexpr int piCeil(const T & v) {return v < T(0) ? int(v) : int(v) + 1;}
+//! \~\brief
+//! \~english Templated function return ceil of float falue
+//! \~russian Шаблонный метод, возвращающий ceil значение
+//! \~\details
+//! \~english
+//! Ceil is the smallest integer that is not less than "v" \n
+//! There are some macros:
+//! - \c piCeilf for "float"
+//! - \c piCeild for "double"
+//!
+//! Example:
+//! \snippet piincludes.cpp ceil
+//! \~russian
+//! Ceil значение - это наименьшее целое, не меньшее чем "v" \n
+//! Есть несколько макросов:
+//! - \c piCeilf для "float"
+//! - \c piCeild для "double"
+//!
+//! Пример:
+//! \snippet piincludes.cpp ceil
+template<typename T>
+inline constexpr int piCeil(const T & v) {
+	return v < T(0) ? int(v) : int(v) + 1;
+}
 
-/*! @brief Templated function return absolute of numeric falue
- * \details Absolute is the positive or equal 0 value \n
- * There are some macros:
- * - \c piAbss for "short"
- * - \c piAbsi for "int"
- * - \c piAbsl for "long"
- * - \c piAbsll for "llong"
- * - \c piAbsf for "float"
- * - \c piAbsd for "double"
- *
- * Example:
- * \snippet piincludes.cpp abs */
-template<typename T> inline constexpr T piAbs(const T & v) {return (v >= T(0) ? v : -v);}
+//! \~\brief
+//! \~english Templated function return absolute of numeric falue
+//! \~russian Шаблонный метод, возвращающий модуль числового значения
+//! \~\details
+//! \~english
+//! Absolute is the positive or equal 0 value \n
+//! There are some macros:
+//! - \c piAbss for "short"
+//! - \c piAbsi for "int"
+//! - \c piAbsl for "long"
+//! - \c piAbsll for "llong"
+//! - \c piAbsf for "float"
+//! - \c piAbsd for "double"
+//!
+//! Example:
+//! \snippet piincludes.cpp abs
+//! \~russian
+//! Модуль числового значения всегда >= 0 \n
+//! Есть несколько макросов:
+//! - \c piAbss для "short"
+//! - \c piAbsi для "int"
+//! - \c piAbsl для "long"
+//! - \c piAbsll для "llong"
+//! - \c piAbsf для "float"
+//! - \c piAbsd для "double"
+//!
+//! Пример:
+//! \snippet piincludes.cpp abs
+template<typename T>
+inline constexpr T piAbs(const T & v) {
+	return (v >= T(0) ? v : -v);
+}
 
-/*! @brief Templated function return minimum of two values
- * \details There are some macros:
- * - \c piMins for "short"
- * - \c piMini for "int"
- * - \c piMinl for "long"
- * - \c piMinll for "llong"
- * - \c piMinf for "float"
- * - \c piMind for "double"
- *
- * Example:
- * \snippet piincludes.cpp min2 */
-template<typename T> inline constexpr T piMin(const T & f, const T & s) {return ((f > s) ? s : f);}
 
-/*! @brief Templated function return minimum of tree values
- * \details There are some macros:
- * - \c piMins for "short"
- * - \c piMini for "int"
- * - \c piMinl for "long"
- * - \c piMinll for "llong"
- * - \c piMinf for "float"
- * - \c piMind for "double"
- *
- * Example:
- * \snippet piincludes.cpp min3 */
-template<typename T> inline constexpr T piMin(const T & f, const T & s, const T & t) {return ((f < s && f < t) ? f : ((s < t) ? s : t));}
+template<typename T>
+constexpr T piMin(const T & f, const T & s) {
+	return ((f > s) ? s : f);
+}
 
-/*! @brief Templated function return maximum of two values
- * \details There are some macros:
- * - \c piMaxs for "short"
- * - \c piMaxi for "int"
- * - \c piMaxl for "long"
- * - \c piMaxll for "llong"
- * - \c piMaxf for "float"
- * - \c piMaxd for "double"
- *
- * Example:
- * \snippet piincludes.cpp max2 */
-template<typename T> inline constexpr T piMax(const T & f, const T & s) {return ((f < s) ? s : f);}
+//! \~\brief
+//! \~english Templated function return minimum of several values
+//! \~russian Шаблонный метод, возвращающий минимум из нескольких значений
+//! \~\details
+//! \~english
+//! There are some macros:
+//! - \c piMins for "short"
+//! - \c piMini for "int"
+//! - \c piMinl for "long"
+//! - \c piMinll for "llong"
+//! - \c piMinf for "float"
+//! - \c piMind for "double"
+//!
+//! Example:
+//! \snippet piincludes.cpp min2
+//! \~russian
+//! Есть несколько макросов:
+//! - \c piMins для "short"
+//! - \c piMini для "int"
+//! - \c piMinl для "long"
+//! - \c piMinll для "llong"
+//! - \c piMinf для "float"
+//! - \c piMind для "double"
+//!
+//! Пример:
+//! \snippet piincludes.cpp min2
+template<typename T, typename... Args>
+constexpr T piMin(const T & f, const T & s, const Args &... args) {
+	return piMin<T>(piMin<T>(f, s), args...);
+}
 
-/*! @brief Templated function return maximum of tree values
- * \details There are some macros:
- * - \c piMaxs for "short"
- * - \c piMaxi for "int"
- * - \c piMaxl for "long"
- * - \c piMaxll for "llong"
- * - \c piMaxf for "float"
- * - \c piMaxd for "double"
- *
- * Example:
- * \snippet piincludes.cpp max3 */
-template<typename T> inline constexpr T piMax(const T & f, const T & s, const T & t) {return ((f > s && f > t) ? f : ((s > t) ? s : t));}
 
-/*! @brief Templated function return clamped value
- * \details Clamped is the not greater than "max" and not lesser than "min" value \n
- * There are some macros:
- * - \c piClamps for "short"
- * - \c piClampi for "int"
- * - \c piClampl for "long"
- * - \c piClampll for "llong"
- * - \c piClampf for "float"
- * - \c piClampd for "double"
- *
- * Example:
- * \snippet piincludes.cpp clamp */
-template<typename T> inline constexpr T piClamp(const T & v, const T & min, const T & max) {return (v > max ? max : (v < min ? min : v));}
+template<typename T>
+constexpr T piMax(const T & f, const T & s) {
+	return ((f < s) ? s : f);
+}
 
-/// Function inverse byte order in memory block
+//! \~\brief
+//! \~english Templated function return maximum of several values
+//! \~russian Шаблонный метод, возвращающий максимум из нескольких значений
+//! \~\details
+//! \~english
+//! There are some macros:
+//! - \c piMaxs for "short"
+//! - \c piMaxi for "int"
+//! - \c piMaxl for "long"
+//! - \c piMaxll for "llong"
+//! - \c piMaxf for "float"
+//! - \c piMaxd for "double"
+//!
+//! Example:
+//! \snippet piincludes.cpp max2
+//! \~russian
+//! Есть несколько макросов:
+//! - \c piMaxs для "short"
+//! - \c piMaxi для "int"
+//! - \c piMaxl для "long"
+//! - \c piMaxll для "llong"
+//! - \c piMaxf для "float"
+//! - \c piMaxd для "double"
+//!
+//! Пример:
+//! \snippet piincludes.cpp max2
+template<typename T, typename... Args>
+constexpr T piMax(const T & f, const T & s, const Args &... args) {
+	return piMax<T>(piMax<T>(f, s), args...);
+}
+
+
+//! \~\brief
+//! \~english Templated function return clamped value
+//! \~russian Шаблонный метод, возвращающий ограниченное значение
+//! \~\details
+//! \~english
+//! Clamped is the not greater than "max" and not lesser than "min" value \n
+//! There are some macros:
+//! - \c piClamps for "short"
+//! - \c piClampi for "int"
+//! - \c piClampl for "long"
+//! - \c piClampll for "llong"
+//! - \c piClampf for "float"
+//! - \c piClampd for "double"
+//!
+//! Example:
+//! \snippet piincludes.cpp clamp
+//! \~russian
+//! Ограниченное значение - не больше чем "max" и не меньше чем "min"
+//! Есть несколько макросов:
+//! - \c piClamps для "short"
+//! - \c piClampi для "int"
+//! - \c piClampl для "long"
+//! - \c piClampll для "llong"
+//! - \c piClampf для "float"
+//! - \c piClampd для "double"
+//!
+//! Пример:
+//! \snippet piincludes.cpp clamp
+template<typename T>
+inline constexpr T piClamp(const T & v, const T & min, const T & max) {
+	return (v > max ? max : (v < min ? min : v));
+}
+
+//! \~\brief
+//! \~english Function inverse byte order in memory block ([1..N] -> [N..1])
+//! \~russian Метод для смены порядка байт в блоке памяти ([1..N] -> [N..1])
 inline void piLetobe(void * data, int size) {
 	for (int i = 0; i < size / 2; i++)
 		piSwap<uchar>(((uchar *)data)[size - i - 1], ((uchar *)data)[i]);
 }
 
-/// @brief Templated function that inverse byte order of value "v"
-template<typename T> inline void piLetobe(T * v) {piLetobe(v, sizeof(T));}
+//! \~\brief
+//! \~english Function for compare two numeric values with epsilon
+//! \~russian Метод для сравнения двух чисел с порогом
+//! \~\details
+//! \~english
+//! There are some macros:
+//! - \c piComparef for "float"
+//! - \c piCompared for "double"
+//!
+//! Example:
+//! \snippet piincludes.cpp compare
+//! \~russian
+//! Есть несколько макросов:
+//! - \c piComparef для "float"
+//! - \c piCompared для "double"
+//!
+//! Пример:
+//! \snippet piincludes.cpp compare
+template<typename T>
+inline bool piCompare(const T & a, const T & b, const T & epsilon = std::numeric_limits<T>::epsilon()) {
+	return piAbs(a - b) <= epsilon;
+}
 
-/*! @brief Templated function that returns "v" with inversed byte order
- * \details This function used to convert values between little and big endian \n
- * There are some macros:
- * - \c piLetobes for "ushort"
- * - \c piLetobei for "uint"
- * - \c piLetobel for "ulong"
- * - \c piLetobell for "ullong"
- *
- * Example:
- * \snippet piincludes.cpp letobe */
-template<typename T> inline T piLetobe(const T & v) {T tv(v); piLetobe(&tv, sizeof(T)); return tv;}
+//! \~\brief
+//! \~english Templated function that inverse byte order of value "v"
+//! \~russian Шаблонный метод, меняющий порядок байт в переменной "v"
+template<typename T>
+inline void piLetobe(T * v) {
+	piLetobe(v, sizeof(T));
+}
+
+//! \~\brief
+//! \~english Templated function that returns "v" with inversed byte order
+//! \~russian Шаблонный метод, возвращающий переменную "v" с измененным порядком байт
+//! \~\details
+//! \~english
+//! This function used to convert values between little and big endian \n
+//! There are some macros:
+//! - \c piLetobes for "ushort"
+//! - \c piLetobei for "uint"
+//! - \c piLetobel for "ulong"
+//! - \c piLetobell for "ullong"
+//!
+//! Example:
+//! \snippet piincludes.cpp letobe
+//! \~russian
+//! Этот метод используется для изменения порядка байт между little и big endian
+//! Есть несколько макросов:
+//! - \c piLetobes для "ushort"
+//! - \c piLetobei для "uint"
+//! - \c piLetobel для "ulong"
+//! - \c piLetobell для "ullong"
+//!
+//! Пример:
+//! \snippet piincludes.cpp letobe
+template<typename T>
+inline T piLetobe(const T & v) {
+	T tv(v);
+	piLetobe(&tv, sizeof(T));
+	return tv;
+}
 
 // specialization
-template<> inline ushort piLetobe(const ushort & v) {return (v << 8) | (v >> 8);}
-template<> inline uint piLetobe(const uint & v) {return (v >> 24) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | ((v << 24) & 0xFF000000);}
-template<> inline float piLetobe(const float & v) {
+template<>
+inline uint16_t piLetobe(const uint16_t & v) {
+	return (v << 8) | (v >> 8);
+}
+template<>
+inline uint32_t piLetobe(const uint32_t & v) {
+	return (v >> 24) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | ((v << 24) & 0xFF000000);
+}
+template<>
+inline float piLetobe(const float & v) {
 	union _pletobe_f {
 		_pletobe_f(const float & f_) { f = f_; }
 		float f;
-		uint v;
+		uint32_t v;
 	};
 	_pletobe_f a(v);
 	a.v = (a.v >> 24) | ((a.v >> 8) & 0xFF00) | ((a.v << 8) & 0xFF0000) | ((a.v << 24) & 0xFF000000);
 	return a.f;
 }
 
-/// @brief Generic hash function, implements murmur3/32 algorithm
+//! \~\brief
+//! \~english Generic hash function, implements murmur3/32 algorithm
+//! \~russian Хэш-функция общего назначения, по алгоритму murmur3/32
 inline uint piHashData(const uchar * data, uint len, uint seed = 0) {
 	if (!data || len <= 0) return 0u;
 	uint h = seed;
@@ -540,24 +485,103 @@ inline uint piHashData(const uchar * data, uint len, uint seed = 0) {
 }
 
 
-template<typename T> inline uint piHash(const T & v) {
+template<typename T>
+inline uint piHash(const T & v) {
 	return 0;
 }
 
-template<> inline uint piHash(const  char   & v) {return (uint)v;}
-template<> inline uint piHash(const uchar   & v) {return (uint)v;}
-template<> inline uint piHash(const  short  & v) {return (uint)v;}
-template<> inline uint piHash(const ushort  & v) {return (uint)v;}
-template<> inline uint piHash(const  int    & v) {return (uint)v;}
-template<> inline uint piHash(const uint    & v) {return (uint)v;}
-template<> inline uint piHash(const  llong  & v) {return piHashData((const uchar *)&v, sizeof(v));}
-template<> inline uint piHash(const ullong  & v) {return piHashData((const uchar *)&v, sizeof(v));}
-template<> inline uint piHash(const float   & v) {return (uint)v;}
-template<> inline uint piHash(const double  & v) {return piHashData((const uchar *)&v, sizeof(v));}
-template<> inline uint piHash(const ldouble & v) {return piHashData((const uchar *)&v, sizeof(v));}
+template<>
+inline uint piHash(const char & v) {
+	return (uint)v;
+}
+template<>
+inline uint piHash(const uchar & v) {
+	return (uint)v;
+}
+template<>
+inline uint piHash(const short & v) {
+	return (uint)v;
+}
+template<>
+inline uint piHash(const ushort & v) {
+	return (uint)v;
+}
+template<>
+inline uint piHash(const int & v) {
+	return (uint)v;
+}
+template<>
+inline uint piHash(const uint & v) {
+	return (uint)v;
+}
+template<>
+inline uint piHash(const llong & v) {
+	return piHashData((const uchar *)&v, sizeof(v));
+}
+template<>
+inline uint piHash(const ullong & v) {
+	return piHashData((const uchar *)&v, sizeof(v));
+}
+template<>
+inline uint piHash(const float & v) {
+	return (uint)v;
+}
+template<>
+inline uint piHash(const double & v) {
+	return piHashData((const uchar *)&v, sizeof(v));
+}
+template<>
+inline uint piHash(const ldouble & v) {
+	return piHashData((const uchar *)&v, sizeof(v));
+}
+
+//! \~\brief
+//! \~english Call \b delete on each "container" element.
+//! \~russian Вызывает \b delete на каждый элемент "container".
+template<typename T>
+inline void piDeleteAll(const T & container) {
+	for (auto i: container) {
+		delete i;
+	}
+}
+
+//! \~\brief
+//! \~english Call \b delete on each element of
+//! [C++11 initializer list](https://en.cppreference.com/w/cpp/utility/initializer_list).
+//! \~russian Вызывает \b delete на каждый элемент
+//! [списка инициализации C++11](https://ru.cppreference.com/w/cpp/utility/initializer_list).
+template<typename T>
+inline void piDeleteAll(std::initializer_list<T> container) {
+	for (auto i: container) {
+		delete i;
+	}
+}
+
+//! \~\brief
+//! \~english Call \b delete on each "container" element and clear container.
+//! \~russian Вызывает \b delete на каждый элемент "container" и очищает контейнер.
+template<typename T>
+inline void piDeleteAllAndClear(T & container) {
+	piDeleteAll(container);
+	container.clear();
+}
+
+
+//! \~\brief
+//! \~english Call \b delete if "pointer" is not null and set it to null. Returns if deleted.
+//! \~russian Вызывает \b delete на "pointer" если он не нулевой и устанавливает его в ноль. Возвращает было ли удаление.
+template<typename T>
+inline bool piDeleteSafety(T *& pointer) {
+	if (!pointer) return false;
+	delete pointer;
+	pointer = nullptr;
+	return true;
+}
 
 #define piRoundf   piRound<float>
 #define piRoundd   piRound<double>
+#define piComparef piCompare<float>
+#define piCompared piCompare<double>
 #define piFloorf   piFloor<float>
 #define piFloord   piFloor<double>
 #define piCeilf    piCeil<float>
@@ -593,4 +617,55 @@ template<> inline uint piHash(const ldouble & v) {return piHashData((const uchar
 #define piLetobef  piLetobe<float>
 
 
+//! \~\brief
+//! \~english Class for executing a function upon scope exit
+//! \~russian Класс для выполнения функции при выходе из области видимости
+//! \~\details
+//! \~english Example
+//! \~russian Пример
+//! \~\code
+//! bool yourFunc() {
+//!		PIScopeExitCall error_call([]() { piCout << "Error!"; });
+//!		...
+//!		if (!good0) {
+//!			...
+//!			return false;
+//!		}
+//!		if (!good1) {
+//!			...
+//!			return false;
+//!		}
+//!		...
+//!		error_call.cancel();
+//!		return true;
+//! }
+//! \endcode
+//! \~english In this example "Error!" will be printed on every \b false function return.
+//! \~russian В данном примере будет выведен "Error!" при каждом \b false возврате из функции.
+class PIP_EXPORT PIScopeExitCall {
+public:
+	//! \~\brief
+	//! \~english Constructor that takes a function to execute
+	//! \~russian Конструктор, который принимает функцию для выполнения
+	explicit PIScopeExitCall(std::function<void()> f): func(f) {}
+
+	//! \~\brief
+	//! \~english Destructor that executes the function if it exists
+	//! \~russian Деструктор, который выполняет функцию, если она существует
+	~PIScopeExitCall() {
+		if (func) func();
+	}
+
+	//! \~\brief
+	//! \~english Method for canceling the function
+	//! \~russian Метод для отмены функции
+	void cancel() { func = nullptr; }
+
+private:
+	NO_COPY_CLASS(PIScopeExitCall)
+
+	std::function<void()> func;
+};
+
+
 #endif // PIBASE_H